Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.7.0 #306

Merged
merged 3 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ All notable changes to this project will be documented in this page.
The format is based on `Keep a Changelog`_, and this project adheres to
`Semantic Versioning`_.

Unreleased
==========
v0.7.0 (8 November 2024)
========================
This release adds support to create water demand and allocation related data (available since Wflow.jl version 0.8.0).
For now, the new methods for demands support is limited to already gridded input datasets.
The release also includes support for the paddy land use type and additional landuse parameters (crop coefficient and root uptake).

Added
-----
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 @@ -21,7 +21,8 @@ For a static (non-interactive) view of the examples follow one of the links belo
* `Update Wflow model: landuse <../_examples/update_model_landuse.ipynb>`_
* `Update Wflow model: forcing <../_examples/update_model_forcing.ipynb>`_
* `Update Wflow model: gauges <../_examples/update_model_gauges.ipynb>`_
* `Update Wflow model (pyhton): connect to a 1D river model <../_examples/connect_to_1d_model.ipynb>`_
* `Update Wflow model: water demands <../_examples/update_model_water_demand.ipynb>`_
* `Update Wflow model (python): connect to a 1D river model <../_examples/connect_to_1d_model.ipynb>`_

**Clip model from command line interface**

Expand Down
33 changes: 33 additions & 0 deletions examples/data/demand/data_catalog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
lisflood_gwbodies:
data_type: RasterDataset
path: lisflood_gwbodies.tif
driver: raster
filesystem: local
meta:
source_url: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/CEMS-GLOFAS/LISFLOOD_static_and_parameter_maps_for_GloFAS/Water_demand/
crs: 4326
lisflood_gwfrac:
data_type: RasterDataset
path: lisflood_gwfrac.tif
driver: raster
filesystem: local
meta:
source_url: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/CEMS-GLOFAS/LISFLOOD_static_and_parameter_maps_for_GloFAS/Water_demand/
crs: 4326
lisflood_ncfrac:
data_type: RasterDataset
path: lisflood_ncfrac.tif
driver: raster
filesystem: local
meta:
source_url: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/CEMS-GLOFAS/LISFLOOD_static_and_parameter_maps_for_GloFAS/Water_demand/
crs: 4326
lisflood_waterregions:
data_type: RasterDataset
path: lisflood_waterregions.tif
driver: raster
filesystem: local
nodata: -9999
meta:
source_url: https://jeodpp.jrc.ec.europa.eu/ftp/jrc-opendata/CEMS-GLOFAS/LISFLOOD_static_and_parameter_maps_for_GloFAS/Water_demand/
crs: 4326
Binary file added examples/data/demand/lisflood_gwbodies.tif
Binary file not shown.
Binary file added examples/data/demand/lisflood_gwfrac.tif
Binary file not shown.
Binary file added examples/data/demand/lisflood_ncfrac.tif
Binary file not shown.
Binary file added examples/data/demand/lisflood_waterregions.tif
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/update_model_water_demand.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"metadata": {},
"outputs": [],
"source": [
"! hydromt update wflow wflow_piave_water_demand -i wflow_update_water_demand.yml -d artifact_data -d \"https://github.com/Deltares/hydromt_wflow/releases/download/v0.5.0/wflow_artifacts.yml\" -d ../tests/data/demand/data_catalog.yml -v"
"! hydromt update wflow wflow_piave_water_demand -i wflow_update_water_demand.yml -d artifact_data -d \"https://github.com/Deltares/hydromt_wflow/releases/download/v0.5.0/wflow_artifacts.yml\" -d ./data/demand/data_catalog.yml -v"
]
},
{
Expand All @@ -111,7 +111,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand Down
2 changes: 1 addition & 1 deletion hydromt_wflow/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""hydroMT plugin for wflow models."""

__version__ = "0.6.2.dev0"
__version__ = "0.7.0"

from .naming import *
from .utils import *
Expand Down
9 changes: 7 additions & 2 deletions hydromt_wflow/workflows/states.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def prepare_cold_states(
Prepare cold states for Wflow.

Compute cold states variables:

* **satwaterdepth**: saturated store [mm]
* **snow**: snow storage [mm]
* **tsoil**: top soil temperature [°C]
Expand All @@ -35,19 +36,23 @@ def prepare_cold_states(
* **h_land**: land water level [m]
* **h_av_land**: land average water level[m]
* **q_land** or **qx_land**+**qy_land**: overland flow for kinwave [m3/s] or
overland flow in x/y directions for local-inertial [m3/s]
overland flow in x/y directions for local-inertial [m3/s]

If lakes, also adds:

* **waterlevel_lake**: lake water level [m]

If reservoirs, also adds:

* **volume_reservoir**: reservoir volume [m3]

If glaciers, also adds:

* **glacierstore**: water within the glacier [mm]

If paddy, also adds:
* **h_paddy**: water on the paddy fields [mm]

* **h_paddy**: water on the paddy fields [mm]

Parameters
----------
Expand Down
Loading