Changeset 14517

Timestamp:

2021-02-21T17:04:25+01:00 (3 years ago)

Author:

agn

Message:

Took account of zradh; used zwbav instead of zwb0 tot in spec of zwb_min

File:

• NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0/src/OCE/ZDF/zdfosm.F90 (modified) (4 diffs)

NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0/src/OCE/ZDF/zdfosm.F90

@@ -426 +426 @@
            zwb0(ji,jj) = grav * zthermal * zwth0(ji,jj) -  grav * zbeta * zws0(ji,jj)
            ! Total upwards surface buoyancy flux
-           zwb0tot(ji,jj) = zwb0(ji,jj) -  grav * zthermal * zrad0(ji,jj)
+           zwb0tot(ji,jj) = zwb0(ji,jj) -  grav * zthermal * ( zrad0(ji,jj) - zradh(ji,jj) )
            ! turbulent heat flux averaged over depth of OSBL
            zwthav(ji,jj) = 0.5 * zwth0(ji,jj) - ( 0.5*( zrad0(ji,jj) + zradh(ji,jj) ) - zradav(ji,jj) )
@@ -1220 +1220 @@
                    DO jk = 1, ibld(ji,jj)
                      znd = gdepw_n(ji,jj,jk) / MAX(zhbl(ji,jj),epsln)
-                     ghamt(ji,jj,jk) = ghamt(ji,jj,jk) - ( zwth0(ji,jj) - zrad0(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_n(ji,jj,jk) / MAX(zhmle(ji,jj),epsln)
-                      ghamt(ji,jj,jk) = ghamt(ji,jj,jk) +  ( zwth0(ji,jj) - zrad0(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
@@ -1659 +1659 @@
          IF ( lconv(ji,jj) ) THEN
 ! Unstable OSBL
-            zwb_min(ji,jj) = zwb_ent(ji,jj) + zdh(ji,jj) / zhbl(ji,jj) * zwb0tot(ji,jj)
+            zwb_min(ji,jj) = zwb_ent(ji,jj) + zdh(ji,jj) / zhbl(ji,jj) * 2._wp * zwbav(ji,jj)
          ENDIF  ! lconv
        END DO   ! ji
@@ -2299 +2299 @@
 ! change zero or one model level.
              hbl(ji,jj) = MAX(zhbl_t(ji,jj), gdepw_n(ji,jj,4) )
-          ENDIF
-          zhbl(ji,jj) = gdepw_n(ji,jj,ibld(ji,jj))
+           ENDIF
+           zhbl(ji,jj) = gdepw_n(ji,jj,ibld(ji,jj))
          END DO
       END DO