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 635 by gezelter, Thu Jul 17 20:32:24 2003 UTC vs.
Revision 730 by gezelter, Wed Aug 27 16:25:11 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.11 2003-07-17 20:32:24 gezelter Exp $, $Date: 2003-07-17 20:32:24 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $
12 > !! @version $Id: calc_sticky_pair.F90,v 1.14 2003-08-27 16:25:11 gezelter Exp $, $Date: 2003-08-27 16:25:11 $, $Name: not supported by cvs2svn $, $Revision: 1.14 $
13  
14   module sticky_pair
15  
# Line 32 | Line 32 | module sticky_pair
32    real( kind = dp ), save :: SSD_ru = 0.0_dp
33    real( kind = dp ), save :: SSD_rlp = 0.0_dp
34    real( kind = dp ), save :: SSD_rup = 0.0_dp
35 +  real( kind = dp ), save :: SSD_rbig = 0.0_dp
36  
37    public :: check_sticky_FF
38    public :: set_sticky_params
# Line 62 | Line 63 | contains
63      SSD_ru = sticky_ru
64      SSD_rlp = sticky_rlp
65      SSD_rup = sticky_rup
66 +
67 +    if (SSD_ru .gt. SSD_rup) then
68 +       SSD_rbig = SSD_ru
69 +    else
70 +       SSD_rbig = SSD_rup
71 +    endif
72    
73      sticky_initialized = .true.
74      return
# Line 104 | Line 111 | contains
111      real (kind=dp) :: rijtest, rjitest
112      real (kind=dp) :: radcomxi, radcomyi, radcomzi
113      real (kind=dp) :: radcomxj, radcomyj, radcomzj
114 +    integer :: id1, id2
115  
108
116      if (.not.sticky_initialized) then
117         write(*,*) 'Sticky forces not initialized!'
118         return
119      endif
120  
121 <    if ( rij .LE. SSD_rup ) then
121 >    if ( rij .LE. SSD_rbig ) then
122  
123         r3 = r2*rij
124         r5 = r3*r2
# Line 339 | Line 346 | contains
346   #endif
347  
348         if (do_stress) then          
342          if (molMembershipList(atom1) .ne. molMembershipList(atom2)) then
349  
350 + #ifdef IS_MPI
351 +          id1 = tagRow(atom1)
352 +          id2 = tagColumn(atom2)
353 + #else
354 +          id1 = atom1
355 +          id2 = atom2
356 + #endif
357 +
358 +          if (molMembershipList(id1) .ne. molMembershipList(id2)) then
359 +
360               ! because the d vector is the rj - ri vector, and
361               ! because fxradial, fyradial, and fzradial are the
362               ! (positive) force on atom i (negative on atom j) we need

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines