Skip to content

GitLab

Commit 893385f1 authored by peastman's avatar peastman
Browse files

Merge branch 'master' of https://github.com/SimTk/openmm

parents f4dc3110 30d4a4bb
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
wrappers/python/simtk/openmm/app/charmmpsffile.py
View file @ 893385f1
...@@ -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):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment