Merge branch 'main' into pyarrow

docs/concept/core.qmd

@@ -13,7 +13,7 @@ can be found in the [Ribasim repository](https://github.com/Deltares/Ribasim) un
 `core/` folder. For developers we also advise to read the
 [developer documentation](/dev/core.qmd). Information on coupling can be found [here](/guide/coupling.qmd).
 
-An overview of all components is given in the [Get Started](/tutorial/index.qmd#sec-components) section.
+An overview of all components is given in the [installation](/install.qmd#sec-components) section.
 
 # The simulation loop {#sec-simulationloop}
 

docs/dev/core.qmd

@@ -4,7 +4,7 @@ title: "Julia core development"
 
 # Julia core overview
 
-The computational core is one of the components of Ribasim as illustrated in the [component overview](/tutorial/index.qmd#sec-components).
+The computational core is one of the components of Ribasim as illustrated in the [component overview](/install.qmd#sec-components).
 
 The computational process can be divided in three phases:
 

docs/index.qmd

@@ -8,8 +8,9 @@ Ribasim is written in the [Julia programming language](https://julialang.org/) a
 on top of the [SciML: Open Source Software for Scientific Machine Learning](https://sciml.ai/)
 libraries.
 
-Ribasim is developed and supported by [Deltares](https://www.deltares.nl).
-The first version of Ribasim is developed by Deltares as part of a consortium with funding from TKI by Deltares for the Dutch watersystem.
+The initial version of Ribasim is developed by [Deltares](https://www.deltares.nl) as part of a consortium for the Dutch watersystem.
+This activity is co-funded by [TKI Deltatechnology](https://tkideltatechnologie.nl/), a Dutch public–private partnership innovation program from the Ministry of Economic Affairs.
+Ribasim will be used as the surface water module of the [Netherlands Hydrologic Instrument (NHI)](https://nhi.nu/).
 
 ![](https://publicwiki.deltares.nl/download/attachments/232326570/image-2023-3-7_16-39-24-1.png?version=1&modificationDate=1678203564884&api=v2){fig-alt="TKI partner logos"}
 

python/ribasim/ribasim/delwaq/template/B5_bounddata.inc.j2

@@ -18,6 +18,10 @@ ITEM 'Precipitation'
 CONCENTRATIONS 'Continuity' 'Precipitation'
 DATA 1 1
 
+ITEM 'UserDemand'
+CONCENTRATIONS 'Continuity' 'UserDemand'
+DATA 1 1
+
 {% for boundary in boundaries -%}
 ITEM '{{ boundary.name }}'
 CONCENTRATIONS {{ boundary.substances | join(' ') | safe }}

ribasim_qgis/core/nodes.py

@@ -357,6 +357,64 @@ def attributes(cls) -> list[QgsField]:
         ]
 
 
+class BasinConcentrationExternal(Input):
+    @classmethod
+    def input_type(cls) -> str:
+        return "Basin / concentration_external"
+
+    @classmethod
+    def geometry_type(cls) -> str:
+        return "No Geometry"
+
+    @classmethod
+    def attributes(cls) -> list[QgsField]:
+        return [
+            QgsField("time", QVariant.DateTime),
+            QgsField("node_id", QVariant.Int),
+            QgsField("substance", QVariant.String),
+            QgsField("concentration", QVariant.Double),
+        ]
+
+
+class BasinConcentrationState(Input):
+    @classmethod
+    def input_type(cls) -> str:
+        return "Basin / concentration_state"
+
+    @classmethod
+    def geometry_type(cls) -> str:
+        return "No Geometry"
+
+    @classmethod
+    def attributes(cls) -> list[QgsField]:
+        return [
+            QgsField("time", QVariant.DateTime),
+            QgsField("node_id", QVariant.Int),
+            QgsField("substance", QVariant.String),
+            QgsField("concentration", QVariant.Double),
+        ]
+
+
+class BasinConcentration(Input):
+    @classmethod
+    def input_type(cls) -> str:
+        return "Basin / concentration"
+
+    @classmethod
+    def geometry_type(cls) -> str:
+        return "No Geometry"
+
+    @classmethod
+    def attributes(cls) -> list[QgsField]:
+        return [
+            QgsField("time", QVariant.DateTime),
+            QgsField("node_id", QVariant.Int),
+            QgsField("substance", QVariant.String),
+            QgsField("drainage", QVariant.Double),
+            QgsField("precipitation", QVariant.Double),
+        ]
+
+
 class BasinSubgridLevel(Input):
     @classmethod
     def input_type(cls) -> str: