From 8e39567658e9019418cc7859a4f3878f0b80c939 Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Tue, 16 Apr 2024 10:05:24 +0100 Subject: [PATCH 1/7] update doc --- docs/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/index.rst b/docs/index.rst index c6005ea7..1d14b38d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,3 +1,5 @@ +.. _anemoi-datasets: + #################################### Welcome to Anemoi's documentation! #################################### From 31473c92aa3c8cf4dc13418e1bc6d9c5122377a1 Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Tue, 16 Apr 2024 10:22:17 +0100 Subject: [PATCH 2/7] update doc --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 1d14b38d..6063c69c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,4 +1,4 @@ -.. _anemoi-datasets: +.. _index-page: #################################### Welcome to Anemoi's documentation! From bff3a5c6952baf8d2a989b3238bb24c37bf3e3a3 Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Tue, 16 Apr 2024 10:22:55 +0100 Subject: [PATCH 3/7] update doc --- .pre-commit-config.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 20cfea30..47639428 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -51,23 +51,23 @@ repos: - --exit-non-zero-on-fix - --preview -- repo: https://github.com/thclark/pre-commit-sphinx - rev: 0.0.1 - hooks: - - id: build-docs - additional_dependencies: - - sphinx - - sphinx_rtd_theme - - nbsphinx - - pandoc - args: - - --cache-dir - - docs/_build/doctrees - - --html-dir - - docs/_build/html - - --source-dir - - docs - language_version: python3 +# - repo: https://github.com/thclark/pre-commit-sphinx +# rev: 0.0.1 +# hooks: +# - id: build-docs +# additional_dependencies: +# - sphinx +# - sphinx_rtd_theme +# - nbsphinx +# - pandoc +# args: +# - --cache-dir +# - docs/_build/doctrees +# - --html-dir +# - docs/_build/html +# - --source-dir +# - docs +# language_version: python3 - repo: https://github.com/sphinx-contrib/sphinx-lint rev: v0.9.1 From 3caa4892e5c6efa4dca5eef700026df14b426d8a Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Tue, 16 Apr 2024 11:23:45 +0100 Subject: [PATCH 4/7] update doc --- docs/conf.py | 20 ++++++++++++++++++++ docs/index.rst | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index 30b10dfc..62a1f298 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,6 +71,26 @@ intersphinx_mapping = { "python": ("https://python.readthedocs.io/en/latest", None), + "anemoi-utils": ( + "https://anemoi-utils.readthedocs.io/en/latest/", + ("../../anemoi-utils/docs/_build/html/objects.inv", None), + ), + "anemoi-datasets": ( + "https://anemoi-datasets.readthedocs.io/en/latest/", + ("../../anemoi-datasets/docs/_build/html/objects.inv", None), + ), + "anemoi-models": ( + "https://anemoi-models.readthedocs.io/en/latest/", + ("../../anemoi-models/docs/_build/html/objects.inv", None), + ), + "anemoi-training": ( + "https://anemoi-training.readthedocs.io/en/latest/", + ("../../anemoi-training/docs/_build/html/objects.inv", None), + ), + "anemoi-inference": ( + "https://anemoi-inference.readthedocs.io/en/latest/", + ("../../anemoi-inference/docs/_build/html/objects.inv", None), + ), } diff --git a/docs/index.rst b/docs/index.rst index 6063c69c..ebe04b1c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -109,6 +109,16 @@ datasets `. cli/compare cli/copy +***************** + Anemoi packages +***************** + +- :ref:`anemoi-utils ` +- :ref:`anemoi-datasets ` +- :ref:`anemoi-models ` +- :ref:`anemoi-training ` +- :ref:`anemoi-inference ` + ********* License ********* From cf09928be10dc590b0629bb8b30a39fdeef5b171 Mon Sep 17 00:00:00 2001 From: Florian Pinault Date: Mon, 22 Apr 2024 18:01:37 +0200 Subject: [PATCH 5/7] simplify --- anemoi/datasets/create/functions/actions/accumulations.py | 3 --- docs/building/sources/perturbations.rst | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/anemoi/datasets/create/functions/actions/accumulations.py b/anemoi/datasets/create/functions/actions/accumulations.py index abb93e37..83910016 100644 --- a/anemoi/datasets/create/functions/actions/accumulations.py +++ b/anemoi/datasets/create/functions/actions/accumulations.py @@ -264,9 +264,6 @@ def compute_accumulations( if not isinstance(param, (list, tuple)): param = [param] - for p in param: - assert p in ["cp", "lsp", "tp", "sf", "lsf", "csf"], p - number = request.get("number", [0]) assert isinstance(number, (list, tuple)) diff --git a/docs/building/sources/perturbations.rst b/docs/building/sources/perturbations.rst index 291e2d0b..39fd72f4 100644 --- a/docs/building/sources/perturbations.rst +++ b/docs/building/sources/perturbations.rst @@ -42,7 +42,7 @@ positive when using the `perturbations` function : It uses the following arguments: -ensembles +members A :ref:`reference ` to the ensemble members. center From 6720a358b00fc28cdaacf450b110c0b9ee9ee22d Mon Sep 17 00:00:00 2001 From: Florian Pinault Date: Wed, 24 Apr 2024 10:41:50 +0200 Subject: [PATCH 6/7] perturbations doc --- docs/building/sources/perturbations.rst | 5 +++++ docs/building/sources/yaml/perturbations.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/building/sources/perturbations.rst b/docs/building/sources/perturbations.rst index 39fd72f4..f6ae8bf6 100644 --- a/docs/building/sources/perturbations.rst +++ b/docs/building/sources/perturbations.rst @@ -51,6 +51,11 @@ center .. literalinclude:: yaml/perturbations.yaml :language: yaml +In this example, the `perturbations` function is applied using two +:ref:`references ` : The strings `members_source` and +`center_source` are arbitrary keys that are used to reference the +elements in `data_sources`. + .. _convective precipitation: https://codes.ecmwf.int/grib/param-db/?id=143 .. _ensemble forecasting: https://www.ecmwf.int/en/elibrary/75394-ensemble-forecasting diff --git a/docs/building/sources/yaml/perturbations.yaml b/docs/building/sources/yaml/perturbations.yaml index fe2da44c..6b4da333 100644 --- a/docs/building/sources/yaml/perturbations.yaml +++ b/docs/building/sources/yaml/perturbations.yaml @@ -1,5 +1,5 @@ data_sources: - members: + members_source: class: ea expver: "0001" grid: 20.0/20.0 @@ -9,7 +9,7 @@ data_sources: stream: enda number: [1, 2, 3, 4, 5, 6, 7, 8, 9] - center: + center_source: class: ea expver: "0001" grid: 20.0/20.0 @@ -20,5 +20,5 @@ data_sources: input: perturbations: - center: ${data_sources.center} - members: ${data_sources.members} + center: ${data_sources.center_source} + members: ${data_sources.members_source} From ed6184af21024c1e3d8781ad777d4c85db31df59 Mon Sep 17 00:00:00 2001 From: Florian Pinault Date: Wed, 24 Apr 2024 14:26:13 +0200 Subject: [PATCH 7/7] updated perturbations doc --- docs/building/sources/perturbations.rst | 7 ++-- docs/building/sources/yaml/perturbations.yaml | 32 ++++++++++--------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/docs/building/sources/perturbations.rst b/docs/building/sources/perturbations.rst index f6ae8bf6..400b12ad 100644 --- a/docs/building/sources/perturbations.rst +++ b/docs/building/sources/perturbations.rst @@ -48,14 +48,11 @@ members center A :ref:`reference ` to the new center requested. +Examples + .. literalinclude:: yaml/perturbations.yaml :language: yaml -In this example, the `perturbations` function is applied using two -:ref:`references ` : The strings `members_source` and -`center_source` are arbitrary keys that are used to reference the -elements in `data_sources`. - .. _convective precipitation: https://codes.ecmwf.int/grib/param-db/?id=143 .. _ensemble forecasting: https://www.ecmwf.int/en/elibrary/75394-ensemble-forecasting diff --git a/docs/building/sources/yaml/perturbations.yaml b/docs/building/sources/yaml/perturbations.yaml index 6b4da333..5881ded9 100644 --- a/docs/building/sources/yaml/perturbations.yaml +++ b/docs/building/sources/yaml/perturbations.yaml @@ -1,22 +1,24 @@ data_sources: members_source: - class: ea - expver: "0001" - grid: 20.0/20.0 - levtype: sfc - param: [10u, 10v, 2t] - type: an - stream: enda - number: [1, 2, 3, 4, 5, 6, 7, 8, 9] + mars: + class: ea + expver: "0001" + grid: 20.0/20.0 + levtype: sfc + param: [10u, 10v, 2t] + type: an + stream: enda + number: [1, 2, 3, 4, 5, 6, 7, 8, 9] center_source: - class: ea - expver: "0001" - grid: 20.0/20.0 - levtype: sfc - param: [10u, 10v, 2t] - type: an - stream: oper + mars: + class: ea + expver: "0001" + grid: 20.0/20.0 + levtype: sfc + param: [10u, 10v, 2t] + type: an + stream: oper input: perturbations: