Merge 'release-4-6' into master

[alexxy/gromacs.git] / src / programs / grompp / grompp.c

diff --git a/src/programs/grompp/grompp.c b/src/programs/grompp/grompp.c
index 7f4ea24b76ea283a69be08f48103b5e9bb869fd6..1be9796a3c2c24f5a4b4f895cbccd0a877b12e2e 100644 (file)
--- a/src/programs/grompp/grompp.c
+++ b/src/programs/grompp/grompp.c
@@ -1414,6 +1414,14 @@ int main (int argc, char *argv[])
 
   bNeedVel = EI_STATE_VELOCITY(ir->eI);
   bGenVel  = (bNeedVel && opts->bGenVel);
+  if (bGenVel && ir->bContinuation)
+  {
+      sprintf(warn_buf,
+              "Generating velocities is inconsistent with attempting "
+              "to continue a previous run. Choose only one of "
+              "gen-vel = yes and continuation = yes.");
+      warning_error(wi, warn_buf);
+  }
 
   snew(plist,F_NRE);
   init_plist(plist);