Real wflow basins (#266)

* High basins; save geoms with less decimals

* Update changelog

* Update comments; added precision for reading csv's

* Update changelog

* Updated windows testdata

* Update linux testdata

* Updated comments

* lakes geojson back

* Linting

* Reupdated linux data

* Reset windows data to commit '0c9bbc7c'

* Reset linux data to commit '0c9bbc7c'

* Updated precision user input

docs/changelog.rst

@@ -11,6 +11,7 @@ Unreleased
 
 Added
 -----
+- If applicable, basins geometry based on the higher resolution DEM is stored seperately under **basins_highres** `PR #266 <https://github.com/Deltares/hydromt_wflow/pull/266>`
 - New function **setup_1dmodel_connection** to connect wflow to 1D river model (eg Delft3D FM 1D, HEC-RAS, etc.) `PR #210 <https://github.com/Deltares/hydromt_wflow/pull/210>`_
 - New setup method for the **KsatHorFrac** parameter **setup_ksathorfarc** to up-downscale existing ksathorfrac maps. `PR #255 <https://github.com/Deltares/hydromt_wflow/pull/255>`_
 - new function **setup_pet_forcing** to reproject existing pet data rather than computing from other meteo data. PR #257
@@ -22,6 +23,7 @@ Added
 
 Changed
 -------
+- Basins geometry (**basins**) is now based on the actual wflow model resolution basins, instead of based on the supplied DEM `PR #266 <https://github.com/Deltares/hydromt_wflow/pull/266>`
 - **setup_soilmaps**: the user can now supply variable sbm soil layer thicknesses. The Brooks Corey coefficient is then computed as weighted average over the sbm layers. PR #242
 - **setup_outlets**: the IDs of wflow_subcatch are used to define the outlets IDs rather than [1:n]. PR #247
 - wflow forcing data type should always be float32. PR #268

examples/linux64/wflow_piave_clip/wflow_sbm.toml

@@ -13,12 +13,12 @@ path_output = "outstate/outstates.nc"
 [input]
 path_forcing = "inmaps.nc"
 path_static = "staticmaps.nc"
-gauges = "wflow_gauges"
 ldd = "wflow_ldd"
 river_location = "wflow_river"
 subcatchment = "wflow_subcatch"
 forcing = [ "vertical.precipitation", "vertical.temperature", "vertical.potential_evaporation",]
 cyclic = [ "vertical.leaf_area_index",]
+gauges = "wflow_gauges"
 gauges_grdc = "wflow_gauges_grdc"
 
 [model]
@@ -110,9 +110,9 @@ h_av = "h_av_river"
 ssf = "ssf"
 
 [state.lateral.land]
+q = "q_land"
 h = "h_land"
 h_av = "h_av_land"
-q = "q_land"
 
 [input.lateral.river]
 length = "wflow_riverlength"

examples/linux64/wflow_piave_subbasin/staticgeoms/gauges.geojson

@@ -2,6 +2,6 @@
 "type": "FeatureCollection",
 "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
 "features": [
-{ "type": "Feature", "properties": { "fid": 1 }, "geometry": { "type": "Point", "coordinates": [ 12.199999999999619, 45.833333333334124 ] } }
+{ "type": "Feature", "properties": { "fid": 1 }, "geometry": { "type": "Point", "coordinates": [ 12.2, 45.833333 ] } }
 ]
 }

examples/linux64/wflow_piave_subbasin/staticgeoms/gauges_grdc.geojson

