diff --git a/changelog/554.fix.md b/changelog/554.fix.md new file mode 100644 index 000000000..adc938a9e --- /dev/null +++ b/changelog/554.fix.md @@ -0,0 +1 @@ +Applied version filtering to dataset queries and fixed supplementary dataset selection to pick a single dataset per matching group. This eliminates spurious experiment and version entries from regression analysis results. diff --git a/packages/climate-ref-core/src/climate_ref_core/constraints.py b/packages/climate-ref-core/src/climate_ref_core/constraints.py index 9c94ccdf3..05867c87c 100644 --- a/packages/climate-ref-core/src/climate_ref_core/constraints.py +++ b/packages/climate-ref-core/src/climate_ref_core/constraints.py @@ -248,16 +248,19 @@ def apply( facets = matching_facets + list(self.optional_matching_facets) datasets = group[facets].drop_duplicates() select = pd.Series(False, index=supplementary_group.index) - for i in range(len(datasets)): - dataset = datasets.iloc[i] - # Restrict the supplementary datasets to those that match the main dataset. + for _, main_group_df in datasets.groupby(matching_facets): + # Restrict the supplementary datasets to those that match this group. + first_row = main_group_df.iloc[0] supplementaries = supplementary_group[ - (supplementary_group[matching_facets] == dataset[matching_facets]).all(axis="columns") + (supplementary_group[matching_facets] == first_row[matching_facets]).all(axis="columns") ] if not supplementaries.empty: - # Select the best matching supplementary dataset based on the optional matching facets. - scores = (supplementaries[facets] == dataset).sum(axis="columns") - supplementaries = supplementaries[scores == scores.max()] + # Score each candidate against ALL main datasets in this group, take max score. + best_scores = pd.Series(0, index=supplementaries.index, dtype=int) + for i in range(len(main_group_df)): + scores = (supplementaries[facets] == main_group_df.iloc[i]).sum(axis="columns") + best_scores = best_scores.combine(scores, max) + supplementaries = supplementaries[best_scores == best_scores.max()] if "version" in supplementaries.columns: # Select the latest version if there are multiple matches supplementaries = supplementaries[ diff --git a/packages/climate-ref-core/tests/unit/test_constraints.py b/packages/climate-ref-core/tests/unit/test_constraints.py index 26c2b1e4c..f7e0faa75 100644 --- a/packages/climate-ref-core/tests/unit/test_constraints.py +++ b/packages/climate-ref-core/tests/unit/test_constraints.py @@ -280,7 +280,7 @@ def test_from_defaults_cmip7_matching_facets(self): "version": ["v20210316", "v20220101", "v20210316", "v20210316"], } ), - [0, 2, 1, 3], + [0, 2, 1], ), ], ) @@ -471,13 +471,8 @@ def test_duplicate_supplementary_index(self): group = data_catalog[data_catalog["variable_id"] == "tas"] result = self.constraint.apply(group=group, data_catalog=data_catalog) - # Both tas rows plus all three areacella rows - expected = pd.concat( - [ - data_catalog.iloc[[0, 1]], - data_catalog.iloc[[2, 3, 4]], - ] - ) + # Both tas rows plus the 1pctCO2 areacella rows (best max-score, first-group tiebreak) + expected = data_catalog.iloc[[0, 1, 2, 3]] assert_frame_equal(result, expected) diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_at_global_warming_levels_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_at_global_warming_levels_.yml index 0c3f3c7da..05fa93452 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_at_global_warming_levels_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_at_global_warming_levels_.yml @@ -1,11 +1,8 @@ cmip6_ssp126: cmip6: - - CMIP6.C4MIP CDRMIP.MIROC.MIROC-ES2L.esm-1pct-brch-1000PgC.r1i1p1f2.fx.areacella.gn.v20200622 - - CMIP6.C4MIP CDRMIP.NCC.NorESM2-LM.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.pr.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.tas.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.fx.areacella.gn.v20200624 - - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191015 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.pr.gn.v20200511 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.tas.gn.v20200720 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.fx.areacella.gn.v20191015 @@ -18,34 +15,27 @@ cmip6_ssp126: - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.pr.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.tas.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.fx.areacella.gn.v20210615 - - CMIP6.CMIP.CCCma.CanESM5-1.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5-CanOE.1pctCO2.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.pr.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.tas.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.fx.areacella.gn.v20200616 - - CMIP6.CMIP.CMCC.CMCC-ESM2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.pr.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.tas.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.fx.areacella.gn.v20210114 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.1pctCO2.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.pr.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.tas.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.pr.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.tas.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.fx.areacella.gr.v20180917 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.1pctCO2.r1i1p1f2.fx.areacella.gr.v20181018 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r13i1p1f2.fx.areacella.gr.v20250328 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.pr.gr.v20181206 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.tas.gr.v20181206 @@ -55,7 +45,6 @@ cmip6_ssp126: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.fx.areacella.gn.v20191115 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.1pctCO2.r1i1p1f1.fx.areacella.gr.v20220428 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.pr.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.tas.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.fx.areacella.gr.v20200217 @@ -67,11 +56,9 @@ cmip6_ssp126: - CMIP6.CMIP.INM.INM-CM4-8.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.pr.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.tas.gr1.v20190530 - - CMIP6.CMIP.INM.INM-CM5-0.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190820 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.pr.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.tas.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.fx.areacella.gr1.v20190610 - - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.1pctCO2.r1i1p1f1.fx.areacella.gr.v20201218 - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.historical.r1i1p1f1.Amon.pr.gr.v20200729 - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.historical.r1i1p1f1.Amon.tas.gr.v20200729 - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.historical.r1i1p1f1.fx.areacella.gr.v20200729 @@ -80,7 +67,6 @@ cmip6_ssp126: - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.fx.areacella.gr.v20180803 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 - - CMIP6.CMIP.MIROC.MIROC-ES2L.1pctCO2.r1i1p1f2.fx.areacella.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.fx.areacella.gn.v20190823 @@ -95,32 +81,26 @@ cmip6_ssp126: - CMIP6.CMIP.MOHC.UKESM1-0-LL.historical.r1i1p1f2.Amon.tas.gn.v20190406 - CMIP6.CMIP.MOHC.UKESM1-1-LL.historical.r1i1p1f2.Amon.pr.gn.v20220512 - CMIP6.CMIP.MOHC.UKESM1-1-LL.historical.r1i1p1f2.Amon.tas.gn.v20220512 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MRI.MRI-ESM2-0.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190603 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.pr.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.tas.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.fx.areacella.gn.v20190603 - - CMIP6.CMIP.NCAR.CESM2-WACCM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190425 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.pr.gn.v20190415 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.tas.gn.v20190227 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.fx.areacella.gn.v20190227 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.pr.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.tas.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.fx.areacella.gn.v20190815 - - CMIP6.CMIP.NCC.NorESM2-MM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.pr.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.tas.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.pr.gr.v20190910 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.tas.gr.v20191028 - - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20180701 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.pr.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.tas.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.fx.areacella.gr1.v20190726 @@ -128,9 +108,6 @@ cmip6_ssp126: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 - CMIP6.CMIP.THU.CIESM.historical.r1i1p1f1.Amon.pr.gr.v20200417 - CMIP6.CMIP.THU.CIESM.historical.r1i1p1f1.Amon.tas.gr.v20200417 - - CMIP6.DAMIP.CSIRO-ARCCSS.ACCESS-CM2.hist-GHG.r1i1p1f1.fx.areacella.gn.v20201120 - - CMIP6.DAMIP.CSIRO.ACCESS-ESM1-5.hist-GHG.r1i1p1f1.fx.areacella.gn.v20200615 - - CMIP6.DAMIP.MIROC.MIROC6.hist-GHG.r1i1p1f1.fx.areacella.gn.v20190705 - CMIP6.ScenarioMIP.AS-RCEC.TaiESM1.ssp126.r1i1p1f1.Amon.pr.gn.v20201124 - CMIP6.ScenarioMIP.AS-RCEC.TaiESM1.ssp126.r1i1p1f1.Amon.tas.gn.v20201124 - CMIP6.ScenarioMIP.AWI.AWI-CM-1-1-MR.ssp126.r1i1p1f1.Amon.pr.gn.v20190529 @@ -175,16 +152,12 @@ cmip6_ssp126: - CMIP6.ScenarioMIP.INM.INM-CM4-8.ssp126.r1i1p1f1.Amon.tas.gr1.v20190603 - CMIP6.ScenarioMIP.INM.INM-CM5-0.ssp126.r1i1p1f1.Amon.pr.gr1.v20190619 - CMIP6.ScenarioMIP.INM.INM-CM5-0.ssp126.r1i1p1f1.Amon.tas.gr1.v20190619 - - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.pr.gr.v20201218 - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.pr.gr.v20220105 - - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.tas.gr.v20201218 - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.tas.gr.v20220105 - CMIP6.ScenarioMIP.IPSL.IPSL-CM6A-LR.ssp126.r1i1p1f1.Amon.pr.gr.v20190903 - CMIP6.ScenarioMIP.IPSL.IPSL-CM6A-LR.ssp126.r1i1p1f1.Amon.tas.gr.v20190903 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.tas.gr1.v20210601 - - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp126.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp126.r1i1p1f2.Amon.pr.gn.v20220314 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp126.r1i1p1f2.Amon.tas.gn.v20220314 - CMIP6.ScenarioMIP.MIROC.MIROC6.ssp126.r1i1p1f1.Amon.pr.gn.v20190627 @@ -217,11 +190,9 @@ cmip6_ssp126: - CMIP6.ScenarioMIP.THU.CIESM.ssp126.r1i1p1f1.Amon.tas.gr.v20200417 cmip6_ssp245: cmip6: - - CMIP6.C4MIP CDRMIP.NCC.NorESM2-LM.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.pr.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.tas.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.fx.areacella.gn.v20200624 - - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191015 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.pr.gn.v20200511 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.tas.gn.v20200720 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.fx.areacella.gn.v20191015 @@ -234,48 +205,39 @@ cmip6_ssp245: - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.pr.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.tas.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.fx.areacella.gn.v20210615 - - CMIP6.CMIP.CCCma.CanESM5-1.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5-CanOE.1pctCO2.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.pr.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.tas.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.fx.areacella.gn.v20200616 - - CMIP6.CMIP.CMCC.CMCC-ESM2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.pr.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.tas.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.fx.areacella.gn.v20210114 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.1pctCO2.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.pr.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.tas.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.pr.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.tas.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.fx.areacella.gr.v20180917 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.1pctCO2.r1i1p1f2.fx.areacella.gr.v20181018 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r13i1p1f2.fx.areacella.gr.v20250328 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.pr.gr.v20181206 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.tas.gr.v20181206 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r1i1p1f1.Amon.pr.gn.v20191108 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r1i1p1f1.Amon.tas.gn.v20191108 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r1i1p1f1.fx.areacella.gn.v20191108 - - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.fx.areacella.gn.v20191115 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.Amon.pr.gr.v20210113 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.Amon.tas.gr.v20210113 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.fx.areacella.gr.v20210616 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.1pctCO2.r1i1p1f1.fx.areacella.gr.v20220428 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.pr.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.tas.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.fx.areacella.gr.v20200217 @@ -290,7 +252,6 @@ cmip6_ssp245: - CMIP6.CMIP.INM.INM-CM4-8.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.pr.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.tas.gr1.v20190530 - - CMIP6.CMIP.INM.INM-CM5-0.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190820 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.pr.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.tas.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.fx.areacella.gr1.v20190610 @@ -299,7 +260,6 @@ cmip6_ssp245: - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.fx.areacella.gr.v20180803 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 - - CMIP6.CMIP.MIROC.MIROC-ES2L.1pctCO2.r1i1p1f2.fx.areacella.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.fx.areacella.gn.v20190823 @@ -310,32 +270,26 @@ cmip6_ssp245: - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.historical.r1i1p1f3.Amon.tas.gn.v20190624 - CMIP6.CMIP.MOHC.UKESM1-0-LL.historical.r1i1p1f2.Amon.pr.gn.v20190406 - CMIP6.CMIP.MOHC.UKESM1-0-LL.historical.r1i1p1f2.Amon.tas.gn.v20190406 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MRI.MRI-ESM2-0.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190603 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.pr.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.tas.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.fx.areacella.gn.v20190603 - - CMIP6.CMIP.NCAR.CESM2-WACCM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190425 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.pr.gn.v20190415 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.tas.gn.v20190227 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.fx.areacella.gn.v20190227 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.pr.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.tas.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.fx.areacella.gn.v20190815 - - CMIP6.CMIP.NCC.NorESM2-MM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.pr.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.tas.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.pr.gr.v20190910 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.tas.gr.v20191028 - - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20180701 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.pr.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.tas.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.fx.areacella.gr1.v20190726 @@ -343,7 +297,6 @@ cmip6_ssp245: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 - CMIP6.CMIP.THU.CIESM.historical.r1i1p1f1.Amon.pr.gr.v20200417 - CMIP6.CMIP.THU.CIESM.historical.r1i1p1f1.Amon.tas.gr.v20200417 - - CMIP6.DAMIP.MIROC.MIROC6.hist-GHG.r1i1p1f1.fx.areacella.gn.v20190705 - CMIP6.ScenarioMIP.AS-RCEC.TaiESM1.ssp245.r1i1p1f1.Amon.pr.gn.v20201124 - CMIP6.ScenarioMIP.AS-RCEC.TaiESM1.ssp245.r1i1p1f1.Amon.tas.gn.v20201124 - CMIP6.ScenarioMIP.AWI.AWI-CM-1-1-MR.ssp245.r1i1p1f1.Amon.pr.gn.v20190529 @@ -395,7 +348,6 @@ cmip6_ssp245: - CMIP6.ScenarioMIP.IPSL.IPSL-CM6A-LR.ssp245.r1i1p1f1.Amon.pr.gr.v20190119 - CMIP6.ScenarioMIP.IPSL.IPSL-CM6A-LR.ssp245.r1i1p1f1.Amon.tas.gr.v20190119 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.tas.gr1.v20210601 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp245.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp245.r1i1p1f2.Amon.tas.gn.v20190823 @@ -425,11 +377,9 @@ cmip6_ssp245: - CMIP6.ScenarioMIP.THU.CIESM.ssp245.r1i1p1f1.Amon.tas.gr.v20200417 cmip6_ssp370: cmip6: - - CMIP6.C4MIP CDRMIP.NCC.NorESM2-LM.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.pr.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.tas.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.fx.areacella.gn.v20200624 - - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191015 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.pr.gn.v20200511 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.tas.gn.v20200720 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.fx.areacella.gn.v20191015 @@ -442,53 +392,42 @@ cmip6_ssp370: - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.pr.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.tas.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.fx.areacella.gn.v20210615 - - CMIP6.CMIP.CCCma.CanESM5-1.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5-CanOE.1pctCO2.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.pr.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.tas.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.fx.areacella.gn.v20200616 - - CMIP6.CMIP.CMCC.CMCC-ESM2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.pr.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.tas.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.fx.areacella.gn.v20210114 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.1pctCO2.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.pr.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.tas.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.pr.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.tas.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.fx.areacella.gr.v20180917 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.1pctCO2.r1i1p1f2.fx.areacella.gr.v20181018 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r13i1p1f2.fx.areacella.gr.v20250328 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.pr.gr.v20181206 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.tas.gr.v20181206 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r1i1p1f1.Amon.pr.gn.v20191108 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r1i1p1f1.Amon.tas.gn.v20191108 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r1i1p1f1.fx.areacella.gn.v20191108 - - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.fx.areacella.gn.v20191115 - - CMIP6.CMIP.E3SM-Project.E3SM-2-0.1pctCO2.r1i1p1f1.fx.areacella.gr.v20220913 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.historical.r1i1p1f1.Amon.pr.gr.v20220830 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.historical.r1i1p1f1.Amon.tas.gr.v20220830 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.historical.r1i1p1f1.fx.areacella.gr.v20220913 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-AerChem.1pctCO2.r1i1p1f1.fx.areacella.gr.v20200729 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-AerChem.historical.r1i1p1f1.Amon.pr.gr.v20200624 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-AerChem.historical.r1i1p1f1.Amon.tas.gr.v20200624 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-AerChem.historical.r1i1p1f1.fx.areacella.gr.v20200624 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.1pctCO2.r1i1p1f1.fx.areacella.gr.v20220428 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.pr.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.tas.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.fx.areacella.gr.v20200217 @@ -498,18 +437,15 @@ cmip6_ssp370: - CMIP6.CMIP.INM.INM-CM4-8.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.pr.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.tas.gr1.v20190530 - - CMIP6.CMIP.INM.INM-CM5-0.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190820 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.pr.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.tas.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.fx.areacella.gr1.v20190610 - - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.1pctCO2.r1i1p1f1.fx.areacella.gr.v20201218 - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.historical.r1i1p1f1.Amon.pr.gr.v20200729 - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.historical.r1i1p1f1.Amon.tas.gr.v20200729 - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.historical.r1i1p1f1.fx.areacella.gr.v20200729 - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.Amon.pr.gr.v20180803 - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.Amon.tas.gr.v20180803 - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.fx.areacella.gr.v20180803 - - CMIP6.CMIP.MIROC.MIROC-ES2L.1pctCO2.r1i1p1f2.fx.areacella.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.fx.areacella.gn.v20190823 @@ -520,36 +456,29 @@ cmip6_ssp370: - CMIP6.CMIP.MOHC.UKESM1-0-LL.historical.r1i1p1f2.Amon.tas.gn.v20190406 - CMIP6.CMIP.MOHC.UKESM1-1-LL.historical.r1i1p1f2.Amon.pr.gn.v20220512 - CMIP6.CMIP.MOHC.UKESM1-1-LL.historical.r1i1p1f2.Amon.tas.gn.v20220512 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MRI.MRI-ESM2-0.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190603 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.pr.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.tas.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.fx.areacella.gn.v20190603 - - CMIP6.CMIP.NCAR.CESM2-WACCM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190425 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.pr.gn.v20190415 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.tas.gn.v20190227 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.fx.areacella.gn.v20190227 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.pr.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.tas.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.fx.areacella.gn.v20190815 - - CMIP6.CMIP.NCC.NorESM2-MM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.pr.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.tas.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.pr.gr.v20190910 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.tas.gr.v20191028 - - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20180701 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.pr.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.tas.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.fx.areacella.gr1.v20190726 - - CMIP6.DAMIP.MIROC.MIROC6.hist-GHG.r1i1p1f1.fx.areacella.gn.v20190705 - CMIP6.ScenarioMIP AerChemMIP.AS-RCEC.TaiESM1.ssp370.r1i1p1f1.Amon.pr.gn.v20201014 - CMIP6.ScenarioMIP AerChemMIP.AS-RCEC.TaiESM1.ssp370.r1i1p1f1.Amon.tas.gn.v20201014 - CMIP6.ScenarioMIP AerChemMIP.AWI.AWI-CM-1-1-MR.ssp370.r1i1p1f1.Amon.pr.gn.v20190529 @@ -624,12 +553,9 @@ cmip6_ssp370: - CMIP6.ScenarioMIP.NOAA-GFDL.GFDL-ESM4.ssp370.r1i1p1f1.Amon.tas.gr1.v20180701 cmip6_ssp585: cmip6: - - CMIP6.C4MIP CDRMIP.MIROC.MIROC-ES2L.esm-1pct-brch-1000PgC.r1i1p1f2.fx.areacella.gn.v20200622 - - CMIP6.C4MIP CDRMIP.NCC.NorESM2-LM.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.pr.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.Amon.tas.gn.v20200623 - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.fx.areacella.gn.v20200624 - - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191015 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.pr.gn.v20200511 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.Amon.tas.gn.v20200720 - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.historical.r1i1p1f1.fx.areacella.gn.v20191015 @@ -642,34 +568,27 @@ cmip6_ssp585: - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.pr.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.Amon.tas.gn.v20190818 - CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.fx.areacella.gn.v20210615 - - CMIP6.CMIP.CCCma.CanESM5-1.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5-CanOE.1pctCO2.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-CanOE.historical.r1i1p2f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.pr.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 - - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.pr.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.Amon.tas.gn.v20200616 - CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.fx.areacella.gn.v20200616 - - CMIP6.CMIP.CMCC.CMCC-ESM2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.pr.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.Amon.tas.gn.v20210114 - CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.fx.areacella.gn.v20210114 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.1pctCO2.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.pr.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.Amon.tas.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1-HR.historical.r1i1p1f2.fx.areacella.gr.v20191021 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.pr.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.Amon.tas.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.fx.areacella.gr.v20180917 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.1pctCO2.r1i1p1f2.fx.areacella.gr.v20181018 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r13i1p1f2.fx.areacella.gr.v20250328 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.pr.gr.v20181206 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.tas.gr.v20181206 @@ -688,7 +607,6 @@ cmip6_ssp585: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.Amon.pr.gr.v20210113 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.Amon.tas.gr.v20210113 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.fx.areacella.gr.v20210616 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.1pctCO2.r1i1p1f1.fx.areacella.gr.v20220428 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.pr.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.Amon.tas.gr.v20200217 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.historical.r1i1p1f1.fx.areacella.gr.v20200217 @@ -703,7 +621,6 @@ cmip6_ssp585: - CMIP6.CMIP.INM.INM-CM4-8.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.pr.gr1.v20190530 - CMIP6.CMIP.INM.INM-CM4-8.historical.r1i1p1f1.Amon.tas.gr1.v20190530 - - CMIP6.CMIP.INM.INM-CM5-0.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190820 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.pr.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.Amon.tas.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.fx.areacella.gr1.v20190610 @@ -712,7 +629,6 @@ cmip6_ssp585: - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.fx.areacella.gr.v20180803 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 - - CMIP6.CMIP.MIROC.MIROC-ES2L.1pctCO2.r1i1p1f2.fx.areacella.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.fx.areacella.gn.v20190823 @@ -725,32 +641,26 @@ cmip6_ssp585: - CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.Amon.tas.gn.v20191207 - CMIP6.CMIP.MOHC.UKESM1-0-LL.historical.r1i1p1f2.Amon.pr.gn.v20190406 - CMIP6.CMIP.MOHC.UKESM1-0-LL.historical.r1i1p1f2.Amon.tas.gn.v20190406 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.pr.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.Amon.tas.gn.v20190710 - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.fx.areacella.gn.v20190710 - - CMIP6.CMIP.MRI.MRI-ESM2-0.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190603 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.pr.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.Amon.tas.gn.v20190222 - CMIP6.CMIP.MRI.MRI-ESM2-0.historical.r1i1p1f1.fx.areacella.gn.v20190603 - - CMIP6.CMIP.NCAR.CESM2-WACCM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190425 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.pr.gn.v20190415 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.Amon.tas.gn.v20190227 - CMIP6.CMIP.NCAR.CESM2-WACCM.historical.r1i1p1f1.fx.areacella.gn.v20190227 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.pr.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.Amon.tas.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.historical.r1i1p1f1.fx.areacella.gn.v20190815 - - CMIP6.CMIP.NCC.NorESM2-MM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.pr.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.Amon.tas.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.pr.gr.v20190910 - CMIP6.CMIP.NIMS-KMA.KACE-1-0-G.historical.r1i1p1f1.Amon.tas.gr.v20191028 - - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20180701 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.pr.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.Amon.tas.gr1.v20190726 - CMIP6.CMIP.NOAA-GFDL.GFDL-ESM4.historical.r1i1p1f1.fx.areacella.gr1.v20190726 @@ -758,9 +668,6 @@ cmip6_ssp585: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 - CMIP6.CMIP.THU.CIESM.historical.r1i1p1f1.Amon.pr.gr.v20200417 - CMIP6.CMIP.THU.CIESM.historical.r1i1p1f1.Amon.tas.gr.v20200417 - - CMIP6.DAMIP.CSIRO-ARCCSS.ACCESS-CM2.hist-GHG.r1i1p1f1.fx.areacella.gn.v20201120 - - CMIP6.DAMIP.CSIRO.ACCESS-ESM1-5.hist-GHG.r1i1p1f1.fx.areacella.gn.v20200615 - - CMIP6.DAMIP.MIROC.MIROC6.hist-GHG.r1i1p1f1.fx.areacella.gn.v20190705 - CMIP6.ScenarioMIP.AS-RCEC.TaiESM1.ssp585.r1i1p1f1.Amon.pr.gn.v20200901 - CMIP6.ScenarioMIP.AS-RCEC.TaiESM1.ssp585.r1i1p1f1.Amon.tas.gn.v20200901 - CMIP6.ScenarioMIP.AWI.AWI-CM-1-1-MR.ssp585.r1i1p1f1.Amon.pr.gn.v20190529 @@ -804,7 +711,6 @@ cmip6_ssp585: - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.ssp585.r1i1p1f1.Amon.pr.gr.v20201201 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.ssp585.r1i1p1f1.Amon.tas.gr.v20201201 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.pr.gr.v20200225 - - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.tas.gr.v20221112 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3.ssp585.r1i1p1f1.Amon.pr.gr.v20200310 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3.ssp585.r1i1p1f1.Amon.tas.gr.v20200310 @@ -817,11 +723,8 @@ cmip6_ssp585: - CMIP6.ScenarioMIP.IPSL.IPSL-CM6A-LR.ssp585.r1i1p1f1.Amon.pr.gr.v20190903 - CMIP6.ScenarioMIP.IPSL.IPSL-CM6A-LR.ssp585.r1i1p1f1.Amon.tas.gr.v20190903 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.tas.gr1.v20210601 - - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.pr.gn.v20190823 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.pr.gn.v20220314 - - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.tas.gn.v20220314 - CMIP6.ScenarioMIP.MIROC.MIROC6.ssp585.r1i1p1f1.Amon.pr.gn.v20190627 - CMIP6.ScenarioMIP.MIROC.MIROC6.ssp585.r1i1p1f1.Amon.tas.gn.v20190627 diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_drivers_for_fire_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_drivers_for_fire_.yml index b0826e87c..e0131fd7f 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_drivers_for_fire_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_climate_drivers_for_fire_.yml @@ -91,9 +91,7 @@ cmip6_gr1_r1i1p1f1_GFDL-ESM4: cmip6_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.hurs.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tasmax.gr.v20211207 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Emon.vegFrac.gr.v20211207 diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clwvi_pr_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clwvi_pr_.yml index 2a86cd651..b214671c1 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clwvi_pr_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clwvi_pr_.yml @@ -242,7 +242,6 @@ cmip6_historical_mon_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.clwvi.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 cmip6_historical_mon_gr_r1i1p1f1_EC-Earth3-Veg-LR: cmip6: diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_enso_basic_climatology_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_enso_basic_climatology_.yml index 8fc1a09d3..671754572 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_enso_basic_climatology_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_enso_basic_climatology_.yml @@ -160,7 +160,6 @@ cmip6_gn_r1i1p1f1_NESM3: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Omon.tos.gn.v20190703 cmip6_gn_r1i1p1f1_NorCPM1: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tauu.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Omon.tos.gn.v20200724 diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_equilibrium_climate_sensitivity_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_equilibrium_climate_sensitivity_.yml index bcf917ff4..b2eae9e91 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_equilibrium_climate_sensitivity_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_equilibrium_climate_sensitivity_.yml @@ -63,7 +63,6 @@ cmip6_gn_r1i1p1f1_ACCESS-CM2: - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.piControl.r1i1p1f1.Amon.rsdt.gn.v20191112 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.piControl.r1i1p1f1.Amon.rsut.gn.v20191112 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.piControl.r1i1p1f1.Amon.tas.gn.v20191112 - - CMIP6.DAMIP.CSIRO-ARCCSS.ACCESS-CM2.hist-GHG.r1i1p1f1.fx.areacella.gn.v20201120 cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: cmip6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191115 @@ -75,7 +74,6 @@ cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.rsdt.gn.v20210316 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.rsut.gn.v20210316 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.tas.gn.v20210316 - - CMIP6.DAMIP.CSIRO.ACCESS-ESM1-5.hist-GHG.r1i1p1f1.fx.areacella.gn.v20200615 cmip6_gn_r1i1p1f1_AWI-CM-1-1-MR: cmip6: - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191015 @@ -163,7 +161,6 @@ cmip6_gn_r1i1p1f1_CESM2-WACCM: - CMIP6.CMIP.NCAR.CESM2-WACCM.piControl.r1i1p1f1.Amon.tas.gn.v20190320 cmip6_gn_r1i1p1f1_CESM2-WACCM-FV2: cmip6: - - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200226 - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.abrupt-4xCO2.r1i1p1f1.Amon.rlut.gn.v20200403 - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.abrupt-4xCO2.r1i1p1f1.Amon.rsdt.gn.v20200403 - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.abrupt-4xCO2.r1i1p1f1.Amon.rsut.gn.v20200403 @@ -301,7 +298,6 @@ cmip6_gn_r1i1p1f1_IITM-ESM: - CMIP6.CMIP.CCCR-IITM.IITM-ESM.piControl.r1i1p1f1.Amon.tas.gn.v20191120 cmip6_gn_r1i1p1f1_MIROC6: cmip6: - - CMIP6.CMIP.MIROC.MIROC6.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190311 - CMIP6.CMIP.MIROC.MIROC6.abrupt-4xCO2.r1i1p1f1.Amon.rlut.gn.v20190705 - CMIP6.CMIP.MIROC.MIROC6.abrupt-4xCO2.r1i1p1f1.Amon.rsdt.gn.v20190705 - CMIP6.CMIP.MIROC.MIROC6.abrupt-4xCO2.r1i1p1f1.Amon.rsut.gn.v20190705 @@ -599,7 +595,6 @@ cmip6_gn_r2i1p1f1_ACCESS-ESM1-5: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.abrupt-4xCO2.r2i1p1f1.Amon.rsdt.gn.v20200901 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.abrupt-4xCO2.r2i1p1f1.Amon.rsut.gn.v20200901 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.abrupt-4xCO2.r2i1p1f1.Amon.tas.gn.v20200901 - - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r2i1p1f1.fx.areacella.gn.v20191128 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.rlut.gn.v20210316 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.rsdt.gn.v20210316 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.rsut.gn.v20210316 @@ -756,7 +751,6 @@ cmip6_gr1_r1i1p1f1_INM-CM4-8: - CMIP6.CMIP.INM.INM-CM4-8.piControl.r1i1p1f1.Amon.tas.gr1.v20190605 cmip6_gr1_r1i1p1f1_INM-CM5-0: cmip6: - - CMIP6.CMIP.INM.INM-CM5-0.1pctCO2.r1i1p1f1.fx.areacella.gr1.v20190820 - CMIP6.CMIP.INM.INM-CM5-0.abrupt-4xCO2.r1i1p1f1.Amon.rlut.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.abrupt-4xCO2.r1i1p1f1.Amon.rsdt.gr1.v20190610 - CMIP6.CMIP.INM.INM-CM5-0.abrupt-4xCO2.r1i1p1f1.Amon.rsut.gr1.v20190610 @@ -990,7 +984,6 @@ cmip6_gr_r2i1p1f1_E3SM-2-0: - CMIP6.CMIP.E3SM-Project.E3SM-2-0.abrupt-4xCO2.r2i1p1f1.Amon.rsdt.gr.v20220830 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.abrupt-4xCO2.r2i1p1f1.Amon.rsut.gr.v20220830 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.abrupt-4xCO2.r2i1p1f1.Amon.tas.gr.v20220830 - - CMIP6.CMIP.E3SM-Project.E3SM-2-0.historical.r2i1p1f1.fx.areacella.gr.v20220913 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.piControl.r1i1p1f1.Amon.rlut.gr.v20220913 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.piControl.r1i1p1f1.Amon.rsdt.gr.v20220913 - CMIP6.CMIP.E3SM-Project.E3SM-2-0.piControl.r1i1p1f1.Amon.rsut.gr.v20220913 @@ -1050,7 +1043,6 @@ cmip6_gr_r3i1p1f1_IPSL-CM6A-LR: - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.piControl.r1i1p1f1.Amon.tas.gr.v20200326 cmip6_gr_r3i1p1f2_CNRM-ESM2-1: cmip6: - - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.1pctCO2.r1i1p1f2.fx.areacella.gr.v20181018 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.abrupt-4xCO2.r3i1p1f2.Amon.rlut.gr.v20190208 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.abrupt-4xCO2.r3i1p1f2.Amon.rsdt.gr.v20190208 - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.abrupt-4xCO2.r3i1p1f2.Amon.rsut.gr.v20190208 diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml index 6fcc62689..cdc66ed4b 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml @@ -1023,7 +1023,6 @@ cmip6_historical_gn_r1i1p1f1_NESM3_Amon_tas: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 cmip6_historical_gn_r1i1p1f1_NorCPM1_Amon_tas: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 cmip6_historical_gn_r1i1p1f1_NorESM2-LM_Amon_tas: @@ -1079,7 +1078,6 @@ cmip6_historical_gr1_r1i1p1f1_INM-CM5-0_Amon_tas: - CMIP6.CMIP.INM.INM-CM5-0.historical.r1i1p1f1.fx.areacella.gr1.v20190610 cmip6_historical_gr1_r1i1p1f1_KIOST-ESM_Amon_tas: cmip6: - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_historical_gr_r1i1p101f1_GISS-E3-G_Amon_tas: cmip6: @@ -1127,7 +1125,6 @@ cmip6_historical_gr_r1i1p1f1_EC-Earth3-Veg-LR_Amon_tas: cmip6_historical_gr_r1i1p1f1_EC-Earth3-Veg_Amon_tas: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 cmip6_historical_gr_r1i1p1f1_EC-Earth3_Amon_tas: cmip6: @@ -1627,7 +1624,6 @@ cmip6_ssp126_gr1_r1i1p1f1_INM-CM5-0_Amon_tas: - CMIP6.ScenarioMIP.INM.INM-CM5-0.ssp126.r1i1p1f1.Amon.tas.gr1.v20190619 cmip6_ssp126_gr1_r1i1p1f1_KIOST-ESM_Amon_tas: cmip6: - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_ssp126_gr_r1i1p1f1_CIESM_Amon_tas: cmip6: @@ -1636,10 +1632,6 @@ cmip6_ssp126_gr_r1i1p1f1_EC-Earth3-Veg-LR_Amon_tas: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.1pctCO2.r1i1p1f1.fx.areacella.gr.v20220428 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg-LR.ssp126.r1i1p1f1.Amon.tas.gr.v20201201 -cmip6_ssp126_gr_r1i1p1f1_EC-Earth3-Veg_Amon_tas: - cmip6: - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp126.r1i1p1f1.Amon.tas.gr.v20200225 cmip6_ssp126_gr_r1i1p1f1_EC-Earth3_Amon_tas: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3.historical.r1i1p1f1.fx.areacella.gr.v20210324 @@ -1650,7 +1642,6 @@ cmip6_ssp126_gr_r1i1p1f1_FGOALS-f3-L_Amon_tas: cmip6_ssp126_gr_r1i1p1f1_IPSL-CM5A2-INCA_Amon_tas: cmip6: - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.1pctCO2.r1i1p1f1.fx.areacella.gr.v20201218 - - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.tas.gr.v20201218 - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.tas.gr.v20220105 cmip6_ssp126_gr_r1i1p1f1_IPSL-CM6A-LR_Amon_tas: cmip6: @@ -1788,7 +1779,6 @@ cmip6_ssp245_gr1_r1i1p1f1_INM-CM5-0_Amon_tas: - CMIP6.ScenarioMIP.INM.INM-CM5-0.ssp245.r1i1p1f1.Amon.tas.gr1.v20190619 cmip6_ssp245_gr1_r1i1p1f1_KIOST-ESM_Amon_tas: cmip6: - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_ssp245_gr_r1i1p1f1_CIESM_Amon_tas: cmip6: @@ -2079,8 +2069,6 @@ cmip6_ssp585_gn_r1i1p1f2_MCM-UA-1-0_Amon_tas: cmip6_ssp585_gn_r1i1p1f2_MIROC-ES2L_Amon_tas: cmip6: - CMIP6.C4MIP CDRMIP.MIROC.MIROC-ES2L.esm-1pct-brch-1000PgC.r1i1p1f2.fx.areacella.gn.v20200622 - - CMIP6.CMIP.MIROC.MIROC-ES2L.1pctCO2.r1i1p1f2.fx.areacella.gn.v20190823 - - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.tas.gn.v20220314 cmip6_ssp585_gn_r1i1p1f2_UKESM1-0-LL_Amon_tas: cmip6: @@ -2109,7 +2097,6 @@ cmip6_ssp585_gr1_r1i1p1f1_INM-CM5-0_Amon_tas: - CMIP6.ScenarioMIP.INM.INM-CM5-0.ssp585.r1i1p1f1.Amon.tas.gr1.v20190724 cmip6_ssp585_gr1_r1i1p1f1_KIOST-ESM_Amon_tas: cmip6: - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_ssp585_gr_r1i1p1f1_CIESM_Amon_tas: cmip6: @@ -2137,7 +2124,6 @@ cmip6_ssp585_gr_r1i1p1f1_EC-Earth3-Veg-LR_Amon_tas: cmip6_ssp585_gr_r1i1p1f1_EC-Earth3-Veg_Amon_tas: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.tas.gr.v20221112 cmip6_ssp585_gr_r1i1p1f1_EC-Earth3_Amon_tas: cmip6: diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_annual_cycle_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_annual_cycle_.yml index 32c30f145..ed8b85007 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_annual_cycle_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_annual_cycle_.yml @@ -432,11 +432,8 @@ cmip6_gn_r1i1p1f1_NESM3: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 cmip6_gn_r1i1p1f1_NorCPM1: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 cmip6_gn_r1i1p1f1_NorESM2-LM: @@ -1157,9 +1154,7 @@ cmip6_gr1_r1i1p1f1_INM-CM5-0: cmip6_gr1_r1i1p1f1_KIOST-ESM: cmip6: - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20210601 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_gr_r101i1p1f1_EC-Earth3: cmip6: @@ -1597,11 +1592,8 @@ cmip6_gr_r1i1p1f1_EC-Earth3-CC: cmip6_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 cmip6_gr_r1i1p1f1_EC-Earth3-Veg-LR: cmip6: diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_timeseries_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_timeseries_.yml index 1cb9bae09..a51668764 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_timeseries_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_timeseries_.yml @@ -431,11 +431,8 @@ cmip6_gn_r1i1p1f1_NESM3: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 cmip6_gn_r1i1p1f1_NorCPM1: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 cmip6_gn_r1i1p1f1_NorESM2-LM: @@ -1156,9 +1153,7 @@ cmip6_gr1_r1i1p1f1_INM-CM5-0: cmip6_gr1_r1i1p1f1_KIOST-ESM: cmip6: - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20210601 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_gr_r101i1p1f1_EC-Earth3: cmip6: @@ -1596,11 +1591,8 @@ cmip6_gr_r1i1p1f1_EC-Earth3-CC: cmip6_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 cmip6_gr_r1i1p1f1_EC-Earth3-Veg-LR: cmip6: diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_trend_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_trend_.yml index ee78c317c..24d95decc 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_trend_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_regional_historical_trend_.yml @@ -432,11 +432,8 @@ cmip6_gn_r1i1p1f1_NESM3: - CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.Amon.tas.gn.v20190630 cmip6_gn_r1i1p1f1_NorCPM1: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 cmip6_gn_r1i1p1f1_NorESM2-LM: @@ -1157,9 +1154,7 @@ cmip6_gr1_r1i1p1f1_INM-CM5-0: cmip6_gr1_r1i1p1f1_KIOST-ESM: cmip6: - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20210601 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_gr_r101i1p1f1_EC-Earth3: cmip6: @@ -1597,11 +1592,8 @@ cmip6_gr_r1i1p1f1_EC-Earth3-CC: cmip6_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 cmip6_gr_r1i1p1f1_EC-Earth3-Veg-LR: cmip6: diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_sea_ice_sensitivity_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_sea_ice_sensitivity_.yml index 5dd94d56a..2b9c4b9de 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_sea_ice_sensitivity_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_sea_ice_sensitivity_.yml @@ -62,7 +62,6 @@ cmip6_historical: - CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.Ofx.areacello.gn.v20190627 - CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.SImon.siconc.gn.v20190627 - CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.fx.areacella.gn.v20190627 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Ofx.areacello.gr1.v20210601 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.SImon.siconc.gr1.v20210601 @@ -102,7 +101,6 @@ cmip6_historical: - CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.Ofx.areacello.gn.v20190308 - CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.SImon.siconc.gn.v20190308 - CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.fx.areacella.gn.v20190308 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Ofx.areacello.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.SImon.siconc.gn.v20200724 diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_transient_climate_response_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_transient_climate_response_.yml index 2460181cc..610107b7b 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_transient_climate_response_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_transient_climate_response_.yml @@ -11,13 +11,11 @@ cmip6_gn_r1i1p1f1_ACCESS-CM2: - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.1pctCO2.r1i1p1f1.Amon.tas.gn.v20191109 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191109 - CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.piControl.r1i1p1f1.Amon.tas.gn.v20191112 - - CMIP6.DAMIP.CSIRO-ARCCSS.ACCESS-CM2.hist-GHG.r1i1p1f1.fx.areacella.gn.v20201120 cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: cmip6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.piControl.r1i1p1f1.Amon.tas.gn.v20210316 - - CMIP6.DAMIP.CSIRO.ACCESS-ESM1-5.hist-GHG.r1i1p1f1.fx.areacella.gn.v20200615 cmip6_gn_r1i1p1f1_AWI-CM-1-1-MR: cmip6: - CMIP6.CMIP.AWI.AWI-CM-1-1-MR.1pctCO2.r1i1p1f1.Amon.tas.gn.v20191015 @@ -47,7 +45,6 @@ cmip6_gn_r1i1p1f1_CAS-ESM2-0: - CMIP6.CMIP.CAS.CAS-ESM2-0.piControl.r1i1p1f1.Amon.tas.gn.v20201228 cmip6_gn_r1i1p1f1_CESM2: cmip6: - - CMIP6.C4MIP.NCAR.CESM2.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191119 - CMIP6.CMIP.NCAR.CESM2.1pctCO2.r1i1p1f1.Amon.tas.gn.v20190425 - CMIP6.CMIP.NCAR.CESM2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190425 - CMIP6.CMIP.NCAR.CESM2.piControl.r1i1p1f1.Amon.tas.gn.v20190320 @@ -65,7 +62,6 @@ cmip6_gn_r1i1p1f1_CESM2-WACCM-FV2: cmip6: - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.1pctCO2.r1i1p1f1.Amon.tas.gn.v20200226 - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200226 - - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.historical.r1i1p1f1.fx.areacella.gn.v20191120 - CMIP6.CMIP.NCAR.CESM2-WACCM-FV2.piControl.r1i1p1f1.Amon.tas.gn.v20191120 cmip6_gn_r1i1p1f1_CMCC-CM2-SR5: cmip6: @@ -131,7 +127,6 @@ cmip6_gn_r1i1p1f1_MIROC6: - CMIP6.CMIP.MIROC.MIROC6.1pctCO2.r1i1p1f1.Amon.tas.gn.v20181212 - CMIP6.CMIP.MIROC.MIROC6.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190311 - CMIP6.CMIP.MIROC.MIROC6.piControl.r1i1p1f1.Amon.tas.gn.v20181212 - - CMIP6.DAMIP.MIROC.MIROC6.hist-GHG.r1i1p1f1.fx.areacella.gn.v20190705 cmip6_gn_r1i1p1f1_MPI-ESM-1-2-HAM: cmip6: - CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.1pctCO2.r1i1p1f1.Amon.tas.gn.v20190628 @@ -162,7 +157,6 @@ cmip6_gn_r1i1p1f1_NorCPM1: - CMIP6.CMIP.NCC.NorCPM1.piControl.r1i1p1f1.Amon.tas.gn.v20190914 cmip6_gn_r1i1p1f1_NorESM2-LM: cmip6: - - CMIP6.C4MIP CDRMIP.NCC.NorESM2-LM.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191108 - CMIP6.CMIP.NCC.NorESM2-LM.1pctCO2.r1i1p1f1.Amon.tas.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190815 - CMIP6.CMIP.NCC.NorESM2-LM.piControl.r1i1p1f1.Amon.tas.gn.v20210118 @@ -180,7 +174,6 @@ cmip6_gn_r1i1p1f1_TaiESM1: cmip6: - CMIP6.CMIP.AS-RCEC.TaiESM1.1pctCO2.r1i1p1f1.Amon.tas.gn.v20200225 - CMIP6.CMIP.AS-RCEC.TaiESM1.1pctCO2.r1i1p1f1.fx.areacella.gn.v20200311 - - CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.fx.areacella.gn.v20200624 - CMIP6.CMIP.AS-RCEC.TaiESM1.piControl.r1i1p1f1.Amon.tas.gn.v20200211 cmip6_gn_r1i1p1f2_MIROC-ES2L: cmip6: @@ -207,13 +200,11 @@ cmip6_gn_r1i1p2f1_CanESM5: cmip6: - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p2f1.Amon.tas.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.piControl.r1i1p2f1.Amon.tas.gn.v20190429 cmip6_gn_r1i1p2f1_CanESM5-1: cmip6: - CMIP6.CMIP.CCCma.CanESM5-1.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.1pctCO2.r1i1p2f1.Amon.tas.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5-1.historical.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5-1.piControl.r1i1p2f1.Amon.tas.gn.v20190429 cmip6_gn_r1i1p2f1_CanESM5-CanOE: cmip6: @@ -272,7 +263,6 @@ cmip6_gn_r2i1p2f1_CanESM5: cmip6: - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r2i1p2f1.Amon.tas.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.piControl.r1i1p2f1.Amon.tas.gn.v20190429 cmip6_gn_r3i1p1f1_CanESM5: cmip6: @@ -300,7 +290,6 @@ cmip6_gn_r3i1p2f1_CanESM5: cmip6: - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.1pctCO2.r3i1p2f1.Amon.tas.gn.v20190429 - - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p2f1.fx.areacella.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.piControl.r1i1p2f1.Amon.tas.gn.v20190429 cmip6_gn_r4i1p1f2_UKESM1-0-LL: cmip6: @@ -329,7 +318,6 @@ cmip6_gr_r1i1p1f1_E3SM-1-0: - CMIP6.CMIP.E3SM-Project.E3SM-1-0.1pctCO2.r1i1p1f1.Amon.tas.gr.v20190718 - CMIP6.CMIP.E3SM-Project.E3SM-1-0.1pctCO2.r1i1p1f1.fx.areacella.gr.v20190919 - CMIP6.CMIP.E3SM-Project.E3SM-1-0.piControl.r1i1p1f1.Amon.tas.gr.v20190719 - - CMIP6.DAMIP.E3SM-Project.E3SM-1-0.hist-GHG.r1i1p1f1.fx.areacella.gr.v20221014 cmip6_gr_r1i1p1f1_E3SM-2-0: cmip6: - CMIP6.CMIP.E3SM-Project.E3SM-2-0.1pctCO2.r1i1p1f1.Amon.tas.gr.v20220825 @@ -354,7 +342,6 @@ cmip6_gr_r1i1p1f1_EC-Earth3-CC: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.1pctCO2.r1i1p1f1.Amon.tas.gr.v20210525 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.1pctCO2.r1i1p1f1.fx.areacella.gr.v20210525 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.historical.r1i1p1f1.fx.areacella.gr.v20210616 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-CC.piControl.r1i1p1f1.Amon.tas.gr.v20210330 cmip6_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: @@ -379,7 +366,6 @@ cmip6_gr_r1i1p1f1_IPSL-CM6A-LR: cmip6: - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.1pctCO2.r1i1p1f1.Amon.tas.gr.v20180727 - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.1pctCO2.r1i1p1f1.fx.areacella.gr.v20180727 - - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.historical.r1i1p1f1.fx.areacella.gr.v20180803 - CMIP6.CMIP.IPSL.IPSL-CM6A-LR.piControl.r1i1p1f1.Amon.tas.gr.v20200326 cmip6_gr_r1i1p1f1_IPSL-CM6A-MR1: cmip6: @@ -394,7 +380,6 @@ cmip6_gr_r1i1p1f2_CNRM-CM6-1: cmip6: - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.1pctCO2.r1i1p1f2.Amon.tas.gr.v20180626 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.1pctCO2.r1i1p1f2.fx.areacella.gr.v20180626 - - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.historical.r1i1p1f2.fx.areacella.gr.v20180917 - CMIP6.CMIP.CNRM-CERFACS.CNRM-CM6-1.piControl.r1i1p1f2.Amon.tas.gr.v20180814 cmip6_gr_r1i1p1f2_CNRM-ESM2-1: cmip6: diff --git a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_zero_emission_commitment_.yml b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_zero_emission_commitment_.yml index cd726907f..28a4b62ea 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_zero_emission_commitment_.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/test_solve_regression/test_solve_regression_zero_emission_commitment_.yml @@ -3,7 +3,6 @@ cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: - CMIP6.C4MIP CDRMIP.CSIRO.ACCESS-ESM1-5.esm-1pct-brch-1000PgC.r1i1p1f1.Amon.tas.gn.v20191206 - CMIP6.C4MIP CDRMIP.CSIRO.ACCESS-ESM1-5.esm-1pct-brch-1000PgC.r1i1p1f1.fx.areacella.gn.v20191206 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.Amon.tas.gn.v20191115 - - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.1pctCO2.r1i1p1f1.fx.areacella.gn.v20191115 cmip6_gn_r1i1p1f1_GISS-E2-1-G-CC: cmip6: - CMIP6.C4MIP CDRMIP.NASA-GISS.GISS-E2-1-G-CC.esm-1pct-brch-1000PgC.r1i1p1f1.Amon.tas.gn.v20191202 diff --git a/packages/climate-ref-ilamb/tests/unit/test_solve_regression/test_solve_regression_gpp_wecann_.yml b/packages/climate-ref-ilamb/tests/unit/test_solve_regression/test_solve_regression_gpp_wecann_.yml index 4a06efdf6..40fb177ae 100644 --- a/packages/climate-ref-ilamb/tests/unit/test_solve_regression/test_solve_regression_gpp_wecann_.yml +++ b/packages/climate-ref-ilamb/tests/unit/test_solve_regression/test_solve_regression_gpp_wecann_.yml @@ -132,9 +132,7 @@ cmip6_historical_gn_r1i1p1f1_MPI-ESM1-2-LR: - CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.fx.sftlf.gn.v20190710 cmip6_historical_gn_r1i1p1f1_NorCPM1: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20200724 - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Lmon.gpp.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 @@ -215,7 +213,6 @@ cmip6_historical_gr1_r1i1p1f1_INM-CM5-0: cmip6_historical_gr1_r1i1p1f1_KIOST-ESM: cmip6: - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.pr.gr1.v20210928 - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Lmon.gpp.gr1.v20210601 cmip6_historical_gr_r1i1p101f1_GISS-E3-G: @@ -248,9 +245,7 @@ cmip6_historical_gr_r1i1p1f1_EC-Earth3-CC: cmip6_historical_gr_r1i1p1f1_EC-Earth3-Veg: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Lmon.gpp.gr.v20211207 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.fx.sftlf.gr.v20211207 diff --git a/packages/climate-ref-pmp/tests/unit/test_solve_regression/test_solve_regression_annual_cycle_.yml b/packages/climate-ref-pmp/tests/unit/test_solve_regression/test_solve_regression_annual_cycle_.yml index f4f73ec31..e82bc3781 100644 --- a/packages/climate-ref-pmp/tests/unit/test_solve_regression/test_solve_regression_annual_cycle_.yml +++ b/packages/climate-ref-pmp/tests/unit/test_solve_regression/test_solve_regression_annual_cycle_.yml @@ -1799,13 +1799,11 @@ cmip6_historical_gn_r1i1p1f1_NESM3_ts__pmp-climatology_ERA-5_ts: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ts.100km.gn.v20250224 cmip6_historical_gn_r1i1p1f1_NorCPM1_pr__pmp-climatology_GPCP-Monthly-3-2_pr: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.pr.gn.v20200724 pmp-climatology: - obs4MIPs.obs4MIPs.NASA-GSFC.GPCP-Monthly-3-2.mon.pr.50km.gn.v20250211 cmip6_historical_gn_r1i1p1f1_NorCPM1_psl__pmp-climatology_ERA-5_psl: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.psl.gn.v20200724 pmp-climatology: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.psl.25km.gn.v20250224 @@ -3923,7 +3921,6 @@ cmip6_historical_gr1_r1i1p1f1_KIOST-ESM_pr__pmp-climatology_GPCP-Monthly-3-2_pr: - obs4MIPs.obs4MIPs.NASA-GSFC.GPCP-Monthly-3-2.mon.pr.50km.gn.v20250211 cmip6_historical_gr1_r1i1p1f1_KIOST-ESM_psl__pmp-climatology_ERA-5_psl: cmip6: - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.psl.gr1.v20210601 pmp-climatology: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.psl.25km.gn.v20250224 @@ -4962,13 +4959,11 @@ cmip6_historical_gr_r1i1p1f1_EC-Earth3-Veg-LR_ts__pmp-climatology_ERA-5_ts: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ts.100km.gn.v20250224 cmip6_historical_gr_r1i1p1f1_EC-Earth3-Veg_pr__pmp-climatology_GPCP-Monthly-3-2_pr: cmip6: - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.pr.gr.v20211207 pmp-climatology: - obs4MIPs.obs4MIPs.NASA-GSFC.GPCP-Monthly-3-2.mon.pr.50km.gn.v20250211 cmip6_historical_gr_r1i1p1f1_EC-Earth3-Veg_psl__pmp-climatology_ERA-5_psl: cmip6: - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.psl.gr.v20211207 pmp-climatology: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.psl.25km.gn.v20250224 diff --git a/packages/climate-ref/src/climate_ref/datasets/base.py b/packages/climate-ref/src/climate_ref/datasets/base.py index 97b73bcc3..ca8a92b1d 100644 --- a/packages/climate-ref/src/climate_ref/datasets/base.py +++ b/packages/climate-ref/src/climate_ref/datasets/base.py @@ -319,6 +319,35 @@ def register_dataset( # noqa: PLR0915 return result + def filter_latest_versions(self, catalog: pd.DataFrame) -> pd.DataFrame: + """ + Filter a data catalog to only include the latest version of each dataset + + Groups by ``dataset_id_metadata`` and keeps only the rows where the version + matches the maximum version within each group (lexicographic comparison). + + Parameters + ---------- + catalog + Data catalog to filter + + Returns + ------- + : + Filtered data catalog with only the latest version of each dataset + """ + if catalog.empty or not self.dataset_id_metadata: + return catalog + + # Get the latest version for each dataset group + # Uses transform to compute max version per group, then filters rows matching the max + # This assumes version can be sorted lexicographically + max_version_per_group = catalog.groupby(list(self.dataset_id_metadata), sort=False)[ + self.version_metadata + ].transform("max") + + return catalog[catalog[self.version_metadata] == max_version_per_group] + def _get_dataset_files(self, db: Database, limit: int | None = None) -> pd.DataFrame: dataset_type = self.dataset_cls.__mapper_args__["polymorphic_identity"] @@ -387,11 +416,4 @@ def load_catalog( if catalog.empty: return pd.DataFrame(columns=self.dataset_specific_metadata + self.file_specific_metadata) - # Get the latest version for each dataset group - # Uses transform to compute max version per group, then filters rows matching the max - # This assumes version can be sorted lexicographically - max_version_per_group = catalog.groupby(list(self.dataset_id_metadata), sort=False)[ - self.version_metadata - ].transform("max") - - return catalog[catalog[self.version_metadata] == max_version_per_group] + return self.filter_latest_versions(catalog) diff --git a/packages/climate-ref/src/climate_ref/solve_helpers.py b/packages/climate-ref/src/climate_ref/solve_helpers.py index 5a4178eda..a05362247 100644 --- a/packages/climate-ref/src/climate_ref/solve_helpers.py +++ b/packages/climate-ref/src/climate_ref/solve_helpers.py @@ -120,7 +120,10 @@ def load_solve_catalog(catalog_dir: Path) -> dict[SourceDatasetType, pd.DataFram for source_type, filename in catalog_files.items(): path = catalog_dir / filename if path.exists(): - result[source_type] = pd.read_parquet(path) + catalog = pd.read_parquet(path) + # Apply the same version deduplication as DatasetAdapter.load_catalog() + adapter = get_dataset_adapter(source_type.value) + result[source_type] = adapter.filter_latest_versions(catalog) return result if result else None diff --git a/packages/climate-ref/tests/unit/datasets/test_datasets.py b/packages/climate-ref/tests/unit/datasets/test_datasets.py index 047116453..0f9be6d4d 100644 --- a/packages/climate-ref/tests/unit/datasets/test_datasets.py +++ b/packages/climate-ref/tests/unit/datasets/test_datasets.py @@ -378,6 +378,97 @@ def test_register_dataset_updates_dataset_metadata(monkeypatch, test_db): assert dataset.grid_label == "gr2" +class TestFilterLatestVersions: + """Tests for DatasetAdapter.filter_latest_versions.""" + + def test_keeps_latest_version_per_group(self): + adapter = CMIP6DatasetAdapter() + catalog = pd.DataFrame( + { + "activity_id": ["CMIP"] * 4, + "institution_id": ["NCAR"] * 4, + "source_id": ["CESM2"] * 4, + "experiment_id": ["historical"] * 4, + "member_id": ["r1i1p1f1"] * 4, + "table_id": ["Amon"] * 4, + "variable_id": ["tas", "tas", "pr", "pr"], + "grid_label": ["gn"] * 4, + "version": ["v20200101", "v20210601", "v20200101", "v20210601"], + "instance_id": [ + "CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.Amon.tas.gn.v20200101", + "CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.Amon.tas.gn.v20210601", + "CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.Amon.pr.gn.v20200101", + "CMIP6.CMIP.NCAR.CESM2.historical.r1i1p1f1.Amon.pr.gn.v20210601", + ], + } + ) + + result = adapter.filter_latest_versions(catalog) + + assert len(result) == 2 + assert set(result["version"]) == {"v20210601"} + assert set(result["variable_id"]) == {"tas", "pr"} + + def test_keeps_all_when_no_duplicates(self): + adapter = CMIP6DatasetAdapter() + catalog = pd.DataFrame( + { + "activity_id": ["CMIP", "CMIP"], + "institution_id": ["NCAR", "NCAR"], + "source_id": ["CESM2", "CESM2"], + "experiment_id": ["historical", "historical"], + "member_id": ["r1i1p1f1", "r1i1p1f1"], + "table_id": ["Amon", "Amon"], + "variable_id": ["tas", "pr"], + "grid_label": ["gn", "gn"], + "version": ["v20210601", "v20210601"], + } + ) + + result = adapter.filter_latest_versions(catalog) + assert len(result) == 2 + + def test_handles_empty_catalog(self): + adapter = CMIP6DatasetAdapter() + catalog = pd.DataFrame() + + result = adapter.filter_latest_versions(catalog) + assert result.empty + + def test_handles_multiple_files_per_dataset(self): + """Multiple files (rows) for the same dataset version should all be kept.""" + adapter = CMIP6DatasetAdapter() + catalog = pd.DataFrame( + { + "activity_id": ["CMIP"] * 4, + "institution_id": ["NCAR"] * 4, + "source_id": ["CESM2"] * 4, + "experiment_id": ["historical"] * 4, + "member_id": ["r1i1p1f1"] * 4, + "table_id": ["Amon"] * 4, + "variable_id": ["tas"] * 4, + "grid_label": ["gn"] * 4, + "version": ["v20200101", "v20200101", "v20210601", "v20210601"], + "path": ["old_1.nc", "old_2.nc", "new_1.nc", "new_2.nc"], + } + ) + + result = adapter.filter_latest_versions(catalog) + + assert len(result) == 2 + assert set(result["path"]) == {"new_1.nc", "new_2.nc"} + assert set(result["version"]) == {"v20210601"} + + def test_no_dataset_id_metadata_returns_unfiltered(self): + """Adapters with empty dataset_id_metadata should return the catalog as-is.""" + adapter = MockDatasetAdapter() + adapter.dataset_id_metadata = () + catalog = pd.DataFrame({"version": ["v1", "v2"], "variable_id": ["tas", "tas"]}) + + result = adapter.filter_latest_versions(catalog) + assert len(result) == 2 + + class TestIngestionStats: """Tests for IngestionStats dataclass.""" diff --git a/packages/climate-ref/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml b/packages/climate-ref/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml index 2cbdadf6b..33a5fcf96 100644 --- a/packages/climate-ref/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml +++ b/packages/climate-ref/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml @@ -1578,7 +1578,6 @@ cmip6_historical_EC-Earth3-Veg_rsut_r1i1p1f1: cmip6_historical_EC-Earth3-Veg_tas_r1i1p1f1: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r1i1p1f1.Amon.tas.gr.v20211207 cmip6_historical_EC-Earth3_rsut_r1i1p1f1: cmip6: @@ -1731,7 +1730,6 @@ cmip6_historical_KIOST-ESM_rsut_r1i1p1f1: - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.rsut.gr1.v20210601 cmip6_historical_KIOST-ESM_tas_r1i1p1f1: cmip6: - - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.CMIP.KIOST.KIOST-ESM.historical.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_historical_MCM-UA-1-0_tas_r1i1p1f1: cmip6: @@ -1807,7 +1805,6 @@ cmip6_historical_NorCPM1_rsut_r1i1p1f1: - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 cmip6_historical_NorCPM1_tas_r1i1p1f1: cmip6: - - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20190914 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.Amon.tas.gn.v20200724 - CMIP6.CMIP.NCC.NorCPM1.historical.r1i1p1f1.fx.areacella.gn.v20200724 cmip6_historical_NorESM2-LM_rsut_r1i1p1f1: @@ -2579,7 +2576,6 @@ cmip6_ssp126_EC-Earth3-Veg-LR_tas_r1i1p1f1: cmip6_ssp126_EC-Earth3-Veg_tas_r1i1p1f1: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp126.r1i1p1f1.Amon.tas.gr.v20200225 cmip6_ssp126_EC-Earth3_tas_r1i1p1f1: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3.historical.r1i1p1f1.fx.areacella.gr.v20210324 @@ -2621,7 +2617,6 @@ cmip6_ssp126_INM-CM5-0_tas_r1i1p1f1: cmip6_ssp126_IPSL-CM5A2-INCA_tas_r1i1p1f1: cmip6: - CMIP6.CMIP.IPSL.IPSL-CM5A2-INCA.1pctCO2.r1i1p1f1.fx.areacella.gr.v20201218 - - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.tas.gr.v20201218 - CMIP6.ScenarioMIP.IPSL.IPSL-CM5A2-INCA.ssp126.r1i1p1f1.Amon.tas.gr.v20220105 cmip6_ssp126_IPSL-CM6A-LR_tas_r1i1p1f1: cmip6: @@ -2632,7 +2627,6 @@ cmip6_ssp126_KACE-1-0-G_tas_r1i1p1f1: - CMIP6.ScenarioMIP.NIMS-KMA.KACE-1-0-G.ssp126.r1i1p1f1.Amon.tas.gr.v20191007 cmip6_ssp126_KIOST-ESM_tas_r1i1p1f1: cmip6: - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp126.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_ssp126_MCM-UA-1-0_tas_r1i1p1f2: cmip6: @@ -2799,7 +2793,6 @@ cmip6_ssp245_KACE-1-0-G_tas_r1i1p1f1: - CMIP6.ScenarioMIP.NIMS-KMA.KACE-1-0-G.ssp245.r1i1p1f1.Amon.tas.gr.v20191217 cmip6_ssp245_KIOST-ESM_tas_r1i1p1f1: cmip6: - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp245.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_ssp245_MCM-UA-1-0_tas_r1i1p1f2: cmip6: @@ -3078,7 +3071,6 @@ cmip6_ssp585_EC-Earth3-Veg-LR_tas_r1i1p1f1: cmip6_ssp585_EC-Earth3-Veg_tas_r1i1p1f1: cmip6: - CMIP6.CMIP.EC-Earth-Consortium.EC-Earth3-Veg.historical.r11i1p1f1.fx.areacella.gr.v20230203 - - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.tas.gr.v20200225 - CMIP6.ScenarioMIP.EC-Earth-Consortium.EC-Earth3-Veg.ssp585.r1i1p1f1.Amon.tas.gr.v20221112 cmip6_ssp585_EC-Earth3_tas_r1i1p1f1: cmip6: @@ -3127,7 +3119,6 @@ cmip6_ssp585_KACE-1-0-G_tas_r1i1p1f1: - CMIP6.ScenarioMIP.NIMS-KMA.KACE-1-0-G.ssp585.r1i1p1f1.Amon.tas.gr.v20190920 cmip6_ssp585_KIOST-ESM_tas_r1i1p1f1: cmip6: - - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.tas.gr1.v20191106 - CMIP6.ScenarioMIP.KIOST.KIOST-ESM.ssp585.r1i1p1f1.Amon.tas.gr1.v20210601 cmip6_ssp585_MCM-UA-1-0_tas_r1i1p1f2: cmip6: @@ -3136,8 +3127,6 @@ cmip6_ssp585_MCM-UA-1-0_tas_r1i1p1f2: cmip6_ssp585_MIROC-ES2L_tas_r1i1p1f2: cmip6: - CMIP6.C4MIP CDRMIP.MIROC.MIROC-ES2L.esm-1pct-brch-1000PgC.r1i1p1f2.fx.areacella.gn.v20200622 - - CMIP6.CMIP.MIROC.MIROC-ES2L.1pctCO2.r1i1p1f2.fx.areacella.gn.v20190823 - - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.tas.gn.v20190823 - CMIP6.ScenarioMIP.MIROC.MIROC-ES2L.ssp585.r1i1p1f2.Amon.tas.gn.v20220314 cmip6_ssp585_MIROC6_tas_r1i1p1f1: cmip6: