Skip to content

Commit

Permalink
Merge pull request #77 from openforcefield/update-water-vdw
Browse files Browse the repository at this point in the history
Use vdWHandler 0.4 in water models and scripts
  • Loading branch information
j-wags authored Aug 9, 2023
2 parents 19d29a8 + 654b985 commit 99ce25c
Show file tree
Hide file tree
Showing 17 changed files with 601 additions and 17 deletions.
2 changes: 1 addition & 1 deletion devtools/conda-envs/canary_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies:
- python
- pip
- pytest
- openff-toolkit
- openff-toolkit >=0.14.3
- openmmforcefields
2 changes: 1 addition & 1 deletion devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- python
- pip
- openff-toolkit
- openff-toolkit >=0.14.3
- pytest
- pytest-cov
- pandas
Expand Down
139 changes: 139 additions & 0 deletions openforcefields/offxml/opc-1.0.2.offxml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion openforcefields/offxml/opc.offxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<SMIRNOFF version="0.3" aromaticity_model="OEAroModel_MDL">
<vdW version="0.3" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" method="cutoff">
<vdW version="0.4" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" periodic_method="cutoff" nonperiodic_method="no-cutoff">
<Atom smirks="[#1]-[#8X2H2+0:1]-[#1]" epsilon="0.212800813 * kilocalorie_per_mole ** 1" id="n-opc-O" rmin_half="1.777167268 * angstrom ** 1"></Atom>
<Atom smirks="[#1:1]-[#8X2H2+0]-[#1]" epsilon="0.0 * kilocalorie_per_mole ** 1" id="n-opc-H" rmin_half="1.0 * angstrom ** 1"></Atom>
<Atom smirks="[#3X0+1:1]" epsilon="0.00216058 * kilocalorie_per_mole ** 1" id="n-ionslm-126-opc-Li+" rmin_half="1.242 * angstrom ** 1"></Atom>
Expand Down
136 changes: 136 additions & 0 deletions openforcefields/offxml/opc3-1.0.1.offxml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion openforcefields/offxml/opc3.offxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<SMIRNOFF version="0.3" aromaticity_model="OEAroModel_MDL">
<vdW version="0.3" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" method="cutoff">
<vdW version="0.4" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" periodic_method="cutoff" nonperiodic_method="no-cutoff">
<Atom smirks="[#1]-[#8X2H2+0:1]-[#1]" epsilon="0.163406 * kilocalorie_per_mole ** 1" id="n-opc3-O" rmin_half="1.781499 * angstrom ** 1"></Atom>
<Atom smirks="[#1:1]-[#8X2H2+0]-[#1]" epsilon="0.0 * kilocalorie_per_mole ** 1" id="n-opc3-H" rmin_half="1.0 * angstrom ** 1"></Atom>
<Atom smirks="[#3X0+1:1]" epsilon="0.0032565 * kilocalorie_per_mole ** 1" id="n-ionslm-126-opc3-Li+" rmin_half="1.27 * angstrom ** 1"></Atom>
Expand Down
34 changes: 34 additions & 0 deletions openforcefields/offxml/tip3p-1.0.1.offxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<SMIRNOFF version="0.3" aromaticity_model="OEAroModel_MDL">
<vdW version="0.4" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" periodic_method="cutoff" nonperiodic_method="no-cutoff">
<Atom smirks="[#1]-[#8X2H2+0:1]-[#1]" epsilon="0.1521 * kilocalorie_per_mole ** 1" id="n-tip3p-O" sigma="3.1507 * angstrom ** 1"></Atom>
<Atom smirks="[#1:1]-[#8X2H2+0]-[#1]" epsilon="0.0 * kilocalorie_per_mole ** 1" id="n-tip3p-H" sigma="1.0 * nanometer ** 1"></Atom>
<Atom smirks="[#3X0+1:1]" epsilon="0.0279896 * kilocalorie_per_mole ** 1" rmin_half="1.025 * angstrom ** 1"></Atom>
<Atom smirks="[#11X0+1:1]" epsilon="0.0874393 * kilocalorie_per_mole ** 1" rmin_half="1.369 * angstrom ** 1"></Atom>
<Atom smirks="[#19X0+1:1]" epsilon="0.1936829 * kilocalorie_per_mole ** 1" rmin_half="1.705 * angstrom ** 1"></Atom>
<Atom smirks="[#37X0+1:1]" epsilon="0.3278219 * kilocalorie_per_mole ** 1" rmin_half="1.813 * angstrom ** 1"></Atom>
<Atom smirks="[#55X0+1:1]" epsilon="0.4065394 * kilocalorie_per_mole ** 1" rmin_half="1.976 * angstrom ** 1"></Atom>
<Atom smirks="[#9X0-1:1]" epsilon="0.003364 * kilocalorie_per_mole ** 1" rmin_half="2.303 * angstrom ** 1"></Atom>
<Atom smirks="[#17X0-1:1]" epsilon="0.035591 * kilocalorie_per_mole ** 1" rmin_half="2.513 * angstrom ** 1"></Atom>
<Atom smirks="[#35X0-1:1]" epsilon="0.0586554 * kilocalorie_per_mole ** 1" rmin_half="2.608 * angstrom ** 1"></Atom>
<Atom smirks="[#53X0-1:1]" epsilon="0.0536816 * kilocalorie_per_mole ** 1" rmin_half="2.86 * angstrom ** 1"></Atom>
</vdW>
<LibraryCharges version="0.3">
<LibraryCharge smirks="[#1]-[#8X2H2+0:1]-[#1]" charge1="-0.834 * elementary_charge ** 1" id="q-tip3p-O"></LibraryCharge>
<LibraryCharge smirks="[#1:1]-[#8X2H2+0]-[#1]" charge1="0.417 * elementary_charge ** 1" id="q-tip3p-H"></LibraryCharge>
<LibraryCharge smirks="[#3X0+1:1]" charge1="1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#11X0+1:1]" charge1="1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#19X0+1:1]" charge1="1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#37X0+1:1]" charge1="1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#55X0+1:1]" charge1="1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#9X0-1:1]" charge1="-1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#17X0-1:1]" charge1="-1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#35X0-1:1]" charge1="-1 * elementary_charge ** 1"></LibraryCharge>
<LibraryCharge smirks="[#53X0-1:1]" charge1="-1 * elementary_charge ** 1"></LibraryCharge>
</LibraryCharges>
<Electrostatics version="0.4" scale12="0.0" scale13="0.0" scale14="0.8333333333" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="0.0 * angstrom ** 1" periodic_potential="Ewald3D-ConductingBoundary" nonperiodic_potential="Coulomb" exception_potential="Coulomb"></Electrostatics>
<Constraints version="0.3">
<Constraint smirks="[#1:1]-[#8X2H2+0:2]-[#1]" id="c-tip3p-H-O" distance="0.9572 * angstrom ** 1"></Constraint>
<Constraint smirks="[#1:1]-[#8X2H2+0]-[#1:2]" id="c-tip3p-H-O-H" distance="1.5139006545247014 * angstrom ** 1"></Constraint>
</Constraints>
</SMIRNOFF>
2 changes: 1 addition & 1 deletion openforcefields/offxml/tip3p.offxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<SMIRNOFF version="0.3" aromaticity_model="OEAroModel_MDL">
<vdW version="0.3" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" method="cutoff">
<vdW version="0.4" potential="Lennard-Jones-12-6" combining_rules="Lorentz-Berthelot" scale12="0.0" scale13="0.0" scale14="0.5" scale15="1.0" cutoff="9.0 * angstrom ** 1" switch_width="1.0 * angstrom ** 1" periodic_method="cutoff" nonperiodic_method="no-cutoff">
<Atom smirks="[#1]-[#8X2H2+0:1]-[#1]" epsilon="0.1521 * kilocalorie_per_mole ** 1" id="n-tip3p-O" sigma="3.1507 * angstrom ** 1"></Atom>
<Atom smirks="[#1:1]-[#8X2H2+0]-[#1]" epsilon="0.0 * kilocalorie_per_mole ** 1" id="n-tip3p-H" sigma="1.0 * nanometer ** 1"></Atom>
<Atom smirks="[#3X0+1:1]" epsilon="0.0279896 * kilocalorie_per_mole ** 1" rmin_half="1.025 * angstrom ** 1"></Atom>
Expand Down
Loading

0 comments on commit 99ce25c

Please sign in to comment.