/[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.4 by adcroft, Fri May 11 18:24:31 2007 UTC revision 1.6 by mlosch, Fri Oct 5 10:50:47 2007 UTC
# Line 91  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 (wTrans(i,j).ne.0.) THEN          IF (wTrans(i,j).ne.0.) THEN
# Line 153  C        MP limiter Line 168  C        MP limiter
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. _d 0)+min(max(A,B,C,D),0. _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. _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)
178          !qMD = 0.5*( ( Qi + Qip ) - dp1h )          !qMD = 0.5*( ( Qi + Qip ) - dp1h )
179           qMD = 0.5*( ( 2.*Qi + DelIp ) - dp1h )           qMD = 0.5*( ( 2.*Qi + DelIp ) - dp1h )

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.6

  ViewVC Help
Powered by ViewVC 1.1.22