Cleanup Diffusion config (#1060)

- Remove `thslp_zdiffu` and `thhgtd_zdiffu` from the Fortran bindings as
they are not used
- Add `hdiff_w_efdt_ratio` to the Fortran bindings (though for now we
don't have any experiment that deviates from the default value)

Author: havogt

model/atmosphere/diffusion/src/icon4py/model/atmosphere/diffusion/diffusion.py

@@ -152,8 +152,6 @@ def __init__(
         smagorinski_scaling_factor: float = 0.015,
         n_substeps: int = 5,
         zdiffu_t: bool = True,
-        thslp_zdiffu: float = 0.025,
-        thhgtd_zdiffu: float = 200.0,
         velocity_boundary_diffusion_denom: float = 200.0,
         temperature_boundary_diffusion_denom: float = 135.0,
         _nudge_max_coeff: float | None = None,  # default is set in __init__
@@ -211,11 +209,6 @@ def __init__(
         #: Called 'l_zdiffu_t' in mo_nonhydrostatic_nml.f90
         self.apply_zdiffusion_t: bool = zdiffu_t
 
-        #:slope threshold (temperature diffusion): is used to build up an index list for application of truly horizontal diffusion in mo_vertical_grid.f90
-        self.thslp_zdiffu = thslp_zdiffu
-        #: threshold [m] for height difference between adjacent grid points, defaults to 200m (temperature diffusion)
-        self.thhgtd_zdiffu = thhgtd_zdiffu
-
         # from other namelists:
         # from parent namelist mo_nonhydrostatic_nml
 
@@ -374,9 +367,6 @@ def _determine_smagorinski_factor(self, config: DiffusionConfig):
                 smagorinski_height = None
             case _:
                 raise NotImplementedError("Only implemented for diffusion type 4 and 5")
-                smagorinski_factor = None
-                smagorinski_height = None
-                pass
         return smagorinski_factor, smagorinski_height
 
 

model/atmosphere/diffusion/tests/diffusion/integration_tests/test_benchmark_diffusion.py

@@ -60,8 +60,6 @@ def test_diffusion_benchmark(
         hdiff_w_efdt_ratio=15.0,
         smagorinski_scaling_factor=0.025,
         zdiffu_t=False,
-        thslp_zdiffu=0.02,
-        thhgtd_zdiffu=125.0,
         velocity_boundary_diffusion_denom=150.0,
         max_nudging_coefficient=0.375,
         n_substeps=5,

model/driver/src/icon4py/model/driver/icon4py_configuration.py

@@ -81,8 +81,6 @@ def _mch_ch_r04b09_diffusion_config():
             hdiff_w_efdt_ratio=15.0,
             smagorinski_scaling_factor=0.025,
             zdiffu_t=True,
-            thslp_zdiffu=0.02,
-            thhgtd_zdiffu=125.0,
             velocity_boundary_diffusion_denom=150.0,
             max_nudging_coefficient=0.375,
             n_substeps=n_substeps_reduced,

model/testing/src/icon4py/model/testing/definitions.py

@@ -279,8 +279,6 @@ def construct_diffusion_config(
             hdiff_w_efdt_ratio=15.0,
             smagorinski_scaling_factor=0.025,
             zdiffu_t=True,
-            thslp_zdiffu=0.02,
-            thhgtd_zdiffu=125.0,
             velocity_boundary_diffusion_denom=150.0,
             max_nudging_coefficient=0.375,
             n_substeps=ndyn_substeps,

tools/src/icon4py/tools/py2fgen/wrappers/diffusion_wrapper.py

@@ -78,10 +78,9 @@ def diffusion_init(
     type_t_diffu: gtx.int32,
     type_vn_diffu: gtx.int32,
     hdiff_efdt_ratio: gtx.float64,
+    hdiff_w_efdt_ratio: gtx.float64,
     smagorinski_scaling_factor: gtx.float64,
     hdiff_temp: bool,
-    thslp_zdiffu: float,
-    thhgtd_zdiffu: float,
     denom_diffu_v: float,
     nudge_max_coeff: float,  # note: this is the scaled ICON value, i.e. not the namelist value
     itype_sher: gtx.int32,
@@ -111,11 +110,10 @@ def diffusion_init(
         type_t_diffu=type_t_diffu,
         type_vn_diffu=type_vn_diffu,
         hdiff_efdt_ratio=hdiff_efdt_ratio,
+        hdiff_w_efdt_ratio=hdiff_w_efdt_ratio,
         smagorinski_scaling_factor=smagorinski_scaling_factor,
         hdiff_temp=hdiff_temp,
         n_substeps=ndyn_substeps,
-        thslp_zdiffu=thslp_zdiffu,
-        thhgtd_zdiffu=thhgtd_zdiffu,
         velocity_boundary_diffusion_denom=denom_diffu_v,
         max_nudging_coefficient=nudge_max_coeff,
         shear_type=TurbulenceShearForcingType(itype_sher),

tools/tests/tools/py2fgen/wrappers/references/diffusion/diffusion.f90

@@ -152,10 +152,9 @@ function diffusion_init_wrapper(theta_ref_mc, &
                                       type_t_diffu, &
                                       type_vn_diffu, &
                                       hdiff_efdt_ratio, &
+                                      hdiff_w_efdt_ratio, &
                                       smagorinski_scaling_factor, &
                                       hdiff_temp, &
-                                      thslp_zdiffu, &
-                                      thhgtd_zdiffu, &
                                       denom_diffu_v, &
                                       nudge_max_coeff, &
                                       itype_sher, &
@@ -263,14 +262,12 @@ function diffusion_init_wrapper(theta_ref_mc, &
 
          real(c_double), value, target :: hdiff_efdt_ratio
 
+         real(c_double), value, target :: hdiff_w_efdt_ratio
+
          real(c_double), value, target :: smagorinski_scaling_factor
 
          logical(c_int), value, target :: hdiff_temp
 
-         real(c_double), value, target :: thslp_zdiffu
-
-         real(c_double), value, target :: thhgtd_zdiffu
-
          real(c_double), value, target :: denom_diffu_v
 
          real(c_double), value, target :: nudge_max_coeff
@@ -501,10 +498,9 @@ subroutine diffusion_init(theta_ref_mc, &
                              type_t_diffu, &
                              type_vn_diffu, &
                              hdiff_efdt_ratio, &
+                             hdiff_w_efdt_ratio, &
                              smagorinski_scaling_factor, &
                              hdiff_temp, &
-                             thslp_zdiffu, &
-                             thhgtd_zdiffu, &
                              denom_diffu_v, &
                              nudge_max_coeff, &
                              itype_sher, &
@@ -559,14 +555,12 @@ subroutine diffusion_init(theta_ref_mc, &
 
       real(c_double), value, target :: hdiff_efdt_ratio
 
+      real(c_double), value, target :: hdiff_w_efdt_ratio
+
       real(c_double), value, target :: smagorinski_scaling_factor
 
       logical(c_int), value, target :: hdiff_temp
 
-      real(c_double), value, target :: thslp_zdiffu
-
-      real(c_double), value, target :: thhgtd_zdiffu
-
       real(c_double), value, target :: denom_diffu_v
 
       real(c_double), value, target :: nudge_max_coeff
@@ -772,10 +766,9 @@ subroutine diffusion_init(theta_ref_mc, &
                                   type_t_diffu=type_t_diffu, &
                                   type_vn_diffu=type_vn_diffu, &
                                   hdiff_efdt_ratio=hdiff_efdt_ratio, &
+                                  hdiff_w_efdt_ratio=hdiff_w_efdt_ratio, &
                                   smagorinski_scaling_factor=smagorinski_scaling_factor, &
                                   hdiff_temp=hdiff_temp, &
-                                  thslp_zdiffu=thslp_zdiffu, &
-                                  thhgtd_zdiffu=thhgtd_zdiffu, &
                                   denom_diffu_v=denom_diffu_v, &
                                   nudge_max_coeff=nudge_max_coeff, &
                                   itype_sher=itype_sher, &

tools/tests/tools/py2fgen/wrappers/references/diffusion/diffusion.h

@@ -22,7 +22,7 @@ extern int diffusion_init_wrapper(
     int zd_intcoef_size_0, int zd_intcoef_size_1, double *zd_diffcoef,
     int zd_diffcoef_size_0, int ndyn_substeps, int diffusion_type, int hdiff_w,
     int hdiff_vn, int hdiff_smag_w, int zdiffu_t, int type_t_diffu,
-    int type_vn_diffu, double hdiff_efdt_ratio,
-    double smagorinski_scaling_factor, int hdiff_temp, double thslp_zdiffu,
-    double thhgtd_zdiffu, double denom_diffu_v, double nudge_max_coeff,
-    int itype_sher, int ltkeshs, int backend, int on_gpu);
+    int type_vn_diffu, double hdiff_efdt_ratio, double hdiff_w_efdt_ratio,
+    double smagorinski_scaling_factor, int hdiff_temp, double denom_diffu_v,
+    double nudge_max_coeff, int itype_sher, int ltkeshs, int backend,
+    int on_gpu);

tools/tests/tools/py2fgen/wrappers/references/diffusion/diffusion.py

@@ -391,10 +391,9 @@ def diffusion_init_wrapper(
     type_t_diffu,
     type_vn_diffu,
     hdiff_efdt_ratio,
+    hdiff_w_efdt_ratio,
     smagorinski_scaling_factor,
     hdiff_temp,
-    thslp_zdiffu,
-    thhgtd_zdiffu,
     denom_diffu_v,
     nudge_max_coeff,
     itype_sher,
@@ -577,10 +576,9 @@ def diffusion_init_wrapper(
                 type_t_diffu=type_t_diffu,
                 type_vn_diffu=type_vn_diffu,
                 hdiff_efdt_ratio=hdiff_efdt_ratio,
+                hdiff_w_efdt_ratio=hdiff_w_efdt_ratio,
                 smagorinski_scaling_factor=smagorinski_scaling_factor,
                 hdiff_temp=hdiff_temp,
-                thslp_zdiffu=thslp_zdiffu,
-                thhgtd_zdiffu=thhgtd_zdiffu,
                 denom_diffu_v=denom_diffu_v,
                 nudge_max_coeff=nudge_max_coeff,
                 itype_sher=itype_sher,

tools/tests/tools/py2fgen/wrappers/test_diffusion_wrapper.py

@@ -58,10 +58,9 @@ def test_diffusion_wrapper_granule_inputs(
     type_t_diffu = diffusion.TemperatureDiscretizationType.HETEROGENEOUS
     type_vn_diffu = diffusion.SmagorinskyStencilType.DIAMOND_VERTICES
     hdiff_efdt_ratio = 24.0
+    hdiff_w_efdt_ratio = 15.0
     smagorinski_scaling_factor = 0.025
     zdiffu_t = True
-    thslp_zdiffu = 0.02
-    thhgtd_zdiffu = 125.0
     denom_diffu_v = 150.0
     max_nudging_coefficient = 0.375
     itype_sher = (
@@ -174,10 +173,9 @@ def test_diffusion_wrapper_granule_inputs(
             type_t_diffu=type_t_diffu,
             type_vn_diffu=type_vn_diffu,
             hdiff_efdt_ratio=hdiff_efdt_ratio,
+            hdiff_w_efdt_ratio=hdiff_w_efdt_ratio,
             smagorinski_scaling_factor=smagorinski_scaling_factor,
             hdiff_temp=hdiff_temp,
-            thslp_zdiffu=thslp_zdiffu,
-            thhgtd_zdiffu=thhgtd_zdiffu,
             denom_diffu_v=denom_diffu_v,
             nudge_max_coeff=max_nudging_coefficient,
             itype_sher=itype_sher.value,
@@ -289,10 +287,9 @@ def test_diffusion_wrapper_single_step(
     type_t_diffu = diffusion.TemperatureDiscretizationType.HETEROGENEOUS
     type_vn_diffu = diffusion.SmagorinskyStencilType.DIAMOND_VERTICES
     hdiff_efdt_ratio = 24.0
+    hdiff_w_efdt_ratio = 15.0
     smagorinski_scaling_factor = 0.025
     zdiffu_t = True
-    thslp_zdiffu = 0.02
-    thhgtd_zdiffu = 125.0
     denom_diffu_v = 150.0
     max_nudging_coefficient = 0.375
     itype_sher = (
@@ -373,10 +370,9 @@ def test_diffusion_wrapper_single_step(
         type_t_diffu=type_t_diffu,
         type_vn_diffu=type_vn_diffu,
         hdiff_efdt_ratio=hdiff_efdt_ratio,
+        hdiff_w_efdt_ratio=hdiff_w_efdt_ratio,
         smagorinski_scaling_factor=smagorinski_scaling_factor,
         hdiff_temp=hdiff_temp,
-        thslp_zdiffu=thslp_zdiffu,
-        thhgtd_zdiffu=thhgtd_zdiffu,
         denom_diffu_v=denom_diffu_v,
         nudge_max_coeff=max_nudging_coefficient,
         itype_sher=itype_sher.value,