climate-ref-esmvaltool 0.5.5__tar.gz → 0.6.0__tar.gz

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: climate-ref-esmvaltool
-Version: 0.5.5
+Version: 0.6.0
 Summary: ESMValTool diagnostic provider for the Rapid Evaluation Framework
-Author-email: ESMValTool development team <esmvaltool-dev@listserv.dfn.de>
-License: Apache-2.0
+Author-email: ESMValTool development team <esmvaltool-dev@listserv.dfn.de>, Jared Lewis <jared.lewis@climate-resource.com>
+License-Expression: Apache-2.0
 License-File: LICENCE
 License-File: NOTICE
 Classifier: Development Status :: 3 - Alpha

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/pyproject.toml

@@ -1,11 +1,13 @@
 [project]
 name = "climate-ref-esmvaltool"
-version = "0.5.5"
+version = "0.6.0"
 description = "ESMValTool diagnostic provider for the Rapid Evaluation Framework"
 readme = "README.md"
 authors = [
-    { name = "ESMValTool development team", email = "esmvaltool-dev@listserv.dfn.de " }
+    { name = "ESMValTool development team", email = "esmvaltool-dev@listserv.dfn.de" },
+    { name = "Jared Lewis", email = "jared.lewis@climate-resource.com" },
 ]
+license = "Apache-2.0"
 requires-python = ">=3.11"
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -27,9 +29,6 @@ dependencies = [
     "xarray >= 2023.3.0",
 ]
 
-[project.license]
-text = "Apache-2.0"
-
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/src/climate_ref_esmvaltool/dataset_registry/data.txt

@@ -1,3 +1,4 @@
+ESMValTool/obs4MIPs/GPCP-V2.3/v20180519/pr_GPCP-SG_L3_v2.3_197901-201710.nc 4dd4678b79ef139446c8406da5aae4fed210abb2f2160ef95f6988bf83e4525b
 ESMValTool/OBS/Tier2/CERES-EBAF/OBS_CERES-EBAF_sat_Ed4.2_Amon_rlut_200003-202311.nc ede887cf2d83c848a0d71316799232e4d717662bd2f78d5aa1fc166b41d9953b
 ESMValTool/OBS/Tier2/CERES-EBAF/OBS_CERES-EBAF_sat_Ed4.2_Amon_rlutcs_200003-202311.nc e70e3273092edf01527970693271641fc6474d1974887d7d272e7d656bab83c2
 ESMValTool/OBS/Tier2/CERES-EBAF/OBS_CERES-EBAF_sat_Ed4.2_Amon_rsut_200003-202311.nc e31e648886c4fa9c09686672a06ab18fbba687ff0d6de2891616d4c8b74e215d
@@ -84,3 +85,5 @@ ESMValTool/OBS/Tier2/OSI-450-sh/OBS_OSI-450-sh_reanaly_v3_OImon_sic_201101-20111
 ESMValTool/OBS/Tier2/OSI-450-sh/OBS_OSI-450-sh_reanaly_v3_OImon_sic_201201-201212.nc 86187c3d1174053f2cba6dad010af49ceab77d368aa9314bf53c330b5f2217b9
 ESMValTool/OBS/Tier2/OSI-450-sh/OBS_OSI-450-sh_reanaly_v3_OImon_sic_201301-201312.nc 8820353570884b2ef182caaffb5986ed6268bbe199fd867f61b56e798ca01f1a
 ESMValTool/OBS/Tier2/OSI-450-sh/OBS_OSI-450-sh_reanaly_v3_OImon_sic_201401-201412.nc 7102d0db3dc02c5b0eb0cfe3535ee50171007ef5b43eb9aae1220ac21b0b98e9
+ESMValTool/OBS/Tier2/TROPFLUX/OBS6_TROPFLUX_reanaly_v1_Amon_tauu_197901-201812.nc bf313e661b42341d5090038b501ed1ff09e58201009c3fccfe45b78e116fdd78
+ESMValTool/OBS/Tier2/TROPFLUX/OBS6_TROPFLUX_reanaly_v1_Omon_tos_197901-201812.nc 5f10a5a2aa47f5d21378ad3178bf8e4b577b0ed72ef8402dc04f5ff6fc99ec07

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/src/climate_ref_esmvaltool/diagnostics/__init__.py

@@ -3,8 +3,9 @@
 from climate_ref_esmvaltool.diagnostics.climate_at_global_warming_levels import ClimateAtGlobalWarmingLevels
 from climate_ref_esmvaltool.diagnostics.cloud_radiative_effects import CloudRadiativeEffects
 from climate_ref_esmvaltool.diagnostics.ecs import EquilibriumClimateSensitivity
+from climate_ref_esmvaltool.diagnostics.enso import ENSOBasicClimatology, ENSOCharacteristics
 from climate_ref_esmvaltool.diagnostics.example import GlobalMeanTimeseries
-from climate_ref_esmvaltool.diagnostics.sea_ice_area_seasonal_cycle import SeaIceAreaSeasonalCycle
+from climate_ref_esmvaltool.diagnostics.sea_ice_area_basic import SeaIceAreaBasic
 from climate_ref_esmvaltool.diagnostics.tcr import TransientClimateResponse
 from climate_ref_esmvaltool.diagnostics.tcre import TransientClimateResponseEmissions
 from climate_ref_esmvaltool.diagnostics.zec import ZeroEmissionCommitment
@@ -12,9 +13,11 @@ from climate_ref_esmvaltool.diagnostics.zec import ZeroEmissionCommitment
 __all__ = [
     "ClimateAtGlobalWarmingLevels",
     "CloudRadiativeEffects",
+    "ENSOBasicClimatology",
+    "ENSOCharacteristics",
     "EquilibriumClimateSensitivity",
     "GlobalMeanTimeseries",
-    "SeaIceAreaSeasonalCycle",
+    "SeaIceAreaBasic",
     "TransientClimateResponse",
     "TransientClimateResponseEmissions",
     "ZeroEmissionCommitment",

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/src/climate_ref_esmvaltool/diagnostics/base.py

@@ -101,15 +101,17 @@ class ESMValToolDiagnostic(CommandLineDiagnostic):
         config = {
             "drs": {
                 "CMIP6": "ESGF",
+                "obs4MIPs": "ESGF",
             },
             "output_dir": str(definition.to_output_path("executions")),
             "rootpath": {
-                "default": str(climate_data),
+                "CMIP6": str(climate_data),
+                "obs4MIPs": str(climate_data),
             },
             "search_esgf": "never",
         }
 
-        # Configure the paths to OBS/OBS6/native6 data
+        # Configure the paths to OBS/OBS6/native6 and non-compliant obs4MIPs data
         registry = dataset_registry_manager["esmvaltool"]
         data_dir = registry.abspath / "ESMValTool"  # type: ignore[attr-defined]
         if not data_dir.exists():
@@ -129,10 +131,14 @@ class ESMValToolDiagnostic(CommandLineDiagnostic):
             config["rootpath"].update(  # type: ignore[attr-defined]
                 {
                     "OBS": str(data_dir / "OBS"),
-                    "OBS6": str(data_dir / "OBS6"),
+                    "OBS6": str(data_dir / "OBS"),
                     "native6": str(data_dir / "RAWOBS"),
                 }
             )
+            config["rootpath"]["obs4MIPs"] = [  # type: ignore[index]
+                config["rootpath"]["obs4MIPs"],  # type: ignore[index]
+                str(data_dir),
+            ]
 
         config_dir = definition.to_output_path("config")
         config_dir.mkdir()

climate_ref_esmvaltool-0.6.0/src/climate_ref_esmvaltool/diagnostics/enso.py

@@ -0,0 +1,155 @@
+from pathlib import Path
+
+import pandas
+import pandas as pd
+
+from climate_ref_core.constraints import (
+    AddSupplementaryDataset,
+    RequireContiguousTimerange,
+    RequireFacets,
+    RequireOverlappingTimerange,
+)
+from climate_ref_core.datasets import ExecutionDatasetCollection, FacetFilter, SourceDatasetType
+from climate_ref_core.diagnostics import DataRequirement
+from climate_ref_core.pycmec.metric import CMECMetric, MetricCV
+from climate_ref_core.pycmec.output import CMECOutput
+from climate_ref_esmvaltool.diagnostics.base import ESMValToolDiagnostic
+from climate_ref_esmvaltool.recipe import dataframe_to_recipe
+from climate_ref_esmvaltool.types import MetricBundleArgs, OutputBundleArgs, Recipe
+
+
+class ENSOBasicClimatology(ESMValToolDiagnostic):
+    """
+    Calculate the ENSO CLIVAR metrics - background climatology.
+    """
+
+    name = "ENSO Basic Climatology"
+    slug = "enso-basic-climatology"
+    base_recipe = "ref/recipe_enso_basicclimatology.yml"
+
+    variables = (
+        "pr",
+        "tos",
+        "tauu",
+    )
+    data_requirements = (
+        DataRequirement(
+            source_type=SourceDatasetType.CMIP6,
+            filters=(
+                FacetFilter(
+                    facets={
+                        "variable_id": variables,
+                        "experiment_id": "historical",
+                    },
+                ),
+            ),
+            group_by=("source_id", "member_id", "grid_label"),
+            constraints=(
+                RequireFacets("variable_id", variables),
+                RequireContiguousTimerange(group_by=("instance_id",)),
+                RequireOverlappingTimerange(group_by=("instance_id",)),
+            ),
+        ),
+    )
+    facets = ()
+
+    @staticmethod
+    def update_recipe(recipe: Recipe, input_files: pandas.DataFrame) -> None:
+        """Update the recipe."""
+        recipe_variables = dataframe_to_recipe(input_files)
+        recipe.pop("datasets")
+        for diagnostic in recipe["diagnostics"].values():
+            for variable in diagnostic["variables"].values():
+                variable["additional_datasets"].extend(
+                    recipe_variables[variable["short_name"]]["additional_datasets"]
+                )
+
+
+class ENSOCharacteristics(ESMValToolDiagnostic):
+    """
+    Calculate the ENSO CLIVAR metrics - basic ENSO characteristics.
+    """
+
+    name = "ENSO Characteristics"
+    slug = "enso-characteristics"
+    base_recipe = "ref/recipe_enso_characteristics.yml"
+
+    data_requirements = (
+        DataRequirement(
+            source_type=SourceDatasetType.CMIP6,
+            filters=(
+                FacetFilter(
+                    facets={
+                        "variable_id": "tos",
+                        "experiment_id": "historical",
+                    },
+                ),
+            ),
+            group_by=("source_id", "member_id", "grid_label"),
+            constraints=(
+                RequireFacets("variable_id", ("tos",)),
+                RequireContiguousTimerange(group_by=("instance_id",)),
+                RequireOverlappingTimerange(group_by=("instance_id",)),
+                AddSupplementaryDataset.from_defaults("areacello", SourceDatasetType.CMIP6),
+            ),
+        ),
+    )
+    facets = ("grid_label", "member_id", "source_id", "region", "metric")
+
+    @staticmethod
+    def update_recipe(recipe: Recipe, input_files: pandas.DataFrame) -> None:
+        """Update the recipe."""
+        recipe_variables = dataframe_to_recipe(input_files)
+        recipe["datasets"] = recipe_variables["tos"]["additional_datasets"]
+        # TODO: update the observational data requirement once available on ESGF.
+        # Observations - use only one per run
+        recipe["datasets"].append(
+            # {
+            #     "dataset": "NOAA-ERSSTv5",
+            #     "version": "v5",
+            #     "project": "OBS6",
+            #     "type": "reanaly",
+            #     "tier": 2,
+            # }
+            {
+                "dataset": "TROPFLUX",
+                "version": "v1",
+                "project": "OBS6",
+                "type": "reanaly",
+                "tier": 2,
+            }
+        )
+
+    @staticmethod
+    def format_result(
+        result_dir: Path,
+        execution_dataset: ExecutionDatasetCollection,
+        metric_args: MetricBundleArgs,
+        output_args: OutputBundleArgs,
+    ) -> tuple[CMECMetric, CMECOutput]:
+        """Format the result."""
+        metrics = pd.read_csv(
+            result_dir / "work" / "diagnostic_metrics" / "plot_script" / "matrix.csv",
+            names=["dataset", "metric_name", "metric_value"],
+        )
+
+        # Update the diagnostic bundle arguments with the computed diagnostics.
+        metric_args[MetricCV.DIMENSIONS.value] = {
+            "json_structure": [
+                "region",
+                "metric",
+            ],
+            "region": {"global": {}},
+            "metric": {metric: {} for metric in metrics.metric_name},
+        }
+        metric_args[MetricCV.RESULTS.value] = {
+            "global": {
+                metric_name: metric_value
+                for metric_name, metric_value in zip(
+                    metrics.metric_name,
+                    metrics.metric_value,
+                )
+            },
+        }
+
+        return CMECMetric.model_validate(metric_args), CMECOutput.model_validate(output_args)

climate_ref_esmvaltool-0.5.5/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_seasonal_cycle.py → climate_ref_esmvaltool-0.6.0/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py

@@ -11,13 +11,13 @@ from climate_ref_esmvaltool.recipe import dataframe_to_recipe
 from climate_ref_esmvaltool.types import Recipe
 
 
-class SeaIceAreaSeasonalCycle(ESMValToolDiagnostic):
+class SeaIceAreaBasic(ESMValToolDiagnostic):
     """
     Calculate seasonal cycle and time series of NH and SH sea ice area.
     """
 
-    name = "Sea ice area seasonal cycle"
-    slug = "sea-ice-area-seasonal-cycle"
+    name = "Sea ice area basic"
+    slug = "sea-ice-area-basic"
     base_recipe = "ref/recipe_ref_sea_ice_area_basic.yml"
 
     data_requirements = (
@@ -44,14 +44,13 @@ class SeaIceAreaSeasonalCycle(ESMValToolDiagnostic):
     @staticmethod
     def update_recipe(recipe: Recipe, input_files: pandas.DataFrame) -> None:
         """Update the recipe."""
-        # Overlap between observations and historical experiment.
-        timerange = "1995/2014"
-
         # Update datasets
         recipe_variables = dataframe_to_recipe(input_files)
         recipe["datasets"] = recipe_variables["siconc"]["additional_datasets"]
+
+        # Use the timerange from the recipe, as defined in the variable.
         for dataset in recipe["datasets"]:
-            dataset["timerange"] = timerange
+            dataset.pop("timerange")
 
         # Update observational datasets
         nh_obs = {
@@ -65,7 +64,6 @@ class SeaIceAreaSeasonalCycle(ESMValToolDiagnostic):
                 },
             ],
             "tier": 2,
-            "timerange": timerange,
             "type": "reanaly",
             "version": "v3",
         }
@@ -76,3 +74,10 @@ class SeaIceAreaSeasonalCycle(ESMValToolDiagnostic):
         diagnostics["siarea_min"]["variables"]["sea_ice_area_sh_feb"]["additional_datasets"] = [sh_obs]
         diagnostics["siarea_seas"]["variables"]["sea_ice_area_nh"]["additional_datasets"] = [nh_obs]
         diagnostics["siarea_seas"]["variables"]["sea_ice_area_sh"]["additional_datasets"] = [sh_obs]
+
+        # Update the captions.
+        dataset = "{dataset}.{ensemble}.{grid}".format(**recipe["datasets"][0])
+        for diagnostic in diagnostics.values():
+            for script_settings in diagnostic["scripts"].values():
+                for plot_settings in script_settings["plots"].values():
+                    plot_settings["caption"] = plot_settings["caption"].replace("[dataset]", dataset)

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/src/climate_ref_esmvaltool/diagnostics/tcre.py

@@ -102,6 +102,17 @@ class TransientClimateResponseEmissions(ESMValToolDiagnostic):
         }
         recipe["diagnostics"].pop("barplot")
 
+        # Update descriptions.
+        dataset = tas_esm_1pctCO2["dataset"]
+        ensemble = tas_esm_1pctCO2["ensemble"]
+        settings = recipe["diagnostics"]["tcre"]["scripts"]["calculate_tcre"]
+        settings["caption"] = (
+            settings["caption"].replace("MPI-ESM1-2-LR", dataset).replace("r1i1p1f1", ensemble)
+        )
+        settings["pyplot_kwargs"]["title"] = (
+            settings["pyplot_kwargs"]["title"].replace("MPI-ESM1-2-LR", dataset).replace("r1i1p1f1", ensemble)
+        )
+
     @staticmethod
     def format_result(
         result_dir: Path,

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/src/climate_ref_esmvaltool/recipe.py

@@ -115,8 +115,8 @@ def dataframe_to_recipe(files: pd.DataFrame) -> dict[str, Any]:
     return variables
 
 
-_ESMVALTOOL_COMMIT = "a759ce46d5185e3784997ce38a3956e39322cdac"
-_ESMVALTOOL_VERSION = f"2.13.0.dev27+g{_ESMVALTOOL_COMMIT[:9]}"
+_ESMVALTOOL_COMMIT = "58fd0b8ece981bc97c4fbd213b11f2228d90db28"
+_ESMVALTOOL_VERSION = f"2.13.0.dev65+g{_ESMVALTOOL_COMMIT[:9]}"
 
 _RECIPES = pooch.create(
     path=pooch.os_cache("climate_ref_esmvaltool"),

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/src/climate_ref_esmvaltool/recipes.txt

@@ -2,7 +2,9 @@ examples/recipe_python.yml ab3f06d269bb2c1368f4dc39da9bcb232fb2adb1fa556ba769e6c
 recipe_calculate_gwl_exceedance_stats.yml 5aa266abc9a8029649b689a2b369a47623b0935d609354332ff4148994642d6b
 recipe_ecs.yml             0cc57034fcb64e32015b4ff949ece5df8cdb8c6f493618b50ceded119fb37918
 recipe_tcr.yml             35f9ef035a4e71aff5cac5dd26c49da2162fc00291bf3b0bd16b661b7b2f606b
-recipe_tcre.yml            4668e357e00c515a8264ac75cb319ce558289689e10189e6f9e982886c414c94
+recipe_tcre.yml            48fc9e3baf541bbcef7491853ea3a774053771dca33352b41466425faeaa38af
 recipe_zec.yml             b0af7f789b7610ab3f29a6617124aa40c40866ead958204fc199eaf82863de51
+ref/recipe_enso_basicclimatology.yml 9ea7deb7ee668e39ac44618b96496d898bd82285c22dcee4fce4695e0c9fa82b
+ref/recipe_enso_characteristics.yml 34c2518b138068ac96d212910b979d54a8fcedee2c0089b5acd56a42c41dc3e4
 ref/recipe_ref_cre.yml     4f35d9639f1008be3b5382a5bd8933a855cb5368ccf5d04a1c70227172e2e82c
-ref/recipe_ref_sea_ice_area_basic.yml 552e282a16ec355778b06f33897e1b8ba8388e5f8a5f814c4c42d91f63007457
+ref/recipe_ref_sea_ice_area_basic.yml 7d01a8527880663ca28284772f83a8356d9972fb4f022a4000e50a56ce044b09

climate_ref_esmvaltool-0.6.0/tests/unit/diagnostics/input_files_enso_characteristics.json

@@ -0,0 +1,142 @@
+{
+    "start_time":{
+        "1":"1850-01-16T12:00:00.000",
+        "109":null
+    },
+    "end_time":{
+        "1":"2014-12-16T12:00:00.000",
+        "109":null
+    },
+    "path":{
+        "1":"\/home\/bandela\/climate_data\/CMIP6\/CMIP\/CSIRO\/ACCESS-ESM1-5\/historical\/r1i1p1f1\/Omon\/tos\/gn\/v20191115\/tos_Omon_ACCESS-ESM1-5_historical_r1i1p1f1_gn_185001-201412.nc",
+        "109":"\/home\/bandela\/climate_data\/CMIP6\/CMIP\/CSIRO\/ACCESS-ESM1-5\/historical\/r1i1p1f1\/Ofx\/areacello\/gn\/v20191115\/areacello_Ofx_ACCESS-ESM1-5_historical_r1i1p1f1_gn.nc"
+    },
+    "activity_id":{
+        "1":"CMIP",
+        "109":"CMIP"
+    },
+    "branch_method":{
+        "1":"standard",
+        "109":"standard"
+    },
+    "branch_time_in_child":{
+        "1":0.0,
+        "109":0.0
+    },
+    "branch_time_in_parent":{
+        "1":21915.0,
+        "109":21915.0
+    },
+    "experiment":{
+        "1":"all-forcing simulation of the recent past",
+        "109":"all-forcing simulation of the recent past"
+    },
+    "experiment_id":{
+        "1":"historical",
+        "109":"historical"
+    },
+    "frequency":{
+        "1":"mon",
+        "109":"fx"
+    },
+    "grid":{
+        "1":"native atmosphere N96 grid (145x192 latxlon)",
+        "109":"native atmosphere N96 grid (145x192 latxlon)"
+    },
+    "grid_label":{
+        "1":"gn",
+        "109":"gn"
+    },
+    "institution_id":{
+        "1":"CSIRO",
+        "109":"CSIRO"
+    },
+    "nominal_resolution":{
+        "1":"250 km",
+        "109":"250 km"
+    },
+    "parent_activity_id":{
+        "1":"CMIP",
+        "109":"CMIP"
+    },
+    "parent_experiment_id":{
+        "1":"piControl",
+        "109":"piControl"
+    },
+    "parent_source_id":{
+        "1":"ACCESS-ESM1-5",
+        "109":"ACCESS-ESM1-5"
+    },
+    "parent_time_units":{
+        "1":"days since 0101-1-1",
+        "109":"days since 0101-1-1"
+    },
+    "parent_variant_label":{
+        "1":"r1i1p1f1",
+        "109":"r1i1p1f1"
+    },
+    "product":{
+        "1":"model-output",
+        "109":"model-output"
+    },
+    "realm":{
+        "1":"ocean",
+        "109":"ocean"
+    },
+    "source_id":{
+        "1":"ACCESS-ESM1-5",
+        "109":"ACCESS-ESM1-5"
+    },
+    "source_type":{
+        "1":"AOGCM",
+        "109":"AOGCM"
+    },
+    "sub_experiment":{
+        "1":"none",
+        "109":"none"
+    },
+    "sub_experiment_id":{
+        "1":"none",
+        "109":"none"
+    },
+    "table_id":{
+        "1":"Omon",
+        "109":"Ofx"
+    },
+    "variable_id":{
+        "1":"tos",
+        "109":"areacello"
+    },
+    "variant_label":{
+        "1":"r1i1p1f1",
+        "109":"r1i1p1f1"
+    },
+    "member_id":{
+        "1":"r1i1p1f1",
+        "109":"r1i1p1f1"
+    },
+    "vertical_levels":{
+        "1":1,
+        "109":1
+    },
+    "version":{
+        "1":"v20191115",
+        "109":"v20191115"
+    },
+    "standard_name":{
+        "1":"sea_surface_temperature",
+        "109":"cell_area"
+    },
+    "long_name":{
+        "1":"Sea Surface Temperature",
+        "109":"Grid-Cell Area for Ocean Variables"
+    },
+    "units":{
+        "1":"degC",
+        "109":"m2"
+    },
+    "instance_id":{
+        "1":"CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Omon.tos.gn.v20191115",
+        "109":"CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Ofx.areacello.gn.v20191115"
+    }
+}

climate_ref_esmvaltool-0.6.0/tests/unit/diagnostics/input_files_enso_climatology.json

@@ -0,0 +1,177 @@
+{
+    "start_time":{
+        "31":"1850-01-16T12:00:00.000",
+        "39":"1850-01-16T12:00:00.000",
+        "1":"1850-01-16T12:00:00.000"
+    },
+    "end_time":{
+        "31":"2014-12-16T12:00:00.000",
+        "39":"2014-12-16T12:00:00.000",
+        "1":"2014-12-16T12:00:00.000"
+    },
+    "path":{
+        "31":"\/home\/bandela\/.esgf\/CMIP6\/CMIP\/CSIRO\/ACCESS-ESM1-5\/historical\/r1i1p1f1\/Amon\/pr\/gn\/v20191115\/pr_Amon_ACCESS-ESM1-5_historical_r1i1p1f1_gn_185001-201412.nc",
+        "39":"\/home\/bandela\/.esgf\/CMIP6\/CMIP\/CSIRO\/ACCESS-ESM1-5\/historical\/r1i1p1f1\/Amon\/tauu\/gn\/v20191115\/tauu_Amon_ACCESS-ESM1-5_historical_r1i1p1f1_gn_185001-201412.nc",
+        "1":"\/home\/bandela\/climate_data\/CMIP6\/CMIP\/CSIRO\/ACCESS-ESM1-5\/historical\/r1i1p1f1\/Omon\/tos\/gn\/v20191115\/tos_Omon_ACCESS-ESM1-5_historical_r1i1p1f1_gn_185001-201412.nc"
+    },
+    "activity_id":{
+        "31":"CMIP",
+        "39":"CMIP",
+        "1":"CMIP"
+    },
+    "branch_method":{
+        "31":"standard",
+        "39":"standard",
+        "1":"standard"
+    },
+    "branch_time_in_child":{
+        "31":0.0,
+        "39":0.0,
+        "1":0.0
+    },
+    "branch_time_in_parent":{
+        "31":21915.0,
+        "39":21915.0,
+        "1":21915.0
+    },
+    "experiment":{
+        "31":"all-forcing simulation of the recent past",
+        "39":"all-forcing simulation of the recent past",
+        "1":"all-forcing simulation of the recent past"
+    },
+    "experiment_id":{
+        "31":"historical",
+        "39":"historical",
+        "1":"historical"
+    },
+    "frequency":{
+        "31":"mon",
+        "39":"mon",
+        "1":"mon"
+    },
+    "grid":{
+        "31":"native atmosphere N96 grid (145x192 latxlon)",
+        "39":"native atmosphere N96 grid (145x192 latxlon)",
+        "1":"native atmosphere N96 grid (145x192 latxlon)"
+    },
+    "grid_label":{
+        "31":"gn",
+        "39":"gn",
+        "1":"gn"
+    },
+    "institution_id":{
+        "31":"CSIRO",
+        "39":"CSIRO",
+        "1":"CSIRO"
+    },
+    "nominal_resolution":{
+        "31":"250 km",
+        "39":"250 km",
+        "1":"250 km"
+    },
+    "parent_activity_id":{
+        "31":"CMIP",
+        "39":"CMIP",
+        "1":"CMIP"
+    },
+    "parent_experiment_id":{
+        "31":"piControl",
+        "39":"piControl",
+        "1":"piControl"
+    },
+    "parent_source_id":{
+        "31":"ACCESS-ESM1-5",
+        "39":"ACCESS-ESM1-5",
+        "1":"ACCESS-ESM1-5"
+    },
+    "parent_time_units":{
+        "31":"days since 0101-1-1",
+        "39":"days since 0101-1-1",
+        "1":"days since 0101-1-1"
+    },
+    "parent_variant_label":{
+        "31":"r1i1p1f1",
+        "39":"r1i1p1f1",
+        "1":"r1i1p1f1"
+    },
+    "product":{
+        "31":"model-output",
+        "39":"model-output",
+        "1":"model-output"
+    },
+    "realm":{
+        "31":"atmos",
+        "39":"atmos",
+        "1":"ocean"
+    },
+    "source_id":{
+        "31":"ACCESS-ESM1-5",
+        "39":"ACCESS-ESM1-5",
+        "1":"ACCESS-ESM1-5"
+    },
+    "source_type":{
+        "31":"AOGCM",
+        "39":"AOGCM",
+        "1":"AOGCM"
+    },
+    "sub_experiment":{
+        "31":"none",
+        "39":"none",
+        "1":"none"
+    },
+    "sub_experiment_id":{
+        "31":"none",
+        "39":"none",
+        "1":"none"
+    },
+    "table_id":{
+        "31":"Amon",
+        "39":"Amon",
+        "1":"Omon"
+    },
+    "variable_id":{
+        "31":"pr",
+        "39":"tauu",
+        "1":"tos"
+    },
+    "variant_label":{
+        "31":"r1i1p1f1",
+        "39":"r1i1p1f1",
+        "1":"r1i1p1f1"
+    },
+    "member_id":{
+        "31":"r1i1p1f1",
+        "39":"r1i1p1f1",
+        "1":"r1i1p1f1"
+    },
+    "vertical_levels":{
+        "31":1,
+        "39":1,
+        "1":1
+    },
+    "version":{
+        "31":"v20191115",
+        "39":"v20191115",
+        "1":"v20191115"
+    },
+    "standard_name":{
+        "31":"precipitation_flux",
+        "39":"surface_downward_eastward_stress",
+        "1":"sea_surface_temperature"
+    },
+    "long_name":{
+        "31":"Precipitation",
+        "39":"Surface Downward Eastward Wind Stress",
+        "1":"Sea Surface Temperature"
+    },
+    "units":{
+        "31":"kg m-2 s-1",
+        "39":"Pa",
+        "1":"degC"
+    },
+    "instance_id":{
+        "31":"CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115",
+        "39":"CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tauu.gn.v20191115",
+        "1":"CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Omon.tos.gn.v20191115"
+    }
+}

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/tests/unit/diagnostics/test_base.py

@@ -41,7 +41,7 @@ def test_build_cmd(mocker, tmp_path, metric_definition, mock_diagnostic, data_di
     assert cmd == ["esmvaltool", "run", f"--config-dir={config_dir}", f"{recipe}"]
     assert (output_dir / "climate_data").is_dir()
     config = yaml.load((config_dir / "config.yml").read_text(encoding="utf-8"))
-    assert len(config["rootpath"]) == 4 if data_dir_exists else 1
+    assert len(config["rootpath"]) == 5 if data_dir_exists else 1
 
 
 def test_build_metric_result(metric_definition, mock_diagnostic):

climate_ref_esmvaltool-0.6.0/tests/unit/diagnostics/test_enso.py

@@ -0,0 +1,47 @@
+from pathlib import Path
+
+import pandas
+from climate_ref_esmvaltool.diagnostics import ENSOBasicClimatology, ENSOCharacteristics
+from climate_ref_esmvaltool.recipe import load_recipe
+
+
+def test_enso_basicclimatology_update_recipe():
+    # Insert the following code in CloudRadiativeEffects.update_recipe to
+    # save an example input dataframe:
+    # input_files.to_json(Path("input_files_enso_climatology.json"), indent=4, date_format="iso")
+    input_files = pandas.read_json(Path(__file__).parent / "input_files_enso_climatology.json")
+    recipe = load_recipe("ref/recipe_enso_basicclimatology.yml")
+    ENSOBasicClimatology().update_recipe(recipe, input_files)
+    assert "datasets" not in recipe
+    for diagnostic in recipe["diagnostics"].values():
+        for variable in diagnostic["variables"].values():
+            assert variable["additional_datasets"][-1]["dataset"] == "ACCESS-ESM1-5"
+
+
+def test_enso_characteristics_update_recipe():
+    # Insert the following code in CloudRadiativeEffects.update_recipe to
+    # save an example input dataframe:
+    # input_files.to_json(Path("input_files_enso_characteristics.json"), indent=4, date_format="iso")
+    input_files = pandas.read_json(Path(__file__).parent / "input_files_enso_characteristics.json")
+    recipe = load_recipe("ref/recipe_enso_characteristics.yml")
+    ENSOCharacteristics().update_recipe(recipe, input_files)
+    assert recipe["datasets"] == [
+        {
+            "activity": "CMIP",
+            "dataset": "ACCESS-ESM1-5",
+            "ensemble": "r1i1p1f1",
+            "exp": "historical",
+            "grid": "gn",
+            "institute": "CSIRO",
+            "mip": "Omon",
+            "project": "CMIP6",
+            "timerange": "18500116T120000/20141216T120000",
+        },
+        {
+            "dataset": "TROPFLUX",
+            "project": "OBS6",
+            "tier": 2,
+            "type": "reanaly",
+            "version": "v1",
+        },
+    ]

{climate_ref_esmvaltool-0.5.5 → climate_ref_esmvaltool-0.6.0}/tests/unit/diagnostics/test_sea_ice_area.py

@@ -1,16 +1,16 @@
 from pathlib import Path
 
 import pandas
-from climate_ref_esmvaltool.diagnostics import SeaIceAreaSeasonalCycle
+from climate_ref_esmvaltool.diagnostics import SeaIceAreaBasic
 from climate_ref_esmvaltool.recipe import load_recipe
 
 
 def test_update_recipe():
     input_files = pandas.read_json(Path(__file__).parent / "input_files_sea_ice_area.json")
     recipe = load_recipe("ref/recipe_ref_sea_ice_area_basic.yml")
-    SeaIceAreaSeasonalCycle().update_recipe(recipe, input_files)
+    SeaIceAreaBasic().update_recipe(recipe, input_files)
     assert len(recipe["datasets"]) == 1
     dataset = recipe["datasets"][0]
     assert dataset["dataset"] == input_files.iloc[0].source_id
-    assert dataset["timerange"] == "1995/2014"
+    assert "timerange" not in dataset
     assert len(recipe["diagnostics"]) == 2

climate_ref_esmvaltool-0.6.0/tests/unit/test_provider.py

@@ -0,0 +1,18 @@
+import importlib.metadata
+
+from climate_ref_esmvaltool import __version__, provider
+
+
+def test_provider():
+    assert provider.name == "ESMValTool"
+    assert provider.slug == "esmvaltool"
+    assert provider.version == __version__
+
+    diagnostic_modules = importlib.resources.files("climate_ref_esmvaltool").glob("diagnostics/*.py")
+    diagnostics_per_module = {
+        "__init__.py": 0,
+        "base.py": 0,
+        "enso.py": 2,
+    }
+    n_diagnostics = sum(diagnostics_per_module.get(f.name, 1) for f in diagnostic_modules)
+    assert len(provider) == n_diagnostics

climate_ref_esmvaltool-0.5.5/tests/unit/test_provider.py

@@ -1,17 +0,0 @@
-import importlib.metadata
-
-from climate_ref_esmvaltool import __version__, provider
-
-
-def test_provider():
-    assert provider.name == "ESMValTool"
-    assert provider.slug == "esmvaltool"
-    assert provider.version == __version__
-
-    metric_modules = importlib.resources.files("climate_ref_esmvaltool").glob("diagnostics/*.py")
-    ignore = {
-        "__init__.py",
-        "base.py",
-    }
-    n_metric_modules = len([f for f in metric_modules if f.name not in ignore])
-    assert len(provider) == n_metric_modules