Merge v1.0.4 into Master - #1015
Merged
Merged
Conversation
* Fix unit For computation of available volume for local inertial river routing. * Update changelog
* Fix ssf_max sub-daily timestep Maximum subsurface flow was not adjusted for sub-daily timestepfor `layered` and `layered_exponential` profiles. * Update changelog
* Fix `active_indices` for output variable `to_river` For `land` domain variables `to_river` this was not working (active indices for the `river` domain were picked up). The mapping of standard name (or model path) to active indices is now more strict (comparing prefix of these strings instead of substring matching). * Add docstring and comment * Update changelog * Add test for gridded netcdf output
This check was based on `hf` of river nodes and should be based on `hf` of floodplain nodes. However, testing showed there is no performance benefit from this check and looping over active floodplain indices.
* Fix model structure docs Field `mass_balance` was missing. * Improve description run without floodplains docs Removed 2D floodplains as these are always part of the local inertial model that combines river and overland local inertial routing. * Fix list of model configurations docs
* Remove local inertial struct fields `a` and `r` These values are saved each sub timestep of local inertial routing but are used only internally (per function) and are not part of model output. * Avoid `NaN`/`Inf` values hydraulic radius For floodplain local inertial routing.
* Update version numbers * Set Julia compat < 1.12 * Update changelog * Revert compat Julia < 1.12 Not using `invoke` on `setfield!` and update of Manifest files. * Bump Julia version * Update SBOM and pixi lock file to v7 * Update date v1.0.3 changelog
* Allow reservoir spilling when using observed outflows The reservoir outflow was only capped based on water availability, but an upper bound on storage for reservoirs with a maximum storage was not applied. This has been fixed so reservoir storage does not exceed maximum storage. * Update changelog * Update docs observed reservoir outflow
The check is incorrect and not required. For computing flow there is already a check for a minimum flow area.
Fix check `hydraulic_radius` floodplain flow
* Add manifest for MSIX installer (#993) And the required logos at two sizes, which are just resampled logos from the `docs/_static` folder The content of the manifest is the same as that of Ribasim, only updating the names where needed. After this is merged, I can try out the new TeamCity job that creates the MSIX from the ZIP. When that works, another job needs to sign the MSIX on the signing agent. This leaves the WiX files in `Wflow/build/wflow_cli/Setup` for now. If all is working well we can update the docs and remove these files and the TeamCity job. (cherry picked from commit 4f5094f) * Update docs for MSIX, remove WiX installer (#996) * Remove WiX installer files * Update docs for MSIX CLI * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Martijn Visser <mgvisser@gmail.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> (cherry picked from commit a8955dc) * Set Version="1.0.3.1 * Set version to 1.0.4.1 --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…wf` docs (#986) * Fix intercell conductance `exponential` `conductivity_profile` The conductance was not scaled by using the “upstream saturated fraction”. Now consistent with the `uniform` `conductivity_profile`. * Fix equations gwf.qmd Units were incorrect in the finite difference formulation, as the conductance is used dx dy (cell area) should be included. Also added how intercell conductance is computed for two different conductivity profiles. * Fix docstring `Aquifer` * Update changelog
To be in line with the rest of the repo. (cherry picked from commit 0035065)
* Bump version numbers * Update changelog * Add missing orcids to zenodo.json * Update patch release 1.0.4 date changelog
vers-w
marked this pull request as ready for review
July 24, 2026 14:31
visr
approved these changes
Jul 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue addressed
Fixes #1009
It seems v1.0.3 was not merged correctly (commits show up again).
When merging to Master, use normal merging ("Create a merge commit").