Fix: ut of 283_NO_restart (#1467)

deepmodeling · Nov 4, 2022 · 84324f4 · 84324f4
1 parent 05a11ea
commit 84324f4
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 2 deletions.
diff --git a/source/input_conv.cpp b/source/input_conv.cpp
@@ -324,7 +324,7 @@ void Input_Conv::Convert(void)
     //----------------------------------------------------------
     if (INPUT.restart_save)
     {
-        GlobalC::restart.folder = GlobalV::global_out_dir + "restart/";
+        GlobalC::restart.folder = GlobalV::global_readin_dir + "restart/";
         const std::string command0 = "test -d " + GlobalC::restart.folder + " || mkdir " + GlobalC::restart.folder;
         if (GlobalV::MY_RANK == 0)
             system(command0.c_str());
@@ -341,7 +341,7 @@ void Input_Conv::Convert(void)
     }
     if (INPUT.restart_load)
     {
-        GlobalC::restart.folder = GlobalV::global_out_dir + "restart/";
+        GlobalC::restart.folder = GlobalV::global_readin_dir + "restart/";
         if (INPUT.dft_functional == "hf" || INPUT.dft_functional == "pbe0" || INPUT.dft_functional == "hse"
             || INPUT.dft_functional == "opt_orb" || INPUT.dft_functional == "scan0")
         {

diff --git a/tests/integrate/283_NO_restart/INPUT b/tests/integrate/283_NO_restart/INPUT
@@ -30,4 +30,5 @@ orbital_dir		../../PP_ORB
 
 #restart_save		1
 restart_load		1
+read_file_dir   ./
 
diff --git a/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_0_0 b/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_0_0
diff --git a/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_1_0 b/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_1_0
diff --git a/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_2_0 b/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_2_0
diff --git a/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_3_0 b/tests/integrate/283_NO_restart/OUT.autotest/restart/charge_3_0
diff --git a/tests/integrate/283_NO_restart/restart/charge_0_0 b/tests/integrate/283_NO_restart/restart/charge_0_0
diff --git a/tests/integrate/283_NO_restart/restart/charge_1_0 b/tests/integrate/283_NO_restart/restart/charge_1_0
diff --git a/tests/integrate/283_NO_restart/restart/charge_2_0 b/tests/integrate/283_NO_restart/restart/charge_2_0
diff --git a/tests/integrate/283_NO_restart/restart/charge_3_0 b/tests/integrate/283_NO_restart/restart/charge_3_0