Fix data download paths

model/testing/src/icon4py/model/testing/data_handling.py

@@ -36,13 +36,14 @@ def download_and_extract(uri: str, dst: pathlib.Path, data_file: str = "download
     pathlib.Path(data_file).unlink(missing_ok=True)
 
 
-def download_test_data(dst: pathlib.Path, uri: str) -> None:
+def download_test_data(dst_root: pathlib.Path, dst_subdir: pathlib.Path, uri: str) -> None:
+    dst = dst_root.joinpath(dst_subdir)
     if config.ENABLE_TESTDATA_DOWNLOAD:
         # We create and lock the *parent* directory as we later check for existence of `dst`.
-        dst.parent.mkdir(parents=True, exist_ok=True)
-        with locking.lock(dst.parent):
+        dst_root.mkdir(parents=True, exist_ok=True)
+        with locking.lock(dst_root):
             if not dst.exists():
-                download_and_extract(uri, dst)
+                download_and_extract(uri, dst_root)
     else:
         # If test data download is disabled, we check if the directory exists
         # without locking. We assume the location is managed by the user

model/testing/src/icon4py/model/testing/datatest_utils.py

@@ -52,11 +52,17 @@ def get_ranked_data_path(base_path: pathlib.Path, comm_size: int) -> pathlib.Pat
     return base_path.absolute().joinpath(f"mpitask{comm_size}")
 
 
+def get_datapath_subdir_for_experiment(
+    experiment: definitions.Experiment = definitions.Experiments.MCH_CH_R04B09,
+) -> pathlib.Path:
+    return pathlib.Path(f"{experiment.name}/ser_data")
+
+
 def get_datapath_for_experiment(
     ranked_base_path: pathlib.Path,
     experiment: definitions.Experiment = definitions.Experiments.MCH_CH_R04B09,
 ) -> pathlib.Path:
-    return ranked_base_path.joinpath(f"{experiment.name}/ser_data")
+    return ranked_base_path.joinpath(get_datapath_subdir_for_experiment(experiment))
 
 
 def create_icon_serial_data_provider(

model/testing/src/icon4py/model/testing/fixtures/datatest.py

@@ -117,9 +117,9 @@ def _download_ser_data(
 ) -> None:
     # not a fixture to be able to use this function outside of pytest
     try:
-        destination_path = dt_utils.get_datapath_for_experiment(_ranked_data_path, _experiment)
+        subdir = dt_utils.get_datapath_subdir_for_experiment(_experiment)
         uri = _experiment.partitioned_data[comm_size]
-        data.download_test_data(destination_path, uri)
+        data.download_test_data(_ranked_data_path, subdir, uri)
     except KeyError as err:
         raise RuntimeError(
             f"No data for communicator of size {comm_size} exists, use 1, 2 or 4"