Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
7762d9fc
"olla/vscode:/vscode.git/clone" did not exist on "d147fc2cbee7aee6ecaced81da2eb69d9e473f03"
Commit
7762d9fc
authored
Feb 20, 2016
by
Rafal P. Wiewiora
Browse files
no multiple generators
parent
004db14a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
10 deletions
+30
-10
wrappers/python/simtk/openmm/app/forcefield.py
wrappers/python/simtk/openmm/app/forcefield.py
+30
-10
No files found.
wrappers/python/simtk/openmm/app/forcefield.py
View file @
7762d9fc
...
...
@@ -1194,8 +1194,12 @@ class HarmonicBondGenerator(object):
@
staticmethod
def
parseElement
(
element
,
ff
):
existing
=
[
f
for
f
in
ff
.
_forces
if
isinstance
(
f
,
HarmonicBondGenerator
)]
if
len
(
existing
)
==
0
:
generator
=
HarmonicBondGenerator
(
ff
)
ff
.
registerGenerator
(
generator
)
else
:
generator
=
existing
[
0
]
for
bond
in
element
.
findall
(
'Bond'
):
generator
.
registerBond
(
bond
.
attrib
)
...
...
@@ -1247,8 +1251,12 @@ class HarmonicAngleGenerator(object):
@
staticmethod
def
parseElement
(
element
,
ff
):
existing
=
[
f
for
f
in
ff
.
_forces
if
isinstance
(
f
,
HarmonicAngleGenerator
)]
if
len
(
existing
)
==
0
:
generator
=
HarmonicAngleGenerator
(
ff
)
ff
.
registerGenerator
(
generator
)
else
:
generator
=
existing
[
0
]
for
angle
in
element
.
findall
(
'Angle'
):
generator
.
registerAngle
(
angle
.
attrib
)
...
...
@@ -1331,8 +1339,12 @@ class PeriodicTorsionGenerator(object):
@
staticmethod
def
parseElement
(
element
,
ff
):
existing
=
[
f
for
f
in
ff
.
_forces
if
isinstance
(
f
,
PeriodicTorsionGenerator
)]
if
len
(
existing
)
==
0
:
generator
=
PeriodicTorsionGenerator
(
ff
)
ff
.
registerGenerator
(
generator
)
else
:
generator
=
existing
[
0
]
for
torsion
in
element
.
findall
(
'Proper'
):
generator
.
registerProperTorsion
(
torsion
.
attrib
)
for
torsion
in
element
.
findall
(
'Improper'
):
...
...
@@ -1430,8 +1442,12 @@ class RBTorsionGenerator(object):
@
staticmethod
def
parseElement
(
element
,
ff
):
existing
=
[
f
for
f
in
ff
.
_forces
if
isinstance
(
f
,
RBTorsionGenerator
)]
if
len
(
existing
)
==
0
:
generator
=
RBTorsionGenerator
(
ff
)
ff
.
registerGenerator
(
generator
)
else
:
generator
=
existing
[
0
]
for
torsion
in
element
.
findall
(
'Proper'
):
types
=
ff
.
_findAtomTypes
(
torsion
.
attrib
,
4
)
if
None
not
in
types
:
...
...
@@ -1534,8 +1550,12 @@ class CMAPTorsionGenerator(object):
@
staticmethod
def
parseElement
(
element
,
ff
):
existing
=
[
f
for
f
in
ff
.
_forces
if
isinstance
(
f
,
CMAPTorsionGenerator
)]
if
len
(
existing
)
==
0
:
generator
=
CMAPTorsionGenerator
(
ff
)
ff
.
registerGenerator
(
generator
)
else
:
generator
=
existing
[
0
]
for
map
in
element
.
findall
(
'Map'
):
values
=
[
float
(
x
)
for
x
in
map
.
text
.
split
()]
size
=
sqrt
(
len
(
values
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment