Merge branch 'after_scf' of github.com:YuLiu98/abacus-develop into af…

…ter_scf
YuLiu98 · Aug 7, 2024 · d35f5c6 · d35f5c6
2 parents 60dc572 + 02d453a
commit d35f5c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/module_elecstate/elecstate_print.cpp b/source/module_elecstate/elecstate_print.cpp
@@ -307,8 +307,9 @@ void ElecState::print_etot(const bool converged,
 
     GlobalV::ofs_running << "\n Density error is " << scf_thr << std::endl;
 
-    if (GlobalV::BASIS_TYPE == "pw")
+    if (GlobalV::BASIS_TYPE == "pw") {
         ModuleBase::GlobalFunc::OUT(GlobalV::ofs_running, "Error Threshold", pw_diag_thr); // xiaohui add 2013-09-02
+}
 
     std::vector<std::string> titles;
     std::vector<double> energies_Ry;

diff --git a/source/module_esolver/esolver_ks.h b/source/module_esolver/esolver_ks.h
@@ -11,7 +11,7 @@
 #include "module_psi/psi.h"
 
 #include <fstream>
-#include <string.h>
+#include <cstring>
 namespace ModuleESolver
 {