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

add docstring to DescrptSeA #1017

Merged
merged 2 commits into from
Aug 23, 2021
Merged

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Aug 23, 2021

Contains other cleanups.

image

image

Contains other cleanups.
@codecov-commenter
Copy link

codecov-commenter commented Aug 23, 2021

Codecov Report

Merging #1017 (1d802f9) into devel (d42ca99) will decrease coverage by 10.73%.
The diff coverage is n/a.

❗ Current head 1d802f9 differs from pull request most recent head 2807df9. Consider uploading reports for the commit 2807df9 to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##            devel    #1017       +/-   ##
===========================================
- Coverage   75.02%   64.28%   -10.74%     
===========================================
  Files          86        5       -81     
  Lines        6923       14     -6909     
===========================================
- Hits         5194        9     -5185     
+ Misses       1729        5     -1724     
Impacted Files Coverage Δ
deepmd/loss/ener.py
deepmd/utils/convert.py
source/op/_prod_virial_se_a_grad.py
source/op/_soft_min_force_grad.py
deepmd/infer/__init__.py
source/op/_prod_force_se_r_grad.py
deepmd/calculator.py
deepmd/utils/compat.py
deepmd/descriptor/se_ar.py
deepmd/cluster/local.py
... and 63 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d42ca99...2807df9. Read the comment docs.

Comment on lines 42 to 47
s(r)=
\begin{cases}
\frac{1}{r}, & r<r_s \\
\frac{1}{r} \{ \frac{1}{2} \cos (\frac{\pi (r - r_s)}{ r_c - r_s} ) +\frac{1}{2} \}, & r_s \leq r<r_c \\
0, & r \geq r_c
\end{cases}
Copy link
Member

Choose a reason for hiding this comment

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

We are now using 5-th order polynomial as switcher. It is smooth upto 2nd order derivative. The cosine switcher is only smooth upto the first order derivative.

https://github.com/njzjz/deepmd-kit/blob/24b433b20e51fc45c7ae587104d00cf732b0e92a/source/lib/include/switcher.h#L77-L92

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, I don't know that.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated equation:
image

@amcadmus amcadmus merged commit 297ce70 into deepmodeling:devel Aug 23, 2021
@njzjz njzjz deleted the docstring_se_e2_a branch August 23, 2021 04:46
gzq942560379 pushed a commit to HPC-AI-Team/deepmd-kit that referenced this pull request Sep 2, 2021
* add docstring to `DescrptSeA`

Contains other cleanups.

* fix the equation of `s(r)`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants