Skip to content

Commit

Permalink
Merge branch 'main' into release/v0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JoostBuitink committed Jul 27, 2023
2 parents 8966ddb + d72640c commit 926049a
Show file tree
Hide file tree
Showing 12 changed files with 534 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# file based on github/gitignore

# ignore all files in this directory
sandbox

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -87,6 +90,7 @@ examples/wflow_piave_forcing
examples/wflow_piave_gauges
examples/wflow_test_sediment
examples/wflow_test_extend_sediment
examples/elevation_data

# pyenv
.python-version
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Various new features and bugfixes in support of Wflow.jl v0.7.1. This version wo

Added
-----
- Support for models in CRS other than 4326. `PR #161 <https://github.com/Deltares/hydromt_wflow/pull/161>`_
- Support for elevation data other than MERIT Hydro in **setup_basemaps**.
- Add options to calculate daily Penman-Monteith potential evaporation using the pyet package. Depending on the available variables, two options are defined ``penman-monteith_tdew`` (inputs: ['temp', 'temp_min', 'temp_max', 'wind_u', 'wind_v', 'temp_dew', 'kin', 'press_msl']) and ``penman-monteith_rh_simple`` (inputs: ['temp', 'temp_min', 'temp_max', 'wind', 'rh', 'kin']).
- Support in toml for dir_input and dir_output options. `PR #140 <https://github.com/Deltares/hydromt_wflow/pull/140>`_
- Add options to calculate daily Penman-Monteith potential evaporation using the pyet package. Depending on the available variables, two options are defined ``penman-monteith_tdew`` (inputs: ['temp', 'temp_min', 'temp_max', 'wind_u', 'wind_v', 'temp_dew', 'kin', 'press_msl']) and ``penman-monteith_rh_simple`` (inputs: ['temp', 'temp_min', 'temp_max', 'wind', 'rh', 'kin']).
Expand Down Expand Up @@ -51,6 +53,10 @@ Deprecated
----------
- The **setup_hydrodem** function has been removed, and the functionality are moved to **setup_rivers** and **setup_floodplains**

Documentation
-------------
- New **prepare_ldd** example notebook to demonstrate how to prepare flow directions and other elevation related data.


v0.2.1 (22 November 2022)
=========================
Expand Down
3 changes: 2 additions & 1 deletion docs/getting_started/example_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ For a static (non-interactive) view of the examples follow one of the links belo

* `Clip Wflow model <../_examples/clip_model.ipynb>`_

**Postprocessing and visualization**
**Pre- Post-processing and visualization**

* `Convert wflow staticmaps netcdf to raster files <../_examples/convert_staticmaps_to_mapstack.ipynb>`_
* `Prepare flow directions and related maps from a DEM <../examples/prepare_ldd.ipynb>`_
* `Plot Wflow static maps <../_examples/plot_wflow_staticmaps.ipynb>`_
* `Plot Wflow forcing data <../_examples/plot_wflow_forcing.ipynb>`_
* `Plot Wflow results data <../_examples/plot_wflow_results.ipynb>`_
Expand Down
8 changes: 5 additions & 3 deletions docs/user_guide/process_analyze.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.. _process_visualize:

================================
Postprocessing and visualization
================================
========================================
Pre and postprocessing and visualization
========================================

The Hydromt-Wflow plugin provides several possibilities to postprocess and visualize the model data and model results:

* `Prepare flow directions and related maps from a DEM <../examples/prepare_ldd.ipynb>`_ using the `flw methods of HydroMT <https://deltares.github.io/hydromt/latest/api.html#flow-direction-methods>`_
* `Convert Wflow staticmaps netcdf to raster files <../_examples/convert_staticmaps_to_mapstack.ipynb>`_ for further processing and analyzation
* Plot `staticmaps <../_examples/plot_wflow_staticmaps.ipynb>`_, `forcing data <../_examples/plot_wflow_forcing.ipynb>`_ and
`model results <../_examples/plot_wflow_results.ipynb>`_ by means of additional python packages
Expand All @@ -15,6 +16,7 @@ The Hydromt-Wflow plugin provides several possibilities to postprocess and visua
.. toctree::
:hidden:

Example: Prepare flow directions and related maps from a DEM <../examples/prepare_ldd.ipynb>
Example: Convert wflow staticmaps netcdf to raster files <../_examples/convert_staticmaps_to_mapstack.ipynb>
Example: Plot Wflow staticmaps <../_examples/plot_wflow_staticmaps.ipynb>
Example: Plot Wflow forcing data <../_examples/plot_wflow_forcing.ipynb>
Expand Down
5 changes: 5 additions & 0 deletions docs/user_guide/wflow_build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ for a proper implementation of this model are:
- basin
- subbasin

The coordinate reference system (CRS) of the model will be the same as the one of the input hydrography data. If the region
is specified using point coordinates or a bounding box, the coordinates used should match the CRS of the hydrography data.
If the user wants to use a different CRS, we advise to reproject the hydrography data to the desired CRS before building the model.
You can find some examples on how to do this in the `example notebook <../_examples/prepare_ldd.ipynb>`_.

.. _model_config:

Configuration file
Expand Down
Loading

0 comments on commit 926049a

Please sign in to comment.