@@ -2,8 +2,8 @@
 "type": "FeatureCollection",
 "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
 "features": [
-{ "type": "Feature", "properties": { "grdc_no": 6349410, "wmo_reg": 6, "sub_reg": 49, "river": "BOITE, TORRENTE", "station": "CANCIA", "country": "IT", "area": 313.0, "altitude": 818.0, "d_start": 1930, "d_end": 2008, "d_yrs": 79, "d_miss": 36.770057182464043, "m_start": null, "m_end": null, "m_yrs": null, "m_miss": null, "t_start": 1930, "t_end": 2008, "t_yrs": 79, "lta_discharge": 9.461, "r_volume_yr": 0.298362096, "r_height_yr": 953.23353354632604 }, "geometry": { "type": "Point", "coordinates": [ 12.216666666666271, 46.433333333333579 ] } },
-{ "type": "Feature", "properties": { "grdc_no": 6349400, "wmo_reg": 6, "sub_reg": 49, "river": "PIAVE, FIUME", "station": "PONTE DELLA IASTA", "country": "IT", "area": 357.0, "altitude": 848.0, "d_start": 1932, "d_end": 2008, "d_yrs": 77, "d_miss": 33.532444444444437, "m_start": null, "m_end": null, "m_yrs": null, "m_miss": null, "t_start": 1932, "t_end": 2008, "t_yrs": 77, "lta_discharge": 10.364, "r_volume_yr": 0.326839104, "r_height_yr": 915.51569747899157 }, "geometry": { "type": "Point", "coordinates": [ 12.516666666665998, 46.533333333333488 ] } },
-{ "type": "Feature", "properties": { "grdc_no": 6349411, "wmo_reg": 6, "sub_reg": 49, "river": "BOITE, TORRENTE", "station": "PODESTAGNO", "country": "IT", "area": 82.0, "altitude": 1330.0, "d_start": 1943, "d_end": 2008, "d_yrs": 66, "d_miss": 51.142821587090893, "m_start": null, "m_end": null, "m_yrs": null, "m_miss": null, "t_start": 1943, "t_end": 2008, "t_yrs": 66, "lta_discharge": 2.256, "r_volume_yr": 0.071145216, "r_height_yr": 867.6245853658537 }, "geometry": { "type": "Point", "coordinates": [ 12.116666666666362, 46.6 ] } }
+{ "type": "Feature", "properties": { "grdc_no": 6349410, "wmo_reg": 6, "sub_reg": 49, "river": "BOITE, TORRENTE", "station": "CANCIA", "country": "IT", "area": 313.0, "altitude": 818.0, "d_start": 1930, "d_end": 2008, "d_yrs": 79, "d_miss": 36.770057182464043, "m_start": null, "m_end": null, "m_yrs": null, "m_miss": null, "t_start": 1930, "t_end": 2008, "t_yrs": 79, "lta_discharge": 9.461, "r_volume_yr": 0.298362096, "r_height_yr": 953.23353354632604 }, "geometry": { "type": "Point", "coordinates": [ 12.216667, 46.433333 ] } },
+{ "type": "Feature", "properties": { "grdc_no": 6349400, "wmo_reg": 6, "sub_reg": 49, "river": "PIAVE, FIUME", "station": "PONTE DELLA IASTA", "country": "IT", "area": 357.0, "altitude": 848.0, "d_start": 1932, "d_end": 2008, "d_yrs": 77, "d_miss": 33.532444444444437, "m_start": null, "m_end": null, "m_yrs": null, "m_miss": null, "t_start": 1932, "t_end": 2008, "t_yrs": 77, "lta_discharge": 10.364, "r_volume_yr": 0.326839104, "r_height_yr": 915.51569747899157 }, "geometry": { "type": "Point", "coordinates": [ 12.516667, 46.533333 ] } },
+{ "type": "Feature", "properties": { "grdc_no": 6349411, "wmo_reg": 6, "sub_reg": 49, "river": "BOITE, TORRENTE", "station": "PODESTAGNO", "country": "IT", "area": 82.0, "altitude": 1330.0, "d_start": 1943, "d_end": 2008, "d_yrs": 66, "d_miss": 51.142821587090893, "m_start": null, "m_end": null, "m_yrs": null, "m_miss": null, "t_start": 1943, "t_end": 2008, "t_yrs": 66, "lta_discharge": 2.256, "r_volume_yr": 0.071145216, "r_height_yr": 867.6245853658537 }, "geometry": { "type": "Point", "coordinates": [ 12.116667, 46.6 ] } }
 ]
 }