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

Comparing trunk/OOPSE/libmdtools/calc_sticky_pair.F90 (file contents):
Revision 378 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
Revision 394 by gezelter, Mon Mar 24 21:55:34 2003 UTC

# Line 9 | Line 9
9   !! @author Matthew Meineke
10   !! @author Christopher Fennel
11   !! @author J. Daniel Gezelter
12 < !! @version $Id: calc_sticky_pair.F90,v 1.1.1.1 2003-03-21 17:42:12 mmeineke Exp $, $Date: 2003-03-21 17:42:12 $, $Name: not supported by cvs2svn $, $Revision: 1.1.1.1 $
12 > !! @version $Id: calc_sticky_pair.F90,v 1.2 2003-03-24 21:55:34 gezelter Exp $, $Date: 2003-03-24 21:55:34 $, $Name: not supported by cvs2svn $, $Revision: 1.2 $
13  
14   module sticky_pair
15  
# Line 92 | Line 92 | contains
92      real (kind=dp) :: fxii, fyii, fzii, fxjj, fyjj, fzjj
93      real (kind=dp) :: fxij, fyij, fzij, fxji, fyji, fzji      
94      real (kind=dp) :: fxradial, fyradial, fzradial
95 +    real (kind=dp) :: rijtest, rjitest
96        
97      if (.not.sticky_initialized) then
98         write(*,*) 'Sticky forces not initialized!'
# Line 140 | Line 141 | contains
141      xj2 = xj*xj
142      yj2 = yj*yj
143      zj2 = zj*zj
144 <    
144 >  
145      call calc_sw_fnc(rij, s, sp, dsdr, dspdr)
146      
147      wi = 2.0d0*(xi2-yi2)*zi / r3
# Line 157 | Line 158 | contains
158      wjp = zjf*zjf*zjs*zjs - SSD_w0
159      wp = wip + wjp
160  
160
161      if (do_pot) then
162   #ifdef IS_MPI
163         pot_row(atom1) = pot_row(atom1) + 0.25d0*SSD_v0*(s*w + sp*wp)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines