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.

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

test: update abacus input parameters for test_make_fp.py #836

Merged
merged 15 commits into from
Aug 4, 2022
Merged

test: update abacus input parameters for test_make_fp.py #836

merged 15 commits into from
Aug 4, 2022

Conversation

hongriTianqi
Copy link
Contributor

update abacus input parameters for test_make_fp.py

@codecov-commenter
Copy link

codecov-commenter commented Aug 2, 2022

Codecov Report

Merging #836 (06370e3) into devel (b8b2ce8) will increase coverage by 0.16%.
The diff coverage is 64.89%.

@@            Coverage Diff             @@
##            devel     #836      +/-   ##
==========================================
+ Coverage   35.93%   36.10%   +0.16%     
==========================================
  Files          97       97              
  Lines       17094    17161      +67     
==========================================
+ Hits         6143     6196      +53     
- Misses      10951    10965      +14     
Impacted Files Coverage Δ
dpgen/generator/run.py 63.30% <38.63%> (-0.40%) ⬇️
dpgen/generator/lib/abacus_scf.py 86.06% <88.00%> (+5.51%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us.

@wanghan-iapcm wanghan-iapcm requested a review from Liu-RX August 3, 2022 00:38
@wanghan-iapcm
Copy link
Contributor

Could you please explain the change of the keywords? It that due the update of abacus version? Which version are the new keywords compatible to?

@hongriTianqi
Copy link
Contributor Author

Could you please explain the change of the keywords? It that due the update of abacus version? Which version are the new keywords compatible to?

OK. Yes, this is due to the update of abacus version. The new keywords are compatible to abacus versions higher than 2.2, since there was important change of input keywords from 2.2 version of abacus. The changed keywords include:
dr2 => scf_thr
niter => scf_nmax
smearing => smearing_method
sigma => smearing_sigma
force => cal_force
stress => cal_stress
out_descriptor => deepks_out_labels
lmax_descriptor => deepks_descriptor_lmax
model_file => deepks_model

assert(fp_params["deepks_scf"] == 0 or fp_params["deepks_scf"] == 1), "'deepks_scf' should be either 0 or 1."
ret += "deepks_scf %d\n" % fp_params["deepks_scf"]
elif key == "deepks_model":
ret += "deepks_model %s\n" % fp_params["deepks_model"]
elif key != "k_points": # "k_points key is used to generate KPT file."
Copy link
Collaborator

Choose a reason for hiding this comment

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

This elif is necessary. The k_points is also specified in fp_params, but can not be written in INPUT file.

Copy link
Contributor Author

@hongriTianqi hongriTianqi Aug 3, 2022

Choose a reason for hiding this comment

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

This k_points tag has been upgraded to the same level as 'user_fp_param'. Users may also use 'fp_kpt_file' to read KPT file now.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Got that. I have no other questions.

@hongriTianqi hongriTianqi requested a review from Liu-RX August 3, 2022 02:33
@hongriTianqi
Copy link
Contributor Author

The current test error seems not caused by this PR, since I installed the devel branch without this PR locally and got the same error.

@njzjz
Copy link
Member

njzjz commented Aug 3, 2022

The error is fixed by #839.

@hongriTianqi
Copy link
Contributor Author

The error is fixed by #839.

Thanks!

@wanghan-iapcm wanghan-iapcm merged commit db6c8f1 into deepmodeling:devel Aug 4, 2022
@hongriTianqi hongriTianqi deleted the abacus_make_fp branch August 4, 2022 04:33
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.

5 participants