--- MITgcm/model/src/dynamics.F 2001/06/06 14:55:45 1.69 +++ MITgcm/model/src/dynamics.F 2001/08/03 19:06:11 1.75 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.69 2001/06/06 14:55:45 adcroft Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/dynamics.F,v 1.75 2001/08/03 19:06:11 adcroft Exp $ C $Name: $ #include "CPP_OPTIONS.h" @@ -29,6 +29,9 @@ #include "PARAMS.h" #include "DYNVARS.h" #include "GRID.h" +#ifdef ALLOW_PASSIVE_TRACER +#include "TR1.h" +#endif #ifdef ALLOW_AUTODIFF_TAMC # include "tamc.h" @@ -91,6 +94,7 @@ _RS maskUp (1-OLx:sNx+OLx,1-OLy:sNy+OLy) _RL fVerT (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL fVerS (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) + _RL fVerTr1 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL fVerU (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL fVerV (1-OLx:sNx+OLx,1-OLy:sNy+OLy,2) _RL phiHyd (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr) @@ -166,432 +170,9 @@ C (1 + dt * K * d_zz) salt[n] = salt* C--- -#ifdef ALLOW_AUTODIFF_TAMC -C-- dummy statement to end declaration part - ikey = 1 -#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 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. - DO j=1-OLy,sNy+OLy - DO i=1-OLx,sNx+OLx - xA(i,j) = 0. _d 0 - yA(i,j) = 0. _d 0 - uTrans(i,j) = 0. _d 0 - vTrans(i,j) = 0. _d 0 - DO k=1,Nr - phiHyd(i,j,k) = 0. _d 0 - KappaRU(i,j,k) = 0. _d 0 - KappaRV(i,j,k) = 0. _d 0 - sigmaX(i,j,k) = 0. _d 0 - sigmaY(i,j,k) = 0. _d 0 - sigmaR(i,j,k) = 0. _d 0 - ENDDO - rhoKM1 (i,j) = 0. _d 0 - rhok (i,j) = 0. _d 0 - phiSurfX(i,j) = 0. _d 0 - phiSurfY(i,j) = 0. _d 0 - ENDDO - ENDDO - - -#ifdef ALLOW_AUTODIFF_TAMC -C-- HPF directive to help TAMC -CHPF$ INDEPENDENT -#endif /* ALLOW_AUTODIFF_TAMC */ - DO bj=myByLo(myThid),myByHi(myThid) - -#ifdef ALLOW_AUTODIFF_TAMC -C-- HPF directive to help TAMC -CHPF$ INDEPENDENT, NEW (rTrans,fVerT,fVerS,fVerU,fVerV -CHPF$& ,phiHyd,utrans,vtrans,xA,yA -CHPF$& ,KappaRT,KappaRS,KappaRU,KappaRV -CHPF$& ) -#endif /* ALLOW_AUTODIFF_TAMC */ - DO bi=myBxLo(myThid),myBxHi(myThid) - -#ifdef ALLOW_AUTODIFF_TAMC - act1 = bi - myBxLo(myThid) - max1 = myBxHi(myThid) - myBxLo(myThid) + 1 - - act2 = bj - myByLo(myThid) - max2 = myByHi(myThid) - myByLo(myThid) + 1 - - act3 = myThid - 1 - max3 = nTx*nTy - - act4 = ikey_dynamics - 1 - - ikey = (act1 + 1) + act2*max1 - & + act3*max1*max2 - & + act4*max1*max2*max3 -#endif /* ALLOW_AUTODIFF_TAMC */ - -C-- Set up work arrays that need valid initial values - DO j=1-OLy,sNy+OLy - DO i=1-OLx,sNx+OLx - rTrans(i,j) = 0. _d 0 - fVerT (i,j,1) = 0. _d 0 - fVerT (i,j,2) = 0. _d 0 - fVerS (i,j,1) = 0. _d 0 - fVerS (i,j,2) = 0. _d 0 - 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 - ENDDO - ENDDO - - DO k=1,Nr - DO j=1-OLy,sNy+OLy - DO i=1-OLx,sNx+OLx -C This is currently also used by IVDC and Diagnostics - ConvectCount(i,j,k) = 0. - KappaRT(i,j,k) = 0. _d 0 - KappaRS(i,j,k) = 0. _d 0 - ENDDO - ENDDO - ENDDO - - iMin = 1-OLx+1 - iMax = sNx+OLx - jMin = 1-OLy+1 - jMax = sNy+OLy - - -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE theta(:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE salt (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE vvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -C-- Start of diagnostic loop - DO k=Nr,1,-1 - -#ifdef ALLOW_AUTODIFF_TAMC -C? Patrick, is this formula correct now that we change the loop range? -C? Do we still need this? -cph kkey formula corrected. -cph Needed for rhok, rhokm1, in the case useGMREDI. - kkey = (ikey-1)*Nr + k -CADJ STORE rhokm1(:,:) = comlev1_bibj_k , key=kkey, byte=isbyte -CADJ STORE rhok (:,:) = comlev1_bibj_k , key=kkey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -C-- Integrate continuity vertically for vertical velocity - CALL INTEGRATE_FOR_W( - I bi, bj, k, uVel, vVel, - O wVel, - I myThid ) - -#ifdef ALLOW_OBCS -#ifdef ALLOW_NONHYDROSTATIC -C-- Apply OBC to W if in N-H mode - IF (useOBCS.AND.nonHydrostatic) THEN - CALL OBCS_APPLY_W( bi, bj, k, wVel, myThid ) - ENDIF -#endif /* ALLOW_NONHYDROSTATIC */ -#endif /* ALLOW_OBCS */ - -C-- Calculate gradients of potential density for isoneutral -C slope terms (e.g. GM/Redi tensor or IVDC diffusivity) -c IF ( k.GT.1 .AND. (useGMRedi.OR.ivdc_kappa.NE.0.) ) THEN - IF ( useGMRedi .OR. (k.GT.1 .AND. ivdc_kappa.NE.0.) ) THEN -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE theta(:,:,k,bi,bj) = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE salt (:,:,k,bi,bj) = comlev1_bibj_k, key=kkey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, k, k, eosType, - I theta, salt, - O rhoK, - I myThid ) - IF (k.GT.1) THEN -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE theta(:,:,k-1,bi,bj) = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE salt (:,:,k-1,bi,bj) = comlev1_bibj_k, key=kkey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - CALL FIND_RHO( - I bi, bj, iMin, iMax, jMin, jMax, k-1, k, eosType, - I theta, salt, - O rhoKm1, - I myThid ) - ENDIF - CALL GRAD_SIGMA( - I bi, bj, iMin, iMax, jMin, jMax, k, - I rhoK, rhoKm1, rhoK, - O sigmaX, sigmaY, sigmaR, - I myThid ) - ENDIF - -C-- Implicit Vertical Diffusion for Convection -c ==> should use sigmaR !!! - IF (k.GT.1 .AND. ivdc_kappa.NE.0.) THEN - CALL CALC_IVDC( - I bi, bj, iMin, iMax, jMin, jMax, k, - I rhoKm1, rhoK, - U ConvectCount, KappaRT, KappaRS, - I myTime, myIter, myThid) - ENDIF - -C-- end of diagnostic k loop (Nr:1) - ENDDO - -#ifdef ALLOW_AUTODIFF_TAMC -cph avoids recomputation of integrate_for_w -CADJ STORE wvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -#ifdef ALLOW_OBCS -C-- Calculate future values on open boundaries - IF (useOBCS) THEN - CALL OBCS_CALC( bi, bj, myTime+deltaT, - I uVel, vVel, wVel, theta, salt, - I myThid ) - ENDIF -#endif /* ALLOW_OBCS */ - -C-- Determines forcing terms based on external fields -C relaxation terms, etc. - CALL EXTERNAL_FORCING_SURF( - I bi, bj, iMin, iMax, jMin, jMax, - I myThid ) -#ifdef ALLOW_AUTODIFF_TAMC -cph needed for KPP -CADJ STORE surfacetendencyU(:,:,bi,bj) -CADJ & = comlev1_bibj, key=ikey, byte=isbyte -CADJ STORE surfacetendencyV(:,:,bi,bj) -CADJ & = comlev1_bibj, key=ikey, byte=isbyte -CADJ STORE surfacetendencyS(:,:,bi,bj) -CADJ & = comlev1_bibj, key=ikey, byte=isbyte -CADJ STORE surfacetendencyT(:,:,bi,bj) -CADJ & = comlev1_bibj, key=ikey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -#ifdef ALLOW_GMREDI - -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE sigmaX(:,:,:) = comlev1, key=ikey, byte=isbyte -CADJ STORE sigmaY(:,:,:) = comlev1, key=ikey, byte=isbyte -CADJ STORE sigmaR(:,:,:) = comlev1, key=ikey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ -C-- Calculate iso-neutral slopes for the GM/Redi parameterisation - IF (useGMRedi) THEN - DO k=1,Nr - CALL GMREDI_CALC_TENSOR( - I bi, bj, iMin, iMax, jMin, jMax, k, - I sigmaX, sigmaY, sigmaR, - I myThid ) - ENDDO -#ifdef ALLOW_AUTODIFF_TAMC - ELSE - DO k=1, Nr - CALL GMREDI_CALC_TENSOR_DUMMY( - I bi, bj, iMin, iMax, jMin, jMax, k, - I sigmaX, sigmaY, sigmaR, - I myThid ) - ENDDO -#endif /* ALLOW_AUTODIFF_TAMC */ - ENDIF - -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE Kwx(:,:,:,bi,bj) = comlev1_bibj, key=ikey, byte=isbyte -CADJ STORE Kwy(:,:,:,bi,bj) = comlev1_bibj, key=ikey, byte=isbyte -CADJ STORE Kwz(:,:,:,bi,bj) = comlev1_bibj, key=ikey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -#endif /* ALLOW_GMREDI */ - -#ifdef ALLOW_KPP -C-- Compute KPP mixing coefficients - IF (useKPP) THEN - CALL KPP_CALC( - I bi, bj, myTime, myThid ) -#ifdef ALLOW_AUTODIFF_TAMC - ELSE - CALL KPP_CALC_DUMMY( - I bi, bj, myTime, myThid ) -#endif /* ALLOW_AUTODIFF_TAMC */ - ENDIF - -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE KPPghat (:,:,:,bi,bj) -CADJ & , KPPviscAz (:,:,:,bi,bj) -CADJ & , KPPdiffKzT(:,:,:,bi,bj) -CADJ & , KPPdiffKzS(:,:,:,bi,bj) -CADJ & , KPPfrac (:,: ,bi,bj) -CADJ & = comlev1_bibj, key=ikey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -#endif /* ALLOW_KPP */ - -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE KappaRT(:,:,:) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE KappaRS(:,:,:) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE theta(:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE salt (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE uvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -CADJ STORE vvel (:,:,:,bi,bj) = comlev1_bibj, key = ikey, byte = isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -#ifdef ALLOW_AIM -C AIM - atmospheric intermediate model, physics package code. -C note(jmc) : phiHyd=0 at this point but is not really used in Molteni Physics - IF ( useAIM ) THEN - CALL TIMER_START('AIM_DO_ATMOS_PHYS [DYNAMICS]', myThid) - CALL AIM_DO_ATMOS_PHYSICS( phiHyd, myTime, myThid ) - CALL TIMER_STOP ('AIM_DO_ATMOS_PHYS [DYNAMICS]', myThid) - ENDIF -#endif /* ALLOW_AIM */ - - -C-- Start of thermodynamics loop - DO k=Nr,1,-1 -#ifdef ALLOW_AUTODIFF_TAMC -C? Patrick Is this formula correct? -cph Yes, but I rewrote it. -cph Also, the KappaR? need the index and subscript k! - kkey = (ikey-1)*Nr + k -#endif /* ALLOW_AUTODIFF_TAMC */ - -C-- km1 Points to level above k (=k-1) -C-- kup Cycles through 1,2 to point to layer above -C-- kDown Cycles through 2,1 to point to current layer - - km1 = MAX(1,k-1) - kup = 1+MOD(k+1,2) - kDown= 1+MOD(k,2) - - iMin = 1-OLx+2 - iMax = sNx+OLx-1 - jMin = 1-OLy+2 - jMax = sNy+OLy-1 - -C-- Get temporary terms used by tendency routines - CALL CALC_COMMON_FACTORS ( - I bi,bj,iMin,iMax,jMin,jMax,k, - O xA,yA,uTrans,vTrans,rTrans,maskUp, - I myThid) - -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE KappaRT(:,:,k) = comlev1_bibj_k, key=kkey, byte=isbyte -CADJ STORE KappaRS(:,:,k) = comlev1_bibj_k, key=kkey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - -#ifdef INCLUDE_CALC_DIFFUSIVITY_CALL -C-- Calculate the total vertical diffusivity - CALL CALC_DIFFUSIVITY( - I bi,bj,iMin,iMax,jMin,jMax,k, - I maskUp, - O KappaRT,KappaRS,KappaRU,KappaRV, - I myThid) -#endif - -C-- Calculate active tracer tendencies (gT,gS,...) -C and step forward storing result in gTnm1, gSnm1, etc. - IF ( tempStepping ) THEN - CALL CALC_GT( - I bi,bj,iMin,iMax,jMin,jMax, k,km1,kup,kDown, - I xA,yA,uTrans,vTrans,rTrans,maskUp, - I KappaRT, - U fVerT, - I myTime, myThid) - tauAB = 0.5d0 + abEps - CALL TIMESTEP_TRACER( - I bi,bj,iMin,iMax,jMin,jMax,k,tauAB, - I theta, gT, - U gTnm1, - I myIter, myThid) - ENDIF - IF ( saltStepping ) THEN - CALL CALC_GS( - I bi,bj,iMin,iMax,jMin,jMax, k,km1,kup,kDown, - I xA,yA,uTrans,vTrans,rTrans,maskUp, - I KappaRS, - U fVerS, - I myTime, myThid) - tauAB = 0.5d0 + abEps - CALL TIMESTEP_TRACER( - I bi,bj,iMin,iMax,jMin,jMax,k,tauAB, - I salt, gS, - U gSnm1, - I myIter, myThid) - ENDIF - -#ifdef ALLOW_OBCS -C-- Apply open boundary conditions - IF (useOBCS) THEN - CALL OBCS_APPLY_TS( bi, bj, k, gTnm1, gSnm1, myThid ) - END IF -#endif /* ALLOW_OBCS */ - -C-- Freeze water - IF (allowFreezing) THEN -#ifdef ALLOW_AUTODIFF_TAMC -CADJ STORE gTNm1(:,:,k,bi,bj) = comlev1_bibj_k -CADJ & , key = kkey, byte = isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - CALL FREEZE( bi, bj, iMin, iMax, jMin, jMax, k, myThid ) - END IF - -C-- end of thermodynamic k loop (Nr:1) - ENDDO - - -#ifdef ALLOW_AUTODIFF_TAMC -C? Patrick? What about this one? -cph Keys iikey and idkey don't seem to be needed -cph since storing occurs on different tape for each -cph impldiff call anyways. -cph Thus, common block comlev1_impl isn't needed either. -cph Storing below needed in the case useGMREDI. - iikey = (ikey-1)*maximpl -#endif /* ALLOW_AUTODIFF_TAMC */ - -C-- Implicit diffusion - IF (implicitDiffusion) THEN - - IF (tempStepping) THEN -#ifdef ALLOW_AUTODIFF_TAMC - idkey = iikey + 1 -CADJ STORE gTNm1(:,:,:,bi,bj) = comlev1_bibj , key=ikey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - CALL IMPLDIFF( - I bi, bj, iMin, iMax, jMin, jMax, - I deltaTtracer, KappaRT, recip_HFacC, - U gTNm1, - I myThid ) - ENDIF - - IF (saltStepping) THEN -#ifdef ALLOW_AUTODIFF_TAMC - idkey = iikey + 2 -CADJ STORE gSNm1(:,:,:,bi,bj) = comlev1_bibj , key=ikey, byte=isbyte -#endif /* ALLOW_AUTODIFF_TAMC */ - CALL IMPLDIFF( - I bi, bj, iMin, iMax, jMin, jMax, - I deltaTtracer, KappaRS, recip_HFacC, - U gSNm1, - I myThid ) - ENDIF - -#ifdef ALLOW_OBCS -C-- Apply open boundary conditions - IF (useOBCS) THEN - DO K=1,Nr - CALL OBCS_APPLY_TS( bi, bj, k, gTnm1, gSnm1, myThid ) - ENDDO - END IF -#endif /* ALLOW_OBCS */ - -C-- End If implicitDiffusion - ENDIF +Ccs- C-- Start computation of dynamics iMin = 1-OLx+2 @@ -637,6 +218,20 @@ I myThid ) ENDIF +#ifdef ALLOW_AUTODIFF_TAMC +CADJ STORE KappaRT(:,:,k) = comlev1_bibj_k, key=kkey, byte=isbyte +CADJ STORE KappaRS(:,:,k) = comlev1_bibj_k, key=kkey, byte=isbyte +#endif /* ALLOW_AUTODIFF_TAMC */ + +#ifdef INCLUDE_CALC_DIFFUSIVITY_CALL +C-- Calculate the total vertical diffusivity + CALL CALC_DIFFUSIVITY( + I bi,bj,iMin,iMax,jMin,jMax,k, + I maskUp, + O KappaRT,KappaRS,KappaRU,KappaRV, + I myThid) +#endif + C-- Calculate accelerations in the momentum equations (gU, gV, ...) C and step forward storing the result in gUnm1, gVnm1, etc... IF ( momStepping ) THEN @@ -752,7 +347,9 @@ ENDDO #ifndef EXCLUDE_DEBUGMODE + If (debugMode) 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) CALL DEBUG_STATS_RL(Nr,wVel,'Wvel (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,theta,'Theta (DYNAMICS)',myThid) @@ -765,6 +362,7 @@ CALL DEBUG_STATS_RL(Nr,GvNm1,'GvNm1 (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,GtNm1,'GtNm1 (DYNAMICS)',myThid) CALL DEBUG_STATS_RL(Nr,GsNm1,'GsNm1 (DYNAMICS)',myThid) + ENDIF #endif RETURN