From 7c25f95e146ac5a9d07f6729ded5135340427c3f Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Fri, 29 May 2026 12:17:57 +0000 Subject: [PATCH 1/7] #734 Add first attempt at generating grid mappings --- .../cmip7/data/grid_mapping/default_grids.cfg | 16 +- .../plugins/cmip7/data/grid_mapping/grids.cfg | 525 +++++++++++++++++- 2 files changed, 530 insertions(+), 11 deletions(-) diff --git a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/default_grids.cfg b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/default_grids.cfg index 545d61969..feebd82fd 100644 --- a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/default_grids.cfg +++ b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/default_grids.cfg @@ -1,23 +1,23 @@ [aerosol] -default = atmos native +default = atmos latlon-native [atmos] -default = atmos native +default = atmos latlon-native [atmosChem] -default = atmos native +default = atmos latlon-native [land] -default = atmos native +default = atmos latlon-native [landIce] -default = atmos native +default = atmos latlon-native [ocean] -default = ocean native +default = ocean tripolar-native [ocnBgchem] -default = ocean native +default = ocean tripolar-native [seaIce] -default = ocean native +default = ocean tripolar-native diff --git a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg index 75fa0dde3..664d4fc1d 100644 --- a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg +++ b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg @@ -1,6 +1,525 @@ +[aerosol] +abs550aer_tavg-u-hxy-u = atmos latlon-native +abs550dust_tavg-u-hxy-u = atmos latlon-native +airmass_tavg-al-hxy-u = atmos latlon-native +ccldncl_tavg-u-hxy-ccl = atmos latlon-native +cdnc_tavg-al-hxy-u = atmos latlon-native +cheaqpso4_tavg-al-hxy-u = atmos latlon-native +chegpso4_tavg-al-hxy-u = atmos latlon-native +chepsoa_tavg-u-hxy-u = atmos latlon-native +cod_tavg-u-hxy-u = atmos latlon-native +conccn_tavg-al-hxy-u = atmos latlon-native +conccn_tpt-u-hs-u = atmos latlon-native +depdust_tavg-u-hxy-u = atmos latlon-native +drydust_tavg-u-hxy-u = atmos latlon-native +ec550aer_tavg-al-hxy-u = atmos latlon-native +ec550aer_tpt-al-hxy-u = atmos latlon-native +emibc_tavg-u-hxy-u = atmos latlon-native +emidms_tavg-u-hxy-u = atmos latlon-native +emidust_tavg-u-hxy-u = atmos latlon-native +emiso2_tavg-u-hxy-u = atmos latlon-native +emiso4_tavg-u-hxy-u = atmos latlon-native +emiss_tavg-u-hxy-u = atmos latlon-native +h2o_tavg-al-hxy-u = atmos latlon-native +lwp_tavg-u-hxy-u = atmos latlon-native +mmraerh2o_tavg-h2m-hxy-u = atmos latlon-native +mmraerh2o_tpt-h2m-hs-u = atmos latlon-native +mmrbc_tavg-al-hxy-u = atmos latlon-native +mmrbc_tavg-h2m-hxy-u = atmos latlon-native +mmrbc_tpt-h2m-hs-u = atmos latlon-native +mmrdust_tavg-al-hxy-u = atmos latlon-native +mmrdust_tavg-h2m-hxy-u = atmos latlon-native +mmrdust_tpt-h2m-hs-u = atmos latlon-native +mmroa_tavg-al-hxy-u = atmos latlon-native +mmroa_tavg-h2m-hxy-u = atmos latlon-native +mmroa_tpt-h2m-hs-u = atmos latlon-native +mmrpm2p5_tavg-al-hxy-u = atmos latlon-native +mmrso4_tavg-al-hxy-u = atmos latlon-native +mmrso4_tavg-h2m-hxy-u = atmos latlon-native +mmrso4_tpt-h2m-hs-u = atmos latlon-native +mmrss_tavg-al-hxy-u = atmos latlon-native +mmrss_tavg-h2m-hxy-u = atmos latlon-native +mmrss_tpt-h2m-hs-u = atmos latlon-native +od550aer_tavg-u-hxy-u = atmos latlon-native +od550dust_tavg-u-hxy-u = atmos latlon-native +od550lt1aer_tavg-u-hxy-u = atmos latlon-native +od865aer_tavg-u-hxy-u = atmos latlon-native +reffclwtop_tavg-u-hxy-cl = atmos latlon-native +rldaf_tavg-u-hxy-u = atmos latlon-native +rldcsaf_tavg-u-hxy-u = atmos latlon-native +rluscsaf_tavg-u-hxy-u = atmos latlon-native +rlutaf_tavg-u-hxy-u = atmos latlon-native +rlutcsaf_tavg-u-hxy-u = atmos latlon-native +rsdaf_tavg-u-hxy-u = atmos latlon-native +rsdcsaf_tavg-u-hxy-u = atmos latlon-native +rsutaf_tavg-u-hxy-u = atmos latlon-native +rsutcsaf_tavg-u-hxy-u = atmos latlon-native +sfpm10_tavg-al-hxy-u = atmos latlon-native +sfpm10_tavg-h2m-hxy-u = atmos latlon-native +sfpm25_tavg-h2m-hxy-u = atmos latlon-native +so2_tavg-al-hxy-u = atmos latlon-native +so2_tavg-h2m-hxy-u = atmos latlon-native +so2_tpt-h2m-hs-u = atmos latlon-native +tatp_tavg-u-hxy-u = atmos latlon-native +ua_tavg-10hPa-hxy-air = atmos latlon-uvgrid +wa_tavg-al-hxy-u = atmos latlon-native +wetdust_tavg-u-hxy-u = atmos latlon-native +zg_tavg-10hPa-hxy-air = atmos latlon-native + +[atmosChem] +dms_tavg-al-hxy-u = atmos latlon-native + [atmos] -uas = atmos uvgrid -vas = atmos vgrid +albisccp_tavg-u-hxy-cl = atmos latlon-native +bldep_tavg-u-hxy-u = atmos latlon-native +bldep_tmax-u-hxy-u = atmos latlon-native +bldep_tmin-u-hxy-u = atmos latlon-native +cfadDbze94_tavg-h40-hxy-air = atmos latlon-native +cfadLidarsr532_tavg-h40-hxy-air = atmos latlon-native +ci_tavg-u-hxy-u = atmos latlon-native +ci_tpt-u-hs-u = atmos latlon-native +cl_tavg-al-hxy-u = atmos latlon-native +cl_tpt-al-hs-u = atmos latlon-native +clc_tavg-al-hxy-u = atmos latlon-native +clcalipso_tavg-220hPa-hxy-air = atmos latlon-native +clcalipso_tavg-560hPa-hxy-air = atmos latlon-native +clcalipso_tavg-840hPa-hxy-air = atmos latlon-native +clcalipso_tavg-h40-hxy-air = atmos latlon-native +clcalipsoice_tavg-h40-hxy-air = atmos latlon-native +clcalipsoliq_tavg-h40-hxy-air = atmos latlon-native +cldncl_tavg-u-hxy-cl = atmos latlon-native +cldnvi_tavg-u-hxy-u = atmos latlon-native +cli_tavg-al-hxy-u = atmos latlon-native +cli_tpt-al-hs-u = atmos latlon-native +clic_tavg-al-hxy-u = atmos latlon-native +clic_tpt-al-hxy-u = atmos latlon-native +climodis_tavg-u-hxy-u = atmos latlon-native +clis_tavg-al-hxy-u = atmos latlon-native +clis_tpt-al-hxy-u = atmos latlon-native +clisccp_tavg-p7c-hxy-air = atmos latlon-native +clivi_tavg-u-hxy-u = atmos latlon-native +clivi_tpt-u-hs-u = atmos latlon-native +clivi_tpt-u-hxy-u = atmos latlon-native +clivic_tavg-u-hxy-u = atmos latlon-native +clivimodis_tavg-u-hxy-u = atmos latlon-native +clmisr_tavg-h16-hxy-air = atmos latlon-native +clmodis_tavg-p7c-hxy-air = atmos latlon-native +cls_tavg-al-hxy-u = atmos latlon-native +clt_tavg-u-hxy-lnd = atmos latlon-native +clt_tavg-u-hxy-u = atmos latlon-native +clt_tpt-u-hs-u = atmos latlon-native +clt_tpt-u-hxy-u = atmos latlon-native +cltcalipso_tavg-u-hxy-u = atmos latlon-native +cltcalipso_tpt-u-hxy-u = atmos latlon-native +cltisccp_tavg-u-hxy-u = atmos latlon-native +cltmodis_tavg-u-hxy-u = atmos latlon-native +clw_tavg-al-hxy-u = atmos latlon-native +clw_tpt-al-hs-u = atmos latlon-native +clwc_tavg-al-hxy-u = atmos latlon-native +clwc_tpt-al-hxy-u = atmos latlon-native +clwmodis_tavg-u-hxy-u = atmos latlon-native +clws_tavg-al-hxy-u = atmos latlon-native +clws_tpt-al-hxy-u = atmos latlon-native +clwvi_tavg-u-hxy-u = atmos latlon-native +clwvi_tpt-u-hs-u = atmos latlon-native +clwvi_tpt-u-hxy-u = atmos latlon-native +clwvic_tavg-u-hxy-u = atmos latlon-native +clwvimodis_tavg-u-hxy-u = atmos latlon-native +epfy_tavg-p39-hy-air = atmos latlon-uvgrid +epfz_tavg-p39-hy-air = atmos latlon-uvgrid +evspsbl_tavg-u-hxy-lnd = atmos latlon-native +evspsbl_tavg-u-hxy-u = atmos latlon-native +evspsbl_tpt-u-hs-u = atmos latlon-native +hfls_tavg-u-hxy-u = atmos latlon-native +hfls_tpt-u-hs-u = atmos latlon-native +hfss_tavg-u-hxy-u = atmos latlon-native +hfss_tpt-u-hs-u = atmos latlon-native +hur_tavg-700hPa-hxy-air = atmos latlon-native +hur_tavg-al-hxy-u = atmos latlon-native +hur_tavg-p19-hxy-air = atmos latlon-native +hur_tavg-p19-hxy-u = atmos latlon-native +hur_tpt-100hPa-hxy-u = atmos latlon-native +hur_tpt-500hPa-hxy-air = atmos latlon-native +hur_tpt-850hPa-hxy-air = atmos latlon-native +hur_tpt-al-hs-u = atmos latlon-native +hurs_tavg-h2m-hxy-u = atmos latlon-native +hurs_tmax-h2m-hxy-u = atmos latlon-native +hurs_tmin-h2m-hxy-crp = atmos latlon-native +hurs_tmin-h2m-hxy-u = atmos latlon-native +hurs_tpt-h2m-hs-u = atmos latlon-native +hurs_tpt-h2m-hxy-u = atmos latlon-native +hus_tavg-al-hxy-u = atmos latlon-native +hus_tavg-p19-hxy-u = atmos latlon-native +hus_tpt-al-hs-u = atmos latlon-native +hus_tpt-al-hxy-u = atmos latlon-native +hus_tpt-p6-hxy-air = atmos latlon-native +hus_tpt-p7h-hxy-air = atmos latlon-native +huss_tavg-h2m-hxy-u = atmos latlon-native +huss_tpt-h2m-hs-u = atmos latlon-native +huss_tpt-h2m-hxy-u = atmos latlon-native +intuadse_tavg-u-hxy-u = atmos latlon-native +intuaw_tavg-u-hxy-u = atmos latlon-native +intuaw_tpt-u-hxy-u = atmos latlon-native +intvadse_tavg-u-hxy-u = atmos latlon-native +intvaw_tavg-u-hxy-u = atmos latlon-native +intvaw_tpt-u-hxy-u = atmos latlon-native +loaddust_tavg-u-hxy-u = atmos latlon-native +mc_tavg-alh-hxy-u = atmos latlon-native +mc_tpt-alh-hs-u = atmos latlon-native +mcd_tavg-alh-hxy-u = atmos latlon-native +mcu_tavg-alh-hxy-u = atmos latlon-native +parasolRefl_tavg-u-hxy-sea = atmos latlon-native +pctisccp_tavg-u-hxy-cl = atmos latlon-native +pfull_tavg-al-hxy-u = atmos latlon-native +pfull_tpt-al-hs-u = atmos latlon-native +pfull_tpt-al-hxy-u = atmos latlon-native +phalf_tavg-alh-hxy-u = atmos latlon-native +phalf_tpt-alh-hs-u = atmos latlon-native +pr_tavg-u-hxy-u = atmos latlon-native +pr_tpt-u-hs-u = atmos latlon-native +pr_tpt-u-hxy-u = atmos latlon-native +prc_tavg-u-hxy-u = atmos latlon-native +prc_tpt-u-hs-u = atmos latlon-native +prra_tavg-u-hxy-lnd = atmos latlon-native +prra_tavg-u-hxy-u = atmos latlon-native +prsn_tavg-u-hxy-u = atmos latlon-native +prsn_tpt-u-hs-u = atmos latlon-native +prsnc_tavg-u-hxy-lnd = atmos latlon-native +prw_tavg-u-hxy-u = atmos latlon-native +prw_tpt-u-hs-u = atmos latlon-native +prw_tpt-u-hxy-u = atmos latlon-native +ps_tavg-u-hxy-u = atmos latlon-native +ps_tpt-u-hs-u = atmos latlon-native +ps_tpt-u-hxy-u = atmos latlon-native +psl_tavg-u-hxy-u = atmos latlon-native +psl_tpt-u-hs-u = atmos latlon-native +psl_tpt-u-hxy-u = atmos latlon-native +ptp_tavg-u-hxy-u = atmos latlon-native +reffcclwtop_tavg-u-hxy-ccl = atmos latlon-native +reffclic_tavg-al-hxy-ccl = atmos latlon-native +reffclic_tpt-al-hs-ccl = atmos latlon-native +reffclic_tpt-al-hxy-ccl = atmos latlon-native +reffclis_tavg-al-hxy-scl = atmos latlon-native +reffclis_tpt-al-hs-scl = atmos latlon-native +reffclis_tpt-al-hxy-scl = atmos latlon-native +reffclwc_tavg-al-hxy-ccl = atmos latlon-native +reffclwc_tpt-al-hs-ccl = atmos latlon-native +reffclwc_tpt-al-hxy-ccl = atmos latlon-native +reffclws_tavg-al-hxy-scl = atmos latlon-native +reffclws_tpt-al-hs-scl = atmos latlon-native +reffclws_tpt-al-hxy-scl = atmos latlon-native +reffsclwtop_tavg-u-hxy-scl = atmos latlon-native +rld4co2_tavg-alh-hxy-u = atmos latlon-native +rld_tavg-alh-hxy-u = atmos latlon-native +rld_tpt-alh-hs-u = atmos latlon-native +rldcs4co2_tavg-alh-hxy-u = atmos latlon-native +rldcs_tavg-alh-hxy-u = atmos latlon-native +rldcs_tpt-alh-hs-u = atmos latlon-native +rlds_tavg-u-hxy-u = atmos latlon-native +rlds_tpt-u-hs-u = atmos latlon-native +rlds_tpt-u-hxy-u = atmos latlon-native +rldscs_tavg-u-hxy-u = atmos latlon-native +rldscs_tpt-u-hs-u = atmos latlon-native +rldscs_tpt-u-hxy-u = atmos latlon-native +rls_tavg-u-hxy-u = atmos latlon-native +rlu4co2_tavg-alh-hxy-u = atmos latlon-native +rlu_tavg-alh-hxy-u = atmos latlon-native +rlu_tpt-alh-hs-u = atmos latlon-native +rlucs4co2_tavg-alh-hxy-u = atmos latlon-native +rlucs_tavg-alh-hxy-u = atmos latlon-native +rlucs_tpt-alh-hs-u = atmos latlon-native +rlus_tavg-u-hxy-u = atmos latlon-native +rlus_tpt-u-hs-u = atmos latlon-native +rluscs_tavg-u-hxy-u = atmos latlon-native +rlut4co2_tavg-u-hxy-u = atmos latlon-native +rlut_tavg-u-hxy-u = atmos latlon-native +rlut_tclmdc-u-hxy-u = atmos latlon-native +rlut_tpt-u-hs-u = atmos latlon-native +rlut_tpt-u-hxy-u = atmos latlon-native +rlutcs4co2_tavg-u-hxy-u = atmos latlon-native +rlutcs_tavg-u-hxy-u = atmos latlon-native +rlutcs_tclmdc-u-hxy-u = atmos latlon-native +rlutcs_tpt-u-hs-u = atmos latlon-native +rlutcs_tpt-u-hxy-u = atmos latlon-native +rsd4co2_tavg-alh-hxy-u = atmos latlon-native +rsd_tavg-alh-hxy-u = atmos latlon-native +rsd_tpt-alh-hs-u = atmos latlon-native +rsdcs4co2_tavg-alh-hxy-u = atmos latlon-native +rsdcs_tavg-alh-hxy-u = atmos latlon-native +rsdcs_tpt-alh-hs-u = atmos latlon-native +rsds_tavg-u-hxy-u = atmos latlon-native +rsds_tpt-u-hs-u = atmos latlon-native +rsds_tpt-u-hxy-u = atmos latlon-native +rsdscs_tavg-u-hxy-u = atmos latlon-native +rsdscs_tpt-u-hs-u = atmos latlon-native +rsdscs_tpt-u-hxy-u = atmos latlon-native +rsdsdiff_tavg-u-hxy-u = atmos latlon-native +rsdt_tavg-u-hxy-u = atmos latlon-native +rsdt_tclmdc-u-hxy-u = atmos latlon-native +rsdt_tpt-u-hs-u = atmos latlon-native +rss_tavg-u-hxy-u = atmos latlon-native +rsu4co2_tavg-alh-hxy-u = atmos latlon-native +rsu_tavg-alh-hxy-u = atmos latlon-native +rsu_tpt-alh-hs-u = atmos latlon-native +rsucs4co2_tavg-alh-hxy-u = atmos latlon-native +rsucs_tavg-alh-hxy-u = atmos latlon-native +rsucs_tpt-alh-hs-u = atmos latlon-native +rsus_tavg-u-hxy-u = atmos latlon-native +rsus_tpt-u-hs-u = atmos latlon-native +rsuscs_tavg-u-hxy-u = atmos latlon-native +rsuscs_tpt-u-hs-u = atmos latlon-native +rsut4co2_tavg-u-hxy-u = atmos latlon-native +rsut_tavg-u-hxy-u = atmos latlon-native +rsut_tclmdc-u-hxy-u = atmos latlon-native +rsut_tpt-u-hs-u = atmos latlon-native +rsut_tpt-u-hxy-u = atmos latlon-native +rsutcs4co2_tavg-u-hxy-u = atmos latlon-native +rsutcs_tavg-u-hxy-u = atmos latlon-native +rsutcs_tclmdc-u-hxy-u = atmos latlon-native +rsutcs_tpt-u-hs-u = atmos latlon-native +rsutcs_tpt-u-hxy-u = atmos latlon-native +rtmt_tavg-u-hxy-u = atmos latlon-native +rtmt_tpt-u-hs-u = atmos latlon-native +rv850_tavg-850hPa-hxy-air = atmos latlon-uvgrid +rv850_tpt-850hPa-hxy-air = atmos latlon-uvgrid +sci_tavg-u-hxy-u = atmos latlon-native +sci_tpt-u-hs-u = atmos latlon-native +scldncl_tavg-u-hxy-scl = atmos latlon-native +sfcWind_tavg-h10m-hxy-u = atmos latlon-native +sfcWind_tmax-h10m-hxy-u = atmos latlon-native +sfcWind_tmaxavg-h10m-hxy-u = atmos latlon-native +sfcWind_tpt-h10m-hs-u = atmos latlon-native +snwc_tavg-u-hxy-lnd = atmos latlon-native +ta_tavg-700hPa-hxy-air = atmos latlon-native +ta_tavg-850hPa-hxy-air = atmos latlon-native +ta_tavg-al-hxy-u = atmos latlon-native +ta_tavg-p19-hxy-air = atmos latlon-native +ta_tavg-p39-hy-air = atmos latlon-native +ta_tpt-al-hs-u = atmos latlon-native +ta_tpt-al-hxy-u = atmos latlon-native +ta_tpt-p3-hxy-air = atmos latlon-native +ta_tpt-p6-hxy-air = atmos latlon-native +ta_tpt-p7h-hxy-air = atmos latlon-native +tas_tavg-h2m-hxy-u = atmos latlon-native +tas_tmax-h2m-hxy-u = atmos latlon-native +tas_tmaxavg-h2m-hxy-u = atmos latlon-native +tas_tmin-h2m-hxy-u = atmos latlon-native +tas_tminavg-h2m-hxy-u = atmos latlon-native +tas_tpt-h2m-hs-u = atmos latlon-native +tas_tpt-h2m-hxy-u = atmos latlon-native +tauu_tavg-u-hxy-u = atmos latlon-ugrid +tauu_tpt-u-hs-u = atmos latlon-ugrid +tauupbl_tavg-u-hxy-u = atmos latlon-ugrid +tauv_tavg-u-hxy-u = atmos latlon-vgrid +tauv_tpt-u-hs-u = atmos latlon-vgrid +tauvpbl_tavg-u-hxy-u = atmos latlon-vgrid +tdps_tavg-h2m-hxy-u = atmos latlon-native +tnhus_tavg-al-hxy-u = atmos latlon-native +tnhus_tpt-al-hs-u = atmos latlon-native +tnhusa_tavg-al-hxy-u = atmos latlon-native +tnhusa_tpt-al-hs-u = atmos latlon-native +tnhusc_tavg-al-hxy-u = atmos latlon-native +tnhusc_tpt-al-hs-u = atmos latlon-native +tnhusmp_tavg-al-hxy-u = atmos latlon-native +tnhusmp_tpt-al-hs-u = atmos latlon-native +tnhuspbl_tavg-al-hxy-u = atmos latlon-native +tnhuspbl_tpt-al-hs-u = atmos latlon-native +tnhusscp_tavg-al-hxy-u = atmos latlon-native +tnhusscp_tpt-al-hs-u = atmos latlon-native +tnhusscpbl_tavg-al-hxy-u = atmos latlon-native +tnhusscpbl_tpt-al-hs-u = atmos latlon-native +tnt_tavg-al-hxy-u = atmos latlon-native +tnt_tpt-al-hs-u = atmos latlon-native +tnta_tavg-al-hxy-u = atmos latlon-native +tnta_tpt-al-hs-u = atmos latlon-native +tntc_tavg-al-hxy-u = atmos latlon-native +tntc_tpt-al-hs-u = atmos latlon-native +tntmp_tavg-al-hxy-u = atmos latlon-native +tntmp_tpt-al-hs-u = atmos latlon-native +tntpbl_tavg-al-hxy-u = atmos latlon-native +tntpbl_tpt-al-hs-u = atmos latlon-native +tntr_tavg-al-hxy-u = atmos latlon-native +tntr_tpt-al-hs-u = atmos latlon-native +tntrl_tavg-al-hxy-u = atmos latlon-native +tntrl_tpt-al-hs-u = atmos latlon-native +tntrlcs_tavg-al-hxy-u = atmos latlon-native +tntrlcs_tpt-al-hs-u = atmos latlon-native +tntrs_tavg-al-hxy-u = atmos latlon-native +tntrs_tpt-al-hs-u = atmos latlon-native +tntrscs_tavg-al-hxy-u = atmos latlon-native +tntrscs_tpt-al-hs-u = atmos latlon-native +tntscp_tavg-al-hxy-u = atmos latlon-native +tntscp_tpt-al-hs-u = atmos latlon-native +tntscpbl_tavg-al-hxy-u = atmos latlon-native +tntscpbl_tpt-al-hs-u = atmos latlon-native +ts_tavg-u-hxy-u = atmos latlon-native +ts_tpt-u-hs-u = atmos latlon-native +ts_tpt-u-hxy-u = atmos latlon-native +ua_tavg-al-hxy-u = atmos latlon-ugrid +ua_tavg-p19-hxy-air = atmos latlon-uvgrid +ua_tavg-p39-hy-air = atmos latlon-uvgrid +ua_tpt-200hPa-hxy-u = atmos latlon-uvgrid +ua_tpt-al-hs-u = atmos latlon-ugrid +ua_tpt-al-hxy-u = atmos latlon-ugrid +ua_tpt-p3-hxy-air = atmos latlon-uvgrid +ua_tpt-p6-hxy-air = atmos latlon-uvgrid +ua_tpt-p7h-hxy-air = atmos latlon-uvgrid +uas_tavg-h10m-hxy-u = atmos latlon-ugrid +uas_tpt-h10m-hs-u = atmos latlon-ugrid +uas_tpt-h10m-hxy-u = atmos latlon-ugrid +utendepfd_tavg-p39-hy-air = atmos latlon-uvgrid +utendnogw_tavg-p19-hxy-air = atmos latlon-uvgrid +utendnogw_tavg-p39-hy-air = atmos latlon-uvgrid +utendogw_tavg-p19-hxy-air = atmos latlon-uvgrid +utendogw_tavg-p39-hy-air = atmos latlon-uvgrid +va_tavg-al-hxy-u = atmos latlon-vgrid +va_tavg-p19-hxy-air = atmos latlon-uvgrid +va_tavg-p39-hy-air = atmos latlon-uvgrid +va_tpt-200hPa-hxy-u = atmos latlon-uvgrid +va_tpt-al-hs-u = atmos latlon-vgrid +va_tpt-al-hxy-u = atmos latlon-vgrid +va_tpt-p3-hxy-air = atmos latlon-uvgrid +va_tpt-p6-hxy-air = atmos latlon-uvgrid +va_tpt-p7h-hxy-air = atmos latlon-uvgrid +vas_tavg-h10m-hxy-u = atmos latlon-vgrid +vas_tpt-h10m-hs-u = atmos latlon-vgrid +vas_tpt-h10m-hxy-u = atmos latlon-vgrid +vtem_tavg-p39-hy-air = atmos latlon-uvgrid +wap_tavg-500hPa-hxy-air = atmos latlon-native +wap_tavg-al-hxy-u = atmos latlon-native +wap_tavg-p19-hxy-air = atmos latlon-native +wap_tavg-p19-hxy-u = atmos latlon-native +wap_tpt-al-hs-u = atmos latlon-native +wap_tpt-p6-hxy-air = atmos latlon-native +wsg_tmax-h10m-hxy-u = atmos latlon-native +wtem_tavg-p39-hy-air = atmos latlon-uvgrid +zg_tavg-1000hPa-hxy-air = atmos latlon-native +zg_tavg-500hPa-hxy-air = atmos latlon-native +zg_tavg-al-hxy-u = atmos latlon-native +zg_tavg-p19-hxy-air = atmos latlon-native +zg_tavg-p39-hy-air = atmos latlon-native +zg_tpt-500hPa-hxy-air = atmos latlon-native +zg_tpt-700hPa-hxy-u = atmos latlon-native +zg_tpt-925hPa-hxy-u = atmos latlon-native +zg_tpt-al-hs-u = atmos latlon-native +zg_tpt-p3-hxy-air = atmos latlon-native +zg_tpt-p7h-hxy-air = atmos latlon-native +ztp_tavg-u-hxy-u = atmos latlon-native + +[landIce] +acabf_tavg-u-hxy-is = atmos latlon-native +hfdsn_tavg-u-hxy-lnd = atmos latlon-native +hfls_tavg-u-hxy-is = atmos latlon-native +hfss_tavg-u-hxy-is = atmos latlon-native +litemptop_tavg-u-hxy-is = atmos latlon-native +mrfso_tavg-u-hxy-lnd = atmos latlon-native +mrro_tavg-u-hxy-is = atmos latlon-native +rlds_tavg-u-hxy-is = atmos latlon-native +rlus_tavg-u-hxy-is = atmos latlon-native +sbl_tavg-u-hxy-is = atmos latlon-native +sbl_tavg-u-hxy-lnd = atmos latlon-native +sbl_tpt-u-hs-u = atmos latlon-native +snc_tavg-u-hxy-lnd = atmos latlon-native +snd_tavg-u-hxy-lnd = atmos latlon-native +snicem_tavg-u-hxy-is = atmos latlon-native +snm_tavg-u-hxy-is = atmos latlon-native +snm_tavg-u-hxy-lnd = atmos latlon-native +snrefr_tavg-u-hxy-is = atmos latlon-native +snw_tavg-u-hxy-lnd = atmos latlon-native +tas_tavg-h2m-hxy-is = atmos latlon-native +ts_tavg-u-hxy-is = atmos latlon-native + +[land] +evspsblpot_tavg-u-hxy-lnd = atmos latlon-native +evspsblsoi_tavg-u-hxy-lnd = atmos latlon-native +evspsblveg_tavg-u-hxy-lnd = atmos latlon-native +hfdsl_tavg-u-hxy-lnd = atmos latlon-native +mrro_tavg-u-hxy-lnd = atmos latlon-native +mrrob_tavg-u-hxy-lnd = atmos latlon-native +mrros_tavg-u-hxy-lnd = atmos latlon-native +mrsfl_tavg-sl-hxy-lnd = atmos latlon-native +mrsll_tavg-sl-hxy-lnd = atmos latlon-native +mrso_tavg-u-hxy-lnd = atmos latlon-native +mrsol_tavg-d100cm-hxy-lnd = atmos latlon-native +mrsol_tavg-d10cm-hxy-lnd = atmos latlon-native +mrsol_tavg-sl-hxy-lnd = atmos latlon-native +mrsol_tpt-d10cm-hxy-lnd = atmos latlon-native +orog_ti-u-hxy-u = atmos latlon-native +sftgif_tavg-u-hxy-u = atmos latlon-native +srfrad_tavg-u-hxy-u = atmos latlon-native +sweLut_tavg-u-hxy-multi = atmos latlon-native +tran_tavg-u-hxy-lnd = atmos latlon-native +tsl_tavg-sl-hxy-lnd = atmos latlon-native +wetlandCH4_tavg-u-hxy-lnd = atmos latlon-native +wetlandFrac_tavg-u-hxy-u = atmos latlon-native +wtd_tavg-u-hxy-lnd = atmos latlon-native [ocean] -zostoga = ocean global-mean \ No newline at end of file +bigthetao_tavg-ol-hm-sea = ocean tripolar-native +bigthetao_tavg-ol-hxy-sea = ocean tripolar-native +bigthetao_tavg-op20bar-hxy-sea = ocean tripolar-native +evspsbl_tavg-u-hxy-ifs = ocean tripolar-native +ficeberg_tavg-ol-hxy-sea = ocean tripolar-native +flandice_tavg-u-hxy-sea = ocean tripolar-native +friver_tavg-u-hxy-sea = ocean tripolar-native +hfds_tavg-u-hxy-sea = ocean tripolar-native +hfevapds_tavg-u-hxy-ifs = ocean tripolar-native +hfibthermds_tavg-ol-hxy-sea = ocean tripolar-native +hfrainds_tavg-u-hxy-ifs = ocean tripolar-native +hfrunoffds_tavg-ol-hxy-sea = ocean tripolar-native +hfsnthermds_tavg-ol-hxy-sea = ocean tripolar-native +hfx_tavg-u-hxy-sea = ocean tripolar-ugrid +hfy_tavg-u-hxy-sea = ocean tripolar-vgrid +masscello_tavg-ol-hxy-sea = ocean tripolar-native +mlotst_tavg-u-hxy-sea = ocean tripolar-native +mlotst_tmax-u-hxy-sea = ocean tripolar-native +mlotst_tmin-u-hxy-sea = ocean tripolar-native +mlotstsq_tavg-u-hxy-sea = ocean tripolar-native +msftbarot_tavg-u-hxy-sea = ocean tripolar-ugrid +pbo_tavg-u-hxy-sea = ocean tripolar-native +sfx_tavg-u-hxy-sea = ocean tripolar-ugrid +sfy_tavg-u-hxy-sea = ocean tripolar-vgrid +siflfwbot_tavg-u-hxy-sea = ocean tripolar-native +so_tavg-ol-hm-sea = ocean tripolar-native +so_tavg-ol-hxy-sea = ocean tripolar-native +sob_tavg-u-hxy-sea = ocean tripolar-native +sos_tavg-u-hm-sea = ocean tripolar-native +sos_tavg-u-hxy-sea = ocean tripolar-native +sossq_tavg-u-hxy-sea = ocean tripolar-native +t20d_tavg-u-hxy-sea = ocean tripolar-native +tauuo_tavg-u-hxy-sea = ocean tripolar-ugrid +tauvo_tavg-u-hxy-sea = ocean tripolar-vgrid +thetao_tavg-d2000m-hxy-sea = ocean tripolar-native +thetao_tavg-d300m-hxy-sea = ocean tripolar-native +thetao_tavg-d700m-hxy-sea = ocean tripolar-native +thetao_tavg-ol-hm-sea = ocean tripolar-native +thetao_tavg-ol-hxy-sea = ocean tripolar-native +thetao_tavg-op20bar-hxy-sea = ocean tripolar-native +thetaot_tavg-u-hxy-sea = ocean tripolar-native +thkcello_tavg-ol-hxy-sea = ocean tripolar-native +thkcelluo_tavg-ol-hxy-sea = ocean tripolar-ugrid +thkcellvo_tavg-ol-hxy-sea = ocean tripolar-vgrid +tos_tavg-u-hm-sea = ocean tripolar-native +tos_tavg-u-hxy-sea = ocean tripolar-native +tossq_tavg-u-hxy-sea = ocean tripolar-native +umo_tavg-ol-hxy-sea = ocean tripolar-ugrid +uo_tavg-ol-hxy-sea = ocean tripolar-ugrid +uos_tavg-u-hxy-sea = ocean tripolar-ugrid +vmo_tavg-ol-hxy-sea = ocean tripolar-vgrid +vo_tavg-ol-hxy-sea = ocean tripolar-vgrid +volcello_tavg-ol-hxy-sea = ocean tripolar-native +vos_tavg-u-hxy-sea = ocean tripolar-vgrid +wfo_tavg-u-hxy-sea = ocean tripolar-native +zos_tavg-u-hxy-sea = ocean tripolar-native +zossq_tavg-u-hxy-sea = ocean tripolar-native +zostoga_tavg-u-hm-sea = ocean tripolar-native + +[seaIce] +rlds_tavg-u-hxy-si = ocean latlon-native +rlus_tavg-u-hxy-si = ocean latlon-native +rsds_tavg-u-hxy-si = ocean latlon-native +rsus_tavg-u-hxy-si = ocean latlon-native +siconca_tavg-u-hxy-u = ocean latlon-native +sidragtop_tavg-u-hxy-si = ocean latlon-native +siflsenstop_tavg-u-hxy-si = ocean latlon-native +ts_tavg-u-hxy-si = ocean latlon-native From cbc17ae68f5a4dba1730efa2c94ed3daba23dd71 Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Fri, 29 May 2026 12:26:30 +0000 Subject: [PATCH 2/7] #734 Add new grid names and labels --- cdds/cdds/common/plugins/cmip7/cmip7_grid.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cdds/cdds/common/plugins/cmip7/cmip7_grid.py b/cdds/cdds/common/plugins/cmip7/cmip7_grid.py index 202f46ca1..d5c10d359 100644 --- a/cdds/cdds/common/plugins/cmip7/cmip7_grid.py +++ b/cdds/cdds/common/plugins/cmip7/cmip7_grid.py @@ -37,6 +37,16 @@ def from_name(cls, name: str) -> 'GridLabel': return grid_label raise KeyError('Not supported grid labels for {}'.format(name)) + LATLON_NATIVE = 'latlon-native', 'g110', False + LATLON_UVGRID = 'latlon-uvgrid', 'g115', False + LATLON_UGRID = 'latlon-ugrid', 'g108', False + LATLON_VGRID = 'latlon-vgrid', 'g109', False + + TRIPOLAR_NATIVE = 'tripolar-native', 'g126', False + TRIPOLAR_UGRID = 'tripolar-ugrid', 'g125', False + TRIPOLAR_VGRID = 'tripolar-vgrid', 'g124', False + + # Old grid labels, to be removed before merging into main. NATIVE = 'native', 'g100', False NATIVE_ZONAL = 'native-zonal', 'g100z', False REGRIDDED = 'regridded', 'g100', False From 78617f9a44ab742645f876b0d3f26a7ae3948b44 Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Tue, 9 Jun 2026 12:10:37 +0000 Subject: [PATCH 3/7] #734 Add grid labels for HH model --- cdds/cdds/common/plugins/cmip7/cmip7_grid.py | 41 +++++++++++++++++++ .../cdds/common/plugins/cmip7/cmip7_models.py | 32 +++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/cdds/cdds/common/plugins/cmip7/cmip7_grid.py b/cdds/cdds/common/plugins/cmip7/cmip7_grid.py index d5c10d359..a3bafc53f 100644 --- a/cdds/cdds/common/plugins/cmip7/cmip7_grid.py +++ b/cdds/cdds/common/plugins/cmip7/cmip7_grid.py @@ -56,3 +56,44 @@ def from_name(cls, name: str) -> 'GridLabel': UVGRID = 'uvgrid', 'g100', True UVGRID_ZONAL = 'uvgrid-zonal', 'g100z', True SITES = 'sites', 'g100', False + + +class Cmip7GridLabelHH(GridLabel): + """Represents grid labels. Each grid label consists of: + * the grid name, for example: 'native' + * the label, for example: 'gn' + * a flag to specify if label requires extra information + """ + + def __init__(self, grid_name: str, label: str, extra_info: bool) -> None: + self.grid_name = grid_name + self.label = label + self.extra_info = extra_info + + @classmethod + def from_name(cls, name: str) -> 'GridLabel': + """Returns the corresponding GridLabel enum for the grid with the given name + + Parameters + ---------- + name : str + Name of the grid + + Returns + ------- + GridLabel + Corresponding GridLabel enum + """ + for grid_label in Cmip7GridLabelHH: + if grid_label.grid_name == name.lower(): + return grid_label + raise KeyError('Not supported grid labels for {}'.format(name)) + + LATLON_NATIVE = 'latlon-native', 'g137', False + LATLON_UVGRID = 'latlon-uvgrid', 'g138', False + LATLON_UGRID = 'latlon-ugrid', 'g139', False + LATLON_VGRID = 'latlon-vgrid', 'g140', False + + TRIPOLAR_NATIVE = 'tripolar-native', 'g154', False + TRIPOLAR_UGRID = 'tripolar-ugrid', 'g155', False + TRIPOLAR_VGRID = 'tripolar-vgrid', 'g153', False diff --git a/cdds/cdds/common/plugins/cmip7/cmip7_models.py b/cdds/cdds/common/plugins/cmip7/cmip7_models.py index ac33dac22..e66d82452 100644 --- a/cdds/cdds/common/plugins/cmip7/cmip7_models.py +++ b/cdds/cdds/common/plugins/cmip7/cmip7_models.py @@ -11,6 +11,8 @@ from cdds.common.plugins.common import LoadResults from cdds.common.plugins.base.base_models import BaseModelParameters, ModelId, BaseModelStore from cdds.common.plugins.cmip7.cmip7_grid_mapping import CMIP7GridMapping +from cdds.common.plugins.cmip7.cmip7_grid import Cmip7GridLabel, Cmip7GridLabelHH +from cdds.common.plugins.grid import GridLabel class Cmip7ModelId(ModelId): @@ -71,6 +73,16 @@ def um_version(self) -> str: """ return '10.8' + def grid_labels(self) -> Type[GridLabel]: + """Returns the grid labels related to CMIP7 models. + + Returns + ------- + Cmip7GridLabel + Grid labels + """ + return Cmip7GridLabel + class UKCM2_0_LL_Params(BaseModelParameters): """Class to store the parameters for the UKCM2.0 model.""" @@ -112,6 +124,16 @@ def um_version(self) -> str: """ return '10.8' + def grid_labels(self) -> Type[GridLabel]: + """Returns the grid labels related to CMIP7 models. + + Returns + ------- + Cmip7GridLabel + Grid labels + """ + return Cmip7GridLabel + class UKCM2a_0_HH_Params(BaseModelParameters): """Class to store the parameters for the UKCM2a high res model.""" @@ -153,6 +175,16 @@ def um_version(self) -> str: """ return '10.8' + def grid_labels(self) -> Type[GridLabel]: + """Returns the grid labels related to CMIP7 models. + + Returns + ------- + Cmip7GridLabel + Grid labels + """ + return Cmip7GridLabelHH + class Cmip7ModelsStore(BaseModelStore): """Singleton class to store for each model the corresponding parameters. From 1531cc3bbb8bebe1f95a5d76fc90a7e9552096f5 Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Tue, 9 Jun 2026 12:11:13 +0000 Subject: [PATCH 4/7] #734 Remove CMIP6 labels --- cdds/cdds/common/plugins/cmip7/cmip7_grid.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cdds/cdds/common/plugins/cmip7/cmip7_grid.py b/cdds/cdds/common/plugins/cmip7/cmip7_grid.py index a3bafc53f..d6041e738 100644 --- a/cdds/cdds/common/plugins/cmip7/cmip7_grid.py +++ b/cdds/cdds/common/plugins/cmip7/cmip7_grid.py @@ -46,17 +46,6 @@ def from_name(cls, name: str) -> 'GridLabel': TRIPOLAR_UGRID = 'tripolar-ugrid', 'g125', False TRIPOLAR_VGRID = 'tripolar-vgrid', 'g124', False - # Old grid labels, to be removed before merging into main. - NATIVE = 'native', 'g100', False - NATIVE_ZONAL = 'native-zonal', 'g100z', False - REGRIDDED = 'regridded', 'g100', False - GLOBAL_MEAN = 'global-mean', 'g100', False - UGRID = 'ugrid', 'g100', True - VGRID = 'vgrid', 'g100', True - UVGRID = 'uvgrid', 'g100', True - UVGRID_ZONAL = 'uvgrid-zonal', 'g100z', True - SITES = 'sites', 'g100', False - class Cmip7GridLabelHH(GridLabel): """Represents grid labels. Each grid label consists of: From 9b13a03fa6c471e484b1bd29d5d3d1365f8cd4e2 Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Tue, 9 Jun 2026 12:23:02 +0000 Subject: [PATCH 5/7] #734 Add remaining UM variables --- .../plugins/cmip7/data/grid_mapping/grids.cfg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg index 664d4fc1d..6f6403a56 100644 --- a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg +++ b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg @@ -15,8 +15,10 @@ drydust_tavg-u-hxy-u = atmos latlon-native ec550aer_tavg-al-hxy-u = atmos latlon-native ec550aer_tpt-al-hxy-u = atmos latlon-native emibc_tavg-u-hxy-u = atmos latlon-native +emibvoc_tavg-u-hxy-u = atmos latlon-native emidms_tavg-u-hxy-u = atmos latlon-native emidust_tavg-u-hxy-u = atmos latlon-native +emiisop_tavg-u-hxy-u = atmos latlon-native emiso2_tavg-u-hxy-u = atmos latlon-native emiso4_tavg-u-hxy-u = atmos latlon-native emiss_tavg-u-hxy-u = atmos latlon-native @@ -71,6 +73,7 @@ dms_tavg-al-hxy-u = atmos latlon-native [atmos] albisccp_tavg-u-hxy-cl = atmos latlon-native +areacella_ti-u-hxy-u = atmos latlon-native bldep_tavg-u-hxy-u = atmos latlon-native bldep_tmax-u-hxy-u = atmos latlon-native bldep_tmin-u-hxy-u = atmos latlon-native @@ -125,6 +128,7 @@ clwvi_tpt-u-hs-u = atmos latlon-native clwvi_tpt-u-hxy-u = atmos latlon-native clwvic_tavg-u-hxy-u = atmos latlon-native clwvimodis_tavg-u-hxy-u = atmos latlon-native +co2mass_tavg-u-hm-u = atmos latlon-native epfy_tavg-p39-hy-air = atmos latlon-uvgrid epfz_tavg-p39-hy-air = atmos latlon-uvgrid evspsbl_tavg-u-hxy-lnd = atmos latlon-native @@ -289,6 +293,7 @@ sfcWind_tavg-h10m-hxy-u = atmos latlon-native sfcWind_tmax-h10m-hxy-u = atmos latlon-native sfcWind_tmaxavg-h10m-hxy-u = atmos latlon-native sfcWind_tpt-h10m-hs-u = atmos latlon-native +sftlf_ti-u-hxy-u = atmos latlon-native snwc_tavg-u-hxy-lnd = atmos latlon-native ta_tavg-700hPa-hxy-air = atmos latlon-native ta_tavg-850hPa-hxy-air = atmos latlon-native @@ -432,7 +437,9 @@ ts_tavg-u-hxy-is = atmos latlon-native [land] evspsblpot_tavg-u-hxy-lnd = atmos latlon-native evspsblsoi_tavg-u-hxy-lnd = atmos latlon-native +evspsblsoi_tavg-u-hxy-u = atmos latlon-native evspsblveg_tavg-u-hxy-lnd = atmos latlon-native +evspsblveg_tavg-u-hxy-u = atmos latlon-native hfdsl_tavg-u-hxy-lnd = atmos latlon-native mrro_tavg-u-hxy-lnd = atmos latlon-native mrrob_tavg-u-hxy-lnd = atmos latlon-native @@ -440,15 +447,21 @@ mrros_tavg-u-hxy-lnd = atmos latlon-native mrsfl_tavg-sl-hxy-lnd = atmos latlon-native mrsll_tavg-sl-hxy-lnd = atmos latlon-native mrso_tavg-u-hxy-lnd = atmos latlon-native +mrsofc_ti-u-hxy-lnd = atmos latlon-native mrsol_tavg-d100cm-hxy-lnd = atmos latlon-native mrsol_tavg-d10cm-hxy-lnd = atmos latlon-native mrsol_tavg-sl-hxy-lnd = atmos latlon-native mrsol_tpt-d10cm-hxy-lnd = atmos latlon-native orog_ti-u-hxy-u = atmos latlon-native +rootd_ti-u-hxy-lnd = atmos latlon-native sftgif_tavg-u-hxy-u = atmos latlon-native +sftgif_ti-u-hxy-u = atmos latlon-native +sftlaf_ti-u-hxy-u = atmos latlon-native +slthick_ti-sl-hxy-lnd = atmos latlon-native srfrad_tavg-u-hxy-u = atmos latlon-native sweLut_tavg-u-hxy-multi = atmos latlon-native tran_tavg-u-hxy-lnd = atmos latlon-native +tran_tavg-u-hxy-u = atmos latlon-native tsl_tavg-sl-hxy-lnd = atmos latlon-native wetlandCH4_tavg-u-hxy-lnd = atmos latlon-native wetlandFrac_tavg-u-hxy-u = atmos latlon-native @@ -514,6 +527,9 @@ zos_tavg-u-hxy-sea = ocean tripolar-native zossq_tavg-u-hxy-sea = ocean tripolar-native zostoga_tavg-u-hm-sea = ocean tripolar-native +[ocnBgchem] +fgdms_tavg-u-hxy-sea = ocean latlon-native + [seaIce] rlds_tavg-u-hxy-si = ocean latlon-native rlus_tavg-u-hxy-si = ocean latlon-native @@ -523,3 +539,4 @@ siconca_tavg-u-hxy-u = ocean latlon-native sidragtop_tavg-u-hxy-si = ocean latlon-native siflsenstop_tavg-u-hxy-si = ocean latlon-native ts_tavg-u-hxy-si = ocean latlon-native + From d5ce029c1b5b4bbb295a2c7b21be49ca610abed0 Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Mon, 15 Jun 2026 10:08:11 +0000 Subject: [PATCH 6/7] #734 Use branded variable name for grid label --- cdds/cdds/common/grids.py | 4 ---- cdds/cdds/common/plugins/cmip7/cmip7_models.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cdds/cdds/common/grids.py b/cdds/cdds/common/grids.py index cb522ee6e..8dc1f1141 100644 --- a/cdds/cdds/common/grids.py +++ b/cdds/cdds/common/grids.py @@ -135,11 +135,7 @@ def retrieve_grid_objects(variable_name: str, mip_table_id: str, model: str) -> plugin = PluginStore.instance().get_plugin() grids_mapping = plugin.models_parameters(model).grids_mapping() - if "_" in variable_name: - variable_name = variable_name.split("_")[0] - grid_type, grid_name = grids_mapping.retrieve_mapping(variable_name, mip_table_id) - grid = None if grid_type is not None and grid_name is not None: grid = Grid(model, grid_type, grid_name) diff --git a/cdds/cdds/common/plugins/cmip7/cmip7_models.py b/cdds/cdds/common/plugins/cmip7/cmip7_models.py index e66d82452..57be82fa0 100644 --- a/cdds/cdds/common/plugins/cmip7/cmip7_models.py +++ b/cdds/cdds/common/plugins/cmip7/cmip7_models.py @@ -6,7 +6,7 @@ import logging import os -from typing import List +from typing import List, Type from cdds.common.plugins.common import LoadResults from cdds.common.plugins.base.base_models import BaseModelParameters, ModelId, BaseModelStore From ac52206f8745b8d2733d8595785b71f6ee808908 Mon Sep 17 00:00:00 2001 From: Jared Drayton <68954395+mo-jareddrayton@users.noreply.github.com> Date: Mon, 15 Jun 2026 13:05:39 +0000 Subject: [PATCH 7/7] #734 Change sea ice grid name to atmos --- .../plugins/cmip7/data/grid_mapping/grids.cfg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg index 6f6403a56..08dd12449 100644 --- a/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg +++ b/cdds/cdds/common/plugins/cmip7/data/grid_mapping/grids.cfg @@ -528,15 +528,15 @@ zossq_tavg-u-hxy-sea = ocean tripolar-native zostoga_tavg-u-hm-sea = ocean tripolar-native [ocnBgchem] -fgdms_tavg-u-hxy-sea = ocean latlon-native +fgdms_tavg-u-hxy-sea = atmos latlon-native [seaIce] -rlds_tavg-u-hxy-si = ocean latlon-native -rlus_tavg-u-hxy-si = ocean latlon-native -rsds_tavg-u-hxy-si = ocean latlon-native -rsus_tavg-u-hxy-si = ocean latlon-native -siconca_tavg-u-hxy-u = ocean latlon-native -sidragtop_tavg-u-hxy-si = ocean latlon-native -siflsenstop_tavg-u-hxy-si = ocean latlon-native -ts_tavg-u-hxy-si = ocean latlon-native +rlds_tavg-u-hxy-si = atmos latlon-native +rlus_tavg-u-hxy-si = atmos latlon-native +rsds_tavg-u-hxy-si = atmos latlon-native +rsus_tavg-u-hxy-si = atmos latlon-native +siconca_tavg-u-hxy-u = atmos latlon-native +sidragtop_tavg-u-hxy-si = atmos latlon-native +siflsenstop_tavg-u-hxy-si = atmos latlon-native +ts_tavg-u-hxy-si = atmos latlon-native