Skip to content

Commit 5890e21

Browse files
authored
Steps blending v1 (#255)
This PR implements the STEPS blending approach in pysteps. It follows the original approaches by Bowler et al. (2006) and Seed et al. (2013).
1 parent f17a627 commit 5890e21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+5614
-287
lines changed

.github/workflows/test_pysteps.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ name: Test pysteps
33
on:
44
# Triggers the workflow on push or pull request events to the master branch
55
push:
6-
branches: [ master ]
6+
branches:
7+
- master
8+
- pysteps-v2
79
pull_request:
8-
branches: [ master ]
10+
branches:
11+
- master
12+
- pysteps-v2
913

1014
jobs:
1115
unit_tests:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 21.6b0
3+
rev: 21.7b0
44
hooks:
55
- id: black
66
language_version: python3

CONTRIBUTING.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ Since PEP8 is a set of recommendations, these are the most important good coding
231231
</tr>
232232

233233
</table>
234-
(source: `Section 3.16.4, Google's python style guide <http://google.github.io/styleguide/pyguide.html>`__)
234+
235+
(source: `Section 3.16.4, Google's python style guide <http://google.github.io/styleguide/pyguide.html>`__)
235236

236237
- If you need to ignore part of the variables returned by a function,
237238
use "_" (single underscore) or __ (double underscore)::

ci/ci_test_env.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies:
2626
- PyWavelets
2727
- pandas
2828
- scikit-image
29+
- rasterio
2930
# Test dependencies
3031
- pytest
3132
- pytest-cov

doc/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Additional requeriments related to the documentation build only
1+
# Additional requirements related to the documentation build only
22
sphinx
33
sphinxcontrib.bibtex
44
sphinx-book-theme
55
sphinx_gallery
66
scikit-image
77
pandas
8-
8+
git+https://github.com/pySTEPS/pysteps-nwp-importers.git@main#egg=pysteps_nwp_importers
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
================
2+
pysteps.blending
3+
================
4+
5+
Implementation of blending methods for blending (ensemble) nowcasts with Numerical Weather Prediction (NWP) models.
6+
7+
.. automodule:: pysteps.blending.interface
8+
.. automodule:: pysteps.blending.clim
9+
.. automodule:: pysteps.blending.linear_blending
10+
.. automodule:: pysteps.blending.skill_scores
11+
.. automodule:: pysteps.blending.steps
12+
.. automodule:: pysteps.blending.utils

doc/source/pysteps_reference/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ available in pysteps.
1414
:caption: API Reference
1515

1616
pysteps
17+
blending
1718
cascade
1819
decorators
1920
extrapolation

doc/source/pysteps_reference/utils.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ Implementation of miscellaneous utility functions.
1616
.. automodule:: pysteps.utils.spectral
1717
.. automodule:: pysteps.utils.tapering
1818
.. automodule:: pysteps.utils.transformation
19+
.. automodule:: pysteps.utils.reprojection

doc/source/references.bib

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11

2+
@TECHREPORT{BPS2004,
3+
AUTHOR = "N. E. Bowler and C. E. Pierce and A. W. Seed",
4+
TITLE = "{STEPS}: A probabilistic precipitation forecasting scheme which merges an extrapolation nowcast with downscaled {NWP}",
5+
INSTITUTION = "UK Met Office",
6+
TYPE = "Forecasting Research Technical Report",
7+
NUMBER = 433,
8+
ADDRESS = "Wallingford, United Kingdom",
9+
YEAR = 2004,
10+
}
11+
212
@ARTICLE{BPS2006,
313
AUTHOR = "N. E. Bowler and C. E. Pierce and A. W. Seed",
414
TITLE = "{STEPS}: A probabilistic precipitation forecasting scheme which merges an extrapolation nowcast with downscaled {NWP}",

doc/source/user_guide/install_pysteps.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ Other optional dependencies include:
3636
* `pywavelets <https://pywavelets.readthedocs.io/en/latest/>`_
3737
(for intensity-scale verification)
3838
* `pandas <https://pandas.pydata.org/>`_ and
39-
`scikit-image <https://scikit-image.org/>`_ (for the DATing and LINDA nowcast methods)
39+
`scikit-image <https://scikit-image.org/>`_ (for advanced feature detection methods)
40+
* `rasterio <https://rasterio.readthedocs.io/en/latest/>`_ (for the reprojection module)
41+
4042

4143
**Important**: If you only want to use pysteps, you can continue reading below.
4244
But, if you want to contribute to pysteps or edit the package, you need to install

0 commit comments

Comments
 (0)