feat: enforce StencilTest conventions programmatically and other minor fixes

model/atmosphere/advection/tests/advection/stencil_tests/test_apply_horizontal_density_increment.py

@@ -29,7 +29,7 @@ class TestApplyHorizontalDensityIncrement(stencil_tests.StencilTest):
         ),
     )
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_rhodz_new: np.ndarray,
@@ -43,7 +43,7 @@ def reference(
         rhodz_ast2 = np.maximum(0.1 * p_rhodz_new, p_rhodz_new) - p_dtime * tmp
         return dict(rhodz_ast2=rhodz_ast2)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         p_rhodz_new = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_mflx_contra_v = data_alloc.random_field(

model/atmosphere/advection/tests/advection/stencil_tests/test_apply_interpolated_tracer_time_tendency.py

@@ -24,7 +24,7 @@ class TestApplyInterpolatedTracerTimeTendency(stencil_tests.StencilTest):
     PROGRAM = apply_interpolated_tracer_time_tendency
     OUTPUTS = ("p_tracer_new",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_tracer_now: np.ndarray,
@@ -37,7 +37,7 @@ def reference(
 
         return dict(p_tracer_new=p_tracer_new)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_tracer_now = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_grf_tend_tracer = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_apply_vertical_density_increment.py

@@ -30,7 +30,7 @@ class TestApplyVerticalDensityIncrement(stencil_tests.StencilTest):
         ),
     )
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         rhodz_ast: np.ndarray,
@@ -47,7 +47,7 @@ def reference(
 
         return dict(rhodz_ast2=rhodz_ast2)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         rhodz_ast = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_mflx_contra_v = data_alloc.random_field(

model/atmosphere/advection/tests/advection/stencil_tests/test_average_horizontal_flux_subcycling_2.py

@@ -24,7 +24,7 @@ class TestAverageHorizontalFluxSubcycling2(stencil_tests.StencilTest):
     PROGRAM = average_horizontal_flux_subcycling_2
     OUTPUTS = ("p_out_e",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         z_tracer_mflx_1_dsl: np.ndarray,
@@ -34,7 +34,7 @@ def reference(
         p_out_e = (z_tracer_mflx_1_dsl + z_tracer_mflx_2_dsl) / float(2)
         return dict(p_out_e=p_out_e)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         z_tracer_mflx_1_dsl = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         z_tracer_mflx_2_dsl = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_average_horizontal_flux_subcycling_3.py

@@ -24,7 +24,7 @@ class TestAverageHorizontalFluxSubcycling3(stencil_tests.StencilTest):
     PROGRAM = average_horizontal_flux_subcycling_3
     OUTPUTS = ("p_out_e",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         z_tracer_mflx_1_dsl: np.ndarray,
@@ -35,7 +35,7 @@ def reference(
         p_out_e = (z_tracer_mflx_1_dsl + z_tracer_mflx_2_dsl + z_tracer_mflx_3_dsl) / float(3)
         return dict(p_out_e=p_out_e)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         z_tracer_mflx_1_dsl = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         z_tracer_mflx_2_dsl = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_antidiffusive_cell_fluxes_and_min_max.py

@@ -28,7 +28,7 @@ class TestComputeAntidiffusiveCellFluxesAndMinMax(stencil_tests.StencilTest):
         "z_tracer_min",
     )
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         geofac_div: np.ndarray,
@@ -77,7 +77,7 @@ def reference(
             z_tracer_min=z_tracer_min,
         )
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         geofac_div = data_alloc.random_field(grid, dims.CellDim, dims.C2EDim)
         p_rhodz_now = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_barycentric_backtrajectory.py

@@ -22,7 +22,7 @@ class TestComputeBarycentricBacktrajectory(stencil_tests.StencilTest):
     PROGRAM = compute_barycentric_backtrajectory
     OUTPUTS = ("p_cell_idx", "p_distv_bary_1", "p_distv_bary_2")
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_vn: np.ndarray,
@@ -79,7 +79,7 @@ def reference(
             p_distv_bary_2=p_distv_bary_2,
         )
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         p_vn = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         p_vt = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_barycentric_backtrajectory_alt.py

@@ -22,7 +22,7 @@ class TestComputeBarycentricBacktrajectoryAlt(stencil_tests.StencilTest):
     PROGRAM = compute_barycentric_backtrajectory_alt
     OUTPUTS = ("p_distv_bary_1", "p_distv_bary_2")
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_vn: np.ndarray,
@@ -72,7 +72,7 @@ def reference(
             p_distv_bary_2=p_distv_bary_2,
         )
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         p_vn = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         p_vt = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ffsl_backtrajectory.py

@@ -34,7 +34,7 @@ class TestComputeFfslBacktrajectory(stencil_tests.StencilTest):
         "p_coords_dreg_v_4_lat_dsl",
     )
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_vn: np.ndarray,
@@ -145,7 +145,7 @@ def reference(
             "p_coords_dreg_v_4_lat_dsl": p_coords_dreg_v_4_lat_dsl,
         }
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         p_vn = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         p_vt = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ffsl_backtrajectory_counterclockwise_indicator.py

@@ -24,7 +24,7 @@ class TestComputeFfslBacktrajectoryCounterclockwiseIndicator(stencil_tests.Stenc
     PROGRAM = compute_ffsl_backtrajectory_counterclockwise_indicator
     OUTPUTS = ("lvn_sys_pos",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_vn: np.ndarray,
@@ -44,7 +44,7 @@ def reference(
 
         return dict(lvn_sys_pos=lvn_sys_pos)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_vn = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         tangent_orientation = data_alloc.random_field(grid, dims.EdgeDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ffsl_backtrajectory_length_indicator.py

@@ -22,7 +22,7 @@ class TestComputeFfslBacktrajectoryLengthIndicator(stencil_tests.StencilTest):
     PROGRAM = compute_ffsl_backtrajectory_length_indicator
     OUTPUTS = ("opt_famask_dsl",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_vn: np.ndarray,
@@ -46,7 +46,7 @@ def reference(
 
         return dict(opt_famask_dsl=opt_famask_dsl)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         p_vn = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         p_vt = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_horizontal_tracer_flux_from_cubic_coefficients.py

@@ -22,7 +22,7 @@ class TestComputeHorizontalTracerFluxFromCubicCoefficients(stencil_tests.Stencil
     PROGRAM = compute_horizontal_tracer_flux_from_cubic_coefficients
     OUTPUTS = ("p_out_e_hybrid_2",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_out_e_hybrid_2: np.ndarray,
@@ -34,7 +34,7 @@ def reference(
 
         return dict(p_out_e_hybrid_2=p_out_e_hybrid_2)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         p_out_e_hybrid_2 = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)
         p_mass_flx_e = data_alloc.random_field(grid, dims.EdgeDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_horizontal_tracer_flux_from_linear_coefficients.py

@@ -24,7 +24,7 @@ class TestComputeHorizontalTracerFluxFromLinearCoefficients(stencil_tests.Stenci
     PROGRAM = compute_horizontal_tracer_flux_from_linear_coefficients
     OUTPUTS = ("p_out_e",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         z_lsq_coeff_1: np.ndarray,
@@ -57,7 +57,7 @@ def reference(
 
         return dict(p_out_e=p_out_e)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         z_lsq_coeff_1 = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         z_lsq_coeff_2 = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_horizontal_tracer_flux_from_linear_coefficients_alt.py

@@ -24,7 +24,7 @@ class TestComputeHorizontalTracerFluxFromLinearCoefficientsAlt(stencil_tests.Ste
     PROGRAM = compute_horizontal_tracer_flux_from_linear_coefficients_alt
     OUTPUTS = ("p_out_e",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         z_lsq_coeff_1: np.ndarray,
@@ -57,7 +57,7 @@ def reference(
 
         return dict(p_out_e=p_out_e)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         z_lsq_coeff_1 = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         z_lsq_coeff_2 = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_positive_definite_horizontal_multiplicative_flux_factor.py

@@ -22,7 +22,7 @@ class TestComputePositiveDefiniteHorizontalMultiplicativeFluxFactor(stencil_test
     PROGRAM = compute_positive_definite_horizontal_multiplicative_flux_factor
     OUTPUTS = ("r_m",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         geofac_div: np.ndarray,
@@ -53,7 +53,7 @@ def reference(
 
         return dict(r_m=r_m)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid) -> dict:
         geofac_div = data_alloc.random_field(grid, dims.CellDim, dims.C2EDim)
         p_cc = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ppm4gpu_parabola_coefficients.py

@@ -24,7 +24,7 @@ class TestComputePpm4gpuParabolaCoefficients(stencil_tests.StencilTest):
     PROGRAM = compute_ppm4gpu_parabola_coefficients
     OUTPUTS = ("z_delta_q", "z_a1")
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         z_face_up: np.ndarray,
@@ -36,7 +36,7 @@ def reference(
         z_a1 = p_cc - 0.5 * (z_face_up + z_face_low)
         return dict(z_delta_q=z_delta_q, z_a1=z_a1)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         z_face_up = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         z_face_low = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ppm_all_face_values.py

@@ -25,7 +25,7 @@ class TestComputePpmAllFaceValues(stencil_tests.StencilTest):
     PROGRAM = compute_ppm_all_face_values
     OUTPUTS = ("p_face",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_cc: np.ndarray,
@@ -49,7 +49,7 @@ def reference(
         p_face[:, 1:] = np.where((k[1:] == elevp1), p_cc[:, :-1], p_face[:, 1:])
         return dict(p_face=p_face)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_cc = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_cellhgt_mc_now = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ppm_quadratic_face_values.py

@@ -27,7 +27,7 @@ class TestComputePpmQuadraticFaceValues(stencil_tests.StencilTest):
     PROGRAM = compute_ppm_quadratic_face_values
     OUTPUTS = (stencil_tests.Output("p_face", refslice=outslice, gtslice=outslice),)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_cc: np.ndarray,
@@ -42,7 +42,7 @@ def reference(
         )
         return dict(p_face=p_face)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_face = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_cc = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ppm_quartic_face_values.py

@@ -24,7 +24,7 @@ class TestComputePpmQuarticFaceValues(stencil_tests.StencilTest):
     PROGRAM = compute_ppm_quartic_face_values
     OUTPUTS = (stencil_tests.Output("p_face", gtslice=(slice(None), slice(2, None))),)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_cc: np.ndarray,
@@ -68,7 +68,7 @@ def reference(
         )
         return dict(p_face=p_face)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_cc = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_cellhgt_mc_now = data_alloc.random_field(

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_ppm_slope.py

@@ -27,7 +27,7 @@ class TestComputePpmSlope(stencil_tests.StencilTest):
         ),
     )
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_cc: np.ndarray,
@@ -64,7 +64,7 @@ def reference(
         z_slope = np.where(k[1:-1] < elev, z_slope_a, z_slope_b)
         return dict(z_slope=z_slope)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         z_slope = data_alloc.zero_field(grid, dims.CellDim, dims.KDim)
         p_cc = data_alloc.random_field(grid, dims.CellDim, dims.KDim, extend={dims.KDim: 1})

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_tendency.py

@@ -22,7 +22,7 @@ class TestComputeTendency(stencil_tests.StencilTest):
     PROGRAM = compute_tendency
     OUTPUTS = ("opt_ddt_tracer_adv",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_tracer_now: np.ndarray,
@@ -34,7 +34,7 @@ def reference(
 
         return dict(opt_ddt_tracer_adv=opt_ddt_tracer_adv)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_tracer_now = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_tracer_new = data_alloc.random_field(grid, dims.CellDim, dims.KDim)

model/atmosphere/advection/tests/advection/stencil_tests/test_compute_vertical_parabola_limiter_condition.py

@@ -24,7 +24,7 @@ class TestComputeVerticalParabolaLimiterCondition(stencil_tests.StencilTest):
     PROGRAM = compute_vertical_parabola_limiter_condition
     OUTPUTS = ("l_limit",)
 
-    @staticmethod
+    @stencil_tests.static_reference
     def reference(
         connectivities: dict[gtx.Dimension, np.ndarray],
         p_face: np.ndarray,
@@ -36,7 +36,7 @@ def reference(
         l_limit = np.where(np.abs(z_delta) < -1 * z_a6i, 1, 0)
         return dict(l_limit=l_limit)
 
-    @pytest.fixture
+    @stencil_tests.input_data_fixture
     def input_data(self, grid: base.Grid) -> dict:
         p_cc = data_alloc.random_field(grid, dims.CellDim, dims.KDim)
         p_face = data_alloc.random_field(grid, dims.CellDim, dims.KDim, extend={dims.KDim: 1})