lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2009-11-18 15:25:14 +00:00
parent 787ae9235a
commit bc7b7e955d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fix_wall.cpp
View File

@ -67,12 +67,18 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
vflag = 1;
vel = atof(arg[iarg+1]);
iarg += 2;
} else if (strcmp(arg[iarg],"wiggle") == 0) {
} else if (strcmp(arg[iarg],"wiggle/sin") == 0) {
if (iarg+3 > narg) error->all("Illegal fix wall command");
aflag = 1;
amplitude = atof(arg[iarg+1]);
period = atof(arg[iarg+2]);
iarg += 3;
} else if (strcmp(arg[iarg],"wiggle/cos") == 0) {
if (iarg+3 > narg) error->all("Illegal fix wall command");
aflag = 2;
amplitude = atof(arg[iarg+1]);
period = atof(arg[iarg+2]);
iarg += 3;
} else error->all("Illegal fix wall command");
// error check
@ -91,6 +97,9 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
if ((wflag[ZLO] || wflag[ZHI]) && domain->xperiodic)
error->all("Cannot use fix wall in periodic zimension");
if ((wflag[ZLO] || wflag[ZHI]) && domain->dimension == 2)
error->all("Cannot use fix wall zlo/zhi for a 2d simulation");
// setup oscillations
if (aflag) {
@ -168,9 +177,12 @@ void FixWall::post_force(int vflag)
if (vflag) {
if (m/2 == 0) coord = coord0[m] + delta*vel;
else coord = coord0[m] - delta*vel;
} else if (aflag) {
} else if (aflag == 1) {
if (m/2 == 0) coord = coord0[m] + amplitude*sin(omega*delta);
else coord = coord0[m] - amplitude*sin(omega*delta);
} else if (aflag == 2) {
if (m/2 == 0) coord = coord0[m] + amplitude * (1.0 - cos(omega*delta));
else coord = coord0[m] - amplitude * (1.0 - cos(omega*delta));
} else coord = coord0[m];
wall_particle(m,coord);