From 2e948966a12467a8884fb571f34135e73b899de4 Mon Sep 17 00:00:00 2001 From: mo-laurenboon Date: Wed, 13 May 2026 08:48:18 +0100 Subject: [PATCH 1/2] #671: create initial changes --- cdds/cdds/common/plugins/cmip7/cmip7_attributes.py | 10 +--------- cdds/cdds/configure/user_config.py | 3 ++- .../test_cmip7_rlucs4co2_tavg-alh-hxy-u.py | 3 --- .../tests/test_functional/utils/configurations.py | 1 - 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/cdds/cdds/common/plugins/cmip7/cmip7_attributes.py b/cdds/cdds/common/plugins/cmip7/cmip7_attributes.py index 81ebda80f..b21566193 100644 --- a/cdds/cdds/common/plugins/cmip7/cmip7_attributes.py +++ b/cdds/cdds/common/plugins/cmip7/cmip7_attributes.py @@ -27,15 +27,7 @@ def further_info_url(self) -> str: str The further info url for CMIP7 """ - root_url = 'https://furtherinfo.es-doc.org' - further_info_url = '{}/{}.{}.{}.{}.{}.{}'.format(root_url, - self._mip_era, - self._request.metadata.institution_id, - self._request.metadata.model_id, - self._request.metadata.experiment_id, - self._request.metadata.sub_experiment_id, - self._request.metadata.variant_label) - return further_info_url + return 'none' class AttributesValidator: diff --git a/cdds/cdds/configure/user_config.py b/cdds/cdds/configure/user_config.py index 2b3b32e55..4b32d63bf 100644 --- a/cdds/cdds/configure/user_config.py +++ b/cdds/cdds/configure/user_config.py @@ -272,7 +272,8 @@ def get_global_attributes(request): Global attributes as dictionary """ global_attributes = OrderedDict() - global_attributes['further_info_url'] = get_further_info_url(request) + if request.metadata.mip_era != "CMIP7": + global_attributes['further_info_url'] = get_further_info_url(request) if request.items_global_attributes: global_attributes.update(request.items_global_attributes) return global_attributes diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py index a43dbf242..46af8640e 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py @@ -42,9 +42,6 @@ def get_test_data(self): "run_bounds": "1900-01-01T00:00:00 1900-03-01T00:00:00", "suite_id": "u-dw498", }, - global_attributes={ - "further_info_url": "https://furtherinfo.es-doc.org/CMIP7.MOHC.UKESM1-3-LL.esm-piControl.none.r1i1p1f1" - }, streams={"ap5": {"CMIP7_atmos@mon": "rlucs4co2_tavg-alh-hxy-u"}}, other={ "reference_version": "v1", diff --git a/mip_convert/mip_convert/tests/test_functional/utils/configurations.py b/mip_convert/mip_convert/tests/test_functional/utils/configurations.py index 3f14c6380..9543920f7 100644 --- a/mip_convert/mip_convert/tests/test_functional/utils/configurations.py +++ b/mip_convert/mip_convert/tests/test_functional/utils/configurations.py @@ -243,7 +243,6 @@ def cmip7_project_info(cls) -> 'ProjectInfo': 'region': "glb", 'drs_specs': 'MIP-DRS7', 'data_specs_version': 'MIP-DS7.0.0.0', - 'further_info_url': 'https://furtherinfo.es-doc.org/CMIP7.MOHC.UKCM2-0-LL.1pctCO2.none.r1i1p1f3' } ) From 004f465ef55f6a3e06ae07b2549742857829ba21 Mon Sep 17 00:00:00 2001 From: mo-laurenboon Date: Wed, 13 May 2026 15:44:52 +0100 Subject: [PATCH 2/2] #671: update reference output --- .../test_functional_cmip7/test_cmip7_fx_rootd_ti_u_hxy_lnd.py | 2 +- .../test_cmip7_fx_slthick_ti_sl_hxy_lnd.py | 2 +- .../test_functional_cmip7/test_cmip7_mon_mcd_tavg-alh-hxy-u.py | 2 +- .../test_functional_cmip7/test_cmip7_mon_uas_tavg_h10m_hxy_u.py | 2 +- .../test_cmip7_mon_zostoga_tavg_u_hm_sea.py | 2 +- .../test_cmip7_rlucs4co2_tavg-alh-hxy-u.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_rootd_ti_u_hxy_lnd.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_rootd_ti_u_hxy_lnd.py index 253864b37..a317b48c1 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_rootd_ti_u_hxy_lnd.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_rootd_ti_u_hxy_lnd.py @@ -41,7 +41,7 @@ def get_test_data(self): 'ancil': {'CMIP7_land@fx': 'rootd_ti-u-hxy-lnd'} }, other={ - 'reference_version': 'v3', + 'reference_version': 'v5', 'filenames': ['rootd_ti-u-hxy-lnd_fx_glb_g100_UKESM1-3-LL_1pctCO2_r1i1p1f3.nc'], 'ignore_history': True, } diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_slthick_ti_sl_hxy_lnd.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_slthick_ti_sl_hxy_lnd.py index f5b58e784..2ddf992d0 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_slthick_ti_sl_hxy_lnd.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_fx_slthick_ti_sl_hxy_lnd.py @@ -41,7 +41,7 @@ def get_test_data(self): 'ancil': {'CMIP7_land@fx': 'slthick_ti-sl-hxy-lnd'} }, other={ - 'reference_version': 'v3', + 'reference_version': 'v5', 'filenames': ['slthick_ti-sl-hxy-lnd_fx_glb_g100_UKESM1-3-LL_1pctCO2_r1i1p1f3.nc'], 'ignore_history': True, } diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_mcd_tavg-alh-hxy-u.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_mcd_tavg-alh-hxy-u.py index 9a2d031ae..e4da44ea9 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_mcd_tavg-alh-hxy-u.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_mcd_tavg-alh-hxy-u.py @@ -38,7 +38,7 @@ def get_test_data(self): 'ap5': {'CMIP7_atmos@mon': 'mcd_tavg-alh-hxy-u'} }, other={ - 'reference_version': 'v1', + 'reference_version': 'v3', 'filenames': ['mcd_tavg-alh-hxy-u_mon_glb_g100_UKESM1-3-LL_1pctCO2_r1i1p1f3_200001-200002.nc'], 'ignore_history': True, } diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_uas_tavg_h10m_hxy_u.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_uas_tavg_h10m_hxy_u.py index 37cad9678..ee69b605f 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_uas_tavg_h10m_hxy_u.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_uas_tavg_h10m_hxy_u.py @@ -38,7 +38,7 @@ def get_test_data(self): 'ap5': {'CMIP7_atmos@mon': 'uas_tavg-h10m-hxy-u'} }, other={ - 'reference_version': 'v5', + 'reference_version': 'v7', 'filenames': ['uas_tavg-h10m-hxy-u_mon_glb_g100_UKESM1-3-LL_1pctCO2_r1i1p1f3_196002-196003.nc'], 'ignore_history': True, } diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_zostoga_tavg_u_hm_sea.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_zostoga_tavg_u_hm_sea.py index 3a1bfbfab..4160bb2c5 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_zostoga_tavg_u_hm_sea.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_mon_zostoga_tavg_u_hm_sea.py @@ -51,7 +51,7 @@ def get_test_data(self): 'onm': '1:-1,1:-1' }, other={ - 'reference_version': 'v1', + 'reference_version': 'v3', 'filenames': ['zostoga_tavg-u-hm-sea_mon_glb_g100_UKCM2-0-LL_1pctCO2_r2i1p1f1_190001-190001.nc'], 'ignore_history': True, } diff --git a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py index 46af8640e..a8414109d 100644 --- a/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py +++ b/mip_convert/mip_convert/tests/test_functional/test_functional_cmip7/test_cmip7_rlucs4co2_tavg-alh-hxy-u.py @@ -44,7 +44,7 @@ def get_test_data(self): }, streams={"ap5": {"CMIP7_atmos@mon": "rlucs4co2_tavg-alh-hxy-u"}}, other={ - "reference_version": "v1", + "reference_version": "v3", "filenames": [ "rlucs4co2_tavg-alh-hxy-u_mon_glb_g100_UKESM1-3-LL_esm-piControl_r1i1p1f1_190001-190002.nc" ],