ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/UseTheForce/DarkSide/sticky.F90
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/UseTheForce/DarkSide/sticky.F90 (file contents):
Revision 1876 by gezelter, Thu Dec 9 20:27:59 2004 UTC vs.
Revision 1877 by tim, Thu Dec 9 21:15:19 2004 UTC

# Line 9 | Line 9
9   !! @author Matthew Meineke
10   !! @author Christopher Fennel
11   !! @author J. Daniel Gezelter
12 < !! @version $Id: sticky.F90,v 1.2.2.1 2004-12-09 20:27:59 gezelter Exp $, $Date: 2004-12-09 20:27:59 $, $Name: not supported by cvs2svn $, $Revision: 1.2.2.1 $
12 > !! @version $Id: sticky.F90,v 1.2.2.2 2004-12-09 21:15:19 tim Exp $, $Date: 2004-12-09 21:15:19 $, $Name: not supported by cvs2svn $, $Revision: 1.2.2.2 $
13  
14   module sticky
15  
# Line 18 | Line 18 | module sticky
18    use atype_module
19    use vector_class
20    use simulation
21 +  use status
22   #ifdef IS_MPI
23    use mpiSimulation
24   #endif
# Line 52 | Line 53 | contains
53      real( kind = dp ), intent(in) :: w0, v0, v0p
54      real( kind = dp ), intent(in) :: rl, ru
55      real( kind = dp ), intent(in) :: rlp, rup
56 +    integer :: nATypes, myATID
57 +
58      
59      isError = 0
60      myATID = getFirstMatchingElement(atypes, "c_ident", c_ident)
# Line 141 | Line 144 | contains
144      real (kind=dp) :: radcomxi, radcomyi, radcomzi
145      real (kind=dp) :: radcomxj, radcomyj, radcomzj
146      integer :: id1, id2
147 +    integer :: me1, me2
148 +   real (kind=dp) :: w0, v0, v0p, rl, ru, rlp, rup, rbig
149  
150 <    if (.not.allocated(StickyMap)) then
150 > if (.not.allocated(StickyMap)) then
151         call handleError("sticky", "no StickyMap was present before first call of do_sticky_pair!")
152         return
153      end if
# Line 428 | Line 433 | contains
433    !! calculates the switching functions and their derivatives for a given
434    subroutine calc_sw_fnc(r, rl, ru, rlp, rup, s, sp, dsdr, dspdr)
435      
436 <    real (kind=dp), intent(in) :: r
436 >    real (kind=dp), intent(in) :: r, rl, ru, rlp, rup
437      real (kind=dp), intent(inout) :: s, sp, dsdr, dspdr
438      
439      ! distances must be in angstroms
# Line 464 | Line 469 | end module sticky
469    subroutine newStickyType(c_ident, w0, v0, v0p, rl, ru, rlp, rup, isError)
470  
471      use definitions, ONLY : dp  
472 <    use sticky, ONLY : module_newStickyType = newStickyType
472 >    use sticky, ONLY : module_newStickyType => newStickyType
473  
474      integer, intent(inout) :: c_ident, isError
475      real( kind = dp ), intent(inout) :: w0, v0, v0p, rl, ru, rlp, rup

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines