/[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.164 by jahn, Thu Mar 21 18:15:44 2013 UTC revision 1.169 by gforget, Thu Feb 6 23:16:46 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_MOM_COMMON
7    # include "MOM_COMMON_OPTIONS.h"
8    #endif
9  #ifdef ALLOW_OBCS  #ifdef ALLOW_OBCS
10  # include "OBCS_OPTIONS.h"  # include "OBCS_OPTIONS.h"
11  #endif  #endif
# Line 78  C     == Global variables === Line 81  C     == Global variables ===
81  #include "SIZE.h"  #include "SIZE.h"
82  #include "EEPARAMS.h"  #include "EEPARAMS.h"
83  #include "PARAMS.h"  #include "PARAMS.h"
84    #include "GRID.h"
85  #include "DYNVARS.h"  #include "DYNVARS.h"
86    #ifdef ALLOW_MOM_COMMON
87    # include "MOM_VISC.h"
88    #endif
89  #ifdef ALLOW_CD_CODE  #ifdef ALLOW_CD_CODE
90  #include "CD_CODE_VARS.h"  # include "CD_CODE_VARS.h"
91  #endif  #endif
 #include "GRID.h"  
92  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
93  # include "tamc.h"  # include "tamc.h"
94  # include "tamc_keys.h"  # include "tamc_keys.h"
# Line 96  C     == Global variables === Line 102  C     == Global variables ===
102  #  include "PTRACERS_FIELDS.h"  #  include "PTRACERS_FIELDS.h"
103  # endif  # endif
104  # ifdef ALLOW_OBCS  # ifdef ALLOW_OBCS
105  #include "OBCS_PARAMS.h"  #  include "OBCS_PARAMS.h"
106  #  include "OBCS_FIELDS.h"  #  include "OBCS_FIELDS.h"
107  #  ifdef ALLOW_PTRACERS  #  ifdef ALLOW_PTRACERS
108  #   include "OBCS_PTRACERS.h"  #   include "OBCS_PTRACERS.h"
# Line 116  C      |-- CALC_GRAD_PHI_SURF Line 122  C      |-- CALC_GRAD_PHI_SURF
122  C      |  C      |
123  C      |-- CALC_VISCOSITY  C      |-- CALC_VISCOSITY
124  C      |  C      |
125    C      |-- MOM_CALC_3D_STRAIN
126    C      |
127    C      |-- CALC_EDDY_STRESS
128    C      |
129  C      |-- CALC_PHI_HYD  C      |-- CALC_PHI_HYD
130  C      |  C      |
131  C      |-- MOM_FLUXFORM  C      |-- MOM_FLUXFORM
132  C      |  C      |
133  C      |-- MOM_VECINV  C      |-- MOM_VECINV
134  C      |  C      |
135    C      |-- MOM_CALC_SMAG_3D
136    C      |-- MOM_UV_SMAG_3D
137    C      |
138  C      |-- TIMESTEP  C      |-- TIMESTEP
139  C      |  C      |
140  C      |-- MOM_U_IMPLICIT_R  C      |-- MOM_U_IMPLICIT_R
# Line 167  C     phiSurfX,  ::  gradient of Surface Line 180  C     phiSurfX,  ::  gradient of Surface
180  C     phiSurfY             or geopotential (atmos) in X and Y direction  C     phiSurfY             or geopotential (atmos) in X and Y direction
181  C     guDissip   :: dissipation tendency (all explicit terms), u component  C     guDissip   :: dissipation tendency (all explicit terms), u component
182  C     gvDissip   :: dissipation tendency (all explicit terms), v component  C     gvDissip   :: dissipation tendency (all explicit terms), v component
183  C     KappaRU    :: vertical viscosity  C     KappaRU    :: vertical viscosity for velocity U-component
184  C     KappaRV    :: vertical viscosity  C     KappaRV    :: vertical viscosity for velocity V-component
185  C     iMin, iMax :: Ranges and sub-block indices on which calculations  C     iMin, iMax :: Ranges and sub-block indices on which calculations
186  C     jMin, jMax    are applied.  C     jMin, jMax    are applied.
187  C     bi, bj     :: tile indices  C     bi, bj     :: tile indices
# Line 188  C                   are switched with k Line 201  C                   are switched with k
201        _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL gvDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
202        _RL KappaRU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)        _RL KappaRU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
203        _RL KappaRV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)        _RL KappaRV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
204    #ifdef ALLOW_SMAG_3D
205    C     str11       :: strain component Vxx @ grid-cell center
206    C     str22       :: strain component Vyy @ grid-cell center
207    C     str33       :: strain component Vzz @ grid-cell center
208    C     str12       :: strain component Vxy @ grid-cell corner
209    C     str13       :: strain component Vxz @ above uVel
210    C     str23       :: strain component Vyz @ above vVel
211    C     viscAh3d_00 :: Smagorinsky viscosity @ grid-cell center
212    C     viscAh3d_12 :: Smagorinsky viscosity @ grid-cell corner
213    C     viscAh3d_13 :: Smagorinsky viscosity @ above uVel
214    C     viscAh3d_23 :: Smagorinsky viscosity @ above vVel
215    C     addDissU    :: zonal momentum tendency from 3-D Smag. viscosity
216    C     addDissV    :: merid momentum tendency from 3-D Smag. viscosity
217          _RL str11(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
218          _RL str22(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
219          _RL str33(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
220          _RL str12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
221          _RL str13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
222          _RL str23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
223          _RL viscAh3d_00(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
224          _RL viscAh3d_12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr )
225          _RL viscAh3d_13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
226          _RL viscAh3d_23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1)
227          _RL addDissU(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
228          _RL addDissV(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
229    #elif ( defined ALLOW_NONHYDROSTATIC )
230          _RL str13(1), str23(1), str33(1)
231          _RL viscAh3d_00(1), viscAh3d_13(1), viscAh3d_23(1)
232    #endif
233    
       INTEGER iMin, iMax  
       INTEGER jMin, jMax  
234        INTEGER bi, bj        INTEGER bi, bj
235        INTEGER i, j        INTEGER i, j
236        INTEGER k, km1, kp1, kUp, kDown        INTEGER k, km1, kp1, kUp, kDown
237          INTEGER iMin, iMax
238          INTEGER jMin, jMax
239          PARAMETER( iMin = 0 , iMax = sNx+1 )
240          PARAMETER( jMin = 0 , jMax = sNy+1 )
241    
242  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
243        LOGICAL dPhiHydDiagIsOn        LOGICAL dPhiHydDiagIsOn
244        _RL tmpFac        _RL tmpFac
245  #endif /* ALLOW_DIAGNOSTICS */  #endif /* ALLOW_DIAGNOSTICS */
246    
   
247  C---    The algorithm...  C---    The algorithm...
248  C  C
249  C       "Correction Step"  C       "Correction Step"
# Line 257  CEOP Line 300  CEOP
300       &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )       &               .OR. DIAGNOSTICS_IS_ON( 'Vm_dPHdy', myThid )
301  #endif  #endif
302    
303  C-- Call to routine for calculation of  C-- Call to routine for calculation of Eliassen-Palm-flux-forced
304  C   Eliassen-Palm-flux-forced U-tendency,  C    U-tendency, if desired:
 C   if desired:  
305  #ifdef INCLUDE_EP_FORCING_CODE  #ifdef INCLUDE_EP_FORCING_CODE
306        CALL CALC_EP_FORCING(myThid)        CALL CALC_EP_FORCING(myThid)
307  #endif  #endif
# Line 304  C     just ensure that all memory refere Line 346  C     just ensure that all memory refere
346  C     point numbers. This prevents spurious hardware signals due to  C     point numbers. This prevents spurious hardware signals due to
347  C     uninitialised but inert locations.  C     uninitialised but inert locations.
348    
349  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
350          DO k=1,Nr          DO k=1,Nr
351           DO j=1-OLy,sNy+OLy           DO j=1-OLy,sNy+OLy
352            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(  
353  c--   need some re-initialisation here to break dependencies  c--   need some re-initialisation here to break dependencies
 cph)  
354             gU(i,j,k,bi,bj) = 0. _d 0             gU(i,j,k,bi,bj) = 0. _d 0
355             gV(i,j,k,bi,bj) = 0. _d 0             gV(i,j,k,bi,bj) = 0. _d 0
356            ENDDO            ENDDO
357           ENDDO           ENDDO
358          ENDDO          ENDDO
359  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF */
360          DO j=1-OLy,sNy+OLy          DO j=1-OLy,sNy+OLy
361           DO i=1-OLx,sNx+OLx           DO i=1-OLx,sNx+OLx
362            fVerU  (i,j,1) = 0. _d 0            fVerU  (i,j,1) = 0. _d 0
# Line 335  cph) Line 373  cph)
373            phiSurfY(i,j)  = 0. _d 0            phiSurfY(i,j)  = 0. _d 0
374            guDissip(i,j)  = 0. _d 0            guDissip(i,j)  = 0. _d 0
375            gvDissip(i,j)  = 0. _d 0            gvDissip(i,j)  = 0. _d 0
376  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF
377            phiHydLow(i,j,bi,bj) = 0. _d 0            phiHydLow(i,j,bi,bj) = 0. _d 0
378  # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)  # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)
379  #  ifndef DISABLE_RSTAR_CODE  #  ifndef DISABLE_RSTAR_CODE
 #   ifndef ALLOW_AUTODIFF_OPENAD  
380            dWtransC(i,j,bi,bj) = 0. _d 0            dWtransC(i,j,bi,bj) = 0. _d 0
381            dWtransU(i,j,bi,bj) = 0. _d 0            dWtransU(i,j,bi,bj) = 0. _d 0
382            dWtransV(i,j,bi,bj) = 0. _d 0            dWtransV(i,j,bi,bj) = 0. _d 0
 #   endif  
383  #  endif  #  endif
384  # endif  # endif
385  #endif  #endif /* ALLOW_AUTODIFF */
386           ENDDO           ENDDO
387          ENDDO          ENDDO
388    
389  C--     Start computation of dynamics  C--     Start computation of dynamics
         iMin = 0  
         iMax = sNx+1  
         jMin = 0  
         jMax = sNy+1  
390    
391  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
392  CADJ STORE wVel (:,:,:,bi,bj) =  CADJ STORE wVel (:,:,:,bi,bj) =
# Line 380  CADJ &                 = comlev1_bibj, k Line 412  CADJ &                 = comlev1_bibj, k
412  #endif /* ALLOW_KPP */  #endif /* ALLOW_KPP */
413  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
414    
415  #ifdef  INCLUDE_CALC_DIFFUSIVITY_CALL  #ifndef ALLOW_AUTODIFF
416            IF ( .NOT.momViscosity ) THEN
417    #endif
418              DO k=1,Nr
419               DO j=1-OLy,sNy+OLy
420                DO i=1-OLx,sNx+OLx
421                 KappaRU(i,j,k) = 0. _d 0
422                 KappaRV(i,j,k) = 0. _d 0
423                ENDDO
424               ENDDO
425              ENDDO
426    #ifndef ALLOW_AUTODIFF
427            ENDIF
428    #endif
429    #ifdef INCLUDE_CALC_DIFFUSIVITY_CALL
430  C--     Calculate the total vertical viscosity  C--     Calculate the total vertical viscosity
431          CALL CALC_VISCOSITY(          IF ( momViscosity ) THEN
432              CALL CALC_VISCOSITY(
433       I            bi,bj, iMin,iMax,jMin,jMax,       I            bi,bj, iMin,iMax,jMin,jMax,
434       O            KappaRU, KappaRV,       O            KappaRU, KappaRV,
435       I            myThid )       I            myThid )
436  #else          ENDIF
437          DO k=1,Nr  #endif /* INCLUDE_CALC_DIFFUSIVITY_CALL */
438           DO j=1-OLy,sNy+OLy  
439            DO i=1-OLx,sNx+OLx  #ifdef ALLOW_SMAG_3D
440             KappaRU(i,j,k) = 0. _d 0          IF ( useSmag3D ) THEN
441             KappaRV(i,j,k) = 0. _d 0            CALL MOM_CALC_3D_STRAIN(
442            ENDDO       O         str11, str22, str33, str12, str13, str23,
443           ENDDO       I         bi, bj, myThid )
444          ENDDO          ENDIF
445  #endif  #endif /* ALLOW_SMAG_3D */
446    
447  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
448  CADJ STORE KappaRU(:,:,:)  CADJ STORE KappaRU(:,:,:)
# Line 407  CADJ &     = comlev1_bibj, key=idynkey, Line 454  CADJ &     = comlev1_bibj, key=idynkey,
454  #ifdef ALLOW_OBCS  #ifdef ALLOW_OBCS
455  C--   For Stevens boundary conditions velocities need to be extrapolated  C--   For Stevens boundary conditions velocities need to be extrapolated
456  C     (copied) to a narrow strip outside the domain  C     (copied) to a narrow strip outside the domain
457           IF ( useOBCS ) THEN          IF ( useOBCS ) THEN
458            CALL OBCS_COPY_UV_N(            CALL OBCS_COPY_UV_N(
459       U         uVel(1-OLx,1-OLy,1,bi,bj),       U         uVel(1-OLx,1-OLy,1,bi,bj),
460       U         vVel(1-OLx,1-OLy,1,bi,bj),       U         vVel(1-OLx,1-OLy,1,bi,bj),
461       I         Nr, bi, bj, myThid )       I         Nr, bi, bj, myThid )
462           ENDIF          ENDIF
463  #endif /* ALLOW_OBCS */  #endif /* ALLOW_OBCS */
464    
465    #ifdef ALLOW_EDDYPSI
466            CALL CALC_EDDY_STRESS(bi,bj,myThid)
467    #endif
468    
469  C--     Start of dynamics loop  C--     Start of dynamics loop
470          DO k=1,Nr          DO k=1,Nr
471    
# Line 429  C--       kDown  Cycles through 2,1 to p Line 480  C--       kDown  Cycles through 2,1 to p
480    
481  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
482           kkey = (idynkey-1)*Nr + k           kkey = (idynkey-1)*Nr + k
 c  
483  CADJ STORE totPhiHyd (:,:,k,bi,bj)  CADJ STORE totPhiHyd (:,:,k,bi,bj)
484  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
485  CADJ STORE phiHydLow (:,:,bi,bj)  CADJ STORE phiHydLow (:,:,bi,bj)
486  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte    
487  CADJ STORE theta (:,:,k,bi,bj)  CADJ STORE theta (:,:,k,bi,bj)
488  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
489  CADJ STORE salt  (:,:,k,bi,bj)  CADJ STORE salt  (:,:,k,bi,bj)
# Line 448  CADJ STORE  phiHydC (:,:) Line 498  CADJ STORE  phiHydC (:,:)
498  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
499  CADJ STORE  phiHydF (:,:)  CADJ STORE  phiHydF (:,:)
500  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  
501  CADJ STORE gU(:,:,k,bi,bj)  CADJ STORE gU(:,:,k,bi,bj)
502  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
503  CADJ STORE gV(:,:,k,bi,bj)  CADJ STORE gV(:,:,k,bi,bj)
# Line 485  CADJ &     = comlev1_bibj_k, key=kkey, b Line 527  CADJ &     = comlev1_bibj_k, key=kkey, b
527  CADJ STORE vVelD(:,:,k,bi,bj)  CADJ STORE vVelD(:,:,k,bi,bj)
528  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
529  #  endif  #  endif
530  # 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  
531  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
532    
533  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  
534           IF ( implicitIntGravWave ) THEN           IF ( implicitIntGravWave ) THEN
535             CALL CALC_PHI_HYD(             CALL CALC_PHI_HYD(
536       I        bi,bj,iMin,iMax,jMin,jMax,k,       I        bi,bj,iMin,iMax,jMin,jMax,k,
# Line 524  C        phiHyd(z=0)=0 Line 559  C        phiHyd(z=0)=0
559  C--      Calculate accelerations in the momentum equations (gU, gV, ...)  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
560  C        and step forward storing the result in gU, gV, etc...  C        and step forward storing the result in gU, gV, etc...
561           IF ( momStepping ) THEN           IF ( momStepping ) THEN
562    #ifdef ALLOW_AUTODIFF
563               DO j=1-OLy,sNy+OLy
564                DO i=1-OLx,sNx+OLx
565                  guDissip(i,j)  = 0. _d 0
566                  gvDissip(i,j)  = 0. _d 0
567                ENDDO
568               ENDDO
569    #endif /* ALLOW_AUTODIFF */
570  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
571  # ifdef NONLIN_FRSURF  # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM)
572  #  if (defined ALLOW_MOM_FLUXFORM) && !(defined DISABLE_RSTAR_CODE)  #  ifndef DISABLE_RSTAR_CODE
573  CADJ STORE dWtransC(:,:,bi,bj)  CADJ STORE dWtransC(:,:,bi,bj)
574  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
575  CADJ STORE dWtransU(:,:,bi,bj)  CADJ STORE dWtransU(:,:,bi,bj)
# Line 534  CADJ &     = comlev1_bibj_k, key=kkey, b Line 577  CADJ &     = comlev1_bibj_k, key=kkey, b
577  CADJ STORE dWtransV(:,:,bi,bj)  CADJ STORE dWtransV(:,:,bi,bj)
578  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
579  #  endif  #  endif
580  CADJ STORE fVerU(:,:,:)  # endif /* NONLIN_FRSURF and ALLOW_MOM_FLUXFORM */
581  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  # if (defined NONLIN_FRSURF) || (defined ALLOW_DEPTH_CONTROL)
582  CADJ STORE fVerV(:,:,:)  CADJ STORE fVerU(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte
583  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ STORE fVerV(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte
584  # endif /* NONLIN_FRSURF */  # endif
585  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
586             IF (.NOT. vectorInvariantMomentum) THEN             IF (.NOT. vectorInvariantMomentum) THEN
587  #ifdef ALLOW_MOM_FLUXFORM  #ifdef ALLOW_MOM_FLUXFORM
# Line 561  CADJ &     = comlev1_bibj_k, key=kkey, b Line 604  CADJ &     = comlev1_bibj_k, key=kkey, b
604       I         myTime, myIter, myThid)       I         myTime, myIter, myThid)
605  #endif  #endif
606             ENDIF             ENDIF
607  C  
608    #ifdef ALLOW_SMAG_3D
609               IF ( useSmag3D ) THEN
610                 CALL MOM_CALC_SMAG_3D(
611         I         str11, str22, str33, str12, str13, str23,
612         O         viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23,
613         I         smag3D_hLsC, smag3D_hLsW, smag3D_hLsS, smag3D_hLsZ,
614         I         k, bi, bj, myThid )
615                 CALL MOM_UV_SMAG_3D(
616         I         str11, str22, str12, str13, str23,
617         I         viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23,
618         O         addDissU, addDissV,
619         I         iMin,iMax,jMin,jMax, k, bi, bj, myThid )
620                 DO j= jMin,jMax
621                  DO i= iMin,iMax
622                   guDissip(i,j) = guDissip(i,j) + addDissU(i,j)
623                   gvDissip(i,j) = gvDissip(i,j) + addDissV(i,j)
624                  ENDDO
625                 ENDDO
626               ENDIF
627    #endif /* ALLOW_SMAG_3D */
628    
629             CALL TIMESTEP(             CALL TIMESTEP(
630       I         bi,bj,iMin,iMax,jMin,jMax,k,       I         bi,bj,iMin,iMax,jMin,jMax,k,
631       I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,       I         dPhiHydX,dPhiHydY, phiSurfX, phiSurfY,
# Line 586  C--     Implicit Vertical advection & vi Line 650  C--     Implicit Vertical advection & vi
650          IF     ( implicitViscosity ) THEN          IF     ( implicitViscosity ) THEN
651  #endif /* INCLUDE_IMPLVERTADV_CODE */  #endif /* INCLUDE_IMPLVERTADV_CODE */
652  #ifdef    ALLOW_AUTODIFF_TAMC  #ifdef    ALLOW_AUTODIFF_TAMC
 CADJ STORE KappaRU(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte  
653  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
654  #endif    /* ALLOW_AUTODIFF_TAMC */  #endif    /* ALLOW_AUTODIFF_TAMC */
655            CALL IMPLDIFF(            CALL IMPLDIFF(
# Line 595  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bib Line 658  CADJ STORE gU(:,:,:,bi,bj) = comlev1_bib
658       U         gU,       U         gU,
659       I         myThid )       I         myThid )
660  #ifdef    ALLOW_AUTODIFF_TAMC  #ifdef    ALLOW_AUTODIFF_TAMC
 CADJ STORE KappaRV(:,:,:) = comlev1_bibj , key=idynkey, byte=isbyte  
661  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte  CADJ STORE gV(:,:,:,bi,bj) = comlev1_bibj , key=idynkey, byte=isbyte
662  #endif    /* ALLOW_AUTODIFF_TAMC */  #endif    /* ALLOW_AUTODIFF_TAMC */
663            CALL IMPLDIFF(            CALL IMPLDIFF(
# Line 650  C--   Step forward W field in N-H algori Line 712  C--   Step forward W field in N-H algori
712           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
713           CALL CALC_GW(           CALL CALC_GW(
714       I                 bi,bj, KappaRU, KappaRV,       I                 bi,bj, KappaRU, KappaRV,
715         I                 str13, str23, str33,
716         I                 viscAh3d_00, viscAh3d_13, viscAh3d_23,
717       I                 myTime, myIter, myThid )       I                 myTime, myIter, myThid )
718          ENDIF          ENDIF
719          IF ( nonHydrostatic.OR.implicitIntGravWave )          IF ( nonHydrostatic.OR.implicitIntGravWave )

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.169

  ViewVC Help
Powered by ViewVC 1.1.22