changes following PR review; not affecting the code

Author: mo-nikosbaltas

CMEW/app/configure_standardise/bin/configure_standardise.sh

@@ -3,29 +3,9 @@
 # The LICENSE.md file contains full licensing details.
 # Send the output from 'set -x' to 'stdout' rather than 'stderr'.
 BASH_XTRACEFD=1
-set -xeu
+set -eux
 
-# We support two-model metadata via REF_* + non-REF vars.
-# Decide which set must be present based on RUN_LABEL.
-REF_SUITE_ID="${REF_SUITE_ID:-}"
-SUITE_ID="${SUITE_ID:-}"
-
-# ---------------------------------------------------------------------------
-# 1. Create variables.txt
-# ---------------------------------------------------------------------------
-echo "[INFO] Creating variables file from ESMValTool recipe"
 cmew-esmvaltool-env create_variables_file.py
-
-echo "[INFO] Running configure_standardise for RUN_LABEL=${RUN_LABEL}"
-
-test -f "${VARIABLES_PATH}" || {
-  echo "[ERROR] variables file missing: ${VARIABLES_PATH}" >&2
-  exit 2
-}
-
-# ---------------------------------------------------------------------------
-# 2. Create request and configure CDDS conversion workflow
-# ---------------------------------------------------------------------------
 cmew-esmvaltool-env create_request_file.py
 cmew-standardise-env create_cdds_directory_structure "${REQUEST_PATH}"
 cmew-standardise-env prepare_generate_variable_list "${REQUEST_PATH}"

CMEW/app/configure_standardise/bin/create_request_file.py

@@ -19,9 +19,10 @@
   - VARIANT_LABEL
 
 Selection rule:
-- RUN_LABEL must be set and must match either REF_SUITE_ID or SUITE_ID.
-- If RUN_LABEL == REF_SUITE_ID -> use REF_* metadata.
-- If RUN_LABEL == SUITE_ID     -> use non-REF metadata.
+- CYLC_TASK_PARAM_dataset must be set and must match either REF_SUITE_ID
+  or SUITE_ID.
+- If CYLC_TASK_PARAM_dataset == REF_SUITE_ID -> use REF_* metadata.
+- If CYLC_TASK_PARAM_dataset == SUITE_ID     -> use non-REF metadata.
 
 Naming requirement:
 - ALWAYS set workflow_basename = suite_id so CDDS paths are cdds_<suite_id>.
@@ -36,17 +37,20 @@
 
 def create_request():
     """
-    Build a CDDS request configuration for the run identified by RUN_LABEL.
+    Build a CDDS request configuration for the run identified by
+    CYLC_TASK_PARAM_dataset.
 
     The function expects a two-run CMEW configuration to be present in the
     environment: one reference run (REF_*) and
                  one evaluation run (MODEL_ID/SUITE_ID/...).
 
     Behaviour:
     - Reads all required metadata directly from environment variables.
-    - Selects the reference or evaluation metadata according to RUN_LABEL.
+    - Selects the reference or evaluation metadata according to
+      CYLC_TASK_PARAM_dataset.
     - Raises KeyError if a required environment variable is missing.
-    - Raises KeyError if RUN_LABEL matches neither REF_SUITE_ID nor SUITE_ID.
+    - Raises KeyError if CYLC_TASK_PARAM_dataset matches neither
+      REF_SUITE_ID nor SUITE_ID.
 
     Returns
     -------
@@ -78,7 +82,7 @@ def create_request():
     variant_label = os.environ["VARIANT_LABEL"]
 
     # Must be set in two-run mode
-    run_label = os.environ["RUN_LABEL"].strip()
+    run_label = os.environ["CYLC_TASK_PARAM_dataset"].strip()
 
     ref_experiment_id = (
         os.environ.get("REF_EXPERIMENT_ID", "amip").strip() or "amip"
@@ -99,9 +103,9 @@ def create_request():
         chosen_experiment_id = experiment_id
     else:
         raise KeyError(
-            "RUN_LABEL must match REF_SUITE_ID or SUITE_ID. "
-            f"Got RUN_LABEL='{run_label}', REF_SUITE_ID='{ref_suite_id}',"
-            f"SUITE_ID='{suite_id}'."
+            "CYLC_TASK_PARAM_dataset must match REF_SUITE_ID or SUITE_ID. "
+            f"Got CYLC_TASK_PARAM_dataset='{run_label}', "
+            f"REF_SUITE_ID='{ref_suite_id}', SUITE_ID='{suite_id}'."
         )
 
     # Requirement: ALWAYS use suite_id for basename (so cdds_<suite_id>)

CMEW/app/configure_standardise/bin/test_create_request_file.py

@@ -7,7 +7,7 @@
 
 def test_create_request(monkeypatch):
     # Two-run only: must set BOTH eval and ref environment variables
-    # and must set RUN_LABEL to select which request to generate.
+    # and must set CYLC_TASK_PARAM_dataset to select which request to generate.
 
     # Shared / common env
     monkeypatch.setenv("START_YEAR", "1993")
@@ -33,7 +33,7 @@ def test_create_request(monkeypatch):
     monkeypatch.setenv("REF_VARIANT_LABEL", "r5i1p1f3")
 
     # Select EVAL branch explicitly
-    monkeypatch.setenv("RUN_LABEL", "u-az513")
+    monkeypatch.setenv("CYLC_TASK_PARAM_dataset", "u-az513")
 
     config = create_request()
     actual = {

CMEW/app/restructure_dirs/bin/restructure_dirs.sh

@@ -3,7 +3,7 @@
 # The LICENSE.md file contains full licensing details.
 # Send the output from 'set -x' to 'stdout' rather than 'stderr'.
 BASH_XTRACEFD=1
-set -xeu
+set -eux
 
 RESTRUCTURE_COMMAND="${CDDS_SOFTWARE_DIR}/ceda-mip-tools/bin/restructure_for_cmip6"
 ROOT_RESTRUCTURED_DIR="${CYLC_WORKFLOW_SHARE_DIR}/work/"

CMEW/app/standardise_model_data/bin/standardise_model_data.sh

@@ -4,14 +4,6 @@
 # Standardise data for both REF and EVAL runs via CDDS.
 
 BASH_XTRACEFD=1
-set -xeu
-
-: "${RUN_LABEL:?RUN_LABEL must be set (ref/eval)}"
-: "${REQUEST_PATH:?REQUEST_PATH must be set}"
-
-echo "[INFO] Running standardise_model_data for RUN_LABEL=${RUN_LABEL}"
-echo "[INFO] Using request: ${REQUEST_PATH}"
+set -eux
 
 cmew-standardise-env cdds_convert "${REQUEST_PATH}"
-
-echo "[INFO] standardise_model_data completed for ${RUN_LABEL}"

CMEW/flow.cylc

@@ -64,7 +64,6 @@
 
     [[PER_DATASET]]
         [[[environment]]]
-            RUN_LABEL = ${CYLC_TASK_PARAM_dataset}
             REQUEST_PATH = ${CYLC_WORKFLOW_SHARE_DIR}/etc/request_${CYLC_TASK_PARAM_dataset}.cfg
             VARIABLES_PATH = ${CYLC_WORKFLOW_SHARE_DIR}/etc/variables_${CYLC_TASK_PARAM_dataset}.txt