/[MITgcm]/MITgcm/pkg/generic_advdiff/gad_os7mp_adv_r.F
ViewVC logotype

Diff of /MITgcm/pkg/generic_advdiff/gad_os7mp_adv_r.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1 by adcroft, Sat Jan 20 21:20:11 2007 UTC revision 1.6 by mlosch, Fri Oct 5 10:50:47 2007 UTC
# Line 33  C     == Routine arguments == Line 33  C     == Routine arguments ==
33  C     == Local variables ==  C     == Local variables ==
34        INTEGER i,j,kp3,kp2,kp1,km1,km2,km3,km4        INTEGER i,j,kp3,kp2,kp1,km1,km2,km3,km4
35        _RL cfl,Psi        _RL cfl,Psi
36        _RL wLoc,Fac,Del,DelIp,DelI,Phi,Eps,rp1h,Msk        _RL wLoc,Fac,DelIp,DelI,Phi,Eps,rp1h,rp1h_cfl
37        _RL Qippp,Qipp,Qip,Qi,Qim,Qimm,Qimmm        _RL Qippp,Qipp,Qip,Qi,Qim,Qimm,Qimmm
38        _RL MskIpp,MskIp,MskI,MskIm,MskImm,MskImmm        _RL MskIpp,MskIp,MskI,MskIm,MskImm,MskImmm
39        _RL d2,d2p1,d2m1,A,B,C,D        _RL d2,d2p1,d2m1,A,B,C,D
40        _RL dp1h,dm1h,qMD,qUL,qLC,PhiMD,PhiLC,PhiMin,PhiMax        _RL dp1h,dm1h,qMD,qUL,qLC,PhiMD,PhiLC,PhiMin,PhiMax
41          _RL DelM,DelP,DelMM,DelPP,DelMMM,DelPPP
42          _RL Del2MM,Del2M,Del2,Del2P,Del2PP
43          _RL Del3MM,Del3M,Del3P,Del3PP
44          _RL Del4M,Del4,Del4P
45          _RL Del5M,Del5P
46          _RL Del6
47    
48        Eps = 1. _d -20        Eps = 1. _d -20
49    
# Line 55  C     == Local variables == Line 61  C     == Local variables ==
61          wLoc = wFld(i,j)          wLoc = wFld(i,j)
62          cfl = abs(wLoc*deltaTloc*recip_drC(k))          cfl = abs(wLoc*deltaTloc*recip_drC(k))
63    
64          IF (wLoc.lt.0.) THEN          IF (wTrans(i,j).lt.0.) THEN
65           Qippp = Q(i,j,kp2)           Qippp = Q(i,j,kp2)
66           Qipp  = Q(i,j,kp1)           Qipp  = Q(i,j,kp1)
67           Qip   = Q(i,j,k)           Qip   = Q(i,j,k)
# Line 70  C     == Local variables == Line 76  C     == Local variables ==
76           MskIm   = maskC(i,j,km1,bi,bj) * float(km1-km2)           MskIm   = maskC(i,j,km1,bi,bj) * float(km1-km2)
77           MskImm  = maskC(i,j,km2,bi,bj) * float(km2-km3)           MskImm  = maskC(i,j,km2,bi,bj) * float(km2-km3)
78           MskImmm = maskC(i,j,km3,bi,bj) * float(km3-km4)           MskImmm = maskC(i,j,km3,bi,bj) * float(km3-km4)
79          ELSEIF (wLoc.gt.0.) THEN          ELSEIF (wTrans(i,j).gt.0.) THEN
80           Qippp = Q(i,j,km3)           Qippp = Q(i,j,km3)
81           Qipp  = Q(i,j,km2)           Qipp  = Q(i,j,km2)
82           Qip   = Q(i,j,km1)           Qip   = Q(i,j,km1)
# Line 85  C     == Local variables == Line 91  C     == Local variables ==
91           MskIm   = maskC(i,j,kp1,bi,bj) * float(kp1-k)           MskIm   = maskC(i,j,kp1,bi,bj) * float(kp1-k)
92           MskImm  = maskC(i,j,kp2,bi,bj) * float(kp2-kp1)           MskImm  = maskC(i,j,kp2,bi,bj) * float(kp2-kp1)
93           MskImmm = maskC(i,j,kp3,bi,bj) * float(kp3-kp2)           MskImmm = maskC(i,j,kp3,bi,bj) * float(kp3-kp2)
94            ELSE
95             Qippp = 0. _d 0
96             Qipp  = 0. _d 0
97             Qip   = 0. _d 0
98             Qi    = 0. _d 0
99             Qim   = 0. _d 0
100             Qimm  = 0. _d 0
101             Qimmm = 0. _d 0
102    
103             MskIpp  = 0. _d 0
104             MskIp   = 0. _d 0
105             MskI    = 0. _d 0
106             MskIm   = 0. _d 0
107             MskImm  = 0. _d 0
108             MskImmm = 0. _d 0
109          ENDIF          ENDIF
110    
111          IF (wLoc.ne.0.) THEN          IF (wTrans(i,j).ne.0.) THEN
          Phi = 0.  
