Merge pull request #1262 from rmcgibbo/docstring2

AMD docstring fix

Merge pull request #1262 from rmcgibbo/docstring2
AMD docstring fix
be0387b6 · peastman · d8299046 · 4bbfd3d1 · be0387b6
Commit be0387b6 authored Nov 13, 2015 by peastman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

wrappers/python/simtk/openmm/amd.py wrappers/python/simtk/openmm/amd.py +4 -2

No files found.
--- a/wrappers/python/simtk/openmm/amd.py
+++ b/wrappers/python/simtk/openmm/amd.py
@@ -160,7 +160,8 @@ class AMDForceGroupIntegrator(CustomIntegrator):

        Returns
        -------
-        the value of the effective potential
+        energy
+            the value of the effective potential
        """
        alphaGroup = self.getAlphaGroup()
        EGroup = self.getEGroup()
@@ -267,7 +268,8 @@ class DualAMDIntegrator(CustomIntegrator):

        Returns
        -------
-        the value of the effective potential
+        energy
+            the value of the effective potential
        """
        alphaTotal = self.getAlphaTotal()
        ETotal = self.getETotal()