Add hfb_pwn dataset and align drains_pwn with the Bergen model#63
Merged
Conversation
- New hfb_pwn mockup dataset (horizontal flow barriers / damwanden), generated from the two damwand features in drains_en_damwand_bergen. Stores the per-feature hydchr and construction depth consumed by nlmod.gwf.hfb.get_hfb_spd. - Correct drains_pwn drain stages to the Bergen v2 outlet levels: the three pump-building drains to -0.5 m NAP (their "uitloop" outlet), drain_dwk stays 0.73; fill mover_lake_name routing (drain_dwk -> "vijver 1, 2 en 3", others -> "vijver 4"). - Register hfb_pwn in repository.yaml. - Fix the Windows path-separator bug in test_mockup_folder_structure and the no-op extent length check in schema_repository.yaml; add a stdlib-json geojson content contract test for drains_pwn and hfb_pwn.
…on main since the 3.14 bump)
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
1 participant
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.
Summary
Transfers the horizontal-flow-barrier (HFB) and drain (DRN) configuration from the Bergen study-case model (
04v2pwnbergenmodel) into reusablenhflodatadatasets, and hardens the data-validation tests.New dataset
hfb_pwndamwand(sheet-pile wall) LineStrings indrains_en_damwand_bergen.nlmod.gwf.hfb.get_hfb_spdconsumes:hydchr(1/100= a 100-day resistance) anddepth(construction depth below groundlevel;elevationleft null). The generator documents that depth-based placement is a deliberate choice (the wall is its physical 5 m of sheet pile, not forced to an absolute aquitard).repository.yaml.drains_pwnvalue corrections (checked against Bergen v2, cell 64)min(diepte_van, diepte_tot)), matching the source "uitloop op -0.5mNAP" comments;drain_dwkstays0.73(pumped).mover_lake_namerouting filled:drain_dwk -> "vijver 1, 2 en 3", other drains ->"vijver 4".Test hardening (surfaced while validating the above)
test_mockup_folder_structure(os.path.normpathon both sides) so the folder-structure contract actually runs on Windows.extent: list(num(), length=4)no-op inschema_repository.yaml->min=4, max=4(yamale ignoreslength=).tests/test_geojson_content.py: a dependency-free (stdlibjson) content contract fordrains_pwn/hfb_pwn(non-empty features, required columns, CRS present) — no value locking.Test plan
hatch run test:pytest tests -v-> 5 passed, 2 xfailed (the xfails are the pre-existing shapefile-backlog checks).