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

This commit is contained in:
sjplimp 2008-04-14 22:14:13 +00:00
parent 89bddb0624
commit 9f1a69e25a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/COLLOID/pair_lubricate.cpp
View File

@ -151,8 +151,8 @@ void PairLubricate::compute(int eflag, int vflag)
} else { } else {
inv_inertia = 1.0 / (0.4*atom->mass[itype]*radi*radi); inv_inertia = 1.0 / (0.4*atom->mass[itype]*radi*radi);
w1 = inv_inertia * (angmom[i][0] + angmom[j][0]); w1 = inv_inertia * (angmom[i][0] + angmom[j][0]);
w1 = inv_inertia * (angmom[i][0] + angmom[j][0]); w2 = inv_inertia * (angmom[i][1] + angmom[j][1]);
w1 = inv_inertia * (angmom[i][0] + angmom[j][0]); w3 = inv_inertia * (angmom[i][2] + angmom[j][2]);
} }
// relative velocities n X P . (v1-v2) = n X (I-nn) . (v1-v2) // relative velocities n X P . (v1-v2) = n X (I-nn) . (v1-v2)
@ -181,8 +181,8 @@ void PairLubricate::compute(int eflag, int vflag)
wr3 = omega[i][2] - omega[j][2]; wr3 = omega[i][2] - omega[j][2];
} else { } else {
wr1 = inv_inertia * (angmom[i][0] - angmom[j][0]); wr1 = inv_inertia * (angmom[i][0] - angmom[j][0]);
wr1 = inv_inertia * (angmom[i][0] - angmom[j][0]); wr2 = inv_inertia * (angmom[i][1] - angmom[j][1]);
wr1 = inv_inertia * (angmom[i][0] - angmom[j][0]); wr3 = inv_inertia * (angmom[i][2] - angmom[j][2]);
} }
wnnr = wr1*delx + wr2*dely + wr3*delz; wnnr = wr1*delx + wr2*dely + wr3*delz;
@ -219,7 +219,7 @@ void PairLubricate::compute(int eflag, int vflag)
(2.0/r)*a_shear*n_cross_omega_t_2; (2.0/r)*a_shear*n_cross_omega_t_2;
fz = -a_squeeze*vn3 - a_shear*(2.0/r)*(2.0/r)*vt3 + fz = -a_squeeze*vn3 - a_shear*(2.0/r)*(2.0/r)*vt3 +
(2.0/r)*a_shear*n_cross_omega_t_3; (2.0/r)*a_shear*n_cross_omega_t_3;
torque[i][0] += -(2.0/r)*a_shear*v_shear1 - a_shear*omega_t_1 - torque[i][0] += -(2.0/r)*a_shear*v_shear1 - a_shear*omega_t_1 -
a_pump*P_dot_wrel_1 - a_twist*wn1; a_pump*P_dot_wrel_1 - a_twist*wn1;
torque[i][1] += -(2.0/r)*a_shear*v_shear2 - a_shear*omega_t_2 - torque[i][1] += -(2.0/r)*a_shear*v_shear2 - a_shear*omega_t_2 -