Skip to content

Include height above nearest drainage (HAND) for later use#856

Merged
jensdebruijn merged 1 commit into
mainfrom
jens-hand
Jun 3, 2026
Merged

Include height above nearest drainage (HAND) for later use#856
jensdebruijn merged 1 commit into
mainfrom
jens-hand

Conversation

@jensdebruijn

Copy link
Copy Markdown
Collaborator

Pull Request Checklist

Documentation

  • All new or substantially edited functions have documentation in the style of documentation in other functions.
  • Where neccesary, code comments are added focussing on why something is done, rather than what is done. The what should ideally be evident from the variable naming and structure.
  • All added or substantially edited functions have type annotations for arguments and return types.

Clarity

  • All variable names are clear and understandable by a non-domain expert.
  • Units should be included and preferably as SI units.
  • All monetary units are nominal USD (face value) for the respective years.

Testing

  • Tests that are not available on GitHub actions pass (primarly test_model.py).
  • When there is an error, the code fails (early). I.e., the code doesn't silently fail.

Thank you for helping maintain the code quality!

Copilot AI review requested due to automatic review settings June 3, 2026 12:51
@jensdebruijn jensdebruijn requested a review from WMLKalthof June 3, 2026 12:51

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds height above nearest drainage (HAND) as an additional hydrography-derived raster in the built model outputs, and bumps the model/package version to ensure existing model builds can be updated accordingly.

Changes:

  • Compute and persist a new routing/height_above_nearest_drainage_m grid during setup_hydrography.
  • Bump package version to 1.0.0b27 (pyproject + lockfile).
  • Add a version update entry instructing users to re-run setup_hydrography, and record the change in the changelog.

Reviewed changes

Copilot reviewed 4 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
uv.lock Bumps editable package version to 1.0.0b27 in the lockfile.
pyproject.toml Bumps project version to 1.0.0b27.
geb/build/version_updates.py Adds a 1.0.0b27 update instruction to re-run setup_hydrography.
geb/build/modules/hydrography.py Computes and writes the HAND raster to the build output grids.
CHANGELOG.md Adds a v1.0.0b27 section entry noting HAND inclusion.

Comment thread geb/build/modules/hydrography.py
@jensdebruijn jensdebruijn merged commit 6ea4253 into main Jun 3, 2026
17 checks passed
@jensdebruijn jensdebruijn deleted the jens-hand branch June 3, 2026 13:20
TimBusker added a commit that referenced this pull request Jun 8, 2026
* fix routing zero discharge error

* changelog

* remove stop here

* Tim europe model evaluation updates  (#848)

* unraise error for manual changes needed + turn off farmer adaptation

* some progress fixing crop calendars

Co-authored-by: Copilot <copilot@github.com>

* some more progress

Co-authored-by: Copilot <copilot@github.com>

* minor changes in evaluate dashboard (larger figures)

* clear error farmer and update version change

* correct version update

* revert docstring-induced error in crop farmers

* Central dashboard functionality in seperate workflow script

* first setup "geb tool merge"

* debuggin code routing

* routing debugging

* debug update routing

* several updates to merge.py

* report outflow points to false (due to RAM issue)

* Use MIRCA-OS crop calendars rather than MIRCA2000

* updates to model merger tool and the evaluation dashboard

* remove now redundant check

* several updates to merger and evaluate

* several simplifications to merge and skill score algorithms

* typo in hydrology eval

* skill score map functionality

* seperate plots for GEB skills, external skills, and merged

* skill score simplifcations

* delete methods from version updates

* delete mean squared erorr

* updates to changelog and delete debugging part in routing

* more intuative function names

* changes to cli.py

* Update CHANGELOG with recent changes and features

Updated the CHANGELOG to reflect recent enhancements and fixes, including new commands and improved plotting functions.

* NamedTuple

* address PR comments & add functionaility for upstream area filtering

* add time series length to model config

* descriptive var names

* external_evaluation_folder to config

* improve merge.py

* remove futures annot

* var name changes

---------

Co-authored-by: Tim Busker <tim.buskervu.nl>
Co-authored-by: Jens de Bruijn <2176353+jensdebruijn@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>

* Include height above nearest drainage (HAND) for later use (#856)

* changelog

* merit basin erorr

* changes made on snellius

* making runner.py shorter and reducing number of functions

* warning message

* routing fix

* mkdocs snellius change

* last changes

* remove option for tailored build, model config names

---------

Co-authored-by: Tim Busker <tim.buskervu.nl>
Co-authored-by: Jens de Bruijn <2176353+jensdebruijn@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>
TimBusker added a commit that referenced this pull request Jun 9, 2026
* fix routing zero discharge error

* changelog

* remove stop here

* Tim europe model evaluation updates  (#848)

* unraise error for manual changes needed + turn off farmer adaptation

* some progress fixing crop calendars

Co-authored-by: Copilot <copilot@github.com>

* some more progress

Co-authored-by: Copilot <copilot@github.com>

* minor changes in evaluate dashboard (larger figures)

* clear error farmer and update version change

* correct version update

* revert docstring-induced error in crop farmers

* Central dashboard functionality in seperate workflow script

* first setup "geb tool merge"

* debuggin code routing

* routing debugging

* debug update routing

* several updates to merge.py

* report outflow points to false (due to RAM issue)

* Use MIRCA-OS crop calendars rather than MIRCA2000

* updates to model merger tool and the evaluation dashboard

* remove now redundant check

* several updates to merger and evaluate

* several simplifications to merge and skill score algorithms

* typo in hydrology eval

* skill score map functionality

* seperate plots for GEB skills, external skills, and merged

* skill score simplifcations

* delete methods from version updates

* delete mean squared erorr

* updates to changelog and delete debugging part in routing

* more intuative function names

* changes to cli.py

* Update CHANGELOG with recent changes and features

Updated the CHANGELOG to reflect recent enhancements and fixes, including new commands and improved plotting functions.

* NamedTuple

* address PR comments & add functionaility for upstream area filtering

* add time series length to model config

* descriptive var names

* external_evaluation_folder to config

* improve merge.py

* remove futures annot

* var name changes

---------

Co-authored-by: Tim Busker <tim.buskervu.nl>
Co-authored-by: Jens de Bruijn <2176353+jensdebruijn@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>

* Include height above nearest drainage (HAND) for later use (#856)

* changelog

* merit basin erorr

* changes made on snellius

* making runner.py shorter and reducing number of functions

* warning message

* routing fix

* interactive charts on dashboard

* dshboard improvements

* update evaluation mkdocs skill scores

* changelog

* typesetting

* clearer variable names and some optimalization

---------

Co-authored-by: Tim Busker <tim.buskervu.nl>
Co-authored-by: Jens de Bruijn <2176353+jensdebruijn@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants