/[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.142 by jmc,
Sun Apr 26 19:36:36 2009 UTC
+revision 1.145 by jmc,
Wed Jan 20 03:50:56 2010 UTC
 Line 15 
 C     !INTERFACE:
        SUBROUTINE DYNAMICS(myTime, myIter, myThid)
  C     !DESCRIPTION: \bv
  C     *==========================================================*
  C     | SUBROUTINE DYNAMICS
  C     | o Controlling routine for the explicit part of the model
  C     |   dynamics.
  C     *==========================================================*
  C     | This routine evaluates the "dynamics" terms for each
  C     | block of ocean in turn. Because the blocks of ocean have
  C     | overlap regions they are independent of one another.
  C     | If terms involving lateral integrals are needed in this
  C     | routine care will be needed. Similarly finite-difference
  C     | operations with stencils wider than the overlap region
  C     | require special consideration.
  C     | The algorithm...
  C     |
  C     | "Correction Step"
 Line 146 
 C     myThid :: Thread number for this i
        INTEGER myIter
        INTEGER myThid
+ C     !FUNCTIONS:
+ #ifdef ALLOW_DIAGNOSTICS
+       LOGICAL  DIAGNOSTICS_IS_ON
+       EXTERNAL DIAGNOSTICS_IS_ON
+ #endif
  C     !LOCAL VARIABLES:
  C     == Local variables
  C     fVer[UV]               o fVer: Vertical flux term - note fVer
-Line 168 
 C     iMin, iMax     - Ranges and sub-bl
+Line 174 
 C     iMin, iMax     - Ranges and sub-bl
  C     jMin, jMax       are applied.
  C     bi, bj
  C     k, kup,        - Index for layer above and below. kup and kDown
  C     kDown, km1       are switched with layer to be the appropriate
  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)
-Line 190 
 C                      index into fVerTe
+Line 196 
 C                      index into fVerTe
        INTEGER k, km1, kp1, kup, kDown
  #ifdef ALLOW_DIAGNOSTICS
+       LOGICAL dPhiHydDiagIsOn
        _RL tmpFac
  #endif /* ALLOW_DIAGNOSTICS */
-Line 244 
 CEOP
+Line 251 
 CEOP
       &   CALL DEBUG_ENTER( 'DYNAMICS', myThid )
  #endif
+ #ifdef ALLOW_DIAGNOSTICS
+       dPhiHydDiagIsOn = .FALSE.
+       IF ( useDiagnostics )
+      &  dPhiHydDiagIsOn = DIAGNOSTICS_IS_ON( 'Um_dPHdx', myThid )
+      &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )
+ #endif
  C-- Call to routine for calculation of
  C   Eliassen-Palm-flux-forced U-tendency,
  C   if desired:
-Line 317 
 cph)
+Line 331 
 cph)
            guDissip(i,j)  = 0. _d 0
            gvDissip(i,j)  = 0. _d 0
  #ifdef ALLOW_AUTODIFF_TAMC
+           phiHydLow(i,j,bi,bj) = 0. _d 0
  # ifdef NONLIN_FRSURF
  #  ifndef DISABLE_RSTAR_CODE
            dWtransC(i,j,bi,bj) = 0. _d 0
-Line 394 
 C--       kDown  Cycles through 2,1 to p
+Line 409 
 C--       kDown  Cycles through 2,1 to p
            kup  = 1+MOD(k+1,2)
            kDown= 1+MOD(k,2)
  #ifdef ALLOW_AUTODIFF_TAMC
           kkey = (idynkey-1)*Nr + k
  c
  CADJ STORE totphihyd (:,:,k,bi,bj)
  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
+ CADJ STORE phihydlow (:,:,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)
-Line 448 
 CADJ &     = comlev1_bibj_k, key=kkey, b
+Line 465 
 CADJ &     = comlev1_bibj_k, key=kkey, b
  # endif
  #endif /* ALLOW_AUTODIFF_TAMC */
  C--      Integrate hydrostatic balance for phiHyd with BC of
  C        phiHyd(z=0)=0
           IF ( implicitIntGravWave ) THEN
             CALL CALC_PHI_HYD(
-Line 465 
 C        phiHyd(z=0)=0
+Line 482 
 C        phiHyd(z=0)=0
       O        phiHydC, dPhiHydX, dPhiHydY,
       I        myTime, myIter, myThid )
           ENDIF
+ #ifdef ALLOW_DIAGNOSTICS
+          IF ( dPhiHydDiagIsOn ) THEN
+            tmpFac = -1. _d 0
+            CALL DIAGNOSTICS_SCALE_FILL( dPhiHydX, tmpFac, 1,
+      &                           'Um_dPHdx', k, 1, 2, bi, bj, myThid )
+            CALL DIAGNOSTICS_SCALE_FILL( dPhiHydY, tmpFac, 1,
+      &                           'Vm_dPHdy', k, 1, 2, bi, bj, myThid )
+          ENDIF
+ #endif /* ALLOW_DIAGNOSTICS */
  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
  C        and step forward storing the result in gU, gV, etc...
-Line 494 
 C
+Line 520 
 C
             ELSE
  #ifdef ALLOW_MOM_VECINV
  C
  # ifdef ALLOW_AUTODIFF_TAMC
  #  ifdef NONLIN_FRSURF
  CADJ STORE fVerU(:,:,:)
  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
-Line 629 
 Cml(
+Line 655 
 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      CALL REMOVE_MEAN_RL( 1, phiHydLow, maskInC, maskInC, rA, drF,
- C     &                'phiHydLow', myTime, myThid )
+ C     &                     'phiHydLow', myTime, myThid )
  Cml)
  #ifdef ALLOW_DIAGNOSTICS
-Line 671 
 Cml)
+Line 697 
 Cml)
  #endif
  #ifdef DYNAMICS_GUGV_EXCH_CHECK
  C- jmc: For safety checking only: This Exchange here should not change
  C       the solution. If solution changes, it means something is wrong,
  C       but it does not mean that it is less wrong with this exchange.
        IF ( debugLevel .GT. debLevB ) THEN
         CALL EXCH_UV_XYZ_RL(gU,gV,.TRUE.,myThid)

 Legend:



Removed from v.1.142
 


changed lines


 
Added in v.1.145
 Legend:



Removed from v.1.142
 


changed lines


 
Added in v.1.145
-Removed from v.1.142
+Added in v.1.145

	ViewVC Help
Powered by ViewVC 1.1.22