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

Combined USER-FEP related updates #1302

Merged
merged 29 commits into from Jan 31, 2019

Conversation

akohlmey
Copy link
Member

@akohlmey akohlmey commented Jan 24, 2019

Purpose

Combine pull requests related to adding "soft" class2 styles to USER-FEP and consolidating/updating the documentation of all "soft" pair styles in a consistent way in a single file.

closes #1300
closes #1293
closes #1289
closes #1269

this also removes references in the entire documentation of pre-installed packages.

Author(s)

Evangelos Voyiatzis
Agilio Padua, ENS de Lyon
Axel Kohlmeyer (ICTP)

Backward Compatibility

For pair styles buck/mdf and lennard/mdf the extract-able parameters have been renamed to be consistent with other similar potentials (aparm/bparm/cparm was renamed to a/b/c)

evoyiatzis and others added 20 commits January 9, 2019 09:24
the source code for the three soft core class2 potentials
Addition of the six files for the class 2 potentials in the end of Install.sh
There are several potentials that contain the method extract() but they are not included in the "fix adapt" and "fix adapt/fep"
A small update of the list is attempted here. The same potentials might be added to the documentation of fix_adapt if it is useful.
…o combined-user-fep-soft-updates

Resolved Conflicts:
	doc/src/compute_fep.txt
	doc/src/fix_adapt_fep.txt
evoyiatzis
evoyiatzis previously approved these changes Jan 24, 2019
Copy link
Collaborator

@agiliopadua agiliopadua left a comment

Choose a reason for hiding this comment

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

Thank you. I was fixing the links too.
I've added the new lj/class2/soft entries to Commands_pair.txt and to pair_style.txt
Just pushed a commit.

@akohlmey
Copy link
Member Author

Thank you. I was fixing the links too.
I've added the new lj/class2/soft entries to Commands_pair.txt and to pair_style.txt
Just pushed a commit.

can't merge anything from that PR anymore, since i had to make some changes to correct spelling and improve consistency. but i've updated the lists of pair styles. fixing the links was done with a single "sed" command, so no big deal there. it looked worse in the jenkins report, than it actually was. So please check, if this is still missing something. thanks.

@agiliopadua
Copy link
Collaborator

Looks good, thanks!

@agiliopadua
Copy link
Collaborator

I've improved the evaluation of the approximation in the tail corrections to energy and virial. Could you add the change below?

diff --git a/doc/src/pair_fep_soft.txt b/doc/src/pair_fep_soft.txt
index 864aebded..06781d07f 100644
--- a/doc/src/pair_fep_soft.txt
+++ b/doc/src/pair_fep_soft.txt
@@ -319,13 +319,14 @@ interaction.

NOTE: The analytical form of the tail corrections for energy and pressure used
in the {lj/cut/soft} potentials are approximate, being identical to that of the
-corresponding non-soft potentials scaled by a factor lambda^n. For real-space
-cutoffs greater than 2.5 sigma and alpha_LJ = 0.5, the error affecting the tail
-correction is below 0.2% when lambda = 0 (worse case). This error disappears as
-lambda approaches 1. Note that this is the error affecting the long-range tail
-(itself a correction to the interaction energy) which includes other
-approximations, namely that the system is homogenous (local density equal the
-average density) beyond the cutoff.
+corresponding non-soft potentials scaled by a factor lambda^n. The errors due to
+this approximation should be negligible. For example, for a cutoff of 2.5 sigma
+this approximation leads to maximum relative errors in tail corrections of the
+order of 1e-4 for energy and virial (alpha_LJ = 0.5, n = 2). The error vanishes
+when lambda approaches 0 or 1. Note that these are the errors affecting the
+long-range tail (itself a correction to the interaction energy) which includes
+other approximations, namely that the system is homogenous (local density equal
+the average density) beyond the cutoff.

The {morse/soft} pair style does not support the "pair_modify"_pair_modify.html
tail option for adding long-range tail corrections to energy and pressure.

@akohlmey
Copy link
Member Author

I've improved the evaluation of the approximation in the tail corrections to energy and virial. Could you add the change below?

the diff/patch here seems to be truncated. would you mind, to submit the change as pull request to
the branch combined-user-fep-soft-updates in my LAMMPS fork at https://github.com/akohlmey/lammps/ ?

or e-mail me a complete (and gzipped) patch?

thanks,
axel.

agiliopadua and others added 2 commits January 25, 2019 15:04
…o combined-user-fep-soft-updates

Resolved Conflicts:
	doc/src/Commands_pair.txt
	doc/src/pair_fep_soft.txt
	doc/src/pair_style.txt
	doc/src/pairs.txt
doc/src/pair_fep_soft.txt Outdated Show resolved Hide resolved
src/USER-FEP/pair_lj_class2_soft.h Outdated Show resolved Hide resolved
@akohlmey akohlmey merged commit 7606529 into lammps:master Jan 31, 2019
@akohlmey akohlmey deleted the combined-user-fep-soft-updates branch February 1, 2019 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request] "soft" version of lj/class2 pair potentials
4 participants