From 823b4123acef20bf189a0ea56365cd0528222c25 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Tue, 1 Apr 2025 14:54:09 +0200 Subject: [PATCH 01/12] Fix doc --- esmvaltool/diag_scripts/monitor/multi_datasets.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esmvaltool/diag_scripts/monitor/multi_datasets.py b/esmvaltool/diag_scripts/monitor/multi_datasets.py index 293c300f3d..2fa0c67b32 100644 --- a/esmvaltool/diag_scripts/monitor/multi_datasets.py +++ b/esmvaltool/diag_scripts/monitor/multi_datasets.py @@ -165,7 +165,7 @@ Horizontal lines to show in plot. Each list element corresponds to one line, and each list element should contain a dictionary with keywords arguments passed to :meth:`matplotlib.axes.Axes.axhline`. Example: ``[{y: - 0}, {y: 1, color: 'red'}]. + 0}, {y: 1, color: 'red'}]``. legend_kwargs: dict, optional Optional keyword arguments for :func:`matplotlib.pyplot.legend`. Use ``legend_kwargs: false`` to not show legends. @@ -203,7 +203,7 @@ Horizontal lines to show in plot. Each list element corresponds to one line, and each list element should contain a dictionary with keywords arguments passed to :meth:`matplotlib.axes.Axes.axhline`. Example: ``[{y: - 0}, {y: 1, color: 'red'}]. + 0}, {y: 1, color: 'red'}]``. legend_kwargs: dict, optional Optional keyword arguments for :func:`matplotlib.pyplot.legend`. Use ``legend_kwargs: false`` to not show legends. @@ -417,7 +417,7 @@ Horizontal lines to show in plot. Each list element corresponds to one line, and each list element should contain a dictionary with keywords arguments passed to :meth:`matplotlib.axes.Axes.axhline`. Example: ``[{y: - 0}, {y: 1, color: 'red'}]. + 0}, {y: 1, color: 'red'}]``. legend_kwargs: dict, optional Optional keyword arguments for :func:`matplotlib.pyplot.legend`. Use ``legend_kwargs: false`` to not show legends. @@ -459,7 +459,7 @@ Horizontal lines to show in plot. Each list element corresponds to one line, and each list element should contain a dictionary with keywords arguments passed to :meth:`matplotlib.axes.Axes.axhline`. Example: ``[{y: - 0}, {y: 1, color: 'red'}]. + 0}, {y: 1, color: 'red'}]``. legend_kwargs: dict, optional Optional keyword arguments for :func:`matplotlib.pyplot.legend`. Use ``legend_kwargs: false`` to not show legends. From fe1c0d20541feaecd5510209fa575395523d78e7 Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Tue, 1 Apr 2025 15:40:13 +0200 Subject: [PATCH 02/12] add var --- .../monitor/recipe_monitor_sanity_checks.yml | 156 +++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) diff --git a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml index 4bcd5dc04e..5f50842bb2 100644 --- a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml +++ b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml @@ -12,7 +12,7 @@ documentation: # Note: The following models are just examples datasets: - - {dataset: MPI-ESM1-2-LR, grid: gn, mip: Amon, project: CMIP6, exp: historical, ensemble: r1i1p1f1} + - {dataset: MPI-ESM1-2-LR, grid: gn, mip: Amon, project: CMIP6, exp: historical, ensemble: r1i1p1f1, derive: true} timerange_for_models: &time_period timerange: '1980/2014' @@ -64,6 +64,15 @@ diagnostics: plots: timeseries: annual_mean_kwargs: false + hlines: + - y: 62.0 + color: orange + - y: 67.0 + color: orange + - y: 58.0 + color: red + - y: 68.0 + color: red plot_kwargs: 'global mean': color: blue @@ -109,6 +118,15 @@ diagnostics: plots: timeseries: annual_mean_kwargs: false + hlines: + - y: 232.0 + color: orange + - y: 240.0 + color: orange + - y: 229.0 + color: red + - y: 241.0 + color: red plot_kwargs: 'global mean': color: blue @@ -126,3 +144,139 @@ diagnostics: label: null linestyle: '--' linewidth: 1 + + + asr: + description: time series of global min/max/mean including "reasonable" ranges + variables: + asr_mean: + <<: *time_period + short_name: asr + legend_label: 'global mean' + preprocessor: globalmean + asr_min: + <<: *time_period + short_name: asr + legend_label: 'global min' + preprocessor: globalmin + asr_max: + <<: *time_period + short_name: asr + legend_label: 'global max' + preprocessor: globalmax + scripts: + timeseries: + script: monitor/multi_datasets.py + plot_folder: '{plot_dir}' + group_variables_by: short_name + facet_used_for_labels: legend_label + plots: + timeseries: + annual_mean_kwargs: false + plot_kwargs: + 'global mean': + color: blue + label: null + linestyle: '-' + linewidth: 2 + label: '{dataset}' + 'global min': + color: blue + label: null + linestyle: '--' + linewidth: 1 + 'global max': + color: blue + label: null + linestyle: '--' + linewidth: 1 + + lwp: + description: time series of global min/max/mean including "reasonable" ranges + variables: + lwp_mean: + <<: *time_period + short_name: lwp + legend_label: 'global mean' + preprocessor: globalmean + lwp_min: + <<: *time_period + short_name: lwp + legend_label: 'global min' + preprocessor: globalmin + lwp_max: + <<: *time_period + short_name: lwp + legend_label: 'global max' + preprocessor: globalmax + scripts: + timeseries: + script: monitor/multi_datasets.py + plot_folder: '{plot_dir}' + group_variables_by: short_name + facet_used_for_labels: legend_label + plots: + timeseries: + annual_mean_kwargs: false + plot_kwargs: + 'global mean': + color: blue + label: null + linestyle: '-' + linewidth: 2 + label: '{dataset}' + 'global min': + color: blue + label: null + linestyle: '--' + linewidth: 1 + 'global max': + color: blue + label: null + linestyle: '--' + linewidth: 1 + + netcre: + description: time series of global min/max/mean including "reasonable" ranges + variables: + netcre_mean: + <<: *time_period + short_name: netcre + legend_label: 'global mean' + preprocessor: globalmean + netcre_min: + <<: *time_period + short_name: netcre + legend_label: 'global min' + preprocessor: globalmin + netcre_max: + <<: *time_period + short_name: netcre + legend_label: 'global max' + preprocessor: globalmax + scripts: + timeseries: + script: monitor/multi_datasets.py + plot_folder: '{plot_dir}' + group_variables_by: short_name + facet_used_for_labels: legend_label + plots: + timeseries: + annual_mean_kwargs: false + plot_kwargs: + 'global mean': + color: blue + label: null + linestyle: '-' + linewidth: 2 + label: '{dataset}' + 'global min': + color: blue + label: null + linestyle: '--' + linewidth: 1 + 'global max': + color: blue + label: null + linestyle: '--' + linewidth: 1 From 3d3f394abaca547bcef76328e746ec1cbca768d3 Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Tue, 1 Apr 2025 17:12:43 +0200 Subject: [PATCH 03/12] name added to config-references --- esmvaltool/config-references.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/esmvaltool/config-references.yml b/esmvaltool/config-references.yml index adc6ff23ba..a9b6b31af8 100644 --- a/esmvaltool/config-references.yml +++ b/esmvaltool/config-references.yml @@ -509,6 +509,11 @@ authors: institute: DLR, Germany orcid: github: ellensarauer + schulze_kirsten: + name: Schulze, Kirsten + institute: Uni Bremen, Germany + orcid: + github: kirsy05 serva_federico: name: Serva, Federico institute: CNR, Italy From 2151d704fe0bbab19c7d7a2afd07a44e637b66a8 Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Tue, 1 Apr 2025 17:45:47 +0200 Subject: [PATCH 04/12] add var --- esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml index 2e8e0cecfb..64890b6edf 100644 --- a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml +++ b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml @@ -6,6 +6,7 @@ documentation: Calculate basic sanity checks e.g. for monitoring new model runs. authors: - lauer_axel + - schulze_kirsten maintainer: - lauer_axel From c5f6d2fe74aaf345d3410d1deb3d0cacd4ac5771 Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Wed, 2 Apr 2025 12:37:27 +0200 Subject: [PATCH 05/12] add more variables --- .../monitor/recipe_monitor_sanity_checks.yml | 271 ++++++++---------- 1 file changed, 113 insertions(+), 158 deletions(-) diff --git a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml index 64890b6edf..c0dcd5f44f 100644 --- a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml +++ b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml @@ -72,10 +72,6 @@ diagnostics: color: orange - y: 67.0 color: orange - - y: 58.0 - color: red - - y: 68.0 - color: red plot_kwargs: 'global mean': color: blue @@ -138,68 +134,23 @@ diagnostics: label: null linestyle: '--' linewidth: 1 -## start - asr: - description: time series of global min/max/mean including "reasonable" ranges - variables: - asr_mean: - <<: *time_period - short_name: asr - legend_label: 'global mean' - preprocessor: globalmean - asr_min: - <<: *time_period - short_name: asr - legend_label: 'global min' - preprocessor: globalmin - asr_max: - <<: *time_period - short_name: asr - legend_label: 'global max' - preprocessor: globalmax - scripts: - timeseries: - script: monitor/multi_datasets.py - plot_folder: '{plot_dir}' - group_variables_by: short_name - facet_used_for_labels: legend_label - plots: - timeseries: - annual_mean_kwargs: false - plot_kwargs: - 'global mean': - color: blue - label: null - linestyle: '-' - linewidth: 2 - label: '{dataset}' - 'global min': - color: blue - label: null - linestyle: '--' - linewidth: 1 - 'global max': - color: blue - label: null - linestyle: '--' - linewidth: 1 - clivi: + lwcre: description: time series of global min/max/mean including "reasonable" ranges variables: - clivi_mean: + lwcre_mean: <<: *time_period - short_name: clivi + short_name: lwcre legend_label: 'global mean' preprocessor: globalmean - clivi_min: + lwcre_min: <<: *time_period - short_name: clivi + short_name: lwcre legend_label: 'global min' preprocessor: globalmin - clivi_max: + lwcre_max: <<: *time_period - short_name: clivi + short_name: lwcre legend_label: 'global max' preprocessor: globalmax scripts: @@ -229,22 +180,22 @@ diagnostics: linestyle: '--' linewidth: 1 - clt: + lwp: description: time series of global min/max/mean including "reasonable" ranges variables: - clt_mean: + lwp_mean: <<: *time_period - short_name: clt + short_name: lwp legend_label: 'global mean' preprocessor: globalmean - clt_min: + lwp_min: <<: *time_period - short_name: clt + short_name: lwp legend_label: 'global min' preprocessor: globalmin - clt_max: + lwp_max: <<: *time_period - short_name: clt + short_name: lwp legend_label: 'global max' preprocessor: globalmax scripts: @@ -274,22 +225,22 @@ diagnostics: linestyle: '--' linewidth: 1 - lwcre: + netcre: description: time series of global min/max/mean including "reasonable" ranges variables: - lwcre_mean: + netcre_mean: <<: *time_period - short_name: lwcre + short_name: netcre legend_label: 'global mean' preprocessor: globalmean - lwcre_min: + netcre_min: <<: *time_period - short_name: lwcre + short_name: netcre legend_label: 'global min' preprocessor: globalmin - lwcre_max: + netcre_max: <<: *time_period - short_name: lwcre + short_name: netcre legend_label: 'global max' preprocessor: globalmax scripts: @@ -319,22 +270,22 @@ diagnostics: linestyle: '--' linewidth: 1 - lwp: + rtnt: description: time series of global min/max/mean including "reasonable" ranges variables: - lwp_mean: + rtnt_mean: <<: *time_period - short_name: lwp + short_name: rtnt legend_label: 'global mean' preprocessor: globalmean - lwp_min: + rtnt_min: <<: *time_period - short_name: lwp + short_name: rtnt legend_label: 'global min' preprocessor: globalmin - lwp_max: + rtnt_max: <<: *time_period - short_name: lwp + short_name: rtnt legend_label: 'global max' preprocessor: globalmax scripts: @@ -364,22 +315,22 @@ diagnostics: linestyle: '--' linewidth: 1 - netcre: + swcre: description: time series of global min/max/mean including "reasonable" ranges variables: - netcre_mean: + swcre_mean: <<: *time_period - short_name: netcre + short_name: swcre legend_label: 'global mean' preprocessor: globalmean - netcre_min: + swcre_min: <<: *time_period - short_name: netcre + short_name: swcre legend_label: 'global min' preprocessor: globalmin - netcre_max: + swcre_max: <<: *time_period - short_name: netcre + short_name: swcre legend_label: 'global max' preprocessor: globalmax scripts: @@ -408,23 +359,23 @@ diagnostics: label: null linestyle: '--' linewidth: 1 - - prw: + + prc: description: time series of global min/max/mean including "reasonable" ranges variables: - prw_mean: + prc_mean: <<: *time_period - short_name: prw + short_name: prc legend_label: 'global mean' preprocessor: globalmean - prw_min: + prc_min: <<: *time_period - short_name: prw + short_name: prc legend_label: 'global min' preprocessor: globalmin - prw_max: + prc_max: <<: *time_period - short_name: prw + short_name: prc legend_label: 'global max' preprocessor: globalmax scripts: @@ -454,22 +405,22 @@ diagnostics: linestyle: '--' linewidth: 1 - rlut: + hfls: description: time series of global min/max/mean including "reasonable" ranges variables: - rlut_mean: + hfls_mean: <<: *time_period - short_name: rlut + short_name: hfls legend_label: 'global mean' preprocessor: globalmean - rlut_min: + hfls_min: <<: *time_period - short_name: rlut + short_name: hfls legend_label: 'global min' preprocessor: globalmin - rlut_max: + hfls_max: <<: *time_period - short_name: rlut + short_name: hfls legend_label: 'global max' preprocessor: globalmax scripts: @@ -499,22 +450,22 @@ diagnostics: linestyle: '--' linewidth: 1 - rtnt: + hfss: description: time series of global min/max/mean including "reasonable" ranges variables: - rtnt_mean: + hfss_mean: <<: *time_period - short_name: rtnt + short_name: hfss legend_label: 'global mean' preprocessor: globalmean - rtnt_min: + hfss_min: <<: *time_period - short_name: rtnt + short_name: hfss legend_label: 'global min' preprocessor: globalmin - rtnt_max: + hfss_max: <<: *time_period - short_name: rtnt + short_name: hfss legend_label: 'global max' preprocessor: globalmax scripts: @@ -544,67 +495,22 @@ diagnostics: linestyle: '--' linewidth: 1 - swcre: - description: time series of global min/max/mean including "reasonable" ranges - variables: - swcre_mean: - <<: *time_period - short_name: swcre - legend_label: 'global mean' - preprocessor: globalmean - swcre_min: - <<: *time_period - short_name: swcre - legend_label: 'global min' - preprocessor: globalmin - swcre_max: - <<: *time_period - short_name: swcre - legend_label: 'global max' - preprocessor: globalmax - scripts: - timeseries: - script: monitor/multi_datasets.py - plot_folder: '{plot_dir}' - group_variables_by: short_name - facet_used_for_labels: legend_label - plots: - timeseries: - annual_mean_kwargs: false - plot_kwargs: - 'global mean': - color: blue - label: null - linestyle: '-' - linewidth: 2 - label: '{dataset}' - 'global min': - color: blue - label: null - linestyle: '--' - linewidth: 1 - 'global max': - color: blue - label: null - linestyle: '--' - linewidth: 1 - - clivi: + pr: description: time series of global min/max/mean including "reasonable" ranges variables: - clivi_mean: + pr_mean: <<: *time_period - short_name: clivi + short_name: pr legend_label: 'global mean' preprocessor: globalmean - clivi_min: + pr_min: <<: *time_period - short_name: clivi + short_name: pr legend_label: 'global min' preprocessor: globalmin - clivi_max: + pr_max: <<: *time_period - short_name: clivi + short_name: pr legend_label: 'global max' preprocessor: globalmax scripts: @@ -634,6 +540,55 @@ diagnostics: linestyle: '--' linewidth: 1 + # sbl: + # description: time series of global min/max/mean including "reasonable" ranges + # variables: + # sbl_mean: + # <<: *time_period + # short_name: sbl + # legend_label: 'global mean' + # preprocessor: globalmean + # sbl_min: + # <<: *time_period + # short_name: sbl + # legend_label: 'global min' + # preprocessor: globalmin + # sbl_max: + # <<: *time_period + # short_name: sbl + # legend_label: 'global max' + # preprocessor: globalmax + # scripts: + # timeseries: + # script: monitor/multi_datasets.py + # plot_folder: '{plot_dir}' + # group_variables_by: short_name + # facet_used_for_labels: legend_label + # plots: + # timeseries: + # annual_mean_kwargs: false + # plot_kwargs: + # 'global mean': + # color: blue + # label: null + # linestyle: '-' + # linewidth: 2 + # label: '{dataset}' + # 'global min': + # color: blue + # label: null + # linestyle: '--' + # linewidth: 1 + # 'global max': + # color: blue + # label: null + # linestyle: '--' + # linewidth: 1 + + + + + From a9f555a1cca64be3c4f7007499fbacc228ac081b Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Wed, 2 Apr 2025 15:59:07 +0200 Subject: [PATCH 06/12] no snow --- .../monitor/recipe_monitor_sanity_checks.yml | 53 +------------------ 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml index c0dcd5f44f..8e14f23e58 100644 --- a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml +++ b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml @@ -540,56 +540,5 @@ diagnostics: linestyle: '--' linewidth: 1 - # sbl: - # description: time series of global min/max/mean including "reasonable" ranges - # variables: - # sbl_mean: - # <<: *time_period - # short_name: sbl - # legend_label: 'global mean' - # preprocessor: globalmean - # sbl_min: - # <<: *time_period - # short_name: sbl - # legend_label: 'global min' - # preprocessor: globalmin - # sbl_max: - # <<: *time_period - # short_name: sbl - # legend_label: 'global max' - # preprocessor: globalmax - # scripts: - # timeseries: - # script: monitor/multi_datasets.py - # plot_folder: '{plot_dir}' - # group_variables_by: short_name - # facet_used_for_labels: legend_label - # plots: - # timeseries: - # annual_mean_kwargs: false - # plot_kwargs: - # 'global mean': - # color: blue - # label: null - # linestyle: '-' - # linewidth: 2 - # label: '{dataset}' - # 'global min': - # color: blue - # label: null - # linestyle: '--' - # linewidth: 1 - # 'global max': - # color: blue - # label: null - # linestyle: '--' - # linewidth: 1 - - - - - - - - + From 2b9be422d051f32d1f1ed1c7b9d1356c1eff0e57 Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Thu, 3 Apr 2025 12:28:34 +0200 Subject: [PATCH 07/12] add author name --- .zenodo.json | 66 ++++++++++++++++++++++++++++------------------------ CITATION.cff | 4 ++++ 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index faa0e63c73..501942bb5f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -334,6 +334,10 @@ "name": "Weigel, Katja", "orcid": "0000-0001-6133-7801" }, + { + "affiliation": "University of Bremen, Germany", + "name": "Schulze, Kirsten" + }, { "affiliation": "DLR, Germany", "name": "Sarauer, Ellen" @@ -420,37 +424,37 @@ "title": "ESMValTool", "version": "v2.11.0", "communities": [ - { - "identifier": "is-enes3" - }, - { - "identifier": "dlr_de" - }, - { - "identifier": "ecfunded" - }, - { - "identifier": "nlesc" - } + { + "identifier": "is-enes3" + }, + { + "identifier": "dlr_de" + }, + { + "identifier": "ecfunded" + }, + { + "identifier": "nlesc" + } ], "grants": [ - { - "id": "10.13039/501100000780::282672" - }, - { - "id": "10.13039/501100000780::641727" - }, - { - "id": "10.13039/501100000780::641816" - }, - { - "id": "10.13039/501100000780::727862" - }, - { - "id": "10.13039/501100000780::776613" - }, - { - "id": "10.13039/501100000780::824084" - } + { + "id": "10.13039/501100000780::282672" + }, + { + "id": "10.13039/501100000780::641727" + }, + { + "id": "10.13039/501100000780::641816" + }, + { + "id": "10.13039/501100000780::727862" + }, + { + "id": "10.13039/501100000780::776613" + }, + { + "id": "10.13039/501100000780::824084" + } ] -} +} \ No newline at end of file diff --git a/CITATION.cff b/CITATION.cff index 645565d4d7..217dcc1626 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -344,6 +344,10 @@ authors: family-names: Weigel given-names: Katja orcid: "https://orcid.org/0000-0001-6133-7801" + - + affiliation: "University of Bremen, Germany" + family-names: Schulze + given-names: Kirsten - affiliation: "DLR, Germany" family-names: Sarauer From 68151703b4fe67e2ec20c29df36a9426106f4671 Mon Sep 17 00:00:00 2001 From: Kirsten Schulze Date: Thu, 3 Apr 2025 13:52:42 +0200 Subject: [PATCH 08/12] removed derive true and add it only to the vars which need it --- .../monitor/recipe_monitor_sanity_checks.yml | 67 ++++++------------- 1 file changed, 20 insertions(+), 47 deletions(-) diff --git a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml index 750f310130..406351d421 100644 --- a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml +++ b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml @@ -13,7 +13,7 @@ documentation: # Note: The following models are just examples datasets: - - {dataset: MPI-ESM1-2-LR, grid: gn, mip: Amon, project: CMIP6, exp: historical, ensemble: r1i1p1f1, derive: true} + - {dataset: MPI-ESM1-2-LR, grid: gn, mip: Amon, project: CMIP6, exp: historical, ensemble: r1i1p1f1} timerange_for_models: &time_period timerange: '1980/2014' @@ -149,16 +149,19 @@ diagnostics: short_name: rlut legend_label: 'global mean' preprocessor: globalmean + derive: true rlut_min: <<: *time_period short_name: rlut legend_label: 'global min' preprocessor: globalmin + derive: true rlut_max: <<: *time_period short_name: rlut legend_label: 'global max' preprocessor: globalmax + derive: true scripts: timeseries: script: monitor/multi_datasets.py @@ -252,16 +255,19 @@ diagnostics: short_name: lwcre legend_label: 'global mean' preprocessor: globalmean + derive: true lwcre_min: <<: *time_period short_name: lwcre legend_label: 'global min' preprocessor: globalmin + derive: true lwcre_max: <<: *time_period short_name: lwcre legend_label: 'global max' preprocessor: globalmax + derive: true scripts: timeseries: script: monitor/multi_datasets.py @@ -297,16 +303,19 @@ diagnostics: short_name: lwp legend_label: 'global mean' preprocessor: globalmean + derive: true lwp_min: <<: *time_period short_name: lwp legend_label: 'global min' preprocessor: globalmin + derive: true lwp_max: <<: *time_period short_name: lwp legend_label: 'global max' preprocessor: globalmax + derive: true scripts: timeseries: script: monitor/multi_datasets.py @@ -342,16 +351,19 @@ diagnostics: short_name: netcre legend_label: 'global mean' preprocessor: globalmean + derive: true netcre_min: <<: *time_period short_name: netcre legend_label: 'global min' preprocessor: globalmin + derive: true netcre_max: <<: *time_period short_name: netcre legend_label: 'global max' preprocessor: globalmax + derive: true scripts: timeseries: script: monitor/multi_datasets.py @@ -387,16 +399,19 @@ diagnostics: short_name: rtnt legend_label: 'global mean' preprocessor: globalmean + derive: true rtnt_min: <<: *time_period short_name: rtnt legend_label: 'global min' preprocessor: globalmin + derive: true rtnt_max: <<: *time_period short_name: rtnt legend_label: 'global max' preprocessor: globalmax + derive: true scripts: timeseries: script: monitor/multi_datasets.py @@ -432,16 +447,19 @@ diagnostics: short_name: swcre legend_label: 'global mean' preprocessor: globalmean + derive: true swcre_min: <<: *time_period short_name: swcre legend_label: 'global min' preprocessor: globalmin + derive: true swcre_max: <<: *time_period short_name: swcre legend_label: 'global max' preprocessor: globalmax + derive: true scripts: timeseries: script: monitor/multi_datasets.py @@ -602,49 +620,4 @@ diagnostics: color: blue label: null linestyle: '--' - linewidth: 1 - - pr: - description: time series of global min/max/mean including "reasonable" ranges - variables: - pr_mean: - <<: *time_period - short_name: pr - legend_label: 'global mean' - preprocessor: globalmean - pr_min: - <<: *time_period - short_name: pr - legend_label: 'global min' - preprocessor: globalmin - pr_max: - <<: *time_period - short_name: pr - legend_label: 'global max' - preprocessor: globalmax - scripts: - timeseries: - script: monitor/multi_datasets.py - plot_folder: '{plot_dir}' - group_variables_by: short_name - facet_used_for_labels: legend_label - plots: - timeseries: - annual_mean_kwargs: false - plot_kwargs: - 'global mean': - color: blue - label: null - linestyle: '-' - linewidth: 2 - label: '{dataset}' - 'global min': - color: blue - label: null - linestyle: '--' - linewidth: 1 - 'global max': - color: blue - label: null - linestyle: '--' - linewidth: 1 + linewidth: 1 \ No newline at end of file From a583e7fe7aad0ae2538facdfccda9c3558837809 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Thu, 3 Apr 2025 14:03:43 +0200 Subject: [PATCH 09/12] pre-commit --- .zenodo.json | 2 +- esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 501942bb5f..0fde242140 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -457,4 +457,4 @@ "id": "10.13039/501100000780::824084" } ] -} \ No newline at end of file +} diff --git a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml index 406351d421..6939b38799 100644 --- a/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml +++ b/esmvaltool/recipes/monitor/recipe_monitor_sanity_checks.yml @@ -620,4 +620,4 @@ diagnostics: color: blue label: null linestyle: '--' - linewidth: 1 \ No newline at end of file + linewidth: 1 From ff9a9d8526248475d35c5761547d67f4be3680d9 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Thu, 3 Apr 2025 14:04:59 +0200 Subject: [PATCH 10/12] Restored old parts of .zenodo.json --- .zenodo.json | 67 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 0fde242140..624d94432f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -334,13 +334,12 @@ "name": "Weigel, Katja", "orcid": "0000-0001-6133-7801" }, - { - "affiliation": "University of Bremen, Germany", - "name": "Schulze, Kirsten" - }, { "affiliation": "DLR, Germany", "name": "Sarauer, Ellen" + }, + "affiliation": "University of Bremen, Germany", + "name": "Schulze, Kirsten" }, { "affiliation": "University of Reading, UK", @@ -424,37 +423,37 @@ "title": "ESMValTool", "version": "v2.11.0", "communities": [ - { - "identifier": "is-enes3" - }, - { - "identifier": "dlr_de" - }, - { - "identifier": "ecfunded" - }, - { - "identifier": "nlesc" - } + { + "identifier": "is-enes3" + }, + { + "identifier": "dlr_de" + }, + { + "identifier": "ecfunded" + }, + { + "identifier": "nlesc" + } ], "grants": [ - { - "id": "10.13039/501100000780::282672" - }, - { - "id": "10.13039/501100000780::641727" - }, - { - "id": "10.13039/501100000780::641816" - }, - { - "id": "10.13039/501100000780::727862" - }, - { - "id": "10.13039/501100000780::776613" - }, - { - "id": "10.13039/501100000780::824084" - } + { + "id": "10.13039/501100000780::282672" + }, + { + "id": "10.13039/501100000780::641727" + }, + { + "id": "10.13039/501100000780::641816" + }, + { + "id": "10.13039/501100000780::727862" + }, + { + "id": "10.13039/501100000780::776613" + }, + { + "id": "10.13039/501100000780::824084" + } ] } From 91060954c1b6d7d763f5e7686ff65a01774bb2f8 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Thu, 3 Apr 2025 14:32:30 +0200 Subject: [PATCH 11/12] Restored old zenodo.json --- .zenodo.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 624d94432f..faa0e63c73 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -337,9 +337,6 @@ { "affiliation": "DLR, Germany", "name": "Sarauer, Ellen" - }, - "affiliation": "University of Bremen, Germany", - "name": "Schulze, Kirsten" }, { "affiliation": "University of Reading, UK", From 722750fa2708697d335956e637e22c5ddf05b50f Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Thu, 3 Apr 2025 14:35:07 +0200 Subject: [PATCH 12/12] Re-added Kirsten --- .zenodo.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index faa0e63c73..b22b130c41 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -338,6 +338,10 @@ "affiliation": "DLR, Germany", "name": "Sarauer, Ellen" }, + { + "affiliation": "University of Bremen, Germany", + "name": "Schulze, Kirsten" + }, { "affiliation": "University of Reading, UK", "name": "Roberts, Charles",