Changes between Version 22 and Version 23 of 2021WP/HPC-08_Mueller_OSMOSIS_streamlining

Timestamp:

2021-05-26T11:30:11+02:00 (3 years ago)

Author:

smueller

Comment:

--

2021WP/HPC-08_Mueller_OSMOSIS_streamlining

@@ -91 +91 @@
 
 ''This change is self contained (to the zdfosm module) and passes SETTE tests. It is ready for merge. Mike Bell (and Andrew Coward)''
+
+== Post-review updates (compatibility with `nn_hls=2` and `ln_tiling=.true.` options)
+
+Regression testing has been carried out using the standard `WED025` SETTE test with the modification
+
+{{{#!diff
+Index: cfgs/WED025/EXPREF/namelist_cfg
+===================================================================
+--- cfgs/WED025/EXPREF/namelist_cfg     (revision 14901)
++++ cfgs/WED025/EXPREF/namelist_cfg     (working copy)
+@@ -444,6 +444,7 @@
+ !-----------------------------------------------------------------------
+ &namtra_mle    !   mixed layer eddy parametrisation (Fox-Kemper)       (default: OFF)
+ !-----------------------------------------------------------------------
++   ln_mle      = .true.   ! (T) use the Mixed Layer Eddy (MLE) parameterisation
+ /
+ !-----------------------------------------------------------------------
+ &namtra_eiv    !   eddy induced velocity param.                         (default: OFF)
+@@ -532,13 +533,8 @@
+ !-----------------------------------------------------------------------
+    !
+    !                       ! type of vertical closure (required)
+-   ln_zdftke   = .true.       !  Turbulent Kinetic Energy closure       (T =>   fill namzdf_tke)
++   ln_zdfosm   = .true.      !  OSMOSIS BL closure                     (T =>   fill namzdf_osm)
+    !
+-   !                       ! convection
+-   ln_zdfevd   = .true.       !  enhanced vertical diffusion
+-      nn_evdm     =    0         ! apply on tracer (=0) or on tracer and momentum (=1)
+-      rn_evd      =  10.0        ! mixing coefficient [m2/s]
+-   !
+    !                       ! coefficients
+    rn_avm0     =   1.2e-4     !  vertical eddy viscosity   [m2/s]       (background Kz if ln_zdfcst=F)
+    rn_avt0     =   2e-06      !  vertical eddy diffusivity [m2/s]       (background Kz if ln_zdfcst=F)
+}}}
+
+to enable in the reference WED025 configuration both the OSMOSIS boundary-layer scheme (as included in the SETTE WED025 tests listed in the table above) and the OSMOSIS-specific extension of mixed-layer eddy-induced transport (not included in the SETTE WED025 tests listed in the table above), with respect to reference output generated using source:/NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining@14822 with the same modification of source:/NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/cfgs/WED025/EXPREF/namelist_cfg (`14822+`).
+
+||= Changeset               =||= Description                                                              =||= SETTE WED025+zdfosm+tramle =||= SETTE WED025+zdfosm+tramle =||= SETTE WED025+zdfosm+tramle =||
+|| [14856,14858,14859] || Synchronisation with source:/NEMO/trunk@14854, minor adjustments, and bugfixes related to diagnostic output || || || ||
+|| [14863] || Synchronisation with source:/NEMO/trunk@14857 || || || ||
+|| [14868] || Removal of redundant halo exchanges || || || ||
+|| [14889] || Compatibility with extended halo (`nn_hls=2`) || || || ||
+|| [14900,14901] || Compatibliity with tiling option (`ln_tiling=.true.`) || || || ||