--- MITgcm/model/src/dynamics.F 2011/05/24 20:25:33 1.157 +++ MITgcm/model/src/dynamics.F 2013/11/05 13:34:31 1.167 @@ -1,8 +1,11 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.157 2011/05/24 20:25:33 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.167 2013/11/05 13:34:31 jmc Exp $ C $Name: $ #include "PACKAGES_CONFIG.h" #include "CPP_OPTIONS.h" +#ifdef ALLOW_MOM_COMMON +# include "MOM_COMMON_OPTIONS.h" +#endif #ifdef ALLOW_OBCS # include "OBCS_OPTIONS.h" #endif @@ -78,11 +81,14 @@ #include "SIZE.h" #include "EEPARAMS.h" #include "PARAMS.h" +#include "GRID.h" #include "DYNVARS.h" +#ifdef ALLOW_MOM_COMMON +# include "MOM_VISC.h" +#endif #ifdef ALLOW_CD_CODE -#include "CD_CODE_VARS.h" +# include "CD_CODE_VARS.h" #endif -#include "GRID.h" #ifdef ALLOW_AUTODIFF_TAMC # include "tamc.h" # include "tamc_keys.h" @@ -96,6 +102,7 @@ # include "PTRACERS_FIELDS.h" # endif # ifdef ALLOW_OBCS +# include "OBCS_PARAMS.h" # include "OBCS_FIELDS.h" # ifdef ALLOW_PTRACERS # include "OBCS_PTRACERS.h" @@ -115,15 +122,20 @@ C | C |-- CALC_VISCOSITY C | +C |-- MOM_CALC_3D_STRAIN +C | +C |-- CALC_EDDY_STRESS +C | C |-- CALC_PHI_HYD C | C |-- MOM_FLUXFORM C | C |-- MOM_VECINV C | -C |-- TIMESTEP +C |-- MOM_CALC_SMAG_3D +C |-- MOM_UV_SMAG_3D C | -C |-- OBCS_APPLY_UV +C |-- TIMESTEP C | C |-- MOM_U_IMPLICIT_R C |-- MOM_V_IMPLICIT_R @@ -168,39 +180,70 @@ C phiSurfY or geopotential (atmos) in X and Y direction C guDissip :: dissipation tendency (all explicit terms), u component C gvDissip :: dissipation tendency (all explicit terms), v component -C KappaRU :: vertical viscosity -C KappaRV :: vertical viscosity -C iMin, iMax - Ranges and sub-block indices on which calculations -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. +C KappaRU :: vertical viscosity for velocity U-component +C KappaRV :: vertical viscosity for velocity V-component +C iMin, iMax :: Ranges and sub-block indices on which calculations +C jMin, jMax are applied. +C bi, bj :: tile indices +C k :: current level index +C km1, kp1 :: index of level above (k-1) and below (k+1) +C kUp, kDown :: Index for interface above and below. kUp and kDown are +C are switched with k to be the appropriate index into fVerU,V _RL fVerU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL fVerV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL phiHydF (1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL phiHydC (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 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 guDissip(1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL gvDissip(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 KappaRU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) + _RL KappaRV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) +#ifdef ALLOW_SMAG_3D +C str11 :: strain component Vxx @ grid-cell center +C str22 :: strain component Vyy @ grid-cell center +C str33 :: strain component Vzz @ grid-cell center +C str12 :: strain component Vxy @ grid-cell corner +C str13 :: strain component Vxz @ above uVel +C str23 :: strain component Vyz @ above vVel +C viscAh3d_00 :: Smagorinsky viscosity @ grid-cell center +C viscAh3d_12 :: Smagorinsky viscosity @ grid-cell corner +C viscAh3d_13 :: Smagorinsky viscosity @ above uVel +C viscAh3d_23 :: Smagorinsky viscosity @ above vVel +C addDissU :: zonal momentum tendency from 3-D Smag. viscosity +C addDissV :: merid momentum tendency from 3-D Smag. viscosity + _RL str11(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr ) + _RL str22(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr ) + _RL str33(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr ) + _RL str12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr ) + _RL str13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1) + _RL str23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1) + _RL viscAh3d_00(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr ) + _RL viscAh3d_12(1-OLx:sNx+OLx,1-OLy:sNy+OLy, Nr ) + _RL viscAh3d_13(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1) + _RL viscAh3d_23(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr+1) + _RL addDissU(1-OLx:sNx+OLx,1-OLy:sNy+OLy) + _RL addDissV(1-OLx:sNx+OLx,1-OLy:sNy+OLy) +#elif ( defined ALLOW_NONHYDROSTATIC ) + _RL str13(1), str23(1), str33(1) + _RL viscAh3d_00(1), viscAh3d_13(1), viscAh3d_23(1) +#endif - INTEGER iMin, iMax - INTEGER jMin, jMax INTEGER bi, bj INTEGER i, j - INTEGER k, km1, kp1, kup, kDown + INTEGER k, km1, kp1, kUp, kDown + INTEGER iMin, iMax + INTEGER jMin, jMax + PARAMETER( iMin = 0 , iMax = sNx+1 ) + PARAMETER( jMin = 0 , jMax = sNy+1 ) #ifdef ALLOW_DIAGNOSTICS LOGICAL dPhiHydDiagIsOn _RL tmpFac #endif /* ALLOW_DIAGNOSTICS */ - C--- The algorithm... C C "Correction Step" @@ -257,15 +300,14 @@ & .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: +C-- Call to routine for calculation of Eliassen-Palm-flux-forced +C U-tendency, if desired: #ifdef INCLUDE_EP_FORCING_CODE CALL CALC_EP_FORCING(myThid) #endif #ifdef ALLOW_AUTODIFF_MONITOR_DIAG - CALL DUMMY_IN_DYNAMICS( mytime, myiter, myThid ) + CALL DUMMY_IN_DYNAMICS( myTime, myIter, myThid ) #endif #ifdef ALLOW_AUTODIFF_TAMC @@ -299,7 +341,7 @@ #endif /* ALLOW_AUTODIFF_TAMC */ C-- Set up work arrays with valid (i.e. not NaN) values -C These inital values do not alter the numerical results. They +C These initial 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. @@ -308,8 +350,6 @@ 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 cph( c-- need some re-initialisation here to break dependencies cph) @@ -339,9 +379,11 @@ phiHydLow(i,j,bi,bj) = 0. _d 0 # if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM) # ifndef DISABLE_RSTAR_CODE +# ifndef ALLOW_AUTODIFF_OPENAD dWtransC(i,j,bi,bj) = 0. _d 0 dWtransU(i,j,bi,bj) = 0. _d 0 dWtransV(i,j,bi,bj) = 0. _d 0 +# endif # endif # endif #endif @@ -349,17 +391,13 @@ ENDDO C-- Start computation of dynamics - iMin = 0 - iMax = sNx+1 - jMin = 0 - jMax = sNy+1 #ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE wvel (:,:,:,bi,bj) = +CADJ STORE wVel (:,:,:,bi,bj) = CADJ & comlev1_bibj, key=idynkey, byte=isbyte #endif /* ALLOW_AUTODIFF_TAMC */ -C-- Explicit part of the Surface Potentiel Gradient (add in TIMESTEP) +C-- Explicit part of the Surface Potential Gradient (add in TIMESTEP) C (note: this loop will be replaced by CALL CALC_GRAD_ETA) IF (implicSurfPress.NE.1.) THEN CALL CALC_GRAD_PHI_SURF( @@ -370,30 +408,46 @@ 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 +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 +#if (defined INCLUDE_CALC_DIFFUSIVITY_CALL) && !(defined ALLOW_AUTODIFF) + IF ( .NOT.momViscosity ) THEN +#endif /* INCLUDE_CALC_DIFFUSIVITY_CALL and not ALLOW_AUTODIFF */ + 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 + ENDDO + ENDDO + ENDDO +#ifdef INCLUDE_CALC_DIFFUSIVITY_CALL C-- Calculate the total vertical viscosity - CALL CALC_VISCOSITY( +#ifdef ALLOW_AUTODIFF + IF ( momViscosity ) THEN +#else + ELSE +#endif + CALL CALC_VISCOSITY( I bi,bj, iMin,iMax,jMin,jMax, O KappaRU, KappaRV, I myThid ) -#else - 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 - ENDDO - ENDDO - ENDDO -#endif + ENDIF +#endif /* INCLUDE_CALC_DIFFUSIVITY_CALL */ + +#ifdef ALLOW_SMAG_3D + IF ( useSmag3D ) THEN + CALL MOM_CALC_3D_STRAIN( + O str11, str22, str33, str12, str13, str23, + I bi, bj, myThid ) + ENDIF +#endif /* ALLOW_SMAG_3D */ #ifdef ALLOW_AUTODIFF_TAMC CADJ STORE KappaRU(:,:,:) @@ -402,6 +456,21 @@ CADJ & = comlev1_bibj, key=idynkey, byte=isbyte #endif /* ALLOW_AUTODIFF_TAMC */ +#ifdef ALLOW_OBCS +C-- For Stevens boundary conditions velocities need to be extrapolated +C (copied) to a narrow strip outside the domain + IF ( useOBCS ) THEN + CALL OBCS_COPY_UV_N( + U uVel(1-OLx,1-OLy,1,bi,bj), + U vVel(1-OLx,1-OLy,1,bi,bj), + I Nr, bi, bj, myThid ) + ENDIF +#endif /* ALLOW_OBCS */ + +#ifdef ALLOW_EDDYPSI + CALL CALC_EDDY_STRESS(bi,bj,myThid) +#endif + C-- Start of dynamics loop DO k=1,Nr @@ -417,17 +486,17 @@ #ifdef ALLOW_AUTODIFF_TAMC kkey = (idynkey-1)*Nr + k c -CADJ STORE totphihyd (:,:,k,bi,bj) +CADJ STORE totPhiHyd (:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE phihydlow (:,:,bi,bj) +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) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gt(:,:,k,bi,bj) +CADJ STORE gT(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gs(:,:,k,bi,bj) +CADJ STORE gS(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # ifdef NONLIN_FRSURF cph-test @@ -435,37 +504,37 @@ CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte CADJ STORE phiHydF (:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gudissip (:,:) +CADJ STORE guDissip (:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gvdissip (:,:) +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 -CADJ STORE gu(:,:,k,bi,bj) +CADJ STORE gU(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gv(:,:,k,bi,bj) +CADJ STORE gV(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # ifndef ALLOW_ADAMSBASHFORTH_3 -CADJ STORE gunm1(:,:,k,bi,bj) +CADJ STORE guNm1(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gvnm1(:,:,k,bi,bj) +CADJ STORE gvNm1(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # else -CADJ STORE gunm(:,:,k,bi,bj,1) +CADJ STORE guNm(:,:,k,bi,bj,1) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gunm(:,:,k,bi,bj,2) +CADJ STORE guNm(:,:,k,bi,bj,2) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gvnm(:,:,k,bi,bj,1) +CADJ STORE gvNm(:,:,k,bi,bj,1) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gvnm(:,:,k,bi,bj,2) +CADJ STORE gvNm(:,:,k,bi,bj,2) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # endif # ifdef ALLOW_CD_CODE -CADJ STORE unm1(:,:,k,bi,bj) +CADJ STORE uNM1(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE vnm1(:,:,k,bi,bj) +CADJ STORE vNM1(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte CADJ STORE uVelD(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte @@ -481,8 +550,7 @@ # endif #endif /* ALLOW_AUTODIFF_TAMC */ -C-- Integrate hydrostatic balance for phiHyd with BC of -C phiHyd(z=0)=0 +C-- Integrate hydrostatic balance for phiHyd with BC of phiHyd(z=0)=0 IF ( implicitIntGravWave ) THEN CALL CALC_PHI_HYD( I bi,bj,iMin,iMax,jMin,jMax,k, @@ -512,8 +580,8 @@ C and step forward storing the result in gU, gV, etc... IF ( momStepping ) THEN #ifdef ALLOW_AUTODIFF_TAMC -# if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM) -# ifndef DISABLE_RSTAR_CODE +# ifdef NONLIN_FRSURF +# if (defined ALLOW_MOM_FLUXFORM) && !(defined DISABLE_RSTAR_CODE) CADJ STORE dWtransC(:,:,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte CADJ STORE dWtransU(:,:,bi,bj) @@ -521,39 +589,55 @@ CADJ STORE dWtransV(:,:,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # endif -# endif -#endif +CADJ STORE fVerU(:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE fVerV(:,:,:) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +# endif /* NONLIN_FRSURF */ +#endif /* ALLOW_AUTODIFF_TAMC */ IF (.NOT. vectorInvariantMomentum) THEN #ifdef ALLOW_MOM_FLUXFORM -C CALL MOM_FLUXFORM( - I bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown, + I bi,bj,k,iMin,iMax,jMin,jMax, I KappaRU, KappaRV, - U fVerU, fVerV, + U fVerU(1-OLx,1-OLy,kUp), fVerV(1-OLx,1-OLy,kUp), + O fVerU(1-OLx,1-OLy,kDown), fVerV(1-OLx,1-OLy,kDown), O guDissip, gvDissip, I myTime, myIter, myThid) #endif ELSE #ifdef ALLOW_MOM_VECINV -C -# ifdef ALLOW_AUTODIFF_TAMC -# ifdef NONLIN_FRSURF -CADJ STORE fVerU(:,:,:) -CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE fVerV(:,:,:) -CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -# endif -# endif /* ALLOW_AUTODIFF_TAMC */ -C CALL MOM_VECINV( - I bi,bj,iMin,iMax,jMin,jMax,k,kup,kDown, + I bi,bj,k,iMin,iMax,jMin,jMax, I KappaRU, KappaRV, - U fVerU, fVerV, + I fVerU(1-OLx,1-OLy,kUp), fVerV(1-OLx,1-OLy,kUp), + O fVerU(1-OLx,1-OLy,kDown), fVerV(1-OLx,1-OLy,kDown), O guDissip, gvDissip, I myTime, myIter, myThid) #endif ENDIF -C + +#ifdef ALLOW_SMAG_3D + IF ( useSmag3D ) THEN + CALL MOM_CALC_SMAG_3D( + I str11, str22, str33, str12, str13, str23, + O viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23, + I smag3D_hLsC, smag3D_hLsW, smag3D_hLsS, smag3D_hLsZ, + I k, bi, bj, myThid ) + CALL MOM_UV_SMAG_3D( + I str11, str22, str12, str13, str23, + I viscAh3d_00, viscAh3d_12, viscAh3d_13, viscAh3d_23, + O addDissU, addDissV, + I iMin,iMax,jMin,jMax, k, bi, bj, myThid ) + DO j= jMin,jMax + DO i= iMin,iMax + guDissip(i,j) = guDissip(i,j) + addDissU(i,j) + gvDissip(i,j) = gvDissip(i,j) + addDissV(i,j) + ENDDO + ENDDO + ENDIF +#endif /* ALLOW_SMAG_3D */ + CALL TIMESTEP( I bi,bj,iMin,iMax,jMin,jMax,k, I dPhiHydX,dPhiHydY, phiSurfX, phiSurfY, @@ -583,7 +667,7 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I -1, KappaRU,recip_HFacW, + I -1, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj), U gU, I myThid ) #ifdef ALLOW_AUTODIFF_TAMC @@ -592,17 +676,22 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I -2, KappaRV,recip_HFacS, + I -2, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj), U gV, I myThid ) ENDIF -#ifdef ALLOW_OBCS +#ifdef ALLOW_OBCS C-- Apply open boundary conditions IF ( useOBCS ) THEN +C-- but first save intermediate velocities to be used in the +C next time step for the Stevens boundary conditions + CALL OBCS_SAVE_UV_N( + I bi, bj, iMin, iMax, jMin, jMax, 0, + I gU, gV, myThid ) CALL OBCS_APPLY_UV( bi, bj, 0, gU, gV, myThid ) ENDIF -#endif /* ALLOW_OBCS */ +#endif /* ALLOW_OBCS */ #ifdef ALLOW_CD_CODE IF (implicitViscosity.AND.useCDscheme) THEN @@ -611,7 +700,7 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I 0, KappaRU,recip_HFacW, + I 0, KappaRU, recip_hFacW(1-OLx,1-OLy,1,bi,bj), U vVelD, I myThid ) #ifdef ALLOW_AUTODIFF_TAMC @@ -619,7 +708,7 @@ #endif /* ALLOW_AUTODIFF_TAMC */ CALL IMPLDIFF( I bi, bj, iMin, iMax, jMin, jMax, - I 0, KappaRV,recip_HFacS, + I 0, KappaRV, recip_hFacS(1-OLx,1-OLy,1,bi,bj), U uVelD, I myThid ) ENDIF @@ -637,6 +726,8 @@ CALL TIMER_START('CALC_GW [DYNAMICS]',myThid) CALL CALC_GW( I bi,bj, KappaRU, KappaRV, + I str13, str23, str33, + I viscAh3d_00, viscAh3d_13, viscAh3d_23, I myTime, myIter, myThid ) ENDIF IF ( nonHydrostatic.OR.implicitIntGravWave ) @@ -682,7 +773,7 @@ #endif /* ALLOW_DIAGNOSTICS */ #ifdef ALLOW_DEBUG - IF ( debugLevel .GE. debLevB ) THEN + IF ( debugLevel .GE. debLevD ) 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) @@ -706,7 +797,7 @@ 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 + IF ( debugLevel .GE. debLevE ) THEN CALL EXCH_UV_XYZ_RL(gU,gV,.TRUE.,myThid) ENDIF #endif