Skip to content

UNST-9784: Turn on 1d solver for 1D2D links again.#758

Draft
rene-deltares wants to merge 42 commits intomainfrom
fm/task/UNST-9784_turn_on_1d_solver
Draft

UNST-9784: Turn on 1d solver for 1D2D links again.#758
rene-deltares wants to merge 42 commits intomainfrom
fm/task/UNST-9784_turn_on_1d_solver

Conversation

@rene-deltares
Copy link
Copy Markdown
Contributor

@rene-deltares rene-deltares commented Mar 31, 2026

What was done

  • e.g. Restarts are made more robust
  • e.g. Fixes a bug related to the writing of water depth on the map file
  • e.g. Introduces a new functionality on energy losses at bridge piers
  • e.g. …

Evidence of the work done

  • Video/figures
    <add video/figures if applicable>
  • Clear from the issue description
  • Not applicable

Tests

  • Tests updated
    <add testcase numbers if applicable, Issue number>
  • Not applicable

Documentation

  • Documentation updated
    <add description of changes if applicable, Issue number>
  • Not applicable

Issue link

FlorisBuwaldaDeltares and others added 30 commits December 17, 2025 16:49
@FlorisBuwaldaDeltares
first concept of default 1d2d crs
5f234e2
@FlorisBuwaldaDeltares
set cz and conveyance
4f4de4e
@FlorisBuwaldaDeltares
identical long culvert results
3322f1b
@FlorisBuwaldaDeltares
accidentally used prof1d when network was not loaded
af35ba9
@FlorisBuwaldaDeltares
restore uniform friction
957920c
@FlorisBuwaldaDeltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
e568589
@FlorisBuwaldaDeltares
add long culvert 1d2d link crosssections
cf1c549
@FlorisBuwaldaDeltares
store crsdef in longculverts option. Fix undefined kchar
88e7415
@FlorisBuwaldaDeltares
new reference
4046b9f
@FlorisBuwaldaDeltares
new tolerances
1ece6ed
@FlorisBuwaldaDeltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
8127e10
@FlorisBuwaldaDeltares
merge with main
fd3d8e5
@FlorisBuwaldaDeltares
restore readcrosssections
d28953a
@rene-deltares
UNST-9257: test_getprof_1d scaffolding
1384533
@rene-deltares
Forgot to add new test_getprof_1d files.
d717117
@rene-deltares
Save work for now
086b8d6
@rene-deltares
Save work
6c04e8f
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
fe999c2
@rene-deltares
UNST-9384: Tests for getprof_1d for half-full and full rectangular tube.
b930ad5 
UNST-9384: Add tests for friction and parameterize test helpers.

UNST-9384: Finally get the network1d getprof_1d test case working with friction calculation enabled.

UNST-9384: Passing tests.

UNST-9384: Comment
@rene-deltares
Deep water
ebadae1
@rene-deltares
Added unit test for old profile code using japerim=0, which is causin…
b097ccd 
…g large differences in area in the models.
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
ac7b52f
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
cdeb01e
@rene-deltares
UNST-9384: For the get_prof1d_tests, call the CMake function to copy …
cf9d445 
…the libs to the test folder.
@rene-deltares
UNST-9384: Accidentally committed a file with a merge conflict inside.
fd4a21b
@rene-deltares
UNST-9384: Disabled the get_prof1d tests using network1d calculation …
f0a6309 
…in the case of a 2D2D link.
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
0e1aef0
@rene-deltares
UNST-9384: Revert changes to rectan
8281e42
@rene-deltares
UNST-9384: Do not call 'set_default_1d2d_crs' for now
8bd65d6
@rene-deltares
UNST-9384: test helpers
c7ae084
rene-deltares and others added 12 commits March 9, 2026 14:02
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
57302d6
@rene-deltares
UNST-9384: Removed duplication of 'generate_square_grid' by moving it…
ad36c77 
… into a 'helper' module, used by both test_getprof1d and test_longculverts
@rene-deltares
UNST-9384: Link dflowfm_kernel to test helpers.
1a4e60b
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
6dad843
@rene-deltares
UNST-9384: Revert changes to devcontainer and pyproject.toml
e987148
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
ca02dd5
@rene-deltares
UNST-9384: Re-enable call to set_default_1d2d_crs. It reallocates and…
4baafc8 
… fills network%adm%line2cross, and if we don't do that the test cases containing 'converted' longculverts crash in 'add_longculvert_1D2D_crosssection.
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
404bfea
@rene-deltares
UNST-9384: Remove the default cross section definition anyway, it was…
dcce6c5 
… leading to failing test cases because the shape of mesh1d_mor_crs_[nz] changed.
@rene-deltares
Merge branch 'main' into fm/task/UNST-9384_1D2D_flow1D_solver
0524ca2
@rene-deltares
UNST-9384: Get rid of last remaining copy_dflowfm_test_dependencies
af6b9ec
@rene-deltares
UNST-9784: Turn on 1d solver for 1D2D links again.
bf2a83a
@rene-deltares rene-deltares marked this pull request as draft April 8, 2026 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rene-deltares @FlorisBuwaldaDeltares