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

This commit is contained in:
sjplimp
2008-07-08 19:45:01 +00:00
parent 97b51b94b3
commit 512e816759
12 changed files with 19 additions and 26 deletions

View File

@ -698,8 +698,6 @@ double PairGayBerne::gayberne_lj(const int i,const int j,double a1[3][3],
double temp1,temp2,temp3;
int *type = atom->type;
int newton_pair = force->newton_pair;
int nlocal = atom->nlocal;
double r12hat[3];
MathExtra::normalize3(r12,r12hat);

View File

@ -666,8 +666,6 @@ void PairLJCutCoulLong::coeff(int narg, char **arg)
void PairLJCutCoulLong::init_style()
{
int i,j;
if (!atom->q_flag)
error->all("Pair style lj/cut/coul/long requires atom attribute q");

View File

@ -389,8 +389,6 @@ void PairLJCutCoulLongTIP4P::settings(int narg, char **arg)
void PairLJCutCoulLongTIP4P::init_style()
{
int i,j;
if (atom->tag_enable == 0)
error->all("Pair style lj/cut/coul/long/tip4p requires atom IDs");
if (!force->newton_pair)

View File

@ -14,7 +14,7 @@ OBJ = $(SRC:.cpp=.o)
# Package variables
PACKAGE = asphere class2 colloid dipole dpd granular \
kspace manybody meam molecule opt poems xtc
kspace manybody meam molecule opt poems xtc sd
PACKUSER = user-ackland user-cg-cmm user-ewaldn user-smd

View File

@ -217,12 +217,12 @@ void ComputeTempSphere::compute_vector()
t[5] += massone * v[i][1]*v[i][2];
inertiaone = inertia[type[i]];
t[0] += massone * omega[i][0]*omega[i][0];
t[1] += massone * omega[i][1]*omega[i][1];
t[2] += massone * omega[i][2]*omega[i][2];
t[3] += massone * omega[i][0]*omega[i][1];
t[4] += massone * omega[i][0]*omega[i][2];
t[5] += massone * omega[i][1]*omega[i][2];
t[0] += inertiaone * omega[i][0]*omega[i][0];
t[1] += inertiaone * omega[i][1]*omega[i][1];
t[2] += inertiaone * omega[i][2]*omega[i][2];
t[3] += inertiaone * omega[i][0]*omega[i][1];
t[4] += inertiaone * omega[i][0]*omega[i][2];
t[5] += inertiaone * omega[i][1]*omega[i][2];
}
} else {
for (i = 0; i < nlocal; i++)
@ -236,12 +236,12 @@ void ComputeTempSphere::compute_vector()
t[5] += massone * v[i][1]*v[i][2];
inertiaone = INERTIA*radius[i]*radius[i]*rmass[i];
t[0] += massone * omega[i][0]*omega[i][0];
t[1] += massone * omega[i][1]*omega[i][1];
t[2] += massone * omega[i][2]*omega[i][2];
t[3] += massone * omega[i][0]*omega[i][1];
t[4] += massone * omega[i][0]*omega[i][2];
t[5] += massone * omega[i][1]*omega[i][2];
t[0] += inertiaone * omega[i][0]*omega[i][0];
t[1] += inertiaone * omega[i][1]*omega[i][1];
t[2] += inertiaone * omega[i][2]*omega[i][2];
t[3] += inertiaone * omega[i][0]*omega[i][1];
t[4] += inertiaone * omega[i][0]*omega[i][2];
t[5] += inertiaone * omega[i][1]*omega[i][2];
}
}

View File

@ -238,7 +238,7 @@ void DeleteAtoms::delete_overlap(int narg, char **arg)
double *special_coul = force->special_coul;
double *special_lj = force->special_lj;
int i,j,ii,jj,inum,jnum,itype;
int i,j,ii,jj,inum,jnum;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
int *ilist,*jlist,*numneigh,**firstneigh;
@ -252,7 +252,6 @@ void DeleteAtoms::delete_overlap(int narg, char **arg)
xtmp = x[i][0];
ytmp = x[i][1];
ztmp = x[i][2];
itype = type[i];
jlist = firstneigh[i];
jnum = numneigh[i];

View File

@ -148,7 +148,6 @@ void FixLangevin::post_force(int vflag)
{
double gamma1,gamma2;
double **x = atom->x;
double **v = atom->v;
double **f = atom->f;
int *type = atom->type;

View File

@ -366,7 +366,7 @@ void FixPressBerendsen::couple()
void FixPressBerendsen::remap()
{
int i,n;
int i;
double oldlo,oldhi,ctr;
double **x = atom->x;

View File

@ -127,7 +127,7 @@ void FixThermalConductivity::init()
void FixThermalConductivity::end_of_step()
{
int i,j,m,insert;
double p,coord,ke;
double coord,ke;
MPI_Status status;
struct {
double value;

View File

@ -78,7 +78,6 @@ void PairLJGromacs::compute(int eflag, int vflag)
double **x = atom->x;
double **f = atom->f;
double *q = atom->q;
int *type = atom->type;
int nlocal = atom->nlocal;
int nall = nlocal + atom->nghost;

View File

@ -363,6 +363,8 @@ RegionStyle(union,RegUnion)
#include "style_poems.h"
#include "style_xtc.h"
#include "style_sd.h"
// user add-ons: individual classes and packages
#include "style_user.h"

View File

@ -1084,7 +1084,7 @@ double Variable::evaluate(char *str, Tree **tree)
customize by adding a math function:
sqrt(),exp(),ln(),log(),sin(),cos(),tan(),asin(),acos(),atan()
ceil(),floor(),round()
/* ---------------------------------------------------------------------- */
---------------------------------------------------------------------- */
double Variable::eval_tree(Tree *tree, int i)
{