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

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

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

revision 1.33 by jmc, Thu Dec 16 22:28:43 2004 UTC revision 1.57 by jmc, Fri Feb 8 20:03:36 2008 UTC
# Line 17  C !INTERFACE: ========================== Line 17  C !INTERFACE: ==========================
17       I     bi,bj, myTime,myIter,myThid)       I     bi,bj, myTime,myIter,myThid)
18    
19  C !DESCRIPTION:  C !DESCRIPTION:
20  C Calculates the tendancy of a tracer due to advection.  C Calculates the tendency of a tracer due to advection.
21  C It uses the multi-dimensional method given in \ref{sect:multiDimAdvection}  C It uses the multi-dimensional method given in \ref{sect:multiDimAdvection}
22  C and can only be used for the non-linear advection schemes such as the  C and can only be used for the non-linear advection schemes such as the
23  C direct-space-time method and flux-limiters.  C direct-space-time method and flux-limiters.
24  C  C
25  C The algorithm is as follows:  C The algorithm is as follows:
26  C \begin{itemize}  C \begin{itemize}
# Line 33  C      - \Delta t \partial_r (w\theta^{( Line 33  C      - \Delta t \partial_r (w\theta^{(
33  C \item{$G_\theta = ( \theta^{(n+3/3)} - \theta^{(n)} )/\Delta t$}  C \item{$G_\theta = ( \theta^{(n+3/3)} - \theta^{(n)} )/\Delta t$}
34  C \end{itemize}  C \end{itemize}
35  C  C
36  C The tendancy (output) is over-written by this routine.  C The tendency (output) is over-written by this routine.
37    
38  C !USES: ===============================================================  C !USES: ===============================================================
39        IMPLICIT NONE        IMPLICIT NONE
# Line 80  C  myThid            :: thread number Line 80  C  myThid            :: thread number
80        INTEGER myThid        INTEGER myThid
81    
82  C !OUTPUT PARAMETERS: ==================================================  C !OUTPUT PARAMETERS: ==================================================
83  C  gTracer           :: tendancy array  C  gTracer           :: tendency array
84        _RL gTracer(1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr,nSx,nSy)        _RL gTracer(1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr,nSx,nSy)
85    
86  C !LOCAL VARIABLES: ====================================================  C !LOCAL VARIABLES: ====================================================
87  C  maskUp        :: 2-D array for mask at W points  C  maskUp        :: 2-D array for mask at W points
88  C  maskLocW      :: 2-D array for mask at West points  C  maskLocW      :: 2-D array for mask at West points
89  C  maskLocS      :: 2-D array for mask at South points  C  maskLocS      :: 2-D array for mask at South points
 C  iMin,iMax,    :: loop range for called routines  
 C  jMin,jMax     :: loop range for called routines  
90  C [iMin,iMax]Upd :: loop range to update tracer field  C [iMin,iMax]Upd :: loop range to update tracer field
91  C [jMin,jMax]Upd :: loop range to update tracer field  C [jMin,jMax]Upd :: loop range to update tracer field
92  C  i,j,k         :: loop indices  C  i,j,k         :: loop indices
93  C  kup           :: index into 2 1/2D array, toggles between 1 and 2  C  kUp           :: index into 2 1/2D array, toggles between 1 and 2
94  C  kdown         :: index into 2 1/2D array, toggles between 2 and 1  C  kDown         :: index into 2 1/2D array, toggles between 2 and 1
95  C  kp1           :: =k+1 for k<Nr, =Nr for k=Nr  C  kp1           :: =k+1 for k<Nr, =Nr for k=Nr
96  C  xA,yA         :: areas of X and Y face of tracer cells  C  xA,yA         :: areas of X and Y face of tracer cells
97    C  uFld,vFld     :: 2-D local copy of horizontal velocity, U,V components
98    C  wFld          :: 2-D local copy of vertical velocity
99  C  uTrans,vTrans :: 2-D arrays of volume transports at U,V points  C  uTrans,vTrans :: 2-D arrays of volume transports at U,V points
100  C  rTrans        :: 2-D arrays of volume transports at W points  C  rTrans        :: 2-D arrays of volume transports at W points
101  C  rTransKp1     :: vertical volume transport at interface k+1  C  rTransKp1     :: vertical volume transport at interface k+1
# Line 110  C  calc_fluxes_X :: logical to indicate Line 110  C  calc_fluxes_X :: logical to indicate
110  C  calc_fluxes_Y :: logical to indicate to calculate fluxes in Y dir  C  calc_fluxes_Y :: logical to indicate to calculate fluxes in Y dir
111  C  interiorOnly  :: only update the interior of myTile, but not the edges  C  interiorOnly  :: only update the interior of myTile, but not the edges
112  C  overlapOnly   :: only update the edges of myTile, but not the interior  C  overlapOnly   :: only update the edges of myTile, but not the interior
113  C  nipass        :: number of passes in multi-dimensional method  C  npass         :: number of passes in multi-dimensional method
114  C  ipass         :: number of the current pass being made  C  ipass         :: number of the current pass being made
115  C  myTile        :: variables used to determine which cube face  C  myTile        :: variables used to determine which cube face
116  C  nCFace        :: owns a tile for cube grid runs using  C  nCFace        :: owns a tile for cube grid runs using
117  C                :: multi-dim advection.  C                :: multi-dim advection.
118  C [N,S,E,W]_edge :: true if N,S,E,W edge of myTile is an Edge of the cube  C [N,S,E,W]_edge :: true if N,S,E,W edge of myTile is an Edge of the cube
119        _RS maskUp  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)  c     _RS maskUp  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
120        _RS maskLocW(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS maskLocW(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
121        _RS maskLocS(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS maskLocS(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
       INTEGER iMin,iMax,jMin,jMax  
122        INTEGER iMinUpd,iMaxUpd,jMinUpd,jMaxUpd        INTEGER iMinUpd,iMaxUpd,jMinUpd,jMaxUpd
123        INTEGER i,j,k,kup,kDown        INTEGER i,j,k,kUp,kDown
124        _RS xA      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS xA      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
125        _RS yA      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RS yA      (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
126          _RL uFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
127          _RL vFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
128          _RL wFld    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
129        _RL uTrans  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL uTrans  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
130        _RL vTrans  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL vTrans  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
131        _RL rTrans  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL rTrans  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
# Line 137  C [N,S,E,W]_edge :: true if N,S,E,W edge Line 139  C [N,S,E,W]_edge :: true if N,S,E,W edge
139        _RL kp1Msk        _RL kp1Msk
140        LOGICAL calc_fluxes_X, calc_fluxes_Y, withSigns        LOGICAL calc_fluxes_X, calc_fluxes_Y, withSigns
141        LOGICAL interiorOnly, overlapOnly        LOGICAL interiorOnly, overlapOnly
142        INTEGER nipass,ipass        INTEGER npass, ipass
143        INTEGER myTile, nCFace        INTEGER nCFace
144        LOGICAL N_edge, S_edge, E_edge, W_edge        LOGICAL N_edge, S_edge, E_edge, W_edge
145    #ifdef ALLOW_EXCH2
146          INTEGER myTile
147    #endif
148  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
       INTEGER     kk  
149        CHARACTER*8 diagName        CHARACTER*8 diagName
150        CHARACTER*4 GAD_DIAG_SUFX, diagSufx        CHARACTER*4 diagSufx
151          LOGICAL     doDiagAdvX, doDiagAdvY, doDiagAdvR
152    C-    Functions:
153          CHARACTER*4 GAD_DIAG_SUFX
154        EXTERNAL    GAD_DIAG_SUFX        EXTERNAL    GAD_DIAG_SUFX
155          LOGICAL  DIAGNOSTICS_IS_ON
156          EXTERNAL DIAGNOSTICS_IS_ON
157  #endif  #endif
158  CEOP  CEOP
159    
160  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
161            act0 = tracerIdentity - 1            act0 = tracerIdentity
162            max0 = maxpass            max0 = maxpass
163            act1 = bi - myBxLo(myThid)            act1 = bi - myBxLo(myThid)
164            max1 = myBxHi(myThid) - myBxLo(myThid) + 1            max1 = myBxHi(myThid) - myBxLo(myThid) + 1
# Line 158  CEOP Line 167  CEOP
167            act3 = myThid - 1            act3 = myThid - 1
168            max3 = nTx*nTy            max3 = nTx*nTy
169            act4 = ikey_dynamics - 1            act4 = ikey_dynamics - 1
170            igadkey = (act0 + 1)            igadkey = act0
171       &                      + act1*max0       &                      + act1*max0
172       &                      + act2*max0*max1       &                      + act2*max0*max1
173       &                      + act3*max0*max1*max2       &                      + act3*max0*max1*max2
174       &                      + act4*max0*max1*max2*max3       &                      + act4*max0*max1*max2*max3
175            if (tracerIdentity.GT.maxpass) then            IF (tracerIdentity.GT.maxpass) THEN
176               print *, 'ph-pass gad_advection ', maxpass, tracerIdentity               print *, 'ph-pass gad_advection ', maxpass, tracerIdentity
177               STOP 'maxpass seems smaller than tracerIdentity'               STOP 'maxpass seems smaller than tracerIdentity'
178            endif            ENDIF
179  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
180    
181  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
182  C--   Set diagnostic suffix for the current tracer  C--   Set diagnostics flags and suffix for the current tracer
183          doDiagAdvX = .FALSE.
184          doDiagAdvY = .FALSE.
185          doDiagAdvR = .FALSE.
186        IF ( useDiagnostics ) THEN        IF ( useDiagnostics ) THEN
187          diagSufx = GAD_DIAG_SUFX( tracerIdentity, myThid )          diagSufx = GAD_DIAG_SUFX( tracerIdentity, myThid )
188            diagName = 'ADVx'//diagSufx
189            doDiagAdvX = DIAGNOSTICS_IS_ON( diagName, myThid )
190            diagName = 'ADVy'//diagSufx
191            doDiagAdvY = DIAGNOSTICS_IS_ON( diagName, myThid )
192            diagName = 'ADVr'//diagSufx
193            doDiagAdvR = DIAGNOSTICS_IS_ON( diagName, myThid )
194        ENDIF        ENDIF
195  #endif  #endif
196    
# Line 191  C     uninitialised but inert locations. Line 209  C     uninitialised but inert locations.
209          fVerT(i,j,1) = 0. _d 0          fVerT(i,j,1) = 0. _d 0
210          fVerT(i,j,2) = 0. _d 0          fVerT(i,j,2) = 0. _d 0
211          rTransKp1(i,j)= 0. _d 0          rTransKp1(i,j)= 0. _d 0
212    #ifdef ALLOW_AUTODIFF_TAMC
213            localTij(i,j) = 0. _d 0
214            wfld(i,j)    = 0. _d 0
215    #endif
216         ENDDO         ENDDO
217        ENDDO        ENDDO
218    
219  C--   Set tile-specific parameters for horizontal fluxes  C--   Set tile-specific parameters for horizontal fluxes
220        IF (useCubedSphereExchange) THEN        IF (useCubedSphereExchange) THEN
221         nipass=3         npass  = 3
222  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
223         IF ( nipass.GT.maxcube ) STOP 'maxcube needs to be = 3'         IF ( npass.GT.maxcube ) STOP 'maxcube needs to be = 3'
224  #endif  #endif
225  #ifdef ALLOW_EXCH2  #ifdef ALLOW_EXCH2
226         myTile = W2_myTileList(bi)         myTile = W2_myTileList(bi)
# Line 215  C--   Set tile-specific parameters for h Line 237  C--   Set tile-specific parameters for h
237         W_edge = .TRUE.         W_edge = .TRUE.
238  #endif  #endif
239        ELSE        ELSE
240         nipass=2         npass  = 2
241           nCFace = 0
242         N_edge = .FALSE.         N_edge = .FALSE.
243         S_edge = .FALSE.         S_edge = .FALSE.
244         E_edge = .FALSE.         E_edge = .FALSE.
245         W_edge = .FALSE.         W_edge = .FALSE.
246        ENDIF        ENDIF
247    
       iMin = 1-OLx  
       iMax = sNx+OLx  
       jMin = 1-OLy  
       jMax = sNy+OLy  
   
248  C--   Start of k loop for horizontal fluxes  C--   Start of k loop for horizontal fluxes
249        DO k=1,Nr        DO k=1,Nr
250  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
251           kkey = (igadkey-1)*Nr + k           kkey = (igadkey-1)*Nr + k
252  CADJ STORE tracer(:,:,k,bi,bj) =  CADJ STORE tracer(:,:,k,bi,bj) =
253  CADJ &     comlev1_bibj_k_gad, key=kkey, byte=isbyte  CADJ &     comlev1_bibj_k_gad, key=kkey, byte=isbyte
254  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
255    
256  C--   Get temporary terms used by tendency routines  C--   Get temporary terms used by tendency routines
257        CALL CALC_COMMON_FACTORS (        CALL CALC_COMMON_FACTORS (
258       I         bi,bj,iMin,iMax,jMin,jMax,k,       I         uVel, vVel,
259       O         xA,yA,uTrans,vTrans,rTrans,maskUp,       O         uFld, vFld, uTrans, vTrans, xA, yA,
260       I         myThid)       I         k,bi,bj, myThid )
261    
262  #ifdef ALLOW_GMREDI  #ifdef ALLOW_GMREDI
263  C--   Residual transp = Bolus transp + Eulerian transp  C--   Residual transp = Bolus transp + Eulerian transp
264        IF (useGMRedi)        IF (useGMRedi)
265       &   CALL GMREDI_CALC_UVFLOW(       &   CALL GMREDI_CALC_UVFLOW(
266       &            uTrans, vTrans, bi, bj, k, myThid)       U                  uFld, vFld, uTrans, vTrans,
267         I                  k, bi, bj, myThid )
268  #endif /* ALLOW_GMREDI */  #endif /* ALLOW_GMREDI */
269    
270  C--   Make local copy of tracer array and mask West & South  C--   Make local copy of tracer array and mask West & South
271        DO j=1-OLy,sNy+OLy        DO j=1-OLy,sNy+OLy
272         DO i=1-OLx,sNx+OLx         DO i=1-OLx,sNx+OLx
273           localTij(i,j)=tracer(i,j,k,bi,bj)           localTij(i,j)=tracer(i,j,k,bi,bj)
274           maskLocW(i,j)=maskW(i,j,k,bi,bj)           maskLocW(i,j)=_maskW(i,j,k,bi,bj)
275           maskLocS(i,j)=maskS(i,j,k,bi,bj)           maskLocS(i,j)=_maskS(i,j,k,bi,bj)
276         ENDDO         ENDDO
277        ENDDO        ENDDO
278    
279  #ifndef ALLOW_AUTODIFF_TAMC  cph-exch2#ifndef ALLOW_AUTODIFF_TAMC
280        IF (useCubedSphereExchange) THEN        IF (useCubedSphereExchange) THEN
281          withSigns = .FALSE.          withSigns = .FALSE.
282          CALL FILL_CS_CORNER_UV_RS(          CALL FILL_CS_CORNER_UV_RS(
283       &            withSigns, maskLocW,maskLocS, bi,bj, myThid )       &            withSigns, maskLocW,maskLocS, bi,bj, myThid )
284        ENDIF        ENDIF
285  #endif  cph-exch2#endif
286    
287  C--   Multiple passes for different directions on different tiles  C--   Multiple passes for different directions on different tiles
288  C--   For cube need one pass for each of red, green and blue axes.  C--   For cube need one pass for each of red, green and blue axes.
289        DO ipass=1,nipass        DO ipass=1,npass
290  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
291           passkey = ipass + (k-1)      *maxcube           passkey = ipass
292       &                   + (igadkey-1)*maxcube*Nr       &                   + (k-1)      *maxpass
293           IF (nipass .GT. maxpass) THEN       &                   + (igadkey-1)*maxpass*Nr
294            STOP 'GAD_ADVECTION: nipass > maxcube. check tamc.h'           IF (npass .GT. maxpass) THEN
295              STOP 'GAD_ADVECTION: npass > maxcube. check tamc.h'
296           ENDIF           ENDIF
297  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
298    
# Line 296  C-    CubedSphere : pass 3 times, with p Line 316  C-    CubedSphere : pass 3 times, with p
316          calc_fluxes_Y = nCFace.EQ.3 .OR. nCFace.EQ.4 .OR. nCFace.EQ.5          calc_fluxes_Y = nCFace.EQ.3 .OR. nCFace.EQ.4 .OR. nCFace.EQ.5
317         ELSEIF (ipass.EQ.2) THEN         ELSEIF (ipass.EQ.2) THEN
318          overlapOnly  = MOD(nCFace,3).EQ.2          overlapOnly  = MOD(nCFace,3).EQ.2
319            interiorOnly = MOD(nCFace,3).EQ.1
320          calc_fluxes_X = nCFace.EQ.2 .OR. nCFace.EQ.3 .OR. nCFace.EQ.4          calc_fluxes_X = nCFace.EQ.2 .OR. nCFace.EQ.3 .OR. nCFace.EQ.4
321          calc_fluxes_Y = nCFace.EQ.5 .OR. nCFace.EQ.6 .OR. nCFace.EQ.1          calc_fluxes_Y = nCFace.EQ.5 .OR. nCFace.EQ.6 .OR. nCFace.EQ.1
322  #endif /* MULTIDIM_OLD_VERSION */  #endif /* MULTIDIM_OLD_VERSION */
323         ELSE         ELSE
324            interiorOnly = .TRUE.
325          calc_fluxes_X = nCFace.EQ.5 .OR. nCFace.EQ.6          calc_fluxes_X = nCFace.EQ.5 .OR. nCFace.EQ.6
326          calc_fluxes_Y = nCFace.EQ.2 .OR. nCFace.EQ.3          calc_fluxes_Y = nCFace.EQ.2 .OR. nCFace.EQ.3
327         ENDIF         ENDIF
# Line 308  C-    not CubedSphere Line 330  C-    not CubedSphere
330          calc_fluxes_X = MOD(ipass,2).EQ.1          calc_fluxes_X = MOD(ipass,2).EQ.1
331          calc_fluxes_Y = .NOT.calc_fluxes_X          calc_fluxes_Y = .NOT.calc_fluxes_X
332        ENDIF        ENDIF
333    
334  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
335  C--   X direction  C--   X direction
336    C-     Advective flux in X
337            DO j=1-Oly,sNy+Oly
338             DO i=1-Olx,sNx+Olx
339              af(i,j) = 0.
340             ENDDO
341            ENDDO
342    C
343    #ifdef ALLOW_AUTODIFF_TAMC
344    # ifndef DISABLE_MULTIDIM_ADVECTION
345    CADJ STORE localTij(:,:)  =
346    CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte
347    CADJ STORE af(:,:)  =
348    CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte
349    # endif
350    #endif /* ALLOW_AUTODIFF_TAMC */
351    C
352        IF (calc_fluxes_X) THEN        IF (calc_fluxes_X) THEN
353    
354  C-     Do not compute fluxes if  C-     Do not compute fluxes if
355  C       a) needed in overlap only  C       a) needed in overlap only
356  C   and b) the overlap of myTile are not cube-face Edges  C   and b) the overlap of myTile are not cube-face Edges
357         IF ( .NOT.overlapOnly .OR. N_edge .OR. S_edge ) THEN         IF ( .NOT.overlapOnly .OR. N_edge .OR. S_edge ) THEN
358    
 #ifndef ALLOW_AUTODIFF_TAMC  
359  C-     Internal exchange for calculations in X  C-     Internal exchange for calculations in X
360  #ifdef MULTIDIM_OLD_VERSION  #ifdef MULTIDIM_OLD_VERSION
361          IF ( useCubedSphereExchange ) THEN          IF ( useCubedSphereExchange ) THEN
362  #else  #else
363          IF ( useCubedSphereExchange .AND.          IF ( overlapOnly ) THEN
      &       ( overlapOnly .OR. ipass.EQ.1 ) ) THEN  
364  #endif  #endif
365           CALL FILL_CS_CORNER_TR_RL( .TRUE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL( .TRUE., .FALSE.,
366         &                              localTij, bi,bj, myThid )
367          ENDIF          ENDIF
 #endif  
   
 C-     Advective flux in X  
         DO j=1-Oly,sNy+Oly  
          DO i=1-Olx,sNx+Olx  
           af(i,j) = 0.  
          ENDDO  
         ENDDO  
368    
369  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
370  #ifndef DISABLE_MULTIDIM_ADVECTION  # ifndef DISABLE_MULTIDIM_ADVECTION
371  CADJ STORE localTij(:,:)  =  CADJ STORE localTij(:,:)  =
372  CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte  CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte
373  #endif  # endif
374  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
375    
376          IF (advectionScheme.EQ.ENUM_FLUX_LIMIT) THEN          IF ( advectionScheme.EQ.ENUM_UPWIND_1RST
377            CALL GAD_FLUXLIMIT_ADV_X( bi,bj,k, dTtracerLev(k),       &     .OR. advectionScheme.EQ.ENUM_DST2 ) THEN
378       I                              uTrans, uVel, maskLocW, localTij,            CALL GAD_DST2U1_ADV_X( bi,bj,k, advectionScheme, .TRUE.,
379         I                           dTtracerLev(k),uTrans,uFld,localTij,
380         O                           af, myThid )
381            ELSEIF (advectionScheme.EQ.ENUM_FLUX_LIMIT) THEN
382              CALL GAD_FLUXLIMIT_ADV_X( bi,bj,k, .TRUE., dTtracerLev(k),
383         I                              uTrans, uFld, maskLocW, localTij,
384       O                              af, myThid )       O                              af, myThid )
385          ELSEIF (advectionScheme.EQ.ENUM_DST3 ) THEN          ELSEIF (advectionScheme.EQ.ENUM_DST3 ) THEN
386            CALL GAD_DST3_ADV_X(      bi,bj,k, dTtracerLev(k),            CALL GAD_DST3_ADV_X(      bi,bj,k, .TRUE., dTtracerLev(k),
387       I                              uTrans, uVel, maskLocW, localTij,       I                              uTrans, uFld, maskLocW, localTij,
388       O                              af, myThid )       O                              af, myThid )
389          ELSEIF (advectionScheme.EQ.ENUM_DST3_FLUX_LIMIT ) THEN          ELSEIF (advectionScheme.EQ.ENUM_DST3_FLUX_LIMIT ) THEN
390            CALL GAD_DST3FL_ADV_X(    bi,bj,k, dTtracerLev(k),            CALL GAD_DST3FL_ADV_X(    bi,bj,k, .TRUE., dTtracerLev(k),
391       I                              uTrans, uVel, maskLocW, localTij,       I                              uTrans, uFld, maskLocW, localTij,
392         O                              af, myThid )
393    #ifndef ALLOW_AUTODIFF_TAMC
394            ELSEIF (advectionScheme.EQ.ENUM_OS7MP ) THEN
395              CALL GAD_OS7MP_ADV_X(     bi,bj,k, .TRUE., dTtracerLev(k),
396         I                              uTrans, uFld, maskLocW, localTij,
397       O                              af, myThid )       O                              af, myThid )
398    #endif
399          ELSE          ELSE
400           STOP 'GAD_ADVECTION: adv. scheme incompatibale with multi-dim'           STOP 'GAD_ADVECTION: adv. scheme incompatibale with multi-dim'
401          ENDIF          ENDIF
402    
 C-     Advective flux in X : done  
        ENDIF  
   
 #ifndef ALLOW_AUTODIFF_TAMC  
403  C-     Internal exchange for next calculations in Y  C-     Internal exchange for next calculations in Y
404         IF ( overlapOnly .AND. ipass.EQ.1 ) THEN          IF ( overlapOnly .AND. ipass.EQ.1 ) THEN
405           CALL FILL_CS_CORNER_TR_RL(.FALSE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL( .FALSE., .FALSE.,
406         &                              localTij, bi,bj, myThid )
407            ENDIF
408    
409    C-     Advective flux in X : done
410         ENDIF         ENDIF
 #endif  
411    
412  C-     Update the local tracer field where needed:  C-     Update the local tracer field where needed:
413    
# Line 376  C      update in overlap-Only Line 415  C      update in overlap-Only
415         IF ( overlapOnly ) THEN         IF ( overlapOnly ) THEN
416          iMinUpd = 1-Olx+1          iMinUpd = 1-Olx+1
417          iMaxUpd = sNx+Olx-1          iMaxUpd = sNx+Olx-1
418  C- notes: these 2 lines below have no real effect (because recip_hFac=0  C- notes: these 2 lines below have no real effect (because recip_hFac=0
419  C         in corner region) but safer to keep them.  C         in corner region) but safer to keep them.
420          IF ( W_edge ) iMinUpd = 1          IF ( W_edge ) iMinUpd = 1
421          IF ( E_edge ) iMaxUpd = sNx          IF ( E_edge ) iMaxUpd = sNx
# Line 384  C         in corner region) but safer to Line 423  C         in corner region) but safer to
423          IF ( S_edge ) THEN          IF ( S_edge ) THEN
424           DO j=1-Oly,0           DO j=1-Oly,0
425            DO i=iMinUpd,iMaxUpd            DO i=iMinUpd,iMaxUpd
426             localTij(i,j)=localTij(i,j)-dTtracerLev(k)*             localTij(i,j) = localTij(i,j)
427       &       _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
428       &       *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
429         &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
430       &       *( af(i+1,j)-af(i,j)       &       *( af(i+1,j)-af(i,j)
431       &         -tracer(i,j,k,bi,bj)*(uTrans(i+1,j)-uTrans(i,j))       &         -tracer(i,j,k,bi,bj)*(uTrans(i+1,j)-uTrans(i,j))
432       &        )       &        )
# Line 396  C         in corner region) but safer to Line 436  C         in corner region) but safer to
436          IF ( N_edge ) THEN          IF ( N_edge ) THEN
437           DO j=sNy+1,sNy+Oly           DO j=sNy+1,sNy+Oly
438            DO i=iMinUpd,iMaxUpd            DO i=iMinUpd,iMaxUpd
439             localTij(i,j)=localTij(i,j)-dTtracerLev(k)*             localTij(i,j) = localTij(i,j)
440       &       _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
441       &       *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
442         &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
443       &       *( af(i+1,j)-af(i,j)       &       *( af(i+1,j)-af(i,j)
444       &         -tracer(i,j,k,bi,bj)*(uTrans(i+1,j)-uTrans(i,j))       &         -tracer(i,j,k,bi,bj)*(uTrans(i+1,j)-uTrans(i,j))
445       &        )       &        )
# Line 408  C         in corner region) but safer to Line 449  C         in corner region) but safer to
449    
450         ELSE         ELSE
451  C      do not only update the overlap  C      do not only update the overlap
452          jMinUpd = 1-Oly          jMinUpd = 1-Oly
453          jMaxUpd = sNy+Oly          jMaxUpd = sNy+Oly
454          IF ( interiorOnly .AND. S_edge ) jMinUpd = 1          IF ( interiorOnly .AND. S_edge ) jMinUpd = 1
455          IF ( interiorOnly .AND. N_edge ) jMaxUpd = sNy          IF ( interiorOnly .AND. N_edge ) jMaxUpd = sNy
456          DO j=jMinUpd,jMaxUpd          DO j=jMinUpd,jMaxUpd
457           DO i=1-Olx+1,sNx+Olx-1           DO i=1-Olx+1,sNx+Olx-1
458             localTij(i,j)=localTij(i,j)-dTtracerLev(k)*             localTij(i,j) = localTij(i,j)
459       &       _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
460       &       *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
461         &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
462       &       *( af(i+1,j)-af(i,j)       &       *( af(i+1,j)-af(i,j)
463       &         -tracer(i,j,k,bi,bj)*(uTrans(i+1,j)-uTrans(i,j))       &         -tracer(i,j,k,bi,bj)*(uTrans(i+1,j)-uTrans(i,j))
464       &        )       &        )
# Line 436  C-     Apply open boundary conditions Line 478  C-     Apply open boundary conditions
478            CALL OBCS_APPLY_TLOC( bi, bj, k, localTij, myThid )            CALL OBCS_APPLY_TLOC( bi, bj, k, localTij, myThid )
479           ELSEIF (tracerIdentity.EQ.GAD_SALINITY) THEN           ELSEIF (tracerIdentity.EQ.GAD_SALINITY) THEN
480            CALL OBCS_APPLY_SLOC( bi, bj, k, localTij, myThid )            CALL OBCS_APPLY_SLOC( bi, bj, k, localTij, myThid )
481    #ifdef ALLOW_PTRACERS
482             ELSEIF (tracerIdentity.GE.GAD_TR1) THEN
483              CALL OBCS_APPLY_PTRACER( bi, bj, k,
484         &         tracerIdentity-GAD_TR1+1, localTij, myThid )
485    #endif /* ALLOW_PTRACERS */
486           ENDIF           ENDIF
487          ENDIF          ENDIF
488  #endif /* ALLOW_OBCS */  #endif /* ALLOW_OBCS */
489    
490  C-     end if/else update overlap-Only  C-     end if/else update overlap-Only
491         ENDIF         ENDIF
492            
493  C--   End of X direction  C--   End of X direction
494        ENDIF        ENDIF
495    
496  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
497  C--   Y direction  C--   Y direction
498    cph-test
499    C-     Advective flux in Y
500            DO j=1-Oly,sNy+Oly
501             DO i=1-Olx,sNx+Olx
502              af(i,j) = 0.
503             ENDDO
504            ENDDO
505    C
506    #ifdef ALLOW_AUTODIFF_TAMC
507    # ifndef DISABLE_MULTIDIM_ADVECTION
508    CADJ STORE localTij(:,:)  =
509    CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte
510    CADJ STORE af(:,:)  =
511    CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte
512    # endif
513    #endif /* ALLOW_AUTODIFF_TAMC */
514    C
515        IF (calc_fluxes_Y) THEN        IF (calc_fluxes_Y) THEN
516    
517  C-     Do not compute fluxes if  C-     Do not compute fluxes if
# Line 455  C       a) needed in overlap only Line 519  C       a) needed in overlap only
519  C   and b) the overlap of myTile are not cube-face edges  C   and b) the overlap of myTile are not cube-face edges
520         IF ( .NOT.overlapOnly .OR. E_edge .OR. W_edge ) THEN         IF ( .NOT.overlapOnly .OR. E_edge .OR. W_edge ) THEN
521    
 #ifndef ALLOW_AUTODIFF_TAMC  
522  C-     Internal exchange for calculations in Y  C-     Internal exchange for calculations in Y
523  #ifdef MULTIDIM_OLD_VERSION  #ifdef MULTIDIM_OLD_VERSION
524          IF ( useCubedSphereExchange ) THEN          IF ( useCubedSphereExchange ) THEN
525  #else  #else
526          IF ( useCubedSphereExchange .AND.          IF ( overlapOnly ) THEN
      &       ( overlapOnly .OR. ipass.EQ.1 ) ) THEN  
527  #endif  #endif
528           CALL FILL_CS_CORNER_TR_RL(.FALSE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL( .FALSE., .FALSE.,
529         &                              localTij, bi,bj, myThid )
530          ENDIF          ENDIF
 #endif  
531    
532  C-     Advective flux in Y  C-     Advective flux in Y
533          DO j=1-Oly,sNy+Oly          DO j=1-Oly,sNy+Oly
# Line 474  C-     Advective flux in Y Line 536  C-     Advective flux in Y
536           ENDDO           ENDDO
537          ENDDO          ENDDO
538    
539  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
540  #ifndef DISABLE_MULTIDIM_ADVECTION  #ifndef DISABLE_MULTIDIM_ADVECTION
541  CADJ STORE localTij(:,:)  =  CADJ STORE localTij(:,:)  =
542  CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte  CADJ &     comlev1_bibj_k_gad_pass, key=passkey, byte=isbyte
543  #endif  #endif
544  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
545    
546          IF (advectionScheme.EQ.ENUM_FLUX_LIMIT) THEN          IF ( advectionScheme.EQ.ENUM_UPWIND_1RST
547            CALL GAD_FLUXLIMIT_ADV_Y( bi,bj,k, dTtracerLev(k),       &     .OR. advectionScheme.EQ.ENUM_DST2 ) THEN
548       I                              vTrans, vVel, maskLocS, localTij,            CALL GAD_DST2U1_ADV_Y( bi,bj,k, advectionScheme, .TRUE.,
549         I                           dTtracerLev(k),vTrans,vFld,localTij,
550         O                           af, myThid )
551            ELSEIF (advectionScheme.EQ.ENUM_FLUX_LIMIT) THEN
552              CALL GAD_FLUXLIMIT_ADV_Y( bi,bj,k, .TRUE., dTtracerLev(k),
553         I                              vTrans, vFld, maskLocS, localTij,
554       O                              af, myThid )       O                              af, myThid )
555          ELSEIF (advectionScheme.EQ.ENUM_DST3 ) THEN          ELSEIF (advectionScheme.EQ.ENUM_DST3 ) THEN
556            CALL GAD_DST3_ADV_Y(      bi,bj,k, dTtracerLev(k),            CALL GAD_DST3_ADV_Y(      bi,bj,k, .TRUE., dTtracerLev(k),
557       I                              vTrans, vVel, maskLocS, localTij,       I                              vTrans, vFld, maskLocS, localTij,
558       O                              af, myThid )       O                              af, myThid )
559          ELSEIF (advectionScheme.EQ.ENUM_DST3_FLUX_LIMIT ) THEN          ELSEIF (advectionScheme.EQ.ENUM_DST3_FLUX_LIMIT ) THEN
560            CALL GAD_DST3FL_ADV_Y(    bi,bj,k, dTtracerLev(k),            CALL GAD_DST3FL_ADV_Y(    bi,bj,k, .TRUE., dTtracerLev(k),
561       I                              vTrans, vVel, maskLocS, localTij,       I                              vTrans, vFld, maskLocS, localTij,
562         O                              af, myThid )
563    #ifndef ALLOW_AUTODIFF_TAMC
564            ELSEIF (advectionScheme.EQ.ENUM_OS7MP ) THEN
565              CALL GAD_OS7MP_ADV_Y(     bi,bj,k, .TRUE., dTtracerLev(k),
566         I                              vTrans, vFld, maskLocS, localTij,
567       O                              af, myThid )       O                              af, myThid )
568    #endif
569          ELSE          ELSE
570           STOP 'GAD_ADVECTION: adv. scheme incompatibale with mutli-dim'           STOP 'GAD_ADVECTION: adv. scheme incompatibale with mutli-dim'
571          ENDIF          ENDIF
572    
 C-     Advective flux in Y : done  
        ENDIF  
   
 #ifndef ALLOW_AUTODIFF_TAMC  
573  C-     Internal exchange for next calculations in X  C-     Internal exchange for next calculations in X
574         IF ( overlapOnly .AND. ipass.EQ.1 ) THEN          IF ( overlapOnly .AND. ipass.EQ.1 ) THEN
575           CALL FILL_CS_CORNER_TR_RL( .TRUE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL( .TRUE., .FALSE.,
576         &                              localTij, bi,bj, myThid )
577            ENDIF
578    
579    C-     Advective flux in Y : done
580         ENDIF         ENDIF
 #endif  
581    
582  C-     Update the local tracer field where needed:  C-     Update the local tracer field where needed:
583    
584  C      update in overlap-Only  C      update in overlap-Only
585         IF ( overlapOnly ) THEN         IF ( overlapOnly ) THEN
586          jMinUpd = 1-Oly+1          jMinUpd = 1-Oly+1
587          jMaxUpd = sNy+Oly-1          jMaxUpd = sNy+Oly-1
588  C- notes: these 2 lines below have no real effect (because recip_hFac=0  C- notes: these 2 lines below have no real effect (because recip_hFac=0
589  C         in corner region) but safer to keep them.  C         in corner region) but safer to keep them.
590          IF ( S_edge ) jMinUpd = 1          IF ( S_edge ) jMinUpd = 1
591          IF ( N_edge ) jMaxUpd = sNy          IF ( N_edge ) jMaxUpd = sNy
# Line 521  C         in corner region) but safer to Line 593  C         in corner region) but safer to
593          IF ( W_edge ) THEN          IF ( W_edge ) THEN
594           DO j=jMinUpd,jMaxUpd           DO j=jMinUpd,jMaxUpd
595            DO i=1-Olx,0            DO i=1-Olx,0
596             localTij(i,j)=localTij(i,j)-dTtracerLev(k)*             localTij(i,j) = localTij(i,j)
597       &       _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
598       &       *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
599         &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
600       &       *( af(i,j+1)-af(i,j)       &       *( af(i,j+1)-af(i,j)
601       &         -tracer(i,j,k,bi,bj)*(vTrans(i,j+1)-vTrans(i,j))       &         -tracer(i,j,k,bi,bj)*(vTrans(i,j+1)-vTrans(i,j))
602       &        )       &        )
# Line 533  C         in corner region) but safer to Line 606  C         in corner region) but safer to
606          IF ( E_edge ) THEN          IF ( E_edge ) THEN
607           DO j=jMinUpd,jMaxUpd           DO j=jMinUpd,jMaxUpd
608            DO i=sNx+1,sNx+Olx            DO i=sNx+1,sNx+Olx
609             localTij(i,j)=localTij(i,j)-dTtracerLev(k)*             localTij(i,j) = localTij(i,j)
610       &       _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
611       &       *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
612         &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
613       &       *( af(i,j+1)-af(i,j)       &       *( af(i,j+1)-af(i,j)
614       &         -tracer(i,j,k,bi,bj)*(vTrans(i,j+1)-vTrans(i,j))       &         -tracer(i,j,k,bi,bj)*(vTrans(i,j+1)-vTrans(i,j))
615       &        )       &        )
# Line 551  C      do not only update the overlap Line 625  C      do not only update the overlap
625          IF ( interiorOnly .AND. E_edge ) iMaxUpd = sNx          IF ( interiorOnly .AND. E_edge ) iMaxUpd = sNx
626          DO j=1-Oly+1,sNy+Oly-1          DO j=1-Oly+1,sNy+Oly-1
627           DO i=iMinUpd,iMaxUpd           DO i=iMinUpd,iMaxUpd
628             localTij(i,j)=localTij(i,j)-dTtracerLev(k)*             localTij(i,j) = localTij(i,j)
629       &       _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
630       &       *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
631         &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
632       &       *( af(i,j+1)-af(i,j)       &       *( af(i,j+1)-af(i,j)
633       &         -tracer(i,j,k,bi,bj)*(vTrans(i,j+1)-vTrans(i,j))       &         -tracer(i,j,k,bi,bj)*(vTrans(i,j+1)-vTrans(i,j))
634       &        )       &        )
# Line 573  C-     Apply open boundary conditions Line 648  C-     Apply open boundary conditions
648            CALL OBCS_APPLY_TLOC( bi, bj, k, localTij, myThid )            CALL OBCS_APPLY_TLOC( bi, bj, k, localTij, myThid )
649           ELSEIF (tracerIdentity.EQ.GAD_SALINITY) THEN           ELSEIF (tracerIdentity.EQ.GAD_SALINITY) THEN
650            CALL OBCS_APPLY_SLOC( bi, bj, k, localTij, myThid )            CALL OBCS_APPLY_SLOC( bi, bj, k, localTij, myThid )
651    #ifdef ALLOW_PTRACERS
652             ELSEIF (tracerIdentity.GE.GAD_TR1) THEN
653              CALL OBCS_APPLY_PTRACER( bi, bj, k,
654         &         tracerIdentity-GAD_TR1+1, localTij, myThid )
655    #endif /* ALLOW_PTRACERS */
656           ENDIF           ENDIF
657          ENDIF          ENDIF
658  #endif /* ALLOW_OBCS */  #endif /* ALLOW_OBCS */
# Line 596  C-    explicit advection is done ; store Line 676  C-    explicit advection is done ; store
676          ENDDO          ENDDO
677        ELSE        ELSE
678  C-    horizontal advection done; store intermediate result in 3D array:  C-    horizontal advection done; store intermediate result in 3D array:
679         DO j=1-Oly,sNy+Oly          DO j=1-Oly,sNy+Oly
680          DO i=1-Olx,sNx+Olx           DO i=1-Olx,sNx+Olx
681           localTijk(i,j,k)=localTij(i,j)            localTijk(i,j,k)=localTij(i,j)
682             ENDDO
683          ENDDO          ENDDO
        ENDDO  
684        ENDIF        ENDIF
685    
686  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
687          IF ( useDiagnostics ) THEN          IF ( doDiagAdvX ) THEN
           kk = -k  
688            diagName = 'ADVx'//diagSufx            diagName = 'ADVx'//diagSufx
689            CALL DIAGNOSTICS_FILL(afx,diagName, kk,1, 2,bi,bj, myThid)            CALL DIAGNOSTICS_FILL(afx,diagName, k,1, 2,bi,bj, myThid)
690            ENDIF
691            IF ( doDiagAdvY ) THEN
692            diagName = 'ADVy'//diagSufx            diagName = 'ADVy'//diagSufx
693            CALL DIAGNOSTICS_FILL(afy,diagName, kk,1, 2,bi,bj, myThid)            CALL DIAGNOSTICS_FILL(afy,diagName, k,1, 2,bi,bj, myThid)
694          ENDIF          ENDIF
695  #endif  #endif
696    
# Line 632  C---+----1----+----2----+----3----+----4 Line 713  C---+----1----+----2----+----3----+----4
713        IF ( .NOT.implicitAdvection ) THEN        IF ( .NOT.implicitAdvection ) THEN
714  C--   Start of k loop for vertical flux  C--   Start of k loop for vertical flux
715         DO k=Nr,1,-1         DO k=Nr,1,-1
716  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
717           kkey = (igadkey-1)*Nr + k           kkey = (igadkey-1)*Nr + (Nr-k+1)
718  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
719  C--   kup    Cycles through 1,2 to point to w-layer above  C--   kUp    Cycles through 1,2 to point to w-layer above
720  C--   kDown  Cycles through 2,1 to point to w-layer below  C--   kDown  Cycles through 2,1 to point to w-layer below
721          kup  = 1+MOD(k+1,2)          kUp  = 1+MOD(k+1,2)
722          kDown= 1+MOD(k,2)          kDown= 1+MOD(k,2)
723  c       kp1=min(Nr,k+1)  c       kp1=min(Nr,k+1)
724          kp1Msk=1.          kp1Msk=1.
725          if (k.EQ.Nr) kp1Msk=0.          if (k.EQ.Nr) kp1Msk=0.
726    
727    #ifdef ALLOW_AUTODIFF_TAMC
728    CADJ STORE rtrans(:,:)  =
729    CADJ &     comlev1_bibj_k_gad, key=kkey, byte=isbyte
730    cphCADJ STORE wfld(:,:)  =
731    cphCADJ &     comlev1_bibj_k_gad, key=kkey, byte=isbyte
732    #endif
733    
734  C-- Compute Vertical transport  C-- Compute Vertical transport
735  #ifdef ALLOW_AIM  #ifdef ALLOW_AIM
736  C- a hack to prevent Water-Vapor vert.transport into the stratospheric level Nr  C- a hack to prevent Water-Vapor vert.transport into the stratospheric level Nr
# Line 653  C- a hack to prevent Water-Vapor vert.tr Line 741  C- a hack to prevent Water-Vapor vert.tr
741          IF ( k.EQ.1 ) THEN          IF ( k.EQ.1 ) THEN
742  #endif  #endif
743    
744    #ifdef ALLOW_AUTODIFF_TAMC
745    cphmultiCADJ STORE wfld(:,:)  =
746    cphmultiCADJ &     comlev1_bibj_k_gad, key=kkey, byte=isbyte
747    #endif /* ALLOW_AUTODIFF_TAMC */
748    
749  C- Surface interface :  C- Surface interface :
750           DO j=1-Oly,sNy+Oly           DO j=1-Oly,sNy+Oly
751            DO i=1-Olx,sNx+Olx            DO i=1-Olx,sNx+Olx
752             rTransKp1(i,j) = kp1Msk*rTrans(i,j)             rTransKp1(i,j) = kp1Msk*rTrans(i,j)
753               wFld(i,j)   = 0.
754             rTrans(i,j) = 0.             rTrans(i,j) = 0.
755             fVerT(i,j,kUp) = 0.             fVerT(i,j,kUp) = 0.
756            ENDDO            ENDDO
757           ENDDO           ENDDO
758    
759          ELSE          ELSE
 C- Interior interface :  
760    
761    #ifdef ALLOW_AUTODIFF_TAMC
762    cphmultiCADJ STORE wfld(:,:)  =
763    cphmultiCADJ &     comlev1_bibj_k_gad, key=kkey, byte=isbyte
764    #endif /* ALLOW_AUTODIFF_TAMC */
765    
766    C- Interior interface :
767           DO j=1-Oly,sNy+Oly           DO j=1-Oly,sNy+Oly
768            DO i=1-Olx,sNx+Olx            DO i=1-Olx,sNx+Olx
769             rTransKp1(i,j) = kp1Msk*rTrans(i,j)             rTransKp1(i,j) = kp1Msk*rTrans(i,j)
770               wFld(i,j)   = wVel(i,j,k,bi,bj)
771             rTrans(i,j) = wVel(i,j,k,bi,bj)*rA(i,j,bi,bj)             rTrans(i,j) = wVel(i,j,k,bi,bj)*rA(i,j,bi,bj)
772         &                 *deepFac2F(k)*rhoFacF(k)
773       &                 *maskC(i,j,k-1,bi,bj)       &                 *maskC(i,j,k-1,bi,bj)
774             fVerT(i,j,kUp) = 0.             fVerT(i,j,kUp) = 0.
775            ENDDO            ENDDO
# Line 676  C- Interior interface : Line 777  C- Interior interface :
777    
778  #ifdef ALLOW_GMREDI  #ifdef ALLOW_GMREDI
779  C--   Residual transp = Bolus transp + Eulerian transp  C--   Residual transp = Bolus transp + Eulerian transp
780           IF (useGMRedi)           IF (useGMRedi)
781       &   CALL GMREDI_CALC_WFLOW(       &     CALL GMREDI_CALC_WFLOW(
782       &                    rTrans, bi, bj, k, myThid)       U                 wFld, rTrans,
783         I                 k, bi, bj, myThid )
784  #endif /* ALLOW_GMREDI */  #endif /* ALLOW_GMREDI */
785    
786  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
787  CADJ STORE localTijk(:,:,k)    cphmultiCADJ STORE localTijk(:,:,k)
788  CADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte  cphmultiCADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte
789  CADJ STORE rTrans(:,:)    cphmultiCADJ STORE rTrans(:,:)
790  CADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte  cphmultiCADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte
791  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
792    
793  C-    Compute vertical advective flux in the interior:  C-    Compute vertical advective flux in the interior:
794           IF (vertAdvecScheme.EQ.ENUM_FLUX_LIMIT) THEN           IF ( vertAdvecScheme.EQ.ENUM_UPWIND_1RST
795  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|       &      .OR. vertAdvecScheme.EQ.ENUM_DST2 ) THEN
796               CALL GAD_DST2U1_ADV_R( bi,bj,k, advectionScheme,
797         I                            dTtracerLev(k),rTrans,wFld,localTijk,
798         O                            fVerT(1-Olx,1-Oly,kUp), myThid )
799             ELSEIF( vertAdvecScheme.EQ.ENUM_FLUX_LIMIT) THEN
800             CALL GAD_FLUXLIMIT_ADV_R( bi,bj,k, dTtracerLev(k),             CALL GAD_FLUXLIMIT_ADV_R( bi,bj,k, dTtracerLev(k),
801       I                               rTrans, wVel, localTijk,       I                               rTrans, wFld, localTijk,
802       O                               fVerT(1-Olx,1-Oly,kUp), myThid )       O                               fVerT(1-Olx,1-Oly,kUp), myThid )
803           ELSEIF (vertAdvecScheme.EQ.ENUM_DST3 ) THEN           ELSEIF( vertAdvecScheme.EQ.ENUM_DST3 ) THEN
804             CALL GAD_DST3_ADV_R(      bi,bj,k, dTtracerLev(k),             CALL GAD_DST3_ADV_R(      bi,bj,k, dTtracerLev(k),
805       I                               rTrans, wVel, localTijk,       I                               rTrans, wFld, localTijk,
806       O                               fVerT(1-Olx,1-Oly,kUp), myThid )       O                               fVerT(1-Olx,1-Oly,kUp), myThid )
807           ELSEIF (vertAdvecScheme.EQ.ENUM_DST3_FLUX_LIMIT ) THEN           ELSEIF( vertAdvecScheme.EQ.ENUM_DST3_FLUX_LIMIT ) THEN
808             CALL GAD_DST3FL_ADV_R(    bi,bj,k, dTtracerLev(k),             CALL GAD_DST3FL_ADV_R(    bi,bj,k, dTtracerLev(k),
809       I                               rTrans, wVel, localTijk,       I                               rTrans, wFld, localTijk,
810       O                               fVerT(1-Olx,1-Oly,kUp), myThid )       O                               fVerT(1-Olx,1-Oly,kUp), myThid )
811    #ifndef ALLOW_AUTODIFF_TAMC
812             ELSEIF (vertAdvecScheme.EQ.ENUM_OS7MP ) THEN
813               CALL GAD_OS7MP_ADV_R(     bi,bj,k, dTtracerLev(k),
814         I                               rTrans, wFld, localTijk,
815         O                               fVerT(1-Olx,1-Oly,kUp), myThid )
816    #endif
817           ELSE           ELSE
818            STOP 'GAD_ADVECTION: adv. scheme incompatibale with mutli-dim'            STOP 'GAD_ADVECTION: adv. scheme incompatibale with mutli-dim'
819           ENDIF           ENDIF
# Line 709  C---+----1----+----2----+----3----+----4 Line 821  C---+----1----+----2----+----3----+----4
821  C- end Surface/Interior if bloc  C- end Surface/Interior if bloc
822          ENDIF          ENDIF
823    
824  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
825  CADJ STORE rTrans(:,:)    cphmultiCADJ STORE rTrans(:,:)
826  CADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte  cphmultiCADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte
827  CADJ STORE rTranskp1(:,:)    cphmultiCADJ STORE rTranskp1(:,:)
828    cphmultiCADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte
829    cph --- following storing of fVerT is critical for correct
830    cph --- gradient with multiDimAdvection
831    cph --- Without it, kDown component is not properly recomputed
832    cph --- This is a TAF bug (and no warning available)
833    CADJ STORE fVerT(:,:,:)
834  CADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k_gad, key=kkey, byte=isbyte
835  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
836    
837  C--   Divergence of vertical fluxes  C--   Divergence of vertical fluxes
838          DO j=1-Oly,sNy+Oly          DO j=1-Oly,sNy+Oly
839           DO i=1-Olx,sNx+Olx           DO i=1-Olx,sNx+Olx
840            localTij(i,j)=localTijk(i,j,k)-dTtracerLev(k)*            localTij(i,j) = localTijk(i,j,k)
841       &     _recip_hFacC(i,j,k,bi,bj)*recip_drF(k)       &      -dTtracerLev(k)*recip_rhoFacC(k)
842       &     *recip_rA(i,j,bi,bj)       &       *_recip_hFacC(i,j,k,bi,bj)*recip_drF(k)
843       &     *( fVerT(i,j,kUp)-fVerT(i,j,kDown)       &       *recip_rA(i,j,bi,bj)*recip_deepFac2C(k)
844       &       -tracer(i,j,k,bi,bj)*(rTrans(i,j)-rTransKp1(i,j))       &       *( fVerT(i,j,kDown)-fVerT(i,j,kUp)
845       &      )*rkFac       &         -tracer(i,j,k,bi,bj)*(rTransKp1(i,j)-rTrans(i,j))
846         &        )*rkSign
847            gTracer(i,j,k,bi,bj)=            gTracer(i,j,k,bi,bj)=
848       &     (localTij(i,j)-tracer(i,j,k,bi,bj))/dTtracerLev(k)       &     (localTij(i,j)-tracer(i,j,k,bi,bj))/dTtracerLev(k)
849           ENDDO           ENDDO
850          ENDDO          ENDDO
851    
852  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
853          IF ( useDiagnostics ) THEN          IF ( doDiagAdvR ) THEN
           kk = -k  
854            diagName = 'ADVr'//diagSufx            diagName = 'ADVr'//diagSufx
855            CALL DIAGNOSTICS_FILL( fVerT(1-Olx,1-Oly,kUp),            CALL DIAGNOSTICS_FILL( fVerT(1-Olx,1-Oly,kUp),
856       &                           diagName, kk,1, 2,bi,bj, myThid)       &                           diagName, k,1, 2,bi,bj, myThid)
857          ENDIF          ENDIF
858  #endif  #endif
859    
860  C--   End of K loop for vertical flux  C--   End of K loop for vertical flux
861         ENDDO         ENDDO
862  C--   end of if not.implicitAdvection block  C--   end of if not.implicitAdvection block
863        ENDIF        ENDIF
864    
865        RETURN        RETURN
866        END        END
Legend:
Removed from v.1.33  
changed lines
  Added in v.1.57
  ViewVC Help
Powered by ViewVC 1.1.22