git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
@ -5,7 +5,7 @@
|
||||
|
||||
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
||||
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
||||
certain rights in this software. This software is distributed under
|
||||
certain rights in this software. This software is distributed under
|
||||
the GNU General Public License.
|
||||
|
||||
See the README file in the top-level LAMMPS directory.
|
||||
@ -66,7 +66,7 @@ void AngleDipole::compute(int eflag, int vflag)
|
||||
int nlocal = atom->nlocal;
|
||||
int newton_bond = force->newton_bond;
|
||||
|
||||
if (!newton_bond)
|
||||
if (!newton_bond)
|
||||
error->all(FLERR,"'newton' flag for bonded interactions must be 'on'");
|
||||
|
||||
for (n = 0; n < nanglelist; n++) {
|
||||
@ -87,19 +87,19 @@ void AngleDipole::compute(int eflag, int vflag)
|
||||
deltaGamma = cosGamma - cos(gamma0[type]);
|
||||
kdg = k[type] * deltaGamma;
|
||||
|
||||
if (eflag) eangle = kdg * deltaGamma; // energy
|
||||
|
||||
tangle = 2.0 * kdg / rmu;
|
||||
|
||||
if (eflag) eangle = kdg * deltaGamma; // energy
|
||||
|
||||
tangle = 2.0 * kdg / rmu;
|
||||
|
||||
torque[iDip][0] += tangle * (dely*mu[iDip][2] - delz*mu[iDip][1]);
|
||||
torque[iDip][1] += tangle * (delz*mu[iDip][0] - delx*mu[iDip][2]);
|
||||
torque[iDip][2] += tangle * (delx*mu[iDip][1] - dely*mu[iDip][0]);
|
||||
|
||||
|
||||
f1[0] = f1[1] = f1[2] = f3[0] = f3[1] = f3[2] = 0.0;
|
||||
|
||||
|
||||
if (evflag) // tally energy (virial=0 because force=0)
|
||||
ev_tally(iRef,iDip,iDummy,nlocal,newton_bond,eangle,f1,f3,
|
||||
0.0,0.0,0.0,0.0,0.0,0.0);
|
||||
0.0,0.0,0.0,0.0,0.0,0.0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -165,7 +165,7 @@ void AngleDipole::write_restart(FILE *fp)
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------------------------
|
||||
proc 0 reads coeffs from restart file, bcasts them
|
||||
proc 0 reads coeffs from restart file, bcasts them
|
||||
------------------------------------------------------------------------- */
|
||||
|
||||
void AngleDipole::read_restart(FILE *fp)
|
||||
@ -203,5 +203,5 @@ double AngleDipole::single(int type, int iRef, int iDip, int iDummy)
|
||||
double deltaGamma = cosGamma - cos(gamma0[type]);
|
||||
double kdg = k[type] * deltaGamma;
|
||||
|
||||
return kdg * deltaGamma; // energy
|
||||
return kdg * deltaGamma; // energy
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user