Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

2014-11-24 10:31:37 -05:00
parent d915225077 af1adefecf
commit 643e531b11
9 changed files with 341 additions and 4 deletions
--- a/src/atom.cpp
+++ b/src/atom.cpp
@ -519,7 +519,7 @@ void Atom::modify_params(int narg, char **arg)
      else if (strcmp(arg[iarg+1],"no") == 0) tag_enable = 2;
      else error->all(FLERR,"Illegal atom_modify command");
      iarg += 2;
-    } if (strcmp(arg[iarg],"map") == 0) {
+    } else if (strcmp(arg[iarg],"map") == 0) {
      if (iarg+2 > narg) error->all(FLERR,"Illegal atom_modify command");
      if (domain->box_exist)
        error->all(FLERR,