Update to GT4Py v1.1.8: adapt type hints (and ignores) (#1096)

Reduce blanket type ignores at the price of adding a handful specific
ones.

---------

Co-authored-by: Hannes Vogt <vogt@hey.com>

Author: DropD

model/atmosphere/advection/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common>=0.0.6",
   # external dependencies
-  "gt4py==1.1.7",
+  "gt4py==1.1.8",
   'packaging>=20.0'
 ]
 description = "ICON advection."

model/atmosphere/advection/src/icon4py/model/atmosphere/advection/stencils/apply_positive_definite_horizontal_multiplicative_flux_factor.py

@@ -37,7 +37,7 @@ def apply_positive_definite_horizontal_multiplicative_flux_factor(
     horizontal_end: gtx.int32,
     vertical_start: gtx.int32,
     vertical_end: gtx.int32,
-):
+) -> None:
     _apply_positive_definite_horizontal_multiplicative_flux_factor(
         r_m,
         p_mflx_tracer_h,

model/atmosphere/advection/src/icon4py/model/atmosphere/advection/stencils/compute_ppm_all_face_values.py

@@ -40,7 +40,7 @@ def _compute_ppm_all_face_values(
 
     p_face = concat_where(dims.KDim == elevp1, p_cc(Koff[-1]), p_face)
 
-    return p_face  # type: ignore[return-value] # concat_where leads to static type-erasure
+    return p_face
 
 
 @gtx.program(grid_type=gtx.GridType.UNSTRUCTURED)

model/atmosphere/advection/src/icon4py/model/atmosphere/advection/stencils/compute_ppm_slope.py

@@ -58,7 +58,7 @@ def _compute_ppm_slope(
         _compute_ppm_slope_a(p_cc, p_cellhgt_mc_now),
     )
 
-    return z_slope  # type: ignore[return-value] # concat_where leads to static type erasure
+    return z_slope
 
 
 @gtx.program(grid_type=gtx.GridType.UNSTRUCTURED)

model/atmosphere/diffusion/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common>=0.0.6",
   # external dependencies
-  "gt4py==1.1.7",
+  "gt4py==1.1.8",
   'packaging>=20.0'
 ]
 description = "ICON diffusion."

model/atmosphere/dycore/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   # workspace members
   "icon4py-common>=0.0.6",
   # external dependencies
-  "gt4py==1.1.7",
+  "gt4py==1.1.8",
   'packaging>=20.0'
 ]
 description = "ICON dynamical core."

model/atmosphere/dycore/tests/dycore/integration_tests/test_benchmark_solve_nonhydro.py

@@ -30,7 +30,7 @@
 )
 from icon4py.model.common.interpolation import interpolation_attributes, interpolation_factory
 from icon4py.model.common.metrics import metrics_attributes, metrics_factory
-from icon4py.model.common.states import prognostic_state as prognostics
+from icon4py.model.common.states import factory, prognostic_state as prognostics
 from icon4py.model.common.utils import data_allocation as data_alloc
 from icon4py.model.testing.fixtures.benchmark import (
     geometry_field_source,
@@ -171,7 +171,7 @@ def solve_nonhydro(
         ddxn_z_full=metrics_field_source.get(metrics_attributes.DDXN_Z_FULL),
         zdiff_gradp=metrics_field_source.get(metrics_attributes.ZDIFF_GRADP),
         vertoffset_gradp=metrics_field_source.get(metrics_attributes.VERTOFFSET_GRADP),
-        nflat_gradp=metrics_field_source.get(metrics_attributes.NFLAT_GRADP),
+        nflat_gradp=metrics_field_source.get_int32(metrics_attributes.NFLAT_GRADP),
         pg_exdist=metrics_field_source.get(metrics_attributes.PG_EXDIST_DSL),
         ddqz_z_full_e=metrics_field_source.get(metrics_attributes.DDQZ_Z_FULL_E),
         ddxt_z_full=metrics_field_source.get(metrics_attributes.DDXT_Z_FULL),

model/atmosphere/dycore/tests/dycore/stencil_tests/test_compute_advection_in_vertical_momentum_equation.py

@@ -76,7 +76,7 @@ def interpolate_contravariant_vertical_velocity_to_full_levels_numpy(
     )
     contravariant_corrected_w_at_cells_on_model_levels = 0.5 * (
         contravariant_corrected_w_with_surface[:, :-1]
-        + contravariant_corrected_w_with_surface[:, 1:]
+        + contravariant_corrected_w_with_surface[:, 1:]  # type: ignore[operator]  # unclear why mypy complains (might be fixable in gt4py mypy plugin)
     )
     return contravariant_corrected_w_at_cells_on_model_levels
 

model/atmosphere/dycore/tests/dycore/stencil_tests/test_compute_horizontal_advection_of_rho_and_theta.py

@@ -252,7 +252,9 @@ def reference(
         return dict(out=(z_rho_e, z_theta_v_e))
 
     @pytest.fixture
-    def input_data(self, grid: base.Grid) -> dict[str, gtx.Field | state_utils.ScalarType]:
+    def input_data(
+        self, grid: base.Grid
+    ) -> dict[str, gtx.Field | state_utils.ScalarType | gtx.Domain | tuple[gtx.Field, ...]]:
         p_vn = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim, dtype=ta.wpfloat)
         p_vt = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim, dtype=ta.vpfloat)
         pos_on_tplane_e_1 = data_alloc.random_field(

model/atmosphere/dycore/tests/dycore/stencil_tests/test_dycore_utils.py

@@ -28,7 +28,7 @@
 
 
 def fourth_order_divdamp_scaling_coeff_numpy(
-    a: np.ndarray, divdamp_order: int, factor: float, mean_cell_area: float
+    a: np.ndarray, divdamp_order: gtx.int32, factor: float, mean_cell_area: float
 ) -> np.ndarray:
     b = np.maximum(0.0, a - 0.25 * factor) if divdamp_order == 24 else np.full_like(a, factor)
     return -b * mean_cell_area**2
@@ -44,7 +44,7 @@ def test_calculate_fourth_order_divdamp_scaling_coeff_order_24(
     backend: gtx_typing.Backend,
 ) -> None:
     second_order_divdamp_factor = 3.0
-    divdamp_order = 24
+    divdamp_order = gtx.int32(24)
     mean_cell_area = 1000.0
     grid = simple_grid.simple_grid(allocator=backend)
     interpolated_fourth_order_divdamp_factor = data_alloc.random_field(