Merge pull request #158 from jingan-181/develop

Fix the problem that HR and SR sparse matrices are not output when out_mat_hs2=1.

Author: dyzheng

source/module_esolver/esolver_ks_lcao.cpp

@@ -906,7 +906,7 @@ namespace ModuleESolver
             GlobalC::dmft.out_to_dmft(this->LOWF, *this->UHM.LM);
         }
 
-        if (Pdiag_Double::out_mat_hsR)
+        if (hsolver::HSolverLCAO::out_mat_hsR)
         {
             this->output_HS_R(); //LiuXh add 2019-07-15
         }

source/src_lcao/ELEC_evolve.cpp

@@ -7,6 +7,9 @@
 #include "../src_parallel/parallel_reduce.h"
 #include "../module_base/timer.h"
 
+//-----HSolver ElecState Hamilt--------
+#include "module_hsolver/hsolver_lcao.h"
+
 ELEC_evolve::ELEC_evolve() {};
 ELEC_evolve::~ELEC_evolve() {};
 
@@ -129,7 +132,7 @@ void ELEC_evolve::evolve_psi(
     } // end k
 
     // LiuXh modify 2019-07-15*/
-    if (!Pdiag_Double::out_mat_hsR)
+    if (!hsolver::HSolverLCAO::out_mat_hsR)
     {
         uhm.GK.destroy_pvpR();
     }