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

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

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

revision 1.4 by heimbach, Sun Apr 3 16:05:34 2005 UTC revision 1.5 by jmc, Fri Oct 14 21:51:05 2005 UTC
# Line 39  C     wFld     :: velocity, vertical com Line 39  C     wFld     :: velocity, vertical com
39        _RL psiP,psiM,thetaP,thetaM        _RL psiP,psiM,thetaP,thetaM
40        _RL wFld        _RL wFld
41        _RL smallNo        _RL smallNo
42        _RL Rjjm,Rjjp  c     _RL Rjjm,Rjjp
43    
44        IF (.NOT. multiDimAdvection) THEN        IF (.NOT. multiDimAdvection) THEN
45  C      If using the standard time-stepping/advection schemes (ie. AB-II)  C      If using the standard time-stepping/advection schemes (ie. AB-II)
# Line 78  c       wFld = wVel(i,j,k,bi_arg,bj_arg) Line 78  c       wFld = wVel(i,j,k,bi_arg,bj_arg)
78          cfl=abs(wFld*dTarg*recip_drC(k))          cfl=abs(wFld*dTarg*recip_drC(k))
79          d0=(2.-cfl)*(1.-cfl)*oneSixth          d0=(2.-cfl)*(1.-cfl)*oneSixth
80          d1=(1.-cfl*cfl)*oneSixth          d1=(1.-cfl*cfl)*oneSixth
81    #ifdef ALLOW_MATRIX
82            IF (.NOT.useMATRIX) THEN
83    #endif /* ALLOW_MATRIX */        
84          IF ( ABS(Rj).LT.smallNo .OR.          IF ( ABS(Rj).LT.smallNo .OR.
85       &       ABS(Rjm).LT.smallNo ) THEN       &       ABS(Rjm).LT.smallNo ) THEN
86           thetaP=0.           thetaP=0.
# Line 99  c       wFld = wVel(i,j,k,bi_arg,bj_arg) Line 102  c       wFld = wVel(i,j,k,bi_arg,bj_arg)
102       &       *( Tracer(i,j, k ,bi,bj) + psiM*Rj )       &       *( Tracer(i,j, k ,bi,bj) + psiM*Rj )
103       &   +0.5*(rTrans(i,j)-abs(rTrans(i,j)))       &   +0.5*(rTrans(i,j)-abs(rTrans(i,j)))
104       &       *( Tracer(i,j,km1,bi,bj) - psiP*Rj )       &       *( Tracer(i,j,km1,bi,bj) - psiP*Rj )
105    #ifdef ALLOW_MATRIX
106            ELSE
107              wT(i,j)=
108         &     0.5*(rTrans(i,j)+abs(rTrans(i,j)))
109         &        *( Tracer(i,j, k ,bi,bj) + (d0*Rj+d1*Rjp) )
110         &    +0.5*(rTrans(i,j)-abs(rTrans(i,j)))
111         &        *( Tracer(i,j,km1,bi,bj) - (d0*Rj+d1*Rjm) )
112            ENDIF
113    #endif /* ALLOW_MATRIX */
114    
115         ENDDO         ENDDO
116        ENDDO        ENDDO
117    
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5
  ViewVC Help
Powered by ViewVC 1.1.22