jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2013-07-23 16:13:59 +00:00
parent dda38788f7
commit 7b96d1c2f8
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/RIGID/fix_rigid_nph.cpp
View File

@ -34,7 +34,7 @@ FixRigidNPH::FixRigidNPH(LAMMPS *lmp, int narg, char **arg) :
scalar_flag = 1;
restart_global = 1;
box_change = 1;
box_change_size = 1;
extscalar = 1;
// error checks

2
src/RIGID/fix_rigid_npt.cpp
View File

@ -34,7 +34,7 @@ FixRigidNPT::FixRigidNPT(LAMMPS *lmp, int narg, char **arg) :
scalar_flag = 1;
restart_global = 1;
box_change = 1;
box_change_size = 1;
extscalar = 1;
// error checks

2
src/SHOCK/fix_append_atoms.cpp
View File

@ -39,7 +39,7 @@ FixAppendAtoms::FixAppendAtoms(LAMMPS *lmp, int narg, char **arg) :
{
force_reneighbor = 1;
next_reneighbor = -1;
box_change = 1;
box_change_size = 1;
time_depend = 1;
if (narg < 4) error->all(FLERR,"Illegal fix append/atoms command");

2
src/SHOCK/fix_msst.cpp
View File

@ -45,7 +45,7 @@ FixMSST::FixMSST(LAMMPS *lmp, int narg, char **arg) :
if (narg < 4) error->all(FLERR,"Illegal fix msst command");
restart_global = 1;
box_change = 1;
box_change_size = 1;
time_integrate = 1;
scalar_flag = 1;
vector_flag = 1;

1
src/SHOCK/fix_wall_piston.cpp
View File

@ -37,7 +37,6 @@ FixWallPiston::FixWallPiston(LAMMPS *lmp, int narg, char **arg) :
{
force_reneighbor = 1;
next_reneighbor = -1;
box_change = 1;
if (narg < 4) error->all(FLERR,"Illegal fix wall/piston command");

21
src/SRD/fix_srd.cpp
View File

@ -355,18 +355,17 @@ void FixSRD::init()
change_size = change_shape = deformflag = 0;
if (domain->nonperiodic == 2) change_size = 1;
for (int i = 0; i < modify->nfix; i++)
if (modify->fix[i]->box_change) {
if (modify->fix[i]->box_change_size) change_size = 1;
if (modify->fix[i]->box_change_shape) change_shape = 1;
if (strcmp(modify->fix[i]->style,"deform") == 0) {
deformflag = 1;
FixDeform *deform = (FixDeform *) modify->fix[i];
if (deform->box_change_shape && deform->remapflag != V_REMAP)
error->all(FLERR,"Using fix srd with inconsistent "
"fix deform remap option");
}
for (int i = 0; i < modify->nfix; i++) {
if (modify->fix[i]->box_change_size) change_size = 1;
if (modify->fix[i]->box_change_shape) change_shape = 1;
if (strcmp(modify->fix[i]->style,"deform") == 0) {
deformflag = 1;
FixDeform *deform = (FixDeform *) modify->fix[i];
if (deform->box_change_shape && deform->remapflag != V_REMAP)
error->all(FLERR,"Using fix srd with inconsistent "
"fix deform remap option");
}
}
if (deformflag && tstat == 0 && me == 0)
error->warning(FLERR,