/[MITgcm]/MITgcm/model/src/dynamics.F

Diff of /MITgcm/model/src/dynamics.F

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

-revision 1.79 by adcroft,
Thu Aug 16 17:12:24 2001 UTC
+revision 1.102 by edhill,
Tue Oct 28 22:57:59 2003 UTC
 Line 1
  C $Header$
  C $Name$
+ #include "PACKAGES_CONFIG.h"
  #include "CPP_OPTIONS.h"
+ CBOP
+ C     !ROUTINE: DYNAMICS
+ C     !INTERFACE:
        SUBROUTINE DYNAMICS(myTime, myIter, myThid)
- C     /==========================================================\
+ C     !DESCRIPTION: \bv
- C     | SUBROUTINE DYNAMICS                                      |
+ C     *==========================================================*
- C     | o Controlling routine for the explicit part of the model |
+ C     | SUBROUTINE DYNAMICS
- C     |   dynamics.                                              |
+ C     | o Controlling routine for the explicit part of the model
- C     |==========================================================|
+ C     |   dynamics.
- C     | This routine evaluates the "dynamics" terms for each     |
+ C     *==========================================================*
- C     | block of ocean in turn. Because the blocks of ocean have |
+ C     | This routine evaluates the "dynamics" terms for each
- C     | overlap regions they are independent of one another.     |
+ C     | block of ocean in turn. Because the blocks of ocean have
- C     | If terms involving lateral integrals are needed in this  |
+ C     | overlap regions they are independent of one another.
- C     | routine care will be needed. Similarly finite-difference |
+ C     | If terms involving lateral integrals are needed in this
- C     | operations with stencils wider than the overlap region   |
+ C     | routine care will be needed. Similarly finite-difference
- C     | require special consideration.                           |
+ C     | operations with stencils wider than the overlap region
- C     | Notes                                                    |
+ C     | require special consideration.
- C     | =====                                                    |
+ C     | The algorithm...
- C     | C*P* comments indicating place holders for which code is |
+ C     |
- C     |      presently being developed.                          |
+ C     | "Correction Step"
- C     \==========================================================/
+ C     | =================
+ C     | Here we update the horizontal velocities with the surface
+ C     | pressure such that the resulting flow is either consistent
+ C     | with the free-surface evolution or the rigid-lid:
+ C     |   U[n] = U* + dt x d/dx P
+ C     |   V[n] = V* + dt x d/dy P
+ C     |
+ C     | "Calculation of Gs"
+ C     | ===================
+ C     | This is where all the accelerations and tendencies (ie.
+ C     | physics, parameterizations etc...) are calculated
+ C     |   rho = rho ( theta[n], salt[n] )
+ C     |   b   = b(rho, theta)
+ C     |   K31 = K31 ( rho )
+ C     |   Gu[n] = Gu( u[n], v[n], wVel, b, ... )
+ C     |   Gv[n] = Gv( u[n], v[n], wVel, b, ... )
+ C     |   Gt[n] = Gt( theta[n], u[n], v[n], wVel, K31, ... )
+ C     |   Gs[n] = Gs( salt[n], u[n], v[n], wVel, K31, ... )
+ C     |
+ C     | "Time-stepping" or "Prediction"
+ C     | ================================
+ C     | The models variables are stepped forward with the appropriate
+ C     | time-stepping scheme (currently we use Adams-Bashforth II)
+ C     | - For momentum, the result is always *only* a "prediction"
+ C     | in that the flow may be divergent and will be "corrected"
+ C     | later with a surface pressure gradient.
+ C     | - Normally for tracers the result is the new field at time
+ C     | level [n+1} *BUT* in the case of implicit diffusion the result
+ C     | is also *only* a prediction.
+ C     | - We denote "predictors" with an asterisk (*).
+ C     |   U* = U[n] + dt x ( 3/2 Gu[n] - 1/2 Gu[n-1] )
+ C     |   V* = V[n] + dt x ( 3/2 Gv[n] - 1/2 Gv[n-1] )
+ C     |   theta[n+1] = theta[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     |   salt[n+1] = salt[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     | With implicit diffusion:
+ C     |   theta* = theta[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     |   salt* = salt[n] + dt x ( 3/2 Gt[n] - 1/2 atG[n-1] )
+ C     |   (1 + dt * K * d_zz) theta[n] = theta*
+ C     |   (1 + dt * K * d_zz) salt[n] = salt*
+ C     |
+ C     *==========================================================*
+ C     \ev
+ C     !USES:
        IMPLICIT NONE
  C     == Global variables ===
  #include "SIZE.h"
  #include "EEPARAMS.h"
-Line 32 
 C     == Global variables ===
+Line 77 
 C     == Global variables ===
  #ifdef ALLOW_PASSIVE_TRACER
  #include "TR1.h"
  #endif
  #ifdef ALLOW_AUTODIFF_TAMC
  # include "tamc.h"
  # include "tamc_keys.h"
  # include "FFIELDS.h"
+ # include "EOS.h"
  # ifdef ALLOW_KPP
  #  include "KPP.h"
  # endif
- # ifdef ALLOW_GMREDI
- #  include "GMREDI.h"
- # endif
  #endif /* ALLOW_AUTODIFF_TAMC */
- #ifdef ALLOW_TIMEAVE
+ C     !CALLING SEQUENCE:
- #include "TIMEAVE_STATV.h"
+ C     DYNAMICS()
- #endif
+ C      |
+ C      |-- CALC_GRAD_PHI_SURF
+ C      |
+ C      |-- CALC_VISCOSITY
+ C      |
+ C      |-- CALC_PHI_HYD
+ C      |
+ C      |-- MOM_FLUXFORM
+ C      |
+ C      |-- MOM_VECINV
+ C      |
+ C      |-- TIMESTEP
+ C      |
+ C      |-- OBCS_APPLY_UV
+ C      |
+ C      |-- IMPLDIFF
+ C      |
+ C      |-- OBCS_APPLY_UV
+ C      |
+ C      |-- CALL TIMEAVE_CUMUL_1T
+ C      |-- CALL DEBUG_STATS_RL
+ C     !INPUT/OUTPUT PARAMETERS:
  C     == Routine arguments ==
  C     myTime - Current time in simulation
  C     myIter - Current iteration number in simulation
-Line 57 
 C     myThid - Thread number for this in
+Line 120 
 C     myThid - Thread number for this in
        INTEGER myIter
        INTEGER myThid
+ C     !LOCAL VARIABLES:
  C     == Local variables
  C     fVer[STUV]               o fVer: Vertical flux term - note fVer
  C                                      is "pipelined" in the vertical
  C                                      so we need an fVer for each
  C                                      variable.
- C     rhoK, rhoKM1   - Density at current level, and level above
+ C     phiHydC    :: hydrostatic potential anomaly at cell center
- C     phiHyd         - Hydrostatic part of the potential phiHydi.
+ C                   In z coords phiHyd is the hydrostatic potential
- C                      In z coords phiHydiHyd is the hydrostatic
+ C                      (=pressure/rho0) anomaly
- C                      Potential (=pressure/rho0) anomaly
+ C                   In p coords phiHyd is the geopotential height anomaly.
- C                      In p coords phiHydiHyd is the geopotential
+ C     phiHydF    :: hydrostatic potential anomaly at middle between 2 centers
- C                      surface height anomaly.
+ C     dPhiHydX,Y :: Gradient (X & Y directions) of hydrostatic potential anom.
- C     phiSurfX, - gradient of Surface potentiel (Pressure/rho, ocean)
+ C     phiSurfX,  ::  gradient of Surface potential (Pressure/rho, ocean)
- C     phiSurfY             or geopotentiel (atmos) in X and Y direction
+ C     phiSurfY             or geopotential (atmos) in X and Y direction
  C     iMin, iMax     - Ranges and sub-block indices on which calculations
  C     jMin, jMax       are applied.
  C     bi, bj
-Line 78 
 C     kDown, km1       are switched with
+Line 142 
 C     kDown, km1       are switched with
  C                      index into fVerTerm.
        _RL fVerU   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)
        _RL fVerV   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)
-       _RL phiHyd  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+       _RL phiHydF (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL rhokm1  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL phiHydC (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
-       _RL rhok    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
+       _RL dPhiHydX(1-Olx:sNx+Olx,1-Oly:sNy+Oly)
+       _RL dPhiHydY(1-Olx:sNx+Olx,1-Oly:sNy+Oly)
        _RL phiSurfX(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
        _RL phiSurfY(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
        _RL KappaRU (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
        _RL KappaRV (1-Olx:sNx+Olx,1-Oly:sNy+Oly,Nr)
-       _RL sigmaX  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
-       _RL sigmaY  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
-       _RL sigmaR  (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
- C This is currently used by IVDC and Diagnostics
-       _RL ConvectCount (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
        INTEGER iMin, iMax
        INTEGER jMin, jMax
-Line 98 
 C This is currently used by IVDC and Dia
+Line 157 
 C This is currently used by IVDC and Dia
        INTEGER i, j
        INTEGER k, km1, kp1, kup, kDown
- Cjmc : add for phiHyd output <- but not working if multi tile per CPU
+       LOGICAL  DIFFERENT_MULTIPLE
- c     CHARACTER*(MAX_LEN_MBUF) suff
+       EXTERNAL DIFFERENT_MULTIPLE
- c     LOGICAL  DIFFERENT_MULTIPLE
- c     EXTERNAL DIFFERENT_MULTIPLE
- Cjmc(end)
  C---    The algorithm...
  C
-Line 147 
 C         salt* = salt[n] + dt x ( 3/2 G
+Line 203 
 C         salt* = salt[n] + dt x ( 3/2 G
  C         (1 + dt * K * d_zz) theta[n] = theta*
  C         (1 + dt * K * d_zz) salt[n] = salt*
  C---
+ CEOP
- C--   Set up work arrays with valid (i.e. not NaN) values
+ C-- Call to routine for calculation of
- C     These inital values do not alter the numerical results. They
+ C   Eliassen-Palm-flux-forced U-tendency,
- C     just ensure that all memory references are to valid floating
+ C   if desired:
- C     point numbers. This prevents spurious hardware signals due to
+ #ifdef INCLUDE_EP_FORCING_CODE
- C     uninitialised but inert locations.
+       CALL CALC_EP_FORCING(myThid)
-       DO j=1-OLy,sNy+OLy
+ #endif
-        DO i=1-OLx,sNx+OLx
-         DO k=1,Nr
-          phiHyd(i,j,k)  = 0. _d 0
-          KappaRU(i,j,k) = 0. _d 0
-          KappaRV(i,j,k) = 0. _d 0
-          sigmaX(i,j,k) = 0. _d 0
-          sigmaY(i,j,k) = 0. _d 0
-          sigmaR(i,j,k) = 0. _d 0
-         ENDDO
-         rhoKM1 (i,j) = 0. _d 0
-         rhok   (i,j) = 0. _d 0
-         phiSurfX(i,j) = 0. _d 0
-         phiSurfY(i,j) = 0. _d 0
-        ENDDO
-       ENDDO
  #ifdef ALLOW_AUTODIFF_TAMC
  C--   HPF directive to help TAMC
-Line 180 
 CHPF$ INDEPENDENT
+Line 222 
 CHPF$ INDEPENDENT
  #ifdef ALLOW_AUTODIFF_TAMC
  C--    HPF directive to help TAMC
  CHPF$  INDEPENDENT, NEW (fVerU,fVerV
- CHPF$&                  ,phiHyd
+ CHPF$&                  ,phiHydF
  CHPF$&                  ,KappaRU,KappaRV
  CHPF$&                  )
  #endif /* ALLOW_AUTODIFF_TAMC */
-Line 190 
 CHPF$&                  )
+Line 232 
 CHPF$&                  )
  #ifdef ALLOW_AUTODIFF_TAMC
            act1 = bi - myBxLo(myThid)
            max1 = myBxHi(myThid) - myBxLo(myThid) + 1
            act2 = bj - myByLo(myThid)
            max2 = myByHi(myThid) - myByLo(myThid) + 1
            act3 = myThid - 1
            max3 = nTx*nTy
            act4 = ikey_dynamics - 1
+           idynkey = (act1 + 1) + act2*max1
-           ikey = (act1 + 1) + act2*max1
       &                      + act3*max1*max2
       &                      + act4*max1*max2*max3
  #endif /* ALLOW_AUTODIFF_TAMC */
- C--     Set up work arrays that need valid initial values
+ C--   Set up work arrays with valid (i.e. not NaN) values
+ C     These inital values do not alter the numerical results. They
+ C     just ensure that all memory references are to valid floating
+ C     point numbers. This prevents spurious hardware signals due to
+ C     uninitialised but inert locations.
+         DO k=1,Nr
+          DO j=1-OLy,sNy+OLy
+           DO i=1-OLx,sNx+OLx
+            KappaRU(i,j,k) = 0. _d 0
+            KappaRV(i,j,k) = 0. _d 0
+ #ifdef ALLOW_AUTODIFF_TAMC
+ cph(
+ c--   need some re-initialisation here to break dependencies
+ c--   totphihyd is assumed zero from ini_pressure, i.e.
+ c--   avoiding iterate pressure p = integral of (g*rho(p)*dz)
+ cph)
+            totPhiHyd(i,j,k,bi,bj) = 0. _d 0
+            gu(i,j,k,bi,bj) = 0. _d 0
+            gv(i,j,k,bi,bj) = 0. _d 0
+ #endif
+           ENDDO
+          ENDDO
+         ENDDO
          DO j=1-OLy,sNy+OLy
           DO i=1-OLx,sNx+OLx
            fVerU  (i,j,1) = 0. _d 0
            fVerU  (i,j,2) = 0. _d 0
            fVerV  (i,j,1) = 0. _d 0
            fVerV  (i,j,2) = 0. _d 0
+           phiHydF (i,j)  = 0. _d 0
+           phiHydC (i,j)  = 0. _d 0
+           dPhiHydX(i,j)  = 0. _d 0
+           dPhiHydY(i,j)  = 0. _d 0
+           phiSurfX(i,j)  = 0. _d 0
+           phiSurfY(i,j)  = 0. _d 0
           ENDDO
          ENDDO
  C--     Start computation of dynamics
-         iMin = 1-OLx+2
+         iMin = 0
-         iMax = sNx+OLx-1
+         iMax = sNx+1
-         jMin = 1-OLy+2
+         jMin = 0
-         jMax = sNy+OLy-1
+         jMax = sNy+1
  #ifdef ALLOW_AUTODIFF_TAMC
- CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
+ CADJ STORE wvel (:,:,:,bi,bj) =
- CADJ STORE vvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
+ CADJ &     comlev1_bibj, key = idynkey, byte = isbyte
- CADJ STORE wvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte
  #endif /* ALLOW_AUTODIFF_TAMC */
  C--     Explicit part of the Surface Potentiel Gradient (add in TIMESTEP)
-Line 236 
 C       (note: this loop will be replace
+Line 302 
 C       (note: this loop will be replace
       I         myThid )
          ENDIF
+ #ifdef ALLOW_AUTODIFF_TAMC
+ CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key=idynkey, byte=isbyte
+ CADJ STORE vvel (:,:,:,bi,bj) = comlev1_bibj, key=idynkey, byte=isbyte
+ #ifdef ALLOW_KPP
+ CADJ STORE KPPviscAz (:,:,:,bi,bj)
+ CADJ &                 = comlev1_bibj, key=idynkey, byte=isbyte
+ #endif /* ALLOW_KPP */
+ #endif /* ALLOW_AUTODIFF_TAMC */
  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL
  C--      Calculate the total vertical diffusivity
          DO k=1,Nr
-Line 246 
 C--      Calculate the total vertical di
+Line 321 
 C--      Calculate the total vertical di
         ENDDO
  #endif
+ #ifdef ALLOW_AUTODIFF_TAMC
+ CADJ STORE KappaRU(:,:,:)
+ CADJ &                 = comlev1_bibj, key=idynkey, byte=isbyte
+ CADJ STORE KappaRV(:,:,:)
+ CADJ &                 = comlev1_bibj, key=idynkey, byte=isbyte
+ #endif /* ALLOW_AUTODIFF_TAMC */
  C--     Start of dynamics loop
          DO k=1,Nr
-Line 259 
 C--       kDown  Cycles through 2,1 to p
+Line 341 
 C--       kDown  Cycles through 2,1 to p
            kDown= 1+MOD(k,2)
  #ifdef ALLOW_AUTODIFF_TAMC
-          kkey = (ikey-1)*Nr + k
+          kkey = (idynkey-1)*Nr + k
+ c
+ CADJ STORE totphihyd (:,:,k,bi,bj)
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE gt (:,:,k,bi,bj)
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE gs (:,:,k,bi,bj)
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE theta (:,:,k,bi,bj)
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE salt  (:,:,k,bi,bj)
+ CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
  #endif /* ALLOW_AUTODIFF_TAMC */
  C--      Integrate hydrostatic balance for phiHyd with BC of
-Line 268 
 C        distinguishe between Stagger an
+Line 361 
 C        distinguishe between Stagger an
           IF (staggerTimeStep) THEN
             CALL CALC_PHI_HYD(
       I        bi,bj,iMin,iMax,jMin,jMax,k,
-      I        gTnm1, gSnm1,
+      I        gT, gS,
-      U        phiHyd,
+      U        phiHydF,
-      I        myThid )
+      O        phiHydC, dPhiHydX, dPhiHydY,
+      I        myTime, myIter, myThid )
           ELSE
             CALL CALC_PHI_HYD(
       I        bi,bj,iMin,iMax,jMin,jMax,k,
       I        theta, salt,
-      U        phiHyd,
+      U        phiHydF,
-      I        myThid )
+      O        phiHydC, dPhiHydX, dPhiHydY,
+      I        myTime, myIter, myThid )
           ENDIF
  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
- C        and step forward storing the result in gUnm1, gVnm1, etc...
+ C        and step forward storing the result in gU, gV, etc...
           IF ( momStepping ) THEN
  #ifndef DISABLE_MOM_FLUXFORM
             IF (.NOT. vectorInvariantMomentum) CALL MOM_FLUXFORM(
       I         bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown,
-      I         phiHyd,KappaRU,KappaRV,
+      I         dPhiHydX,dPhiHydY,KappaRU,KappaRV,
       U         fVerU, fVerV,
-      I         myTime, myThid)
+      I         myTime, myIter, myThid)
  #endif
  #ifndef DISABLE_MOM_VECINV
             IF (vectorInvariantMomentum) CALL MOM_VECINV(
       I         bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown,
-      I         phiHyd,KappaRU,KappaRV,
+      I         dPhiHydX,dPhiHydY,KappaRU,KappaRV,
       U         fVerU, fVerV,
-      I         myTime, myThid)
+      I         myTime, myIter, myThid)
  #endif
             CALL TIMESTEP(
       I         bi,bj,iMin,iMax,jMin,jMax,k,
-      I         phiHyd, phiSurfX, phiSurfY,
+      I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,
-      I         myIter, myThid)
+      I         myTime, myIter, myThid)
  #ifdef   ALLOW_OBCS
  C--      Apply open boundary conditions
-          IF (useOBCS) THEN
+            IF (useOBCS) THEN
-            CALL OBCS_APPLY_UV( bi, bj, k, gUnm1, gVnm1, myThid )
+              CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid )
-          END IF
+            ENDIF
  #endif   /* ALLOW_OBCS */
- #ifdef   ALLOW_AUTODIFF_TAMC
- #ifdef   INCLUDE_CD_CODE
-          ELSE
-            DO j=1-OLy,sNy+OLy
-              DO i=1-OLx,sNx+OLx
-                guCD(i,j,k,bi,bj) = 0.0
-                gvCD(i,j,k,bi,bj) = 0.0
-              END DO
-            END DO
- #endif   /* INCLUDE_CD_CODE */
- #endif   /* ALLOW_AUTODIFF_TAMC */
           ENDIF
  C--     end of dynamics k loop (1:Nr)
          ENDDO
  C--     Implicit viscosity
          IF (implicitViscosity.AND.momStepping) THEN
  #ifdef    ALLOW_AUTODIFF_TAMC
-           idkey = iikey + 3
+ CADJ STORE KappaRU(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte
- CADJ STORE gUNm1(:,:,:,bi,bj) = comlev1_bibj , key=ikey, byte=isbyte
+ CADJ STORE gU(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
  #endif    /* ALLOW_AUTODIFF_TAMC */
            CALL IMPLDIFF(
       I         bi, bj, iMin, iMax, jMin, jMax,
       I         deltaTmom, KappaRU,recip_HFacW,
-      U         gUNm1,
+      U         gU,
       I         myThid )
  #ifdef    ALLOW_AUTODIFF_TAMC
-           idkey = iikey + 4
+ CADJ STORE KappaRV(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte
- CADJ STORE gVNm1(:,:,:,bi,bj) = comlev1_bibj , key=ikey, byte=isbyte
+ CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
  #endif    /* ALLOW_AUTODIFF_TAMC */
            CALL IMPLDIFF(
       I         bi, bj, iMin, iMax, jMin, jMax,
       I         deltaTmom, KappaRV,recip_HFacS,
-      U         gVNm1,
+      U         gV,
       I         myThid )
  #ifdef   ALLOW_OBCS
  C--      Apply open boundary conditions
           IF (useOBCS) THEN
             DO K=1,Nr
-              CALL OBCS_APPLY_UV( bi, bj, k, gUnm1, gVnm1, myThid )
+              CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid )
             ENDDO
           END IF
  #endif   /* ALLOW_OBCS */
- #ifdef    INCLUDE_CD_CODE
+ #ifdef    ALLOW_CD_CODE
  #ifdef    ALLOW_AUTODIFF_TAMC
-           idkey = iikey + 5
+ CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
- CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_bibj , key=ikey, byte=isbyte
  #endif    /* ALLOW_AUTODIFF_TAMC */
            CALL IMPLDIFF(
       I         bi, bj, iMin, iMax, jMin, jMax,
-Line 368 
 CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_
+Line 449 
 CADJ STORE vVelD(:,:,:,bi,bj) = comlev1_
       U         vVelD,
       I         myThid )
  #ifdef    ALLOW_AUTODIFF_TAMC
-           idkey = iikey + 6
+ CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
- CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_bibj , key=ikey, byte=isbyte
  #endif    /* ALLOW_AUTODIFF_TAMC */
            CALL IMPLDIFF(
       I         bi, bj, iMin, iMax, jMin, jMax,
       I         deltaTmom, KappaRV,recip_HFacS,
       U         uVelD,
       I         myThid )
- #endif    /* INCLUDE_CD_CODE */
+ #endif    /* ALLOW_CD_CODE */
  C--     End If implicitViscosity.AND.momStepping
          ENDIF
- Cjmc : add for phiHyd output <- but not working if multi tile per CPU
- c       IF ( DIFFERENT_MULTIPLE(dumpFreq,myTime+deltaTClock,myTime)
- c    &  .AND. buoyancyRelation .eq. 'ATMOSPHERIC' ) THEN
- c         WRITE(suff,'(I10.10)') myIter+1
- c         CALL WRITE_FLD_XYZ_RL('PH.',suff,phiHyd,myIter+1,myThid)
- c       ENDIF
- Cjmc(end)
- #ifdef ALLOW_TIMEAVE
-         IF (taveFreq.GT.0.) THEN
-           CALL TIMEAVE_CUMUL_1T(phiHydtave, phiHyd, Nr,
-      I                              deltaTclock, bi, bj, myThid)
-           IF (ivdc_kappa.NE.0.) THEN
-             CALL TIMEAVE_CUMULATE(ConvectCountTave, ConvectCount, Nr,
-      I                              deltaTclock, bi, bj, myThid)
-           ENDIF
-         ENDIF
- #endif /* ALLOW_TIMEAVE */
         ENDDO
        ENDDO
+ Cml(
+ C     In order to compare the variance of phiHydLow of a p/z-coordinate
+ C     run with etaH of a z/p-coordinate run the drift of phiHydLow
+ C     has to be removed by something like the following subroutine:
+ C      CALL REMOVE_MEAN_RL( 1, phiHydLow, maskH, maskH, rA, drF,
+ C     &                'phiHydLow', myThid )
+ Cml)
  #ifndef DISABLE_DEBUGMODE
-       If (debugMode) THEN
+       If ( debugLevel .GE. debLevB ) THEN
         CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)
         CALL DEBUG_STATS_RL(Nr,uVel,'Uvel (DYNAMICS)',myThid)
         CALL DEBUG_STATS_RL(Nr,vVel,'Vvel (DYNAMICS)',myThid)

 Legend:



Removed from v.1.79
 


changed lines


 
Added in v.1.102
 Legend:



Removed from v.1.79
 


changed lines


 
Added in v.1.102
-Removed from v.1.79
+Added in v.1.102

	ViewVC Help
Powered by ViewVC 1.1.22