Merge pull request NorESMhub#375 from matsbn/feature-hybrid_enhanceme…

…nts5

Feature hybrid enhancements 5

cime_config/namelist_definition_blom.xml

@@ -1072,7 +1072,7 @@
     <category>vcoord</category>
     <group>vcoord</group>
     <values>
-      <value>0</value>
+      <value>4</value>
     </values>
     <desc>add desc</desc>
   </entry>
@@ -1082,7 +1082,42 @@
     <category>vcoord</category>
     <group>vcoord</group>
     <values>
-      <value>0</value>
+      <value>2</value>
+    </values>
+    <desc>add desc</desc>
+  </entry>
+
+  <entry id="regrid_nudge_ts">
+    <type>real</type>
+    <category>vcoord</category>
+    <group>vcoord</group>
+    <values>
+      <value>86400.</value>
+    </values>
+    <desc>add desc</desc>
+  </entry>
+
+  <entry id="stab_fac_limit">
+    <type>real</type>
+    <category>vcoord</category>
+    <group>vcoord</group>
+    <values>
+      <value>.75</value>
+    </values>
+    <desc>add desc</desc>
+  </entry>
+
+  <entry id="smooth_diff_max">
+    <type>real</type>
+    <category>vcoord</category>
+    <group>vcoord</group>
+    <values>
+      <value>50000.</value>
+      <value blom_unit="cgs">50000.e4</value>
+      <value ocn_grid="tnx0.25v4"  blom_unit="mks">40000.</value>
+      <value ocn_grid="tnx0.25v4"  blom_unit="cgs">40000.e4</value>
+      <value ocn_grid="tnx0.125v4" blom_unit="mks">20000.</value>
+      <value ocn_grid="tnx0.125v4" blom_unit="cgs">20000.e4</value>
     </values>
     <desc>add desc</desc>
   </entry>

meson.build

@@ -14,6 +14,9 @@ if fcc.get_id() == 'gcc'
                            '-ffpe-trap=invalid,zero,overflow'],
                           language: 'fortran')
   endif
+  if get_option('buildtype') == 'release'
+    add_project_arguments('-ffp-contract=off'.split(),language: 'fortran')
+  endif
   # If MPI is enabled we need to allow for argument mismatch with gfortran to
   # make it able to compile
   if get_option('mpi') and fcc.has_argument('-fallow-argument-mismatch')

phy/mod_blom_init.F90

@@ -50,7 +50,6 @@ subroutine blom_init()
     use mod_niw,             only: uml, vml, umlres, vmlres
     use mod_eos,             only: inieos
     use mod_swabs,           only: iniswa
-    use mod_ndiff,           only: ndiff_init
     use mod_tmsmt,           only: initms
     use mod_dia,             only: diaini, diasg1
     use mod_inicon,          only: inicon
@@ -161,12 +160,6 @@ subroutine blom_init()
       call initke
     end if
 
-    ! ------------------------------------------------------------------
-    ! Initialize neutral diffusion
-    ! ------------------------------------------------------------------
-
-    call ndiff_init
-
     ! ------------------------------------------------------------------
     ! Initialize diagnostic accumulation fields
     ! ------------------------------------------------------------------
@@ -340,6 +333,7 @@ subroutine blom_init()
     ! update some halos
     ! ------------------------------------------------------------------
 
+    call xctilr(sigmar, 1,kk, 2,2, halo_ps)
     call xctilr(uflx, 1,2*kk, 1,1, halo_uv)
     call xctilr(vflx, 1,2*kk, 1,1, halo_vv)
     call xctilr(phi(1-nbdy,1-nbdy,kk+1), 1,1, 2,2, halo_ps)
@@ -350,7 +344,6 @@ subroutine blom_init()
     call xctilr(pgfym, 1,2, 1,2, halo_vv)
     call xctilr(xiyp, 1,2, 1,2, halo_vs)
     call xctilr(xiym, 1,2, 1,2, halo_vs)
-    call xctilr(sigmar, 1,kk, 1,1, halo_ps)
     if (vcoord_type_tag == isopyc_bulkml) then
        call xctilr(uml, 1,4, 1,0, halo_uv)
        call xctilr(vml, 1,4, 0,1, halo_vv)