combine relax_new with relax_old

19hello · 19hello · commit f3ff4e5bd9d9 · 2025-06-18T09:05:44.000Z
diff --git a/source/Makefile.Objects b/source/Makefile.Objects
@@ -445,8 +445,8 @@ OBJS_RELAXATION=bfgs_basic.o\
     lattice_change_basic.o\
     lattice_change_cg.o\
     lattice_change_methods.o\
-    relax_old.o\
-    relax.o\
+    relax_nsync.o\
+    relax_sync.o\
     bfgs.o\
     lbfgs.o\
     matrix_methods.o\
diff --git a/source/module_relax/CMakeLists.txt b/source/module_relax/CMakeLists.txt
@@ -4,12 +4,12 @@ add_library(
 
     relax_driver.cpp
 
-    relax.cpp
+    relax_sync.cpp
     line_search.cpp
     
     bfgs.cpp
     lbfgs.cpp
-    relax_old.cpp
+    relax_nsync.cpp
     bfgs_basic.cpp
     ions_move_basic.cpp
     ions_move_bfgs.cpp
diff --git a/source/module_relax/relax_driver.h b/source/module_relax/relax_driver.h
@@ -4,8 +4,8 @@
 #include "module_cell/unitcell.h"
 #include "module_esolver/esolver.h"
 #include "module_esolver/esolver_ks.h"
-#include "relax.h"
-#include "relax_old.h"
+#include "relax_sync.h"
+#include "relax_nsync.h"
 #include "bfgs.h"
 class Relax_Driver
 {
diff --git a/source/module_relax/relax_nsync.cpp b/source/module_relax/relax_nsync.cpp
@@ -1,4 +1,4 @@
-#include "relax_old.h"
+#include "relax_nsync.h"
 
 #include "module_base/global_function.h"
 #include "module_base/global_variable.h"
diff --git a/source/module_relax/relax_nsync.h b/source/module_relax/relax_nsync.h
diff --git a/source/module_relax/relax_sync.cpp b/source/module_relax/relax_sync.cpp
@@ -1,4 +1,4 @@
-#include "relax.h"
+#include "relax_sync.h"
 
 
 #include "module_base/matrix3.h"
diff --git a/source/module_relax/relax_sync.h b/source/module_relax/relax_sync.h
diff --git a/source/module_relax/test/CMakeLists.txt b/source/module_relax/test/CMakeLists.txt
@@ -14,7 +14,7 @@ AddTest(
 
 AddTest(
   TARGET relax_new_relax
-  SOURCES  relax_test.cpp ../relax.cpp ../line_search.cpp ../../module_base/tool_quit.cpp ../../module_base/global_variable.cpp ../../module_base/global_file.cpp ../../module_base/memory.cpp ../../module_base/timer.cpp
+  SOURCES  relax_test.cpp ../relax_sync.cpp ../line_search.cpp ../../module_base/tool_quit.cpp ../../module_base/global_variable.cpp ../../module_base/global_file.cpp ../../module_base/memory.cpp ../../module_base/timer.cpp
     ../../module_base/matrix3.cpp ../../module_base/intarray.cpp ../../module_base/tool_title.cpp
     ../../module_base/global_function.cpp ../../module_base/complexmatrix.cpp ../../module_base/matrix.cpp
     ../../module_base/complexarray.cpp ../../module_base/tool_quit.cpp ../../module_base/realarray.cpp
diff --git a/source/module_relax/test/relax_test.cpp b/source/module_relax/test/relax_test.cpp
@@ -3,7 +3,7 @@
 #define private public
 #include "module_parameter/parameter.h"
 #undef private
-#include "../relax.h"
+#include "../relax_sync.h"
 #include "module_cell/unitcell.h"
 #include "relax_test.h"
 #include <fstream>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "relax_old.h"`
	`1`	`+#include "relax_nsync.h"`
`2`	`2`
`3`	`3`	`#include "module_base/global_function.h"`
`4`	`4`	`#include "module_base/global_variable.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "relax.h"`
	`1`	`+#include "relax_sync.h"`
`2`	`2`
`3`	`3`
`4`	`4`	`#include "module_base/matrix3.h"`