--- MITgcm/model/src/dynamics.F 2006/06/20 20:57:37 1.135 +++ MITgcm/model/src/dynamics.F 2013/03/21 18:15:44 1.164 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.135 2006/06/20 20:57:37 baylor Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.164 2013/03/21 18:15:44 jahn Exp $ C $Name: $ #include "PACKAGES_CONFIG.h" @@ -15,17 +15,17 @@ 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 | 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 | 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" @@ -93,10 +93,11 @@ # endif # ifdef ALLOW_PTRACERS # include "PTRACERS_SIZE.h" -# include "PTRACERS.h" +# include "PTRACERS_FIELDS.h" # endif # ifdef ALLOW_OBCS -# include "OBCS.h" +#include "OBCS_PARAMS.h" +# include "OBCS_FIELDS.h" # ifdef ALLOW_PTRACERS # include "OBCS_PTRACERS.h" # endif @@ -115,20 +116,18 @@ C | C |-- CALC_VISCOSITY C | -C |-- CALC_PHI_HYD +C |-- CALC_PHI_HYD C | -C |-- MOM_FLUXFORM +C |-- MOM_FLUXFORM C | -C |-- MOM_VECINV +C |-- MOM_VECINV C | -C |-- TIMESTEP +C |-- TIMESTEP C | -C |-- OBCS_APPLY_UV +C |-- MOM_U_IMPLICIT_R +C |-- MOM_V_IMPLICIT_R C | -C |-- MOM_U_IMPLICIT_R -C |-- MOM_V_IMPLICIT_R -C | -C |-- IMPLDIFF +C |-- IMPLDIFF C | C |-- OBCS_APPLY_UV C | @@ -139,13 +138,19 @@ C !INPUT/OUTPUT PARAMETERS: C == Routine arguments == -C myTime - Current time in simulation -C myIter - Current iteration number in simulation -C myThid - Thread number for this instance of the routine. +C myTime :: Current time in simulation +C myIter :: Current iteration number in simulation +C myThid :: Thread number for this instance of the routine. _RL myTime 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 @@ -162,38 +167,40 @@ 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 +C KappaRV :: vertical viscosity +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) INTEGER iMin, iMax INTEGER jMin, jMax INTEGER bi, bj INTEGER i, j - INTEGER k, km1, kp1, kup, kDown + INTEGER k, km1, kp1, kUp, kDown #ifdef ALLOW_DIAGNOSTICS + LOGICAL dPhiHydDiagIsOn _RL tmpFac #endif /* ALLOW_DIAGNOSTICS */ - + C--- The algorithm... C C "Correction Step" @@ -240,8 +247,14 @@ CEOP #ifdef ALLOW_DEBUG - IF ( debugLevel .GE. debLevB ) - & CALL DEBUG_ENTER( 'DYNAMICS', myThid ) + IF (debugMode) 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 @@ -251,6 +264,10 @@ CALL CALC_EP_FORCING(myThid) #endif +#ifdef ALLOW_AUTODIFF_MONITOR_DIAG + CALL DUMMY_IN_DYNAMICS( myTime, myIter, myThid ) +#endif + #ifdef ALLOW_AUTODIFF_TAMC C-- HPF directive to help TAMC CHPF$ INDEPENDENT @@ -282,52 +299,54 @@ #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. +#ifdef ALLOW_AUTODIFF_TAMC 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 -#ifdef ALLOW_AUTODIFF_TAMC cph( c-- need some re-initialisation here to break dependencies cph) gU(i,j,k,bi,bj) = 0. _d 0 gV(i,j,k,bi,bj) = 0. _d 0 -#endif ENDDO ENDDO ENDDO +#endif /* ALLOW_AUTODIFF_TAMC */ DO j=1-OLy,sNy+OLy DO i=1-OLx,sNx+OLx fVerU (i,j,1) = 0. _d 0 fVerU (i,j,2) = 0. _d 0 fVerV (i,j,1) = 0. _d 0 fVerV (i,j,2) = 0. _d 0 - phiHydF (i,j) = 0. _d 0 - phiHydC (i,j) = 0. _d 0 + phiHydF (i,j) = 0. _d 0 + phiHydC (i,j) = 0. _d 0 +#ifndef INCLUDE_PHIHYD_CALCULATION_CODE dPhiHydX(i,j) = 0. _d 0 - dPhiHydY(i,j) = 0. _d 0 + dPhiHydY(i,j) = 0. _d 0 +#endif phiSurfX(i,j) = 0. _d 0 phiSurfY(i,j) = 0. _d 0 guDissip(i,j) = 0. _d 0 gvDissip(i,j) = 0. _d 0 #ifdef ALLOW_AUTODIFF_TAMC -cph( -c-- need some re-initialisation here to break dependencies -cph) -# ifdef NONLIN_FRSURF + phiHydLow(i,j,bi,bj) = 0. _d 0 +# if (defined NONLIN_FRSURF) && (defined ALLOW_MOM_FLUXFORM) # ifndef DISABLE_RSTAR_CODE - dWtransC(i,j,bi,bj) = 0. _d 0 - dWtransU(i,j,bi,bj) = 0. _d 0 - dWtransV(i,j,bi,bj) = 0. _d 0 +# 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 /* NONLIN_FRSURF */ -#endif /* ALLOW_AUTODIFF_TAMC */ +# endif +#endif ENDDO ENDDO @@ -338,46 +357,64 @@ jMax = sNy+1 #ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE wvel (:,:,:,bi,bj) = -CADJ & comlev1_bibj, key = idynkey, byte = isbyte +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( I bi,bj,iMin,iMax,jMin,jMax, I etaN, O phiSurfX,phiSurfY, - I myThid ) + I myThid ) 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 STORE KPPviscAz (:,:,:,bi,bj) CADJ & = comlev1_bibj, key=idynkey, byte=isbyte #endif /* ALLOW_KPP */ #endif /* ALLOW_AUTODIFF_TAMC */ #ifdef INCLUDE_CALC_DIFFUSIVITY_CALL -C-- Calculate the total vertical diffusivity +C-- Calculate the total vertical viscosity + CALL CALC_VISCOSITY( + I bi,bj, iMin,iMax,jMin,jMax, + O KappaRU, KappaRV, + I myThid ) +#else DO k=1,Nr - CALL CALC_VISCOSITY( - I bi,bj,iMin,iMax,jMin,jMax,k, - O KappaRU,KappaRV, - I myThid) - ENDDO + 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 #ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE KappaRU(:,:,:) +CADJ STORE KappaRU(:,:,:) CADJ & = comlev1_bibj, key=idynkey, byte=isbyte -CADJ STORE KappaRV(:,:,:) +CADJ STORE KappaRV(:,:,:) 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 */ + C-- Start of dynamics loop DO k=1,Nr @@ -390,69 +427,74 @@ kup = 1+MOD(k+1,2) kDown= 1+MOD(k,2) -#ifdef ALLOW_AUTODIFF_TAMC +#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 theta (:,:,k,bi,bj) +CADJ STORE phiHydLow (:,:,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE salt (:,:,k,bi,bj) +CADJ STORE theta (:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gt(:,:,k,bi,bj) +CADJ STORE salt (:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE gs(:,:,k,bi,bj) +CADJ STORE gT(:,:,k,bi,bj) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE gS(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # ifdef NONLIN_FRSURF cph-test -CADJ STORE phiHydC (:,:) +CADJ STORE phiHydC (:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE phiHydF (:,:) +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 STORE fVerU (:,:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE fVerV (:,:,:) +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 -CADJ STORE gunm1(:,:,k,bi,bj) +# ifndef ALLOW_ADAMSBASHFORTH_3 +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 -# ifndef DISABLE_RSTAR_CODE -CADJ STORE dwtransc(:,:,bi,bj) +# else +CADJ STORE guNm(:,:,k,bi,bj,1) +CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE guNm(:,:,k,bi,bj,2) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE dwtransu(:,:,bi,bj) +CADJ STORE gvNm(:,:,k,bi,bj,1) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE dwtransv(:,:,bi,bj) +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 STORE uVelD(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE vVelD(:,:,k,bi,bj) +CADJ STORE vVelD(:,:,k,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # endif # endif # ifdef ALLOW_DEPTH_CONTROL -CADJ STORE fVerU (:,:,:) +CADJ STORE fVerU (:,:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE fVerV (:,:,:) +CADJ STORE fVerV (:,:,:) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte # endif #endif /* ALLOW_AUTODIFF_TAMC */ -C-- Integrate hydrostatic balance for phiHyd with BC of +C-- Integrate hydrostatic balance for phiHyd with BC of C phiHyd(z=0)=0 IF ( implicitIntGravWave ) THEN CALL CALC_PHI_HYD( @@ -469,49 +511,52 @@ 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... IF ( momStepping ) THEN - IF (.NOT. vectorInvariantMomentum) THEN -#ifdef ALLOW_MOM_FLUXFORM -C -# ifdef ALLOW_AUTODIFF_TAMC -# ifdef NONLIN_FRSURF -# ifndef DISABLE_RSTAR_CODE -CADJ STORE dwtransc(:,:,bi,bj) +#ifdef ALLOW_AUTODIFF_TAMC +# 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) +CADJ STORE dWtransU(:,:,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE dwtransv(:,:,bi,bj) +CADJ STORE dWtransV(:,:,bi,bj) CADJ & = comlev1_bibj_k, key=kkey, byte=isbyte -# endif # endif -# endif /* ALLOW_AUTODIFF_TAMC */ -C +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 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 @@ -523,23 +568,16 @@ I guDissip, gvDissip, I myTime, myIter, myThid) -#ifdef ALLOW_OBCS -C-- Apply open boundary conditions - IF (useOBCS) THEN - CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid ) - ENDIF -#endif /* ALLOW_OBCS */ - ENDIF - C-- end of dynamics k loop (1:Nr) ENDDO C-- Implicit Vertical advection & viscosity -#if (defined (INCLUDE_IMPLVERTADV_CODE) && defined (ALLOW_MOM_COMMON)) +#if (defined (INCLUDE_IMPLVERTADV_CODE) && \ + defined (ALLOW_MOM_COMMON) && !(defined ALLOW_AUTODIFF_TAMC)) IF ( momImplVertAdv ) THEN - CALL MOM_U_IMPLICIT_R( kappaRU, + CALL MOM_U_IMPLICIT_R( kappaRU, I bi, bj, myTime, myIter, myThid ) CALL MOM_V_IMPLICIT_R( kappaRV, I bi, bj, myTime, myIter, myThid ) @@ -553,7 +591,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 @@ -562,19 +600,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 .AND.(implicitViscosity.OR.momImplVertAdv) ) THEN - DO K=1,Nr - CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid ) - ENDDO + 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 @@ -583,7 +624,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 @@ -591,50 +632,50 @@ #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 #endif /* ALLOW_CD_CODE */ C-- End implicit Vertical advection & viscosity - - ENDDO - ENDDO - -#ifdef ALLOW_OBCS - IF (useOBCS) THEN - CALL OBCS_PRESCRIBE_EXCHANGES(myThid) - ENDIF -#endif C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| #ifdef ALLOW_NONHYDROSTATIC C-- Step forward W field in N-H algorithm - IF ( nonHydrostatic ) THEN + IF ( nonHydrostatic ) THEN #ifdef ALLOW_DEBUG - IF ( debugLevel .GE. debLevB ) - & CALL DEBUG_CALL('CALC_GW', myThid ) + IF (debugMode) CALL DEBUG_CALL('CALC_GW', myThid ) #endif CALL TIMER_START('CALC_GW [DYNAMICS]',myThid) CALL CALC_GW( - I KappaRU, KappaRV, - I myTime, myIter, myThid ) - ENDIF - IF ( nonHydrostatic.OR.implicitIntGravWave ) - & CALL TIMESTEP_WVEL( myTime, myIter, myThid ) - IF ( nonHydrostatic ) + I bi,bj, KappaRU, KappaRV, + I myTime, myIter, myThid ) + ENDIF + IF ( nonHydrostatic.OR.implicitIntGravWave ) + & CALL TIMESTEP_WVEL( bi,bj, myTime, myIter, myThid ) + IF ( nonHydrostatic ) & CALL TIMER_STOP ('CALC_GW [DYNAMICS]',myThid) #endif C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| +C- end of bi,bj loops + ENDDO + ENDDO + +#ifdef ALLOW_OBCS + IF (useOBCS) THEN + CALL OBCS_EXCHANGES( myThid ) + ENDIF +#endif + 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 & 'phiHydLow', myThid ) +C CALL REMOVE_MEAN_RL( 1, phiHydLow, maskInC, maskInC, rA, drF, +C & 'phiHydLow', myTime, myThid ) Cml) #ifdef ALLOW_DIAGNOSTICS @@ -652,9 +693,9 @@ ENDIF #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) @@ -675,17 +716,16 @@ #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- 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 #ifdef ALLOW_DEBUG - IF ( debugLevel .GE. debLevB ) - & CALL DEBUG_LEAVE( 'DYNAMICS', myThid ) + IF (debugMode) CALL DEBUG_LEAVE( 'DYNAMICS', myThid ) #endif RETURN