Merge pull request #958 from YuLiu98/develop

Qianruipku · web-flow · commit 7df0daf96940 · 2022-05-29T20:09:11.000+08:00
fix : revert and to or in the last commit
diff --git a/source/module_base/global_file.cpp b/source/module_base/global_file.cpp
@@ -84,7 +84,7 @@ void ModuleBase::Global_File::make_dir_out(
 	MPI_Barrier(MPI_COMM_WORLD);
 #endif
 
-    if(calculation == "md" && calculation == "sto-md")
+    if(calculation == "md" || calculation == "sto-md")
     {
         int make_dir_stru = 0;
         std::string command1 =  "test -d " + GlobalV::global_stru_dir + " || mkdir " + GlobalV::global_stru_dir;

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void ModuleBase::Global_File::make_dir_out(`
`84`	`84`	`MPI_Barrier(MPI_COMM_WORLD);`
`85`	`85`	`#endif`
`86`	`86`
`87`		`- if(calculation == "md" && calculation == "sto-md")`
	`87`	`+ if(calculation == "md" \|\| calculation == "sto-md")`
`88`	`88`	`{`
`89`	`89`	`int make_dir_stru = 0;`
`90`	`90`	`std::string command1 = "test -d " + GlobalV::global_stru_dir + " \|\| mkdir " + GlobalV::global_stru_dir;`