Merge branch 'esolver' of github.com:YuLiu98/abacus-develop into esolver

YuLiu98 · YuLiu98 · commit eb316038ee35 · 2024-10-11T18:27:52.000+08:00
diff --git a/source/module_io/output_log.cpp b/source/module_io/output_log.cpp
@@ -246,7 +246,8 @@ void print_force(std::ofstream& ofs_running,
     fmt << atom_label << force_x << force_y << force_z;
     table = fmt.str();
     ofs_running << table << std::endl;
-    if (PARAM.inp.test_force) std::cout << table << std::endl;
+    if (PARAM.inp.test_force) { std::cout << table << std::endl;
+}
 }
 void print_stress(const std::string& name, const ModuleBase::matrix& scs, const bool screen, const bool ry)
 {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,8 @@ void print_force(std::ofstream& ofs_running,`
`246`	`246`	`fmt << atom_label << force_x << force_y << force_z;`
`247`	`247`	`table = fmt.str();`
`248`	`248`	`ofs_running << table << std::endl;`
`249`		`- if (PARAM.inp.test_force) std::cout << table << std::endl;`
	`249`	`+ if (PARAM.inp.test_force) { std::cout << table << std::endl;`
	`250`	`+}`
`250`	`251`	`}`
`251`	`252`	`void print_stress(const std::string& name, const ModuleBase::matrix& scs, const bool screen, const bool ry)`
`252`	`253`	`{`