ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2010-08-19 16:01:08 +00:00
parent ad1adc6474
commit 5ff00cfd0f
15 changed files with 118 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/fix_addforce.cpp
View File

@ -72,6 +72,7 @@ FixAddForce::FixAddForce(LAMMPS *lmp, int narg, char **arg) :
// optional args
iregion = -1;
idregion = NULL;
estr = NULL;
int iarg = 6;
@ -79,7 +80,11 @@ FixAddForce::FixAddForce(LAMMPS *lmp, int narg, char **arg) :
if (strcmp(arg[iarg],"region") == 0) {
if (iarg+2 > narg) error->all("Illegal fix addforce command");
iregion = domain->find_region(arg[iarg+1]);
if (iregion == -1) error->all("Fix addforce region ID does not exist");
if (iregion == -1)
error->all("Region ID for fix addforce does not exist");
int n = strlen(arg[iarg+1]) + 1;
idregion = new char[n];
strcpy(idregion,arg[iarg+1]);
iarg += 2;
} else if (strcmp(arg[iarg],"energy") == 0) {
if (iarg+2 > narg) error->all("Illegal fix addforce command");
@ -107,6 +112,7 @@ FixAddForce::~FixAddForce()
delete [] ystr;
delete [] zstr;
delete [] estr;
delete [] idregion;
memory->destroy_2d_double_array(sforce);
}
@ -156,6 +162,13 @@ void FixAddForce::init()
else error->all("Variable for fix setforce is invalid style");
} else estyle = NONE;
// set index and check validity of region
if (iregion >= 0) {
iregion = domain->find_region(idregion);
if (iregion == -1) error->all("Region ID for fix addforce does not exist");
}
if (xstyle == ATOM || ystyle == ATOM || zstyle == ATOM)
varflag = ATOM;
else if (xstyle == EQUAL || ystyle == EQUAL || zstyle == EQUAL)