Peilbeheerst oktober (#169)

By @rbruijnshkv. --------- Co-authored-by: rbruijnshkv <[email protected]>
Deltares · Oct 21, 2024 · 4a8ae3c · 4a8ae3c
1 parent e0f021f
commit 4a8ae3c
Show file tree

Hide file tree

Showing 8 changed files with 1,213 additions and 715 deletions.
diff --git a/src/peilbeheerst_model/01_test_parse_crossings.ipynb b/src/peilbeheerst_model/01_test_parse_crossings.ipynb
@@ -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": {
@@ -591,7 +591,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,

diff --git a/src/peilbeheerst_model/02_crossings_to_ribasim_notebook.ipynb b/src/peilbeheerst_model/02_crossings_to_ribasim_notebook.ipynb
@@ -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",
@@ -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)"
    ]
   },
@@ -1187,7 +1186,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,