remove the duplication of fixtures

model/driver/tests/driver/fixtures.py

@@ -30,6 +30,7 @@
     model_top_height,
     ndyn_substeps,
     processor_props,
+    savepoint_diffusion_exit,
     savepoint_nonhydro_exit,
     savepoint_nonhydro_init,
     savepoint_nonhydro_step_final,
@@ -108,21 +109,8 @@ def timeloop_diffusion_savepoint_init(
 
 
 @pytest.fixture
-def timeloop_diffusion_savepoint_exit(
-    data_provider,  # imported fixtures data_provider`
-    step_date_exit,  # imported fixtures step_date_exit`
-    timeloop_diffusion_linit_exit,
-):
-    """
-    Load data from ICON savepoint at exist of diffusion module.
-
-    date of the timestamp to be selected can be set seperately by overriding the 'timeloop_date'
-    fixture, passing 'step_data=<iso_string>'
-    """
-    sp = data_provider.from_savepoint_diffusion_exit(
-        linit=timeloop_diffusion_linit_exit, date=step_date_exit
-    )
-    return sp
+def linit(timeloop_diffusion_linit_exit: bool) -> bool:
+    return timeloop_diffusion_linit_exit
 
 
 @pytest.fixture

model/driver/tests/driver/integration_tests/test_icon4py.py

@@ -113,7 +113,7 @@ def test_run_timeloop_single_step(
     damping_height: float,
     ndyn_substeps: int,
     timeloop_diffusion_savepoint_init: sb.IconDiffusionInitSavepoint,
-    timeloop_diffusion_savepoint_exit: sb.IconDiffusionExitSavepoint,
+    savepoint_diffusion_exit: sb.IconDiffusionExitSavepoint,
     savepoint_velocity_init: sb.IconVelocityInitSavepoint,
     savepoint_nonhydro_init: sb.IconNonHydroInitSavepoint,
     savepoint_nonhydro_exit: sb.IconNonHydroExitSavepoint,
@@ -355,10 +355,10 @@ def test_run_timeloop_single_step(
     )
 
     rho_sp = savepoint_nonhydro_exit.rho_new()
-    exner_sp = timeloop_diffusion_savepoint_exit.exner()
-    theta_sp = timeloop_diffusion_savepoint_exit.theta_v()
-    vn_sp = timeloop_diffusion_savepoint_exit.vn()
-    w_sp = timeloop_diffusion_savepoint_exit.w()
+    exner_sp = savepoint_diffusion_exit.exner()
+    theta_sp = savepoint_diffusion_exit.theta_v()
+    vn_sp = savepoint_diffusion_exit.vn()
+    w_sp = savepoint_diffusion_exit.w()
 
     assert test_utils.dallclose(
         prognostic_states.current.vn.asnumpy(),

model/standalone_driver/tests/standalone_driver/fixtures.py

@@ -7,7 +7,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 import pytest
 
-from icon4py.model.testing import serialbox
 from icon4py.model.testing.fixtures import (
     damping_height,
     data_provider,
@@ -26,6 +25,7 @@
     model_top_height,
     ndyn_substeps,
     processor_props,
+    savepoint_diffusion_exit,
     savepoint_nonhydro_exit,
     savepoint_nonhydro_init,
     savepoint_nonhydro_step_final,
@@ -35,21 +35,8 @@
     stretch_factor,
     top_height_limit_for_maximal_layer_thickness,
 )
-from icon4py.model.testing.serialbox import IconDiffusionExitSavepoint
 
 
 @pytest.fixture
-def timeloop_diffusion_savepoint_exit_standalone(
-    data_provider: serialbox.IconSerialDataProvider,
-    step_date_exit: str,
-    timeloop_diffusion_linit_exit: bool,
-) -> IconDiffusionExitSavepoint:
-    """
-    Load data from ICON savepoint at exit of diffusion module.
-
-    date of the timestamp to be selected can be set seperately by overriding the 'timeloop_date'
-    fixture, passing 'step_data=<iso_string>'
-    """
-    return data_provider.from_savepoint_diffusion_exit(
-        linit=timeloop_diffusion_linit_exit, date=step_date_exit
-    )
+def linit(timeloop_diffusion_linit_exit: bool) -> bool:
+    return timeloop_diffusion_linit_exit

model/standalone_driver/tests/standalone_driver/integration_tests/test_standalone_driver.py

@@ -45,7 +45,7 @@ def test_standalone_driver(
     tmp_path: pathlib.Path,
     savepoint_nonhydro_exit: sb.IconNonHydroExitSavepoint,
     substep_exit: int,
-    timeloop_diffusion_savepoint_exit_standalone: sb.IconDiffusionExitSavepoint,
+    savepoint_diffusion_exit: sb.IconDiffusionExitSavepoint,
 ) -> None:
     backend_name = next(
         (k for k, v in model_backends.BACKENDS.items() if backend_like == v), "embedded"
@@ -59,10 +59,10 @@ def test_standalone_driver(
     )
 
     rho_sp = savepoint_nonhydro_exit.rho_new()
-    exner_sp = timeloop_diffusion_savepoint_exit_standalone.exner()
-    theta_sp = timeloop_diffusion_savepoint_exit_standalone.theta_v()
-    vn_sp = timeloop_diffusion_savepoint_exit_standalone.vn()
-    w_sp = timeloop_diffusion_savepoint_exit_standalone.w()
+    exner_sp = savepoint_diffusion_exit.exner()
+    theta_sp = savepoint_diffusion_exit.theta_v()
+    vn_sp = savepoint_diffusion_exit.vn()
+    w_sp = savepoint_diffusion_exit.w()
     assert test_utils.dallclose(
         ds.prognostics.current.vn.asnumpy(),
         vn_sp.asnumpy(),