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

This commit is contained in:
Axel Kohlmeyer
2018-02-09 14:44:11 +01:00

View File

@ -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