climate-ref-esmvaltool 0.19.2__tar.gz → 0.20.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (365) hide show
  1. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/PKG-INFO +1 -1
  2. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/pyproject.toml +1 -1
  3. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/__init__.py +8 -32
  4. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/dataset_registry/data.txt +44 -0
  5. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/base.py +19 -3
  6. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/climate_at_global_warming_levels.py +1 -1
  7. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py +2 -2
  8. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py +2 -2
  9. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/cloud_scatterplots.py +5 -5
  10. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/ecs.py +2 -2
  11. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/enso.py +35 -47
  12. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/example.py +2 -2
  13. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/ozone.py +91 -78
  14. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py +4 -4
  15. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py +22 -7
  16. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/sea_ice_sensitivity.py +86 -47
  17. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/tcr.py +2 -2
  18. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/recipe.py +3 -3
  19. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/recipes.txt +4 -4
  20. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/requirements/conda-lock.yml +5646 -7861
  21. climate_ref_esmvaltool-0.20.0/src/climate_ref_esmvaltool/requirements/environment.yml +20 -0
  22. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-basic-climatology/cmip6/catalog.yaml +0 -1
  23. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-basic-climatology/cmip6/manifest.json +213 -0
  24. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-basic-climatology/cmip6/regression/output.json +118 -21
  25. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-basic-climatology/cmip6/regression/series.json +877 -1861
  26. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-basic-climatology/cmip7/catalog.yaml +231 -0
  27. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-basic-climatology/cmip7/manifest.json +213 -0
  28. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-basic-climatology/cmip7/regression/output.json +345 -0
  29. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-basic-climatology/cmip7/regression/series.json +3506 -0
  30. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip6/manifest.json +201 -0
  31. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-characteristics/cmip6/regression/diagnostic.json +6 -6
  32. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip6/regression/output.json +265 -0
  33. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip7/catalog.yaml +121 -0
  34. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip7/manifest.json +201 -0
  35. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip7/regression/diagnostic.json +58 -0
  36. climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip7/regression/output.json +265 -0
  37. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-annual-cycle/cmip6/manifest.json +11 -11
  38. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-annual-cycle/cmip7/catalog.yaml +22 -22
  39. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-annual-cycle/cmip7/manifest.json +13 -13
  40. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-lat-time/cmip6/manifest.json +11 -11
  41. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-nh-mar → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-lat-time}/cmip7/catalog.yaml +22 -22
  42. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-lat-time/cmip7/manifest.json +13 -13
  43. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-nh-mar/cmip6/manifest.json +10 -10
  44. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-nh-mar/cmip6/regression/series.json +65 -65
  45. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-sh-oct → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-nh-mar}/cmip7/catalog.yaml +22 -22
  46. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-nh-mar/cmip7/manifest.json +12 -12
  47. climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-nh-mar/cmip7/regression/series.json +223 -0
  48. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-sh-oct/cmip6/manifest.json +9 -9
  49. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-lat-time → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-sh-oct}/cmip7/catalog.yaml +22 -22
  50. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-sh-oct/cmip7/manifest.json +12 -12
  51. climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-sh-oct/cmip7/regression/series.json +223 -0
  52. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-zonal/cmip6/manifest.json +11 -11
  53. climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-zonal/cmip7/manifest.json +49 -0
  54. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip6/manifest.json +21 -21
  55. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip7/catalog.yaml +33 -33
  56. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-area-basic/cmip7/manifest.json +69 -0
  57. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-area-basic/cmip7/regression/diagnostic.json +9 -0
  58. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip7/regression/output.json +24 -24
  59. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip7/regression/series.json +261 -181
  60. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip6/manifest.json +61 -0
  61. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip6/regression/diagnostic.json +71 -0
  62. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-sensitivity/cmip6/regression/output.json +5 -5
  63. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip7/catalog.yaml +155 -0
  64. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip7/manifest.json +61 -0
  65. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip7/regression/diagnostic.json +71 -0
  66. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-sensitivity/cmip7/regression/output.json +5 -5
  67. climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip7/regression/series.json +1 -0
  68. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_enso_basic_climatology_cmip6.yml +140 -45
  69. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_enso_basic_climatology_cmip7.yml +128 -40
  70. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_enso_characteristics_cmip6.yml +159 -8
  71. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_enso_characteristics_cmip7.yml +159 -8
  72. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_annual_cycle_cmip6_obs4mips.yml +5 -6
  73. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_annual_cycle_cmip7_obs4mips.yml +5 -6
  74. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_lat_time_cmip6_obs4mips.yml +5 -6
  75. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_lat_time_cmip7_obs4mips.yml +5 -6
  76. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_nh_mar_cmip6_obs4mips.yml +6 -7
  77. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_nh_mar_cmip7_obs4mips.yml +5 -6
  78. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_sh_oct_cmip6_obs4mips.yml +5 -6
  79. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_ozone_sh_oct_cmip7_obs4mips.yml +4 -5
  80. climate_ref_esmvaltool-0.20.0/tests/unit/diagnostics/recipes/recipe_sea_ice_sensitivity_cmip6.yml +254 -0
  81. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_sea_ice_sensitivity_cmip7.yml +123 -84
  82. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_base.py +20 -1
  83. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_ozone.py +5 -5
  84. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_provider.py +9 -42
  85. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_enso_basic_climatology_.yml +334 -184
  86. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_sea_ice_sensitivity_.yml +106 -0
  87. climate_ref_esmvaltool-0.19.2/src/climate_ref_esmvaltool/requirements/environment.yml +0 -6
  88. climate_ref_esmvaltool-0.19.2/tests/test-data/enso-basic-climatology/cmip6/manifest.json +0 -153
  89. climate_ref_esmvaltool-0.19.2/tests/test-data/enso-basic-climatology/cmip7/catalog.yaml +0 -121
  90. climate_ref_esmvaltool-0.19.2/tests/test-data/enso-characteristics/cmip6/manifest.json +0 -65
  91. climate_ref_esmvaltool-0.19.2/tests/test-data/enso-characteristics/cmip6/regression/output.json +0 -85
  92. climate_ref_esmvaltool-0.19.2/tests/test-data/enso-characteristics/cmip7/catalog.yaml +0 -84
  93. climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-nh-mar/cmip7/regression/series.json +0 -171
  94. climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-sh-oct/cmip7/regression/series.json +0 -171
  95. climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-zonal/cmip7/manifest.json +0 -12
  96. climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-area-basic/cmip7/manifest.json +0 -69
  97. climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip6/manifest.json +0 -61
  98. climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip6/regression/diagnostic.json +0 -50
  99. climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip7/catalog.yaml +0 -155
  100. climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip7/manifest.json +0 -12
  101. climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip7/regression/diagnostic.json +0 -50
  102. climate_ref_esmvaltool-0.19.2/tests/unit/diagnostics/recipes/recipe_sea_ice_sensitivity_cmip6.yml +0 -217
  103. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/.gitignore +0 -0
  104. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/LICENCE +0 -0
  105. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/NOTICE +0 -0
  106. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/README.md +0 -0
  107. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/_version.py +0 -0
  108. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/__init__.py +0 -0
  109. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/tcre.py +0 -0
  110. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/diagnostics/zec.py +0 -0
  111. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/py.typed +0 -0
  112. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/reference_registry.py +0 -0
  113. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/src/climate_ref_esmvaltool/types.py +0 -0
  114. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/integration/test_diagnostics.py +0 -0
  115. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-at-global-warming-levels/cmip6/catalog.yaml +0 -0
  116. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-at-global-warming-levels/cmip6/manifest.json +0 -0
  117. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-at-global-warming-levels/cmip6/regression/diagnostic.json +0 -0
  118. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-at-global-warming-levels/cmip6/regression/output.json +0 -0
  119. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-at-global-warming-levels/cmip6/regression/series.json +0 -0
  120. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip6/catalog.yaml +0 -0
  121. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip6/manifest.json +0 -0
  122. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip6/regression/diagnostic.json +0 -0
  123. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip6/regression/output.json +0 -0
  124. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip6/regression/series.json +0 -0
  125. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip7/catalog.yaml +0 -0
  126. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip7/manifest.json +0 -0
  127. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip7/regression/diagnostic.json +0 -0
  128. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip7/regression/output.json +0 -0
  129. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/climate-drivers-for-fire/cmip7/regression/series.json +0 -0
  130. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip6/catalog.yaml +0 -0
  131. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip6/manifest.json +0 -0
  132. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip6/regression/diagnostic.json +0 -0
  133. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip6/regression/output.json +0 -0
  134. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip6/regression/series.json +0 -0
  135. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip7/catalog.yaml +0 -0
  136. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip7/manifest.json +0 -0
  137. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip7/regression/diagnostic.json +0 -0
  138. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip7/regression/output.json +0 -0
  139. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-radiative-effects/cmip7/regression/series.json +0 -0
  140. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-cli-ta/cmip6/catalog.yaml +0 -0
  141. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-cli-ta/cmip6/manifest.json +0 -0
  142. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-cli-ta/cmip6/regression/diagnostic.json +0 -0
  143. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-cli-ta/cmip6/regression/output.json +0 -0
  144. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-cli-ta/cmip6/regression/series.json +0 -0
  145. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-cli-ta/cmip7/catalog.yaml +0 -0
  146. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip6/catalog.yaml +0 -0
  147. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip6/manifest.json +0 -0
  148. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip6/regression/diagnostic.json +0 -0
  149. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip6/regression/output.json +0 -0
  150. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip6/regression/series.json +0 -0
  151. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip7/catalog.yaml +0 -0
  152. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip7/manifest.json +0 -0
  153. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip7/regression/diagnostic.json +0 -0
  154. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip7/regression/output.json +0 -0
  155. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip7/regression/series.json +0 -0
  156. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip6/catalog.yaml +0 -0
  157. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip6/manifest.json +0 -0
  158. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip6/regression/diagnostic.json +0 -0
  159. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip6/regression/output.json +0 -0
  160. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip6/regression/series.json +0 -0
  161. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip7/catalog.yaml +0 -0
  162. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip7/manifest.json +0 -0
  163. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip7/regression/diagnostic.json +0 -0
  164. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip7/regression/output.json +0 -0
  165. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip7/regression/series.json +0 -0
  166. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip6/catalog.yaml +0 -0
  167. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip6/manifest.json +0 -0
  168. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip6/regression/diagnostic.json +0 -0
  169. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip6/regression/output.json +0 -0
  170. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip6/regression/series.json +0 -0
  171. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip7/catalog.yaml +0 -0
  172. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip7/manifest.json +0 -0
  173. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip7/regression/diagnostic.json +0 -0
  174. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip7/regression/output.json +0 -0
  175. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip7/regression/series.json +0 -0
  176. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-basic-climatology/cmip6/regression/diagnostic.json +0 -0
  177. {climate_ref_esmvaltool-0.19.2/tests/test-data/global-mean-timeseries/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/enso-basic-climatology/cmip7}/regression/diagnostic.json +0 -0
  178. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-characteristics/cmip6/catalog.yaml +0 -0
  179. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/enso-characteristics/cmip6/regression/series.json +0 -0
  180. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-annual-cycle/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/enso-characteristics/cmip7}/regression/series.json +0 -0
  181. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip6/catalog.yaml +0 -0
  182. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip6/manifest.json +0 -0
  183. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip6/regression/diagnostic.json +0 -0
  184. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip6/regression/output.json +0 -0
  185. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip6/regression/series.json +0 -0
  186. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip7/catalog.yaml +0 -0
  187. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip7/manifest.json +0 -0
  188. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip7/regression/diagnostic.json +0 -0
  189. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip7/regression/output.json +0 -0
  190. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/equilibrium-climate-sensitivity/cmip7/regression/series.json +0 -0
  191. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip6/catalog.yaml +0 -0
  192. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip6/manifest.json +0 -0
  193. {climate_ref_esmvaltool-0.19.2/tests/test-data/global-mean-timeseries/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/global-mean-timeseries/cmip6}/regression/diagnostic.json +0 -0
  194. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip6/regression/output.json +0 -0
  195. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip6/regression/series.json +0 -0
  196. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip7/catalog.yaml +0 -0
  197. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip7/manifest.json +0 -0
  198. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-annual-cycle/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/global-mean-timeseries/cmip7}/regression/diagnostic.json +0 -0
  199. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip7/regression/output.json +0 -0
  200. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/global-mean-timeseries/cmip7/regression/series.json +0 -0
  201. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-annual-cycle/cmip6/catalog.yaml +0 -0
  202. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-annual-cycle/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-annual-cycle/cmip6}/regression/diagnostic.json +0 -0
  203. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-annual-cycle/cmip6/regression/output.json +0 -0
  204. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-annual-cycle/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-annual-cycle/cmip6}/regression/series.json +0 -0
  205. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-lat-time/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-annual-cycle/cmip7}/regression/diagnostic.json +0 -0
  206. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-annual-cycle/cmip7/regression/output.json +0 -0
  207. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-lat-time/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-annual-cycle/cmip7}/regression/series.json +0 -0
  208. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-lat-time/cmip6/catalog.yaml +0 -0
  209. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-lat-time/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-lat-time/cmip6}/regression/diagnostic.json +0 -0
  210. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-lat-time/cmip6/regression/output.json +0 -0
  211. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-lat-time/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-lat-time/cmip6}/regression/series.json +0 -0
  212. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-nh-mar/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-lat-time/cmip7}/regression/diagnostic.json +0 -0
  213. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-lat-time/cmip7/regression/output.json +0 -0
  214. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-zonal/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-lat-time/cmip7}/regression/series.json +0 -0
  215. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-nh-mar/cmip6/catalog.yaml +0 -0
  216. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-nh-mar/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-nh-mar/cmip6}/regression/diagnostic.json +0 -0
  217. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-nh-mar/cmip6/regression/output.json +0 -0
  218. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-sh-oct/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-nh-mar/cmip7}/regression/diagnostic.json +0 -0
  219. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-nh-mar/cmip7/regression/output.json +0 -0
  220. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-sh-oct/cmip6/catalog.yaml +0 -0
  221. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-sh-oct/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-sh-oct/cmip6}/regression/diagnostic.json +0 -0
  222. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-sh-oct/cmip6/regression/output.json +0 -0
  223. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-sh-oct/cmip6/regression/series.json +0 -0
  224. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-zonal/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-sh-oct/cmip7}/regression/diagnostic.json +0 -0
  225. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-sh-oct/cmip7/regression/output.json +0 -0
  226. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-zonal/cmip6/catalog.yaml +0 -0
  227. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-zonal/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-zonal/cmip6}/regression/diagnostic.json +0 -0
  228. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-zonal/cmip6/regression/output.json +0 -0
  229. {climate_ref_esmvaltool-0.19.2/tests/test-data/ozone-zonal/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-zonal/cmip6}/regression/series.json +0 -0
  230. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-zonal/cmip7/catalog.yaml +0 -0
  231. {climate_ref_esmvaltool-0.19.2/tests/test-data/regional-historical-annual-cycle/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-zonal/cmip7}/regression/diagnostic.json +0 -0
  232. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/ozone-zonal/cmip7/regression/output.json +0 -0
  233. {climate_ref_esmvaltool-0.19.2/tests/test-data/regional-historical-trend/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/ozone-zonal/cmip7}/regression/series.json +0 -0
  234. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip6/catalog.yaml +0 -0
  235. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip6/manifest.json +0 -0
  236. {climate_ref_esmvaltool-0.19.2/tests/test-data/regional-historical-annual-cycle/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/regional-historical-annual-cycle/cmip6}/regression/diagnostic.json +0 -0
  237. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip6/regression/output.json +0 -0
  238. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip6/regression/series.json +0 -0
  239. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip7/catalog.yaml +0 -0
  240. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip7/manifest.json +0 -0
  241. {climate_ref_esmvaltool-0.19.2/tests/test-data/regional-historical-timeseries/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/regional-historical-annual-cycle/cmip7}/regression/diagnostic.json +0 -0
  242. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip7/regression/output.json +0 -0
  243. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/cmip7/regression/series.json +0 -0
  244. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-annual-cycle/obs4mips/catalog.yaml +0 -0
  245. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip6/catalog.yaml +0 -0
  246. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip6/manifest.json +0 -0
  247. {climate_ref_esmvaltool-0.19.2/tests/test-data/regional-historical-timeseries/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/regional-historical-timeseries/cmip6}/regression/diagnostic.json +0 -0
  248. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip6/regression/output.json +0 -0
  249. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip6/regression/series.json +0 -0
  250. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip7/catalog.yaml +0 -0
  251. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip7/manifest.json +0 -0
  252. {climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-area-basic/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/regional-historical-timeseries/cmip7}/regression/diagnostic.json +0 -0
  253. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip7/regression/output.json +0 -0
  254. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/cmip7/regression/series.json +0 -0
  255. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-timeseries/obs4mips/catalog.yaml +0 -0
  256. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip6/catalog.yaml +0 -0
  257. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip6/manifest.json +0 -0
  258. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip6/regression/diagnostic.json +0 -0
  259. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip6/regression/output.json +0 -0
  260. {climate_ref_esmvaltool-0.19.2/tests/test-data/regional-historical-trend/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/regional-historical-trend/cmip6}/regression/series.json +0 -0
  261. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip7/catalog.yaml +0 -0
  262. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip7/manifest.json +0 -0
  263. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip7/regression/diagnostic.json +0 -0
  264. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/cmip7/regression/output.json +0 -0
  265. {climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip6 → climate_ref_esmvaltool-0.20.0/tests/test-data/regional-historical-trend/cmip7}/regression/series.json +0 -0
  266. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/regional-historical-trend/obs4mips/catalog.yaml +0 -0
  267. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip6/catalog.yaml +0 -0
  268. {climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-area-basic/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-area-basic/cmip6}/regression/diagnostic.json +0 -0
  269. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip6/regression/output.json +0 -0
  270. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-area-basic/cmip6/regression/series.json +0 -0
  271. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/sea-ice-sensitivity/cmip6/catalog.yaml +0 -0
  272. {climate_ref_esmvaltool-0.19.2/tests/test-data/sea-ice-sensitivity/cmip7 → climate_ref_esmvaltool-0.20.0/tests/test-data/sea-ice-sensitivity/cmip6}/regression/series.json +0 -0
  273. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip6/catalog.yaml +0 -0
  274. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip6/manifest.json +0 -0
  275. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip6/regression/diagnostic.json +0 -0
  276. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip6/regression/output.json +0 -0
  277. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip6/regression/series.json +0 -0
  278. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip7/catalog.yaml +0 -0
  279. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip7/manifest.json +0 -0
  280. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip7/regression/diagnostic.json +0 -0
  281. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip7/regression/output.json +0 -0
  282. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response/cmip7/regression/series.json +0 -0
  283. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response-emissions/cmip6/catalog.yaml +0 -0
  284. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response-emissions/cmip6/manifest.json +0 -0
  285. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response-emissions/cmip6/regression/diagnostic.json +0 -0
  286. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response-emissions/cmip6/regression/output.json +0 -0
  287. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/transient-climate-response-emissions/cmip6/regression/series.json +0 -0
  288. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-1pctCO2-parent/catalog.yaml +0 -0
  289. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-1pctCO2-parent/manifest.json +0 -0
  290. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-1pctCO2-parent/regression/diagnostic.json +0 -0
  291. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-1pctCO2-parent/regression/output.json +0 -0
  292. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-1pctCO2-parent/regression/series.json +0 -0
  293. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-esm-1pctCO2-parent/catalog.yaml +0 -0
  294. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-esm-1pctCO2-parent/manifest.json +0 -0
  295. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-esm-1pctCO2-parent/regression/diagnostic.json +0 -0
  296. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-esm-1pctCO2-parent/regression/output.json +0 -0
  297. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/test-data/zero-emission-commitment/cmip6-esm-1pctCO2-parent/regression/series.json +0 -0
  298. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_climate_at_global_warming_levels_cmip6.yml +0 -0
  299. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml +0 -0
  300. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip7.yml +0 -0
  301. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_radiative_effects_cmip6_obs4mips.yml +0 -0
  302. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_radiative_effects_cmip7_obs4mips.yml +0 -0
  303. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_cli_ta_cmip6.yml +0 -0
  304. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_cli_ta_cmip7.yml +0 -0
  305. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_clivi_lwcre_cmip6.yml +0 -0
  306. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_clivi_lwcre_cmip7.yml +0 -0
  307. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_clt_swcre_cmip6.yml +0 -0
  308. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_clt_swcre_cmip7.yml +0 -0
  309. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_clwvi_pr_cmip6.yml +0 -0
  310. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_clwvi_pr_cmip7.yml +0 -0
  311. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_cloud_scatterplots_reference_obs4mips.yml +0 -0
  312. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_equilibrium_climate_sensitivity_cmip6.yml +0 -0
  313. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_equilibrium_climate_sensitivity_cmip7.yml +0 -0
  314. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_global_mean_timeseries_cmip6.yml +0 -0
  315. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_global_mean_timeseries_cmip7.yml +0 -0
  316. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_annual_cycle_cmip6.yml +0 -0
  317. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_annual_cycle_cmip7.yml +0 -0
  318. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_annual_cycle_obs4mips.yml +0 -0
  319. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_timeseries_cmip6.yml +0 -0
  320. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_timeseries_cmip7.yml +0 -0
  321. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_timeseries_obs4mips.yml +0 -0
  322. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_trend_cmip6.yml +0 -0
  323. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_trend_cmip7.yml +0 -0
  324. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_regional_historical_trend_obs4mips.yml +0 -0
  325. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_sea_ice_area_basic_cmip6_esmvaltool_reference.yml +0 -0
  326. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_sea_ice_area_basic_cmip7_esmvaltool_reference.yml +0 -0
  327. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_transient_climate_response_cmip6.yml +0 -0
  328. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_transient_climate_response_cmip7.yml +0 -0
  329. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_transient_climate_response_emissions_cmip6.yml +0 -0
  330. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_transient_climate_response_emissions_cmip7.yml +0 -0
  331. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_zero_emission_commitment_cmip6.yml +0 -0
  332. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/recipes/recipe_zero_emission_commitment_cmip7.yml +0 -0
  333. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_recipes.py +0 -0
  334. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_sea_ice_area_basic.py +0 -0
  335. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_series_selection.py +0 -0
  336. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_supported_test_cases.py +0 -0
  337. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/diagnostics/test_tcre.py +0 -0
  338. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_diagnostic.py +0 -0
  339. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_recipe.py +0 -0
  340. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_reference_registry.py +0 -0
  341. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_series_contract.py +0 -0
  342. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_climate_at_global_warming_levels_.yml +0 -0
  343. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_climate_drivers_for_fire_.yml +0 -0
  344. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_cloud_radiative_effects_.yml +0 -0
  345. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_cli_ta_.yml +0 -0
  346. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clivi_lwcre_.yml +0 -0
  347. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clt_swcre_.yml +0 -0
  348. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_clwvi_pr_.yml +0 -0
  349. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_cloud_scatterplots_reference_.yml +0 -0
  350. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_enso_characteristics_.yml +0 -0
  351. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_equilibrium_climate_sensitivity_.yml +0 -0
  352. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_global_mean_timeseries_.yml +0 -0
  353. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_ozone_annual_cycle_.yml +0 -0
  354. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_ozone_lat_time_.yml +0 -0
  355. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_ozone_nh_mar_.yml +0 -0
  356. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_ozone_sh_oct_.yml +0 -0
  357. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_ozone_zonal_.yml +0 -0
  358. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_regional_historical_annual_cycle_.yml +0 -0
  359. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_regional_historical_timeseries_.yml +0 -0
  360. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_regional_historical_trend_.yml +0 -0
  361. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_sea_ice_area_basic_.yml +0 -0
  362. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_transient_climate_response_.yml +0 -0
  363. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_transient_climate_response_emissions_.yml +0 -0
  364. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression/test_solve_regression_zero_emission_commitment_.yml +0 -0
  365. {climate_ref_esmvaltool-0.19.2 → climate_ref_esmvaltool-0.20.0}/tests/unit/test_solve_regression.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: climate-ref-esmvaltool
3
- Version: 0.19.2
3
+ Version: 0.20.0
4
4
  Summary: ESMValTool diagnostic provider for the Rapid Evaluation Framework
5
5
  Author-email: ESMValTool development team <esmvaltool-dev@listserv.dfn.de>, Jared Lewis <jared.lewis@climate-resource.com>
6
6
  License-Expression: Apache-2.0
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "climate-ref-esmvaltool"
3
- version = "0.19.2"
3
+ version = "0.20.0"
4
4
  description = "ESMValTool diagnostic provider for the Rapid Evaluation Framework"
5
5
  readme = "README.md"
6
6
  authors = [
@@ -2,10 +2,8 @@
2
2
  Rapid evaluating CMIP data with ESMValTool.
3
3
  """
4
4
 
5
- from __future__ import annotations
6
-
7
5
  from pathlib import Path
8
- from typing import TYPE_CHECKING, Any
6
+ from typing import Any
9
7
 
10
8
  import pooch
11
9
  from loguru import logger
@@ -19,7 +17,7 @@ from climate_ref_core.dataset_registry import (
19
17
  fetch_all_files,
20
18
  validate_registry_cache,
21
19
  )
22
- from climate_ref_core.providers import CondaDiagnosticProvider
20
+ from climate_ref_core.providers import CondaDiagnosticProvider, DataIngestRequest
23
21
  from climate_ref_core.source_types import SourceDatasetType
24
22
  from climate_ref_esmvaltool._version import __version__
25
23
  from climate_ref_esmvaltool.diagnostics.base import _DATASETS_REGISTRY_NAME, registry_data_root
@@ -30,42 +28,24 @@ from climate_ref_esmvaltool.recipe import (
30
28
  _RECIPES_URL,
31
29
  )
32
30
 
33
- if TYPE_CHECKING:
34
- from climate_ref.config import Config
35
-
36
31
 
37
32
  class ESMValToolProvider(CondaDiagnosticProvider):
38
33
  """Provider for ESMValTool diagnostics."""
39
34
 
40
- def fetch_data(self, config: Config) -> None:
35
+ def fetch_data(self, config: Any) -> None:
41
36
  """Fetch ESMValTool reference data."""
42
37
  for registry_name in [_DATASETS_REGISTRY_NAME, _RECIPES_REGISTRY_NAME]:
43
38
  registry = dataset_registry_manager[registry_name]
44
39
  fetch_all_files(registry, registry_name, output_dir=None)
45
40
 
46
- def ingest_data(self, config: Config, db: Any) -> None:
41
+ def data_to_ingest(self, config: Any) -> list[DataIngestRequest]:
47
42
  """
48
- Ingest the fetched ESMValTool reference data into the database.
43
+ Request ingestion of the fetched ESMValTool reference data.
49
44
 
50
45
  A diagnostic that declares an `esmvaltool-reference` requirement
51
46
  selects its reference data from the catalog,
52
47
  so the downloaded files have to be ingested before the solver can find them.
53
-
54
- Ingestion needs the climate-ref package, so it is skipped when the provider is
55
- installed on its own.
56
48
  """
57
- try:
58
- from climate_ref.datasets import ingest_datasets # noqa: PLC0415
59
- from climate_ref.datasets.esmvaltool_reference import ( # noqa: PLC0415
60
- ESMValToolReferenceDatasetAdapter,
61
- )
62
- except ImportError:
63
- logger.info(
64
- f"Skipping {self.slug} data ingestion: climate-ref package not installed. "
65
- "Run `ref datasets ingest --source-type esmvaltool-reference` manually if needed."
66
- )
67
- return
68
-
69
49
  reference_path = registry_data_root()
70
50
  if not reference_path.exists():
71
51
  logger.warning(
@@ -73,15 +53,11 @@ class ESMValToolProvider(CondaDiagnosticProvider):
73
53
  "so there is nothing to ingest. "
74
54
  f"Fetch it with `ref datasets fetch-data --registry {_DATASETS_REGISTRY_NAME}`."
75
55
  )
76
- return
56
+ return []
77
57
 
78
- try:
79
- stats = ingest_datasets(ESMValToolReferenceDatasetAdapter(), reference_path, db)
80
- stats.log_summary("ESMValTool reference ingestion complete:")
81
- except ValueError as e:
82
- logger.warning(f"No valid ESMValTool reference datasets found: {e}")
58
+ return [DataIngestRequest(SourceDatasetType.ESMValToolReference, reference_path)]
83
59
 
84
- def validate_setup(self, config: Config) -> bool:
60
+ def validate_setup(self, config: Any) -> bool:
85
61
  """Validate conda environment and data checksums."""
86
62
  # First check conda environment
87
63
  if not super().validate_setup(config):
@@ -69,6 +69,48 @@ ESMValTool/native6/Tier3/ERA5/v1/mon/pr/era5_total_precipitation_2012_monthly.nc
69
69
  ESMValTool/native6/Tier3/ERA5/v1/mon/pr/era5_total_precipitation_2013_monthly.nc 710ba54caf511eb713eee58f7dda2a79c824ce3c758ad08802109b4898641eb8
70
70
  ESMValTool/native6/Tier3/ERA5/v1/mon/pr/era5_total_precipitation_2014_monthly.nc af69507521f2493cfb898100f1a33d983cf09c394421fcb8f5b644b2e113d79c
71
71
  ESMValTool/obs4MIPs/GPCP-V2.3/v20180519/pr_GPCP-SG_L3_v2.3_197901-201710.nc 4dd4678b79ef139446c8406da5aae4fed210abb2f2160ef95f6988bf83e4525b
72
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198301-198312.nc 5cafa0bc10b82350b4e064e32e80f98a3fb27c47453fb8cfd1be17bf6ad7c75e
73
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198401-198412.nc dfaa435f5b4c5090ef46818b3b41accec10e950dba097165eea5286e211ffed1
74
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198501-198512.nc 1df4e7145f16d5f75f6eaaf58c889ca71591884a88385f6474fdb92597c61a61
75
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198601-198612.nc 3741e42ef8a2a5d4d1f6268f2e75129e58385eb1eddf85303e0f51de6a4cca9b
76
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198701-198712.nc 915a5a1a9040fda085f39b119095fcca1a3e7ad34cbfbcefa09b16b111296117
77
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198801-198812.nc 96271d2b35465985359d87aa10d8df380986f8181bc12a76e6eff5dbafd75386
78
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_198901-198912.nc 1a9923dca1f932c8581c670c2470876293c79c49450411f9ee10bd4a45552dc1
79
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199001-199012.nc 2d311b6f91b52aafa8453e3c63f4441d4eddef5350b4fb1b14232e9eb2c2165c
80
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199101-199112.nc 2c1535024306ab2a7dc1c67cd011dda5fe57e68e4f57b8d1c4bdc4ab2acbcfbd
81
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199201-199212.nc d4b12d1589d4807e4c06278dd26b073aa86784d2f9b0a9e751ecc50f035238bf
82
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199301-199312.nc 81f24a85d1cec9e36d77487b1e8c4c0559d9bb2455a3775944e459c11ab0143f
83
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199401-199412.nc 37123499bb2725afe1da0461030276cdcc5e34cdf67f1104ba305fa4406d6880
84
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199501-199512.nc 78c2ed123ac67342673cf4b802529020baf92187c0aee0be47a69d999d00ad18
85
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199601-199612.nc de707e4df699fbca2354c094c37ed82236ba1038dcbbc38f2ddf9fd63bec211c
86
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199701-199712.nc 590a579fdf8a84a8e81d93017880e16ba67b20ba08d55da43667f28509763383
87
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199801-199812.nc f7b85138c47355d5442e668f2fab303604f9f55ea5dce1f9d9641db8989a46fa
88
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_199901-199912.nc 60f594111603155e6f482f6fef19d14eb0eff6dca79eb60493f79bbd21d7150d
89
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200001-200012.nc 6b3831f5e72baf3322cd97ea3054f4b617a61f9019e04829a5a8689b61388e54
90
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200101-200112.nc 26da62c124b3bc06454dcdbee84e6d1502aac37a7d35e8e018f802caaadf7340
91
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200201-200212.nc 01e7585e9207e8c24ac5fc8f87d2a84c001b48d2804413ee0e7e1a9f71de98c8
92
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200301-200312.nc 2c5774aaadd447c19e6f40632d73706bfe8f49b17d93a05a5154cd0b0da5bc7c
93
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200401-200412.nc f203878287ea416d141e380b620ae59a5d9707cfd8854503ad4960b1f0f9c80e
94
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200501-200512.nc ccfbd209e52f4b887b6266f224184c28592fefc46c3b742251ce4c34ffde8e1c
95
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200601-200612.nc e91d364cf6d5123453b26bfe59e9c4d565740c3b5de242343ade011e7281f229
96
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200701-200712.nc ae00f3a4daa7d0efc877a74837c8f08fd6a5dc8a954cfbe86ccd4437568446d5
97
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200801-200812.nc e768c15db9ed7e92d63ba1e47782cba08cb79f2c030a67471534c8a2ac74a770
98
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_200901-200912.nc 345878a381c673cfbb1305b5d542a99322e2d0c9931f9b8d7b2b0a1051abf2f3
99
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201001-201012.nc f8e9af8a94d83b84ba9a1fe4ed0c1c46c567948152ae4b0b8f194f1c81313ca5
100
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201101-201112.nc 63b3724bf062fad4f396e5e0bf2c1eb164d6af767652109e13a38e6cf5f56d72
101
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201201-201212.nc 7afeb8f56b97cf74969087589872394b37fb67f85851bbf15164a93c2d1da838
102
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201301-201312.nc 24230e33dc33c220286248f7d156c85c4cca35fce3b6481bed593cb2e13e15b6
103
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201401-201412.nc 3ca5d42cb14a116a65b871137c9c660cb0506964c715a5a226ff43c7767d1a34
104
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201501-201512.nc d8053c021f99bfc8d414af2fb40ab8740470d84c0710204517118d08e7fa803e
105
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201601-201612.nc 319bbea218dc885751bcb65130550cae4d3b19ebbebde471dcb6cca878396ec4
106
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201701-201712.nc cd1d94f718da0da16064de00d1cc5babd23eef6a88d44f58b0cc92ce84ad9155
107
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201801-201812.nc 8ac7c00b9e414db05f832b489bce93ae247c760d0abb555b3b6ab774188961fa
108
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_201901-201912.nc afbb151f659c9e8276c8c5aef61bee9c21e7baf6cb2be3bdeeaf1cd8dc94c47c
109
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_202001-202012.nc ed799fcb753a134ec57de87fb9cbaf07a3560f1c3f57f24907f45babde795383
110
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_202101-202112.nc b1a20462843170cb4410d086fa99284e3bf5edb546844125f6566054610a9dac
111
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_202201-202212.nc 00cc874004b45904a97b9e385b5c228eedde90aff45ed648b02df29d44cf9c2d
112
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_202301-202312.nc cfa513393759acff5e011e14ba86f7f956e494d9dd78f7fe2646afee6fb75f09
113
+ ESMValTool/obs4MIPs/GPCP-V3.3/v20260220/pr_mon_GPCP-3-3_NASA-GISS_gn_202401-202409.nc aaecd4d9be4b1bd4ddcde8ae6b71712feff76b6c42c4675b0f7a60f03fed9e65
72
114
  ESMValTool/OBS/Tier2/CERES-EBAF/OBS_CERES-EBAF_sat_Ed4.2_Amon_rlut_200003-202311.nc ede887cf2d83c848a0d71316799232e4d717662bd2f78d5aa1fc166b41d9953b
73
115
  ESMValTool/OBS/Tier2/CERES-EBAF/OBS_CERES-EBAF_sat_Ed4.2_Amon_rlutcs_200003-202311.nc e70e3273092edf01527970693271641fc6474d1974887d7d272e7d656bab83c2
74
116
  ESMValTool/OBS/Tier2/CERES-EBAF/OBS_CERES-EBAF_sat_Ed4.2_Amon_rsut_200003-202311.nc e31e648886c4fa9c09686672a06ab18fbba687ff0d6de2891616d4c8b74e215d
@@ -163,3 +205,5 @@ ESMValTool/OBS/Tier2/OSI-450-sh/OBS_OSI-450-sh_reanaly_v3_OImon_sic_201401-20141
163
205
  ESMValTool/OBS/Tier3/CALIPSO-ICECLOUD/OBS_CALIPSO-ICECLOUD_sat_1-00_Amon_cli_200701-201512.nc 977824810e8f9dbe7df278c59397ffc3f78491a9eb5a0b70e6b28ac66db8e12d
164
206
  ESMValTool/OBS/Tier2/TROPFLUX/OBS6_TROPFLUX_reanaly_v1_Amon_tauu_197901-201812.nc bf313e661b42341d5090038b501ed1ff09e58201009c3fccfe45b78e116fdd78
165
207
  ESMValTool/OBS/Tier2/TROPFLUX/OBS6_TROPFLUX_reanaly_v1_Omon_tos_197901-201812.nc 5f10a5a2aa47f5d21378ad3178bf8e4b577b0ed72ef8402dc04f5ff6fc99ec07
208
+ ESMValTool/OBS/Tier2/TROPFLUX/OBS6_TROPFLUX_reanaly_v2_Amon_tauu_194001-202512.nc ff606b459597a0353fe2528413162e4571159f35a93101b6666b82a04513a7d8
209
+ ESMValTool/OBS/Tier2/TROPFLUX/OBS6_TROPFLUX_reanaly_v2_Omon_tos_194001-202512.nc fea88e11f5fc057fa6679f44968fbf596200149c214ce432192ba86f61739f61
@@ -102,6 +102,21 @@ def index_dataset_labels(dataset: xr.Dataset) -> xr.Dataset:
102
102
  return dataset
103
103
 
104
104
 
105
+ def series_values(dataset: xr.Dataset, name: str) -> xr.DataArray:
106
+ """Get the values of a series from an ESMValTool output file.
107
+
108
+ A multi-dataset file names its variable after its first dataset, which may be a reference
109
+ with a different variable name, so a file holding a single variable falls back to that variable.
110
+ """
111
+ if name in dataset:
112
+ return dataset[name]
113
+ bounds = {dataset[coord].attrs.get("bounds") for coord in dataset.variables}
114
+ candidates = [var for var in dataset.data_vars if var not in bounds and not str(var).endswith("_bnds")]
115
+ if len(candidates) != 1:
116
+ raise KeyError(f"No variable named {name!r} in file with variables {list(dataset.data_vars)}")
117
+ return dataset[candidates[0]]
118
+
119
+
105
120
  class ESMValToolDiagnostic(CommandLineDiagnostic):
106
121
  """ESMValTool Diagnostic base class."""
107
122
 
@@ -572,9 +587,10 @@ class ESMValToolDiagnostic(CommandLineDiagnostic):
572
587
  attributes["caption"] = caption
573
588
  attributes["values_name"] = series_def.values_name
574
589
  attributes["index_name"] = series_def.index_name
590
+ values = series_values(dataset, series_def.values_name)
575
591
  for attr in variable_attributes:
576
- if attr in dataset[series_def.values_name].attrs:
577
- attributes[f"value_{attr}"] = dataset[series_def.values_name].attrs[attr]
592
+ if attr in values.attrs:
593
+ attributes[f"value_{attr}"] = values.attrs[attr]
578
594
  if attr in dataset[series_def.index_name].attrs:
579
595
  attributes[f"index_{attr}"] = dataset[series_def.index_name].attrs[attr]
580
596
  # TODO: Handle masked values in the index
@@ -597,7 +613,7 @@ class ESMValToolDiagnostic(CommandLineDiagnostic):
597
613
  SeriesMetricValue(
598
614
  dimensions={**input_selectors, **series_def.dimensions},
599
615
  kind=kind,
600
- values=fillvalues_to_nan(dataset[series_def.values_name].values).tolist(),
616
+ values=fillvalues_to_nan(values.values).tolist(),
601
617
  index=index,
602
618
  index_name=series_def.index_name,
603
619
  attributes=attributes,
@@ -180,7 +180,7 @@ class ClimateAtGlobalWarmingLevels(ESMValToolDiagnostic):
180
180
  # name="cmip7",
181
181
  # description="Test with CMIP7 data.",
182
182
  # requests=(
183
- # CMIP7Request(
183
+ # ConvertedCMIP7Request(
184
184
  # slug="cmip7",
185
185
  # facets={
186
186
  # "experiment_id": ["ssp245", "historical"],
@@ -8,7 +8,7 @@ from climate_ref_core.constraints import (
8
8
  )
9
9
  from climate_ref_core.datasets import FacetFilter, SourceDatasetType
10
10
  from climate_ref_core.diagnostics import DataRequirement
11
- from climate_ref_core.esgf import CMIP6Request, CMIP7Request
11
+ from climate_ref_core.esgf import CMIP6Request, ConvertedCMIP7Request
12
12
  from climate_ref_core.metric_values.typing import FileDefinition
13
13
  from climate_ref_core.testing import TestCase, TestDataSpecification
14
14
  from climate_ref_esmvaltool.diagnostics.base import ESMValToolDiagnostic, get_cmip_source_type
@@ -182,7 +182,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic):
182
182
  requests=(
183
183
  # The recipe runs CMIP7 over 2002-2021, but real CanESM5 `historical` data
184
184
  # ends in 2014, so extend_historical_to repeats 2014 out to 2021-12.
185
- CMIP7Request(
185
+ ConvertedCMIP7Request(
186
186
  slug="cmip7",
187
187
  facets={
188
188
  "experiment_id": ["historical"],
@@ -9,7 +9,7 @@ from climate_ref_core.constraints import (
9
9
  )
10
10
  from climate_ref_core.datasets import FacetFilter, SourceDatasetType
11
11
  from climate_ref_core.diagnostics import DataRequirement
12
- from climate_ref_core.esgf import CMIP6Request, CMIP7Request, Obs4MIPsRequest
12
+ from climate_ref_core.esgf import CMIP6Request, ConvertedCMIP7Request, Obs4MIPsRequest
13
13
  from climate_ref_core.metric_values.typing import FileDefinition, SeriesDefinition
14
14
  from climate_ref_core.testing import TestCase, TestDataSpecification
15
15
  from climate_ref_esmvaltool.diagnostics.base import ESMValToolDiagnostic, get_cmip_source_type
@@ -213,7 +213,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
213
213
  name="cmip7",
214
214
  description="Test with CMIP7 data.",
215
215
  requests=(
216
- CMIP7Request(
216
+ ConvertedCMIP7Request(
217
217
  slug="cmip7",
218
218
  facets={
219
219
  "experiment_id": "historical",
@@ -11,7 +11,7 @@ from climate_ref_core.constraints import (
11
11
  )
12
12
  from climate_ref_core.datasets import FacetFilter, SourceDatasetType
13
13
  from climate_ref_core.diagnostics import DataRequirement
14
- from climate_ref_core.esgf import CMIP6Request, CMIP7Request
14
+ from climate_ref_core.esgf import CMIP6Request, ConvertedCMIP7Request
15
15
  from climate_ref_core.metric_values.typing import FileDefinition
16
16
  from climate_ref_core.testing import TestCase, TestDataSpecification
17
17
  from climate_ref_esmvaltool.diagnostics.base import ESMValToolDiagnostic, get_cmip_source_type
@@ -169,7 +169,7 @@ class CloudScatterplotCltSwcre(ESMValToolDiagnostic):
169
169
  name="cmip7",
170
170
  description="Test with CMIP7 data.",
171
171
  requests=(
172
- CMIP7Request(
172
+ ConvertedCMIP7Request(
173
173
  slug="cmip7",
174
174
  facets={
175
175
  "experiment_id": "historical",
@@ -241,7 +241,7 @@ class CloudScatterplotClwviPr(ESMValToolDiagnostic):
241
241
  name="cmip7",
242
242
  description="Test with CMIP7 data.",
243
243
  requests=(
244
- CMIP7Request(
244
+ ConvertedCMIP7Request(
245
245
  slug="cmip7",
246
246
  facets={
247
247
  "experiment_id": "historical",
@@ -312,7 +312,7 @@ class CloudScatterplotCliviLwcre(ESMValToolDiagnostic):
312
312
  name="cmip7",
313
313
  description="Test with CMIP7 data.",
314
314
  requests=(
315
- CMIP7Request(
315
+ ConvertedCMIP7Request(
316
316
  slug="cmip7",
317
317
  facets={
318
318
  "experiment_id": "historical",
@@ -384,7 +384,7 @@ class CloudScatterplotCliTa(ESMValToolDiagnostic):
384
384
  name="cmip7",
385
385
  description="Test with CMIP7 data.",
386
386
  requests=(
387
- CMIP7Request(
387
+ ConvertedCMIP7Request(
388
388
  slug="cmip7",
389
389
  facets={
390
390
  "experiment_id": "historical",
@@ -12,7 +12,7 @@ from climate_ref_core.constraints import (
12
12
  )
13
13
  from climate_ref_core.datasets import ExecutionDatasetCollection, FacetFilter, SourceDatasetType
14
14
  from climate_ref_core.diagnostics import DataRequirement
15
- from climate_ref_core.esgf import CMIP6Request, CMIP7Request
15
+ from climate_ref_core.esgf import CMIP6Request, ConvertedCMIP7Request
16
16
  from climate_ref_core.metric_values.typing import FileDefinition, SeriesDefinition
17
17
  from climate_ref_core.pycmec.metric import CMECMetric, MetricCV
18
18
  from climate_ref_core.pycmec.output import CMECOutput
@@ -152,7 +152,7 @@ class EquilibriumClimateSensitivity(ESMValToolDiagnostic):
152
152
  name="cmip7",
153
153
  description="Test with CMIP7 data.",
154
154
  requests=(
155
- CMIP7Request(
155
+ ConvertedCMIP7Request(
156
156
  slug="cmip7",
157
157
  facets={
158
158
  "experiment_id": ["abrupt-4xCO2", "piControl"],
@@ -8,6 +8,7 @@ from climate_ref_core.constraints import (
8
8
  RequireContiguousTimerange,
9
9
  RequireFacets,
10
10
  RequireOverlappingTimerange,
11
+ SelectSingleGrid,
11
12
  )
12
13
  from climate_ref_core.datasets import ExecutionDatasetCollection, FacetFilter, SourceDatasetType
13
14
  from climate_ref_core.diagnostics import DataRequirement
@@ -28,8 +29,8 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
28
29
 
29
30
  name = "ENSO Basic Climatology"
30
31
  slug = "enso-basic-climatology"
31
- base_recipe = "ref/recipe_enso_basicclimatology.yml"
32
- version = 2
32
+ base_recipe = "ref/recipe_enso_basicclimatology_CMIP7.yml"
33
+ version = 4
33
34
 
34
35
  data_requirements = (
35
36
  (
@@ -51,8 +52,9 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
51
52
  },
52
53
  ),
53
54
  ),
54
- group_by=("source_id", "experiment_id", "member_id", "grid_label"),
55
+ group_by=("source_id", "experiment_id", "member_id"),
55
56
  constraints=(
57
+ SelectSingleGrid(group_by=("source_id", "experiment_id", "member_id", "variable_id")),
56
58
  RequireContiguousTimerange(group_by=("instance_id",)),
57
59
  RequireOverlappingTimerange(group_by=("instance_id",)),
58
60
  RequireFacets(
@@ -90,8 +92,9 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
90
92
  },
91
93
  ),
92
94
  ),
93
- group_by=("source_id", "experiment_id", "variant_label", "grid_label"),
95
+ group_by=("source_id", "experiment_id", "variant_label"),
94
96
  constraints=(
97
+ SelectSingleGrid(group_by=("source_id", "experiment_id", "variant_label", "variable_id")),
95
98
  RequireContiguousTimerange(group_by=("instance_id",)),
96
99
  RequireOverlappingTimerange(group_by=("instance_id",)),
97
100
  RequireFacets(
@@ -151,7 +154,7 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
151
154
  )
152
155
  + tuple(
153
156
  FileDefinition(
154
- file_pattern=f"plots/diagnostic_level2/plot_script/png/*_{var_name}_map_*.png",
157
+ file_pattern=f"plots/diagnostic_divedowns/plotlevel2_script/png/*_{var_name}_map_*.png",
155
158
  dimensions={
156
159
  "variable_id": "tos" if var_name == "tos" else var_name,
157
160
  },
@@ -177,11 +180,11 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
177
180
  attributes=[],
178
181
  )
179
182
  for var_name in ("pr", "sst", "tauu")
180
- for source_id in ("{source_id}", "GPCP-V2.3", "TROPFLUX")
183
+ for source_id in ("{source_id}", "GPCP-V3.3", "TROPFLUX")
181
184
  )
182
185
  + tuple(
183
186
  SeriesDefinition(
184
- file_pattern=f"diagnostic_metrics/plot_script/{{source_id}}_eq_{var_name}_seacycle.nc",
187
+ file_pattern=f"diagnostic_metrics/plot_script/{source_id}_eq_{var_name}_seacycle.nc",
185
188
  dimensions=(
186
189
  {
187
190
  "statistic": (
@@ -196,11 +199,11 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
196
199
  attributes=[],
197
200
  )
198
201
  for var_name in ("pr", "sst", "tauu")
199
- for source_id in ("{source_id}", "GPCP-V2.3", "TROPFLUX")
202
+ for source_id in ("{source_id}", "GPCP-V3.3", "TROPFLUX")
200
203
  )
201
204
  + tuple(
202
205
  SeriesDefinition(
203
- file_pattern="diagnostic_metrics/plot_script/{source_id}_pr_double.nc",
206
+ file_pattern=f"diagnostic_metrics/plot_script/{source_id}_pr_double.nc",
204
207
  dimensions=(
205
208
  {
206
209
  "statistic": (
@@ -213,11 +216,11 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
213
216
  index_name="lat",
214
217
  attributes=[],
215
218
  )
216
- for source_id in ("{source_id}", "GPCP-V2.3")
219
+ for source_id in ("{source_id}", "GPCP-V3.3")
217
220
  )
218
221
  + tuple(
219
222
  SeriesDefinition(
220
- file_pattern="diagnostic_metrics/plot_script/*_pr_double_seacycle.nc",
223
+ file_pattern=f"diagnostic_metrics/plot_script/{source_id}_pr_double_seacycle.nc",
221
224
  dimensions=(
222
225
  {
223
226
  "statistic": (
@@ -231,7 +234,7 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
231
234
  index_name="lat",
232
235
  attributes=[],
233
236
  )
234
- for source_id in ("{source_id}", "GPCP-V2.3")
237
+ for source_id in ("{source_id}", "GPCP-V3.3")
235
238
  )
236
239
  )
237
240
 
@@ -261,14 +264,13 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
261
264
  slug="cmip7",
262
265
  facets={
263
266
  "experiment_id": "historical",
264
- "source_id": "CanESM5",
267
+ "source_id": "UKESM1-3-LL",
265
268
  "variable_id": ["pr", "tauu", "tos"],
266
- "branded_variable": [
267
- "pr_tavg-u-hxy-u",
268
- "tauu_tavg-u-hxy-u",
269
- "tos_tavg-u-hxy-sea",
269
+ "branding_suffix": [
270
+ "tavg-u-hxy-u",
271
+ "tavg-u-hxy-sea",
270
272
  ],
271
- "variant_label": "r1i1p1f1",
273
+ "variant_label": "r1i1p1f2",
272
274
  "frequency": "mon",
273
275
  "region": "glb",
274
276
  },
@@ -289,6 +291,10 @@ class ENSOBasicClimatology(ESMValToolDiagnostic):
289
291
  recipe.pop("datasets")
290
292
  for diagnostic in recipe["diagnostics"].values():
291
293
  for variable in diagnostic["variables"].values():
294
+ # CMIP6 has no branding suffix, so keep it on the observations only.
295
+ branding_suffix = variable.pop("branding_suffix")
296
+ for dataset in variable["additional_datasets"]:
297
+ dataset.setdefault("branding_suffix", branding_suffix)
292
298
  variable["additional_datasets"].extend(
293
299
  recipe_variables[variable["short_name"]]["additional_datasets"]
294
300
  )
@@ -301,8 +307,8 @@ class ENSOCharacteristics(ESMValToolDiagnostic):
301
307
 
302
308
  name = "ENSO Characteristics"
303
309
  slug = "enso-characteristics"
304
- base_recipe = "ref/recipe_enso_characteristics.yml"
305
- version = 2
310
+ base_recipe = "ref/recipe_enso_characteristics_CMIP7.yml"
311
+ version = 3
306
312
 
307
313
  data_requirements = (
308
314
  (
@@ -355,7 +361,7 @@ class ENSOCharacteristics(ESMValToolDiagnostic):
355
361
  series = tuple()
356
362
  files = tuple(
357
363
  FileDefinition(
358
- file_pattern=f"plots/diagnostic_metrics/plot_script/png/*_{metric}.png",
364
+ file_pattern=f"plots/*/*/png/*_{metric}.png",
359
365
  dimensions={"metric": metric},
360
366
  )
361
367
  for metric in (
@@ -395,13 +401,13 @@ class ENSOCharacteristics(ESMValToolDiagnostic):
395
401
  slug="cmip7",
396
402
  facets={
397
403
  "experiment_id": "historical",
398
- "source_id": "CanESM5",
404
+ "source_id": "UKESM1-3-LL",
399
405
  "variable_id": ["areacello", "tos"],
400
- "branded_variable": [
401
- "areacello_ti-u-hxy-u",
402
- "tos_tavg-u-hxy-sea",
406
+ "branding_suffix": [
407
+ "ti-u-hxy-u",
408
+ "tavg-u-hxy-sea",
403
409
  ],
404
- "variant_label": "r1i1p1f1",
410
+ "variant_label": "r1i1p1f2",
405
411
  "frequency": ["fx", "mon"],
406
412
  "region": "glb",
407
413
  },
@@ -419,26 +425,8 @@ class ENSOCharacteristics(ESMValToolDiagnostic):
419
425
  ) -> None:
420
426
  """Update the recipe."""
421
427
  recipe_variables = dataframe_to_recipe(input_files[get_cmip_source_type(input_files)])
422
- recipe["datasets"] = recipe_variables["tos"]["additional_datasets"]
423
- # TODO: update the observational data requirement once available on ESGF.
424
- # Observations - use only one per run
425
- recipe["datasets"].append(
426
- # {
427
- # "dataset": "NOAA-ERSSTv5",
428
- # "version": "v5",
429
- # "project": "OBS6",
430
- # "type": "reanaly",
431
- # "tier": 2,
432
- # }
433
- {
434
- "dataset": "TROPFLUX",
435
- "version": "v1",
436
- "project": "OBS6",
437
- "type": "reanaly",
438
- "tier": 2,
439
- "mip": "Omon",
440
- }
441
- )
428
+ observations = [dataset for dataset in recipe["datasets"] if dataset["project"] == "OBS6"]
429
+ recipe["datasets"] = recipe_variables["tos"]["additional_datasets"] + observations
442
430
 
443
431
  @staticmethod
444
432
  def format_result(
@@ -449,7 +437,7 @@ class ENSOCharacteristics(ESMValToolDiagnostic):
449
437
  ) -> tuple[CMECMetric, CMECOutput]:
450
438
  """Format the result."""
451
439
  metrics = pd.read_csv(
452
- result_dir / "work" / "diagnostic_metrics" / "plot_script" / "matrix.csv",
440
+ result_dir / "work" / "diagnostic_metrics" / "metrics_script" / "matrix.csv",
453
441
  names=["dataset", "metric_name", "metric_value"],
454
442
  )
455
443
 
@@ -3,7 +3,7 @@ import pandas
3
3
  from climate_ref_core.constraints import AddSupplementaryDataset, RequireContiguousTimerange
4
4
  from climate_ref_core.datasets import FacetFilter, SourceDatasetType
5
5
  from climate_ref_core.diagnostics import DataRequirement
6
- from climate_ref_core.esgf import CMIP6Request, CMIP7Request
6
+ from climate_ref_core.esgf import CMIP6Request, ConvertedCMIP7Request
7
7
  from climate_ref_core.metric_values.typing import FileDefinition, SeriesDefinition
8
8
  from climate_ref_core.testing import TestCase, TestDataSpecification
9
9
  from climate_ref_esmvaltool.diagnostics.base import ESMValToolDiagnostic, get_cmip_source_type
@@ -105,7 +105,7 @@ class GlobalMeanTimeseries(ESMValToolDiagnostic):
105
105
  name="cmip7",
106
106
  description="Test with CMIP7 data.",
107
107
  requests=(
108
- CMIP7Request(
108
+ ConvertedCMIP7Request(
109
109
  slug="cmip7",
110
110
  facets={
111
111
  "source_id": "CanESM5",