Skip to content

Commit

Permalink
Merge branch 'main' into cmorize_noaa_mbl_ch4
Browse files Browse the repository at this point in the history
  • Loading branch information
valeriupredoi authored Oct 12, 2023
2 parents 8636c33 + 12a2bdb commit 9536397
Show file tree
Hide file tree
Showing 10 changed files with 719 additions and 311 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ jobs:
conda activate esmvaltool
mkdir -p ~/climate_data
esmvaltool config get_config_user
echo "offline: false" >> ~/.esmvaltool/config-user.yml
echo "search_esgf: when_missing" >> ~/.esmvaltool/config-user.yml
cat ~/.esmvaltool/config-user.yml
for recipe in esmvaltool/recipes/testing/recipe_*.yml; do
esmvaltool run "$recipe"
Expand Down
4 changes: 3 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ build:
jobs:
pre_create_environment:
# update mamba just in case
- mamba update --yes --quiet --name=base mamba
- mamba update --yes --quiet --name=base mamba 'zstd=1.5.2'
- mamba --version
- mamba list --name=base
post_create_environment:
- conda run -n ${CONDA_DEFAULT_ENV} mamba list
# use conda run executable wrapper to have all env variables
- conda run -n ${CONDA_DEFAULT_ENV} mamba --version
- conda run -n ${CONDA_DEFAULT_ENV} pip install . --no-deps
Expand Down
9 changes: 9 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,15 @@
"affiliation": "DLR, Germany",
"name": "Kazeroni, Rémi",
"orcid": "0000-0001-7205-9528"
},
{
"affiliation": "DLR, Germany",
"name": "Kraft, Jeremy"
},
{
"affiliation": "University of Bremen, Germany",
"name": "Ruhe, Lukas",
"orcid": "0000-0001-6349-9118"
}
],
"description": "ESMValTool: A community diagnostic and performance metrics tool for routine evaluation of Earth system models in CMIP.",
Expand Down
9 changes: 9 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,15 @@ authors:
family-names: Beucher
given-names: Romain
orcid: "https://orcid.org/0000-0003-3891-5444"
-
affiliation: "DLR, Germany"
family-names: Kraft
given-names: Jeremy
-
affiliation: "University of Bremen, Germany"
family-names: Ruhe
given-names: Lukas
orcid: "https://orcid.org/0000-0001-6349-9118"
-
affiliation: "DLR, Germany"
family-names: Bonnet
Expand Down
411 changes: 205 additions & 206 deletions conda-linux-64.lock

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion doc/sphinx/source/recipes/recipe_monitor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,11 @@ Zonal mean pr including a reference dataset.
:align: center
:width: 14cm

Hovmoeller plot (pressure vs time) of ta including a reference dataset.
Hovmoeller plot (pressure vs. time) of ta including a reference dataset.

.. _fig_hovmoeller_time_vs_lat_with_ref:
.. figure:: /recipes/figures/monitor/hovmoeller_time_vs_lat_with_ref.png
:align: center
:width: 14cm

Hovmoeller plot (time vs. latitude) of tas including a reference dataset
5 changes: 5 additions & 0 deletions esmvaltool/config-references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,11 @@ authors:
name: Koirala, Sujan
institute: MPI-BGC, Germany
orcid: https://orcid.org/0000-0001-5681-1986
kraft_jeremy:
name: Kraft, Jeremy
institute: DLR, Germany
orcid:
github: jeremykraftdlr
krasting_john:
name: Krasting, John
institute: NOAA, USA
Expand Down
547 changes: 448 additions & 99 deletions esmvaltool/diag_scripts/monitor/multi_datasets.py

Large diffs are not rendered by default.

34 changes: 31 additions & 3 deletions esmvaltool/recipes/monitor/recipe_monitor_with_refs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ documentation:
(ongoing) model simulations.
authors:
- schlund_manuel
- winterstein_franziska
- sarauer_ellen
- kuehbacher_birgit
- heuer_helge
- kraft_jeremy
- kuehbacher_birgit
- ruhe_lukas
- sarauer_ellen
- winterstein_franziska
maintainer:
- schlund_manuel

Expand All @@ -20,6 +22,7 @@ datasets:
- {project: CMIP6, dataset: MPI-ESM1-2-HR, exp: historical, ensemble: r1i1p1f1, grid: gn, plot_label: 'MPI-ESM1-2-HR historical'}
- {project: CMIP6, dataset: MPI-ESM1-2-LR, exp: historical, ensemble: r1i1p1f1, grid: gn, plot_label: 'Reference (MPI-ESM1-2-LR historical)', reference_for_monitor_diags: true}


preprocessors:

timeseries_regular:
Expand Down Expand Up @@ -92,6 +95,13 @@ preprocessors:
area_statistics:
operator: mean

zonal_mean_2d:
regrid:
target_grid: 2x2
scheme: linear
zonal_statistics:
operator: mean


diagnostics:

Expand Down Expand Up @@ -175,6 +185,7 @@ diagnostics:
plot_kwargs_bias:
levels: [-10.0, -7.5, -5.0, -2.5, 0.0, 2.5, 5.0, 7.5, 10.0]


plot_1D_profiles_with_references:
description: Plot 1D profiles including reference datasets.
variables:
Expand Down Expand Up @@ -227,3 +238,20 @@ diagnostics:
log_y: false
pyplot_kwargs:
ylim: [0, 20000]

plot_time_vs_lat_with_references:
description: Plot Hovmoeller time vs. latitude including reference datasets.
variables:
tas:
mip: Amon
preprocessor: zonal_mean_2d
timerange: '2000/2004'
scripts:
plot:
<<: *plot_multi_dataset_default
script: monitor/multi_datasets.py
plots:
hovmoeller_time_vs_lat_or_lon:
common_cbar: true
show_x_minor_ticks: false
time_format: '%Y'

0 comments on commit 9536397

Please sign in to comment.