Unverified Commit 5f68f300 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

replace Fix::box_change_xxx variables with Fix::box_change bitmask and add check to Domain::init() 

This allows a more specific tracking of whether multiple fixes are
modifying the same box parameter and error out in that case.
parent f0935fea

src/RIGID/fix_rigid_nh.cpp

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ FixRigidNH::FixRigidNH(LAMMPS *lmp, int narg, char **arg) : 
       p_period[0] != p_period[2]))

    error->all(FLERR,"Invalid fix rigid npt/nph command pressure settings");



  if (p_flag[0]) box_change |= BOX_CHANGE_X;

  if (p_flag[1]) box_change |= BOX_CHANGE_Y;

  if (p_flag[2]) box_change |= BOX_CHANGE_Z;



  if ((tstat_flag && t_period <= 0.0) ||

      (p_flag[0] && p_period[0] <= 0.0) ||

      (p_flag[1] && p_period[1] <= 0.0) ||

src/RIGID/fix_rigid_nh_small.cpp

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,10 @@ FixRigidNHSmall::FixRigidNHSmall(LAMMPS *lmp, int narg, char **arg) : 
       p_period[0] != p_period[2]))

    error->all(FLERR,"Invalid fix rigid/small npt/nph command pressure settings");



  if (p_flag[0]) box_change |= BOX_CHANGE_X;

  if (p_flag[1]) box_change |= BOX_CHANGE_Y;

  if (p_flag[2]) box_change |= BOX_CHANGE_Z;



  if ((tstat_flag && t_period <= 0.0) ||

      (p_flag[0] && p_period[0] <= 0.0) ||

      (p_flag[1] && p_period[1] <= 0.0) ||

src/RIGID/fix_rigid_nph.cpp

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ FixRigidNPH::FixRigidNPH(LAMMPS *lmp, int narg, char **arg) : 


  scalar_flag = 1;

  restart_global = 1;

  box_change_size = 1;

  extscalar = 1;



  // error checks

src/RIGID/fix_rigid_nph_small.cpp

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ FixRigidNPHSmall::FixRigidNPHSmall(LAMMPS *lmp, int narg, char **arg) : 


  scalar_flag = 1;

  restart_global = 1;

  box_change_size = 1;

  extscalar = 1;



  // error checks

src/RIGID/fix_rigid_npt.cpp

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ FixRigidNPT::FixRigidNPT(LAMMPS *lmp, int narg, char **arg) : 


  scalar_flag = 1;

  restart_global = 1;

  box_change_size = 1;

  extscalar = 1;



  // error checks

CRA Git | Maintained and supported by SUSTech CRA and CCSE