lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2008-06-24 19:44:54 +00:00
parent c110bf1f6a
commit cf4e5e7976
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DPD/pair_dpd.cpp
View File

@ -149,7 +149,7 @@ void PairDPD::compute(int eflag, int vflag)
}
if (eflag) {
evdwl = a0[itype][jtype] * r * (1.0 - 0.5*r/cut[itype][jtype]);
evdwl = -a0[itype][jtype] * r * (1.0 - 0.5*r/cut[itype][jtype]);
evdwl *= factor_dpd;
}
@ -383,6 +383,6 @@ double PairDPD::single(int i, int j, int itype, int jtype, double rsq,
wd = 1.0 - r/cut[itype][jtype];
fforce = a0[itype][jtype]*wd * factor_dpd*rinv;
phi = a0[itype][jtype] * r * (1.0 - 0.5*r/cut[itype][jtype]);
phi = -a0[itype][jtype] * r * (1.0 - 0.5*r/cut[itype][jtype]);
return factor_dpd*phi;
}