cdds workflow directory can be indepent from other model/experiment/variant

runs and to be consistent with how it is with cdds 2.5.5.

Author: mo-johnmo

CMEW/app/configure_standardise/bin/create_request_file.py

@@ -31,12 +31,13 @@ def create_request():
     root_proc_dir = os.environ["ROOT_PROC_DIR"]
     root_data_dir = os.environ["ROOT_DATA_DIR"]
     variables_path = os.environ["VARIABLES_PATH"]
+    experiment_id = "amip"
+    variant_label = "r1i1p1f1"
 
     start_datetime = f"{start_year}-01-01T00:00:00Z"
     end_year = int(start_year) + int(number_of_years)
     end_datetime = f"{end_year}-01-01T00:00:00Z"
     base_date = "1850-01-01T00:00:00Z"
-    # time_units = "days since " + base_date
     mip_table_v = "0.0.23"
     mip_table_dir = "$CDDS_ETC" + "/mip_tables/GCModelDev/" + mip_table_v
 
@@ -45,26 +46,30 @@ def create_request():
         "branch_method": "no parent",
         "base_date": base_date,
         "calendar": calendar,
-        "experiment_id": "amip",
+        "experiment_id": experiment_id,
         "institution_id": institution_id,
         "license": "GCModelDev model data is licensed under the Open Government License v3 (https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/)",  # noqa: E501
         "mip": "ESMVal",
         "mip_era": "GCModelDev",
         "sub_experiment_id": "none",
-        "variant_label": "r1i1p1f1",
+        "variant_label": variant_label,
         "model_id": model_id,
         "model_type": "AGCM AER",
     }  # end metadata
     request["netcdf_global_attributes"] = {
-        # This is needed for CDDS 3.0.6 but may not be needed with 3.1+, to be
+        # This is needed for CDDS 3.0.6 but may not be needed with 3.1+. To be
         # ascertained by follow-up discussion and testing.
         "parent_experiment_id": "no parent",
     }
     request["common"] = {
         "mip_table_dir": mip_table_dir,
         "mode": "relaxed",
         "package": "round-1",
-        "workflow_basename": "CMEW",
+        "workflow_basename": model_id
+        + "_"
+        + experiment_id
+        + "_"
+        + variant_label,
         "root_proc_dir": root_proc_dir,
         "root_data_dir": root_data_dir,
         "root_ancil_dir": "$CDDS_ETC/" + "ancil",

CMEW/app/configure_standardise/bin/test_create_request_file.py

@@ -20,6 +20,8 @@ def monkey_env(monkeypatch):
     monkeypatch.setenv("CALENDAR", "360_day")
     monkeypatch.setenv("INSTITUTION_ID", "MOHC")
     monkeypatch.setenv("SUITE_ID", "u-az513")
+    monkeypatch.setenv("EXPERIMENT_ID", "amip")
+    monkeypatch.setenv("VARIANT_LABEL", "r1i1p1f1")
     monkeypatch.setenv("ROOT_PROC_DIR", "~/cylc-run/CMEW/runX/share/proc")
     monkeypatch.setenv("ROOT_DATA_DIR", "~/cylc-run/CMEW/runX/share/data")
     monkeypatch.setenv(
@@ -79,6 +81,8 @@ def expected_config():
     root_proc_dir = os.environ["ROOT_PROC_DIR"]
     root_data_dir = os.environ["ROOT_DATA_DIR"]
     variables_path = os.environ["VARIABLES_PATH"]
+    experiment_id = os.environ["EXPERIMENT_ID"]
+    variant_label = os.environ["VARIANT_LABEL"]
 
     start_datetime = f"{start_year}-01-01T00:00:00Z"
     end_year = int(start_year) + int(number_of_years)
@@ -92,13 +96,13 @@ def expected_config():
         "branch_method": "no parent",
         "base_date": base_date,
         "calendar": calendar,
-        "experiment_id": "amip",
+        "experiment_id": experiment_id,
         "institution_id": institution_id,
         "license": "GCModelDev model data is licensed under the Open Government License v3 (https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/)",  # noqa: E501
         "mip": "ESMVal",
         "mip_era": "GCModelDev",
         "sub_experiment_id": "none",
-        "variant_label": "r1i1p1f1",
+        "variant_label": variant_label,
         "model_id": model_id,
         "model_type": "AGCM AER",
     }  # end metadata
@@ -109,7 +113,11 @@ def expected_config():
         "mip_table_dir": mip_table_dir,
         "mode": "relaxed",
         "package": "round-1",
-        "workflow_basename": "CMEW",
+        "workflow_basename": model_id
+        + "_"
+        + experiment_id
+        + "_"
+        + variant_label,
         "root_proc_dir": root_proc_dir,
         "root_data_dir": root_data_dir,
         "root_ancil_dir": "$CDDS_ETC/" + "ancil",