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

Browse Source
This commit is contained in:
sjplimp
2013-02-14 15:57:17 +00:00
parent 8f94aa8010
commit 180c732619
4 changed files with 167 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
View File

@ -41,6 +41,8 @@ PairLJCutTIP4PLongOMP::PairLJCutTIP4PLongOMP(LAMMPS *lmp) :
{ {
suffix_flag |= Suffix::OMP; suffix_flag |= Suffix::OMP;
respa_enable = 0; respa_enable = 0;
newsite_thr = NULL;
hneigh_thr = NULL;
// TIP4P cannot compute virial as F dot r // TIP4P cannot compute virial as F dot r
// due to finding bonded H atoms which are not near O atom // due to finding bonded H atoms which are not near O atom
@ -50,6 +52,14 @@ PairLJCutTIP4PLongOMP::PairLJCutTIP4PLongOMP(LAMMPS *lmp) :
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
PairLJCutTIP4PLongOMP::~PairLJCutTIP4PLongOMP()
{
memory->destroy(hneigh_thr);
memory->destroy(newsite_thr);
}
/* ---------------------------------------------------------------------- */
void PairLJCutTIP4PLongOMP::compute(int eflag, int vflag) void PairLJCutTIP4PLongOMP::compute(int eflag, int vflag)
{ {
if (eflag || vflag) ev_setup(eflag,vflag); if (eflag || vflag) ev_setup(eflag,vflag);
@ -58,23 +68,27 @@ void PairLJCutTIP4PLongOMP::compute(int eflag, int vflag)
const int nlocal = atom->nlocal; const int nlocal = atom->nlocal;
const int nall = nlocal + atom->nghost; const int nall = nlocal + atom->nghost;
// reallocate hneigh & newsite if necessary // reallocate hneigh_thr & newsite_thr if necessary
// initialize hneigh[0] to -1 on steps when reneighboring occurred // initialize hneigh_thr[0] to -1 on steps when reneighboring occurred
// initialize hneigh[2] to 0 every step // initialize hneigh_thr[2] to 0 every step
if (atom->nmax > nmax) { if (atom->nmax > nmax) {
nmax = atom->nmax; nmax = atom->nmax;
memory->destroy(hneigh); memory->destroy(hneigh_thr);
memory->create(hneigh,nmax,3,"pair:hneigh"); memory->create(hneigh_thr,nmax,"pair:hneigh_thr");
memory->destroy(newsite); memory->destroy(newsite_thr);
memory->create(newsite,nmax,3,"pair:newsite"); memory->create(newsite_thr,nmax,"pair:newsite_thr");
} }
// XXX: this could be threaded, too.
int i; int i;
// tag entire list as completely invalid after a neighbor
// list update, since that can change the order of atoms.
if (neighbor->ago == 0) if (neighbor->ago == 0)
for (i = 0; i < nall; i++) hneigh[i][0] = -1; for (i = 0; i < nall; i++) hneigh_thr[i].a = -1;
for (i = 0; i < nall; i++) hneigh[i][2] = 0;
// indicate that the coordinates for the M point need to
// be updated. this needs to be done in every step.
for (i = 0; i < nall; i++) hneigh_thr[i].t = 0;
const int nthreads = comm->nthreads; const int nthreads = comm->nthreads;
const int inum = list->inum; const int inum = list->inum;
@ -120,9 +134,6 @@ void PairLJCutTIP4PLongOMP::compute(int eflag, int vflag)
template <int CTABLE, int EVFLAG, int EFLAG, int VFLAG> template <int CTABLE, int EVFLAG, int EFLAG, int VFLAG>
void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr) void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
{ {
int i,j,ii,jj,jnum,itype,jtype,itable, key;
int n,vlist[6];
int iH1,iH2,jH1,jH2;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul; double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul;
double fraction,table; double fraction,table;
double r,rsq,r2inv,r6inv,forcecoul,forcelj,cforce; double r,rsq,r2inv,r6inv,forcecoul,forcelj,cforce;
@ -130,19 +141,22 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
double grij,expm2,prefactor,t,erfc; double grij,expm2,prefactor,t,erfc;
double v[6],xH1[3],xH2[3]; double v[6],xH1[3],xH2[3];
double fdx,fdy,fdz,fOx,fOy,fOz,fHx,fHy,fHz; double fdx,fdy,fdz,fOx,fOy,fOz,fHx,fHy,fHz;
const double *x1,*x2; dbl3_t x1,x2;
int *ilist,*jlist,*numneigh,**firstneigh;
int *ilist,*jlist,*numneigh,**firstneigh;
int i,j,ii,jj,jnum,itype,jtype,itable, key;
int n,vlist[6];
int iH1,iH2,jH1,jH2;
evdwl = ecoul = 0.0; evdwl = ecoul = 0.0;
const double * const * const x = atom->x; const dbl3_t * _noalias const x = (dbl3_t *) atom->x[0];
double * const * const f = thr->get_f(); dbl3_t * _noalias const f = (dbl3_t *) thr->get_f()[0];
const double * const q = atom->q; const double * _noalias const q = atom->q;
const int * const type = atom->type; const int * _noalias const type = atom->type;
const int nlocal = atom->nlocal; const int nlocal = atom->nlocal;
const int tid = thr->get_tid(); const double * _noalias const special_coul = force->special_coul;
const double * const special_coul = force->special_coul; const double * _noalias const special_lj = force->special_lj;
const double * const special_lj = force->special_lj;
const double qqrd2e = force->qqrd2e; const double qqrd2e = force->qqrd2e;
const double cut_coulsqplus = (cut_coul+2.0*qdist) * (cut_coul+2.0*qdist); const double cut_coulsqplus = (cut_coul+2.0*qdist) * (cut_coul+2.0*qdist);
@ -157,39 +171,39 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
for (ii = iifrom; ii < iito; ++ii) { for (ii = iifrom; ii < iito; ++ii) {
i = ilist[ii]; i = ilist[ii];
qtmp = q[i]; qtmp = q[i];
xtmp = x[i][0]; xtmp = x[i].x;
ytmp = x[i][1]; ytmp = x[i].y;
ztmp = x[i][2]; ztmp = x[i].z;
itype = type[i]; itype = type[i];
// if atom I = water O, set x1 = offset charge site // if atom I = water O, set x1 = offset charge site
// else x1 = x of atom I // else x1 = x of atom I
// NOTE: to make this part thread safe, we need to // NOTE: to make this part thread safe, we need to
// make sure that the hneigh[][] entries only get // make sure that the hneigh_thr[][] entries only get
// updated, when all data is in place. worst case, // updated, when all data is in place. worst case,
// some calculation is repeated, but since the results // some calculation is repeated, but since the results
// will be the same, there is no race condition. // will be the same, there is no race condition.
if (itype == typeO) { if (itype == typeO) {
if (hneigh[i][0] < 0) { if (hneigh_thr[i].a < 0) {
iH1 = atom->map(atom->tag[i] + 1); iH1 = atom->map(atom->tag[i] + 1);
iH2 = atom->map(atom->tag[i] + 2); iH2 = atom->map(atom->tag[i] + 2);
if (iH1 == -1 || iH2 == -1) if (iH1 == -1 || iH2 == -1)
error->one(FLERR,"TIP4P hydrogen is missing"); error->one(FLERR,"TIP4P hydrogen is missing");
if (atom->type[iH1] != typeH || atom->type[iH2] != typeH) if (atom->type[iH1] != typeH || atom->type[iH2] != typeH)
error->one(FLERR,"TIP4P hydrogen has incorrect atom type"); error->one(FLERR,"TIP4P hydrogen has incorrect atom type");
compute_newsite_thr(x[i],x[iH1],x[iH2],newsite[i]); compute_newsite_thr(x[i],x[iH1],x[iH2],newsite_thr[i]);
hneigh[i][2] = 1; hneigh_thr[i].t = 1;
hneigh[i][1] = iH2; hneigh_thr[i].b = iH2;
hneigh[i][0] = iH1; hneigh_thr[i].a = iH1;
} else { } else {
iH1 = hneigh[i][0]; iH1 = hneigh_thr[i].a;
iH2 = hneigh[i][1]; iH2 = hneigh_thr[i].b;
if (hneigh[i][2] == 0) { if (hneigh_thr[i].t == 0) {
compute_newsite_thr(x[i],x[iH1],x[iH2],newsite[i]); compute_newsite_thr(x[i],x[iH1],x[iH2],newsite_thr[i]);
hneigh[i][2] = 1; hneigh_thr[i].t = 1;
} }
} }
x1 = newsite[i]; x1 = newsite_thr[i];
} else x1 = x[i]; } else x1 = x[i];
jlist = firstneigh[i]; jlist = firstneigh[i];
@ -202,9 +216,9 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
factor_coul = special_coul[sbmask(j)]; factor_coul = special_coul[sbmask(j)];
j &= NEIGHMASK; j &= NEIGHMASK;
delx = xtmp - x[j][0]; delx = xtmp - x[j].x;
dely = ytmp - x[j][1]; dely = ytmp - x[j].y;
delz = ztmp - x[j][2]; delz = ztmp - x[j].z;
rsq = delx*delx + dely*dely + delz*delz; rsq = delx*delx + dely*dely + delz*delz;
jtype = type[j]; jtype = type[j];
@ -219,9 +233,9 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
fxtmp += delx*forcelj; fxtmp += delx*forcelj;
fytmp += dely*forcelj; fytmp += dely*forcelj;
fztmp += delz*forcelj; fztmp += delz*forcelj;
f[j][0] -= delx*forcelj; f[j].x -= delx*forcelj;
f[j][1] -= dely*forcelj; f[j].y -= dely*forcelj;
f[j][2] -= delz*forcelj; f[j].z -= delz*forcelj;
if (EFLAG) { if (EFLAG) {
evdwl = r6inv*(lj3[itype][jtype]*r6inv-lj4[itype][jtype]) - evdwl = r6inv*(lj3[itype][jtype]*r6inv-lj4[itype][jtype]) -
@ -236,7 +250,7 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
// adjust rsq and delxyz for off-site O charge(s) if necessary // adjust rsq and delxyz for off-site O charge(s) if necessary
// but only if they are within reach // but only if they are within reach
// NOTE: to make this part thread safe, we need to // NOTE: to make this part thread safe, we need to
// make sure that the hneigh[][] entries only get // make sure that the hneigh_thr[][] entries only get
// updated, when all data is in place. worst case, // updated, when all data is in place. worst case,
// some calculation is repeated, but since the results // some calculation is repeated, but since the results
// will be the same, there is no race condition. // will be the same, there is no race condition.
@ -247,31 +261,31 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
// else x2 = x of atom J // else x2 = x of atom J
if (jtype == typeO) { if (jtype == typeO) {
if (hneigh[j][0] < 0) { if (hneigh_thr[j].a < 0) {
jH1 = atom->map(atom->tag[j] + 1); jH1 = atom->map(atom->tag[j] + 1);
jH2 = atom->map(atom->tag[j] + 2); jH2 = atom->map(atom->tag[j] + 2);
if (jH1 == -1 || jH2 == -1) if (jH1 == -1 || jH2 == -1)
error->one(FLERR,"TIP4P hydrogen is missing"); error->one(FLERR,"TIP4P hydrogen is missing");
if (atom->type[jH1] != typeH || atom->type[jH2] != typeH) if (atom->type[jH1] != typeH || atom->type[jH2] != typeH)
error->one(FLERR,"TIP4P hydrogen has incorrect atom type"); error->one(FLERR,"TIP4P hydrogen has incorrect atom type");
compute_newsite_thr(x[j],x[jH1],x[jH2],newsite[j]); compute_newsite_thr(x[j],x[jH1],x[jH2],newsite_thr[j]);
hneigh[j][2] = 1; hneigh_thr[j].t = 1;
hneigh[j][1] = jH2; hneigh_thr[j].b = jH2;
hneigh[j][0] = jH1; hneigh_thr[j].a = jH1;
} else { } else {
jH1 = hneigh[j][0]; jH1 = hneigh_thr[j].a;
jH2 = hneigh[j][1]; jH2 = hneigh_thr[j].b;
if (hneigh[j][2] == 0) { if (hneigh_thr[j].t == 0) {
compute_newsite_thr(x[j],x[jH1],x[jH2],newsite[j]); compute_newsite_thr(x[j],x[jH1],x[jH2],newsite_thr[j]);
hneigh[j][2] = 1; hneigh_thr[j].t = 1;
} }
} }
x2 = newsite[j]; x2 = newsite_thr[j];
} else x2 = x[j]; } else x2 = x[j];
delx = x1[0] - x2[0]; delx = x1.x - x2.x;
dely = x1[1] - x2[1]; dely = x1.y - x2.y;
delz = x1[2] - x2[2]; delz = x1.z - x2.z;
rsq = delx*delx + dely*dely + delz*delz; rsq = delx*delx + dely*dely + delz*delz;
} }
@ -324,12 +338,12 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
fztmp += delz * cforce; fztmp += delz * cforce;
if (VFLAG) { if (VFLAG) {
v[0] = x[i][0] * delx * cforce; v[0] = x[i].x * delx * cforce;
v[1] = x[i][1] * dely * cforce; v[1] = x[i].y * dely * cforce;
v[2] = x[i][2] * delz * cforce; v[2] = x[i].z * delz * cforce;
v[3] = x[i][0] * dely * cforce; v[3] = x[i].x * dely * cforce;
v[4] = x[i][0] * delz * cforce; v[4] = x[i].x * delz * cforce;
v[5] = x[i][1] * delz * cforce; v[5] = x[i].y * delz * cforce;
} }
vlist[n++] = i; vlist[n++] = i;
@ -352,24 +366,24 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
fytmp += fOy; fytmp += fOy;
fztmp += fOz; fztmp += fOz;
f[iH1][0] += fHx; f[iH1].x += fHx;
f[iH1][1] += fHy; f[iH1].y += fHy;
f[iH1][2] += fHz; f[iH1].z += fHz;
f[iH2][0] += fHx; f[iH2].x += fHx;
f[iH2][1] += fHy; f[iH2].y += fHy;
f[iH2][2] += fHz; f[iH2].z += fHz;
if (VFLAG) { if (VFLAG) {
domain->closest_image(x[i],x[iH1],xH1); domain->closest_image(&x[i].x,&x[iH1].x,xH1);
domain->closest_image(x[i],x[iH2],xH2); domain->closest_image(&x[i].x,&x[iH2].x,xH2);
v[0] = x[i][0]*fOx + xH1[0]*fHx + xH2[0]*fHx; v[0] = x[i].x*fOx + xH1[0]*fHx + xH2[0]*fHx;
v[1] = x[i][1]*fOy + xH1[1]*fHy + xH2[1]*fHy; v[1] = x[i].y*fOy + xH1[1]*fHy + xH2[1]*fHy;
v[2] = x[i][2]*fOz + xH1[2]*fHz + xH2[2]*fHz; v[2] = x[i].z*fOz + xH1[2]*fHz + xH2[2]*fHz;
v[3] = x[i][0]*fOy + xH1[0]*fHy + xH2[0]*fHy; v[3] = x[i].x*fOy + xH1[0]*fHy + xH2[0]*fHy;
v[4] = x[i][0]*fOz + xH1[0]*fHz + xH2[0]*fHz; v[4] = x[i].x*fOz + xH1[0]*fHz + xH2[0]*fHz;
v[5] = x[i][1]*fOz + xH1[1]*fHz + xH2[1]*fHz; v[5] = x[i].y*fOz + xH1[1]*fHz + xH2[1]*fHz;
} }
vlist[n++] = i; vlist[n++] = i;
vlist[n++] = iH1; vlist[n++] = iH1;
@ -377,17 +391,17 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
} }
if (jtype != typeO) { if (jtype != typeO) {
f[j][0] -= delx * cforce; f[j].x -= delx * cforce;
f[j][1] -= dely * cforce; f[j].y -= dely * cforce;
f[j][2] -= delz * cforce; f[j].z -= delz * cforce;
if (VFLAG) { if (VFLAG) {
v[0] -= x[j][0] * delx * cforce; v[0] -= x[j].x * delx * cforce;
v[1] -= x[j][1] * dely * cforce; v[1] -= x[j].y * dely * cforce;
v[2] -= x[j][2] * delz * cforce; v[2] -= x[j].z * delz * cforce;
v[3] -= x[j][0] * dely * cforce; v[3] -= x[j].x * dely * cforce;
v[4] -= x[j][0] * delz * cforce; v[4] -= x[j].x * delz * cforce;
v[5] -= x[j][1] * delz * cforce; v[5] -= x[j].y * delz * cforce;
} }
vlist[n++] = j; vlist[n++] = j;
@ -406,28 +420,28 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
fHy = 0.5*alpha * fdy; fHy = 0.5*alpha * fdy;
fHz = 0.5*alpha * fdz; fHz = 0.5*alpha * fdz;
f[j][0] += fOx; f[j].x += fOx;
f[j][1] += fOy; f[j].y += fOy;
f[j][2] += fOz; f[j].z += fOz;
f[jH1][0] += fHx; f[jH1].x += fHx;
f[jH1][1] += fHy; f[jH1].y += fHy;
f[jH1][2] += fHz; f[jH1].z += fHz;
f[jH2][0] += fHx; f[jH2].x += fHx;
f[jH2][1] += fHy; f[jH2].y += fHy;
f[jH2][2] += fHz; f[jH2].z += fHz;
if (VFLAG) { if (VFLAG) {
domain->closest_image(x[j],x[jH1],xH1); domain->closest_image(&x[j].x,&x[jH1].x,xH1);
domain->closest_image(x[j],x[jH2],xH2); domain->closest_image(&x[j].x,&x[jH2].x,xH2);
v[0] += x[j][0]*fOx + xH1[0]*fHx + xH2[0]*fHx; v[0] += x[j].x*fOx + xH1[0]*fHx + xH2[0]*fHx;
v[1] += x[j][1]*fOy + xH1[1]*fHy + xH2[1]*fHy; v[1] += x[j].y*fOy + xH1[1]*fHy + xH2[1]*fHy;
v[2] += x[j][2]*fOz + xH1[2]*fHz + xH2[2]*fHz; v[2] += x[j].z*fOz + xH1[2]*fHz + xH2[2]*fHz;
v[3] += x[j][0]*fOy + xH1[0]*fHy + xH2[0]*fHy; v[3] += x[j].x*fOy + xH1[0]*fHy + xH2[0]*fHy;
v[4] += x[j][0]*fOz + xH1[0]*fHz + xH2[0]*fHz; v[4] += x[j].x*fOz + xH1[0]*fHz + xH2[0]*fHz;
v[5] += x[j][1]*fOz + xH1[1]*fHz + xH2[1]*fHz; v[5] += x[j].y*fOz + xH1[1]*fHz + xH2[1]*fHz;
} }
vlist[n++] = j; vlist[n++] = j;
vlist[n++] = jH1; vlist[n++] = jH1;
@ -448,9 +462,9 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
} }
} }
} }
f[i][0] += fxtmp; f[i].x += fxtmp;
f[i][1] += fytmp; f[i].y += fytmp;
f[i][2] += fztmp; f[i].z += fztmp;
} }
} }
@ -460,25 +474,25 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr)
return it as xM return it as xM
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
void PairLJCutTIP4PLongOMP::compute_newsite_thr(const double * xO, void PairLJCutTIP4PLongOMP::compute_newsite_thr(const dbl3_t &xO,
const double * xH1, const dbl3_t &xH1,
const double * xH2, const dbl3_t &xH2,
double * xM) const dbl3_t &xM) const
{ {
double delx1 = xH1[0] - xO[0]; double delx1 = xH1.x - xO.x;
double dely1 = xH1[1] - xO[1]; double dely1 = xH1.y - xO.y;
double delz1 = xH1[2] - xO[2]; double delz1 = xH1.z - xO.z;
domain->minimum_image(delx1,dely1,delz1); domain->minimum_image(delx1,dely1,delz1);
double delx2 = xH2[0] - xO[0]; double delx2 = xH2.x - xO.x;
double dely2 = xH2[1] - xO[1]; double dely2 = xH2.y - xO.y;
double delz2 = xH2[2] - xO[2]; double delz2 = xH2.z - xO.z;
domain->minimum_image(delx2,dely2,delz2); domain->minimum_image(delx2,dely2,delz2);
const double prefac = alpha * 0.5; const double prefac = alpha * 0.5;
xM[0] = xO[0] + prefac * (delx1 + delx2); xM.x = xO.x + prefac * (delx1 + delx2);
xM[1] = xO[1] + prefac * (dely1 + dely2); xM.y = xO.y + prefac * (dely1 + dely2);
xM[2] = xO[2] + prefac * (delz1 + delz2); xM.z = xO.z + prefac * (delz1 + delz2);
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

8
src/USER-OMP/pair_lj_cut_tip4p_long_omp.h
View File

@ -33,16 +33,18 @@ class PairLJCutTIP4PLongOMP : public PairLJCutTIP4PLong, public ThrOMP {
public: public:
PairLJCutTIP4PLongOMP(class LAMMPS *); PairLJCutTIP4PLongOMP(class LAMMPS *);
virtual ~PairLJCutTIP4PLongOMP() {}; virtual ~PairLJCutTIP4PLongOMP();
virtual void compute(int, int); virtual void compute(int, int);
virtual double memory_usage(); virtual double memory_usage();
private: private:
dbl3_t *newsite_thr;
int3_t *hneigh_thr;
template <int CFLAG, int EVFLAG, int EFLAG, int VFLAG> template <int CFLAG, int EVFLAG, int EFLAG, int VFLAG>
void eval(int ifrom, int ito, ThrData * const thr); void eval(int ifrom, int ito, ThrData * const thr);
void compute_newsite_thr(const double *, const double *, void compute_newsite_thr(const dbl3_t &, const dbl3_t &,
const double *, double *) const; const dbl3_t &, dbl3_t &) const;
}; };
} }

