Commit 6002411b authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'release-1.2.x'

parents 71410a3f 1f507da1
Pipeline #4496 passed with stages
in 23 minutes and 9 seconds
version 1.2.1
--------------
* FIXED issue #39 Time scale in Gromacs converter was incorrect
version 1.2.0 version 1.2.0
-------------- --------------
* ADDED issue #27 Better error handling when an error occurs when running an analysis from the GUI * ADDED issue #27 Better error handling when an error occurs when running an analysis from the GUI
......
...@@ -109,7 +109,7 @@ class GromacsConverter(Converter): ...@@ -109,7 +109,7 @@ class GromacsConverter(Converter):
self._universe.foldCoordinatesIntoBox() self._universe.foldCoordinatesIntoBox()
# The current time. # The current time.
t = times[0]*Units.fs t = times[0]*Units.ps
# Store a snapshot of the current configuration in the output trajectory. # Store a snapshot of the current configuration in the output trajectory.
self._snapshot(data={'time': t}) self._snapshot(data={'time': t})
......
...@@ -25,9 +25,9 @@ __repo__ = "https://code.ill.fr/scientific-software/mdanse/" ...@@ -25,9 +25,9 @@ __repo__ = "https://code.ill.fr/scientific-software/mdanse/"
__license__ = "GPL 3" __license__ = "GPL 3"
__version__ = "1.2.0" __version__ = "1.2.1"
__date__ = "18-09-2018" __date__ = "21-09-2018"
__commit__ = "undefined" __commit__ = "undefined"
......
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