Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #1662 to devel #1669

Merged
merged 1 commit into from
Nov 23, 2024
Merged

merge #1662 to devel #1669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions dpgen/generator/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,9 @@
return found[0]


def revise_lmp_input_model(lmp_lines, task_model_list, trj_freq, deepmd_version="1"):
def revise_lmp_input_model(
lmp_lines, task_model_list, trj_freq, deepmd_version="1", use_ele_temp=0
):
idx = find_only_one_key(lmp_lines, ["pair_style", "deepmd"])
graph_list = " ".join(task_model_list)
if Version(deepmd_version) < Version("1"):
Expand All @@ -1014,13 +1016,22 @@
trj_freq,
)
else:
lmp_lines[idx] = (
"pair_style deepmd %s out_freq %d out_file model_devi.out\n"
% (
graph_list,
trj_freq,
if use_ele_temp == 0:
lmp_lines[idx] = (
"pair_style deepmd %s out_freq %d out_file model_devi.out\n"
% (
graph_list,
trj_freq,
)
)
elif use_ele_temp == 1:
lmp_lines[idx] = (
"pair_style deepmd %s out_freq %d out_file model_devi.out fparam ${ELE_TEMP}\n"
% (
graph_list,
trj_freq,

Check warning on line 1032 in dpgen/generator/run.py

View check run for this annotation

Codecov / codecov/patch

dpgen/generator/run.py#L1032 

Added line #L1032 was not covered by tests
)
)
)
return lmp_lines


Expand Down Expand Up @@ -1289,6 +1300,8 @@
sys_idx = expand_idx(cur_job["sys_idx"])
if len(sys_idx) != len(list(set(sys_idx))):
raise RuntimeError("system index should be uniq")

use_ele_temp = jdata.get("use_ele_temp", 0)
mass_map = jdata["mass_map"]
use_plm = jdata.get("model_devi_plumed", False)
use_plm_path = jdata.get("model_devi_plumed_path", False)
Expand Down Expand Up @@ -1394,6 +1407,7 @@
task_model_list,
trj_freq,
deepmd_version=deepmd_version,
use_ele_temp=use_ele_temp,
)
else:
if len(lmp_lines[template_pair_deepmd_idx].split()) != (
Expand All @@ -1414,6 +1428,7 @@
task_model_list,
trj_freq,
deepmd_version=deepmd_version,
use_ele_temp=use_ele_temp,
)
# use revise_lmp_input_model to raise error message if "part_style" or "deepmd" not found
else:
Expand All @@ -1422,6 +1437,7 @@
task_model_list,
trj_freq,
deepmd_version=deepmd_version,
use_ele_temp=use_ele_temp,
)

lmp_lines = revise_lmp_input_dump(
Expand Down
Loading