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

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

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

revision 1.4 by adcroft, Fri May 11 17:30:06 2007 UTC revision 1.5 by adcroft, Fri May 11 18:24:31 2007 UTC
# Line 35  C     == Routine arguments == Line 35  C     == Routine arguments ==
35  C     == Local variables ==  C     == Local variables ==
36        INTEGER i,j        INTEGER i,j
37        _RL cfl,Psi        _RL cfl,Psi
38        _RL vLoc,Fac,Del,DelIp,DelI,Phi,Eps,rp1h,rp1h_cfl,Msk        _RL vLoc,Fac,DelIp,DelI,Phi,Eps,rp1h,rp1h_cfl
39        _RL Qippp,Qipp,Qip,Qi,Qim,Qimm,Qimmm        _RL Qippp,Qipp,Qip,Qi,Qim,Qimm,Qimmm
40        _RL MskIpp,MskIp,MskI,MskIm,MskImm,MskImmm        _RL MskIpp,MskIp,MskI,MskIm,MskImm,MskImmm
41        _RL d2,d2p1,d2m1,A,B,C,D        _RL d2,d2p1,d2m1,A,B,C,D
42        _RL dp1h,dm1h,qMD,qUL,qLC,PhiMD,PhiLC,PhiMin,PhiMax        _RL dp1h,dm1h,qMD,qUL,qLC,PhiMD,PhiLC,PhiMin,PhiMax
43          _RL DelM,DelP,DelMM,DelPP,DelMMM,DelPPP
44          _RL Del2MM,Del2M,Del2,Del2P,Del2PP
45          _RL Del3MM,Del3M,Del3P,Del3PP
46          _RL Del4M,Del4,Del4P
47          _RL Del5M,Del5P
48          _RL Del6
49    
50        Eps = 1. _d -20        Eps = 1. _d -20
51    
# Line 94  C     == Local variables == Line 100  C     == Local variables ==
100          IF (vTrans(i,j).ne.0.) THEN          IF (vTrans(i,j).ne.0.) THEN
101  C        2nd order correction [i i-1]  C        2nd order correction [i i-1]
102           Fac = 1.           Fac = 1.
103           Del = Qip-Qi           DelP = (Qip-Qi)*MskI
104           Msk = MskI           Phi = Fac * DelP
          Phi = Msk * Fac * Del  
