Changeset 14557

Timestamp:

2021-03-01T13:20:08+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: minor bugfix and partial reversal of changeset [14305] (ticket #2353)}

File:

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

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

@@ -235 +235 @@
       REAL(wp) :: zt,zs,zu,zv,zrh               ! variables used in constructing averages
 ! Scales
-      REAL(wp)   :: zrad0                       ! Surface solar temperature flux (deg m/s)
-      REAL(wp)   :: zradh                       ! Radiative flux at bl base (Buoyancy units)
+      REAL(wp), DIMENSION(jpi,jpj) :: zrad0     ! Surface solar temperature flux (deg m/s)
+      REAL(wp), DIMENSION(jpi,jpj) :: zradh     ! Radiative flux at bl base (Buoyancy units)
       REAL(wp)   :: zradav                      ! Radiative flux, bl average (Buoyancy Units)
       REAL(wp), DIMENSION(jpi,jpj) :: zustar    ! friction velocity
@@ -333 +333 @@
       IF( ln_timing ) CALL timing_start('zdf_osm')
       ibld(:,:)   = 0     ; imld(:,:)  = 0
-      zustar(:,:) = 0.0_wp
+      zrad0(:,:)  = 0.0_wp ; zradh(:,:) = 0.0_wp ; zustar(:,:) = 0.0_wp
       zwstrl(:,:) = 0._wp ; zvstr(:,:) = 0._wp ; zwstrc(:,:)    = 0._wp
       zwth0(:,:)  = 0.0_wp ; zws0(:,:)  = 0.0_wp ; zwb0(:,:)      = 0.0_wp
@@ -379 +379 @@
       zz1 =  1.0_wp - rn_abs
       DO_2D( 0, 0, 0, 0 )
-         zrad0         = qsr(ji,jj) * r1_rho0_rcp                          ! Surface downward irradiance (so always +ve)
-         zradh         = zrad0 *                                       &   ! Downwards irradiance at base of boundary layer
+         zrad0(ji,jj)  = qsr(ji,jj) * r1_rho0_rcp                          ! Surface downward irradiance (so always +ve)
+         zradh(ji,jj)  = zrad0(ji,jj) *                                &   ! Downwards irradiance at base of boundary layer
             &            ( zz0 * EXP( -1.0_wp * hbl(ji,jj) / rn_si0 ) + zz1 * EXP( -1.0_wp * hbl(ji,jj) / rn_si1 ) )
-         zradav        = zrad0 *                                       &   ! Downwards irradiance averaged over depth of the OSBL
+         zradav        = zrad0(ji,jj) *                                &   ! Downwards irradiance averaged over depth of the OSBL
             &     ( zz0 * ( 1.0_wp - EXP( -hbl(ji,jj)/rn_si0 ) ) * rn_si0 +   &
             &       zz1 * ( 1.0_wp - EXP( -hbl(ji,jj)/rn_si1 ) ) * rn_si1 ) / hbl(ji,jj)
          zwth0(ji,jj)  = - qns(ji,jj) * r1_rho0_rcp * tmask(ji,jj,1)       ! Upwards surface Temperature flux for non-local term
          zwthav(ji,jj) = 0.5_wp * zwth0(ji,jj) -                       &   ! Turbulent heat flux averaged over depth of OSBL
-            &            ( 0.5_wp * ( zrad0 + zradh ) - zradav )
+            &            ( 0.5_wp * ( zrad0(ji,jj) + zradh(ji,jj) ) - zradav )
      END_2D
      DO_2D( 0, 0, 0, 0 )
@@ -397 +397 @@
            &             grav * zbeta * zws0(ji,jj)
         zwb0tot(ji,jj) = zwb0(ji,jj) - grav * zthermal *               &   ! Total upwards surface buoyancy flux
-           &                           ( zrad0(ji,jj) - zradh(ji,j) )
+           &                           ( zrad0(ji,jj) - zradh(ji,jj) )
         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