From: Aleksei Iupinov <a.yupinov@gmail.com>
Date: Thu, 8 Feb 2018 10:47:06 +0000 (+0100)
Subject: Merge branch 'release-2018' into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=c3ab8222330d5f2bc47fa42cbf3e74965d8eed1b;p=alexxy%2Fgromacs.git

Merge branch 'release-2018' into master

Manually modified:
src/programs/mdrun/md.cpp (to uncomment done_ebin())

Change-Id: Ic3887c40668f69e69ee8da15d210721b8bd3e95f
---

c3ab8222330d5f2bc47fa42cbf3e74965d8eed1b
diff --cc src/programs/mdrun/md.cpp
index bda2386e9b,a4d07c9167..add6985075
--- a/src/programs/mdrun/md.cpp
+++ b/src/programs/mdrun/md.cpp
@@@ -1984,7 -1991,8 +1984,7 @@@ double gmx::do_md(FILE *fplog, t_commre
                         eprAVER, mdebin, fcd, groups, &(ir->opts), ir->awh);
          }
      }
- 
 -    // TODO Enable the next line when merging to master branch
 -    // done_ebin(mdebin->ebin);
++    done_ebin(mdebin->ebin);
      done_mdoutf(outf);
  
      if (bPMETune)