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

Comparing trunk/OOPSE/libmdtools/calc_charge_charge.F90 (file contents):
Revision 1138 by gezelter, Wed Apr 28 21:39:22 2004 UTC vs.
Revision 1143 by tim, Thu Apr 29 16:03:38 2004 UTC

# Line 115 | Line 115 | contains
115      real( kind = dp ), dimension(3) :: d, dc
116      real( kind = dp ), dimension(3,nLocal) :: f
117      real( kind = dp ), dimension(nLocal) :: mfact
118 <    real( kind = dp ) :: theR, term1, term2, fxij, fyij, fzij
118 >    real( kind = dp ) :: theR, term1, term2
119      real( kind = dp ) :: fxab, fyab, fzab, fxba, fyba, fzba
120      
121      if (.not. haveCutoffs) then
# Line 163 | Line 163 | contains
163  
164         if (molecular_cutoffs) then
165  
166 <          term1 = vterm * (taper / rij)
167 <        
168 <          fxij = term1 * d(1) / rij
169 <          fyij = term1 * d(2) / rij
170 <          fzij = term1 * d(3) / rij
166 >          term1 = -vterm * (taper / rij)
167  
168 +          fx = term1 * d(1) / rij
169 +          fy = term1 * d(2) / rij
170 +          fz = term1 * d(3) / rij
171 +
172            term2 = vterm * dtdr * mfact(atom1)
173  
174            fxab = term2 * dc(1) / rcij

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines