/[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.162 by jmc, Sun Mar 18 22:19:45 2012 UTC revision 1.170 by jmc, Fri Apr 4 20:54:11 2014 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_AUTODIFF
7    # include "AUTODIFF_OPTIONS.h"
8    #endif
9    #ifdef ALLOW_MOM_COMMON
10    # include "MOM_COMMON_OPTIONS.h"
11    #endif
12  #ifdef ALLOW_OBCS  #ifdef ALLOW_OBCS
13  # include "OBCS_OPTIONS.h"  # include "OBCS_OPTIONS.h"
14  #endif  #endif
# Line 78  C     == Global variables === Line 84  C     == Global variables ===
84  #include "SIZE.h"  #include "SIZE.h"
85  #include "EEPARAMS.h"  #include "EEPARAMS.h"
86  #include "PARAMS.h"  #include "PARAMS.h"
87    #include "GRID.h"
88  #include "DYNVARS.h"  #include "DYNVARS.h"
89    #ifdef ALLOW_MOM_COMMON
90    # include "MOM_VISC.h"
91    #endif
92  #ifdef ALLOW_CD_CODE  #ifdef ALLOW_CD_CODE
93  #include "CD_CODE_VARS.h"  # include "CD_CODE_VARS.h"
94  #endif  #endif
95  #include "GRID.h"  #ifdef ALLOW_AUTODIFF
 #ifdef ALLOW_AUTODIFF_TAMC  
96  # include "tamc.h"  # include "tamc.h"
97  # include "tamc_keys.h"  # include "tamc_keys.h"
98  # include "FFIELDS.h"  # include "FFIELDS.h"
# Line 96  C     == Global variables === Line 105  C     == Global variables ===
105  #  include "PTRACERS_FIELDS.h"  #  include "PTRACERS_FIELDS.h"
106  # endif  # endif
107  # ifdef ALLOW_OBCS  # ifdef ALLOW_OBCS
108    #  include "OBCS_PARAMS.h"
109  #  include "OBCS_FIELDS.h"  #  include "OBCS_FIELDS.h"
110  #  ifdef ALLOW_PTRACERS  #  ifdef ALLOW_PTRACERS
111  #   include "OBCS_PTRACERS.h"  #   include "OBCS_PTRACERS.h"
# Line 104  C     == Global variables === Line 114  C     == Global variables ===
114  # ifdef ALLOW_MOM_FLUXFORM  # ifdef ALLOW_MOM_FLUXFORM
115  #  include "MOM_FLUXFORM.h"  #  include "MOM_FLUXFORM.h"
116  # endif  # endif
117  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF */
118    
119  C     !CALLING SEQUENCE:  C     !CALLING SEQUENCE:
120  C     DYNAMICS()  C     DYNAMICS()
# Line 115  C      |-- CALC_GRAD_PHI_SURF Line 125  C      |-- CALC_GRAD_PHI_SURF
125  C      |  C      |
126  C      |-- CALC_VISCOSITY  C      |-- CALC_VISCOSITY
127  C      |  C      |
128    C      |-- MOM_CALC_3D_STRAIN
129    C      |
130    C      |-- CALC_EDDY_STRESS
131    C      |
132  C      |-- CALC_PHI_HYD  C      |-- CALC_PHI_HYD
133  C      |  C      |
134  C      |-- MOM_FLUXFORM  C      |-- MOM_FLUXFORM
135  C      |  C      |
136  C      |-- MOM_VECINV  C      |-- MOM_VECINV
137  C      |  C      |
138    C      |-- MOM_CALC_SMAG_3D
139    C      |-- MOM_UV_SMAG_3D
140    C      |
141  C      |-- TIMESTEP  C      |-- TIMESTEP
142  C      |  C      |
143  C      |-- MOM_U_IMPLICIT_R  C      |-- MOM_U_IMPLICIT_R
# Line 166  C     phiSurfX,  ::  gradient of Surface Line 183  C     phiSurfX,  ::  gradient of Surface
183  C     phiSurfY             or geopotential (atmos) in X and Y direction  C     phiSurfY             or geopotential (atmos) in X and Y direction
184  C     guDissip   :: dissipation tendency (all explicit terms), u component  C     guDissip   :: dissipation tendency (all explicit terms), u component
185  C     gvDissip   :: dissipation tendency (all explicit terms), v component  C     gvDissip   :: dissipation tendency (all explicit terms), v component
186  C     KappaRU    :: vertical viscosity  C     KappaRU    :: vertical viscosity for velocity U-component
187  C     KappaRV    :: vertical viscosity  C     KappaRV    :: vertical viscosity for velocity V-component
188  C     iMin, iMax :: Ranges and sub-block indices on which calculations  C     iMin, iMax :: Ranges and sub-block indices on which calculations
189  C     jMin, jMax    are applied.  C     jMin, jMax    are applied.
190  C     bi, bj     :: tile indices  C     bi, bj     :: tile indices
# Line 187  C                   are switched with k Line 204  C                   are switched with k
204        _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
205        _RL KappaRU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)        _RL KappaRU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
206        _RL KappaRV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)        _RL KappaRV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
207    #ifdef ALLOW_SMAG_3D
208    C     str11       :: strain component Vxx @ grid-cell center
209    C     str22       :: strain component Vyy @ grid-cell center
210    C     str33       :: strain component Vzz @ grid-cell center
211    C     str12       :: strain component Vxy @ grid-cell corner
212    C     str13       :: strain component Vxz @ above uVel
213    C     str23       :: strain component Vyz @ above vVel
214    C     viscAh3d_00 :: Smagorinsky viscosity @ grid-cell center
215    C     viscAh3d_12 :: Smagorinsky viscosity @ grid-cell corner
216    C     viscAh3d_13 :: Smagorinsky viscosity @ above uVel
217    C     viscAh3d_23 :: Smagorinsky viscosity @ above vVel
218    C     addDissU    :: zonal momentum tendency from 3-D Smag. viscosity
219    C     addDissV    :: merid momentum tendency from 3-D Smag. viscosity
220          _RL str11(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
221          _RL str22(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
222          _RL str33(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
223          _RL str12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
224          _RL str13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
225          _RL str23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
226          _RL viscAh3d_00(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
227          _RL viscAh3d_12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
228          _RL viscAh3d_13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
229          _RL viscAh3d_23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
230          _RL addDissU(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
231          _RL addDissV(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
232    #elif ( defined ALLOW_NONHYDROSTATIC )
233          _RL str13(1), str23(1), str33(1)
234          _RL viscAh3d_00(1), viscAh3d_13(1), viscAh3d_23(1)
235    #endif
236    
       INTEGER iMin, iMax  
       INTEGER jMin, jMax  
237        INTEGER bi, bj        INTEGER bi, bj
238        INTEGER i, j        INTEGER i, j
239        INTEGER k, km1, kp1, kUp, kDown        INTEGER k, km1, kp1, kUp, kDown
240          INTEGER iMin, iMax
241          INTEGER jMin, jMax
242          PARAMETER( iMin = 0 , iMax = sNx+1 )
243          PARAMETER( jMin = 0 , jMax = sNy+1 )
244    
245  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
246        LOGICAL dPhiHydDiagIsOn        LOGICAL dPhiHydDiagIsOn
247        _RL tmpFac        _RL tmpFac
248  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */
249    
   
250  C---    The algorithm...  C---    The algorithm...
251  C  C
252  C       "Correction Step"  C       "Correction Step"
# Line 256  CEOP Line 303  CEOP
303       &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )       &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )
304  #endif  #endif
305    
306  C-- Call to routine for calculation of  C-- Call to routine for calculation of Eliassen-Palm-flux-forced
307  C   Eliassen-Palm-flux-forced U-tendency,  C    U-tendency, if desired:
 C   if desired:  
308  #ifdef INCLUDE_EP_FORCING_CODE  #ifdef INCLUDE_EP_FORCING_CODE
309        CALL CALC_EP_FORCING(myThid)        CALL CALC_EP_FORCING(myThid)
310  #endif  #endif
# Line 303  C     just ensure that all memory refere Line 349  C     just ensure that all memory refere
349  C     point numbers. This prevents spurious hardware signals due to  C     point numbers. This prevents spurious hardware signals due to
350  C     uninitialised but inert locations.  C     uninitialised but inert locations.
351    
352  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
353          DO k=1,Nr          DO k=1,Nr
354           DO j=1-OLy,sNy+OLy           DO j=1-OLy,sNy+OLy
355            DO i=1-OLx,sNx+OLx            DO i=1-OLx,sNx+OLx
            KappaRU(i,j,k) = 0. _d 0  
            KappaRV(i,j,k) = 0. _d 0  
 cph(  
356  c--   need some re-initialisation here to break dependencies  c--   need some re-initialisation here to break dependencies
 cph)  
357             gU(i,j,k,bi,bj) = 0. _d 0             gU(i,j,k,bi,bj) = 0. _d 0
358             gV(i,j,k,bi,bj) = 0. _d 0             gV(i,j,k,bi,bj) = 0. _d 0
359            ENDDO            ENDDO
360           ENDDO           ENDDO
361          ENDDO          ENDDO
362  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF */
363          DO j=1-OLy,sNy+OLy          DO j=1-OLy,sNy+OLy
364           DO i=1-OLx,sNx+OLx           DO i=1-OLx,sNx+OLx
365            fVerU  (i,j,1) = 0. _d 0            fVerU  (i,j,1) = 0. _d 0
# Line 334  cph) Line 376  cph)
376            phiSurfY(i,j)  = 0. _d 0            phiSurfY(i,j)  = 0. _d 0
377            guDissip(i,j)  = 0. _d 0            guDissip(i,j)  = 0. _d 0
378            gvDissip(i,j)  = 0. _d 0            gvDissip(i,j)  = 0. _d 0
379  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
380            phiHydLow(i,j,bi,bj) = 0. _d 0            phiHydLow(i,j,bi,bj) = 0. _d 0
381  # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)  # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)
382  #  ifndef DISABLE_RSTAR_CODE  #  ifndef DISABLE_RSTAR_CODE
# Line 343  cph) Line 385  cph)
385            dWtransV(i,j,bi,bj) = 0. _d 0            dWtransV(i,j,bi,bj) = 0. _d 0
386  #  endif  #  endif
387  # endif  # endif
388  #endif  #endif /* ALLOW_AUTODIFF */
389           ENDDO           ENDDO
390          ENDDO          ENDDO
391    
392  C--     Start computation of dynamics  C--     Start computation of dynamics
         iMin = 0  
         iMax = sNx+1  
         jMin = 0  
         jMax = sNy+1  
393    
394  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
395  CADJ STORE wVel (:,:,:,bi,bj) =  CADJ STORE wVel (:,:,:,bi,bj) =
# Line 377  CADJ &                 = comlev1_bibj, k Line 415  CADJ &                 = comlev1_bibj, k
415  #endif /* ALLOW_KPP */  #endif /* ALLOW_KPP */
416  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
417    
418  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL  #ifndef ALLOW_AUTODIFF
419            IF ( .NOT.momViscosity ) THEN
420    #endif
421              DO k=1,Nr
422               DO j=1-OLy,sNy+OLy
423                DO i=1-OLx,sNx+OLx
424                 KappaRU(i,j,k) = 0. _d 0
425                 KappaRV(i,j,k) = 0. _d 0
426                ENDDO
427               ENDDO
428              ENDDO
429    #ifndef ALLOW_AUTODIFF
430            ENDIF
431    #endif
432    #ifdef INCLUDE_CALC_DIFFUSIVITY_CALL
433  C--     Calculate the total vertical viscosity  C--     Calculate the total vertical viscosity
434          CALL CALC_VISCOSITY(          IF ( momViscosity ) THEN
435              CALL CALC_VISCOSITY(
436       I            bi,bj, iMin,iMax,jMin,jMax,       I            bi,bj, iMin,iMax,jMin,jMax,
437       O            KappaRU, KappaRV,       O            KappaRU, KappaRV,
438       I            myThid )       I            myThid )
439  #else          ENDIF
440          DO k=1,Nr  #endif /* INCLUDE_CALC_DIFFUSIVITY_CALL */
441           DO j=1-OLy,sNy+OLy  
442            DO i=1-OLx,sNx+OLx  #ifdef ALLOW_SMAG_3D
443             KappaRU(i,j,k) = 0. _d 0          IF ( useSmag3D ) THEN
444             KappaRV(i,j,k) = 0. _d 0            CALL MOM_CALC_3D_STRAIN(
445            ENDDO       O         str11, str22, str33, str12, str13, str23,
446           ENDDO       I         bi, bj, myThid )
447          ENDDO          ENDIF
448  #endif  #endif /* ALLOW_SMAG_3D */
449    
450  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
451  CADJ STORE KappaRU(:,:,:)  CADJ STORE KappaRU(:,:,:)
# Line 404  CADJ &     = comlev1_bibj, key=idynkey, Line 457  CADJ &     = comlev1_bibj, key=idynkey,
457  #ifdef ALLOW_OBCS  #ifdef ALLOW_OBCS
458  C--   For Stevens boundary conditions velocities need to be extrapolated  C--   For Stevens boundary conditions velocities need to be extrapolated
459  C     (copied) to a narrow strip outside the domain  C     (copied) to a narrow strip outside the domain
460           IF ( useOBCS ) THEN          IF ( useOBCS ) THEN
461            CALL OBCS_COPY_UV_N(            CALL OBCS_COPY_UV_N(
462       U         uVel(1-OLx,1-OLy,1,bi,bj),       U         uVel(1-OLx,1-OLy,1,bi,bj),
463       U         vVel(1-OLx,1-OLy,1,bi,bj),       U         vVel(1-OLx,1-OLy,1,bi,bj),
464       I         Nr, bi, bj, myThid )       I         Nr, bi, bj, myThid )
465           ENDIF          ENDIF
466  #endif /* ALLOW_OBCS */  #endif /* ALLOW_OBCS */
467    
468    #ifdef ALLOW_EDDYPSI
469            CALL CALC_EDDY_STRESS(bi,bj,myThid)
470    #endif
471    
472  C--     Start of dynamics loop  C--     Start of dynamics loop
473          DO k=1,Nr          DO k=1,Nr
474    
# Line 426  C--       kDown  Cycles through 2,1 to p Line 483  C--       kDown  Cycles through 2,1 to p
483    
484  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
485           kkey = (idynkey-1)*Nr + k           kkey = (idynkey-1)*Nr + k
 c  
486  CADJ STORE totPhiHyd (:,:,k,bi,bj)  CADJ STORE totPhiHyd (:,:,k,bi,bj)
487  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
488  CADJ STORE phiHydLow (:,:,bi,bj)  CADJ STORE phiHydLow (:,:,bi,bj)
# Line 445  CADJ STORE  phiHydC (:,:) Line 501  CADJ STORE  phiHydC (:,:)
501  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
502  CADJ STORE  phiHydF (:,:)  CADJ STORE  phiHydF (:,:)
503  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
 CADJ STORE  guDissip (:,:)  
 CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  
 CADJ STORE  gvDissip (:,:)  
 CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  
 CADJ STORE  fVerU (:,:,:)  
 CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  
 CADJ STORE  fVerV (:,:,:)  
 CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  
504  CADJ STORE gU(:,:,k,bi,bj)  CADJ STORE gU(:,:,k,bi,bj)
505  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
506  CADJ STORE gV(:,:,k,bi,bj)  CADJ STORE gV(:,:,k,bi,bj)
# Line 482  CADJ &     = comlev1_bibj_k, key=kkey, b Line 530  CADJ &     = comlev1_bibj_k, key=kkey, b
530  CADJ STORE vVelD(:,:,k,bi,bj)  CADJ STORE vVelD(:,:,k,bi,bj)
531  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
532  #  endif  #  endif
533  # endif  # endif /* NONLIN_FRSURF */
 # ifdef ALLOW_DEPTH_CONTROL  
 CADJ STORE  fVerU (:,:,:)  
 CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  
 CADJ STORE  fVerV (:,:,:)  
 CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  
 # endif  
534  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
535    
536  C--      Integrate hydrostatic balance for phiHyd with BC of  C--      Integrate hydrostatic balance for phiHyd with BC of phiHyd(z=0)=0
 C        phiHyd(z=0)=0  
537           IF ( implicitIntGravWave ) THEN           IF ( implicitIntGravWave ) THEN
538             CALL CALC_PHI_HYD(             CALL CALC_PHI_HYD(
539       I        bi,bj,iMin,iMax,jMin,jMax,k,       I        bi,bj,iMin,iMax,jMin,jMax,k,
# Line 521  C        phiHyd(z=0)=0 Line 562  C        phiHyd(z=0)=0
562  C--      Calculate accelerations in the momentum equations (gU, gV, ...)  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
563  C        and step forward storing the result in gU, gV, etc...  C        and step forward storing the result in gU, gV, etc...
564           IF ( momStepping ) THEN           IF ( momStepping ) THEN
565    #ifdef ALLOW_AUTODIFF
566               DO j=1-OLy,sNy+OLy
567                DO i=1-OLx,sNx+OLx
568                  guDissip(i,j)  = 0. _d 0
569                  gvDissip(i,j)  = 0. _d 0
570                ENDDO
571               ENDDO
572    #endif /* ALLOW_AUTODIFF */
573  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
574  # ifdef NONLIN_FRSURF  # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)
575  #  if (defined ALLOW_MOM_FLUXFORM) && !(defined DISABLE_RSTAR_CODE)  #  ifndef DISABLE_RSTAR_CODE
576  CADJ STORE dWtransC(:,:,bi,bj)  CADJ STORE dWtransC(:,:,bi,bj)
577  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
578  CADJ STORE dWtransU(:,:,bi,bj)  CADJ STORE dWtransU(:,:,bi,bj)
# Line 531  CADJ &     = comlev1_bibj_k, key=kkey, b Line 580  CADJ &     = comlev1_bibj_k, key=kkey, b
580  CADJ STORE dWtransV(:,:,bi,bj)  CADJ STORE dWtransV(:,:,bi,bj)
581  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
582  #  endif  #  endif
583  CADJ STORE fVerU(:,:,:)  # endif /* NONLIN_FRSURF and ALLOW_MOM_FLUXFORM */
584  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  # if (defined NONLIN_FRSURF) || (defined ALLOW_DEPTH_CONTROL)
585  CADJ STORE fVerV(:,:,:)  CADJ STORE fVerU(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte
586  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ STORE fVerV(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte
587  # endif /* NONLIN_FRSURF */  # endif
588  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
589             IF (.NOT. vectorInvariantMomentum) THEN             IF (.NOT. vectorInvariantMomentum) THEN
590  #ifdef ALLOW_MOM_FLUXFORM  #ifdef ALLOW_MOM_FLUXFORM
# Line 558  CADJ &     = comlev1_bibj_k, key=kkey, b Line 607  CADJ &     = comlev1_bibj_k, key=kkey, b
607       I         myTime, myIter, myThid)       I         myTime, myIter, myThid)
608  #endif  #endif
609             ENDIF             ENDIF
610  C  
611    #ifdef ALLOW_SMAG_3D
612               IF ( useSmag3D ) THEN
613                 CALL MOM_CALC_SMAG_3D(
614         I         str11, str22, str33, str12, str13, str23,
615         O         viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23,
616         I         smag3D_hLsC, smag3D_hLsW, smag3D_hLsS, smag3D_hLsZ,
617         I         k, bi, bj, myThid )
618                 CALL MOM_UV_SMAG_3D(
619         I         str11, str22, str12, str13, str23,
620         I         viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23,
621         O         addDissU, addDissV,
622         I         iMin,iMax,jMin,jMax, k, bi, bj, myThid )
623                 DO j= jMin,jMax
624                  DO i= iMin,iMax
625                   guDissip(i,j) = guDissip(i,j) + addDissU(i,j)
626                   gvDissip(i,j) = gvDissip(i,j) + addDissV(i,j)
627                  ENDDO
628                 ENDDO
629               ENDIF
630    #endif /* ALLOW_SMAG_3D */
631    
632             CALL TIMESTEP(             CALL TIMESTEP(
633       I         bi,bj,iMin,iMax,jMin,jMax,k,       I         bi,bj,iMin,iMax,jMin,jMax,k,
634       I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,       I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,
# Line 583  C--     Implicit Vertical advection & vi Line 653  C--     Implicit Vertical advection & vi
653          IF     ( implicitViscosity ) THEN          IF     ( implicitViscosity ) THEN
654  #endif /* INCLUDE_IMPLVERTADV_CODE */  #endif /* INCLUDE_IMPLVERTADV_CODE */
655  #ifdef    ALLOW_AUTODIFF_TAMC  #ifdef    ALLOW_AUTODIFF_TAMC
 CADJ STORE KappaRU(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte  
656  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
657  #endif    /* ALLOW_AUTODIFF_TAMC */  #endif    /* ALLOW_AUTODIFF_TAMC */
658            CALL IMPLDIFF(            CALL IMPLDIFF(
# Line 592  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bib Line 661  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bib
661       U         gU,       U         gU,
662       I         myThid )       I         myThid )
663  #ifdef    ALLOW_AUTODIFF_TAMC  #ifdef    ALLOW_AUTODIFF_TAMC
 CADJ STORE KappaRV(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte  
664  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
665  #endif    /* ALLOW_AUTODIFF_TAMC */  #endif    /* ALLOW_AUTODIFF_TAMC */
666            CALL IMPLDIFF(            CALL IMPLDIFF(
# Line 647  C--   Step forward W field in N-H algori Line 715  C--   Step forward W field in N-H algori
715           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
716           CALL CALC_GW(           CALL CALC_GW(
717       I                 bi,bj, KappaRU, KappaRV,       I                 bi,bj, KappaRU, KappaRV,
718         I                 str13, str23, str33,
719         I                 viscAh3d_00, viscAh3d_13, viscAh3d_23,
720       I                 myTime, myIter, myThid )       I                 myTime, myIter, myThid )
721          ENDIF          ENDIF
722          IF ( nonHydrostatic.OR.implicitIntGravWave )          IF ( nonHydrostatic.OR.implicitIntGravWave )

Legend:
Removed from v.1.162  
changed lines
  Added in v.1.170

  ViewVC Help
Powered by ViewVC 1.1.22