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@10160 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2013-06-28 19:00:58 +00:00
parent fcc992d386
commit aa33af4032
94 changed files with 638 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/region_cone.cpp
View File

@ -21,6 +21,7 @@
#include "region_cone.h"
#include "domain.h"
#include "error.h"
#include "force.h"
using namespace LAMMPS_NS;
@ -38,20 +39,20 @@ RegCone::RegCone(LAMMPS *lmp, int narg, char **arg) :
axis = arg[2][0];
if (axis == 'x') {
c1 = yscale*atof(arg[3]);
c2 = zscale*atof(arg[4]);
radiuslo = yscale*atof(arg[5]);
radiushi = yscale*atof(arg[6]);
c1 = yscale*force->numeric(FLERR,arg[3]);
c2 = zscale*force->numeric(FLERR,arg[4]);
radiuslo = yscale*force->numeric(FLERR,arg[5]);
radiushi = yscale*force->numeric(FLERR,arg[6]);
} else if (axis == 'y') {
c1 = xscale*atof(arg[3]);
c2 = zscale*atof(arg[4]);
radiuslo = xscale*atof(arg[5]);
radiushi = xscale*atof(arg[6]);
c1 = xscale*force->numeric(FLERR,arg[3]);
c2 = zscale*force->numeric(FLERR,arg[4]);
radiuslo = xscale*force->numeric(FLERR,arg[5]);
radiushi = xscale*force->numeric(FLERR,arg[6]);
} else if (axis == 'z') {
c1 = xscale*atof(arg[3]);
c2 = yscale*atof(arg[4]);
radiuslo = xscale*atof(arg[5]);
radiushi = xscale*atof(arg[6]);
c1 = xscale*force->numeric(FLERR,arg[3]);
c2 = yscale*force->numeric(FLERR,arg[4]);
radiuslo = xscale*force->numeric(FLERR,arg[5]);
radiushi = xscale*force->numeric(FLERR,arg[6]);
}
if (strcmp(arg[7],"INF") == 0 || strcmp(arg[7],"EDGE") == 0) {
@ -73,9 +74,9 @@ RegCone::RegCone(LAMMPS *lmp, int narg, char **arg) :
else lo = domain->boxlo_bound[2];
}
} else {
if (axis == 'x') lo = xscale*atof(arg[7]);
if (axis == 'y') lo = yscale*atof(arg[7]);
if (axis == 'z') lo = zscale*atof(arg[7]);
if (axis == 'x') lo = xscale*force->numeric(FLERR,arg[7]);
if (axis == 'y') lo = yscale*force->numeric(FLERR,arg[7]);
if (axis == 'z') lo = zscale*force->numeric(FLERR,arg[7]);
}
if (strcmp(arg[8],"INF") == 0 || strcmp(arg[7],"EDGE") == 0) {
@ -97,9 +98,9 @@ RegCone::RegCone(LAMMPS *lmp, int narg, char **arg) :
else hi = domain->boxhi_bound[2];
}
} else {
if (axis == 'x') hi = xscale*atof(arg[8]);
if (axis == 'y') hi = yscale*atof(arg[8]);
if (axis == 'z') hi = zscale*atof(arg[8]);
if (axis == 'x') hi = xscale*force->numeric(FLERR,arg[8]);
if (axis == 'y') hi = yscale*force->numeric(FLERR,arg[8]);
if (axis == 'z') hi = zscale*force->numeric(FLERR,arg[8]);
}
// error check