Skip to content

add option to ignore convergence check for vasp/contcar#355

Merged
wanghan-iapcm merged 34 commits intodeepmodeling:develfrom
panxiang126:devel
Sep 7, 2022
Merged

add option to ignore convergence check for vasp/contcar#355
wanghan-iapcm merged 34 commits intodeepmodeling:develfrom
panxiang126:devel

Conversation

@panxiang126
Copy link
Contributor

it is the realization for discussion #350.

Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
@panxiang126
Copy link
Contributor Author

Similar changes have been made to pwmat/movement and fhi_aims/output , but I don't have test files, please double-check.

Signed-off-by: Pan Xiang <panxiang126@gmail.com>
@wanghan-iapcm wanghan-iapcm requested a review from njzjz September 3, 2022 13:50
@wanghan-iapcm
Copy link
Contributor

Please solve the issues in the UTs.

Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Sep 3, 2022

Codecov Report

Merging #355 (308c13c) into devel (652bb22) will decrease coverage by 0.02%.
The diff coverage is 81.08%.

@@            Coverage Diff             @@
##            devel     #355      +/-   ##
==========================================
- Coverage   82.18%   82.16%   -0.03%     
==========================================
  Files          66       66              
  Lines        5798     5819      +21     
==========================================
+ Hits         4765     4781      +16     
- Misses       1033     1038       +5     
Impacted Files Coverage Δ
dpdata/pwmat/movement.py 76.76% <63.63%> (-1.02%) ⬇️
dpdata/fhi_aims/output.py 90.37% <72.72%> (-1.04%) ⬇️
dpdata/plugins/fhi_aims.py 89.47% <100.00%> (ø)
dpdata/plugins/pwmat.py 86.48% <100.00%> (ø)
dpdata/plugins/vasp.py 100.00% <100.00%> (ø)
dpdata/system.py 84.70% <100.00%> (ø)
dpdata/vasp/outcar.py 96.18% <100.00%> (+0.21%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Comment on lines +8 to +9
if "converge" not in kwargs.keys():
kwargs["converge"] = True
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should use dict.setdefault or be directly written into the method definition line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
@Format.register("fhi_aims/output")
class FhiMDFormat(Format):
def from_labeled_system(self, file_name, md=True, begin = 0, step = 1, **kwargs):
def from_labeled_system(self, file_name, md=True, begin = 0, step = 1, converge=True, **kwargs):
Copy link
Contributor

@wanghan-iapcm wanghan-iapcm Sep 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest using req_converge or convergence_check in the interface, because it is more self-explanary.
The same suggest for the pwmat and vasp interfaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All are denoted by convergence_check.

Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
Signed-off-by: Pan Xiang <panxiang126@gmail.com>
@panxiang126 panxiang126 requested review from njzjz and wanghan-iapcm and removed request for njzjz and wanghan-iapcm September 6, 2022 04:58
@wanghan-iapcm wanghan-iapcm merged commit 58c1753 into deepmodeling:devel Sep 7, 2022
@panxiang126 panxiang126 deleted the devel branch September 7, 2022 04:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants