fix compile

Qianruipku · Nov 27, 2024 · 3035ebf · 3035ebf
1 parent d410afc
commit 3035ebf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/source/module_hamilt_pw/hamilt_pwdft/hamilt_lcaopw.h b/source/module_hamilt_pw/hamilt_pwdft/hamilt_lcaopw.h
@@ -22,8 +22,8 @@ namespace hamilt
       HamiltLIP(elecstate::Potential* pot_in,
                 ModulePW::PW_Basis_K* wfc_basis,
                 K_Vectors* p_kv,
-                Exx_Lip<T>& exx_lip_in,
-                pseudopot_cell_vnl* nlpp, )
+                pseudopot_cell_vnl* nlpp,
+                Exx_Lip<T>& exx_lip_in)
           : HamiltPW<T, base_device::DEVICE_CPU>(pot_in, wfc_basis, p_kv, nlpp), exx_lip(exx_lip_in){};
       Exx_Lip<T>& exx_lip;
 #endif

diff --git a/source/module_hamilt_pw/hamilt_stodft/test/test_hamilt_sto.cpp b/source/module_hamilt_pw/hamilt_stodft/test/test_hamilt_sto.cpp
@@ -11,7 +11,7 @@ void elecstate::Potential::cal_v_eff(Charge const*, UnitCell const*, ModuleBase:
 void elecstate::Potential::cal_fixed_v(double*){}
 
 template <typename T, typename Device>
-hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv){}
+hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv, pseudopot_cell_vnl*){}
 template <typename T, typename Device>
 hamilt::HamiltPW<T, Device>::~HamiltPW(){
     delete this->ops;
@@ -70,7 +70,7 @@ class TestHamiltSto : public ::testing::Test
         p_kv = new K_Vectors();
         std::vector<int> ngk = {2};
         p_kv->ngk = ngk;
-        hamilt_sto = new hamilt::HamiltSdftPW<std::complex<double>, base_device::DEVICE_CPU>(pot, wfc_basis, p_kv, npol, &emin, &emax);
+        hamilt_sto = new hamilt::HamiltSdftPW<std::complex<double>, base_device::DEVICE_CPU>(pot, wfc_basis, p_kv, nullptr, npol, &emin, &emax);
         hamilt_sto->ops = new TestOp<std::complex<double>, base_device::DEVICE_CPU>();
     }
 

diff --git a/source/module_hamilt_pw/hamilt_stodft/test/test_sto_tool.cpp b/source/module_hamilt_pw/hamilt_stodft/test/test_sto_tool.cpp
@@ -8,7 +8,7 @@
  ***********************************************/
 
 template <typename T, typename Device>
-hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv){}
+hamilt::HamiltPW<T, Device>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* p_kv,pseudopot_cell_vnl*){}
 template <typename T, typename Device>
 hamilt::HamiltPW<T, Device>::~HamiltPW(){};
 template <typename T, typename Device>

diff --git a/source/module_hsolver/test/diago_mock.h b/source/module_hsolver/test/diago_mock.h
@@ -574,7 +574,7 @@ template<> void hamilt::HamiltPW<double>::updateHk(const int ik)
     return;
 }
 
-template<> hamilt::HamiltPW<double>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv)
+template<> hamilt::HamiltPW<double>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv, pseudopot_cell_vnl*)
 {
     this->ops = new OperatorMock<double>;
 }
@@ -589,7 +589,7 @@ template<> void hamilt::HamiltPW<std::complex<double>>::updateHk(const int ik)
     return;
 }
 
-template<> hamilt::HamiltPW<std::complex<double>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv)
+template<> hamilt::HamiltPW<std::complex<double>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv, pseudopot_cell_vnl*)
 {
     this->ops = new OperatorMock<std::complex<double>>;
 }
@@ -604,7 +604,7 @@ template<> void hamilt::HamiltPW<std::complex<float>>::updateHk(const int ik)
     return;
 }
 
-template<> hamilt::HamiltPW<std::complex<float>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv)
+template<> hamilt::HamiltPW<std::complex<float>>::HamiltPW(elecstate::Potential* pot_in, ModulePW::PW_Basis_K* wfc_basis, K_Vectors* pkv, pseudopot_cell_vnl*)
 {
     this->ops = new OperatorMock<std::complex<float>>;
 }

diff --git a/source/module_hsolver/test/hsolver_supplementary_mock.h b/source/module_hsolver/test/hsolver_supplementary_mock.h
@@ -44,8 +44,8 @@ void ElecState::print_eigenvalue(std::ofstream& ofs)
 
 void ElecState::init_scf(const int istep,
                          const ModuleBase::ComplexMatrix& strucfac,
-                         ModuleSymmetry::Symmetry&,
                          const bool*,
+                         ModuleSymmetry::Symmetry&,
                          const void*)
 {
     return;