diff --git a/model/atmosphere/advection/tests/advection_stencil_tests/test_compute_ppm_all_face_values.py b/model/atmosphere/advection/tests/advection_stencil_tests/test_compute_ppm_all_face_values.py index 080d5acd5..e952a5f95 100644 --- a/model/atmosphere/advection/tests/advection_stencil_tests/test_compute_ppm_all_face_values.py +++ b/model/atmosphere/advection/tests/advection_stencil_tests/test_compute_ppm_all_face_values.py @@ -21,7 +21,7 @@ class TestComputePpmAllFaceValues(helpers.StencilTest): PROGRAM = compute_ppm_all_face_values OUTPUTS = ("p_face",) - MARKER = (pytest.mark.embedded_skip,) + # MARKER = (pytest.mark.embedded_skip,) @staticmethod def reference( diff --git a/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_apply_diffusion_to_theta_and_exner.py b/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_apply_diffusion_to_theta_and_exner.py index 67c7def55..8fe952a41 100644 --- a/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_apply_diffusion_to_theta_and_exner.py +++ b/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_apply_diffusion_to_theta_and_exner.py @@ -34,7 +34,7 @@ class TestApplyDiffusionToThetaAndExner(StencilTest): PROGRAM = apply_diffusion_to_theta_and_exner OUTPUTS = ("theta_v", "exner") - MARKER = (pytest.mark.embedded_skip, pytest.mark.miss_neighbors) + MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference( diff --git a/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla2_and_smag_coefficients_for_vn.py b/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla2_and_smag_coefficients_for_vn.py index 1842d296f..cdaa76da8 100644 --- a/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla2_and_smag_coefficients_for_vn.py +++ b/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla2_and_smag_coefficients_for_vn.py @@ -21,7 +21,7 @@ class TestCalculateNabla2AndSmagCoefficientsForVn(StencilTest): PROGRAM = calculate_nabla2_and_smag_coefficients_for_vn OUTPUTS = ("kh_smag_e", "kh_smag_ec", "z_nabla2_e") - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference( diff --git a/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla4.py b/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla4.py index 21fb7b6a9..60621eb1e 100644 --- a/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla4.py +++ b/model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_calculate_nabla4.py @@ -66,7 +66,7 @@ def calculate_nabla4_numpy( class TestCalculateNabla4(StencilTest): PROGRAM = calculate_nabla4 OUTPUTS = ("z_nabla4_e2",) - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py index 5b8e8f070..6ae1e3535 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_add_vertical_wind_derivative_to_divergence_damping.py @@ -21,7 +21,7 @@ class TestAddVerticalWindDerivativeToDivergenceDamping(StencilTest): PROGRAM = add_vertical_wind_derivative_to_divergence_damping OUTPUTS = ("z_graddiv_vn",) - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py index 5e84cb157..0a6b8614a 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_advective_normal_wind_tendency.py @@ -52,7 +52,7 @@ def compute_advective_normal_wind_tendency_numpy( class TestComputeAdvectiveNormalWindTendency(StencilTest): PROGRAM = compute_advective_normal_wind_tendency OUTPUTS = ("ddt_vn_apc",) - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_of_rho_and_theta.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_of_rho_and_theta.py index 68034300f..b58da6049 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_of_rho_and_theta.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_advection_of_rho_and_theta.py @@ -21,7 +21,7 @@ class TestComputeBtraj(StencilTest): PROGRAM = compute_horizontal_advection_of_rho_and_theta OUTPUTS = ("z_rho_e", "z_theta_v_e") - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def compute_btraj_numpy( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py index c61f9f4ff..2241d9283 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates.py @@ -21,7 +21,7 @@ class TestComputeHorizontalGradientOfExnerPressureForFlatCoordinates(StencilTest): PROGRAM = compute_horizontal_gradient_of_exner_pressure_for_flat_coordinates OUTPUTS = ("z_gradh_exner",) - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference(grid, inv_dual_edge_length: np.array, z_exner_ex_pr: np.array, **kwargs) -> dict: diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py index ce118efc8..6409624f9 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_multiple_levels.py @@ -25,7 +25,7 @@ class TestComputeHorizontalGradientOfExnerPressureForMultipleLevels(StencilTest): PROGRAM = compute_horizontal_gradient_of_exner_pressure_for_multiple_levels OUTPUTS = ("z_gradh_exner",) - MARKER = (pytest.mark.embedded_skip, pytest.mark.miss_neighbors) + MARKER = (pytest.mark.embedded_skip,) # pytest.mark.miss_neighbors) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py index 93c1e953c..1d20e2773 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates.py @@ -21,7 +21,7 @@ class TestComputeHorizontalGradientOfExnerPressureForNonflatCoordinates(StencilTest): PROGRAM = compute_horizontal_gradient_of_exner_pressure_for_nonflat_coordinates OUTPUTS = ("z_gradh_exner",) - MARKER = (pytest.mark.miss_neighbors,) + # MARKER = (pytest.mark.miss_neighbors,) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py index 054b50ad8..f5d9d5826 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_compute_hydrostatic_correction_term.py @@ -25,7 +25,7 @@ class TestComputeHydrostaticCorrectionTerm(StencilTest): OUTPUTS = ("z_hydro_corr",) PROGRAM = compute_hydrostatic_correction_term - MARKER = (pytest.mark.embedded_skip, pytest.mark.miss_neighbors) + MARKER = (pytest.mark.embedded_skip,) # pytest.mark.miss_neighbors) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py index 1ddafe488..be60bef63 100644 --- a/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py +++ b/model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_velocity_advection_stencil_8_to_13.py @@ -33,7 +33,7 @@ class TestFusedVelocityAdvectionStencil8To13(StencilTest): "w_concorr_c", "z_w_con_c", ) - MARKER = (pytest.mark.embedded_skip,) + # MARKER = (pytest.mark.embedded_skip,) @staticmethod def reference( diff --git a/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py b/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py index 793e200e8..569ad5312 100644 --- a/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py +++ b/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py @@ -839,6 +839,7 @@ def test_run_solve_nonhydro_single_step( atol=1e-14, ) + @pytest.mark.embedded_skip @pytest.mark.datatest @pytest.mark.parametrize("experiment", [dt_utils.REGIONAL_EXPERIMENT]) diff --git a/model/common/tests/grid_tests/test_geometry.py b/model/common/tests/grid_tests/test_geometry.py index 76d580794..a35af3156 100644 --- a/model/common/tests/grid_tests/test_geometry.py +++ b/model/common/tests/grid_tests/test_geometry.py @@ -101,8 +101,6 @@ def test_compute_inverse_edge_length(backend, grid_savepoint, grid_file, experim (dt_utils.R02B04_GLOBAL, dt_utils.GLOBAL_EXPERIMENT, 1e-11), ], ) -# stencil from geomtery factory does not get compute in the second case, i.e. only regional experiment fields are outputted -# hence if running global alone, it does verify but with teh additional of regional it does not @pytest.mark.datatest def test_compute_dual_edge_length(backend, grid_savepoint, grid_file, experiment, rtol): grid_geometry = grid_utils.get_grid_geometry(backend, experiment, grid_file) diff --git a/model/testing/src/icon4py/model/testing/helpers.py b/model/testing/src/icon4py/model/testing/helpers.py index 4b4ee8406..4451b50bd 100644 --- a/model/testing/src/icon4py/model/testing/helpers.py +++ b/model/testing/src/icon4py/model/testing/helpers.py @@ -112,9 +112,9 @@ def _test_validation(self, grid, backend, input_data): def _test_execution_benchmark(self, pytestconfig, grid, backend, input_data, benchmark): if self.MARKER is not None: for marker in self.MARKER: - if marker.markname == "embedded_skip": - pytest.skip("test not compatible with embedded backend") - elif marker.markname == "miss_neighbors": + # if marker.markname == "embedded_skip": + # pytest.skip("test not compatible with embedded backend") + if marker.markname == "miss_neighbors": pytest.xfail("Stencil does not support missing neighbors.") if pytestconfig.getoption( "--benchmark-disable"