Commit dba4efba authored by sjplimp's avatar sjplimp
Browse files 

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1830 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 345d0d3d

src/fix_enforce2d.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int FixEnforce2D::setmask() 
void FixEnforce2D::init()

{

  if (domain->dimension == 3)

    error->all("Should not use fix enforce2d with 3d simulation");

    error->all("Cannot use fix enforce2d with 3d simulation");

}



/* ---------------------------------------------------------------------- */

src/fix_nph.cpp

+6 −6
Original line number Diff line number Diff line
@@ -139,21 +139,21 @@ FixNPH::FixNPH(LAMMPS *lmp, int narg, char **arg) : 
  // error checks



  if (press_couple == XY && (p_flag[0] == 0 || p_flag[1] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix nph command pressure settings");

  if (press_couple == YZ && (p_flag[1] == 0 || p_flag[2] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix nph command pressure settings");

  if (press_couple == XZ && (p_flag[0] == 0 || p_flag[2] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix nph command pressure settings");



  if (press_couple == XY && 

      (p_start[0] != p_start[1] || p_stop[0] != p_stop[1]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix nph command pressure settings");

  if (press_couple == YZ && 

      (p_start[1] != p_start[2] || p_stop[1] != p_stop[2]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix nph command pressure settings");

  if (press_couple == XZ && 

      (p_start[0] != p_start[2] || p_stop[0] != p_stop[2]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix nph command pressure settings");



  if (p_flag[0] && domain->xperiodic == 0)

    error->all("Cannot use fix nph on a non-periodic dimension");

src/fix_npt.cpp

+6 −6
Original line number Diff line number Diff line
@@ -145,21 +145,21 @@ FixNPT::FixNPT(LAMMPS *lmp, int narg, char **arg) : 
  // error checks



  if (press_couple == XY && (p_flag[0] == 0 || p_flag[1] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix npt command pressure settings");

  if (press_couple == YZ && (p_flag[1] == 0 || p_flag[2] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix npt command pressure settings");

  if (press_couple == XZ && (p_flag[0] == 0 || p_flag[2] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix npt command pressure settings");



  if (press_couple == XY && 

      (p_start[0] != p_start[1] || p_stop[0] != p_stop[1]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix npt command pressure settings");

  if (press_couple == YZ && 

      (p_start[1] != p_start[2] || p_stop[1] != p_stop[2]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix npt command pressure settings");

  if (press_couple == XZ && 

      (p_start[0] != p_start[2] || p_stop[0] != p_stop[2]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix npt command pressure settings");

    

  if (p_flag[0] && domain->xperiodic == 0)

    error->all("Cannot use fix npt on a non-periodic dimension");

src/fix_press_berendsen.cpp

+6 −6
Original line number Diff line number Diff line
@@ -135,21 +135,21 @@ FixPressBerendsen::FixPressBerendsen(LAMMPS *lmp, int narg, char **arg) : 
  // error checks



  if (press_couple == XY && (p_flag[0] == 0 || p_flag[1] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix press/berendsen command pressure settings");

  if (press_couple == YZ && (p_flag[1] == 0 || p_flag[2] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix press/berendsen command pressure settings");

  if (press_couple == XZ && (p_flag[0] == 0 || p_flag[2] == 0))

    error->all("Invalid fix npt command");

    error->all("Invalid fix press/berendsen command pressure settings");



  if (press_couple == XY && 

      (p_start[0] != p_start[1] || p_stop[0] != p_stop[1]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix press/berendsen command pressure settings");

  if (press_couple == YZ && 

      (p_start[1] != p_start[2] || p_stop[1] != p_stop[2]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix press/berendsen command pressure settings");

  if (press_couple == XZ && 

      (p_start[0] != p_start[2] || p_stop[0] != p_stop[2]))

    error->all("Invalid fix npt command");

    error->all("Invalid fix press/berendsen command pressure settings");



  if (p_flag[0] && domain->xperiodic == 0)

    error->all("Cannot use fix press/berendsen on a non-periodic dimension");

CRA Git | Maintained and supported by SUSTech CRA and CCSE