Changeset 14556 for NEMO/branches/2021

Timestamp:

2021-03-01T13:01:40+01:00 (3 years ago)

Author:

smueller

Message:

Synchronisation of the OSMOSIS boundary layer scheme with the version developed in branch ^{/NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0: transfer of changesets [14409,14517] (ticket #2353)}

File:

• NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/ZDF/zdfosm.F90 (modified) (6 diffs)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/ZDF/zdfosm.F90

@@ -247 +247 @@
       REAL(wp), DIMENSION(jpi,jpj) :: zws0      ! Surface freshwater flux
       REAL(wp), DIMENSION(jpi,jpj) :: zwb0      ! Surface buoyancy flux
+      REAL(wp), DIMENSION(jpi,jpj) :: zwb0tot   ! Total surface buoyancy flux including insolation
       REAL(wp), DIMENSION(jpi,jpj) :: zwthav    ! Heat flux - bl average
       REAL(wp), DIMENSION(jpi,jpj) :: zwsav     ! freshwater flux - bl average
@@ -337 +338 @@
       zwthav(:,:) = 0._wp ; zwsav(:,:) = 0._wp ; zwbav(:,:)     = 0._wp ; zwb_ent(:,:)   = 0._wp
       zustke(:,:) = 0._wp ; zla(:,:)   = 0._wp ; zcos_wind(:,:) = 0._wp ; zsin_wind(:,:) = 0._wp
-      zhol(:,:)   = 0._wp
+      zhol(:,:)   = 0._wp ; zwb0tot(:,:) = 0.0_wp
       lconv(:,:)  = .FALSE.; lpyc(:,:) = .FALSE. ; lflux(:,:) = .FALSE. ;  lmle(:,:) = .FALSE.
       ! mixed layer
@@ -395 +396 @@
         zwb0(ji,jj)    = grav * zthermal * zwth0(ji,jj) -              &   ! Non radiative upwards surface buoyancy flux
            &             grav * zbeta * zws0(ji,jj)
+        zwb0tot(ji,jj) = zwb0(ji,jj) - grav * zthermal *               &   ! Total upwards surface buoyancy flux
+           &                           ( zrad0(ji,jj) - zradh(ji,j) )
         zwsav(ji,jj)   = 0.5 * zws0(ji,jj)                                 ! Turbulent salinity flux averaged over depth of the OBSL
         zwbav(ji,jj)   = grav  * zthermal * zwthav(ji,jj) -            &   ! Turbulent buoyancy flux averaged over the depth of the
@@ -761 +764 @@
                 DO jk = 1, ibld(ji,jj)
                   znd = gdepw(ji,jj,jk,Kmm) / MAX(zhbl(ji,jj),epsln)
-                  ghamt(ji,jj,jk) = ghamt(ji,jj,jk) - zwth0(ji,jj) * ( 1.0 - znd )
+                  ghamt(ji,jj,jk) = ghamt(ji,jj,jk) - ( zwth0(ji,jj) - zrad0(ji,jj) + zradh(ji,jj) ) * ( 1.0 - znd )
                   ghams(ji,jj,jk) = ghams(ji,jj,jk) - zws0(ji,jj) * ( 1.0 - znd )
                  END DO
                  DO jk = 1, mld_prof(ji,jj)
                    znd = gdepw(ji,jj,jk,Kmm) / MAX(zhmle(ji,jj),epsln)
-                   ghamt(ji,jj,jk) = ghamt(ji,jj,jk) + zwth0(ji,jj) * ( 1.0 - znd )
+                   ghamt(ji,jj,jk) = ghamt(ji,jj,jk) + ( zwth0(ji,jj) - zrad0(ji,jj) + zradh(ji,jj) ) * ( 1.0 - znd )
                    ghams(ji,jj,jk) = ghams(ji,jj,jk) + zws0(ji,jj) * ( 1.0 -znd )
                  END DO
@@ -1169 +1172 @@
       IF ( lconv(ji,jj) ) THEN
 ! Unstable OSBL
-         zwb_min(ji,jj) = zwb_ent(ji,jj) + zdh(ji,jj) / zhbl(ji,jj) * zwb0(ji,jj)
+         zwb_min(ji,jj) = zwb_ent(ji,jj) + zdh(ji,jj) / zhbl(ji,jj) * 2.0_wp * zwbav(ji,jj)
       END IF  ! lconv
      END_2D
@@ -1963 +1966 @@
            zdb_mle = zb_bl(ji,jj) - zbuoy
 ! Timestep hmle.
-           hmle(ji,jj) = hmle(ji,jj) + zwb0(ji,jj) * rn_Dt / zdb_mle
+           hmle(ji,jj) = hmle(ji,jj) + zwb0tot(ji,jj) * rn_Dt / zdb_mle
         ELSE
            IF ( zhmle(ji,jj) > zhbl(ji,jj) ) THEN