Merge pull request #198 from MetOffice/CDDSO-352_v2.5.3_release

CDDSO-352 v2.5.3 release

Author: matthew-mizielinski

cdds/CHANGES.rst

@@ -3,6 +3,15 @@
 
 .. include:: common.txt
 
+Release 2.5.3, November 22, 2023
+================================
+* Adaptations needed for new CMIP6Plus MIP tables (CDDSO-336, CDDSO-365)
+* Adaptations needed to support use of sub_experiment_ids that are not 
+  “none” (CDDSO-365, CDDSO-362)
+* Extract can again correctly retrieve sub-daily data (CDDSO-358)
+* The update_directives script in the per-stream suite now correctly 
+  calculate upper limits for memory / wall time / local storage (CDDSO-360)
+
 Release 2.5.2, October 18, 2023
 ===============================
 * Polar row masking is now specified directly in the MIP Convert config

cdds/cdds/__init__.py

@@ -2,6 +2,6 @@
 # Please see LICENSE.rst for license details.
 from cdds.versions import get_version
 
-_DEV = True
+_DEV = False
 _NUMERICAL_VERSION = '2.5.3'
 __version__ = get_version('cdds')

cdds/cdds/global_arguments.json

@@ -5,15 +5,15 @@
     "mass_data_class": "crum",
     "output_mass_root": "moose:/adhoc/projects/cdds/",
     "output_mass_suffix": "development",
-    "processing_workflow_branch": "cdds_2.5.2",
+    "processing_workflow_branch": "cdds_2.5.3",
     "root_ancil_dir": "${CDDS_ETC}/ancil/",
     "root_data_dir": "/project/cdds_data",
     "root_hybrid_heights_dir": "${CDDS_ETC}/vertical_coordinates",
     "root_inventory_dir": "/project/cdds/inventory/",
     "root_mip_table_dir": "${CDDS_ETC}/mip_tables/CMIP6/",
     "root_proc_dir": "/project/cdds/proc",
     "root_replacement_coordinates_dir": "${CDDS_ETC}/horizontal_coordinates/",
-    "rose_suite_branch": "tags/2.5.2",
+    "rose_suite_branch": "tags/2.5.3",
     "sites_file": "${CDDS_ETC}/cfmip2/cfmip2-sites-orog.txt",
     "skip_extract": false,
     "skip_extract_validation": false,

cdds/cdds/global_arguments_jasmin.json

@@ -1,25 +1,24 @@
 {
-    "controlled_vocabulary_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/cv/CMIP6_CVs",
-    "data_request_base_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/data_requests/CMIP6/",
+    "data_request_base_dir": "${CDDS_ETC}/data_requests/CMIP6/",
     "data_request_version": "01.00.29",
     "log_level": "logging.INFO",
     "mass_data_class": "crum",
     "output_mass_root": "",
     "output_mass_suffix": "",
-    "processing_workflow_branch": "cdds_2.5.2",
-    "root_ancil_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/ancil/",
+    "processing_workflow_branch": "cdds_2.5.3",
+    "root_ancil_dir": "${CDDS_ETC}/ancil/",
     "root_data_dir": "/project/cdds_data",
-    "root_hybrid_heights_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/vertical_coordinates",
-    "root_inventory_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/inventory/",
-    "root_mip_table_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/mip_tables/CMIP6/",
+    "root_hybrid_heights_dir": "${CDDS_ETC}/vertical_coordinates",
+    "root_inventory_dir": "${CDDS_ETC}/inventory/",
+    "root_mip_table_dir": "${CDDS_ETC}/mip_tables/CMIP6/",
     "root_proc_dir": "/project/cdds/proc",
-    "root_replacement_coordinates_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/horizontal_coordinates/",
+    "root_replacement_coordinates_dir": "${CDDS_ETC}/horizontal_coordinates/",
     "rose_suite_branch": "cdds_jasmin_2.5",
-    "sites_file": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/cfmip2/cfmip2-sites-orog.txt",
+    "sites_file": "${CDDS_ETC}/cfmip2/cfmip2-sites-orog.txt",
     "skip_extract": true,
     "skip_extract_validation": false,
     "skip_qc": false,
     "skip_transfer": true,
-    "standard_names_dir": "/gws/smf/j04/cmip6_prep/cdds-env-python3/etc/standard_names/",
+    "standard_names_dir": "${CDDS_ETC}/standard_names/",
     "user_config_template_name": "mip_convert.cfg.{}"
 }