Merge branch 'develop' of https://gitee.com/deepmodeling/abacus-develop into rdmft

Author: JGHan7

source/Makefile.Objects

@@ -584,7 +584,6 @@ OBJS_LCAO=evolve_elec.o\
       LCAO_set_fs.o\
       LCAO_set_st.o\
       LCAO_nl_mu.o\
-      LCAO_nnr.o\
       LCAO_set_zero.o\
       LCAO_allocate.o\
       LCAO_set_mat2d.o\

source/module_base/module_mixing/test/mixing_test.cpp

@@ -1,4 +1,6 @@
+#ifdef _OPENMP
 #include <omp.h>
+#endif
 
 #include "../broyden_mixing.h"
 #include "../plain_mixing.h"
@@ -151,7 +153,9 @@ class Mixing_Test : public testing::Test
 
 TEST_F(Mixing_Test, BroydenSolveLinearEq)
 {
+#ifdef _OPENMP
     omp_set_num_threads(1);
+#endif
     init_method("broyden");
     std::vector<double> x_in = xd_ref;
     std::vector<double> x_out(3);
@@ -196,7 +200,9 @@ TEST_F(Mixing_Test, BroydenSolveLinearEq)
 
 TEST_F(Mixing_Test, PulaySolveLinearEq)
 {
+#ifdef _OPENMP
     omp_set_num_threads(1);
+#endif
     init_method("pulay");
     std::vector<double> x_in = xd_ref;
     std::vector<double> x_out(3);
@@ -242,7 +248,9 @@ TEST_F(Mixing_Test, PulaySolveLinearEq)
 
 TEST_F(Mixing_Test, PlainSolveLinearEq)
 {
+#ifdef _OPENMP
     omp_set_num_threads(1);
+#endif
     init_method("plain");
     std::vector<double> x_in = xd_ref;
     std::vector<double> x_out(3);

source/module_elecstate/test/charge_mixing_test.cpp

@@ -10,7 +10,10 @@
 #include "module_basis/module_pw/pw_basis.h"
 #include "module_hamilt_general/module_xc/xc_functional.h"
 #undef private
+
+#ifdef _OPENMP
 #include <omp.h>
+#endif
 
 int FUNC_TYPE = 1;
 
@@ -116,7 +119,9 @@ class ChargeMixingTest : public ::testing::Test
 
 TEST_F(ChargeMixingTest, SetMixingTest)
 {
+#ifdef _OPENMP
     omp_set_num_threads(1);
+#endif
     PARAM.input.nspin = 1;
     Charge_Mixing CMtest;
     CMtest.set_rhopw(&pw_basis, &pw_basis);
@@ -214,7 +219,9 @@ TEST_F(ChargeMixingTest, SetMixingTest)
 
 TEST_F(ChargeMixingTest, InitMixingTest)
 {
+#ifdef _OPENMP
     omp_set_num_threads(1);
+#endif
     PARAM.input.nspin = 1;
     FUNC_TYPE = 1;
     Charge_Mixing CMtest;

source/module_esolver/set_matrix_grid.cpp

@@ -68,6 +68,7 @@ void ESolver_KS_LCAO<TK, TR>::set_matrix_grid(Record_adj& ra)
                              this->pw_rho->nplane,
                              this->pw_rho->startz_current,
                              GlobalC::ucell,
+                             GlobalC::GridD,
                              dr_uniform,
                              rcuts,
                              psi_u,
@@ -85,14 +86,7 @@ void ESolver_KS_LCAO<TK, TR>::set_matrix_grid(Record_adj& ra)
     // and allocate the space for H(R) and S(R).
     // If k point is used here, allocate HlocR after atom_arrange.
     ra.for_2d(this->pv, PARAM.globalv.gamma_only_local, orb_.cutoffs());
-
-    if (!PARAM.globalv.gamma_only_local)
-    {
-        // need to first calculae lgd.
-        // using GridT.init.
-        this->GridT.cal_nnrg(&this->pv, orb_.cutoffs());
-    }
-
+    
     ModuleBase::timer::tick("ESolver_KS_LCAO", "set_matrix_grid");
     return;
 }

source/module_hamilt_lcao/hamilt_lcaodft/CMakeLists.txt

@@ -27,7 +27,6 @@ if(ENABLE_LCAO)
         spar_hsr.cpp
         spar_st.cpp
         spar_u.cpp
-        LCAO_nnr.cpp
 		LCAO_set_fs.cpp
 		LCAO_set_st.cpp
 		LCAO_nl_mu.cpp