112  C        2nd order correction [i i-1]  C        2nd order correction [i i-1]
113           Fac = 1.           Fac = 1.
114           Del = Qip-Qi           DelP = (Qip-Qi)*MskI
115           Msk = MskI           Phi = Fac * DelP
          Phi = Msk * Fac * Del  
116  C        3rd order correction [i i-1 i-2]  C        3rd order correction [i i-1 i-2]
117           Fac = Fac * ( cfl + 1. )/3.           Fac = Fac * ( cfl + 1. )/3.
118           Del = Del - ( Qi-Qim )           DelM = (Qi-Qim)*MskIm
119           Msk = Msk * MskIm           Del2 = DelP - DelM
120           Phi = Phi - Msk * Fac * Del           Phi = Phi - Fac * Del2
121  C        4th order correction [i+1 i i-1 i-2]  C        4th order correction [i+1 i i-1 i-2]
122           Fac = Fac * ( cfl - 2. )/4.           Fac = Fac * ( cfl - 2. )/4.
123           Del = ( Qipp-2.*Qip+Qi ) - Del           DelPP = (Qipp-Qip)*MskIp*MskI
124           Msk = Msk * MskIp           Del2P = DelPP - DelP
125           Phi = Phi + Msk * Fac * Del           Del3P = Del2P - Del2
126             Phi = Phi + Fac * Del3p
127  C        5th order correction [i+1 i i-1 i-2 i-3]  C        5th order correction [i+1 i i-1 i-2 i-3]
128           Fac = Fac * ( cfl - 3. )/5.           Fac = Fac * ( cfl - 3. )/5.
129           Del = Del - ( Qip-3.*Qi+3.*Qim-Qimm )           DelMM = (Qim-Qimm)*MskImm*MskIm
130           Msk = Msk * MskImm           Del2M = DelM - DelMM
131           Phi = Phi + Msk * Fac * Del           Del3M = Del2 - Del2M
132             Del4 = Del3P - Del3M
133             Phi = Phi + Fac * Del4
134  C        6th order correction [i+2 i+1 i i-1 i-2 i-3]  C        6th order correction [i+2 i+1 i i-1 i-2 i-3]
135           Fac = Fac * ( cfl + 2. )/6.           Fac = Fac * ( cfl + 2. )/6.
136           Del = ( Qippp-4.*Qipp+6.*Qip-4.*Qi+Qim ) - Del           DelPPP = (Qippp-Qipp)*MskIpp*MskIp*MskI
137           Msk = Msk * MskIpp           Del2PP = DelPP - DelP
138           Phi = Phi + Msk * Fac * Del           Del3PP = Del2PP - Del2P
139             Del4P = Del3PP - Del3P
140             Del5P = Del4P - Del4
141             Phi = Phi + Fac * Del5P
142  C        7th order correction [i+2 i+1 i i-1 i-2 i-3 i-4]  C        7th order correction [i+2 i+1 i i-1 i-2 i-3 i-4]
143           Fac = Fac * ( cfl + 2. )/7.           Fac = Fac * ( cfl + 2. )/7.
144           Del = Del - ( Qipp-5.*Qip+10.*Qi-10.*Qim+5.*Qimm-Qimmm )           DelMMM = (Qimm-Qimmm)*MskImmm*MskImm*MskIm
145           Msk = Msk * MskImmm           Del2MM = DelMM - DelMMM
146           Phi = Phi - Msk * Fac * Del           Del3MM = Del2M - Del2MM
147             Del4M = Del3M - Del3MM
148             Del5M = Del4 - Del4M
149             Del6 = Del5P - Del5M
150             Phi = Phi - Fac * Del6
151    
152           DelIp = ( Qip - Qi ) * MskI           DelIp = ( Qip - Qi ) * MskI
153           Phi = sign(1.,Phi)*sign(1.,DelIp)*abs(Phi+Eps)/abs(DelIp+Eps)           Phi = sign(1. _d 0,Phi)*sign(1. _d 0,DelIp)
154         &        *abs(Phi+Eps)/abs(DelIp+Eps)
155    
156           DelI = ( Qi - Qim ) * MskIm           DelI = ( Qi - Qim ) * MskIm
157           rp1h =sign(1.,DelI)*sign(1.,DelIp)*abs(DelI+Eps)/abs(DelIp+Eps)           rp1h =sign(1. _d 0,DelI)*sign(1. _d 0,DelIp)
158         &        *abs(DelI+Eps)/abs(DelIp+Eps)
159             rp1h_cfl = rp1h/(cfl+Eps)
160    
161  C        TVD limiter  C        TVD limiter
162  !        Phi = max(0., min( 2./(1-cfl), Phi, 2.*rp1h/cfl ) )  !        Phi = max(0. _d 0, min( 2./(1-cfl), Phi, 2.*rp1h_cfl ) )
163    
164  C        MP limiter  C        MP limiter
165           d2   = ( ( Qip + Qim ) - 2.*Qi  ) * MskI * MskIm           d2   = Del2 !( ( Qip + Qim ) - 2.*Qi  ) * MskI * MskIm
166           d2p1 = ( ( Qipp + Qi ) - 2.*Qip ) * MskIp * MskI           d2p1 = Del2P !( ( Qipp + Qi ) - 2.*Qip ) * MskIp * MskI
167           d2m1 = ( ( Qi + Qimm ) - 2.*Qim ) * MskIm * MskImm           d2m1 = Del2M !( ( Qi + Qimm ) - 2.*Qim ) * MskIm * MskImm
168           A = 4.*d2 - d2p1           A = 4.*d2 - d2p1
169           B = 4.*d2p1 - d2           B = 4.*d2p1 - d2
170           C = d2           C = d2
171           D = d2p1;           D = d2p1
172           dp1h = max(min(A,B,C,D),0.)+min(max(A,B,C,D),0.)           dp1h = max(min(A,B,C,D),0. _d 0)+min(max(A,B,C,D),0. _d 0)
173           A = 4.*d2m1 - d2           A = 4.*d2m1 - d2
174           B = 4.*d2 - d2m1           B = 4.*d2 - d2m1
175           C = d2m1           C = d2m1
176           D = d2;           D = d2
177           dm1h = max(min(A,B,C,D),0.)+min(max(A,B,C,D),0.)           dm1h = max(min(A,B,C,D),0. _d 0)+min(max(A,B,C,D),0. _d 0)
178           qMD = 0.5*( ( Qi + Qip ) - dp1h )          !qMD = 0.5*( ( Qi + Qip ) - dp1h )
179           qUL = Qi + (1.-cfl)/cfl*( Qi-Qim )           qMD = 0.5*( ( 2.*Qi + DelIp ) - dp1h )
180           qLC = Qi + 0.5*( 1.+dm1h/(Qi-Qim+Eps) )*(qUL-Qi)           qUL = Qi + (1.-cfl)/(cfl+Eps)*DelI
181           PhiMD = 2./(1.-cfl)*(qMD-Qi+Eps)/(Qip-Qi+Eps)           qLC = Qi + 0.5*( 1.+dm1h/(DelI+Eps) )*(qUL-Qi)
182           PhiLC = 2.*rp1h/cfl*(qLC-Qi+Eps)/(qUL-Qi+Eps)           PhiMD = 2./(1.-cfl)*(qMD-Qi+Eps)/(DelIp+Eps)
183           PhiMin = max(min(0.,PhiMD),min(0.,2.*rp1h/cfl,PhiLC))           PhiLC = 2.*rp1h_cfl*(qLC-Qi+Eps)/(qUL-Qi+Eps)
184           PhiMax = min(max(2./(1.-cfl),PhiMD),max(0.,2.*rp1h/cfl,PhiLC))           PhiMin = max(min(0. _d 0,PhiMD),
185         &        min(0. _d 0,2.*rp1h_cfl,PhiLC))
186             PhiMax = min(max(2. _d 0/(1.-cfl),PhiMD),
187         &        max(0. _d 0,2.*rp1h_cfl,PhiLC))
188           Phi = max(PhiMin,min(Phi,PhiMax))           Phi = max(PhiMin,min(Phi,PhiMax))
189    
190           Psi = Phi * 0.5 * (1. - cfl)           Psi = Phi * 0.5 * (1. - cfl)
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.6
  ViewVC Help
Powered by ViewVC 1.1.22