Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Peilbeheerst oktober #169

Merged
merged 9 commits into from
Oct 21, 2024
Merged

Peilbeheerst oktober #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb73a84
Convert the crossings_to_ribasim notebook to version 2024.11
rbruijnshkv Oct 17, 2024
ae25ec2
Convert the crossings_to_ribasim.py from Ribasim version 2024.10 to 2…
rbruijnshkv Oct 17, 2024
edf7de1
Simplified the python file and made it Ribasim 2024.11 compatible
rbruijnshkv Oct 17, 2024
c069b1a
Ribasim 2024.11 compatible
rbruijnshkv Oct 17, 2024
c2912ff
Ribasim 2024.11 compatible, including improved outlet and pump control
rbruijnshkv Oct 17, 2024
8818b01
New settings for Outlet and Pump Control, 2024.11 compatible
rbruijnshkv Oct 17, 2024
7e32b75
Run pixi
rbruijnshkv Oct 17, 2024
5e4ac26
pixi run pre-commit
visr Oct 21, 2024
a4fd055
Remove unneeded conversion
visr Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/peilbeheerst_model/01_test_parse_crossings.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python [conda env:ribasim]",
"display_name": "default",
"language": "python",
"name": "conda-env-ribasim-py"
"name": "python3"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -591,7 +591,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.12.7"
}
},
"nbformat": 4,
Expand Down
41 changes: 20 additions & 21 deletions src/peilbeheerst_model/02_crossings_to_ribasim_notebook.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,30 @@
"# insert the individual model modules in an actual model\n",
"model = Model(starttime=model_characteristics[\"starttime\"], endtime=model_characteristics[\"endtime\"], crs=\"EPSG:28992\")\n",
"\n",
"model.edge = edge\n",
"model.edge.df = edge\n",
"\n",
"model.basin.node = basin_node\n",
"model.basin.node.df = basin_node\n",
"model.basin.profile = basin_profile\n",
"model.basin.static = basin_static\n",
"model.basin.state = basin_state\n",
"model.basin.area = basin_area\n",
"\n",
"model.pump.node = pump_node\n",
"model.pump.node.df = pump_node\n",
"model.pump.static = pump_static\n",
"\n",
"model.tabulated_rating_curve.node = tabulated_rating_curve_node\n",
"model.tabulated_rating_curve.node.df = tabulated_rating_curve_node\n",
"model.tabulated_rating_curve.static = tabulated_rating_curve_static\n",
"\n",
"model.manning_resistance.node = manning_resistance_node\n",
"model.manning_resistance.node.df = manning_resistance_node\n",
"model.manning_resistance.static = manning_resistance_static\n",
"\n",
"model.level_boundary.node = level_boundary_node\n",
"model.level_boundary.node.df = level_boundary_node\n",
"model.level_boundary.static = level_boundary_static\n",
"\n",
"model.flow_boundary.node = flow_boundary_node\n",
"model.flow_boundary.node.df = flow_boundary_node\n",
"model.flow_boundary.static = flow_boundary_static\n",
"\n",
"model.terminal.node = terminal_node\n",
"model.terminal.node.df = terminal_node\n",
"\n",
"# add checks and metadata\n",
"checks = network.check(model, post_processed_data=post_processed_data, crossings=crossings)\n",
Expand Down Expand Up @@ -789,37 +789,36 @@
"# insert the individual model modules in an actual model\n",
"model = Model(starttime=model_characteristics[\"starttime\"], endtime=model_characteristics[\"endtime\"], crs=\"EPSG:28992\")\n",
"\n",
"model.edge = edge\n",
"model.edge.df = edge\n",
"\n",
"model.basin.node = basin_node\n",
"model.basin.node.df = basin_node\n",
"model.basin.profile = basin_profile\n",
"model.basin.static = basin_static\n",
"model.basin.state = basin_state\n",
"model.basin.area = basin_area\n",
"\n",
"model.pump.node = pump_node\n",
"model.pump.node.df = pump_node\n",
"model.pump.static = pump_static\n",
"\n",
"model.tabulated_rating_curve.node = tabulated_rating_curve_node\n",
"model.tabulated_rating_curve.node.df = tabulated_rating_curve_node\n",
"model.tabulated_rating_curve.static = tabulated_rating_curve_static\n",
"\n",
"model.level_boundary.node = level_boundary_node\n",
"model.manning_resistance.node.df = manning_resistance_node\n",
"model.manning_resistance.static = manning_resistance_static\n",
"\n",
"model.level_boundary.node.df = level_boundary_node\n",
"model.level_boundary.static = level_boundary_static\n",
"\n",
"model.flow_boundary.node = flow_boundary_node\n",
"model.flow_boundary.node.df = flow_boundary_node\n",
"model.flow_boundary.static = flow_boundary_static\n",
"\n",
"model.manning_resistance.node = manning_resistance_node\n",
"model.manning_resistance.static = manning_resistance_static\n",
"\n",
"model.terminal.node = terminal_node\n",
"model.terminal.node.df = terminal_node\n",
"\n",
"# add checks and metadata\n",
"checks = network.check(post_processed_data=post_processed_data, crossings=crossings, model=model)\n",
"checks = network.check(model, post_processed_data=post_processed_data, crossings=crossings)\n",
"model = network.add_meta_data(model, checks, post_processed_data, crossings)\n",
"\n",
"# write the result\n",
"# stop\n",
"network.WriteResults(model=model, checks=checks)"
]
},
Expand Down Expand Up @@ -1187,7 +1186,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.12.7"
}
},
"nbformat": 4,
Expand Down
Loading
Loading