Skip to content

Commit 1e02f02

Browse files
committed
cp2k/aimd_output bug fix 3
1 parent f951ca0 commit 1e02f02

File tree

4 files changed

+1092
-4
lines changed

4 files changed

+1092
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ build
1919
dist
2020
dpdata.egg-info
2121
_version.py
22+
!tests/cp2k/aimd/cp2k.log

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ xyz_multi_systems.to_deepmd_raw('./my_deepmd_data/')
102102
| siesta| output | False | True | LabeledSystem | 'siesta/output'|
103103
| siesta| aimd_output | True | True | LabeledSystem | 'siesta/aimd_output' |
104104
| cp2k | output | False | True | LabeledSystem | 'cp2k/output' |
105-
| cp2k | a dir (contains *pos*.xyz and *.log file) | False | True | LabeledSystem | 'cp2k/aimd_output' |
105+
| cp2k | dir | False | True | LabeledSystem | 'cp2k/aimd_output' |
106106
| QE | log | False | True | LabeledSystem | 'qe/pw/scf' |
107107
| QE | log | True | False | System | 'qe/cp/traj' |
108108
| QE | log | True | True | LabeledSystem | 'qe/cp/traj' |

dpdata/system.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ def __init__ (self,
817817
- ``gaussian/log``: gaussian logs
818818
- ``gaussian/md``: gaussian ab initio molecular dynamics
819819
- ``cp2k/output``: cp2k output file
820-
- ``cp2k/aimd_output``: cp2k output file
820+
- ``cp2k/aimd_output``: cp2k aimd output dir(contains *pos*.xyz and *.log file)
821821
822822
type_map : list of str
823823
Needed by formats deepmd/raw and deepmd/npy. Maps atom type to name. The atom with type `ii` is mapped to `type_map[ii]`.
@@ -907,8 +907,6 @@ def has_virial(self) :
907907

908908

909909
def from_cp2k_aimd_output(self, file_dir):
910-
print(1387,glob.glob("{}/*pos*.xyz".format(file_dir)))
911-
print(1387,glob.glob("{}/*.log".format(file_dir)))
912910
xyz_file=glob.glob("{}/*pos*.xyz".format(file_dir))[0]
913911
log_file=glob.glob("{}/*.log".format(file_dir))[0]
914912
for info_dict in Cp2kSystems(log_file, xyz_file):

0 commit comments

Comments
 (0)