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

basic idea for templates to create permutations of possible donor / acceptor H sites #103

Open
wants to merge 97 commits into
base: tetr
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
f769d19
donor/acceptor structure for Hs in templates
godenymarta May 31, 2023
1403aed
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] May 31, 2023
15694db
fixed tests
florianjoerg Jun 1, 2023
2b30f91
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Jun 1, 2023
09f62e1
Merge pull request #102 from florianjoerg/customnonbondedforce
florianjoerg Jun 1, 2023
6512ecd
Merge branch 'main' into tetr_marta
godenymarta Jun 5, 2023
c74d439
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Jun 5, 2023
4cb0b87
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jun 19, 2023
9a6e5c7
Merge pull request #105 from florianjoerg/pre-commit-ci-update-config
florianjoerg Jun 23, 2023
59cd591
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jun 26, 2023
ab09709
Merge pull request #106 from florianjoerg/pre-commit-ci-update-config
florianjoerg Jun 27, 2023
89a81f6
deleted unnecessary lines
godenymarta Jun 29, 2023
a21ae35
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Jun 29, 2023
f828374
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jul 3, 2023
14369b0
Merge pull request #108 from florianjoerg/pre-commit-ci-update-config
florianjoerg Jul 3, 2023
fefa5fd
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Aug 7, 2023
36d468e
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Aug 7, 2023
ffad461
Merge pull request #109 from florianjoerg/pre-commit-ci-update-config
florianjoerg Aug 13, 2023
3818b38
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Aug 14, 2023
b924931
started tests for toh2 system
godenymarta Aug 18, 2023
f378ba0
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Aug 18, 2023
fba6337
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Aug 18, 2023
b44cbc1
Merge pull request #110 from florianjoerg/pre-commit-ci-update-config
florianjoerg Aug 21, 2023
941fe35
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Aug 21, 2023
521092f
Merge pull request #111 from florianjoerg/pre-commit-ci-update-config
florianjoerg Aug 23, 2023
f59a5ec
started on idea for acceptor and donor modes for each residue, settin…
godenymarta Aug 23, 2023
5191426
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Aug 23, 2023
8933e95
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Aug 23, 2023
db83717
started reusing stuff from the h2oac branch for donor/acceptor modes
godenymarta Aug 25, 2023
bb07d58
tests
godenymarta Aug 25, 2023
4dce219
resolved merge conflict
godenymarta Aug 25, 2023
63119f9
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Aug 25, 2023
1be893b
updates mainly to update.py to include donor/acceptor modes
godenymarta Aug 31, 2023
8e719dc
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Aug 31, 2023
33c4a78
small corrections
godenymarta Sep 1, 2023
96632c1
⬆ [pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Sep 4, 2023
8406799
mda reader for openmm rst files
florianjoerg Sep 5, 2023
2051908
Merge pull request #113 from florianjoerg/mda_xml_reader
florianjoerg Sep 5, 2023
a7cf442
Merge branch 'main' into pre-commit-ci-update-config
florianjoerg Sep 5, 2023
9722fb8
Merge pull request #112 from florianjoerg/pre-commit-ci-update-config
florianjoerg Sep 5, 2023
b2f7302
Update helpers.py
florianjoerg Sep 5, 2023
7e91172
Update helpers.py
florianjoerg Sep 5, 2023
44b21c6
Update test_helpers.py
florianjoerg Sep 5, 2023
831f6ff
Update README.md
florianjoerg Sep 6, 2023
f103ccb
first idea to save and load residues and setup donor and acceptor par…
godenymarta Sep 7, 2023
4159b60
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Sep 7, 2023
6a5d566
Merge branch 'main' of github.com:florianjoerg/protex into tetr_marta
godenymarta Sep 22, 2023
fea3977
new force field files for toh2
godenymarta Sep 26, 2023
693b500
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Sep 26, 2023
132cca8
started debugging code with test_h2o.py
godenymarta Sep 26, 2023
536731b
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Sep 26, 2023
1d8f268
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Sep 26, 2023
cdf9207
debugging
godenymarta Oct 2, 2023
94f0c47
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Oct 2, 2023
f2db5d7
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Oct 2, 2023
5b0ff4f
debugging (ordered names, H_D parms)
godenymarta Oct 11, 2023
5c6c878
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Oct 11, 2023
af67d68
debugging
godenymarta Oct 17, 2023
df859f6
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Oct 17, 2023
64ac762
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Oct 17, 2023
b884d80
CustomNonBondedForce works only with fast
godenymarta Oct 18, 2023
37d22e5
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Oct 18, 2023
e9833ea
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Oct 18, 2023
f06af2e
changes to donor/acceptor modes, still need to think about when to up…
godenymarta Oct 20, 2023
0a67828
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Oct 20, 2023
f51f539
debugging
godenymarta Nov 2, 2023
e8f12cb
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Nov 2, 2023
3a31bc0
saving and loading whole protex system
godenymarta Nov 14, 2023
0d7398d
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Nov 14, 2023
0ff1a0c
fixed parameters not being saved and loaded
godenymarta Nov 16, 2023
2863015
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Nov 16, 2023
75fc214
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Nov 16, 2023
2e07bc5
use HBonds per default for water systems, cleanup of notes and todos
godenymarta Nov 17, 2023
9cd458d
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Nov 17, 2023
acad25e
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Nov 17, 2023
8cc8877
removed unused pair_13_list
godenymarta Nov 20, 2023
8bfea5a
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Nov 20, 2023
5717ef6
fixing bug with DrudeForceThole (not present in water)
godenymarta Dec 4, 2023
40b2739
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Dec 4, 2023
7a6540e
larger changes to check is force is present for each residue before t…
godenymarta Dec 6, 2023
2434950
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Dec 6, 2023
ca4819a
fixing drude vs drudethole problem
godenymarta Dec 13, 2023
0a18009
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Dec 13, 2023
09ac68c
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2023
c274ddd
fixing detect_forces
godenymarta Dec 14, 2023
8ca220e
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Dec 14, 2023
ebad8fd
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Dec 14, 2023
e221950
changed extract_templates to account for residues being bound togethe…
godenymarta Jan 4, 2024
e511d35
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Jan 4, 2024
156ecfd
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Jan 4, 2024
87a9c4b
fixing CustomNonbondedForce, now updating NBF and CNBF for each H and D
godenymarta Jan 5, 2024
90f616d
Merge branch 'tetr_marta' of github.com:florianjoerg/protex into tetr…
godenymarta Jan 5, 2024
1bae514
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Jan 5, 2024
f610e78
trying to find a way to update nonbonded exclusions for H/D, needs a …
godenymarta Jan 12, 2024
d96852d
🛠️ [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Jan 12, 2024
8736194
working on customnonbondedforce
godenymarta Aug 21, 2024
ea5259e
Merge branch 'tetr_marta' of github.com:cbc-univie/protex into tetr_m…
godenymarta Aug 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ repos:
- id: trailing-whitespace
types: [python]
- repo: https://github.com/asottile/pyupgrade
rev: v3.4.0
rev: v3.10.1
hooks:
- id: pyupgrade
args:
- --py39-plus
- --keep-runtime-typing
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.270
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.287
hooks:
- id: ruff
verbose: True
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ protex
[![codecov](https://codecov.io/gh/florianjoerg/protex/branch/main/graph/badge.svg?token=ddqu0BzewU)](https://codecov.io/gh/florianjoerg/protex)
[![Github release](https://badgen.net/github/release/florianjoerg/protex)](https://github.com/florianjoerg/protex/releases/)
[![GitHub license](https://img.shields.io/github/license/florianjoerg/protex?color=green)](https://github.com/florianjoerg/protex/blob/main/LICENSE)
[![GH Pages](https://github.com/florianj77/protex/actions/workflows/gh_pages.yml/badge.svg)](https://github.com/florianj77/protex/actions/workflows/gh_pages.yml)
[![GH Pages](https://github.com/florianjoerg/protex/actions/workflows/gh_pages.yml/badge.svg)](https://github.com/florianjoerg/protex/actions/workflows/gh_pages.yml)
[![docs stable](https://img.shields.io/badge/docs-stable-5077AB.svg?logo=read%20the%20docs)](https://florianjoerg.github.io/protex/)
[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/protex.svg)](https://anaconda.org/conda-forge/protex)

Expand Down
5,578 changes: 5,578 additions & 0 deletions protex/forcefield/toh2/h2o.crd

Large diffs are not rendered by default.

10,321 changes: 10,321 additions & 0 deletions protex/forcefield/toh2/h2o.psf

Large diffs are not rendered by default.

11,156 changes: 11,156 additions & 0 deletions protex/forcefield/toh2/h2o_npt_7.rst

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions protex/forcefield/toh2/toppar/cl_d.str
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
* Toppar stream file generated by FFParam cgenfftoconverter
* For use with Drude force field
*

ioformat extended

read rtf card append
* Topologies generated by FFParam cgenfftoconverter
* For use with Drude force field
*
44

AUTO ANGL DIHE DRUD

! Marta from protein master 2013

RESI CLA -1.000 ! Chloride Ion
GROUP
ATOM CLA CLAD -1.000 ALPHA -3.969 TYPE DPPOL
PATCHING FIRST NONE LAST NONE

END

read param card append
* Parameters generated by FFParam cgenfftoconverter
* For use with Drude force field
*

! Parameters are picked from same text file containing all currently available parameters.
! Similar approach like cgenff is applied, but it is not checked for its robustness.

BONDS

ANGLES

DIHEDRALS

IMPROPERS


END
RETURN
62 changes: 62 additions & 0 deletions protex/forcefield/toh2/toppar/h2o_d.str
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
* Toppar stream file generated by FFParam cgenfftoconverter
* For use with Drude force field
*

ioformat extended

read rtf card append
* Topologies generated by FFParam cgenfftoconverter
* For use with Drude force field
*
44

AUTO ANGL DIHE DRUD

! Converts cgenff atomtype to drude atom types.
! Charges are picked from cgenff stream file
! Alpha and Thole values are picked from first match of atom type in a text file containing all currently available residues.
! If it cannot find the values -1.0 and -1.3 values are assigned to the atom type.

RESI H2O 0.000 !
GROUP
ATOM OH2 OPOL13 -0.669 ALPHA -1.44 THOLE 1.3
ATOM H1 HPOL 0.3345
ATOM H2 HPOL 0.3345
ATOM H3 DUMH 0.000
ATOM H4 DUMH 0.000
BOND OH2 H1
BOND OH2 H2
BOND OH2 H3
BOND OH2 H4
!ANGLE H1 OH2 H2
!ANGLE H1 OH2 H3
!ANGLE H3 OH2 H2
!ANGLE H1 OH2 H4
!ANGLE H2 OH2 H4
!ANGLE H3 OH2 H4


!PATCH FIRST NONE LAST NONE

END


read param card append
* Parameters generated by FFParam cgenfftoconverter
* For use with Drude force field
*

! Parameters are picked from same text file containing all currently available parameters.
! Similar approach like cgenff is applied, but it is not checked for its robustness.

BONDS

ANGLES

DIHEDRALS

IMPROPERS


END
RETURN
62 changes: 62 additions & 0 deletions protex/forcefield/toh2/toppar/h3o_d.str
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
* Toppar stream file generated by FFParam cgenfftoconverter
* For use with Drude force field
*

ioformat extended

read rtf card append
* Topologies generated by FFParam cgenfftoconverter
* For use with Drude force field
*
44

AUTO ANGL DIHE DRUD

! Converts cgenff atomtype to drude atom types.
! Charges are picked from cgenff stream file
! Alpha and Thole values are picked from first match of atom type in a text file containing all currently available residues.
! If it cannot find the values -1.0 and -1.3 values are assigned to the atom type.

!TETRA-WATER by Max
RESI H3O 1.0000
GROUP
ATOM OH2 OPOL13 -0.4871 ALPHA -1.09 TYPE DPPOL THOLE 1.3
ATOM H1 HPOL 0.4957
ATOM H2 HPOL 0.4957
ATOM H3 HPOL 0.4957
ATOM H4 DUMH 0.0000
BOND OH2 H1
BOND OH2 H2
BOND OH2 H3
BOND OH2 H4
!ANGLE H1 OH2 H2
!ANGLE H1 OH2 H3
!ANGLE H3 OH2 H2
!ANGLE H1 OH2 H4
!ANGLE H2 OH2 H4
!ANGLE H3 OH2 H4

!PATCH FIRST NONE LAST NONE

END


read param card append
* Parameters generated by FFParam cgenfftoconverter
* For use with Drude force field
*

! Parameters are picked from same text file containing all currently available parameters.
! Similar approach like cgenff is applied, but it is not checked for its robustness.

BONDS

ANGLES

DIHEDRALS

IMPROPERS


END
RETURN
42 changes: 42 additions & 0 deletions protex/forcefield/toh2/toppar/na_d.str
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
* Toppar stream file generated by FFParam cgenfftoconverter
* For use with Drude force field
*

ioformat extended

read rtf card append
* Topologies generated by FFParam cgenfftoconverter
* For use with Drude force field
*
44

AUTO ANGL DIHE DRUD

! Marta from protein master 2013

RESI SOD 1.000 ! Sodium Ion
GROUP
ATOM SOD SODD 1.000 ALPHA -0.157
PATCHING FIRST NONE LAST NONE

END

read param card append
* Parameters generated by FFParam cgenfftoconverter
* For use with Drude force field
*

! Parameters are picked from same text file containing all currently available parameters.
! Similar approach like cgenff is applied, but it is not checked for its robustness.

BONDS

ANGLES

DIHEDRALS

IMPROPERS


END
RETURN
59 changes: 59 additions & 0 deletions protex/forcefield/toh2/toppar/oh_d.str
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
* Toppar stream file generated by FFParam cgenfftoconverter
* For use with Drude force field
*

ioformat extended

read rtf card append
* Topologies generated by FFParam cgenfftoconverter
* For use with Drude force field
*
44

AUTO ANGL DIHE DRUD

! Converts cgenff atomtype to drude atom types.
! Charges are picked from cgenff stream file
! Alpha and Thole values are picked from first match of atom type in a text file containing all currently available residues.
! If it cannot find the values -1.0 and -1.3 values are assigned to the atom type.

RESI OH -1.0000
GROUP
ATOM OH2 OPOL13 -1.320 ALPHA -1.0000 TYPE DPPOL THOLE 1.3000 ! ODW and HDW atom types from SWM4 water, Marta
ATOM H1 HPOL 0.320
ATOM H2 DUMH 0.000
ATOM H3 DUMH 0.000
ATOM H4 DUMH 0.000
BOND OH2 H1
BOND OH2 H2
BOND OH2 H3
BOND OH2 H4
!ANGLE H1 OH2 H2
!ANGLE H1 OH2 H3
!ANGLE H3 OH2 H2
!ANGLE H1 OH2 H4
!ANGLE H2 OH2 H4
!ANGLE H3 OH2 H4

END


read param card append
* Parameters generated by FFParam cgenfftoconverter
* For use with Drude force field
*

! Parameters are picked from same text file containing all currently available parameters.
! Similar approach like cgenff is applied, but it is not checked for its robustness.

BONDS

ANGLES

DIHEDRALS

IMPROPERS


END
RETURN
Loading