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

This commit is contained in:
sjplimp 2011-06-28 15:04:48 +00:00
parent 5267e31f32
commit 3cb626773c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.lib
View File

File diff suppressed because one or more lines are too long

4
src/pair_dpd.cpp
View File

@ -380,7 +380,7 @@ double PairDPD::single(int i, int j, int itype, int jtype, double rsq,
rinv = 1.0/r;
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 = 0.5*a0[itype][jtype]*cut[itype][jtype] * wd*wd;
return factor_dpd*phi;
}