Merge branch 'patch-2' of https://github.com/amilumas/lammps into collected-small-changes

src/USER-MISC/temper_npt.cpp

@@ -101,9 +101,9 @@ void TemperNPT::command(int narg, char **arg)
   // change the volume. This currently only applies to fix npt and
   // fix rigid/npt variants
 
-  if ((strncmp(modify->fix[whichfix]->style,"npt",3) == 0)
-      || (strncmp(modify->fix[whichfix]->style,"rigid/npt",9) == 0))
-    error->universe_all(FLERR,"Tempering temperature fix is not supported");
+  if ((strncmp(modify->fix[whichfix]->style,"npt",3) != 0)
+      && (strncmp(modify->fix[whichfix]->style,"rigid/npt",9) != 0))
+    error->universe_all(FLERR,"Tempering temperature and pressure fix is not supported");
 
   // setup for long tempering run