Using explicit project

Author: NParsonsMO

CMEW/app/add_datasets/bin/add_datasets_to_share.py

@@ -99,7 +99,7 @@ def convert_str_to_facets(section):
     return section_dict
 
 
-def add_common_facets(dataset_dict, project="CMIP6"):
+def add_common_facets(dataset_dict, project):
     """
     Add start year, end year and project to a dataset dictionary.
 
@@ -109,7 +109,6 @@ def add_common_facets(dataset_dict, project="CMIP6"):
         A dictionary containing the facets of a dataset.
     project: str
         A string indicating the project to which the dataset belongs.
-        Default is "CMIP6".
 
     Returns
     -------
@@ -127,10 +126,14 @@ def add_common_facets(dataset_dict, project="CMIP6"):
     dataset_dict["end_year"] = end_year
     dataset_dict["project"] = project
 
+    # Add MOHC as an institute only for generated CMEW runs
+    if dataset_dict["project"] == "ESMVal":
+        dataset_dict["institute"] = "MOHC"
+
     return dataset_dict
 
 
-def process_naml_file(naml_fp):
+def process_naml_file(naml_fp, project=None):
     """
     Extract the datasets and their facets from a namelist file.
 
@@ -148,7 +151,7 @@ def process_naml_file(naml_fp):
     sections = extract_sections_from_naml(naml_fp)
     for section in sections:
         dataset_dict = convert_str_to_facets(section)
-        dataset_dict = add_common_facets(dataset_dict)
+        dataset_dict = add_common_facets(dataset_dict, project)
         datasets.append(dataset_dict)
     return datasets
 
@@ -235,8 +238,20 @@ def dict_namelists_in_work_dir():
     # Loop over the namelist files in the work directory
     for basename, nl_fp in dict_namelists_in_work_dir().items():
 
-        # Extract the datasets from each file
-        datasets = process_naml_file(nl_fp)
+        # Check if it's model runs
+        if basename == "model_runs":
+
+            # Extract the datasets from each file
+            datasets = process_naml_file(nl_fp, "ESMVal")
+
+            # Write the datasets to a YAML file in the target directory
+            write_datasets_to_yaml(datasets, basename, target_dir)
+
+        # Check if it's CMIP6:
+        if basename == "cmip6_datasets":
+
+            # Extract the datasets from each file
+            datasets = process_naml_file(nl_fp, "CMIP6")
 
-        # Write the datasets to a YAML file in the target directory
-        write_datasets_to_yaml(datasets, basename, target_dir)
+            # Write the datasets to a YAML file in the target directory
+            write_datasets_to_yaml(datasets, basename, target_dir)

CMEW/app/add_datasets/bin/test_add_datasets_to_share.py

@@ -120,7 +120,7 @@ def test_add_common_facets(mock_env_vars):
         "project": "CMIP6",
     }
 
-    actual = add_common_facets(dataset_dict)
+    actual = add_common_facets(dataset_dict, "CMIP6")
     assert actual == expected
 
 
@@ -148,7 +148,7 @@ def test_process_naml_file(path_to_mock_nl, mock_env_vars):
         },
     ]
 
-    actual = process_naml_file(path_to_mock_nl)
+    actual = process_naml_file(path_to_mock_nl, "CMIP6")
     assert actual == expected