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

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

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

revision 1.129 by heimbach, Sat Feb 25 16:20:01 2006 UTC revision 1.147 by gforget, Tue Aug 10 17:58:30 2010 UTC
# Line 3  C $Name$ Line 3  C $Name$
3    
4  #include "PACKAGES_CONFIG.h"  #include "PACKAGES_CONFIG.h"
5  #include "CPP_OPTIONS.h"  #include "CPP_OPTIONS.h"
6    #ifdef ALLOW_OBCS
7    # include "OBCS_OPTIONS.h"
8    #endif
9    
10  #undef DYNAMICS_GUGV_EXCH_CHECK  #undef DYNAMICS_GUGV_EXCH_CHECK
11    
12  CBOP  CBOP
# Line 11  C     !INTERFACE: Line 15  C     !INTERFACE:
15        SUBROUTINE DYNAMICS(myTime, myIter, myThid)        SUBROUTINE DYNAMICS(myTime, myIter, myThid)
16  C     !DESCRIPTION: \bv  C     !DESCRIPTION: \bv
17  C     *==========================================================*  C     *==========================================================*
18  C     | SUBROUTINE DYNAMICS                                        C     | SUBROUTINE DYNAMICS
19  C     | o Controlling routine for the explicit part of the model    C     | o Controlling routine for the explicit part of the model
20  C     |   dynamics.                                                C     |   dynamics.
21  C     *==========================================================*  C     *==========================================================*
22  C     | This routine evaluates the "dynamics" terms for each        C     | This routine evaluates the "dynamics" terms for each
23  C     | block of ocean in turn. Because the blocks of ocean have    C     | block of ocean in turn. Because the blocks of ocean have
24  C     | overlap regions they are independent of one another.        C     | overlap regions they are independent of one another.
25  C     | If terms involving lateral integrals are needed in this    C     | If terms involving lateral integrals are needed in this
26  C     | routine care will be needed. Similarly finite-difference    C     | routine care will be needed. Similarly finite-difference
27  C     | operations with stencils wider than the overlap region      C     | operations with stencils wider than the overlap region
28  C     | require special consideration.                              C     | require special consideration.
29  C     | The algorithm...  C     | The algorithm...
30  C     |  C     |
31  C     | "Correction Step"  C     | "Correction Step"
# Line 87  C     == Global variables === Line 91  C     == Global variables ===
91  # ifdef ALLOW_KPP  # ifdef ALLOW_KPP
92  #  include "KPP.h"  #  include "KPP.h"
93  # endif  # endif
94    # ifdef ALLOW_PTRACERS
95    #  include "PTRACERS_SIZE.h"
96    #  include "PTRACERS_FIELDS.h"
97    # endif
98    # ifdef ALLOW_OBCS
99    #  include "OBCS.h"
100    #  ifdef ALLOW_PTRACERS
101    #   include "OBCS_PTRACERS.h"
102    #  endif
103    # endif
104    # ifdef ALLOW_MOM_FLUXFORM
105    #  include "MOM_FLUXFORM.h"
106    # endif
107  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
108    
109  C     !CALLING SEQUENCE:  C     !CALLING SEQUENCE:
# Line 98  C      |-- CALC_GRAD_PHI_SURF Line 115  C      |-- CALC_GRAD_PHI_SURF
115  C      |  C      |
116  C      |-- CALC_VISCOSITY  C      |-- CALC_VISCOSITY
117  C      |  C      |
118  C      |-- CALC_PHI_HYD    C      |-- CALC_PHI_HYD
119  C      |  C      |
120  C      |-- MOM_FLUXFORM    C      |-- MOM_FLUXFORM
121  C      |  C      |
122  C      |-- MOM_VECINV      C      |-- MOM_VECINV
123  C      |  C      |
124  C      |-- TIMESTEP        C      |-- TIMESTEP
125  C      |  C      |
126  C      |-- OBCS_APPLY_UV  C      |-- OBCS_APPLY_UV
127  C      |  C      |
128  C      |-- MOM_U_IMPLICIT_R        C      |-- MOM_U_IMPLICIT_R
129  C      |-- MOM_V_IMPLICIT_R        C      |-- MOM_V_IMPLICIT_R
130  C      |  C      |
131  C      |-- IMPLDIFF        C      |-- IMPLDIFF
132  C      |  C      |
133  C      |-- OBCS_APPLY_UV  C      |-- OBCS_APPLY_UV
134  C      |  C      |
# Line 122  C      |-- DEBUG_STATS_RL Line 139  C      |-- DEBUG_STATS_RL
139    
140  C     !INPUT/OUTPUT PARAMETERS:  C     !INPUT/OUTPUT PARAMETERS:
141  C     == Routine arguments ==  C     == Routine arguments ==
142  C     myTime - Current time in simulation  C     myTime :: Current time in simulation
143  C     myIter - Current iteration number in simulation  C     myIter :: Current iteration number in simulation
144  C     myThid - Thread number for this instance of the routine.  C     myThid :: Thread number for this instance of the routine.
145        _RL myTime        _RL myTime
146        INTEGER myIter        INTEGER myIter
147        INTEGER myThid        INTEGER myThid
148    
149    C     !FUNCTIONS:
150    #ifdef ALLOW_DIAGNOSTICS
151          LOGICAL  DIAGNOSTICS_IS_ON
152          EXTERNAL DIAGNOSTICS_IS_ON
153    #endif
154    
155  C     !LOCAL VARIABLES:  C     !LOCAL VARIABLES:
156  C     == Local variables  C     == Local variables
157  C     fVer[UV]               o fVer: Vertical flux term - note fVer  C     fVer[UV]               o fVer: Vertical flux term - note fVer
# Line 145  C     phiSurfX,  ::  gradient of Surface Line 168  C     phiSurfX,  ::  gradient of Surface
168  C     phiSurfY             or geopotential (atmos) in X and Y direction  C     phiSurfY             or geopotential (atmos) in X and Y direction
169  C     guDissip   :: dissipation tendency (all explicit terms), u component  C     guDissip   :: dissipation tendency (all explicit terms), u component
170  C     gvDissip   :: dissipation tendency (all explicit terms), v component  C     gvDissip   :: dissipation tendency (all explicit terms), v component
171    C     KappaRU    :: vertical viscosity
172    C     KappaRV    :: vertical viscosity
173  C     iMin, iMax     - Ranges and sub-block indices on which calculations  C     iMin, iMax     - Ranges and sub-block indices on which calculations
174  C     jMin, jMax       are applied.  C     jMin, jMax       are applied.
175  C     bi, bj  C     bi, bj
176  C     k, kup,        - Index for layer above and below. kup and kDown  C     k, kup,        - Index for layer above and below. kup and kDown
177  C     kDown, km1       are switched with layer to be the appropriate  C     kDown, km1       are switched with layer to be the appropriate
178  C                      index into fVerTerm.  C                      index into fVerTerm.
179        _RL fVerU   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)        _RL fVerU   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)
180        _RL fVerV   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)        _RL fVerV   (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2)
# Line 171  C                      index into fVerTe Line 196  C                      index into fVerTe
196        INTEGER k, km1, kp1, kup, kDown        INTEGER k, km1, kp1, kup, kDown
197    
198  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
199          LOGICAL dPhiHydDiagIsOn
200        _RL tmpFac        _RL tmpFac
201  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */
202    
203    
204  C---    The algorithm...  C---    The algorithm...
205  C  C
206  C       "Correction Step"  C       "Correction Step"
# Line 225  CEOP Line 251  CEOP
251       &   CALL DEBUG_ENTER( 'DYNAMICS', myThid )       &   CALL DEBUG_ENTER( 'DYNAMICS', myThid )
252  #endif  #endif
253    
254    #ifdef ALLOW_DIAGNOSTICS
255          dPhiHydDiagIsOn = .FALSE.
256          IF ( useDiagnostics )
257         &  dPhiHydDiagIsOn = DIAGNOSTICS_IS_ON( 'Um_dPHdx', myThid )
258         &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )
259    #endif
260    
261  C-- Call to routine for calculation of  C-- Call to routine for calculation of
262  C   Eliassen-Palm-flux-forced U-tendency,  C   Eliassen-Palm-flux-forced U-tendency,
263  C   if desired:  C   if desired:
# Line 268  C     just ensure that all memory refere Line 301  C     just ensure that all memory refere
301  C     point numbers. This prevents spurious hardware signals due to  C     point numbers. This prevents spurious hardware signals due to
302  C     uninitialised but inert locations.  C     uninitialised but inert locations.
303    
304    #ifdef ALLOW_AUTODIFF_TAMC
305          DO k=1,Nr          DO k=1,Nr
306           DO j=1-OLy,sNy+OLy           DO j=1-OLy,sNy+OLy
307            DO i=1-OLx,sNx+OLx            DO i=1-OLx,sNx+OLx
308             KappaRU(i,j,k) = 0. _d 0             KappaRU(i,j,k) = 0. _d 0
309             KappaRV(i,j,k) = 0. _d 0             KappaRV(i,j,k) = 0. _d 0
 #ifdef ALLOW_AUTODIFF_TAMC  
310  cph(  cph(
311  c--   need some re-initialisation here to break dependencies  c--   need some re-initialisation here to break dependencies
312  cph)  cph)
313             gU(i,j,k,bi,bj) = 0. _d 0             gU(i,j,k,bi,bj) = 0. _d 0
314             gV(i,j,k,bi,bj) = 0. _d 0             gV(i,j,k,bi,bj) = 0. _d 0
 #endif  
315            ENDDO            ENDDO
316           ENDDO           ENDDO
317          ENDDO          ENDDO
318    #endif /* ALLOW_AUTODIFF_TAMC */
319          DO j=1-OLy,sNy+OLy          DO j=1-OLy,sNy+OLy
320           DO i=1-OLx,sNx+OLx           DO i=1-OLx,sNx+OLx
321            fVerU  (i,j,1) = 0. _d 0            fVerU  (i,j,1) = 0. _d 0
322            fVerU  (i,j,2) = 0. _d 0            fVerU  (i,j,2) = 0. _d 0
323            fVerV  (i,j,1) = 0. _d 0            fVerV  (i,j,1) = 0. _d 0
324            fVerV  (i,j,2) = 0. _d 0            fVerV  (i,j,2) = 0. _d 0
325            phiHydF (i,j)  = 0. _d 0            phiHydF (i,j)  = 0. _d 0
326            phiHydC (i,j)  = 0. _d 0            phiHydC (i,j)  = 0. _d 0
327    #ifndef INCLUDE_PHIHYD_CALCULATION_CODE
328            dPhiHydX(i,j)  = 0. _d 0            dPhiHydX(i,j)  = 0. _d 0
329            dPhiHydY(i,j)  = 0. _d 0            dPhiHydY(i,j)  = 0. _d 0
330    #endif
331            phiSurfX(i,j)  = 0. _d 0            phiSurfX(i,j)  = 0. _d 0
332            phiSurfY(i,j)  = 0. _d 0            phiSurfY(i,j)  = 0. _d 0
333            guDissip(i,j)  = 0. _d 0            guDissip(i,j)  = 0. _d 0
334            gvDissip(i,j)  = 0. _d 0            gvDissip(i,j)  = 0. _d 0
335    #ifdef ALLOW_AUTODIFF_TAMC
336              phiHydLow(i,j,bi,bj) = 0. _d 0
337    # ifdef NONLIN_FRSURF
338    #  ifndef DISABLE_RSTAR_CODE
339              dWtransC(i,j,bi,bj) = 0. _d 0
340              dWtransU(i,j,bi,bj) = 0. _d 0
341              dWtransV(i,j,bi,bj) = 0. _d 0
342    #  endif
343    # endif
344    #endif
345           ENDDO           ENDDO
346          ENDDO          ENDDO
347    
# Line 308  C--     Start computation of dynamics Line 353  C--     Start computation of dynamics
353    
354  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
355  CADJ STORE wvel (:,:,:,bi,bj) =  CADJ STORE wvel (:,:,:,bi,bj) =
356  CADJ &     comlev1_bibj, key = idynkey, byte = isbyte  CADJ &     comlev1_bibj, key=idynkey, byte=isbyte
357  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
358    
359  C--     Explicit part of the Surface Potentiel Gradient (add in TIMESTEP)  C--     Explicit part of the Surface Potentiel Gradient (add in TIMESTEP)
# Line 318  C       (note: this loop will be replace Line 363  C       (note: this loop will be replace
363       I         bi,bj,iMin,iMax,jMin,jMax,       I         bi,bj,iMin,iMax,jMin,jMax,
364       I         etaN,       I         etaN,
365       O         phiSurfX,phiSurfY,       O         phiSurfX,phiSurfY,
366       I         myThid )                               I         myThid )
367          ENDIF          ENDIF
368    
369  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
# Line 331  CADJ &                 = comlev1_bibj, k Line 376  CADJ &                 = comlev1_bibj, k
376  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
377    
378  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL
379  C--      Calculate the total vertical diffusivity  C--     Calculate the total vertical viscosity
380            CALL CALC_VISCOSITY(
381         I            bi,bj, iMin,iMax,jMin,jMax,
382         O            KappaRU, KappaRV,
383         I            myThid )
384    #else
385          DO k=1,Nr          DO k=1,Nr
386           CALL CALC_VISCOSITY(           DO j=1-OLy,sNy+OLy
387       I        bi,bj,iMin,iMax,jMin,jMax,k,            DO i=1-OLx,sNx+OLx
388       O        KappaRU,KappaRV,             KappaRU(i,j,k) = 0. _d 0
389       I        myThid)             KappaRV(i,j,k) = 0. _d 0
390         ENDDO            ENDDO
391             ENDDO
392            ENDDO
393  #endif  #endif
394    
395  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
396  CADJ STORE KappaRU(:,:,:)  CADJ STORE KappaRU(:,:,:)
397  CADJ &                 = comlev1_bibj, key=idynkey, byte=isbyte  CADJ &     = comlev1_bibj, key=idynkey, byte=isbyte
398  CADJ STORE KappaRV(:,:,:)  CADJ STORE KappaRV(:,:,:)
399  CADJ &                 = comlev1_bibj, key=idynkey, byte=isbyte  CADJ &     = comlev1_bibj, key=idynkey, byte=isbyte
400  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
401    
402  C--     Start of dynamics loop  C--     Start of dynamics loop
# Line 359  C--       kDown  Cycles through 2,1 to p Line 411  C--       kDown  Cycles through 2,1 to p
411            kup  = 1+MOD(k+1,2)            kup  = 1+MOD(k+1,2)
412            kDown= 1+MOD(k,2)            kDown= 1+MOD(k,2)
413    
414  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
415           kkey = (idynkey-1)*Nr + k           kkey = (idynkey-1)*Nr + k
416  c  c
417  CADJ STORE totphihyd (:,:,k,bi,bj)  CADJ STORE totphihyd (:,:,k,bi,bj)
418  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
419    CADJ STORE phihydlow (:,:,bi,bj)
420    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
421  CADJ STORE theta (:,:,k,bi,bj)  CADJ STORE theta (:,:,k,bi,bj)
422  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
423  CADJ STORE salt  (:,:,k,bi,bj)  CADJ STORE salt  (:,:,k,bi,bj)
# Line 405  CADJ STORE vVelD(:,:,k,bi,bj) Line 459  CADJ STORE vVelD(:,:,k,bi,bj)
459  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
460  #  endif  #  endif
461  # endif  # endif
462    # ifdef ALLOW_DEPTH_CONTROL
463    CADJ STORE  fVerU (:,:,:)
464    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
465    CADJ STORE  fVerV (:,:,:)
466    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
467    # endif
468  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
469    
470  C--      Integrate hydrostatic balance for phiHyd with BC of  C--      Integrate hydrostatic balance for phiHyd with BC of
471  C        phiHyd(z=0)=0  C        phiHyd(z=0)=0
472           IF ( implicitIntGravWave ) THEN           IF ( implicitIntGravWave ) THEN
473             CALL CALC_PHI_HYD(             CALL CALC_PHI_HYD(
# Line 424  C        phiHyd(z=0)=0 Line 484  C        phiHyd(z=0)=0
484       O        phiHydC, dPhiHydX, dPhiHydY,       O        phiHydC, dPhiHydX, dPhiHydY,
485       I        myTime, myIter, myThid )       I        myTime, myIter, myThid )
486           ENDIF           ENDIF
487    #ifdef ALLOW_DIAGNOSTICS
488             IF ( dPhiHydDiagIsOn ) THEN
489               tmpFac = -1. _d 0
490               CALL DIAGNOSTICS_SCALE_FILL( dPhiHydX, tmpFac, 1,
491         &                           'Um_dPHdx', k, 1, 2, bi, bj, myThid )
492               CALL DIAGNOSTICS_SCALE_FILL( dPhiHydY, tmpFac, 1,
493         &                           'Vm_dPHdy', k, 1, 2, bi, bj, myThid )
494             ENDIF
495    #endif /* ALLOW_DIAGNOSTICS */
496    
497  C--      Calculate accelerations in the momentum equations (gU, gV, ...)  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
498  C        and step forward storing the result in gU, gV, etc...  C        and step forward storing the result in gU, gV, etc...
499           IF ( momStepping ) THEN           IF ( momStepping ) THEN
500    #ifdef ALLOW_AUTODIFF_TAMC
501    # ifdef NONLIN_FRSURF
502    #  ifndef DISABLE_RSTAR_CODE
503    CADJ STORE dWtransC(:,:,bi,bj)
504    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
505    CADJ STORE dWtransU(:,:,bi,bj)
506    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
507    CADJ STORE dWtransV(:,:,bi,bj)
508    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
509    #  endif
510    # endif
511    #endif
512               IF (.NOT. vectorInvariantMomentum) THEN
513  #ifdef ALLOW_MOM_FLUXFORM  #ifdef ALLOW_MOM_FLUXFORM
514             IF (.NOT. vectorInvariantMomentum) CALL MOM_FLUXFORM(  C
515                  CALL MOM_FLUXFORM(
516       I         bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown,       I         bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown,
517       I         KappaRU, KappaRV,       I         KappaRU, KappaRV,
518       U         fVerU, fVerV,       U         fVerU, fVerV,
519       O         guDissip, gvDissip,       O         guDissip, gvDissip,
520       I         myTime, myIter, myThid)       I         myTime, myIter, myThid)
521  #endif  #endif
522               ELSE
523  #ifdef ALLOW_MOM_VECINV  #ifdef ALLOW_MOM_VECINV
            IF (vectorInvariantMomentum) THEN  
524  C  C
525  # ifdef ALLOW_AUTODIFF_TAMC  # ifdef ALLOW_AUTODIFF_TAMC
526  #  ifdef NONLIN_FRSURF  #  ifdef NONLIN_FRSURF
527  CADJ STORE fVerU(:,:,:)  CADJ STORE fVerU(:,:,:)
528  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
# Line 454  C Line 537  C
537       U         fVerU, fVerV,       U         fVerU, fVerV,
538       O         guDissip, gvDissip,       O         guDissip, gvDissip,
539       I         myTime, myIter, myThid)       I         myTime, myIter, myThid)
            ENDIF  
540  #endif  #endif
541               ENDIF
542    C
543             CALL TIMESTEP(             CALL TIMESTEP(
544       I         bi,bj,iMin,iMax,jMin,jMax,k,       I         bi,bj,iMin,iMax,jMin,jMax,k,
545       I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,       I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,
# Line 476  C--     end of dynamics k loop (1:Nr) Line 560  C--     end of dynamics k loop (1:Nr)
560          ENDDO          ENDDO
561    
562  C--     Implicit Vertical advection & viscosity  C--     Implicit Vertical advection & viscosity
563  #ifdef INCLUDE_IMPLVERTADV_CODE  #if (defined (INCLUDE_IMPLVERTADV_CODE) && \
564         defined (ALLOW_MOM_COMMON) && !(defined ALLOW_AUTODIFF_TAMC))
565          IF ( momImplVertAdv ) THEN          IF ( momImplVertAdv ) THEN
566            CALL MOM_U_IMPLICIT_R( kappaRU,            CALL MOM_U_IMPLICIT_R( kappaRU,
567       I                           bi, bj, myTime, myIter, myThid )       I                           bi, bj, myTime, myIter, myThid )
568            CALL MOM_V_IMPLICIT_R( kappaRV,            CALL MOM_V_IMPLICIT_R( kappaRV,
569       I                           bi, bj, myTime, myIter, myThid )       I                           bi, bj, myTime, myIter, myThid )
# Line 536  CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_ Line 621  CADJ STORE uVelD(:,:,:,bi,bj) = comlev1_
621          ENDIF          ENDIF
622  #endif    /* ALLOW_CD_CODE */  #endif    /* ALLOW_CD_CODE */
623  C--     End implicit Vertical advection & viscosity  C--     End implicit Vertical advection & viscosity
   
        ENDDO  
       ENDDO  
   
 #ifdef ALLOW_OBCS  
       IF (useOBCS) THEN  
        CALL OBCS_PRESCRIBE_EXCHANGES(myThid)  
       ENDIF  
 #endif  
624    
625  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
626    
627  #ifdef ALLOW_NONHYDROSTATIC  #ifdef ALLOW_NONHYDROSTATIC
628  C--   Step forward W field in N-H algorithm  C--   Step forward W field in N-H algorithm
629        IF ( nonHydrostatic ) THEN          IF ( nonHydrostatic ) THEN
630  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
631           IF ( debugLevel .GE. debLevB )           IF ( debugLevel .GE. debLevB )
632       &     CALL DEBUG_CALL('CALC_GW', myThid )       &     CALL DEBUG_CALL('CALC_GW', myThid )
633  #endif  #endif
634           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
635           CALL CALC_GW( myTime, myIter, myThid )           CALL CALC_GW(
636        ENDIF       I                 bi,bj, KappaRU, KappaRV,
637        IF ( nonHydrostatic.OR.implicitIntGravWave )       I                 myTime, myIter, myThid )
638       &   CALL TIMESTEP_WVEL( myTime, myIter, myThid )          ENDIF
639        IF ( nonHydrostatic )          IF ( nonHydrostatic.OR.implicitIntGravWave )
640         &   CALL TIMESTEP_WVEL( bi,bj, myTime, myIter, myThid )
641            IF ( nonHydrostatic )
642       &   CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)       &   CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)
643  #endif  #endif
644    
645  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
646    
647    C-    end of bi,bj loops
648           ENDDO
649          ENDDO
650    
651    #ifdef ALLOW_OBCS
652          IF (useOBCS) THEN
653           CALL OBCS_PRESCRIBE_EXCHANGES(myThid)
654          ENDIF
655    #endif
656    
657  Cml(  Cml(
658  C     In order to compare the variance of phiHydLow of a p/z-coordinate  C     In order to compare the variance of phiHydLow of a p/z-coordinate
659  C     run with etaH of a z/p-coordinate run the drift of phiHydLow  C     run with etaH of a z/p-coordinate run the drift of phiHydLow
660  C     has to be removed by something like the following subroutine:  C     has to be removed by something like the following subroutine:
661  C      CALL REMOVE_MEAN_RL( 1, phiHydLow, maskH, maskH, rA, drF,  C      CALL REMOVE_MEAN_RL( 1, phiHydLow, maskInC, maskInC, rA, drF,
662  C     &                'phiHydLow', myThid )  C     &                     'phiHydLow', myTime, myThid )
663  Cml)  Cml)
664    
665  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
666        IF ( usediagnostics ) THEN        IF ( useDiagnostics ) THEN
667    
668         CALL DIAGNOSTICS_FILL(totPhihyd,'PHIHYD  ',0,Nr,0,1,1,myThid)         CALL DIAGNOSTICS_FILL(totPhihyd,'PHIHYD  ',0,Nr,0,1,1,myThid)
669         CALL DIAGNOSTICS_FILL(phiHydLow,'PHIBOT  ',0, 1,0,1,1,myThid)         CALL DIAGNOSTICS_FILL(phiHydLow,'PHIBOT  ',0, 1,0,1,1,myThid)
# Line 589  Cml) Line 677  Cml)
677    
678        ENDIF        ENDIF
679  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */
680          
681  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
682        If ( debugLevel .GE. debLevB ) THEN        If ( debugLevel .GE. debLevB ) THEN
683         CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)         CALL DEBUG_STATS_RL(1,EtaN,'EtaN (DYNAMICS)',myThid)
# Line 612  Cml) Line 700  Cml)
700  #endif  #endif
701    
702  #ifdef DYNAMICS_GUGV_EXCH_CHECK  #ifdef DYNAMICS_GUGV_EXCH_CHECK
703  C- jmc: For safety checking only: This Exchange here should not change  C- jmc: For safety checking only: This Exchange here should not change
704  C       the solution. If solution changes, it means something is wrong,  C       the solution. If solution changes, it means something is wrong,
705  C       but it does not mean that it is less wrong with this exchange.  C       but it does not mean that it is less wrong with this exchange.
706        IF ( debugLevel .GT. debLevB ) THEN        IF ( debugLevel .GT. debLevB ) THEN
707         CALL EXCH_UV_XYZ_RL(gU,gV,.TRUE.,myThid)         CALL EXCH_UV_XYZ_RL(gU,gV,.TRUE.,myThid)
Legend:
Removed from v.1.129  
changed lines
  Added in v.1.147
  ViewVC Help
Powered by ViewVC 1.1.22