Merge branch 'main' into 1_to_1_allocation_networks

docs/contribute/ci.qmd

@@ -2,7 +2,7 @@
 title: "Continuous integration"
 ---
 
-Continuous integration (CI) is about commits being merged frequently.
+Continuous integration (CI) is about commits being merged frequently, resulting in new features being released frequently.
 When proposing new changes to the code base a [pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) is opened.
 When a new commit in that pull request, a series of tests will be done to make sure that this commit is error-free and robust in different environments.
 This process drive each new development through building, testing, quality checking.
@@ -42,10 +42,9 @@ graph LR
 ```
 
 ## Conditions of using TeamCity
-TeamCity is not always triggered by every new development.
-For a certain workflow, TeamCity is only used under the following conditions:
+TeamCity only runs workflows with the following conditions:
 
-* When the workflow takes too long to run on Github Action
+* When the workflow would take too long to run on Github Action
 * When the release depends on the artifacts of the workflow.
 * When other TeamCity projects depend on artifacts of Ribasim (e.g. iMOD coupler)
 

docs/python/examples.ipynb

@@ -1455,7 +1455,7 @@
     "    basin.State(level=[0.5]),\n",
     "]\n",
     "model.basin.add(\n",
-    "    Node(2, Point(1.0, 0.0)),\n",
+    "    Node(2, Point(1.0, 0.0), subnetwork_id=2),\n",
     "    [\n",
     "        *basin_data,\n",
     "        basin.Time(\n",
@@ -1469,7 +1469,7 @@
     "    ],\n",
     ")\n",
     "model.basin.add(\n",
-    "    Node(5, Point(2.0, -1.0)),\n",
+    "    Node(5, Point(2.0, -1.0), subnetwork_id=2),\n",
     "    [\n",
     "        *basin_data,\n",
     "        basin.Static(\n",
@@ -1480,9 +1480,6 @@
     "            urban_runoff=[0.0],\n",
     "        ),\n",
     "    ],\n",
-    ")\n",
-    "profile = pd.DataFrame(\n",
-    "    data={\"node_id\": [2, 2, 5, 5], \"area\": 1e3, \"level\": [0.0, 1.0, 0.0, 1.0]}\n",
     ")"
    ]
   },
@@ -1500,15 +1497,15 @@
    "outputs": [],
    "source": [
     "model.flow_boundary.add(\n",
-    "    Node(1, Point(0.0, 0.0)), [flow_boundary.Static(flow_rate=[1e-3])]\n",
+    "    Node(1, Point(0.0, 0.0), subnetwork_id=2), [flow_boundary.Static(flow_rate=[1e-3])]\n",
     ")"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Setup allocation level control:\n"
+    "Setup level demand:\n"
    ]
   },
   {
@@ -1518,7 +1515,7 @@
    "outputs": [],
    "source": [
     "model.level_demand.add(\n",
-    "    Node(4, Point(1.0, -1.0)),\n",
+    "    Node(4, Point(1.0, -1.0), subnetwork_id=2),\n",
     "    [level_demand.Static(priority=[1], min_level=[1.0], max_level=[1.5])],\n",
     ")"
    ]
@@ -1537,7 +1534,7 @@
    "outputs": [],
    "source": [
     "model.user_demand.add(\n",
-    "    Node(3, Point(2.0, 0.0)),\n",
+    "    Node(3, Point(2.0, 0.0), subnetwork_id=2),\n",
     "    [\n",
     "        user_demand.Static(\n",
     "            priority=[2], demand=[1.5e-3], return_factor=[0.2], min_level=[0.2]\n",