-
Notifications
You must be signed in to change notification settings - Fork 67
Add particle mesh Ewald calc via PME library from A. Simmonett #581
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ure output so more important messages happen at the end.
…y of determining '=' position because apparently expr index does not work the same way on Macs (grr)
… trajectory/ensembles only (also it currently doesnt compile).
…gy. Only print timing components that were actually used.
…te it out in config.h
…ere ever necessary but they definitely should not be now.
…work so errors are not silently ignored.
…lizer wrappers; cpptraj doesnt use them and the LAPACK that comes with Amber only has double precision.
…ibcpptraj objects
…ts correct numbers (counts as 1 execution and 1 comparison). Consolidate program error into a function.
…for which binaries are unnecessary).
…; do not ignore errors in this test.
Going to squash this merge since the original libpme header was a beast. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main point of this PR was to add a PME calculation to cpptraj, but it turned into a few more things. Addition of PME was accomplished via using a PME library developed by Andrew Simmonnett (@andysim) for the reciprocal part of the energy. Since the PME library required C++11 support (also FFTW3), the configure script needed to check for this. In adding the C++11 check I decided to rewrite the entire configure script to make it a bit more efficient, particularly in how it checks for and links in external libraries. It should also be smarter about determining whether C++/Fortran linking is required. I also bundled in ARPACK since it's a key library for CPPTRAJ but can be hard to obtain and compile compared to other libraries. And since I was adding a new energy term anyway, I decided to add a kinetic energy calculation as well and make some improvements to and clean up the existing
energy
action.Summary:
energy
:The
cut
,dsumtol
,ewcoeff
, andskinnb
keywords mean the same as they do foretype ewald
.etype ewald
as well).energy
:ketype vv
If no
ketype
is specified default is to useketype vv
when force/velocity info present, otherwise just use velocity info.The
energy
action is now smarter about when only certain terms are desired. Also, if only one term is to be calculated the redundant 'Total' term is not calculated.Rewrite of configure. C++11 support now enabled by default if available. If
-amberlib
is specified, FFTW3 support will be enabled if it is available in AMBERHOME. The output from configure has been cleaned up and a better summary of chosen options is written at the end. New command line options:The
box
action now correctly sets the internal box type.In calculation expressions, allow operator characters inside data set aspects (e.g.
ENE[VDW1-4]
).ARPACK now bundled with CPPTRAJ.