Changeset 14729

Timestamp:

2021-04-19T17:30:24+02: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 [14645,14646] (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

@@ -334 +334 @@
       ! For debugging
       INTEGER :: ikt
+      REAL(wp) :: zlarge = -1.0e10_wp, zero = 0.0_wp
       !!--------------------------------------------------------------------
       !
       IF( ln_timing ) CALL timing_start('zdf_osm')
       ibld(:,:)   = 0     ; imld(:,:)  = 0
-      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
-      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 ; zwb0tot(:,:) = 0.0_wp
+      zrad0(:,:)  = zlarge ; zradh(:,:)   = zlarge ; zustar(:,:)     = zlarge
+      zwstrl(:,:) = zlarge ; zvstr(:,:)   = zlarge ; zwstrc(:,:)     = zlarge ; zuw0(:,:)      = zlarge
+      zwth0(:,:)  = zlarge ; zws0(:,:)    = zlarge ; zwb0(:,:)       = zlarge
+      zwthav(:,:) = zlarge ; zwsav(:,:)   = zlarge ; zwbav(:,:)      = zlarge ; zwb_ent(:,:)   = zlarge
+      zustke(:,:) = zlarge ; zla(:,:)     = zlarge ; zcos_wind(:,:)  = zlarge ; zsin_wind(:,:) = zlarge
+      zhol(:,:)   = zlarge ; zwb0tot(:,:) = zlarge ; zalpha_pyc(:,:) = zlarge
       lconv(:,:)  = .FALSE.; lpyc(:,:) = .FALSE. ; lflux(:,:) = .FALSE. ;  lmle(:,:) = .FALSE.
       ! mixed layer
       ! no initialization of zhbl or zhml (or zdh?)
-      zhbl(:,:)    = 1._wp ; zhml(:,:)    = 1._wp ; zdh(:,:)      = 1._wp ; zdhdt(:,:)   = 0._wp
-      zt_bl(:,:)   = 0._wp ; zs_bl(:,:)   = 0._wp ; zu_bl(:,:)    = 0._wp
-      zv_bl(:,:)   = 0._wp ; zb_bl(:,:)  = 0._wp
-      zt_ml(:,:)   = 0._wp ; zs_ml(:,:)    = 0._wp ; zu_ml(:,:)   = 0._wp
-      zt_mle(:,:)   = 0._wp ; zs_mle(:,:)    = 0._wp ; zu_mle(:,:)   = 0._wp
-      zb_mle(:,:) = 0._wp
-      zv_ml(:,:)   = 0._wp ; zdt_bl(:,:)   = 0._wp ; zds_bl(:,:)  = 0._wp
-      zdu_bl(:,:)  = 0._wp ; zdv_bl(:,:)  = 0._wp ; zdb_bl(:,:)  = 0._wp
-      zdt_ml(:,:)  = 0._wp ; zds_ml(:,:)  = 0._wp ; zdu_ml(:,:)   = 0._wp ; zdv_ml(:,:)  = 0._wp
-      zdb_ml(:,:)  = 0._wp
-      !
-      zdbdz_pyc(:,:,:) = 0.0_wp
-      !
-      zdtdz_bl_ext(:,:) = 0._wp ; zdsdz_bl_ext(:,:) = 0._wp ; zdbdz_bl_ext(:,:) = 0._wp
+      zhbl(:,:)   = zlarge ; zhml(:,:)   = zlarge  ; zdh(:,:)        = zlarge ; zdhdt(:,:)     = zlarge
+      zt_bl(:,:)  = zlarge ; zs_bl(:,:)  = zlarge  ; zu_bl(:,:)      = zlarge
+      zv_bl(:,:)  = zlarge ; zb_bl(:,:)  = zlarge
+      zt_ml(:,:)  = zlarge ; zs_ml(:,:)  = zlarge  ; zu_ml(:,:)      = zlarge
+      zt_mle(:,:) = zlarge ; zs_mle(:,:) = zlarge  ; zu_mle(:,:)     = zlarge
+      zb_mle(:,:) = zlarge
+      zv_ml(:,:)  = zlarge ; zdt_bl(:,:) = zlarge  ; zds_bl(:,:)     = zlarge
+      zdu_bl(:,:) = zlarge ; zdv_bl(:,:) = zlarge  ; zdb_bl(:,:)     = zlarge
+      zdt_ml(:,:) = zlarge ; zds_ml(:,:) = zlarge  ; zdu_ml(:,:)     = zlarge ; zdv_ml(:,:)    = zlarge
+      zdb_ml(:,:) = zlarge
+      !
+      zdbdz_pyc(:,:,:) = zlarge
+      zdbdz_pyc(A2D(0),:) = 0.0_wp
+      !
+      zdtdz_bl_ext(:,:) = zlarge ; zdsdz_bl_ext(:,:) = zlarge ; zdbdz_bl_ext(:,:) = zlarge
 
       IF ( ln_osm_mle ) THEN  ! only initialise arrays if needed
-         zdtdx(:,:) = 0._wp ; zdtdy(:,:) = 0._wp ; zdsdx(:,:) = 0._wp
-         zdsdy(:,:) = 0._wp ; dbdx_mle(:,:) = 0._wp ; dbdy_mle(:,:) = 0._wp
-         zwb_fk(:,:) = 0._wp ; zvel_mle(:,:) = 0._wp; zdiff_mle(:,:) = 0._wp
-         zhmle(:,:) = 0._wp  ; zmld(:,:) = 0._wp
+         zdtdx(:,:)  = zlarge ; zdtdy(:,:)    = zlarge ; zdsdx(:,:)     = zlarge
+         zdsdy(:,:)  = zlarge ; dbdx_mle(:,:) = zlarge ; dbdy_mle(:,:)  = zlarge
+         zwb_fk(:,:) = zlarge ; zvel_mle(:,:) = zlarge ; zdiff_mle(:,:) = zlarge
+         zhmle(:,:)  = zlarge ; zmld(:,:)     = zlarge
       ENDIF
-      zwb_fk_b(:,:) = 0._wp   ! must be initialised even with ln_osm_mle=F as used in zdf_osm_calculate_dhdt
-
-      zhbl_t(:,:)     = 0._wp
-
-      zdiffut(:,:,:) = 0._wp ; zviscos(:,:,:) = 0._wp ; ghamt(:,:,:) = 0._wp
-      ghams(:,:,:)   = 0._wp ; ghamu(:,:,:)   = 0._wp ; ghamv(:,:,:) = 0._wp
+      zwb_fk_b(:,:) = zlarge   ! must be initialised even with ln_osm_mle=F as used in zdf_osm_calculate_dhdt
+
+      zhbl_t(:,:)   = zlarge
+
+      zdiffut(:,:,:) = zlarge ; zviscos(:,:,:) = zlarge
+      zdiffut(A2D(0),:) = 0.0_wp ; zviscos(A2D(0),:) = 0.0_wp
+      ghamt(:,:,:)   = zlarge ; ghams(:,:,:)   = zlarge
+      ghamt(A2D(0),:)   = 0.0_wp ; ghams(A2D(0),:)   = 0.0_wp
+      ghamu(:,:,:)   = zlarge ; ghamv(:,:,:)   = zlarge
+      ghamu(A2D(0),:)   = 0.0_wp ; ghamv(A2D(0),:)   = 0.0_wp
+      zdiff_mle(A2D(0)) = 0.0_wp
 
 
@@ -1390 +1397 @@
          END_2D
 
-         zekman(:,:) = EXP( -1.0_wp * zek * ABS( ff_t(:,:) ) * zhbl(:,:) / MAX(zustar(:,:), 1.e-8 ) )
-
-         zshear(:,:) = 0._wp
+         zekman(A2D(0)) = EXP( -1.0_wp * zek * ABS( ff_t(A2D(0)) ) * zhbl(A2D(0)) / MAX(zustar(A2D(0)), 1.e-8 ) )
+
+         zshear(A2D(0)) = 0._wp
 #ifdef key_osm_debug
          IF(narea==nn_narea_db) THEN
@@ -1401 +1408 @@
          END IF
 #endif
-         j_ddh(:,:) = 1
+         j_ddh(A2D(0)) = 1
 
          DO_2D( 0, 0, 0, 0 )
@@ -1502 +1509 @@
          END_2D
 
-         zwb_min(:,:) = 0._wp
+         zwb_min(:,:) = zlarge
 
          DO_2D( 0, 0, 0, 0 )
@@ -1608 +1615 @@
 
          IF( ln_timing ) CALL timing_start('zdf_osm_osf')
-         znd_param(:,:) = 0._wp
+         znd_param(A2D(0)) = 0.0_wp
 
          DO_2D( 0, 0, 0, 0 )
@@ -2508 +2515 @@
       !
       ! Averages over depth of boundary layer
-      pt(:,:)     = 0.0_wp
-      ps(:,:)     = 0.0_wp
-      pu(:,:)     = 0.0_wp
-      pv(:,:)     = 0.0_wp
+      pt(A2D(0))     = 0.0_wp
+      ps(A2D(0))     = 0.0_wp
+      pu(A2D(0))     = 0.0_wp
+      pv(A2D(0))     = 0.0_wp
       zthick(:,:) = epsln
       jkflt = jpk