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

This commit is contained in:
sjplimp 2014-01-31 22:39:42 +00:00
parent 7cb21d1cd9
commit 47f42c2a55
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
View File

@ -240,8 +240,9 @@ void PairHbondDreidingLJOMP::eval(int iifrom, int iito, ThrData * const thr)
pm.denom_vdw;
switch2 = 12.0*rsq * (pm.cut_outersq-rsq) *
(rsq-pm.cut_innersq) / pm.denom_vdw;
force_kernel = force_kernel*switch1 + eng_lj*switch2;
eng_lj *= switch1;
force_kernel = force_kernel*switch1 + eng_lj*switch2/rsq;
force_angle *= switch1;
eng_lj *= switch1;
}
if (EFLAG) {

5
src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
View File

@ -239,8 +239,9 @@ void PairHbondDreidingMorseOMP::eval(int iifrom, int iito, ThrData * const thr)
pm.denom_vdw;
switch2 = 12.0*rsq * (pm.cut_outersq-rsq) *
(rsq-pm.cut_innersq) / pm.denom_vdw;
force_kernel = force_kernel*switch1 + eng_morse*switch2;
eng_morse *= switch1;
force_kernel = force_kernel*switch1 + eng_morse*switch2/rsq;
force_angle *= switch1;
eng_morse *= switch1;
}
if (EFLAG) {