ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE_old/src/mdtools/libmdCode/calc_dipole_dipole.F90
(Generate patch)

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/calc_dipole_dipole.F90 (file contents):
Revision 317 by gezelter, Tue Mar 11 23:13:06 2003 UTC vs.
Revision 326 by gezelter, Wed Mar 12 19:31:55 2003 UTC

# Line 12 | Line 12 | module dipole_dipole
12    
13    contains
14    
15 <  subroutine do_dipole_pair(atom1, atom2, d, rij, pot, u_l, f, t)
15 >  subroutine do_dipole_pair(atom1, atom2, d, rij, pot, u_l, f, t, &
16 >       do_pot, do_stress)
17      
18 +    logical :: do_pot, do_stress
19 +
20      integer atom1, atom2, me1, me2
21      double precision rij, mu1, mu2
22      double precision dfact1, dfact2, dip2, r2, r3, r5, pre
# Line 87 | Line 90 | module dipole_dipole
90        
91         vterm = dip2*((u1dotu2/r3) - 3.0d0*(rdotu1*rdotu2/r5))
92        
93 +       if (do_pot) then
94   #ifdef IS_MPI
95 <       pot_row(atom1) = pot_row(atom1) + 0.5d0*vterm*taper
96 <       pot_col(atom2) = pot_col(atom2) + 0.5d0*vterm*taper
95 >          pot_row(atom1) = pot_row(atom1) + 0.5d0*vterm*taper
96 >          pot_col(atom2) = pot_col(atom2) + 0.5d0*vterm*taper
97   #else
98 <       pot = pot + vterm*taper
98 >          pot = pot + vterm*taper
99   #endif
100 +       endif
101        
102         dudx = (-dfact1 * d(1) * ((u1dotu2/r3) - &
103              (5.0d0*(rdotu1*rdotu2)/r5)) -  &
# Line 152 | Line 157 | module dipole_dipole
157         t(3,atom2) = t(3,atom2) - ul2(1)*dudu2y + ul2(2)*dudu2x
158   #endif
159        
160 <       if (doStress()) then          
160 >       if (do_stress) then          
161            tau_Temp(1) = tau_Temp(1) + dudx * d(1)
162            tau_Temp(2) = tau_Temp(2) + dudx * d(2)
163            tau_Temp(3) = tau_Temp(3) + dudx * d(3)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines