diff --git a/doc/sphinx/source/_static/custom.css b/doc/sphinx/source/_static/custom.css new file mode 100644 index 0000000000..ba3dbf80c3 --- /dev/null +++ b/doc/sphinx/source/_static/custom.css @@ -0,0 +1,46 @@ +.gallery { + display: grid; + grid-template-columns: repeat(3, minmax(180px, 1fr)); + gap: 1em; +} + +@media (max-width: 620px) { + .gallery { + grid-template-columns: repeat(2, minmax(180px, 1fr)); + } +} +@media (max-width: 420px) { + .gallery { + grid-template-columns: repeat(1, minmax(180px, 1fr)); + } +} + +.gallery figure:hover { + background-color: var(--pst-color-surface); +} + +.gallery figure img { + max-height: 220px; + object-fit: cover; + overflow: hidden; +} + +.gallery figure figcaption { + color: var(--pst-color-text-muted); + line-height: 1.2; + text-decoration: none; +} + +.gallery figure figcaption a { + text-decoration: none; + color: var(--pst-color-text); +} + +.gallery figure figcaption a:hover { + text-decoration: underline; + color: var(--pst-color-link-hover); +} + +.gallery figure span.caption-number { + display: none; +} diff --git a/doc/sphinx/source/community/diagnostic.rst b/doc/sphinx/source/community/diagnostic.rst index e50e4c603b..cb13847847 100644 --- a/doc/sphinx/source/community/diagnostic.rst +++ b/doc/sphinx/source/community/diagnostic.rst @@ -108,6 +108,26 @@ A resolution of 150 `dpi `_ is recommended for these image files, as this is high enough for the images to look good on the documentation webpage, but not so high that the files become large. +By default, the first example image will be used for the automatically +generated gallery. To select a specific image for the gallery, you can use the +following syntax for an arbitrary amount of images: + +.. code-block:: rst + + .. _fig_name: + .. + gallery + .. figure:: /recipes/figure/recipe_name/figure-name.png + +To not have any figure appear in the gallery, you can include a + +.. code-block:: rst + + .. + no-gallery + +anywhere in your recipe documentation file. + In the recipe ------------- Fill in the ``documentation`` section of the recipe as described in diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 682377468c..d792321120 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -203,7 +203,12 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ["figures/ESMValTool-logo-2-dark.png"] +html_static_path = [ + "figures/ESMValTool-logo-2-dark.png", + "_static", +] + +html_css_files = ["custom.css"] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied diff --git a/doc/sphinx/source/generate_gallery.py b/doc/sphinx/source/generate_gallery.py index 6ee72601d2..38103675e1 100644 --- a/doc/sphinx/source/generate_gallery.py +++ b/doc/sphinx/source/generate_gallery.py @@ -1,137 +1,129 @@ #!/usr/bin/env python """Create gallery with all available recipes.""" +import html import os +from pathlib import Path + +from docutils import nodes +from docutils.core import publish_doctree RECIPE_DIR = "recipes" OUT_PATH = os.path.abspath("gallery.rst") HEADER = ( + ":html_theme.sidebar_secondary.remove:\n\n" ".. DO NOT MODIFY! THIS PAGE IS AUTOGENERATED!\n\n" "#######\nGallery\n#######\n\n" "This section shows example plots produced by ESMValTool. For more " - "information, click on the footnote below the image. " + "information, follow the links in the figure captions." "A website displaying results produced with the latest release of " "ESMValTool for all available recipes can be accessed `here " "`_." "\n\n" ) -WIDTH = ":width: 90%" -FIGURE_STR = ".. figure::" -IMAGE_STR = " image:: " -TABLE_SEP = ( - "+---------------------------------------------------" - "+---------------------------------------------------+\n" -) -EMPTY_TABLE = ( - "| " - "| |\n" -) -CELL_WIDTH = 50 +MAX_CAPTION_LENGTH = 100 +START_GALLERY = '.. raw:: html\n\n
\n\n' -def _get_figure_index(file_content): - """Get index of figure in text.""" - if FIGURE_STR in file_content: - return file_content.index(FIGURE_STR) + len(FIGURE_STR) - if IMAGE_STR in file_content: - return file_content.index(IMAGE_STR) + len(IMAGE_STR) - raise ValueError("File does not contain image") +END_GALLERY = "\n.. raw:: html\n\n
\n\n" +FIGURE_HTML = ( + ".. figure:: {uri}\n :width: 100%\n\n :ref:`{caption} <{link}>`\n\n" +) -def _get_next_row(filenames, file_contents): - """Get next row.""" - figure_idx = [_get_figure_index(content) for content in file_contents] - figure_paths = [ - file_contents[idx][fig_idx:].split("\n")[0].strip() - for (idx, fig_idx) in enumerate(figure_idx) + +def _has_gallery_marker(node): + """Wether the node is preceeded by a ``.. gallery`` comment.""" + siblings = list(node.parent) + idx = siblings.index(node) + if idx <= 0: + return False + prev_node = siblings[idx - 1] + if not isinstance(prev_node, nodes.comment): + return False + return prev_node.astext().lower().strip().startswith("gallery") + + +def _is_excluded_from_gallery(node): + """Wether the node has a no-gallery marker.""" + comments = node.traverse(nodes.comment) + for comment in comments: + if comment.astext().lower().strip() == "no-gallery": + return True + return False + + +def _get_figures_from_file(fname): + """Get marked, no or first figure from documentation page.""" + with (Path(RECIPE_DIR) / fname).open() as f: + content = f.read() + tree = publish_doctree(content, settings_overrides={"report_level": 5}) + try: + link = content.split("\n")[0].split(" ")[1][1:-1] + except IndexError: + print(f"No label found in first line of {fname}. Skipping") + return [] + if _is_excluded_from_gallery(tree): # ignore files with no-gallery marker + return [] + figures = tree.traverse(nodes.figure) + for fig in figures: + fig["link"] = link # add doc page link to figure + marked_figures = [f for f in figures if _has_gallery_marker(f)] + if len(marked_figures) > 0: # consider all figures with gallery marker + return marked_figures + if len(figures) > 0: # select first figure if nothing is marked + return [figures[0]] + return [] + + +def _get_data_from_figure(figure): + image = figure.traverse(nodes.image)[0] + try: + caption = figure.traverse(nodes.caption)[0].astext().strip() + except IndexError: + caption = "No caption available" + if len(caption) > MAX_CAPTION_LENGTH: + caption = caption[:MAX_CAPTION_LENGTH] + "..." + return { + "uri": html.escape(image["uri"]), + "caption": html.escape(caption.replace("\n", " ")), + "link": html.escape(figure["link"]), + } + + +def _find_recipes(root_dir, exclude_dirs): + return [ + path.relative_to(root_dir) + for path in Path(root_dir).rglob("recipe_*.rst") + if not any( + path.parents[0].name.startswith(exclude) + for exclude in exclude_dirs + ) ] - subst = [f"|{os.path.splitext(filename)[0]}|" for filename in filenames] - link = [file_contents[0].split()[1][1:-1]] - if figure_paths[1] == "": - subst[1] = "" - link.append("") - else: - link.append(file_contents[1].split()[1][1:-1]) - - # Build table - row = "" - refs = "" - row += TABLE_SEP - row += f"| {subst[0].ljust(CELL_WIDTH)}| {subst[1].ljust(CELL_WIDTH)}|\n" - row += EMPTY_TABLE - left_col = "[#]_".ljust(CELL_WIDTH) - if figure_paths[1] == "": - right_col = "".ljust(CELL_WIDTH) - else: - right_col = "[#]_".ljust(CELL_WIDTH) - row += f"| {left_col}| {right_col}|\n" - - # Build refs - for idx, path in enumerate(figure_paths): - if path == "": - continue - refs += f".. {subst[idx]} image:: {path}\n" - refs += f" {WIDTH}\n" - refs += "\n" - refs += f".. [#] :ref:`{link[idx]}`\n" - refs += "\n" - - return (row, refs) + + +def _generate_rst_file(fname, data): + """Generate rst file from data.""" + output = "" + output += HEADER + output += START_GALLERY + for figure_data in data: + output += FIGURE_HTML.format(**figure_data) + output += END_GALLERY + with open(fname, "w") as f: + f.write(output) + print(f"Wrote {fname}") def main(): """Generate gallery for recipe plots.""" print(f"Generating gallery at {OUT_PATH}") - left_col = True - table = "" - refs = "" - filenames = [] - file_contents = [] - for filename in sorted(os.listdir(RECIPE_DIR)): - if not filename.startswith("recipe_"): - continue - if not filename.endswith(".rst"): - continue - with open(os.path.join(RECIPE_DIR, filename)) as in_file: - recipe_file = in_file.read() - if FIGURE_STR not in recipe_file and IMAGE_STR not in recipe_file: - print(f"INFO: {filename} does not contain an image, skipping") - continue - if not recipe_file.startswith(".."): - print( - f"INFO: {filename} does not contain reference at top, skipping" - ) - continue - - # Get next row - if left_col: - left_col = False - filenames = [filename] - file_contents = [recipe_file] - continue - else: - left_col = True - filenames.append(filename) - file_contents.append(recipe_file) - new_row = _get_next_row(filenames, file_contents) - table += new_row[0] - refs += new_row[1] - - # Last row - if len(filenames) == 1: - filenames.append("") - file_contents.append(f"{FIGURE_STR}\n") - new_row = _get_next_row(filenames, file_contents) - table += new_row[0] - refs += new_row[1] - table += TABLE_SEP - table += "\n" - - # Write file - whole_file = HEADER + table + refs - with open(OUT_PATH, "w") as out_file: - print(whole_file, file=out_file) - print(f"Wrote {OUT_PATH}") + figures = [] + fnames = _find_recipes(RECIPE_DIR, ["legacy", "figures"]) + for filename in sorted(fnames): + figures.extend(_get_figures_from_file(filename)) + data = [_get_data_from_figure(f) for f in figures] + _generate_rst_file(OUT_PATH, data) if __name__ == "__main__": diff --git a/doc/sphinx/source/recipes/index.rst b/doc/sphinx/source/recipes/index.rst index b545fc7e96..c73bbeb9de 100644 --- a/doc/sphinx/source/recipes/index.rst +++ b/doc/sphinx/source/recipes/index.rst @@ -106,7 +106,6 @@ IPCC recipe_ipccwg1ar6ch3 recipe_ipccwg1ar5ch9 recipe_collins13ipcc - recipe_examples Land ^^^^ @@ -164,12 +163,9 @@ require a legacy version of ESMValTool to run. .. toctree:: - :maxdepth: 1 + :maxdepth: 2 - recipe_psyplot - recipe_rainfarm - recipe_schlund20jgr - recipe_spei + legacy_recipe_list Broken recipe list diff --git a/doc/sphinx/source/recipes/recipe_psyplot.rst b/doc/sphinx/source/recipes/legacy/recipe_psyplot.rst similarity index 100% rename from doc/sphinx/source/recipes/recipe_psyplot.rst rename to doc/sphinx/source/recipes/legacy/recipe_psyplot.rst diff --git a/doc/sphinx/source/recipes/recipe_rainfarm.rst b/doc/sphinx/source/recipes/legacy/recipe_rainfarm.rst similarity index 100% rename from doc/sphinx/source/recipes/recipe_rainfarm.rst rename to doc/sphinx/source/recipes/legacy/recipe_rainfarm.rst diff --git a/doc/sphinx/source/recipes/recipe_schlund20jgr.rst b/doc/sphinx/source/recipes/legacy/recipe_schlund20jgr.rst similarity index 100% rename from doc/sphinx/source/recipes/recipe_schlund20jgr.rst rename to doc/sphinx/source/recipes/legacy/recipe_schlund20jgr.rst diff --git a/doc/sphinx/source/recipes/recipe_spei.rst b/doc/sphinx/source/recipes/legacy/recipe_spei.rst similarity index 100% rename from doc/sphinx/source/recipes/recipe_spei.rst rename to doc/sphinx/source/recipes/legacy/recipe_spei.rst diff --git a/doc/sphinx/source/recipes/legacy_recipe_list.rst b/doc/sphinx/source/recipes/legacy_recipe_list.rst new file mode 100644 index 0000000000..5af4046dc7 --- /dev/null +++ b/doc/sphinx/source/recipes/legacy_recipe_list.rst @@ -0,0 +1,16 @@ +.. _legacy_recipe_list: + +Legacy Recipes +============== + +Recipes that have been retired and are included for +documentation purposes only. Typically, these recipes +require a legacy version of ESMValTool to run. + +.. toctree:: + :maxdepth: 1 + + legacy/recipe_psyplot + legacy/recipe_rainfarm + legacy/recipe_schlund20jgr + legacy/recipe_spei diff --git a/doc/sphinx/source/recipes/recipe_capacity_factor.rst b/doc/sphinx/source/recipes/recipe_capacity_factor.rst index 39b277e294..94956324dd 100644 --- a/doc/sphinx/source/recipes/recipe_capacity_factor.rst +++ b/doc/sphinx/source/recipes/recipe_capacity_factor.rst @@ -75,4 +75,4 @@ Example plots :align: center :width: 14cm -Wind capacity factor for five turbines: Enercon E70 (top-left), Gamesa G80 (middle-top), Gamesa G87 (top-right), Vestas V100 (bottom-left) and Vestas V110 (middle-bottom) using the IPSL-CM5A-MR simulations for the r1p1i1 ensemble for the rcp8.5 scenario during the period 2021-2050. + Wind capacity factor for five turbines: Enercon E70 (top-left), Gamesa G80 (middle-top), Gamesa G87 (top-right), Vestas V100 (bottom-left) and Vestas V110 (middle-bottom) using the IPSL-CM5A-MR simulations for the r1p1i1 ensemble for the rcp8.5 scenario during the period 2021-2050. diff --git a/doc/sphinx/source/recipes/recipe_climate_change_hotspot.rst b/doc/sphinx/source/recipes/recipe_climate_change_hotspot.rst index ea3adadd61..cb5e94db93 100644 --- a/doc/sphinx/source/recipes/recipe_climate_change_hotspot.rst +++ b/doc/sphinx/source/recipes/recipe_climate_change_hotspot.rst @@ -190,11 +190,17 @@ Example plots .. figure:: /recipes/figures/cos22esd/tas_45.png :align: center + Mediterranean region temperature change differences against the mean global temperature + change. The changes for the periods 2041–2060 (first and third + row) and 2081–2100 (second and fourth row) are evaluated against 1986–2005 mean. The differences are shown for the CMIP5 (left) + and CMIP6 (right) DJF, JJA and annual mean projections (columns) under the high emission scenario RCP8.5 and SSP5-8.5 respectively. N + indicates the number of models included in the ensemble mean. + .. figure:: /recipes/figures/cos22esd/pr_45.png :align: center - Mediterranean region temperature (upper rows) and precipitation (lower rows) change differences against the mean global temperature - change and the mean 30–45º  N latitudinal belt precipitation change respectively. The changes for the periods 2041–2060 (first and third + Mediterranean region precipitation change differences against the mean 30–45º  N latitudinal belt precipitation change respectively. + The changes for the periods 2041–2060 (first and third row) and 2081–2100 (second and fourth row) are evaluated against 1986–2005 mean. The differences are shown for the CMIP5 (left) and CMIP6 (right) DJF, JJA and annual mean projections (columns) under the high emission scenario RCP8.5 and SSP5-8.5 respectively. N indicates the number of models included in the ensemble mean. diff --git a/doc/sphinx/source/recipes/recipe_combined_indices.rst b/doc/sphinx/source/recipes/recipe_combined_indices.rst index cff0856bff..2ac5639333 100644 --- a/doc/sphinx/source/recipes/recipe_combined_indices.rst +++ b/doc/sphinx/source/recipes/recipe_combined_indices.rst @@ -77,4 +77,4 @@ Example plots :align: center :width: 14cm -Time series of the standardized sea surface temperature (tos) area averaged over the Nino 3.4 region during the boreal winter (December-January-February). The time series correspond to the MPI-ESM-MR (red) and BCC-CSM1-1 (blue) models and their mean (black) during the period 1950-2005 for the ensemble r1p1i1 of the historical simulations. + Time series of the standardized sea surface temperature (tos) area averaged over the Nino 3.4 region during the boreal winter (December-January-February). The time series correspond to the MPI-ESM-MR (red) and BCC-CSM1-1 (blue) models and their mean (black) during the period 1950-2005 for the ensemble r1p1i1 of the historical simulations. diff --git a/doc/sphinx/source/recipes/recipe_diurnal_temperature_index.rst b/doc/sphinx/source/recipes/recipe_diurnal_temperature_index.rst index 200255ed50..3464fc21f7 100644 --- a/doc/sphinx/source/recipes/recipe_diurnal_temperature_index.rst +++ b/doc/sphinx/source/recipes/recipe_diurnal_temperature_index.rst @@ -73,4 +73,4 @@ Example plots :align: center :width: 14cm -Mean number of days exceeding the Diurnal Temperature Range (DTR) simulated during the historical period (1961-1990) by 5 degrees during the period 2030-2080. The result is derived from one RCP 8.5 scenario simulated by MPI-ESM-MR. + Mean number of days exceeding the Diurnal Temperature Range (DTR) simulated during the historical period (1961-1990) by 5 degrees during the period 2030-2080. The result is derived from one RCP 8.5 scenario simulated by MPI-ESM-MR. diff --git a/doc/sphinx/source/recipes/recipe_extreme_index.rst b/doc/sphinx/source/recipes/recipe_extreme_index.rst index e4656a3a77..1149c4ef06 100644 --- a/doc/sphinx/source/recipes/recipe_extreme_index.rst +++ b/doc/sphinx/source/recipes/recipe_extreme_index.rst @@ -88,9 +88,9 @@ References Example plots ------------- -.. _fig_combinedindices1: +.. _fig_extremeindex1: .. figure:: /recipes/figures/recipe_extreme_index/t90p_IPSL-CM5A-LR_rcp85_2020_2040.png :align: center :width: 14cm -Average change in the heat component (t90p metric) of the Combined Climate Extreme Index for the 2020-2040 compared to the 1971-2000 reference period for the RCP 8.5 scenario simulated by MPI-ESM-MR. + Average change in the heat component (t90p metric) of the Combined Climate Extreme Index for the 2020-2040 compared to the 1971-2000 reference period for the RCP 8.5 scenario simulated by MPI-ESM-MR. diff --git a/doc/sphinx/source/recipes/recipe_gier20bg.rst b/doc/sphinx/source/recipes/recipe_gier20bg.rst index b8f8fb9b8e..4858ee03ea 100644 --- a/doc/sphinx/source/recipes/recipe_gier20bg.rst +++ b/doc/sphinx/source/recipes/recipe_gier20bg.rst @@ -171,6 +171,8 @@ Example plots Mean fractional coverage of monthly satellite data. .. _fig_gier20bg_2: +.. + gallery .. figure:: /recipes/figures/gier20bg/fig02.png :align: center :width: 80% @@ -194,6 +196,8 @@ Example plots of interannual variability. .. _fig_gier20bg_5: +.. + gallery .. figure:: /recipes/figures/gier20bg/fig05.png :align: center :width: 80% diff --git a/doc/sphinx/source/recipes/recipe_heatwaves_coldwaves.rst b/doc/sphinx/source/recipes/recipe_heatwaves_coldwaves.rst index 019508ae80..ba4b6eb39e 100644 --- a/doc/sphinx/source/recipes/recipe_heatwaves_coldwaves.rst +++ b/doc/sphinx/source/recipes/recipe_heatwaves_coldwaves.rst @@ -69,4 +69,4 @@ Example plots :align: center :width: 14cm -Mean number of summer days during the period 2060-2080 when the daily maximum near-surface air temperature exceeds the 80th quantile of the 1971-2000 reference period. The results are based on one RCP 8.5 scenario simulated by BCC-CSM1-1. + Mean number of summer days during the period 2060-2080 when the daily maximum near-surface air temperature exceeds the 80th quantile of the 1971-2000 reference period. The results are based on one RCP 8.5 scenario simulated by BCC-CSM1-1. diff --git a/doc/sphinx/source/recipes/recipe_impact.rst b/doc/sphinx/source/recipes/recipe_impact.rst index b873f227ad..b7d2455366 100644 --- a/doc/sphinx/source/recipes/recipe_impact.rst +++ b/doc/sphinx/source/recipes/recipe_impact.rst @@ -69,7 +69,7 @@ Example plots .. figure:: /recipes/figures/impact/bias_vs_change.png :align: center - "Bias and change for each variable" + Bias and change for each variable .. raw:: html diff --git a/doc/sphinx/source/recipes/recipe_kcs.rst b/doc/sphinx/source/recipes/recipe_kcs.rst index 1ed117ecb6..285e531534 100644 --- a/doc/sphinx/source/recipes/recipe_kcs.rst +++ b/doc/sphinx/source/recipes/recipe_kcs.rst @@ -128,6 +128,8 @@ AND highlighting the selected steering parameters and resampling periods: .. figure:: /recipes/figures/kcs/global_matching.png :align: center + CMIP spread in global temperature change, highlighting selected steering parameters and resampling periods + The diagnostic ``local_resampling`` produces a number of output files: * ``season_means_.nc``: intermediate results, containing the season means for each segment of the original target model ensemble. @@ -158,3 +160,5 @@ The diagnostic ``local_resampling`` produces a number of output files: .. _fig_kcs_local_validation: .. figure:: /recipes/figures/kcs/local_validation_2085.png :align: center + + Validation figure, reproducing figures 5 and 6 from Lenderink et al. (2014) diff --git a/doc/sphinx/source/recipes/recipe_modes_of_variability.rst b/doc/sphinx/source/recipes/recipe_modes_of_variability.rst index 3fcd4aa5d2..13ffeb986a 100644 --- a/doc/sphinx/source/recipes/recipe_modes_of_variability.rst +++ b/doc/sphinx/source/recipes/recipe_modes_of_variability.rst @@ -86,4 +86,4 @@ Example plots :align: center :width: 14cm -Four modes of variability for autumn (September-October-November) in the North Atlantic European Sector for the RCP 8.5 scenario using BCC-CSM1-1 future projection during the period 2020-2075. The frequency of occurrence of each variability mode is indicated in the title of each map. + Four modes of variability for autumn (September-October-November) in the North Atlantic European Sector for the RCP 8.5 scenario using BCC-CSM1-1 future projection during the period 2020-2075. The frequency of occurrence of each variability mode is indicated in the title of each map. diff --git a/doc/sphinx/source/recipes/recipe_multimodel_products.rst b/doc/sphinx/source/recipes/recipe_multimodel_products.rst index 9d7bcc651d..9208b8c307 100644 --- a/doc/sphinx/source/recipes/recipe_multimodel_products.rst +++ b/doc/sphinx/source/recipes/recipe_multimodel_products.rst @@ -76,4 +76,4 @@ Example plots .. _fig_multimodprod: .. figure:: /recipes/figures/multimodel_products/tas_JUN_multimodel-anomaly_2006_2099_1961_1990.png -Multi-model mean anomaly of 2-m air temperature during the future projection 2006-2099 in June considering the reference period 1961-1990 (colours). Crosses indicate that the 80% of models agree in the sign of the multi-model mean anomaly. The models selected are BCC-CSM1-1, MPI-ESM-MR and MIROC5 in the r1i1p1 ensembles for the RCP 2.6 scenario. + Multi-model mean anomaly of 2-m air temperature during the future projection 2006-2099 in June considering the reference period 1961-1990 (colours). Crosses indicate that the 80% of models agree in the sign of the multi-model mean anomaly. The models selected are BCC-CSM1-1, MPI-ESM-MR and MIROC5 in the r1i1p1 ensembles for the RCP 2.6 scenario. diff --git a/doc/sphinx/source/recipes/recipe_pv_capacity_factor.rst b/doc/sphinx/source/recipes/recipe_pv_capacity_factor.rst index 08962f3ca8..b632c13515 100644 --- a/doc/sphinx/source/recipes/recipe_pv_capacity_factor.rst +++ b/doc/sphinx/source/recipes/recipe_pv_capacity_factor.rst @@ -74,4 +74,4 @@ Example plots :align: center :width: 14cm -PV capacity factor calculated from IPSL-CM5-MR during the DJF season for 1980–2005. + PV capacity factor calculated from IPSL-CM5-MR during the DJF season for 1980–2005. diff --git a/doc/sphinx/source/recipes/recipe_seaice_drift.rst b/doc/sphinx/source/recipes/recipe_seaice_drift.rst index a3207bce0b..10446a4a6c 100644 --- a/doc/sphinx/source/recipes/recipe_seaice_drift.rst +++ b/doc/sphinx/source/recipes/recipe_seaice_drift.rst @@ -75,7 +75,7 @@ Example plots .. figure:: /recipes/figures/seaice_drift/drift-strength.png :align: center -Scatter plots of modelled (red) and observed (blue) monthly mean -sea-ice drift speed against sea-ice concentration (left panel) and sea-ice -thickness (right panel) temporally averaged over the period 1979–2005 and -spatially averaged over the SCICEX box. + Scatter plots of modelled (red) and observed (blue) monthly mean + sea-ice drift speed against sea-ice concentration (left panel) and sea-ice + thickness (right panel) temporally averaged over the period 1979–2005 and + spatially averaged over the SCICEX box. diff --git a/doc/sphinx/source/recipes/recipe_thermodyn_diagtool.rst b/doc/sphinx/source/recipes/recipe_thermodyn_diagtool.rst index 5ee51dfb9c..c1a5973a5d 100644 --- a/doc/sphinx/source/recipes/recipe_thermodyn_diagtool.rst +++ b/doc/sphinx/source/recipes/recipe_thermodyn_diagtool.rst @@ -143,6 +143,10 @@ Example plots :align: left :width: 14cm + Meridional transports. + .. figure:: /recipes/figures/thermodyn_diagtool/CanESM2_wmb_transp.png :align: right :width: 14cm + + Water mass transports. diff --git a/doc/sphinx/source/recipes/recipe_toymodel.rst b/doc/sphinx/source/recipes/recipe_toymodel.rst index c39ac951db..0b58d1da6e 100644 --- a/doc/sphinx/source/recipes/recipe_toymodel.rst +++ b/doc/sphinx/source/recipes/recipe_toymodel.rst @@ -78,4 +78,4 @@ Example plots .. _fig_toymodel: .. figure:: /recipes/figures/toymodel/synthetic_CMIP5_bcc-csm1-1_Amon_rcp45_r1i1p1_psl_2051-2060.jpg -Twenty synthetic single-model ensemble generated by the recipe_toymodel.yml (see Section 3.7.2) for the 2051-2060 monthly data of r1i1p1 RCP 4.5 scenario of BCC_CSM1-1 simulation. + Twenty synthetic single-model ensemble generated by the recipe_toymodel.yml (see Section 3.7.2) for the 2051-2060 monthly data of r1i1p1 RCP 4.5 scenario of BCC_CSM1-1 simulation.