Commit 9349f496 authored by Robert McGibbon's avatar Robert McGibbon
Browse files

one more change to the numpy code. last commit was bad

parent 196d01be
...@@ -274,15 +274,15 @@ def stripUnits(args): ...@@ -274,15 +274,15 @@ def stripUnits(args):
""" """
newArgList=[] newArgList=[]
for arg in args: for arg in args:
if unit.is_quantity(arg): if 'numpy' in sys.modules and isinstance(arg, numpy.ndarray):
arg = arg.tolist()
elif unit.is_quantity(arg):
# JDC: Ugly workaround for OpenMM using 'bar' for fundamental pressure unit. # JDC: Ugly workaround for OpenMM using 'bar' for fundamental pressure unit.
if arg.unit.is_compatible(unit.bar): if arg.unit.is_compatible(unit.bar):
arg = arg / unit.bar arg = arg / unit.bar
else: else:
arg=arg.value_in_unit_system(unit.md_unit_system) arg=arg.value_in_unit_system(unit.md_unit_system)
# JDC: End workaround. # JDC: End workaround.
if 'numpy' in sys.modules and isinstance(arg, numpy.ndarray):
arg = arg.tolist()
elif isinstance(arg, dict): elif isinstance(arg, dict):
newKeys = stripUnits(arg.keys()) newKeys = stripUnits(arg.keys())
newValues = stripUnits(arg.values()) newValues = stripUnits(arg.values())
......
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