29
src/variable.cpp
View File

@ -47,8 +47,9 @@ enum{INDEX,LOOP,WORLD,UNIVERSE,ULOOP,STRING,FILEVAR,EQUAL,ATOM};
enum{ARG,OP}; enum{ARG,OP};
// customize by adding a function // customize by adding a function
// if add before OR, also set precedence level and precedence length in *.h
enum{DONE,ADD,SUBTRACT,MULTIPLY,DIVIDE,CARAT,UNARY, enum{DONE,ADD,SUBTRACT,MULTIPLY,DIVIDE,CARAT,MODULO,UNARY,
NOT,EQ,NE,LT,LE,GT,GE,AND,OR, NOT,EQ,NE,LT,LE,GT,GE,AND,OR,
SQRT,EXP,LN,LOG,ABS,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2, SQRT,EXP,LN,LOG,ABS,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,
RANDOM,NORMAL,CEIL,FLOOR,ROUND,RAMP,STAGGER,LOGFREQ,STRIDE, RANDOM,NORMAL,CEIL,FLOOR,ROUND,RAMP,STAGGER,LOGFREQ,STRIDE,
@ -86,13 +87,15 @@ Variable::Variable(LAMMPS *lmp) : Pointers(lmp)
randomequal = NULL; randomequal = NULL;
randomatom = NULL; randomatom = NULL;
// customize by assigning a precedence level
precedence[DONE] = 0; precedence[DONE] = 0;
precedence[OR] = 1; precedence[OR] = 1;
precedence[AND] = 2; precedence[AND] = 2;
precedence[EQ] = precedence[NE] = 3; precedence[EQ] = precedence[NE] = 3;
precedence[LT] = precedence[LE] = precedence[GT] = precedence[GE] = 4; precedence[LT] = precedence[LE] = precedence[GT] = precedence[GE] = 4;
precedence[ADD] = precedence[SUBTRACT] = 5; precedence[ADD] = precedence[SUBTRACT] = 5;
precedence[MULTIPLY] = precedence[DIVIDE] = 6; precedence[MULTIPLY] = precedence[DIVIDE] = precedence[MODULO] = 6;
precedence[CARAT] = 7; precedence[CARAT] = 7;
precedence[UNARY] = precedence[NOT] = 8; precedence[UNARY] = precedence[NOT] = 8;
} }
@ -1323,11 +1326,12 @@ double Variable::evaluate(char *str, Tree **tree)
// math operator, including end-of-string // math operator, including end-of-string
// ---------------- // ----------------
} else if (strchr("+-*/^<>=!&|\0",onechar)) { } else if (strchr("+-*/^<>=!&|%\0",onechar)) {
if (onechar == '+') op = ADD; if (onechar == '+') op = ADD;
else if (onechar == '-') op = SUBTRACT; else if (onechar == '-') op = SUBTRACT;
else if (onechar == '*') op = MULTIPLY; else if (onechar == '*') op = MULTIPLY;
else if (onechar == '/') op = DIVIDE; else if (onechar == '/') op = DIVIDE;
else if (onechar == '%') op = MODULO;
else if (onechar == '^') op = CARAT; else if (onechar == '^') op = CARAT;
else if (onechar == '=') { else if (onechar == '=') {
if (str[i+1] != '=') if (str[i+1] != '=')
@ -1411,6 +1415,10 @@ double Variable::evaluate(char *str, Tree **tree)
if (value2 == 0.0) if (value2 == 0.0)
error->all(FLERR,"Divide by 0 in variable formula"); error->all(FLERR,"Divide by 0 in variable formula");
argstack[nargstack++] = value1 / value2; argstack[nargstack++] = value1 / value2;
} else if (opprevious == MODULO) {
if (value2 == 0.0)
error->all(FLERR,"Modulo 0 in variable formula");
argstack[nargstack++] = fmod(value1,value2);
} else if (opprevious == CARAT) { } else if (opprevious == CARAT) {
if (value2 == 0.0) if (value2 == 0.0)
error->all(FLERR,"Power by 0 in variable formula"); error->all(FLERR,"Power by 0 in variable formula");
@ -1534,6 +1542,16 @@ double Variable::collapse_tree(Tree *tree)
return tree->value; return tree->value;
} }
if (tree->type == MODULO) {
arg1 = collapse_tree(tree->left);
arg2 = collapse_tree(tree->right);
if (tree->left->type != VALUE || tree->right->type != VALUE) return 0.0;
tree->type = VALUE;
if (arg2 == 0.0) error->one(FLERR,"Modulo 0 in variable formula");
tree->value = fmod(arg1,arg2);
return tree->value;
}
if (tree->type == CARAT) { if (tree->type == CARAT) {
arg1 = collapse_tree(tree->left); arg1 = collapse_tree(tree->left);
arg2 = collapse_tree(tree->right); arg2 = collapse_tree(tree->right);
@ -1943,6 +1961,11 @@ double Variable::eval_tree(Tree *tree, int i)
if (denom == 0.0) error->one(FLERR,"Divide by 0 in variable formula"); if (denom == 0.0) error->one(FLERR,"Divide by 0 in variable formula");
return eval_tree(tree->left,i) / denom; return eval_tree(tree->left,i) / denom;
} }
if (tree->type == MODULO) {
double denom = eval_tree(tree->right,i);
if (denom == 0.0) error->one(FLERR,"Modulo 0 in variable formula");
return fmod(eval_tree(tree->left,i),denom);
}
if (tree->type == CARAT) { if (tree->type == CARAT) {
double exponent = eval_tree(tree->right,i); double exponent = eval_tree(tree->right,i);
if (exponent == 0.0) error->one(FLERR,"Power by 0 in variable formula"); if (exponent == 0.0) error->one(FLERR,"Power by 0 in variable formula");

4
src/variable.h
View File

@ -54,8 +54,8 @@ class Variable : protected Pointers {
class RanMars *randomequal; // random number generator for equal-style vars class RanMars *randomequal; // random number generator for equal-style vars
class RanMars *randomatom; // random number generator for atom-style vars class RanMars *randomatom; // random number generator for atom-style vars
int precedence[16]; // precedence level of math operators int precedence[17]; // precedence level of math operators
// set length to include OR in enum // set length to include up to OR in enum
int me; int me;
struct Tree { // parse tree for atom-style variables struct Tree { // parse tree for atom-style variables