105  C        3rd order correction [i i-1 i-2]  C        3rd order correction [i i-1 i-2]
106           Fac = Fac * ( cfl + 1. )/3.           Fac = Fac * ( cfl + 1. )/3.
107           Del = Del - ( Qi-Qim )           DelM = (Qi-Qim)*MskIm
108           Msk = Msk * MskIm           Del2 = DelP - DelM
109           Phi = Phi - Msk * Fac * Del           Phi = Phi - Fac * Del2
110  C        4th order correction [i+1 i i-1 i-2]  C        4th order correction [i+1 i i-1 i-2]
111           Fac = Fac * ( cfl - 2. )/4.           Fac = Fac * ( cfl - 2. )/4.
112           Del = ( Qipp-2.*Qip+Qi ) - Del           DelPP = (Qipp-Qip)*MskIp*MskI
113           Msk = Msk * MskIp           Del2P = DelPP - DelP
114           Phi = Phi + Msk * Fac * Del           Del3P = Del2P - Del2
115             Phi = Phi + Fac * Del3p
116  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]
117           Fac = Fac * ( cfl - 3. )/5.           Fac = Fac * ( cfl - 3. )/5.
118           Del = Del - ( Qip-3.*Qi+3.*Qim-Qimm )           DelMM = (Qim-Qimm)*MskImm*MskIm
119           Msk = Msk * MskImm           Del2M = DelM - DelMM
120           Phi = Phi + Msk * Fac * Del           Del3M = Del2 - Del2M
121             Del4 = Del3P - Del3M
122             Phi = Phi + Fac * Del4
123  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]
124           Fac = Fac * ( cfl + 2. )/6.           Fac = Fac * ( cfl + 2. )/6.
125           Del = ( Qippp-4.*Qipp+6.*Qip-4.*Qi+Qim ) - Del           DelPPP = (Qippp-Qipp)*MskIpp*MskIp*MskI
126           Msk = Msk * MskIpp           Del2PP = DelPP - DelP
127           Phi = Phi + Msk * Fac * Del           Del3PP = Del2PP - Del2P
128             Del4P = Del3PP - Del3P
129             Del5P = Del4P - Del4
130             Phi = Phi + Fac * Del5P
131  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]
132           Fac = Fac * ( cfl + 2. )/7.           Fac = Fac * ( cfl + 2. )/7.
133           Del = Del - ( Qipp-5.*Qip+10.*Qi-10.*Qim+5.*Qimm-Qimmm )           DelMMM = (Qimm-Qimmm)*MskImmm*MskImm*MskIm
134           Msk = Msk * MskImmm           Del2MM = DelMM - DelMMM
135           Phi = Phi - Msk * Fac * Del           Del3MM = Del2M - Del2MM
136             Del4M = Del3M - Del3MM
137             Del5M = Del4 - Del4M
138             Del6 = Del5P - Del5M
139             Phi = Phi - Fac * Del6
140    
141           DelIp = ( Qip - Qi ) * MskI           DelIp = ( Qip - Qi ) * MskI
142           Phi = sign(1. _d 0,Phi)*sign(1. _d 0,DelIp)           Phi = sign(1. _d 0,Phi)*sign(1. _d 0,DelIp)
# Line 136  C        TVD limiter Line 151  C        TVD limiter
151  !        Phi = max(0. _d 0, min( 2./(1-cfl), Phi, 2.*rp1h_cfl ) )  !        Phi = max(0. _d 0, min( 2./(1-cfl), Phi, 2.*rp1h_cfl ) )
152    
153  C        MP limiter  C        MP limiter
154           d2   = ( ( Qip + Qim ) - 2.*Qi  ) * MskI * MskIm           d2   = Del2 !( ( Qip + Qim ) - 2.*Qi  ) * MskI * MskIm
155           d2p1 = ( ( Qipp + Qi ) - 2.*Qip ) * MskIp * MskI           d2p1 = Del2P !( ( Qipp + Qi ) - 2.*Qip ) * MskIp * MskI
156           d2m1 = ( ( Qi + Qimm ) - 2.*Qim ) * MskIm * MskImm           d2m1 = Del2M !( ( Qi + Qimm ) - 2.*Qim ) * MskIm * MskImm
157           A = 4.*d2 - d2p1           A = 4.*d2 - d2p1
158           B = 4.*d2p1 - d2           B = 4.*d2p1 - d2
159           C = d2           C = d2
# Line 149  C        MP limiter Line 164  C        MP limiter
164           C = d2m1           C = d2m1
165           D = d2;           D = d2;
166           dm1h = max(min(A,B,C,D),0. _d 0)+min(max(A,B,C,D),0. _d 0)           dm1h = max(min(A,B,C,D),0. _d 0)+min(max(A,B,C,D),0. _d 0)
167           qMD = 0.5*( ( Qi + Qip ) - dp1h )          !qMD = 0.5*( ( Qi + Qip ) - dp1h )
168           qUL = Qi + (1.-cfl)/(cfl+Eps)*( Qi-Qim )           qMD = 0.5*( ( 2.*Qi + DelIp ) - dp1h )
169           qLC = Qi + 0.5*( 1.+dm1h/(Qi-Qim+Eps) )*(qUL-Qi)           qUL = Qi + (1.-cfl)/(cfl+Eps)*DelI
170           PhiMD = 2./(1.-cfl)*(qMD-Qi+Eps)/(Qip-Qi+Eps)           qLC = Qi + 0.5*( 1.+dm1h/(DelI+Eps) )*(qUL-Qi)
171             PhiMD = 2./(1.-cfl)*(qMD-Qi+Eps)/(DelIp+Eps)
172           PhiLC = 2.*rp1h_cfl*(qLC-Qi+Eps)/(qUL-Qi+Eps)           PhiLC = 2.*rp1h_cfl*(qLC-Qi+Eps)/(qUL-Qi+Eps)
173           PhiMin = max(min(0. _d 0,PhiMD),           PhiMin = max(min(0. _d 0,PhiMD),
174       &        min(0. _d 0,2.*rp1h_cfl,PhiLC))       &        min(0. _d 0,2.*rp1h_cfl,PhiLC))
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5
  ViewVC Help
Powered by ViewVC 1.1.22