Skip to content

Commit ffc2bc0

Browse files
committed
Fix: update template class Charge initialization
1 parent d4bc339 commit ffc2bc0

File tree

10 files changed

+19
-26
lines changed

10 files changed

+19
-26
lines changed

source/source_estate/module_charge/charge.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,5 @@ void Charge<Tr>::init_final_scf()
764764
return;
765765
}
766766

767-
768767
template class Charge<double>;
769-
template class Charge<std::complex<double>>;
768+
template class Charge<std::complex<double>>;

source/source_estate/module_charge/charge_init.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,5 @@ void Charge<Tr>::non_linear_core_correction
456456
return;
457457
}
458458

459-
460-
461459
template class Charge<double>;
462-
template class Charge<std::complex<double>>;
460+
template class Charge<std::complex<double>>;

source/source_estate/module_charge/charge_mpi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void Charge<Tr>::rho_mpi()
150150
return;
151151
}
152152

153-
154153
template class Charge<double>;
155154
template class Charge<std::complex<double>>;
155+
156156
#endif

source/source_estate/test/charge_extra_test.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ Parallel_Grid::~Parallel_Grid(){};
2929

3030

3131
// mock functions for Charge<double>
32-
template<>
33-
Charge<double>::Charge()
32+
template<> Charge<double>::Charge()
3433
{
3534
rhopw = new ModulePW::PW_Basis;
3635
rhopw->nrxx = 8;
@@ -45,21 +44,20 @@ Charge<double>::Charge()
4544
rho[0][i] = i + 1;
4645
}
4746
}
48-
template<>
49-
Charge<double>::~Charge()
47+
template<> Charge<double>::~Charge()
5048
{
5149
delete[] rho[0];
5250
delete[] rho;
5351
delete rhopw;
5452
}
55-
template<>
56-
void Charge<double>::atomic_rho(const int spin_number_need,
53+
template<> void Charge<double>::atomic_rho(const int spin_number_need,
5754
const double& omega,
5855
double** rho_in,
5956
const ModuleBase::ComplexMatrix& strucFac,
6057
const UnitCell& ucell) const
6158
{
6259
}
60+
template class Charge<double>;
6361

6462
// mock functions for PW_Basis
6563
namespace ModulePW

source/source_estate/test/charge_mixing_test.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,23 @@ int XC_Functional::func_type = 1;
1515
bool XC_Functional::ked_flag = false;
1616

1717
// mock function
18-
Magnetism::~Magnetism()
18+
Magnetism::~Magnetism()
1919
{
2020
}
2121
Magnetism::Magnetism()
2222
{
2323
}
24-
template<>
25-
Charge<double>::~Charge()
24+
template<> Charge<double>::~Charge()
2625
{
2726
}
28-
template<>
29-
Charge<double>::Charge()
27+
template<> Charge<double>::Charge()
3028
{
3129
}
32-
33-
template<>
34-
void Charge<double>::set_rhopw(ModulePW::PW_Basis* rhopw_in)
30+
template<> void Charge<double>::set_rhopw(ModulePW::PW_Basis* rhopw_in)
3531
{
3632
this->rhopw = rhopw_in;
3733
}
34+
template class Charge<double>;
3835
#ifdef __LCAO
3936
InfoNonlocal::InfoNonlocal()
4037
{

source/source_estate/test/elecstate_base_test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ template<typename Tr> void Charge<Tr>::renormalize_rho()
9797
template<typename Tr> void Charge<Tr>::check_rho()
9898
{
9999
}
100+
template class Charge<double>;
100101

101102
/************************************************
102103
* unit test of elecstate.cpp

source/source_estate/test/elecstate_magnetism_test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ template<> Charge<double>::Charge()
3333
template<> Charge<double>::~Charge()
3434
{
3535
}
36+
template class Charge<double>;
3637

3738

3839
class MagnetismTest : public ::testing::Test

source/source_estate/test/elecstate_print_test.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ Magnetism::Magnetism(){}
3131
Magnetism::~Magnetism(){}
3232
InfoNonlocal::InfoNonlocal(){}
3333
InfoNonlocal::~InfoNonlocal(){}
34-
template<> Charge<double>::Charge()
35-
{
36-
}
37-
template<> Charge<double>::~Charge()
38-
{
39-
}
34+
template<> Charge<double>::Charge(){}
35+
template<> Charge<double>::~Charge(){}
36+
template class Charge<double>;
4037
SepPot::SepPot(){}
4138
SepPot::~SepPot(){}
4239
Sep_Cell::Sep_Cell() noexcept {}

source/source_estate/test/elecstate_pw_test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ template<typename Tr> void Charge<Tr>::renormalize_rho()
146146
template<typename Tr> void Charge<Tr>::check_rho()
147147
{
148148
}
149+
template class Charge<double>;
149150

150151
void Set_GlobalV_Default()
151152
{

source/source_estate/test/potential_new_test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ template<> Charge<double>::Charge()
4242
template<> Charge<double>::~Charge()
4343
{
4444
}
45+
template class Charge<double>;
4546
surchem::surchem()
4647
{
4748
}

0 commit comments

Comments
 (0)