ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/DarkSide/switcheroo.F90
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/switcheroo.F90 (file contents):
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 2424 by chrisfen, Fri Nov 11 15:21:55 2005 UTC

# Line 48 | Line 48 | module switcheroo
48  
49   #define __FORTRAN90
50   #include "UseTheForce/fSwitchingFunction.h"
51 + #include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
52  
53    real ( kind = dp ), dimension(NSWITCHTYPES) :: rin
54    real ( kind = dp ), dimension(NSWITCHTYPES) :: rout
55    real ( kind = dp ), dimension(NSWITCHTYPES) :: rin2
56    real ( kind = dp ), dimension(NSWITCHTYPES) :: rout2
57 +  real ( kind = dp ), save :: c0, c1, c2, c3, c4, c5
58  
59    logical, dimension(NSWITCHTYPES) :: isOK
60 +  logical, save :: haveFunctionType = .false.
61 +  integer, save :: functionType = CUBIC
62  
63  
64    public::set_switch
65 +  public::set_function_type
66    public::get_switch
67  
68   contains
# Line 95 | Line 100 | contains
100  
101    end subroutine set_switch
102  
103 +  subroutine set_function_type(functionForm)
104 +    integer, intent(in) :: functionForm    
105 +    functionType = functionForm
106 +
107 +    if (functionType .eq. FIFTH_ORDER_POLY) then
108 +       c0 = 1.0d0
109 +       c1 = 0.0d0
110 +       c2 = 0.0d0
111 +       c3 = -10.0d0
112 +       c4 = 15.0d0
113 +       c5 = -6.0d0
114 +    endif
115 +  end subroutine set_function_type
116 +
117    subroutine get_switch(r2, sw, dswdr, r, SwitchType, in_switching_region)
118  
119      real( kind = dp ), intent(in) :: r2
120      real( kind = dp ), intent(inout) :: sw, dswdr, r
121      real( kind = dp ) :: ron, roff
122 +    real( kind = dp ) :: rval, rval2, rval3, rval4, rval5
123 +    real( kind = dp ) :: rvaldi, rvaldi2, rvaldi3, rvaldi4, rvaldi5
124      integer, intent(in)    :: SwitchType
125      logical, intent(inout) :: in_switching_region
126  
# Line 127 | Line 148 | contains
148            ron = rin(SwitchType)
149            roff = rout(SwitchType)
150  
151 <          sw = (roff + 2.0d0*r - 3.0d0*ron)*(roff-r)**2/ ((roff-ron)**3)
152 <          dswdr = 6.0d0*(r*r - r*ron - r*roff +roff*ron)/((roff-ron)**3)
151 >          if (functionType .eq. FIFTH_ORDER_POLY) then
152 >             rval = ( r - ron )
153 >             rval2 = rval*rval
154 >             rval3 = rval2*rval
155 >             rval4 = rval2*rval2
156 >             rval5 = rval3*rval2
157 >             rvaldi = 1.0d0/( roff - ron )
158 >             rvaldi2 = rvaldi*rvaldi
159 >             rvaldi3 = rvaldi2*rvaldi
160 >             rvaldi4 = rvaldi2*rvaldi2
161 >             rvaldi5 = rvaldi3*rvaldi2
162 >             sw = c0 + c1*rval*rvaldi + c2*rval2*rvaldi2 + c3*rval3*rvaldi3 &
163 >                  + c4*rval4*rvaldi4 + c5*rval5*rvaldi5
164 >             dswdr = c1*rvaldi + 2.0d0*c2*rval*rvaldi2 &
165 >                  + 3.0d0*c3*rval2*rvaldi3 + 4.0d0*c4*rval3*rvaldi4 &
166 >                  + 5.0d0*c5*rval4*rvaldi5
167  
168 +          else
169 +             sw = (roff + 2.0d0*r - 3.0d0*ron)*(roff-r)**2/ ((roff-ron)**3)
170 +             dswdr = 6.0d0*(r*r - r*ron - r*roff +roff*ron)/((roff-ron)**3)
171 +
172 +          endif
173            in_switching_region = .true.
174            return          
175         endif
# Line 138 | Line 178 | end module switcheroo
178      endif
179  
180    end subroutine get_switch
181 +
182   end module switcheroo

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines