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

Feat/trappe ua combrule #452

Merged
merged 3 commits into from
Aug 11, 2021

Conversation

justinGilmer
Copy link
Contributor

PR Summary:

After the addition of the combining_rule forcefield XML metadata, we
added the geometric mixing rule to oplsaa.xml, but neglected to
include that information for our TraPPE xml.

This includes the Lorentz-Berethlot mixing rule as metadata as well as
bumping the version number for the trappe-ua.xml file.

A minor spelling mistake was also fixed.

PR Checklist


  • Includes appropriate unit test(s)
  • Appropriate docstring(s) are added/updated
  • Code is (approximately) PEP8 compliant
  • Issue(s) raised/addressed?

After the addition of the `combining_rule` forcefield XML metadata, we
added the `geometric` mixing rule to oplsaa.xml, but neglected to
include that information for our TraPPE xml.

This includes the `Lorentz-Berethlot` mixing rule as metadata as well as
bumping the version number for the trappe-ua.xml file.

A minor spelling mistake was also fixed.
@daico007
Copy link
Member

daico007 commented Aug 9, 2021

Do we also want a CHANGLOG.md for Trappe XML

@codecov
Copy link

codecov bot commented Aug 9, 2021

Codecov Report

Merging #452 (0aa062b) into master (78dbdaf) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #452   +/-   ##
=======================================
  Coverage   73.88%   73.88%           
=======================================
  Files          17       17           
  Lines        1842     1842           
=======================================
  Hits         1361     1361           
  Misses        481      481           

@justinGilmer
Copy link
Contributor Author

We absolutely do, I forgot about that. Will add that in a second.

Copy link
Contributor

@CalCraven CalCraven left a comment

Choose a reason for hiding this comment

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

Once the CHANGELOG.md is added, should be ready to go.

@daico007 daico007 merged commit 8c0ad75 into mosdef-hub:master Aug 11, 2021
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.

3 participants