Skip to content

Commit f97d891

Browse files
committed
Fix: read STRU in md restart
1 parent 47d8197 commit f97d891

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

source/module_io/read_input_item_system.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -646,10 +646,6 @@ void ReadInput::item_system()
646646
{
647647
para.input.read_file_dir = "OUT." + para.input.suffix;
648648
}
649-
else
650-
{
651-
para.input.read_file_dir = para.input.read_file_dir;
652-
}
653649
para.input.read_file_dir = to_dir(para.input.read_file_dir);
654650
};
655651
this->add_item(item);

source/module_io/read_set_globalv.cpp

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,22 @@ void ReadInput::set_globalv(Parameter& para)
2323
para.sys.global_matrix_dir = to_dir(para.sys.global_matrix_dir);
2424

2525
/// get the global readin directory
26-
// if (para.inp.read_file_dir == "auto")
27-
// {
28-
// para.sys.global_readin_dir = para.globalv.global_out_dir;
29-
// }
30-
// else
31-
// {
32-
// para.sys.global_readin_dir = para.inp.read_file_dir + '/';
33-
// }
3426
para.sys.global_readin_dir = para.inp.read_file_dir + '/';
3527
para.sys.global_readin_dir = to_dir(para.sys.global_readin_dir);
3628

3729
/// get the stru file for md restart case
3830
if (para.inp.calculation == "md" && para.mdp.md_restart)
3931
{
4032
int istep = current_md_step(para.sys.global_readin_dir);
41-
para.sys.global_in_stru = para.sys.global_stru_dir + "STRU_MD_" + std::to_string(istep);
4233

43-
// if (para.inp.read_file_dir == "auto")
44-
// {
45-
// para.sys.global_in_stru = para.sys.global_stru_dir + "STRU_MD_" + std::to_string(istep);
46-
// }
47-
// else
48-
// {
49-
// para.sys.global_in_stru = para.inp.read_file_dir + "STRU_MD_" + std::to_string(istep);
50-
// }
34+
if (para.inp.read_file_dir == to_dir("OUT." + para.input.suffix))
35+
{
36+
para.sys.global_in_stru = para.sys.global_stru_dir + "STRU_MD_" + std::to_string(istep);
37+
}
38+
else
39+
{
40+
para.sys.global_in_stru = para.inp.read_file_dir + "STRU_MD_" + std::to_string(istep);
41+
}
5142
}
5243
else
5344
{

0 commit comments

Comments
 (0)