Merge remote-tracking branch 'upstream/master'

2017-07-11 20:04:26 +02:00
parent 3477015296 4339379948
commit 5055b2ab7d
1298 changed files with 107419 additions and 25532 deletions
--- a/src/min.cpp
+++ b/src/min.cpp
@ -173,8 +173,8 @@ void Min::init()

  if (neigh_every != 1 || neigh_delay != 0 || neigh_dist_check != 1) {
    if (comm->me == 0)
-      error->warning(FLERR,
-                     "Resetting reneighboring criteria during minimization");
+      error->warning(FLERR, "Using 'neigh_modify every 1 delay 0 check"
+                     " yes' setting during minimization");
  }

  neighbor->every = 1;