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 2723 by chrisfen, Thu Apr 20 21:02:00 2006 UTC vs.
Revision 2756 by gezelter, Wed May 17 15:37:15 2006 UTC

# Line 89 | Line 89 | contains
89         return
90      endif
91  
92 <    if ((router .lt. 0.0d0) .or. (rinner .lt. 0.0d0))  then
92 >    if ((router .lt. 0.0_dp) .or. (rinner .lt. 0.0_dp))  then
93         call handleError("set_switch", "one of the switches is negative!")
94         return
95      endif
# Line 109 | Line 109 | contains
109      do i = 1, np
110         r2 = rin2 + dble(i-1)*dx
111         xvals(i) = r2
112 <       yvals(i) = dsqrt(r2)
112 >       yvals(i) = sqrt(r2)
113      enddo
114  
115      call newSpline(r2spline, xvals, yvals, .true.)
116  
117      if (functionType .eq. FIFTH_ORDER_POLY) then
118 <       c0 = 1.0d0
119 <       c3 = -10.0d0
120 <       c4 = 15.0d0
121 <       c5 = -6.0d0
118 >       c0 = 1.0_dp
119 >       c3 = -10.0_dp
120 >       c4 = 15.0_dp
121 >       c5 = -6.0_dp
122  
123         dx = (rout-rin) / dble(np-1)
124      
# Line 131 | Line 131 | contains
131            rval3 = rval2*rval
132            rval4 = rval2*rval2
133            rval5 = rval3*rval2
134 <          rvaldi = 1.0d0/( rout - rin )
134 >          rvaldi = 1.0_dp/( rout - rin )
135            rvaldi2 = rvaldi*rvaldi
136            rvaldi3 = rvaldi2*rvaldi
137            rvaldi4 = rvaldi2*rvaldi2
# Line 145 | Line 145 | contains
145      else
146         rCubVals(1) = rin
147         rCubVals(2) = rout
148 <       sCubVals(1) = 1.0d0
149 <       sCubVals(2) = 0.0d0      
148 >       sCubVals(1) = 1.0_dp
149 >       sCubVals(2) = 0.0_dp      
150         call newSpline(switchSpline, rCubVals, sCubVals, .true.)
151      endif
152      
# Line 184 | Line 184 | contains
184      integer :: j
185      real ( kind = dp ) :: a, b, c, d, dx
186  
187 <    sw = 1.0d0
188 <    dswdr = 0.0d0
187 >    sw = 1.0_dp
188 >    dswdr = 0.0_dp
189      in_switching_region = .false.
190  
191      if (r2.gt.rin2) then
192         if (r2.gt.rout2) then
193  
194 <          sw = 0.0d0
195 <          dswdr = 0.0d0
194 >          sw = 0.0_dp
195 >          dswdr = 0.0_dp
196            return
197            
198         else        
# Line 203 | Line 203 | contains
203               dx = r - rin
204               sw = switchSpline%y(1) + dx*(dx*(switchSpline%c(1) + &
205                    dx*switchSpline%d(1)))
206 <             dswdr = dx*(2.0d0 * switchSpline%c(1) + &
207 <                  3.0d0 * dx * switchSpline%d(1))
206 >             dswdr = dx*(2.0_dp * switchSpline%c(1) + &
207 >                  3.0_dp * dx * switchSpline%d(1))
208            else
209               call lookupUniformSpline1d(switchSpline, r, sw, dswdr)
210            endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines