--- MITgcm/model/src/dynamics.F 2010/10/25 23:02:35 1.151 +++ 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.151 2010/10/25 23:02:35 jmc 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" @@ -96,7 +96,8 @@ # 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 @@ -123,8 +124,6 @@ C | C |-- TIMESTEP C | -C |-- OBCS_APPLY_UV -C | C |-- MOM_U_IMPLICIT_R C |-- MOM_V_IMPLICIT_R C | @@ -170,30 +169,31 @@ 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 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 @@ -247,8 +247,7 @@ CEOP #ifdef ALLOW_DEBUG - IF ( debugLevel .GE. debLevB ) - & CALL DEBUG_ENTER( 'DYNAMICS', myThid ) + IF (debugMode) CALL DEBUG_ENTER( 'DYNAMICS', myThid ) #endif #ifdef ALLOW_DIAGNOSTICS @@ -265,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 @@ -296,7 +299,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. @@ -336,9 +339,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 @@ -352,11 +357,11 @@ 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( @@ -367,8 +372,8 @@ 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 @@ -399,6 +404,17 @@ 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 @@ -414,17 +430,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 @@ -432,37 +448,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 @@ -509,8 +525,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) @@ -518,34 +534,29 @@ 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 @@ -557,13 +568,6 @@ I guDissip, gvDissip, I myTime, myIter, myThid) -#ifdef ALLOW_OBCS -C-- Apply open boundary conditions -c IF (useOBCS) THEN -c CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid ) -c ENDIF -#endif /* ALLOW_OBCS */ - ENDIF C-- end of dynamics k loop (1:Nr) @@ -587,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 @@ -596,21 +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 -c IF ( useOBCS .AND.(implicitViscosity.OR.momImplVertAdv) ) THEN -c DO K=1,Nr -c CALL OBCS_APPLY_UV( bi, bj, k, gU, gV, myThid ) -c 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 @@ -619,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 @@ -627,7 +632,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 @@ -640,8 +645,7 @@ C-- Step forward W field in N-H algorithm 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( @@ -661,9 +665,9 @@ ENDDO #ifdef ALLOW_OBCS -c IF (useOBCS) THEN -c CALL OBCS_PRESCRIBE_EXCHANGES(myThid) -c ENDIF + IF (useOBCS) THEN + CALL OBCS_EXCHANGES( myThid ) + ENDIF #endif Cml( @@ -691,7 +695,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) @@ -715,14 +719,13 @@ 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