Skip to content

Commit 3035ebf

Browse files
committed
fix compile
1 parent d410afc commit 3035ebf

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

source/module_hamilt_pw/hamilt_pwdft/hamilt_lcaopw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ namespace hamilt
2222
HamiltLIP(elecstate::Potential* pot_in,
2323
ModulePW::PW_Basis_K* wfc_basis,
2424
K_Vectors* p_kv,
25-
Exx_Lip<T>& exx_lip_in,
26-
pseudopot_cell_vnl* nlpp, )
25+
pseudopot_cell_vnl* nlpp,
26+
Exx_Lip<T>& exx_lip_in)
2727
: HamiltPW<T, base_device::DEVICE_CPU>(pot_in, wfc_basis, p_kv, nlpp), exx_lip(exx_lip_in){};
2828
Exx_Lip<T>& exx_lip;
2929
#endif

source/module_hamilt_pw/hamilt_stodft/test/test_hamilt_sto.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void elecstate::Potential::cal_v_eff(Charge const*, UnitCell const*, ModuleBase:
1111
void elecstate::Potential::cal_fixed_v(double*){}
1212

1313
template <typename T, typename Device>
14-
hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv){}
14+
hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv, pseudopot_cell_vnl*){}
1515
template <typename T, typename Device>
1616
hamilt::HamiltPW<T, Device>::~HamiltPW(){
1717
delete this->ops;
@@ -70,7 +70,7 @@ class TestHamiltSto : public ::testing::Test
7070
p_kv = new K_Vectors();
7171
std::vector<int> ngk = {2};
7272
p_kv->ngk = ngk;
73-
hamilt_sto = new hamilt::HamiltSdftPW<std::complex<double>, base_device::DEVICE_CPU>(pot, wfc_basis, p_kv, npol, &emin, &emax);
73+
hamilt_sto = new hamilt::HamiltSdftPW<std::complex<double>, base_device::DEVICE_CPU>(pot, wfc_basis, p_kv, nullptr, npol, &emin, &emax);
7474
hamilt_sto->ops = new TestOp<std::complex<double>, base_device::DEVICE_CPU>();
7575
}
7676

source/module_hamilt_pw/hamilt_stodft/test/test_sto_tool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
***********************************************/
99

1010
template <typename T, typename Device>
11-
hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv){}
11+
hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv,pseudopot_cell_vnl*){}
1212
template <typename T, typename Device>
1313
hamilt::HamiltPW<T, Device>::~HamiltPW(){};
1414
template <typename T, typename Device>

source/module_hsolver/test/diago_mock.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ template<> void hamilt::HamiltPW<double>::updateHk(const int ik)
574574
return;
575575
}
576576

577-
template<> hamilt::HamiltPW<double>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv)
577+
template<> hamilt::HamiltPW<double>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv, pseudopot_cell_vnl*)
578578
{
579579
this->ops = new OperatorMock<double>;
580580
}
@@ -589,7 +589,7 @@ template<> void hamilt::HamiltPW<std::complex<double>>::updateHk(const int ik)
589589
return;
590590
}
591591

592-
template<> hamilt::HamiltPW<std::complex<double>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv)
592+
template<> hamilt::HamiltPW<std::complex<double>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv, pseudopot_cell_vnl*)
593593
{
594594
this->ops = new OperatorMock<std::complex<double>>;
595595
}
@@ -604,7 +604,7 @@ template<> void hamilt::HamiltPW<std::complex<float>>::updateHk(const int ik)
604604
return;
605605
}
606606

607-
template<> hamilt::HamiltPW<std::complex<float>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv)
607+
template<> hamilt::HamiltPW<std::complex<float>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv, pseudopot_cell_vnl*)
608608
{
609609
this->ops = new OperatorMock<std::complex<float>>;
610610
}

source/module_hsolver/test/hsolver_supplementary_mock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ void ElecState::print_eigenvalue(std::ofstream& ofs)
4444

4545
void ElecState::init_scf(const int istep,
4646
const ModuleBase::ComplexMatrix& strucfac,
47-
ModuleSymmetry::Symmetry&,
4847
const bool*,
48+
ModuleSymmetry::Symmetry&,
4949
const void*)
5050
{
5151
return;

0 commit comments

Comments
 (0)