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
30d4a4bb
Unverified
Commit
30d4a4bb
authored
Jan 19, 2018
by
peastman
Committed by
GitHub
Jan 19, 2018
Browse files
Merge pull request #1974 from agrossfield/master
allow the user to skip parameter condensing CHARMM parameters
parents
7164109e
80528f3b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
wrappers/python/simtk/openmm/app/charmmpsffile.py
wrappers/python/simtk/openmm/app/charmmpsffile.py
+1
-1
No files found.
wrappers/python/simtk/openmm/app/charmmpsffile.py
View file @
30d4a4bb
...
@@ -740,7 +740,7 @@ class CharmmPsfFile(object):
...
@@ -740,7 +740,7 @@ class CharmmPsfFile(object):
raise a ValueError
raise a ValueError
"""
"""
# Load the parameter set
# Load the parameter set
self
.
loadParameters
(
params
.
condense
()
)
self
.
loadParameters
(
params
)
hasbox
=
self
.
topology
.
getUnitCellDimensions
()
is
not
None
hasbox
=
self
.
topology
.
getUnitCellDimensions
()
is
not
None
# Check GB input parameters
# Check GB input parameters
if
implicitSolvent
is
not
None
and
gbsaModel
not
in
(
'ACE'
,
None
):
if
implicitSolvent
is
not
None
and
gbsaModel
not
in
(
'ACE'
,
None
):
...
...
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