ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/calc_dipole_dipole.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/calc_dipole_dipole.F90 (file contents):
Revision 469 by mmeineke, Mon Apr 7 20:06:31 2003 UTC vs.
Revision 621 by gezelter, Wed Jul 16 02:11:02 2003 UTC

# Line 31 | Line 31 | contains
31      return
32    end subroutine initialize_dipole
33  
34
34    subroutine do_dipole_pair(atom1, atom2, d, rij, r2, pot, u_l, f, t, &
35         do_pot, do_stress)
36      
# Line 80 | Line 79 | contains
79      ul2(3) = u_l(3,atom2)
80   #endif
81  
83    if( atom1 .eq. 2 )then
84       write (0,*) 'ul =', ul1(1), ul1(2), ul1(3)
85    endif
82  
87    if( atom2 .eq. 2 )then
88       write (0,*) 'ul =', ul2(1), ul2(2), ul2(3)
89    endif
90
91
83      call getElementProperty(atypes, me1, "dipole_moment", mu1)
84      call getElementProperty(atypes, me2, "dipole_moment", mu2)
85  
# Line 149 | Line 140 | contains
140        
141  
142   #ifdef IS_MPI
143 <       f_Row(1,atom1) = f_Row(1,atom1) - dudx
144 <       f_Row(2,atom1) = f_Row(2,atom1) - dudy
145 <       f_Row(3,atom1) = f_Row(3,atom1) - dudz
143 >       f_Row(1,atom1) = f_Row(1,atom1) + dudx
144 >       f_Row(2,atom1) = f_Row(2,atom1) + dudy
145 >       f_Row(3,atom1) = f_Row(3,atom1) + dudz
146  
147 <       f_Col(1,atom2) = f_Col(1,atom2) + dudx
148 <       f_Col(2,atom2) = f_Col(2,atom2) + dudy
149 <       f_Col(3,atom2) = f_Col(3,atom2) + dudz
147 >       f_Col(1,atom2) = f_Col(1,atom2) - dudx
148 >       f_Col(2,atom2) = f_Col(2,atom2) - dudy
149 >       f_Col(3,atom2) = f_Col(3,atom2) - dudz
150        
151         t_Row(1,atom1) = t_Row(1,atom1) - ul1(2)*dudu1z + ul1(3)*dudu1y
152         t_Row(2,atom1) = t_Row(2,atom1) - ul1(3)*dudu1x + ul1(1)*dudu1z
# Line 165 | Line 156 | contains
156         t_Col(2,atom2) = t_Col(2,atom2) - ul2(3)*dudu2x + ul2(1)*dudu2z
157         t_Col(3,atom2) = t_Col(3,atom2) - ul2(1)*dudu2y + ul2(2)*dudu2x
158   #else
159 <       f(1,atom1) = f(1,atom1) - dudx
160 <       f(2,atom1) = f(2,atom1) - dudy
161 <       f(3,atom1) = f(3,atom1) - dudz
159 >       f(1,atom1) = f(1,atom1) + dudx
160 >       f(2,atom1) = f(2,atom1) + dudy
161 >       f(3,atom1) = f(3,atom1) + dudz
162        
163 <       f(1,atom2) = f(1,atom2) + dudx
164 <       f(2,atom2) = f(2,atom2) + dudy
165 <       f(3,atom2) = f(3,atom2) + dudz
163 >       f(1,atom2) = f(1,atom2) - dudx
164 >       f(2,atom2) = f(2,atom2) - dudy
165 >       f(3,atom2) = f(3,atom2) - dudz
166        
167         t(1,atom1) = t(1,atom1) - ul1(2)*dudu1z + ul1(3)*dudu1y
168         t(2,atom1) = t(2,atom1) - ul1(3)*dudu1x + ul1(1)*dudu1z
# Line 183 | Line 174 | contains
174   #endif
175        
176         if (do_stress) then          
177 <          tau_Temp(1) = tau_Temp(1) + dudx * d(1)
178 <          tau_Temp(2) = tau_Temp(2) + dudx * d(2)
179 <          tau_Temp(3) = tau_Temp(3) + dudx * d(3)
180 <          tau_Temp(4) = tau_Temp(4) + dudy * d(1)
181 <          tau_Temp(5) = tau_Temp(5) + dudy * d(2)
182 <          tau_Temp(6) = tau_Temp(6) + dudy * d(3)
183 <          tau_Temp(7) = tau_Temp(7) + dudz * d(1)
184 <          tau_Temp(8) = tau_Temp(8) + dudz * d(2)
185 <          tau_Temp(9) = tau_Temp(9) + dudz * d(3)
186 <          virial_Temp = virial_Temp + (tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
177 >
178 >          if (molMembershipList(atom1) .ne. molMembershipList(atom2)) then
179 >
180 >             ! because the d vector is the rj - ri vector, and
181 >             ! because dudx, dudy, dudz are the (positive) force on
182 >             ! atom i (negative on atom j) we need a negative sign here:
183 >
184 >             tau_Temp(1) = tau_Temp(1) - d(1) * dudx
185 >             tau_Temp(2) = tau_Temp(2) - d(1) * dudy
186 >             tau_Temp(3) = tau_Temp(3) - d(1) * dudz
187 >             tau_Temp(4) = tau_Temp(4) - d(2) * dudx
188 >             tau_Temp(5) = tau_Temp(5) - d(2) * dudy
189 >             tau_Temp(6) = tau_Temp(6) - d(2) * dudz
190 >             tau_Temp(7) = tau_Temp(7) - d(3) * dudx
191 >             tau_Temp(8) = tau_Temp(8) - d(3) * dudy
192 >             tau_Temp(9) = tau_Temp(9) - d(3) * dudz
193 >
194 >             virial_Temp = virial_Temp + &
195 >                  (tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
196 >
197 >          endif          
198         endif
199        
200      endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines