jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2011-07-26 19:13:38 +00:00
parent 63c9cc12fd
commit 85efbcaf7e
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/COLLOID/fix_wall_colloid.cpp
View File

@ -76,7 +76,7 @@ void FixWallColloid::precompute(int m)
void FixWallColloid::wall_particle(int m, int which, double coord)
{
double delta,delta2,rinv,r2inv,r4inv,r8inv,fwall;
double r2,rinv2,r2inv2,r4inv2,r6inv2;
double r2,rinv2,r2inv2,r4inv2;
double r3,rinv3,r2inv3,r4inv3,r6inv3;
double rad,rad2,rad4,rad8,diam,new_coeff2;
double eoffset;
@ -124,7 +124,6 @@ void FixWallColloid::wall_particle(int m, int which, double coord)
rinv2 = 1.0/r2;
r2inv2 = rinv2*rinv2;
r4inv2 = r2inv2*r2inv2;
r6inv2 = r4inv2*r2inv2;
r3 = delta + rad;
rinv3 = 1.0/r3;
r2inv3 = rinv3*rinv3;
@ -141,7 +140,6 @@ void FixWallColloid::wall_particle(int m, int which, double coord)
rinv2 = 1.0/r2;
r2inv2 = rinv2*rinv2;
r4inv2 = r2inv2*r2inv2;
r6inv2 = r4inv2*r2inv2;
r3 = cutoff[m] + rad;
rinv3 = 1.0/r3;
r2inv3 = rinv3*rinv3;

5
src/compute_property_local.cpp
View File

@ -280,8 +280,7 @@ void ComputePropertyLocal::compute_local()
int ComputePropertyLocal::count_pairs(int allflag, int forceflag)
{
int i,j,m,n,ii,jj,inum,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz;
double rsq,factor_coul,factor_lj;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
int *ilist,*jlist,*numneigh,**firstneigh;
double **x = atom->x;
@ -321,8 +320,6 @@ int ComputePropertyLocal::count_pairs(int allflag, int forceflag)
for (jj = 0; jj < jnum; jj++) {
j = jlist[jj];
factor_lj = special_lj[sbmask(j)];
factor_coul = special_coul[sbmask(j)];
j &= NEIGHMASK;
if (!(mask[j] & groupbit)) continue;

1
src/memory.cpp
View File

@ -12,7 +12,6 @@
------------------------------------------------------------------------- */
#include "lmptype.h"
#include "mpi.h"
#include "stdio.h"
#include "stdlib.h"
#include "string.h"