Ensemble: Rename 'run_number' to 'number_of_run' and fix seed spin box max value.

This reverts commit 1e1ee67d4b.

.gitlab-ci.yml

@@ -186,7 +186,7 @@ unittest:
     - pip3 install -r ./full-requirements.txt
     - pip3 install -U -r ./full-requirements.txt
     - cd src
-    - python3 -m unittest discover -t .
+    - python3.12 -m unittest discover -t .
 
 test-pep8:
   stage: test
@@ -638,7 +638,7 @@ shadow-release:
     - job: pkg-hash
       artifacts: true
   rules:
-    - if: $CI_COMMIT_BRANCH != 'master' && $CI_COMMIT_TAG
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^v/
   artifacts:
     paths:
       - linux/pamhyr-gnulinux.tar.xz
@@ -672,7 +672,7 @@ tag-release:
     - job: pkg-hash
       artifacts: true
   rules:
-    - if: $CI_COMMIT_BRANCH == 'master' && $CI_COMMIT_TAG
+    - if: $CI_COMMIT_TAG =~ /^v/
   artifacts:
     paths:
       - linux/pamhyr-gnulinux.tar.xz

AUTHORS

@@ -1,3 +1,4 @@
 Sylvain COULIBALY, INRAE, 2020 - 2022
 Théophile TERRAZ, INRAE, 2022 - 2024
-Pierre-Antoine ROUBY, INRAE, 2023 - 2025
+Pierre-Antoine ROUBY, INRAE, 2023 - 2026
+Dylan JEANNIN, INRAE, 2026

README.md

@@ -3,7 +3,7 @@
 Pamhyr is a free and open source graphical user interface for 1D hydro-sedimentary
 modelling of rivers.
 
-![logo](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/raw/master/src/View/ui/ressources/Pamhyr2_logo.png)
+![logo](https://gitlab.com/pamhyr/pamhyr2/-/raw/master/src/View/ui/ressources/Pamhyr2_logo.png)
 
 ## Features
 
@@ -21,9 +21,9 @@ modelling of rivers.
 + Create and edit study alternative scenario tree
 
 Let see the
-[documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home)
-([:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home-fr),
-[:gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home-en))
+[documentation](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home)
+([:fr:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home-fr),
+[:gb:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home-en))
 for more details.
 
 ## Install
@@ -31,11 +31,11 @@ for more details.
 ### GNU/Linux
 
 See documentation:
-- [French :fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20GNULinux)
-- [English :gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux)
+- [French :fr:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/fr/Install%20on%20GNULinux)
+- [English :gb:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/en/Install%20on%20GNULinux)
 
 ### Windows
 
 See documentation:
-- [French :fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20Windows)
-- [English :gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows)
+- [French :fr:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/fr/Install%20on%20Windows)
+- [English :gb:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/en/Install%20on%20Windows)

doc/tools/PamhyrDoc.cls

@@ -157,12 +157,12 @@
 %%
 
 %% FIXME: Delete me for the first realease
-\usepackage{draftwatermark}
-\SetWatermarkLightness{0.8}
-\SetWatermarkAngle{25}
-\SetWatermarkScale{3}
-\SetWatermarkFontSize{1cm}
-\SetWatermarkText{Work in progress}
+%% \usepackage{draftwatermark}
+%% \SetWatermarkLightness{0.8}
+%% \SetWatermarkAngle{25}
+%% \SetWatermarkScale{3}
+%% \SetWatermarkFontSize{1cm}
+%% \SetWatermarkText{Work in progress}
 
 %% Icons
 

manifest.scm

@@ -20,4 +20,4 @@
        "python-pyqtgraph" "python-qscintilla"
        "python-numpy@1" "python-shapely" "python-pyshp"
        "python-matplotlib" "python-colorama"
-       "python-rasterio"))
+       "python-rasterio" "python-psutil"))

requirements.txt

@@ -14,3 +14,4 @@ platformdirs>=4.2.0
 pyshp>=2.3.1
 rasterio==1.3.11
 #fortranformat==2.0.3
+psutil>=7.2.2

src/Checker/Adists.py

@@ -1,5 +1,5 @@
 # Adists.py -- Pamhyr study checkers
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Checker/Checker.py

@@ -1,5 +1,5 @@
 # Checker.py -- Pamhyr abstract checker class
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Checker/Mage.py

@@ -1,5 +1,5 @@
 # Mage.py -- Pamhyr MAGE checkers
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Checker/Study.py

@@ -1,5 +1,5 @@
 # Study.py -- Pamhyr study checkers
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Meshing/AMeshingTool.py

@@ -1,5 +1,5 @@
 # AMeshingTool.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Meshing/Internal.py

@@ -1,5 +1,5 @@
 # Internal.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -66,7 +66,6 @@ class InternalMeshing(AMeshingTool):
         return new_profiles
 
     def st_to_m(self, profiles, guide_list):
-
         guide_list = ["un"] + guide_list + ["np"]
         max_values = [0] * (len(guide_list) - 1)
         max_values_index = [0] * (len(guide_list) - 1)
@@ -85,11 +84,13 @@ class InternalMeshing(AMeshingTool):
                                 profiles[isect+1],
                                 guide_list[i],
                                 guide_list[i+1])
+
             for isect in reversed(range(0, max_values_index[i])):
                 self.compl_sect(profiles[isect+1],
                                 profiles[isect],
                                 guide_list[i],
                                 guide_list[i+1])
+
         return profiles
 
     def interpolate_transversal_step(self,
@@ -129,6 +130,7 @@ class InternalMeshing(AMeshingTool):
                     p.name = f'interpol{p.rk}'
                 new_profiles2.append(p)
             new_profiles.append(new_profiles2)
+
         return new_profiles
 
     def compl_sect(self, sect1, sect2, tag1, tag2):
@@ -164,7 +166,6 @@ class InternalMeshing(AMeshingTool):
         for i in range(len1):
             ltot1 += sect1.point(start1+i).dist(sect1.point(start1+i+1))
             alpha.append(ltot1)
-        alpha = list(map(lambda x: x/ltot1, alpha))  # target ratios
         for i in range(len2):
             ltot2 += sect2.point(start2+i).dist(sect2.point(start2+i+1))
             beta.append(ltot2)
@@ -179,6 +180,7 @@ class InternalMeshing(AMeshingTool):
             sect2.add_npoints(len1-len2)
             len2 = len1
         else:  # regular case
+            alpha = list(map(lambda x: x/ltot1, alpha))  # target ratios
             beta = list(map(lambda x: x/ltot2, beta))  # current ratios
             for i in range(len1 - len2):
                 beta.append(1.0)
@@ -214,7 +216,7 @@ class InternalMeshing(AMeshingTool):
                             ratio = (alpha[j0] - beta[j0-1]) \
                                     / (beta[j0] - beta[j0-1])
                             if ratio < 0.0:
-                                print(f"ratio négatif {ratio}")
+                                logger.warning(f"ratio négatif {ratio}")
                                 # on double le point a gauche
                                 p = sect2.point(start2+j0-1).copy()
                                 sect2.insert_point(start2+j0-1, p)
@@ -243,8 +245,9 @@ class InternalMeshing(AMeshingTool):
                 sect2.point(start2+len2).name = ''
         if tag1 != "un":
             sect2.point(start2).name = tag1
-        if tag1 != "np":
+        if tag2 != "np":
             sect2.point(start2+len2).name = tag2
+
         sect2.modified()
 
     def update_rk(self, reach, begin_rk, end_rk,

src/Meshing/Mage.py

@@ -1,5 +1,5 @@
 # Mage.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Meshing/__init__.py

@@ -1,5 +1,5 @@
 # __init__.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Meshing/test_Meshing.py

@@ -1,5 +1,5 @@
 # test_Model.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/BoundaryCondition/BoundaryCondition.py

@@ -1,5 +1,5 @@
 # BoundaryCondition.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -232,6 +232,8 @@ class BoundaryCondition(SQLSubModel):
             type TEXT NOT NULL,
             tab TEXT NOT NULL,
             node INTEGER,
+            d50 REAL DEFAULT 0.002,
+            sigma REAL DEFAULT 1,
             {Scenario.create_db_add_scenario()},
             {Scenario.create_db_add_scenario_fk()},
             FOREIGN KEY(node) REFERENCES river_node(pamhyr_id),
@@ -258,6 +260,17 @@ class BoundaryCondition(SQLSubModel):
                     "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
                 )
 
+        if major == "0" and int(minor) <= 2:
+            if int(release) < 4:
+                execute(
+                    "ALTER TABLE boundary_condition " +
+                    "ADD COLUMN d50 REAL DEFAULT 0.002"
+                )
+                execute(
+                    "ALTER TABLE boundary_condition " +
+                    "ADD COLUMN sigma REAL DEFAULT 1"
+                )
+
         return cls._update_submodel(execute, version, data)
 
     @classmethod
@@ -316,7 +329,8 @@ class BoundaryCondition(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, name, type, node, scenario " +
+            "SELECT pamhyr_id, deleted, name, type, node, d50, sigma, " +
+            "scenario " +
             "FROM boundary_condition " +
             f"WHERE tab = '{tab}' " +
             f"AND scenario = {scenario.id} " +
@@ -331,6 +345,8 @@ class BoundaryCondition(SQLSubModel):
             name = next(it)
             t = next(it)
             node = next(it)
+            d50 = next(it)
+            sigma = next(it)
             owner_scenario = next(it)
 
             ctor = cls._get_ctor_from_type(t)
@@ -340,9 +356,14 @@ class BoundaryCondition(SQLSubModel):
                 status=data['status'],
                 owner_scenario=owner_scenario
             )
+
             if deleted:
                 bc.set_as_deleted()
 
+            if t == "SL":
+                bc.d50 = d50
+                bc.sigma = sigma
+
             bc.node = None
             if node != -1:
                 bc.node = next(filter(lambda n: n.id == node, nodes), None)
@@ -375,15 +396,22 @@ class BoundaryCondition(SQLSubModel):
         if self._node is not None:
             node = self._node.id
 
+        d50 = 0.002
+        sigma = 1
+        if self._type == "SL":
+            d50 = self._d50
+            sigma = self._sigma
+
         execute(
             "INSERT INTO " +
             "boundary_condition(" +
-            "pamhyr_id, deleted, name, type, tab, node, scenario" +
+            "pamhyr_id, deleted, name, type, tab, node, d50, sigma, scenario" +
             ") " +
             "VALUES (" +
             f"{self._pamhyr_id}, {self._db_format(self.is_deleted())}, " +
             f"'{self._db_format(self._name)}', " +
             f"'{self._db_format(self._type)}', '{tab}', {node}, " +
+            f"{d50}, {sigma}, " +
             f"{self._status.scenario_id}" +
             ")"
         )
@@ -468,6 +496,24 @@ class BoundaryCondition(SQLSubModel):
     def has_node(self):
         return self._node is not None
 
+    @property
+    def d50(self):
+        return self._d50
+
+    @d50.setter
+    def d50(self, value):
+        self._d50 = float(value)
+        self.modified()
+
+    @property
+    def sigma(self):
+        return self._sigma
+
+    @sigma.setter
+    def sigma(self, value):
+        self._sigma = float(value)
+        self.modified()
+
     @property
     def header(self):
         return self._header.copy()

src/Model/BoundaryCondition/BoundaryConditionList.py

@@ -1,5 +1,5 @@
 # BoundaryConditionList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/BoundaryCondition/BoundaryConditionTypes.py

@@ -1,5 +1,5 @@
 # BoundaryConditionTypes.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -1,5 +1,5 @@
 # BoundaryConditionsAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -70,9 +70,8 @@ class Data(SQLSubModel):
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
         created = False
-
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
+        if major == "0" and minor == "0":
+            if int(release) < 11:
                 cls._db_create(execute)
                 created = True
 
@@ -143,8 +142,9 @@ class Data(SQLSubModel):
         table = execute(
             "SELECT pamhyr_id, deleted, data0, data1, scenario FROM " +
             "boundary_condition_data_adists " +
-            f"WHERE bca = {bca.id} " +
-            f"AND scenario = {scenario.id}"
+            f"WHERE scenario = {scenario.id} " +
+            # f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
+            f"AND bca = {bca.id}"
         )
 
         if table is not None:
@@ -187,8 +187,9 @@ class Data(SQLSubModel):
         execute(
             "INSERT INTO " +
             "boundary_condition_data_adists(" +
-            "pamhyr_id, data0, data1, bca, scenario) " +
-            f"VALUES ({self.id}, '{data0}', {data1}, {bca.id}, " +
+            "pamhyr_id, deleted, data0, data1, bca, scenario) " +
+            f"VALUES ({self.id}, {self._db_format(self.is_deleted())}, " +
+            f"'{data0}', {data1}, {bca.id}, " +
             f"{self._status.scenario_id})"
         )
 
@@ -247,15 +248,13 @@ class BoundaryConditionAdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
+        if major == "0" and int(minor) < 2:
+            if cls.is_table_exists(execute, "boundary_condition_adists"):
+                cls._db_update_to_0_2_0(execute, data)
+            else:
                 cls._db_create(execute)
                 created = True
 
-        if major == "0" and int(minor) < 2:
-            if not created:
-                cls._db_update_to_0_2_0(execute, data)
-
         if not created:
             return cls._update_submodel(execute, version, data)
 
@@ -300,6 +299,14 @@ class BoundaryConditionAdisTS(SQLSubModel):
             if pol_id == -1:
                 continue
 
+            if pol_id not in pid_pol:
+                # ⚠️ cas important : probablement déjà migré
+                logger.warning(
+                    f"pol_id {pol_id} not in pid_pol " +
+                    "→ probably already migrated"
+                )
+                continue
+
             execute(
                 f"UPDATE boundary_condition_adists " +
                 f"SET pollutant = {pid_pol[pol_id]} " +
@@ -312,17 +319,21 @@ class BoundaryConditionAdisTS(SQLSubModel):
         status = data['status']
         nodes = data['nodes']
         scenario = data["scenario"]
+        pollutant = data.get("pollutant")
         loaded = data['loaded_pid']
 
         if scenario is None:
             return new
 
-        table = execute(
-            "SELECT pamhyr_id, deleted, pollutant, type, node, scenario " +
+        sql = (
+            "SELECT pamhyr_id, deleted, pollutant, type, node, scenario "
             "FROM boundary_condition_adists " +
-            f"WHERE scenario = {scenario.id} " +
-            f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
+            f"WHERE scenario = {scenario.id} "
         )
+        if pollutant is not None:
+            sql += f"AND pollutant = {pollutant.id} "
+
+        table = execute(sql)
 
         if table is not None:
             for row in table:
@@ -347,7 +358,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
                 bc.type = bc_type
 
                 bc.node = None
-                if row[3] != -1:
+                if node != -1:
                     tmp = next(
                         filter(
                             lambda n: n.id == node, nodes
@@ -426,7 +437,14 @@ class BoundaryConditionAdisTS(SQLSubModel):
             d._data_traversal(predicate, modifier, data)
 
     def __len__(self):
-        return len(self._data)
+        return len(
+            list(
+                filter(
+                    lambda el: el is not None and not el.is_deleted(),
+                    self._data
+                )
+            )
+        )
 
     @classmethod
     def time_convert(cls, data):
@@ -451,7 +469,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @node.setter
     def node(self, node):
         self._node = node
-        self._status.modified()
+        self.modified()
 
     @property
     def header(self):
@@ -460,7 +478,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @header.setter
     def header(self, header):
         self._header = header
-        self._status.modified()
+        self.modified()
 
     @property
     def pollutant(self):
@@ -469,7 +487,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @pollutant.setter
     def pollutant(self, pollutant):
         self._pollutant = pollutant
-        self._status.modified()
+        self.modified()
 
     @property
     def type(self):
@@ -478,11 +496,16 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @type.setter
     def type(self, type):
         self._type = type
-        self._status.modified()
+        self.modified()
 
     @property
     def data(self):
-        return self._data.copy()
+        return list(
+            filter(
+                lambda el: el is not None and not el.is_deleted(),
+                self._data
+            )
+        )
 
     @property
     def _default_0(self):
@@ -511,33 +534,36 @@ class BoundaryConditionAdisTS(SQLSubModel):
         return (new_0, new_1)
 
     def add(self, index: int):
-        value = (self._default_0, self._default_1)
+        value = Data(
+            self._default_0, self._default_1,
+            status=self._status
+        )
         self._data.insert(index, value)
-        self._status.modified()
+        self.modified()
         return value
 
     def insert(self, index: int, value):
         self._data.insert(index, value)
-        self._status.modified()
+        self.modified()
 
     def delete_i(self, indexes):
-        self._data = list(
+        list(
             map(
-                lambda e: e[1],
+                lambda e: e[1].set_as_deleted(),
                 filter(
-                    lambda e: e[0] not in indexes,
+                    lambda e: e[0] in indexes,
                     enumerate(self.data)
                 )
             )
         )
-        self._status.modified()
+        self.modified()
 
     def sort(self, _reverse=False, key=None):
         if key is None:
             self._data.sort(reverse=_reverse)
         else:
             self._data.sort(reverse=_reverse, key=key)
-        self._status.modified()
+        self.modified()
 
     def index(self, bc):
         self._data.index(bc)
@@ -552,10 +578,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
         return lst
 
     def _set_i_c_v(self, index, column, value):
-        v = list(self._data[index])
+        v = self._data[index]
         v[column] = self._types[column](value)
-        self._data[index] = tuple(v)
-        self._status.modified()
+        self._data[index] = v
+        self.modified()
 
     def set_i_0(self, index: int, value):
         self._set_i_c_v(index, 0, value)

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

@@ -1,5 +1,5 @@
 # BoundaryConditionsAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,9 +38,13 @@ class BoundaryConditionsAdisTSList(PamhyrModelList):
         if data is None:
             data = {}
 
-        new._lst = BoundaryConditionAdisTS._db_load(
-            execute, data
-        )
+        previous_pollutant = data.get("pollutant")
+        data.pop("pollutant", None)
+
+        new._lst = BoundaryConditionAdisTS._db_load(execute, data)
+
+        if previous_pollutant is not None:
+            data["pollutant"] = previous_pollutant
 
         return new
 

src/Model/D90AdisTS/D90AdisTS.py

@@ -1,5 +1,5 @@
 # D90AdisTS.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -73,15 +73,13 @@ class D90AdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 6:
+        if major == "0" and int(minor) < 2:
+            if cls.is_table_exists(execute, "d90_adists"):
+                cls._db_update_to_0_2_0(execute, data)
+            else:
                 cls._db_create(execute)
                 created = True
 
-        if major == "0" and int(minor) < 2:
-            if not created:
-                cls._db_update_to_0_2_0(execute, data)
-
         if not created:
             return cls._update_submodel(execute, version, data)
 

src/Model/D90AdisTS/D90AdisTSList.py

@@ -1,5 +1,5 @@
 # D90AdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -1,5 +1,5 @@
 # D90AdisTSSpec.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -70,16 +70,12 @@ class D90AdisTSSpec(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
-        created = False
-
-        if major == 0 and minor < 1:
-            if int(release) < 6:
-                cls._db_create(execute)
-                created = True
 
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(execute, "d90_spec"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return True
 
@@ -87,6 +83,7 @@ class D90AdisTSSpec(SQLSubModel):
     def _db_update_to_0_2_0(cls, execute, data):
         table = "d90_spec"
         table_new = "d90_adists_spec"
+        reachs = data['id2pid']['river_reach']
 
         cls.update_db_add_pamhyr_id(execute, table, data)
         Scenario.update_db_add_scenario(execute, table)
@@ -95,8 +92,10 @@ class D90AdisTSSpec(SQLSubModel):
 
         execute(
             f"INSERT INTO {table_new}_tmp " +
-            "(pamhyr_id, name, d90, enabled, scenario) " +
-            "SELECT pamhyr_id, name, d90, enabled, scenario " +
+            "(pamhyr_id, d90_default, name, reach, " +
+            " start_rk, end_rk, d90, enabled, scenario) " +
+            "SELECT pamhyr_id, d90_default, name, reach, " +
+            " start_rk, end_rk, d90, enabled, scenario " +
             f"FROM {table}"
         )
 
@@ -104,12 +103,13 @@ class D90AdisTSSpec(SQLSubModel):
         execute(f"ALTER TABLE {table_new}_tmp RENAME TO {table_new}")
 
         cls._db_update_to_0_2_0_set_d90_pid(execute, data)
+        cls._db_update_to_0_2_0_set_reach_pid(execute, table_new, reachs)
 
     @classmethod
     def _db_update_to_0_2_0_set_d90_pid(cls, execute, data):
         pid_d90 = data["id2pid"]["d90_adists"]
         els = execute(
-            f"SELECT pamhyr_id, d90 FROM d90_adists_spec"
+            f"SELECT pamhyr_id, d90_default FROM d90_adists_spec"
         )
 
         for row in els:
@@ -121,8 +121,8 @@ class D90AdisTSSpec(SQLSubModel):
                 continue
 
             execute(
-                f"UPDATE d90_adists_spec" +
-                f"SET d90 = {pid_d90[d90_id]} " +
+                f"UPDATE d90_adists_spec " +
+                f"SET d90_default = {pid_d90[d90_id]} " +
                 f"WHERE pamhyr_id = {pid}"
             )
 
@@ -167,7 +167,7 @@ class D90AdisTSSpec(SQLSubModel):
                     owner_scenario=owner_scenario
                 )
                 if deleted:
-                    new_spec.is_deleted()
+                    new_spec.set_as_deleted()
 
                 new_spec.reach = reach
                 new_spec.start_rk = start_rk
@@ -196,12 +196,12 @@ class D90AdisTSSpec(SQLSubModel):
             "d90_default, name, reach, " +
             "start_rk, end_rk, d90, enabled, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {self._db_format(self.is_deleted())}, " +
             f"{d90_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
             f"{self._start_rk}, {self._end_rk}, " +
-            f"{self._d90}, {self._enabled}" +
+            f"{self._d90}, {self._enabled}, " +
             f"{self._status.scenario_id}" +
             ")"
         )

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -1,5 +1,5 @@
 # DIFAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,15 +79,13 @@ class DIFAdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 6:
+        if major == "0" and int(minor) < 2:
+            if cls.is_table_exists(execute, "dif_adists"):
+                cls._db_update_to_0_2_0(execute, data)
+            else:
                 cls._db_create(execute)
                 created = True
 
-        if major == "0" and int(minor) < 2:
-            if not created:
-                cls._db_update_to_0_2_0(execute, data)
-
         if not created:
             return cls._update_submodel(execute, version, data)
 
@@ -142,24 +140,24 @@ class DIFAdisTS(SQLSubModel):
                 enabled = (next(it) == 1)
                 owner_scenario = next(it)
 
-                dif = cls(
+                DIF = cls(
                     id=pid,
                     name=name,
                     status=status,
                     owner_scenario=owner_scenario,
                 )
 
-                dif.method = method
-                dif.dif = dif
-                dif.b = b
-                dif.c = c
-                dif.enabled = enabled
+                DIF.method = method
+                DIF.dif = dif
+                DIF.b = b
+                DIF.c = c
+                DIF.enabled = enabled
 
                 data['dif_default_id'] = pid
-                dif._data = DIFAdisTSSpec._db_load(execute, data)
+                DIF._data = DIFAdisTSSpec._db_load(execute, data)
 
                 loaded.add(pid)
-                new.append(dif)
+                new.append(DIF)
 
         data["scenario"] = scenario.parent
         new += cls._db_load(execute, data)
@@ -190,7 +188,7 @@ class DIFAdisTS(SQLSubModel):
             b = self.b
 
         c = -1.
-        if self.dif is not None:
+        if self.c is not None:
             c = self.c
 
         sql = (
@@ -201,7 +199,7 @@ class DIFAdisTS(SQLSubModel):
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +
             f"'{self._db_format(self._method)}', " +
-            f"{dif.id}, {b}, {c}, {self._enabled}, " +
+            f"{dif}, {b}, {c}, {self._enabled}, " +
             f"{self._status.scenario_id}" +
             ")"
         )

src/Model/DIFAdisTS/DIFAdisTSList.py

@@ -1,5 +1,5 @@
 # DIFAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -1,5 +1,5 @@
 # DIFAdisTSSpec.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,16 +33,14 @@ class DIFAdisTSSpec(SQLSubModel):
     _id_cnt = 0
 
     def __init__(self, id: int = -1, method: str = "",
-                 status=None):
-        super(DIFAdisTSSpec, self).__init__()
+                 status=None, owner_scenario=-1):
+        super(DIFAdisTSSpec, self).__init__(
+            id=id, status=status,
+            owner_scenario=owner_scenario
+        )
 
         self._status = status
 
-        if id == -1:
-            self.id = DIFAdisTSSpec._id_cnt
-        else:
-            self.id = id
-
         self._method = method
         self._reach = None
         self._start_rk = None
@@ -52,8 +50,6 @@ class DIFAdisTSSpec(SQLSubModel):
         self._c = None
         self._enabled = True
 
-        DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id)
-
     @classmethod
     def _db_create(cls, execute, ext=""):
         execute(f"""
@@ -81,16 +77,12 @@ class DIFAdisTSSpec(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
-        created = False
-
-        if major == 0 and minor < 1:
-            if int(release) < 6:
-                cls._db_create(execute)
-                created = True
 
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(execute, "dif_spec"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return True
 
@@ -195,7 +187,7 @@ class DIFAdisTSSpec(SQLSubModel):
                 new_spec.c = c
                 new_spec.enabled = enabled
 
-                loaded.add(pid)
+                loaded.add(id)
                 new.append(new_spec)
 
         data["scenario"] = scenario.parent
@@ -210,22 +202,23 @@ class DIFAdisTSSpec(SQLSubModel):
 
         dif_default = data['dif_default_id']
 
-        execute(
+        sql = (
             "INSERT INTO " +
             "dif_adists_spec(pamhyr_id, deleted, " +
             "dif_default, method, reach, " +
             "start_rk, end_rk, dif, b, c, enabled, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {self._db_format(self.is_deleted())}, " +
             f"{dif_default}, " +
             f"'{self._db_format(self._method)}', " +
             f"{self._reach}, " +
             f"{self._start_rk}, {self._end_rk}, " +
             f"{self._dif}, {self._b}, {self._c}, " +
-            f"{self._enabled}" +
+            f"{self._enabled}, " +
             f"{self._status.scenario_id}" +
             ")"
         )
+        execute(sql)
 
         return True
 

src/Model/Ensembles/Distribution.py

@@ -0,0 +1,232 @@
+# Distribution.py -- Pamhyr
+# Copyright (C) 2026  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+
+import struct
+import logging
+import itertools
+import numpy as np
+
+from tools import logger_exception
+
+from Model.Except import NotImplementedMethodeError
+from Model.Tools.PamhyrDB import SQLSubModel
+from Model.Scenario import Scenario
+
+logger = logging.getLogger()
+
+
+class Distribution(SQLSubModel):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1,
+                 name: str = "", script: str = "",
+                 status=None):
+        super(Distribution, self).__init__(
+            id=id, status=status,
+            owner_scenario=0
+        )
+
+        self._name = name
+        self._type = "generic"
+        self._script = script
+        self._labels = []
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def labels(self):
+        return self._labels
+
+    @classmethod
+    def _db_create(cls, execute, ext=""):
+        execute(f"""
+          CREATE TABLE ensemble_distribution{ext} (
+            {cls.create_db_add_pamhyr_id()},
+            deleted BOOLEAN NOT NULL DEFAULT FALSE,
+            name TEXT NOT NULL,
+            script TEXT NOT NULL,
+            PRIMARY KEY(pamhyr_id)
+          )
+        """)
+
+        if ext == "_tmp":
+            return True
+
+        return cls._create_submodel(execute)
+
+    @classmethod
+    def _db_update(cls, execute, version, data=None):
+        major, minor, release = version.strip().split(".")
+        if major == "0" and int(minor) < 2:
+            cls._db_create(execute)
+        elif major == "0" and int(minor) == 2:
+            if int(release) < 8:
+                cls._db_create(execute)
+
+        return cls._update_submodel(execute, version, data)
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        new = []
+        scenario = data["scenario"]
+        loaded = data['loaded_pid']
+
+        table = execute(
+            "SELECT pamhyr_id, deleted, name, script " +
+            "FROM ensemble_distribution " +
+            f"WHERE pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
+        )
+
+        for row in table:
+            it = iter(row)
+
+            id = next(it)
+            deleted = (next(it) == 1)
+            name = next(it)
+            script = next(it)
+
+            new_distribution = cls(
+                id, name=name, script=script,
+                status=data["status"]
+            )
+            if deleted:
+                new_distribution.set_as_deleted()
+
+            loaded.add(id)
+            new.append(new_distribution)
+
+        return new
+
+    def _db_save(self, execute, data=None):
+        # Only save custom distribution
+        if self._type != "custom":
+            return True
+
+        if not self.must_be_saved():
+            return True
+
+        execute(
+            "INSERT INTO " +
+            "ensemble_distribution(pamhyr_id, deleted, " +
+            "  name, script) " +
+            "VALUES (?, ?, ?, ?)",
+            self.pamhyr_id, self.is_deleted(),
+            self._name, self._script
+        )
+
+        return True
+
+    def _data_traversal(self,
+                        predicate=lambda obj, data: True,
+                        modifier=lambda obj, data: None,
+                        data={}):
+        if predicate(self, data):
+            modifier(self, data)
+
+    def random(self, r):
+        raise NotImplementedMethodeError(cls, cls._load)
+
+
+###########################
+# DISTRIBUTION IMPLEMENTATION #
+###########################
+
+class Uniform(Distribution):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1,
+                 name: str = "uniform", script: str = "",
+                 status=None):
+        super(Uniform, self).__init__(
+            id=id, status=status,
+            name=name, script=script
+        )
+
+        self._labels = ["low", "high"]
+
+    def random(self, params, nb):
+        lst = params.copy()
+        lst.append(nb)
+
+        return np.random.uniform(*lst)
+
+
+class Normal(Distribution):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1,
+                 name: str = "normal", script: str = "",
+                 status=None):
+        super(Normal, self).__init__(
+            id=id, status=status,
+            name=name, script=script
+        )
+
+        self._labels = ["loc", "scale"]
+
+    def random(self, params, nb):
+        lst = params.copy()
+        lst.append(nb)
+
+        return np.random.normal(*lst)
+
+
+class Poisson(Distribution):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1,
+                 name: str = "poisson", script: str = "",
+                 status=None):
+        super(Poisson, self).__init__(
+            id=id, status=status,
+            name=name, script=script
+        )
+
+        self._labels = ["lam"]
+
+    def random(self, params, nb):
+        lst = params.copy()
+        lst.append(nb)
+
+        return np.random.poisson(*lst)
+
+
+class Custom(Distribution):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1,
+                 name: str = "", script: str = "",
+                 status=None):
+        super(Custom, self).__init__(
+            id=id, status=status,
+            name=name, script=script
+        )
+
+        self._labels = ["custom"]
+        self._type = "custom"
+
+    def random(self, params, nb):
+        try:
+            # Run script to (re)define the sample distribution
+            f = eval(self._script)
+            return f(params, nb)
+        except Exception as e:
+            logger_exception(e)
+            return None         # TODO: Raise helpful exception

src/Model/Ensembles/DistributionList.py

@@ -0,0 +1,60 @@
+# DistributionList.py -- Pamhyr
+# Copyright (C) 2026  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+
+from tools import trace, timer
+
+from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Ensembles.Distribution import *
+
+
+class DistributionList(PamhyrModelList):
+    _sub_classes = [Distribution]
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        new = cls(status=data['status'])
+
+        # Default distributions
+        new._lst = [
+            Uniform(status=data['status']),
+            Normal(status=data['status']),
+            Poisson(status=data['status']),
+        ]
+
+        # DB custom distributions
+        new._lst += Distribution._db_load(
+            execute, data
+        )
+
+        return new
+
+    def _db_save(self, execute, data={}):
+        execute(
+            "DELETE FROM ensemble_distribution"
+        )
+
+        for fun in self._lst:
+            fun._db_save(execute, data)
+
+        return True
+
+    def new(self, index):
+        r = Custom(status=self._status)
+        self._lst.insert(index, r)
+        self._status.modified()
+        return r

src/Model/Ensembles/Ensemble.py

@@ -0,0 +1,254 @@
+# Ensemble.py -- Pamhyr
+# Copyright (C) 2026  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+
+import struct
+import logging
+import itertools
+
+import numpy as np
+
+from Model.Tools.PamhyrDB import SQLSubModel
+from Model.Scenario import Scenario
+from Model.Ensembles.Distribution import Uniform
+
+logger = logging.getLogger()
+
+
+class Ensemble(SQLSubModel):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1, name: str = "",
+                 distribution=None, params=[0., 100.],
+                 data_type=None, target_data=None,
+                 status=None, owner_scenario=-1):
+        super(Ensemble, self).__init__(
+            id=id, status=status,
+            owner_scenario=owner_scenario
+        )
+
+        self._name = name
+        self._data_type = data_type
+        self._distribution = distribution
+        self._params = params
+        self._target_data = target_data
+
+    @classmethod
+    def _db_create(cls, execute, ext=""):
+        execute(f"""
+          CREATE TABLE ensemble{ext} (
+            {cls.create_db_add_pamhyr_id()},
+            deleted BOOLEAN NOT NULL DEFAULT FALSE,
+            name TEXT NOT NULL,
+            type VARCHAR(8) NOT NULL,
+            distribution INTEGER NOT NULL,
+            distribution_name VARCHAR(32) NOT NULL,
+            params BLOB NOT NULL,
+            params_len INTEGER NOT NULL,
+            data_pid INTEGER NOT NULL,
+            {Scenario.create_db_add_scenario()},
+            {Scenario.create_db_add_scenario_fk()},
+            PRIMARY KEY(pamhyr_id, scenario)
+          )
+        """)
+
+        if ext == "_tmp":
+            return True
+
+        return cls._create_submodel(execute)
+
+    @classmethod
+    def _db_update(cls, execute, version, data=None):
+        major, minor, release = version.strip().split(".")
+        if major == "0" and int(minor) < 2:
+            cls._db_create(execute)
+        elif major == "0" and int(minor) == 2:
+            if int(release) < 8:
+                cls._db_create(execute)
+
+        return cls._update_submodel(execute, version, data)
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        new = []
+        scenario = data["scenario"]
+        distributions = data["ens_distributions"]
+        stricklers = data["stricklers"]
+        loaded = data['loaded_pid']
+
+        table = execute(
+            "SELECT pamhyr_id, deleted, name, type, " +
+            "distribution, distribution_name, params, params_len, data_pid, " +
+            "scenario " +
+            "FROM ensemble " +
+            f"WHERE scenario = {scenario.id} " +
+            f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
+        )
+
+        for row in table:
+            it = iter(row)
+
+            id = next(it)
+            deleted = (next(it) == 1)
+            name = next(it)
+            data_type = next(it)
+            fid = next(it)
+            fname = next(it)
+            params = next(it)
+            params_len = next(it)
+            data_pid = next(it)
+            owner_scenario = next(it)
+
+            def fn(f): return f._name == fname
+            if fid != -1:
+                def fn(f): return f._pamhyr_id == fid
+
+            distribution = next(
+                filter(fn, distributions.lst),
+                None
+            )
+
+            target_data = next(
+                filter(
+                    lambda s: s._pamhyr_id == data_pid,
+                    stricklers.lst
+                ),
+                None
+            )
+
+            rdata = list(cls._decode_params(params, params_len))
+
+            new_ensemble = cls(
+                id, name=name,
+                distribution=distribution,
+                params=rdata,
+                data_type=data_type,
+                target_data=target_data,
+                status=data["status"],
+                owner_scenario=owner_scenario
+            )
+            if deleted:
+                new_ensemble.set_as_deleted()
+
+            loaded.add(id)
+            new.append(new_ensemble)
+
+        return new
+
+    def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
+        execute(
+            "DELETE FROM ensemble " +
+            f"WHERE pamhyr_id = {self.pamhyr_id} " +
+            f"AND scenario = {self._status.scenario_id}"
+        )
+
+        bparams, length = self._encode_params()
+
+        if self._distribution is None:
+            fid = -1
+            fname = "NULL"
+        else:
+            fid = self._distribution._pamhyr_id
+            fname = self._distribution._name
+
+            if self._distribution._type == "generic":
+                fid = -1
+
+        data_pid = -1
+        if self._target_data is not None:
+            data_pid = self._target_data._pamhyr_id
+
+        execute(
+            "INSERT INTO " +
+            "ensemble(pamhyr_id, deleted, name, type, " +
+            "  distribution, distribution_name, params, params_len, " +
+            "  data_pid, scenario) " +
+            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            self.pamhyr_id, self.is_deleted(),
+            self._name, self._data_type,
+            fid, fname, bparams, length,
+            data_pid, self._status.scenario_id
+        )
+
+        return True
+
+    def _encode_params(self):
+        length = len(self._params)
+        data_format = ">" + ''.join(itertools.repeat("d", length))
+
+        return struct.pack(data_format, *self._params), length
+
+    @classmethod
+    def _decode_params(cls, bparams, length):
+        data_format = ">" + ''.join(itertools.repeat("d", length))
+
+        return struct.unpack(data_format, bparams)
+
+    def random(self, nb):
+        return np.nditer(
+            self._distribution.random(
+                self._params, nb
+            )
+        )
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        self._name = name
+        self._status.modified()
+
+    @property
+    def distribution(self):
+        return self._distribution
+
+    @distribution.setter
+    def distribution(self, distribution):
+        self._distribution = distribution
+        self._status.modified()
+
+    @property
+    def params(self):
+        return self._params
+
+    @params.setter
+    def params(self, params):
+        self._params = params
+        self._status.modified()
+
+    @property
+    def data_type(self):
+        return self._data_type
+
+    @data_type.setter
+    def data_type(self, data_type):
+        self._data_type = data_type
+        self._status.modified()
+
+    @property
+    def target_data(self):
+        return self._target_data
+
+    @target_data.setter
+    def target_data(self, target_data):
+        self._target_data = target_data
+        self._status.modified()

src/Model/Ensembles/EnsembleList.py

@@ -0,0 +1,53 @@
+# EnsembleList.py -- Pamhyr
+# Copyright (C) 2026  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+
+from tools import trace, timer
+
+from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Ensembles.Ensemble import Ensemble
+
+
+class EnsembleList(PamhyrModelList):
+    _sub_classes = [Ensemble]
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        new = cls(status=data['status'])
+
+        new._lst = Ensemble._db_load(
+            execute, data
+        )
+
+        return new
+
+    def _db_save(self, execute, data=None):
+        execute(
+            "DELETE FROM ensemble " +
+            f"WHERE scenario = {self._status.scenario_id}"
+        )
+
+        for ens in self._lst:
+            ens._db_save(execute, data=data)
+
+        return True
+
+    def new(self, index):
+        r = Ensemble(status=self._status)
+        self._lst.insert(index, r)
+        self._status.modified()
+        return r

src/Model/Except.py

@@ -1,5 +1,5 @@
 # Except.py -- Pamhyr model exceptions
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Friction/Friction.py

@@ -1,5 +1,5 @@
 # Friction.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -228,9 +228,10 @@ class Friction(SQLSubModel):
         ssi = self._status.scenario_id
 
         return (
-            self._begin_strickler._owner_scenario == ssi
-            # or self._end_strickler._owner_scenario == ssi
-            or super(Friction, self).must_be_saved()
+            self._begin_strickler is not None
+            and (self._begin_strickler._owner_scenario == ssi
+                 # or self._end_strickler._owner_scenario == ssi
+                 or super(Friction, self).must_be_saved())
         )
 
     def _db_save(self, execute, data=None):
@@ -364,3 +365,9 @@ class Friction(SQLSubModel):
         #                  self.end_strickler.medium])
 
         return minor, medium
+
+    def update_rks(self, begin_rk, end_rk):
+        self._begin_rk = begin_rk
+        self._end_rk = end_rk
+
+        self.modified()

src/Model/Friction/FrictionList.py

@@ -1,5 +1,5 @@
 # FrictionList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Geometry/Point.py

@@ -1,5 +1,5 @@
 # Point.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Geometry/PointXY.py

@@ -1,5 +1,5 @@
 # PointXY.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Geometry/PointXYZ.py

@@ -1,5 +1,5 @@
 # PointXYZ.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -66,6 +66,11 @@ class PointXYZ(Point):
           )
         """)
 
+        execute(
+            "CREATE INDEX idx_point " +
+            "ON geometry_pointXYZ(profile, scenario);"
+        )
+
         return cls._create_submodel(execute)
 
     @classmethod
@@ -90,6 +95,12 @@ class PointXYZ(Point):
                     "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
                 )
 
+        # Try to create index at each update
+        execute(
+            "CREATE INDEX IF NOT EXISTS idx_point " +
+            "ON geometry_pointXYZ(profile, scenario);"
+        )
+
         return cls._update_submodel(execute, version, data)
 
     @classmethod
@@ -338,6 +349,13 @@ class PointXYZ(Point):
         self._z = float(value)
         self.modified()
 
+    def shift(self, x, y, z):
+        self.x += x
+        self.y += y
+        self.z += z
+
+        self.modified()
+
     def get_coordinate(self):
         return (self._x, self._y, self._z)
 

src/Model/Geometry/Profile.py

@@ -1,5 +1,5 @@
 # Profile.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Geometry/ProfileXYZ.py

@@ -1,5 +1,5 @@
 # ProfileXYZ.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ from typing import List
 from functools import reduce
 from dataclasses import dataclass
 
-from tools import timer, flatten
+from tools import trace, timer, flatten
 from shapely import geometry
 
 from Model.Tools.PamhyrDB import SQLSubModel
@@ -91,6 +91,9 @@ class ProfileXYZ(Profile, SQLSubModel):
         self._station = []
         self.station_up_to_date = False
 
+        self._get_water_limits_cache = {}
+        self._get_water_limits_ac_cache = {}
+
     @classmethod
     def _db_create(cls, execute, ext=""):
         execute(f"""
@@ -396,7 +399,6 @@ class ProfileXYZ(Profile, SQLSubModel):
 
         for point in self._points:
             p = point.copy()
-            print(p)
             new_p._points.append(p)
 
         new_p.modified()
@@ -620,6 +622,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         """
         return [x for x in lst if not np.isnan(x)]
 
+    @timer
     def speed(self, q, z):
         area = self.wet_area(z)
 
@@ -671,6 +674,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             length += line.length
         return length
 
+    @timer
     def compute_wet_area(self, z):
         area = 0.0
         if len(self.tab.L) > 0:
@@ -711,6 +715,7 @@ class ProfileXYZ(Profile, SQLSubModel):
                 if len(line.coords) > 2:
                     poly = geometry.Polygon(line)
                     area += poly.area
+
         return area
 
     def wet_radius(self, z):
@@ -733,6 +738,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         line = geometry.LineString(list(zip(station, zz)))
         return line
 
+    @timer
     def wet_lines(self, z):
         points = self._points
         if len(points) < 3:
@@ -809,7 +815,6 @@ class ProfileXYZ(Profile, SQLSubModel):
         return points
 
     def get_nb_wet_areas(self, z):
-
         n_zones = 0
         points = self._points
         if points[0].z <= z:
@@ -821,10 +826,13 @@ class ProfileXYZ(Profile, SQLSubModel):
 
         return n_zones
 
+    @timer
     def get_all_water_limits_ac(self, z):
         """
         Determine all water limits for z elevation.
         """
+        if z in self._get_water_limits_ac_cache:
+            return self._get_water_limits_ac_cache[z]
 
         points = self._points
         if len(points) < 3:
@@ -857,69 +865,94 @@ class ProfileXYZ(Profile, SQLSubModel):
             logger.error(f"ERROR in get_all_water_limits_ac")
             return [], []
 
-        return start, list(reversed(end))
+        res = start, list(reversed(end))
+        self._get_water_limits_ac_cache[z] = res
 
+        return res
+
+    @timer
     def get_water_limits(self, z):
+        if z in self._get_water_limits_cache:
+            return self._get_water_limits_cache[z]
+
+        v = self.get_water_limits_compute(z)
+
+        return v
+
+    def get_water_limits_compute(self, z):
         """
         Determine left and right limits of water elevation.
         """
-
         # Get the index of first point with elevation lesser than water
         # elevation (for the right and left river side)
-        i_left = -1
-        i_right = -1
+        i_left = next(
+            filter(
+                lambda i: self.point(i).z <= z,
+                range(self.number_points)
+            ),
+            -1
+        )
 
-        for i in range(self.number_points):
-            if self.point(i).z <= z:
-                i_left = i
-                break
-
-        for i in reversed(range(self.number_points)):
-            if self.point(i).z <= z:
-                i_right = i
-                break
+        i_right = next(
+            filter(
+                lambda i: self.point(i).z <= z,
+                reversed(range(self.number_points))
+            ),
+            -1
+        )
 
         # Interpolate points at river left side
         if (i_left > 0):
-            if abs(self.point(i_left - 1).z - self.point(i_left).z) < 1e-20:
-                pt_left = self.point(i_left)
+            pi = self.point(i_left)
+            pim1 = self.point(i_left - 1)
+
+            if abs(pim1.z - pi.z) < 1e-20:
+                pt_left = pi
             else:
-                fact = (z - self.point(i_left).z) / \
-                    (self.point(i_left - 1).z - self.point(i_left).z)
-                x = self.point(i_left).x + fact * \
-                    (self.point(i_left - 1).x - self.point(i_left).x)
-                y = self.point(i_left).y + fact * \
-                    (self.point(i_left - 1).y - self.point(i_left).y)
+                fact = (z - pi.z) / (pim1.z - pi.z)
+                x = pi.x + fact * (pim1.x - pi.x)
+                y = pi.y + fact * (pim1.y - pi.y)
                 pt_left = PointXYZ(x=x, y=y, z=z, name="wl_left")
         else:
             pt_left = self.point(0)
 
         # Interpolate points at river right side
         if (i_right < self.number_points - 1):
-            if abs(self.point(i_right + 1).z - self.point(i_right).z) < 1e-20:
-                pt_right = self.point(i_right)
+            pi = self.point(i_right)
+            pip1 = self.point(i_right + 1)
+
+            if abs(pip1.z - pi.z) < 1e-20:
+                pt_right = pi
             else:
-                fact = (z - self.point(i_right).z) / \
-                    (self.point(i_right + 1).z - self.point(i_right).z)
-                x = self.point(i_right).x + fact * \
-                    (self.point(i_right + 1).x - self.point(i_right).x)
-                y = self.point(i_right).y + fact * \
-                    (self.point(i_right + 1).y - self.point(i_right).y)
+                fact = (z - pi.z) / (pip1.z - pi.z)
+                x = pi.x + fact * (pip1.x - pi.x)
+                y = pi.y + fact * (pip1.y - pi.y)
                 pt_right = PointXYZ(x=x, y=y, z=z, name="wl_right")
         else:
             pt_right = self.point(self.number_points - 1)
 
-        return pt_left, pt_right
+        v = (pt_left, pt_right)
 
+        # Put results in cache
+        self._get_water_limits_cache[z] = v
+
+        # Create a generator to improve results data reading speed
+        yield v
+
+    @timer
     def compute_tabulation(self):
         sorted_points = sorted(self._points, key=lambda p: p.z)
+
         self.tab.z = np.array([p.z for p in sorted_points], np.float64)
         self.tab.L = np.zeros(len(self.tab.z), np.float64)
         self.tab.A = np.zeros(len(self.tab.z), np.float64)
+
         for i in range(1, len(self.tab.z)):
             self.tab.L[i] = self.compute_wet_width(self.tab.z[i])
+
             dx = (self.tab.L[i] + self.tab.L[i-1])/2
             dz = self.tab.z[i] - self.tab.z[i-1]
+
             self.tab.A[i] = self.tab.A[i-1] + dz * dx
 
         self.tab_up_to_date = True
@@ -1074,16 +1107,10 @@ class ProfileXYZ(Profile, SQLSubModel):
 
     def shift(self, x, y, z):
         for p in self._points:
-            p.x = p.x + x
-            p.y = p.y + y
-            p.z = p.z + z
+            p.shift(x, y, z)
 
         self.modified()
 
-    def modified(self):
-        self.tab_up_to_date = False
-        self.station_up_to_date = False
-
     def add_npoints(self, npoints):
         # add npoints in a profile
         for k in range(npoints):
@@ -1105,6 +1132,7 @@ class ProfileXYZ(Profile, SQLSubModel):
                        rk=self.rk,
                        reach=self.reach,
                        status=self._status)
+
         for i, k in enumerate(self.points):
             p.insert_point(i, k.copy())
 

src/Model/Geometry/Reach.py

@@ -1,5 +1,5 @@
 # Reach.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,6 +52,11 @@ class Reach(SQLSubModel):
         self._guidelines_is_valid = False
         self._guidelines = {}
 
+        super(Reach, self).__init__(
+            id=parent.pamhyr_id,
+            status=status,
+        )
+
     @property
     def pamhyr_id(self):
         return self._parent.pamhyr_id
@@ -60,6 +65,10 @@ class Reach(SQLSubModel):
     def _pamhyr_id(self):
         return self._parent.pamhyr_id
 
+    @_pamhyr_id.setter
+    def _pamhyr_id(self, id):
+        return
+
     @classmethod
     def _db_create(cls, execute):
         return cls._create_submodel(execute)
@@ -103,6 +112,9 @@ class Reach(SQLSubModel):
                         predicate=lambda obj, data: True,
                         modifier=lambda obj, data: None,
                         data={}):
+        if predicate(self, data):
+            modifier(self, data)
+
         for p in self._profiles:
             p._data_traversal(predicate, modifier, data)
 
@@ -199,13 +211,12 @@ class Reach(SQLSubModel):
         else:
             gi = self.get_global_profil_index(index)
             profile.num = gi
-            print(f"gi = {gi}")
             self._profiles.insert(gi, profile)
 
         self.modified()
 
     def delete(self, indexes):
-        """Delete some elements in profile list
+        """Set some elements as deleted in profile list
 
         Args:
             indexes: The list of index to delete
@@ -247,7 +258,7 @@ class Reach(SQLSubModel):
         self.modified()
 
     def delete_profiles(self, profiles):
-        """Delete some elements in profile list
+        """Set profiles list as deleted
 
         Args:
             profiles: The list of profile to delete
@@ -956,3 +967,9 @@ class Reach(SQLSubModel):
                 break
 
         return global_index
+
+    def update_rks(self, rks):
+        for rk, profile in zip(rks, self.profiles):
+            profile.rk = rk
+
+        self.modified()

src/Model/Geometry/Vector_1d.py

@@ -1,5 +1,5 @@
 # Vector_1d.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/HydraulicStructures/Basic/HydraulicStructures.py

@@ -1,5 +1,5 @@
 # HydraulicStructures.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -183,7 +183,6 @@ class BasicHS(SQLSubModel):
             bhs._data = BHSValue._db_load(
                 execute, data
             )
-            print(f"{bhs_pid} : {deleted}")
             if deleted:
                 bhs.set_as_deleted()
 

src/Model/HydraulicStructures/Basic/Types.py

@@ -1,5 +1,5 @@
 # Types.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/HydraulicStructures/Basic/Value.py

@@ -1,5 +1,5 @@
 # Value.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -1,5 +1,5 @@
 # HydraulicStructures.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -274,6 +274,9 @@ class HydraulicStructure(SQLSubModel):
         return hs
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
         execute(
             "DELETE FROM hydraulic_structures " +
             f"WHERE pamhyr_id = {self.pamhyr_id} " +

src/Model/HydraulicStructures/HydraulicStructuresList.py

@@ -1,5 +1,5 @@
 # HydraulicStructuresList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/InitialConditions/InitialConditions.py

@@ -1,5 +1,5 @@
 # InitialConditions.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -225,6 +225,8 @@ class Data(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
         ind = data["ind"]
 
         execute(
@@ -396,7 +398,7 @@ class InitialConditions(SQLSubModel):
 
     @reach.setter
     def reach(self, new):
-        self._reach = reach
+        self._reach = new
         self.modified()
 
     @property
@@ -586,8 +588,6 @@ class InitialConditions(SQLSubModel):
                 for data in self._data:
                     data_height[data["rk"].rk] = data["height"]
 
-        print(data_height)
-
         incline = self._reach.reach.get_incline_median_mean()
         logger.debug(f"incline = {incline}")
 

src/Model/InitialConditions/InitialConditionsDict.py

@@ -1,5 +1,5 @@
 # InitialConditionsDict.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -1,5 +1,5 @@
 # InitialConditionsAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,16 +79,12 @@ class InitialConditionsAdisTS(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
-        created = False
-
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 6:
-                cls._db_create(execute)
-                created = True
 
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(execute, "initial_conditions_adists"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return True
 
@@ -267,7 +263,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @name.setter
     def name(self, name):
         self._name = name
-        self._status.modified()
+        self.modified()
 
     @property
     def pollutant(self):
@@ -276,7 +272,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @pollutant.setter
     def pollutant(self, pollutant):
         self._pollutant = pollutant
-        self._status.modified()
+        self.modified()
 
     @property
     def concentration(self):
@@ -285,7 +281,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @concentration.setter
     def concentration(self, concentration):
         self._concentration = concentration
-        self._status.modified()
+        self.modified()
 
     @property
     def eg(self):
@@ -294,7 +290,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @eg.setter
     def eg(self, eg):
         self._eg = eg
-        self._status.modified()
+        self.modified()
 
     @property
     def em(self):
@@ -303,7 +299,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @em.setter
     def em(self, em):
         self._em = em
-        self._status.modified()
+        self.modified()
 
     @property
     def ed(self):
@@ -312,7 +308,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @ed.setter
     def ed(self, ed):
         self._ed = ed
-        self._status.modified()
+        self.modified()
 
     @property
     def enabled(self):
@@ -321,28 +317,45 @@ class InitialConditionsAdisTS(SQLSubModel):
     @enabled.setter
     def enabled(self, enabled):
         self._enabled = enabled
-        self._status.modified()
+        self.modified()
 
     def new(self, index):
         n = ICAdisTSSpec(status=self._status)
         self._data.insert(index, n)
-        self._status.modified()
+        self.modified()
         return n
 
     def delete(self, data):
-        self._data = list(
-            filter(
-                lambda x: x not in data,
-                self._data
+        list(
+            map(
+                lambda x: x.set_as_deleted(),
+                data
             )
         )
-        self._status.modified()
+        self.modified()
 
     def delete_i(self, indexes):
-        for ind in indexes:
-            del self._data[ind]
-        self._status.modified()
+        list(
+            map(
+                lambda e: e[1].set_as_deleted(),
+                filter(
+                    lambda e: e[0] in indexes,
+                    enumerate(self._data)
+                )
+            )
+        )
+        self.modified()
 
     def insert(self, index, data):
-        self._data.insert(index, data)
-        self._status.modified()
+        if data in self._data:
+            self.undelete([data])
+        else:
+            self._data.insert(index, data)
+
+        self.modified()
+
+    def undelete(self, lst):
+        for x in lst:
+            x.set_as_not_deleted()
+
+        self.modified()

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py

@@ -1,5 +1,5 @@
 # InitialConditionsAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -1,5 +1,5 @@
 # InitialConditionsAdisTSSpec.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ class ICAdisTSSpec(SQLSubModel):
     _sub_classes = []
 
     def __init__(self, id: int = -1, name: str = "",
-                 status=None):
+                 status=None, owner_scenario=None):
         super(ICAdisTSSpec, self).__init__()
 
         self._status = status
@@ -77,16 +77,12 @@ class ICAdisTSSpec(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
-        created = False
-
-        if major == 0 and minor < 1:
-            if int(release) < 6:
-                cls._db_create(execute)
-                created = True
 
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(execute, "initial_conditions_adists_spec"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return True
 
@@ -194,7 +190,7 @@ class ICAdisTSSpec(SQLSubModel):
                 new_spec.rate = rate
                 new_spec.enabled = enabled
 
-                loaded.add(pid)
+                # loaded.add(pid)
                 new.append(new_spec)
 
         data["scenario"] = scenario.parent
@@ -211,7 +207,7 @@ class ICAdisTSSpec(SQLSubModel):
 
         sql = (
             "INSERT INTO " +
-            "initial_conditions_adists_spec(id, deleted, " +
+            "initial_conditions_adists_spec(pamhyr_id, deleted, " +
             "ic_default, name, reach, " +
             "start_rk, end_rk, concentration, eg, em, ed, rate, " +
             "enabled, scenario) " +

src/Model/LateralContribution/LateralContribution.py

@@ -1,5 +1,5 @@
 # LateralContribution.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -147,9 +147,9 @@ class Data(SQLSubModel):
             it = iter(v)
 
             pid = next(it)
-            delete = next(it)
-            data0 = bc._types[0](next(it))
-            data1 = bc._types[1](next(it))
+            deleted = next(it)
+            data0 = lc._types[0](next(it))
+            data1 = lc._types[1](next(it))
             owner_scenario = next(it)
 
             nd = cls(

src/Model/LateralContribution/LateralContributionList.py

@@ -1,5 +1,5 @@
 # LateralContributionList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/LateralContribution/LateralContributionTypes.py

@@ -1,5 +1,5 @@
 # LateralContributionTypes.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -1,5 +1,5 @@
 # LateralContributionAdisTS.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,14 +69,12 @@ class Data(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
-                cls._db_create(execute)
-                created = True
-
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(
+                    execute, "lateral_contribution_data_adists"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return True
 
@@ -132,11 +130,13 @@ class Data(SQLSubModel):
         if scenario is None:
             return new
 
+        lca = data["lca"]
+
         table = execute(
-            "SELECT pamhyr_id, deleted, data0, data1 " +
+            "SELECT pamhyr_id, deleted, data0, data1, scenario " +
             "FROM lateral_contribution_data_adists " +
             f"WHERE scenario = {scenario.id} " +
-            f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
+            f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
             f"AND lca = '{lca.id}'"
         )
 
@@ -150,16 +150,16 @@ class Data(SQLSubModel):
                 data1 = next(it)
                 owner_scenario = next(it)
 
-                data = cls(
+                lc = cls(
                     data0, data1,
                     id=pid, status=status,
                     owner_scenario=owner_scenario
                 )
                 if deleted:
-                    data.set_as_deleted()
+                    lc.set_as_deleted()
 
                 loaded.add(pid)
-                new.append(data)
+                new.append(lc)
 
         data["scenario"] = scenario.parent
         new += cls._db_load(execute, data)
@@ -175,7 +175,7 @@ class Data(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "lateral_contribution_adists(pamhyr_id, deleted," +
+            "lateral_contribution_data_adists(pamhyr_id, deleted," +
             "data0, data1, lca, scenario) " +
             "VALUES (" +
             f"{self.id}, {self._db_format(self.is_deleted())}, " +
@@ -241,15 +241,13 @@ class LateralContributionAdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
+        if major == "0" and int(minor) < 2:
+            if cls.is_table_exists(execute, "lateral_contribution_adists"):
+                cls._db_update_to_0_2_0(execute, data)
+            else:
                 cls._db_create(execute)
                 created = True
 
-        if major == "0" and int(minor) < 2:
-            if not created:
-                cls._db_update_to_0_2_0(execute, data)
-
         if not created:
             return cls._update_submodel(execute, version, data)
 
@@ -372,16 +370,18 @@ class LateralContributionAdisTS(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "lateral_contribution_adists(id, deleted," +
+            "lateral_contribution_adists(pamhyr_id, deleted, " +
             "pollutant, reach, begin_rk, end_rk, scenario) " +
             "VALUES (" +
             f"{self.id}, {self._db_format(self.is_deleted())}, " +
             f"{self._pollutant}, {self.reach}, " +
-            f"{self._begin_rk}, {self._end_rk}" +
+            f"{self._begin_rk}, {self._end_rk}, " +
             f"{self._status.scenario_id}" +
             ")"
         )
 
+        data["lca"] = self
+
         ind = 0
         for d in self._data:
             data["ind"] = ind
@@ -406,7 +406,7 @@ class LateralContributionAdisTS(SQLSubModel):
         return len(
             list(
                 filter(
-                    lambda el: not el.is_deleted(),
+                    lambda el: el is not None and not el.is_deleted(),
                     self._data
                 )
             )
@@ -452,7 +452,12 @@ class LateralContributionAdisTS(SQLSubModel):
 
     @property
     def data(self):
-        return self._data.copy()
+        return list(
+            filter(
+                lambda el: el is not None and not el.is_deleted(),
+                self._data
+            )
+        )
 
     @property
     def begin_rk(self):
@@ -471,3 +476,57 @@ class LateralContributionAdisTS(SQLSubModel):
     def end_rk(self, end_rk):
         self._end_rk = end_rk
         self.modified()
+
+    @property
+    def _default_0(self):
+        return self._types[0](0)
+
+    @property
+    def _default_1(self):
+        return self._types[1](0.0)
+
+    def add(self, index: int):
+        value = Data(self._default_0, self._default_1, status=self._status)
+        self._data.insert(index, value)
+        self.modified()
+        return value
+
+    def insert(self, index: int, data: Data):
+        self._data.insert(index, data)
+        self.modified()
+
+    def delete_i(self, indexes):
+        self._data = list(
+            map(
+                lambda e: e[1].set_as_deleted(),
+                filter(
+                    lambda e: e[0] not in indexes,
+                    enumerate(self.data)
+                )
+            )
+        )
+        self.modified()
+
+    def index(self, bc):
+        self._data.index(bc)
+
+    def get_i(self, index: int):
+        return self._data[index]
+
+    def get_range(self, _range):
+        lst = []
+        for r in _range:
+            lst.append(r)
+        return lst
+
+    def _set_i_c_v(self, index: int, column: int, value):
+        v = self._data[index]
+        v[column] = self._types[column](value)
+        self._data[index] = v
+        self.modified()
+
+    def set_i_0(self, index: int, value):
+        self._set_i_c_v(index, 0, value)
+
+    def set_i_1(self, index: int, value):
+        self._set_i_c_v(index, 1, value)

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

@@ -1,5 +1,5 @@
 # LateralContributionsAdisTSList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Network/Edge.py

@@ -1,5 +1,5 @@
 # Edge.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Network/Graph.py

@@ -1,5 +1,5 @@
 # Graph.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Network/Node.py

@@ -1,5 +1,5 @@
 # Node.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Network/Point.py

@@ -1,5 +1,5 @@
 # Point.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Network/__init__.py

@@ -1,5 +1,5 @@
 # __init__.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Network/test_network.py

@@ -1,5 +1,5 @@
 # test_Network.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -1,5 +1,5 @@
 # OutputRKAdists.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -95,16 +95,12 @@ class OutputRKAdists(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
-        created = False
-
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
-                cls._db_create(execute)
-                created = True
 
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(execute, "OutputRKAdists"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return True
 
@@ -193,7 +189,7 @@ class OutputRKAdists(SQLSubModel):
             "output_rk_adists(pamhyr_id, deleted, " +
             "reach, rk, title, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {self._db_format(self.is_deleted())}, " +
             f"{self._reach}, {self._rk}, " +
             f"'{self._db_format(self._title)}', " +
             f"{self._status.scenario_id}" +

src/Model/Pollutants/Pollutants.py

@@ -1,5 +1,5 @@
 # Pollutants.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,6 +28,9 @@ from tools import (
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 from Model.Scenario import Scenario
+from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
+    BoundaryConditionAdisTS,
+)
 
 logger = logging.getLogger()
 
@@ -101,6 +104,12 @@ class PollutantCharacteristics(SQLSubModel):
             self._ac = value
         elif key == 8:
             self._bc = value
+        self.propagate_modified()
+
+    def propagate_modified(self):
+        self.modified()
+        if hasattr(self, "_pollutant") and self._pollutant:
+            self._pollutant.modified()
 
     @classmethod
     def _db_create(cls, execute, ext=""):
@@ -129,16 +138,12 @@ class PollutantCharacteristics(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
-        created = False
-
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
-                cls._db_create(execute)
-                created = True
 
         if major == "0" and int(minor) < 2:
-            if not created:
+            if cls.is_table_exists(execute, "Pollutants_characteristics"):
                 cls._db_update_to_0_2_0(execute, data)
+            else:
+                cls._db_create(execute)
 
         return cls._update_submodel(execute, version, data)
 
@@ -253,6 +258,12 @@ class PollutantCharacteristics(SQLSubModel):
         if not self.must_be_saved():
             return True
 
+        execute(
+                "DELETE FROM pollutants_characteristics " +
+                f"WHERE pamhyr_id = {self.id} " +
+                f"AND scenario = {self._status.scenario_id}"
+            )
+
         execute(
             "INSERT INTO " +
             "pollutants_characteristics(pamhyr_id, deleted, " +
@@ -275,7 +286,10 @@ class PollutantCharacteristics(SQLSubModel):
 
 
 class Pollutants(SQLSubModel):
-    _sub_classes = [PollutantCharacteristics]
+    _sub_classes = [
+        PollutantCharacteristics,
+        # BoundaryConditionAdisTS
+    ]
 
     def __init__(self, id: int = -1, name: str = "",
                  status=None, owner_scenario=-1):
@@ -293,6 +307,11 @@ class Pollutants(SQLSubModel):
         self._enabled = True
 
         self._data = []
+        self._boundary_conditions_adists = []
+
+    @property
+    def boundary_conditions_adists(self):
+        return self._boundary_conditions_adists
 
     @property
     def name(self):
@@ -301,7 +320,7 @@ class Pollutants(SQLSubModel):
     @name.setter
     def name(self, name):
         self._name = name
-        self._status.modified()
+        self.modified()
 
     @property
     def data(self):
@@ -309,19 +328,21 @@ class Pollutants(SQLSubModel):
 
     @data.setter
     def data(self, data):
-        self._data = [PollutantCharacteristics(type=int(data[0]),
-                                               diametre=float(data[1]),
-                                               rho=float(data[2]),
-                                               porosity=float(data[3]),
-                                               cdc_riv=float(data[4]),
-                                               cdc_cas=float(data[5]),
-                                               apd=float(data[6]),
-                                               ac=float(data[7]),
-                                               bc=float(data[8]),
-                                               pollutant=self,
-                                               status=self._status
-                                               )
-                      ]
+        self._data = [
+            PollutantCharacteristics(
+                type=int(data[0]),
+                diametre=float(data[1]),
+                rho=float(data[2]),
+                porosity=float(data[3]),
+                cdc_riv=float(data[4]),
+                cdc_cas=float(data[5]),
+                apd=float(data[6]),
+                ac=float(data[7]),
+                bc=float(data[8]),
+                pollutant=self,
+                status=self._status
+            )
+        ]
 
     @classmethod
     def _db_create(cls, execute, ext=""):
@@ -329,6 +350,7 @@ class Pollutants(SQLSubModel):
           CREATE TABLE pollutants{ext}(
             {cls.create_db_add_pamhyr_id()},
             deleted BOOLEAN NOT NULL DEFAULT FALSE,
+            enabled BOOLEAN NOT NULL DEFAULT TRUE,
             name TEXT NOT NULL,
             {Scenario.create_db_add_scenario()},
             {Scenario.create_db_add_scenario_fk()}
@@ -345,14 +367,20 @@ class Pollutants(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
-            if int(release) < 7:
+        if major == "0" and int(minor) < 2:
+            if cls.is_table_exists(execute, "Pollutants"):
+                cls._db_update_to_0_2_0(execute, data)
+            else:
                 cls._db_create(execute)
                 created = True
 
-        if major == "0" and int(minor) < 2:
-            if not created:
-                cls._db_update_to_0_2_0(execute, data)
+        if major == "0" and minor == "2":
+            if int(release) < 6:
+                execute(f"ALTER TABLE pollutants " +
+                        f"ADD COLUMN enabled BOOLEAN NOT NULL DEFAULT TRUE")
+
+                # cls._db_update_to_0_2_5(execute, data)
+                # # created = True
 
         if not created:
             return cls._update_submodel(execute, version, data)
@@ -391,7 +419,8 @@ class Pollutants(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, name FROM pollutants " +
+            "SELECT pamhyr_id, deleted, enabled, name, scenario " +
+            "FROM pollutants " +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
         )
@@ -402,20 +431,32 @@ class Pollutants(SQLSubModel):
 
                 pid = next(it)
                 deleted = (next(it) == 1)
+                enabled = (next(it) == 1)
                 name = next(it)
+                owner_scenario = next(it)
 
                 new_pollutant = cls(
                     id=pid, name=name,
-                    status=status
+                    status=status,
+                    owner_scenario=owner_scenario
                 )
                 if deleted:
                     new_pollutant.set_as_deleted()
+                if not enabled:
+                    new_pollutant.enabled = False
 
                 data["pollutant"] = new_pollutant
                 new_pollutant._data = PollutantCharacteristics._db_load(
                     execute, data=data
                 )
 
+                new_pollutant._boundary_conditions_adists = (
+                    BoundaryConditionAdisTS._db_load(
+                        execute,
+                        data=data
+                    )
+                )
+
                 loaded.add(pid)
                 new.append(new_pollutant)
 
@@ -444,9 +485,10 @@ class Pollutants(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "pollutants(pamhyr_id, deleted, name, scenario) " +
+            "pollutants(pamhyr_id, deleted, enabled, name, scenario) " +
             "VALUES (" +
             f"{self.id}, {self._db_format(self.is_deleted())}, " +
+            f"{self._db_format(self._enabled)}, " +
             f"'{self._db_format(self._name)}', " +
             f"{self._status.scenario_id}" +
             ")"
@@ -455,6 +497,9 @@ class Pollutants(SQLSubModel):
         for d in self._data:
             ok &= d._db_save(execute, data)
 
+        for bc in self._boundary_conditions_adists:
+            ok &= bc._db_save(execute, data)
+
         return ok
 
     def _data_traversal(self,

src/Model/Pollutants/PollutantsList.py

@@ -19,7 +19,7 @@
 from tools import trace, timer
 
 from Model.Except import NotImplementedMethodeError
-from Model.Tools.PamhyrList import PamhyrModelList
+from Model.Tools.PamhyrListExt import PamhyrModelList
 from Model.Pollutants.Pollutants import Pollutants
 
 

src/Model/Reservoir/Reservoir.py

@@ -1,5 +1,5 @@
 # Reservoir.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -263,8 +263,6 @@ class Reservoir(SQLSubModel):
         cls._db_update_to_0_2_0_set_node_pid(execute, table, nodes)
         Scenario.update_db_add_scenario(execute, table)
 
-        print(execute(f"SELECT * FROM {table}"))
-
         cls._db_create(execute, ext="_tmp")
         execute(
             f"INSERT INTO {table}_tmp " +
@@ -314,7 +312,7 @@ class Reservoir(SQLSubModel):
                 new_reservoir._node = next(
                     filter(
                         lambda n: n.id == node_id, data["nodes"]
-                    )
+                    ), None
                 )
 
             data["reservoir"] = new_reservoir

src/Model/Reservoir/ReservoirList.py

@@ -1,5 +1,5 @@
 # ReservoirList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Results/Results.py

@@ -1,5 +1,5 @@
 # Results.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@ import numpy as np
 from copy import deepcopy
 from datetime import datetime
 
+from tools import timer
+
 from Model.Scenario import Scenario
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Results.River.River import River
@@ -155,11 +157,188 @@ class AdditionalData(SQLSubModel):
         return True
 
 
+class TableData(SQLSubModel):
+    _sub_classes = []
+
+    def __init__(self, id=-1, study=None,
+                 legend="", data=None,
+                 owner_scenario=-1):
+        super(TableData, self).__init__(
+            id=id, status=study.status,
+            owner_scenario=owner_scenario
+        )
+
+        self._study = study
+        self._legend = legend
+        self._data = data
+
+    @property
+    def data(self):
+        return self._data
+
+    @classmethod
+    def _db_create(cls, execute, ext=""):
+        execute(f"""
+          CREATE TABLE results_table_data{ext} (
+            {cls.create_db_add_pamhyr_id()},
+            result INTEGER NOT NULL,
+            legend TEXT NOT NULL,
+            unit TEXT NOT NULL,
+            data_shape_x INTEGER NOT NULL,
+            data_shape_y INTEGER NOT NULL,
+            data_shape_z INTEGER DEFAULT -1,
+            data BLOB NOT NULL,
+            {Scenario.create_db_add_scenario()},
+            {Scenario.create_db_add_scenario_fk()},
+            FOREIGN KEY(result) REFERENCES results(pamhyr_id),
+            PRIMARY KEY(pamhyr_id, result, legend, scenario)
+          )
+        """)
+
+        if ext != "":
+            return True
+
+        return cls._create_submodel(execute)
+
+    @classmethod
+    def _db_update(cls, execute, version, data=None):
+        major, minor, release = version.strip().split(".")
+        create = False
+
+        if major == "0" and int(minor) == 2:
+            if int(release) < 7 and not create:
+                cls._db_create(execute)
+                create = True
+
+        return cls._update_submodel(execute, version, data)
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        res = {}
+
+        study = data['study']
+        status = data['status']
+        scenario = data["scenario"]
+        result = data["result"]
+        rid = data["result_pid"]
+
+        table = execute(
+            "SELECT pamhyr_id, " +
+            "legend, unit, " +
+            "data_shape_x, data_shape_y, data_shape_z, " +
+            "data, " +
+            "scenario " +
+            "FROM results_table_data " +
+            f"WHERE scenario = {scenario.id} " +
+            f"AND result = {rid}"
+        )
+
+        for v in table:
+            it = iter(v)
+
+            pid = next(it)
+            legend = next(it)
+            unit = next(it)
+            data_shape_x = next(it)
+            data_shape_y = next(it)
+            data_shape_z = next(it)
+            data = next(it)
+            owner_scenario = next(it)
+
+            dtype = cls._unit_to_dtype(unit)
+
+            np_data = np.frombuffer(data, dtype=dtype)
+            if data_shape_y == -1:
+                np_data = np.reshape(np_data, data_shape_x)
+            elif data_shape_z == -1:
+                np_data = np.reshape(np_data, (data_shape_x,
+                                               data_shape_y))
+            else:
+                np_data = np.reshape(np_data, (data_shape_x,
+                                               data_shape_y,
+                                               data_shape_z))
+
+            new_table = cls(study=study,
+                            legend=legend, data=np_data,
+                            owner_scenario=owner_scenario)
+
+            res[legend] = new_table
+
+        return res
+
+    def _db_save(self, execute, data=None):
+        if self._status.scenario.id != self._owner_scenario:
+            return
+
+        shape_x = -1
+        shape_y = -1
+        shape_z = -1
+        shape = self._data.shape
+
+        if len(shape) == 2:
+            shape_x, shape_y = shape
+        elif len(shape) == 1:
+            shape_x, = shape
+        elif len(shape) == 3:
+            shape_x, shape_y, shape_z = shape
+        else:
+            logger.error(
+                f"Failed to parse numpy shape: {shape}"
+            )
+
+        execute(
+            "INSERT INTO " +
+            "results_table_data (pamhyr_id, result, " +
+            "legend, unit, " +
+            "data_shape_x, data_shape_y, data_shape_z, " +
+            "data, " +
+            "scenario) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            self._pamhyr_id, data["result"],
+            self._legend, self._dtype_to_unit(self._data.dtype),
+            shape_x, shape_y, shape_z,
+            self._data,
+            self._owner_scenario
+        )
+
+        return True
+
+    @classmethod
+    def _unit_to_dtype(cls, unit):
+        t = {
+            "i32": np.int32, "i64": np.int64,
+            "u32": np.uint32, "u64": np.uint64,
+            "f32": np.float32, "f64": np.float64,
+        }
+
+        return t[unit]
+
+    def _dtype_to_unit(self, dtype):
+        t = {
+            np.dtype(np.int32): "i32", np.dtype(np.int64): "i64",
+            np.dtype(np.uint32): "u32", np.dtype(np.uint64): "u64",
+            np.dtype(np.float32): "f32", np.dtype(np.float64): "f64",
+        }
+
+        return t[dtype]
+
+    def table(self):
+        return self._data
+
+    def __len__(self):
+        return len(self._data)
+
+    def __getitem__(self, key):
+        if isinstance(key, tuple):
+            return self._data[key[0], key[1]]
+
+        self._data[key]
+
+
 class Results(SQLSubModel):
-    _sub_classes = [River, AdditionalData]
+    _sub_classes = [River, TableData, AdditionalData]
 
     def __init__(self, id=-1, study=None, solver=None,
-                 repertory="", name="0"):
+                 repertory="", name="0", is_ensemble=False):
         super(Results, self).__init__(
             id=id, status=study.status,
             owner_scenario=study.status.scenario.id
@@ -167,21 +346,29 @@ class Results(SQLSubModel):
 
         self._name = name
         self._study = study
-        self._river = River(self._study)
+        self._river = River(self._study, self)
 
         self._solver = solver
         self._repertory = repertory
 
+        self._is_ensemble = is_ensemble
+
         self._meta_data = {
             # Keep results creation date
             "creation_date": datetime.now(),
             "study_revision": study.status.version,
             "additional_data": [],
+            "table": {},
         }
 
+        self._ts_index = {}
+
         if solver is not None:
             self.set("solver_type", solver._type)
 
+    def is_ensemble(self):
+        return self._is_ensemble
+
     @property
     def date(self):
         date = self._meta_data["creation_date"]
@@ -195,6 +382,7 @@ class Results(SQLSubModel):
     def study(self):
         return self._study
 
+    @timer
     def set(self, key, value):
         self._meta_data[key] = value
 
@@ -212,6 +400,16 @@ class Results(SQLSubModel):
     def get(self, key):
         return self._meta_data[key]
 
+    def set_timestamp_index(self, index):
+        self._ts_index = index
+
+    def get_timestamp_id(self, ts):
+        return self._ts_index[ts]
+
+    def compute_timestamp_index(self):
+        for i, ts in enumerate(self._meta_data["timestamps"]):
+            self._ts_index[ts] = i
+
     def reload(self):
         return self._solver.results(
             self._study,
@@ -219,6 +417,11 @@ class Results(SQLSubModel):
             qlog=None,
         )
 
+    def bufferize(self, key):
+        if self.is_valid:
+            for reach in self._river._reachs:
+                reach.bufferize(self._meta_data["timestamps"], key)
+
     def timestamps_to_struct(self):
         ts = self._meta_data["timestamps"]
         sf = ">" + ''.join(itertools.repeat("d", len(ts)))
@@ -304,11 +507,20 @@ class Results(SQLSubModel):
             new_results.set("study_revision", revision)
             new_results.set("creation_date", creation_date)
 
+            data["result_pid"] = pid
+            data["result"] = new_results
+
+            table_data = TableData._db_load(execute, data)
+            new_results.set("table", table_data)
+
             sf = ">" + ''.join(itertools.repeat("d", nb_timestamps))
             ts = struct.unpack(sf, timestamps_bytes)
             new_results.set("timestamps", ts)
 
             data["timestamps"] = sorted(ts)
+            new_results.compute_timestamp_index()
+
+            data["parent"] = new_results
             new_results._river = River._db_load(execute, data)
 
             new_results.set(
@@ -316,6 +528,20 @@ class Results(SQLSubModel):
                 AdditionalData._db_load(execute, data)
             )
 
+            # Update global index
+            i = 0
+            for reach in new_results._river.reachs:
+                nb = len(reach.profiles)
+                reach.set_global_index(range(i, i + nb + 1))
+                i += nb
+
+            if "Z" in table_data:
+                for ts in data["timestamps"]:
+                    new_results._river.update_water_limits(
+                        ts,
+                        table_data["Z"][new_results.get_timestamp_id(ts), :]
+                    )
+
             yield (solver_type, new_results)
 
     def _db_save_clear(self, execute, solver_type, data=None):
@@ -338,15 +564,26 @@ class Results(SQLSubModel):
                     f"WHERE scenario = {self._owner_scenario} " +
                     f"AND result = {pid}"
                 )
+                execute(
+                    "DELETE FROM results_table_data " +
+                    f"WHERE scenario = {self._owner_scenario} " +
+                    f"AND result = {pid}"
+                )
                 execute(
                     "DELETE FROM results_add_data " +
                     f"WHERE scenario = {self._owner_scenario} " +
                     f"AND result = {pid}"
                 )
 
+    def _is_valid(self):
+        return "timestamps" in self._meta_data
+
     def _db_save(self, execute, data=None):
         if self._status.scenario.id != self._owner_scenario:
-            return
+            return True
+
+        if not self._is_valid():
+            return False
 
         pid = self._pamhyr_id
         if self._solver is None:
@@ -375,7 +612,19 @@ class Results(SQLSubModel):
         data["result"] = self._pamhyr_id
         self._river._db_save(execute, data)
 
+        tables = self.get("table")
+        for legend in tables:
+            tables[legend]._db_save(execute, data)
+
         for add_data in self.get("additional_data"):
             add_data._db_save(execute, data)
 
         return True
+
+    def new_table_data(self, legend, data):
+        return TableData(
+            study=self._study,
+            legend=legend,
+            data=data,
+            owner_scenario=self._owner_scenario
+        )

src/Model/Results/ResultsAdisTS.py

@@ -1,5 +1,5 @@
 # Results.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,12 +21,13 @@ import os
 from copy import deepcopy
 from datetime import datetime
 
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Results.River.RiverAdisTS import River
 
 logger = logging.getLogger()
 
 
-class Results(object):
+class Results(SQLSubModel):
     def __init__(self, study=None, solver=None,
                  repertory="", name="0", type_pol=None):
         self._study = study
@@ -90,3 +91,6 @@ class Results(object):
             self._repertory,
             qlog=None,
         )
+
+    def _db_save(self, execute, data=None):
+        return False

src/Model/Results/River/River.py

@@ -1,5 +1,5 @@
 # River.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,11 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import types
 import struct
 import logging
 import itertools
+import numpy as np
 
-from tools import flatten
+from tools import flatten, timer
 from functools import reduce
 from datetime import datetime
 
@@ -29,15 +31,17 @@ logger = logging.getLogger()
 
 
 class Profile(SQLSubModel):
-    def __init__(self, profile, study):
+    def __init__(self, profile, study, parent):
         super(Profile, self).__init__(
             id=-1, status=study.status,
             owner_scenario=study.status.scenario.id
         )
 
+        self._parent = parent
         self._study = study
         self._profile = profile  # Source profile in the study
         self._data = {}  # Dict of dict {<ts>: {<key>: <value>, ...}, ...}
+        self._global_index = -1
 
     def __len__(self):
         return len(self._data)
@@ -54,15 +58,26 @@ class Profile(SQLSubModel):
     def geometry(self):
         return self._profile
 
+    @property
+    def global_index(self):
+        return self._global_index
+
+    @global_index.setter
+    def global_index(self, id):
+        self._global_index = id
+
+    @timer
     def set(self, timestamp, key, data):
         if timestamp not in self._data:
             self._data[timestamp] = {}
 
         self._data[timestamp][key] = data
 
+    @timer
     def get_ts(self, timestamp):
         return self._data[timestamp]
 
+    @timer
     def get_key(self, key):
         res = list(
             map(lambda ts: self._data[ts][key],
@@ -70,13 +85,25 @@ class Profile(SQLSubModel):
         )
         return res
 
+    @timer
     def get_ts_key(self, timestamp, key):
         if timestamp in self._data:
             if key in self._data[timestamp]:
-                return self._data[timestamp][key]
+                v = self._data[timestamp][key]
+
+                # If is a generator, compute value(s)
+                if isinstance(v, types.GeneratorType):
+                    v = next(v)
+                    self._data[timestamp][key] = v
+
+                return v
+
         return None
 
-    def has_sediment(self):
+    def has_sediment_layers(self):
+        return any(map(lambda ts: "sl" in self._data[ts], self._data))
+
+    def has_bedload(self):
         return any(map(lambda ts: "sl" in self._data[ts], self._data))
 
     @classmethod
@@ -110,9 +137,9 @@ class Profile(SQLSubModel):
 
     @classmethod
     def _db_load(cls, execute, data=None):
-        new = {}
         status = data['status']
 
+        parent = data['parent']
         study = data['study']
         reach = data['reach']
         profile = data['profile']
@@ -120,6 +147,8 @@ class Profile(SQLSubModel):
         loaded = data['loaded_pid']
         timestamps = data['timestamps']
 
+        new = cls(profile, study, parent)
+
         values = execute(
             "SELECT pamhyr_id, result, key, " +
             "len_data, data, scenario " +
@@ -139,12 +168,6 @@ class Profile(SQLSubModel):
             data = next(it)
             owner_scenario = next(it)
 
-            if profile not in new:
-                new_data = cls(profile, study)
-                new[profile] = new_data
-            else:
-                new_data = new[profile]
-
             if key in ["Z", "Q", "V"]:
                 sf = ">" + ''.join(itertools.repeat("f", len_data))
                 len_values = len(values)
@@ -157,11 +180,11 @@ class Profile(SQLSubModel):
                 )
 
             for timestamp, value in zip(timestamps, values):
-                new_data.set(timestamp, key, value)
+                new.set(timestamp, key, value)
                 if key == "Z":
-                    new_data.update_water_limits(timestamp, value)
+                    new.update_water_limits(timestamp, value)
 
-        return list(new.values())
+        return new
 
     @classmethod
     def _db_load_data_sl_format(cls, values, len_data, timestamps):
@@ -253,19 +276,20 @@ class Profile(SQLSubModel):
 class Reach(SQLSubModel):
     _sub_classes = [Profile]
 
-    def __init__(self, reach, study, with_init=True):
+    def __init__(self, reach, study, parent, with_init=True):
         super(Reach, self).__init__(
             id=-1, status=study.status,
             owner_scenario=study.status.scenario.id
         )
 
+        self._parent = parent
         self._study = study
         self._reach = reach  # Source reach in the study
         self._profiles = []
         if with_init:
             self._profiles = list(
                 map(
-                    lambda p: Profile(p, self._study),
+                    lambda p: Profile(p, self._study, self._parent),
                     reach.profiles
                 )
             )
@@ -276,6 +300,10 @@ class Reach(SQLSubModel):
             )
         )
 
+        self._global_index = (-1, -1)
+
+        self._buffers = {}
+
     def __len__(self):
         return len(self._profiles)
 
@@ -295,14 +323,42 @@ class Reach(SQLSubModel):
     def profile_mask(self):
         return self._profile_mask
 
+    @property
+    def buffers(self):
+        return self._buffers
+
     def profile(self, id):
         return self._profiles[id]
 
+    def set_global_index(self, indexs):
+        self._global_index = (indexs[0], indexs[-1])
+
+        for profile, ind in zip(self._profiles, indexs):
+            profile.global_index = ind
+
+    @property
+    def global_index(self):
+        return self._global_index
+
+    @timer
     def set(self, profile_id, timestamp, key, data):
         self._profiles[profile_id].set(timestamp, key, data)
 
     def has_sediment(self):
-        return any(map(lambda profile: profile.has_sediment(), self._profiles))
+        return any(map(lambda profile: profile.has_sediment_layers(),
+                       self._profiles))
+
+    def has_bedload(self):
+        return any(map(lambda profile: profile.has_bedload(), self._profiles))
+
+    def bufferize(self, timestamps, key):
+        self._buffers[key] = np.zeros((len(timestamps), len(self)))
+        for i, p in enumerate(self._profiles):
+            self._buffers[key][:, i] = p.get_key(key)
+
+    def update_water_limits(self, timestamp, z_data):
+        for profile, z in zip(self._profiles, z_data):
+            profile.update_water_limits(timestamp, z)
 
     @classmethod
     def _db_create(cls, execute, ext=""):
@@ -317,12 +373,13 @@ class Reach(SQLSubModel):
         reach = data["reach"]
 
         new_reach = cls(
-            data["reach"], data["study"], with_init=False
+            data["reach"], data["study"], data["parent"],
+            with_init=False
         )
 
         for i, profile in enumerate(reach.profiles):
             data["profile"] = profile
-            new_reach._profiles += Profile._db_load(execute, data)
+            new_reach._profiles += [Profile._db_load(execute, data)]
 
         return new_reach
 
@@ -336,16 +393,19 @@ class Reach(SQLSubModel):
 class River(SQLSubModel):
     _sub_classes = [Reach]
 
-    def __init__(self, study):
+    def __init__(self, study, parent):
         super(River, self).__init__(
             id=-1, status=study.status,
             owner_scenario=study.status.scenario.id
         )
 
         self._study = study
+        self._parent = parent
 
         # Dict with timestamps as key
         self._reachs = []
+        for i, _ in enumerate(self._study.river.enable_edges()):
+            self.add(i)
 
     def __len__(self):
         return len(self._reachs)
@@ -363,7 +423,7 @@ class River(SQLSubModel):
     def add(self, reach_id):
         reachs = self._study.river.enable_edges()
 
-        new = Reach(reachs[reach_id].reach, self._study)
+        new = Reach(reachs[reach_id].reach, self._study, self._parent)
 
         self._reachs.append(new)
         return new
@@ -376,6 +436,15 @@ class River(SQLSubModel):
             )
         )
 
+    def update_water_limits(self, timestamp, data):
+        for reach in self._reachs:
+            ind = reach.global_index
+
+            reach.update_water_limits(
+                timestamp,
+                data[ind[0]:ind[1]]
+            )
+
     @classmethod
     def _db_create(cls, execute, ext=""):
         return cls._create_submodel(execute)
@@ -387,7 +456,9 @@ class River(SQLSubModel):
     @classmethod
     def _db_load(cls, execute, data=None):
         study = data["study"]
-        new_river = cls(study)
+        parent = data["parent"]
+
+        new_river = cls(study, parent)
 
         for reach in study.river.reachs():
             data["reach"] = reach.reach

src/Model/Results/River/RiverAdisTS.py

@@ -1,5 +1,5 @@
 # River.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/River.py

@@ -1,5 +1,5 @@
 # River.py -- Pamhyr river model
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList \
 from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
 from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
 from Model.GeoTIFF.GeoTIFFList import GeoTIFFList
+from Model.Ensembles.EnsembleList import EnsembleList
 from Model.Results.Results import Results
 
 logger = logging.getLogger()
@@ -180,6 +181,9 @@ class RiverNode(Node):
         return nodes
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
         execute(
             "INSERT OR REPLACE INTO river_node(" +
             "pamhyr_id, deleted, name, x, y, scenario" +
@@ -361,7 +365,7 @@ class RiverReach(Edge):
             )
             new.enable(enable=enabled)
             if deleted:
-                nd.set_as_deleted()
+                new.set_as_deleted()
 
             data["reach"] = new
             new._reach = Reach._db_load(execute, data)
@@ -377,6 +381,9 @@ class RiverReach(Edge):
         return reachs
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
         execute(
             "INSERT OR REPLACE INTO " +
             "river_reach(" +
@@ -386,7 +393,7 @@ class RiverReach(Edge):
             "VALUES (" +
             f"{self.pamhyr_id}, {self._db_format(self.is_deleted())}, " +
             f"'{self._db_format(self._name)}', " +
-            f"{self._db_format(self.is_enable())},"
+            f"{self._db_format(self.is_enable())}," +
             f"{self.node1.pamhyr_id}, {self.node2.pamhyr_id}, " +
             f"{self._status.scenario_id}" +
             ")"
@@ -470,6 +477,7 @@ class River(Graph):
         D90AdisTSList,
         DIFAdisTSList,
         GeoTIFFList,
+        EnsembleList,
         Results
     ]
 
@@ -509,6 +517,9 @@ class River(Graph):
 
         self._geotiff = GeoTIFFList(status=self._status)
 
+        # Scenario ensemble
+        self._ensembles = EnsembleList(status=self._status)
+
         self._results = {}
 
     @classmethod
@@ -543,7 +554,7 @@ class River(Graph):
         new._nodes = RiverNode._db_load(
             execute, data
         )
-        data["nodes"] = new.nodes()
+        data["nodes"] = new._nodes
         data['loaded_pid'] = set()
 
         new._edges = RiverReach._db_load(
@@ -623,6 +634,8 @@ class River(Graph):
 
         new._geotiff = GeoTIFFList._db_load(execute, data)
 
+        new._ensembles = EnsembleList._db_load(execute, data)
+
         return new
 
     def _db_load_results(self, execute, data=None):
@@ -658,6 +671,8 @@ class River(Graph):
 
         objs.append(self._geotiff)
 
+        objs.append(self._ensembles)
+
         for solv_type in self.results:
             objs.append(self.results[solv_type])
 
@@ -734,7 +749,7 @@ class River(Graph):
             self._BoundaryConditionsAdisTS,
             self._LateralContributionsAdisTS,
             self._D90AdisTS, self._DIFAdisTS,
-            self._geotiff,
+            self._geotiff, self._ensembles,
         ]
 
         for solver in self._parameters:

src/Model/Scenario.py

@@ -17,21 +17,58 @@
 # -*- coding: utf-8 -*-
 
 import os
+import logging
 
-from tools import logger_exception
+from tools import logger_exception, timer, flatten
 
 from Model.Tools.PamhyrDB import SQLSubModel
 
+logger = logging.getLogger()
+
 
 class Scenario(SQLSubModel):
     _id_cnt = 0
     _sub_classes = []
 
+    tables_with_deleted_column = [
+        # Adists
+        "output_rk_adists",
+        "boundary_condition_adists", "boundary_condition_data_adists",
+        "lateral_contribution_adists", "lateral_contribution_data_adists",
+        "initial_conditions_adists", "initial_conditions_adists_spec",
+        "d90_adists", "d90_adists_spec",
+        "dif_adists_spec",
+        "pollutants", "pollutants_characteristics",
+        # Hydraulic
+        "additional_files",
+        "boundary_condition", "boundary_condition_data",
+        "lateral_contribution", "lateral_contribution_data",
+        "friction", "stricklers",
+        "hydraulic_structures",
+        "hydraulic_structures_basic",
+        "initial_conditions",
+        "sedimentary_layer", "sedimentary_layer_layer",
+        "reservoir", "reservoir_data",
+        "rep_lines",
+        "geometry_pointXYZ", "geometry_profileXYZ",
+        "river_reach", "river_node",
+        "geotiff", "reservoir", "reservoir_data",
+        "ensemble",
+    ]
+
+    related_tables = tables_with_deleted_column + [
+        "dif_adists",
+        "solver_parameter",
+        "hydraulic_structures_basic_value",
+        "results", "results_data", "results_add_data",
+    ]
+
     def __init__(self,
                  id: int = -1,
                  name: str = "",
                  description: str = "",
                  x: int = 1000.0, y: int = 1000.0,
+                 is_ensemble: bool = False,
                  revision: int = 0,
                  parent=None):
         super(Scenario, self).__init__()
@@ -41,6 +78,7 @@ class Scenario(SQLSubModel):
         self._x, self._y = x, y
         self._name = name
         self._description = description
+        self._is_ensemble = is_ensemble
         self._revision = revision
         self._parent = parent
 
@@ -63,6 +101,7 @@ class Scenario(SQLSubModel):
             y REAL NOT NULL DEFAULT 1000,
             name TEXT NOT NULL,
             description TEXT NOT NULL,
+            is_ensemble BOOL DEFAULT FALSE,
             revision INTEGER NOT NULL,
             parent_id INTEGER REFERENCES scenario(id)
           )
@@ -98,6 +137,13 @@ class Scenario(SQLSubModel):
             cls._db_create(execute)
             cls._db_add_default(execute)
 
+        if major == "0" and int(minor) == 2:
+            if int(release) < 8:
+                execute(
+                    f"ALTER TABLE scenario " +
+                    "ADD COLUMN is_ensemble BOOL DEFAULT FALSE"
+                )
+
         return True
 
     @classmethod
@@ -118,7 +164,8 @@ class Scenario(SQLSubModel):
         scenarios = {}
 
         table = execute(
-            "SELECT id, x, y, name, description, revision, parent_id " +
+            "SELECT id, x, y, name, description, " +
+            "  is_ensemble, revision, parent_id " +
             "FROM scenario " +
             "ORDER BY id ASC"
         )
@@ -130,6 +177,7 @@ class Scenario(SQLSubModel):
             x, y = next(it), next(it)
             name = next(it)
             desc = next(it)
+            is_ens = next(it)
             revi = next(it)
             parent = next(it)
 
@@ -139,7 +187,9 @@ class Scenario(SQLSubModel):
             new = cls(
                 id=id, x=x, y=y,
                 name=name, description=desc,
-                revision=revi, parent=parent
+                is_ensemble=is_ens,
+                revision=revi,
+                parent=parent
             )
             scenarios[id] = new
 
@@ -149,21 +199,18 @@ class Scenario(SQLSubModel):
         if self.is_deleted():
             return self.drop_all(execute)
 
-        parent = 'NULL'
+        parent = None
         if self.parent is not None:
             parent = self.parent._id
 
         execute(
             "INSERT OR REPLACE INTO " +
-            "scenario(id, x, y, name, description, revision, parent_id) " +
-            "VALUES (" +
-            f"{self._id}, " +
-            f"{self.x}, {self.y}, " +
-            f"'{self._db_format(self.name)}', " +
-            f"'{self._db_format(self.description)}', " +
-            f"{self._revision}, " +
-            f"{parent}" +
-            ")"
+            "scenario(id, x, y, name, description, " +
+            "  is_ensemble, revision, parent_id) " +
+            "VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+            self._id, self.x, self.y,
+            self.name, self.description, self._is_ensemble,
+            self._revision, parent
         )
 
         return True
@@ -171,29 +218,7 @@ class Scenario(SQLSubModel):
     def drop_all(self, execute):
         execute(f"DELETE FROM scenario WHERE id = {self.id}")
 
-        tables = [
-            # Adists
-            "output_rk_adists",
-            "boundary_condition_adists", "boundary_condition_data_adists",
-            "lateral_contribution_adists", "lateral_contribution_data_adists",
-            "initial_conditions_adists",
-            "d90_adists", "dif_adists",
-            "pollutants", "pollutants_characteristics",
-            # Hydraulic
-            "additional_files",
-            "boundary_condition", "boundary_condition_data",
-            "lateral_contribution", "lateral_contribution_data",
-            "friction", "stricklers",
-            "hydraulic_structures",
-            "hydraulic_structures_basic", "hydraulic_structures_basic_value",
-            "initial_conditions",
-            "sedimentary_layer", "sedimentary_layer_layer",
-            "reservoir", "reservoir_data",
-            "rep_lines",
-            "solver_parameter",
-            "geometry_pointXYZ", "geometry_profileXYZ",
-            "river_reach", "river_node",
-        ]
+        tables = self.related_tables
 
         for table in tables:
             execute(
@@ -203,6 +228,67 @@ class Scenario(SQLSubModel):
 
         return True
 
+    def get_parent_branch(self):
+        def aux(scenario, acc):
+            if scenario is None:
+                return acc
+
+            return aux(scenario.parent, [scenario.id] + acc)
+
+        return aux(self, [])
+
+    @timer
+    def clean_deleted_data(self, execute):
+        tables = self.tables_with_deleted_column
+        branch = self.get_parent_branch()
+
+        all_ids = []
+
+        for table in tables:
+            if self.parent is None:
+                # This scenario is the default scenario, so we can
+                # delete all data marked as deleted
+                execute(
+                    f"DELETE FROM {table} " +
+                    f"WHERE scenario = {self.id} " +
+                    "AND deleted = TRUE"
+                )
+                continue
+
+            # Select pamhyr_id for each deleted data in this scenario
+            # who do not exists into parents scenarios
+            ids = execute(
+                f"""
+                  SELECT pamhyr_id FROM {table}
+                  WHERE deleted = TRUE
+                  AND scenario = {self.id}
+                  AND pamhyr_id NOT IN (
+                    SELECT pamhyr_id FROM {table}
+                    WHERE scenario IN
+                      ({', '.join(map(str, branch[:-1]))})
+                  )
+                """, fetch_one=False
+            )
+            if ids is None or len(ids) == 0:
+                continue
+
+            ids = flatten(ids)
+
+            logger.debug(
+                f"({self.name}) Drop deleted data into '{table}' : {ids}"
+            )
+
+            execute(
+                f"DELETE FROM {table} " +
+                f"WHERE scenario = {self.id} " +
+                "AND pamhyr_id IN " +
+                f"({', '.join(map(str, ids))})"
+            )
+
+            all_ids += ids
+
+        return all_ids
+
     @property
     def id(self):
         return self._id
@@ -249,6 +335,9 @@ class Scenario(SQLSubModel):
     def parent(self):
         return self._parent
 
+    def is_ensemble(self):
+        return self._is_ensemble
+
     def set_pos(self, x, y):
         self._x = x
         self._y = y
@@ -266,6 +355,8 @@ class Scenario(SQLSubModel):
             return self.name
         if key == "description":
             return self.description
+        if key == "is_ensemble":
+            return self.is_ensemble()
         if key == "parent":
             return self.parent
 

src/Model/Scenarios.py

@@ -16,6 +16,8 @@
 
 # -*- coding: utf-8 -*-
 
+from functools import reduce
+
 from tools import logger_exception
 
 from Model.Tools.PamhyrDict import PamhyrModelDict
@@ -55,8 +57,11 @@ class Scenarios(PamhyrModelDict):
 
         return None
 
-    def new(self, parent):
-        new = Scenario(parent=parent)
+    def new(self, parent, is_ensemble=False):
+        new = Scenario(
+            parent=parent,
+            is_ensemble=is_ensemble
+        )
         self.set(new._id, new)
         return new
 
@@ -78,3 +83,12 @@ class Scenarios(PamhyrModelDict):
 
         self._dict[key].set_as_deleted()
         self._status.modified()
+
+    def is_leaf(self, scenario):
+        return not reduce(
+            lambda acc, s: (
+                acc or (not s.is_deleted() and s.parent is scenario)
+            ),
+            self._dict.values(),
+            False
+        )

src/Model/Serializable.py

@@ -1,5 +1,5 @@
 # Serializable.py -- Pamhyr pickle abstract class
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/SolverParameters/SolverParametersList.py

@@ -1,5 +1,5 @@
 # SolverParametersList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Status.py

@@ -1,5 +1,5 @@
 # Status.py -- Pamhyr model status class
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ class StudyStatus(object):
         self._status = Status.EDIT
         self._scenario = scenario
         self._saved = True
+        self._loading = False
 
     @property
     def scenario_id(self):
@@ -86,6 +87,15 @@ class StudyStatus(object):
     def is_saved(self):
         return self._saved
 
+    def is_loading(self):
+        return self._loading
+
+    def start_loading(self):
+        self._loading = True
+
+    def stop_loading(self):
+        self._loading = False
+
     def save(self):
         logger.debug("model status set as saved")
         self._saved = True
@@ -97,6 +107,9 @@ class StudyStatus(object):
         self._saved = True
 
     def modified(self):
+        if self._loading:
+            return
+
         if self._saved:
             self.version += 1
 

src/Model/Stricklers/Stricklers.py

@@ -1,5 +1,5 @@
 # Stricklers.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Stricklers/StricklersList.py

@@ -1,5 +1,5 @@
 # StricklersList.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/Study.py

@@ -1,5 +1,5 @@
 # Study.py -- Pamhyr Study class
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,12 +24,22 @@ from datetime import datetime
 from tools import timer, timestamp
 from functools import reduce
 
+from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrDict import PamhyrModelDict
 from Model.Tools.PamhyrDB import SQLModel
 from Model.Scenarios import Scenarios
 from Model.Scenario import Scenario
 from Model.Status import StudyStatus
 from Model.Except import NotImplementedMethodeError
 from Model.River import River
+from Model.Geometry.Reach import Reach
+from Model.Ensembles.DistributionList import DistributionList
+from Model.HydraulicStructures.HydraulicStructures import (
+    HydraulicStructure
+)
+from Model.HydraulicStructures.Basic.HydraulicStructures import (
+    BasicHS
+)
 
 from Checker.Study import *
 
@@ -37,10 +47,11 @@ logger = logging.getLogger()
 
 
 class Study(SQLModel):
-    _version = "0.2.3"
+    _version = "0.2.8"
 
     _sub_classes = [
         Scenario,
+        DistributionList,
         River,
     ]
 
@@ -75,6 +86,9 @@ class Study(SQLModel):
             self.scenarios = Scenarios(status=self.status)
             self.scenarios[0] = s0
             self.status.scenario = s0
+
+            self._ens_distributions = DistributionList(status=self.status)
+
             self._river = River(status=self.status)
         else:
             self._init_db_file(filename, is_new=False)
@@ -379,12 +393,19 @@ class Study(SQLModel):
                 lambda a, s: a or (s.parent is scenario),
                 new.scenarios.lst,
                 False
-        ):
+        ) or scenario.is_ensemble():
             new.status.set_as_read_only()
 
         data["scenario"] = scenario
         data["loaded_pid"] = set()
 
+        # Get ensemble distribution
+        new._ens_distributions = DistributionList._db_load(
+            sql_exec, data=data
+        )
+
+        data["ens_distributions"] = new._ens_distributions
+
         # Load river data
         new._river = River._db_load(
             sql_exec, data=data
@@ -445,12 +466,83 @@ class Study(SQLModel):
         )
         progress()
 
+        if self.status.scenario.is_ensemble():
+            lst = [
+                self.scenarios, self._ens_distributions,
+                self._river._ensembles,
+            ]
+            for solv in self._river._results:
+                lst.append(self._river._results[solv])
+
+            self._save_submodel(
+                lst, data=progress
+            )
+            progress()
+            self.commit()
+
+            return
+
         self._save_submodel(
-            [self.scenarios, self._river],
+            [
+                self.scenarios, self._ens_distributions,
+                self._river
+            ],
             data=progress
         )
+
+        # Clear DB for current scenario
+        ids = self.status.scenario.clean_deleted_data(self.execute)
+        self.memory_clean(ids)
+
+        progress()
+
         self.commit()
 
+    @timer
+    def memory_clean(self, ids):
+        if len(ids) == 0:
+            return
+
+        reach_class = Reach
+        hs_classes = [HydraulicStructure, BasicHS]
+        list_classes = set(PamhyrModelList.__subclasses__())
+        dict_classes = set(PamhyrModelDict.__subclasses__())
+
+        def modifier(obj, data):
+            t = type(obj)
+
+            if t is reach_class:
+                obj._profiles = list(
+                    filter(
+                        lambda el: el.id not in ids,
+                        obj._profiles
+                    )
+                )
+            elif t in hs_classes:
+                obj._data = list(
+                    filter(
+                        lambda el: el.id not in ids,
+                        obj._data
+                    )
+                )
+            elif t in dict_classes:
+                new = {}
+                for key in obj._dict:
+                    if obj._dict[key].id not in ids:
+                        new[key] = obj._dict[key]
+                obj._dict = new
+            elif t in list_classes:
+                obj._lst = list(
+                    filter(
+                        lambda el: el.id not in ids,
+                        obj._lst
+                    )
+                )
+
+        self.river._data_traversal(
+            lambda o, d: True, modifier, {}
+        )
+
     def sql_save_request_count(self, *args, **kargs):
         return self._count()
 
@@ -459,7 +551,10 @@ class Study(SQLModel):
             [self.scenarios, self._river]
         )
         logger.debug(cnt)
-        return cnt + 7
+        # HACK: 8 is the number of SQL request do and dont counted in
+        # submodel save_count (let's count sql execute into the
+        # '_save' method)
+        return cnt + 8
 
     def close(self):
         """Close db connection
@@ -485,7 +580,8 @@ class Study(SQLModel):
         self.status.scenario = scenario
 
         if reduce(
-                lambda a, s: a or (s.parent is scenario),
+                lambda a, s: a or (s.parent is scenario
+                                   and not s.is_deleted()),
                 self.scenarios.lst,
                 False
         ):
@@ -508,18 +604,24 @@ class Study(SQLModel):
         data = {
             "status": self.status,
             "loaded_pid": set(),
-            "scenario": scenario
+            "scenario": scenario,
+            "ens_distributions": self._ens_distributions,
         }
 
-        # Load river data
-        river = River._db_load(
-            sql_exec, data=data
-        )
-        data["study"] = self
-        river._db_load_results(sql_exec, data=data)
+        self.status.start_loading()
+        try:
+            # Load river data
+            river = River._db_load(
+                sql_exec, data=data
+            )
+            data["study"] = self
+            river._db_load_results(sql_exec, data=data)
+        finally:
+            self.status.stop_loading()
+            self.status.scenario = old_scenario
 
-        self._river_scenario_cache[scenario] = river
-        self.status.scenario = old_scenario
+        # FIXME: Disable scenario cache to save memory usage
+        # self._river_scenario_cache[scenario] = river
 
         return river
 
@@ -588,6 +690,22 @@ class Study(SQLModel):
         self.status.set_as_editable()
         return new
 
+    def create_ensemble_scenario(self, switch=True):
+        new = self.scenarios.new(
+            self.status.scenario,
+            is_ensemble=True
+        )
+
+        new.name = self.status.scenario.name + " (ensemble)"
+        new.set_pos(self.status.scenario.x + 100,
+                    self.status.scenario.y)
+
+        if switch:
+            self.status.scenario = new
+
+        self.status.set_as_editable()
+        return new
+
     @property
     def results(self):
         return self._river.results

src/Model/Tools/PamhyrDB.py

@@ -1,5 +1,5 @@
 # PamhyrDB.py -- Pamhyr abstract model database classes
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@ from functools import reduce
 from SQL import SQL
 from Model.Except import NotImplementedMethodeError
 
+from tools import trace
+
 from Model.Tools.PamhyrID import PamhyrID
 
 logger = logging.getLogger()
@@ -48,11 +50,9 @@ class SQLModel(SQL):
         self._cur = self._db.cursor()
 
         if is_new:
-            logger.info("Create database")
             self._create()      # Create db
             # self._save()        # Save
         else:
-            logger.info("Update database")
             self._update()      # Update db scheme if necessary
             # self._load()        # Load data
 
@@ -202,6 +202,8 @@ class SQLSubModel(PamhyrID):
         """
         if self._status is None:
             return
+        if self._status.is_loading():
+            return
 
         self._owner_scenario = self._status.scenario_id
         self._status.modified()
@@ -218,6 +220,8 @@ class SQLSubModel(PamhyrID):
         """
         if self._status is None:
             return
+        if self._status.is_loading():
+            return
 
         self._owner_scenario = self._status.scenario_id
         self._status.modified()
@@ -297,6 +301,15 @@ class SQLSubModel(PamhyrID):
         """
         raise NotImplementedMethodeError(cls, cls._db_update)
 
+    @classmethod
+    def is_table_exists(cls, execute, table):
+        return any(
+            execute(
+                "SELECT name FROM sqlite_master " +
+                f"WHERE type='table' AND name='{table}'"
+            )
+        )
+
     @classmethod
     def _db_update_to_0_2_0_set_node_pid(cls, execute, table, nodes):
         els = execute(
@@ -311,6 +324,14 @@ class SQLSubModel(PamhyrID):
             if node_id == -1:
                 continue
 
+            if node_id not in nodes:
+                # ⚠️ cas important : probablement déjà migré
+                logger.warning(
+                    f"node_id {node_id} not in nodes " +
+                    "→ probably already migrated"
+                )
+                continue
+
             execute(
                 f"UPDATE {table} " +
                 f"SET node = {nodes[node_id]} " +

src/Model/Tools/PamhyrDict.py

@@ -1,5 +1,5 @@
 # PamhyrDict.py -- Pamhyr abstract dict for model classes
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -97,6 +97,9 @@ class PamhyrModelDict(SQLSubModel):
             Nothing
 
         """
+        if predicate(self, data):
+            modifier(self, data)
+
         for key in self._dict:
             self._dict[key]\
                 ._data_traversal(predicate, modifier, data)

src/Model/Tools/PamhyrList.py

@@ -1,5 +1,5 @@
 # PamhyrList.py -- Pamhyr Abstract List object for the Model
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -100,6 +100,9 @@ class PamhyrModelList(SQLSubModel):
             Nothing
 
         """
+        if predicate(self, data):
+            modifier(self, data)
+
         for el in self._lst:
             el._data_traversal(predicate, modifier, data)
 

src/Model/Tools/PamhyrListExt.py

@@ -1,5 +1,5 @@
 # PamhyrList.py -- Pamhyr Abstract List object for the Model
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -107,6 +107,9 @@ class PamhyrModelList(SQLSubModel):
         Returns:
             Nothing
         """
+        if predicate(self, data):
+            modifier(self, data)
+
         for el in self._lst:
             el._data_traversal(predicate, modifier, data)
 
@@ -168,7 +171,7 @@ class PamhyrModelList(SQLSubModel):
                 lambda x: x[1],
                 filter(
                     lambda x: x[0] in indexes,
-                    enumerate(self._lst)
+                    enumerate(self.lst)
                 )
             )
         )

src/Model/__init__.py

@@ -1,5 +1,5 @@
 # __init__.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Model/test_Model.py

@@ -1,5 +1,5 @@
 # test_Model.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/SQL.py

@@ -1,5 +1,5 @@
 # SQL.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/AScript.py

@@ -1,5 +1,5 @@
 # AScript.py -- Pamhyr abstract script class
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/Hello.py

@@ -1,5 +1,5 @@
 # Hello.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/ListSolver.py

@@ -1,5 +1,5 @@
 # ListSolver.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/MageMesh.py

@@ -1,5 +1,5 @@
 # MageMesh.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/P3DST.py

@@ -1,5 +1,5 @@
 # P3DST.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/Run.py

@@ -1,5 +1,5 @@
 # Run.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Scripts/mage_to_mascaret.py

@@ -1,3 +1,20 @@
+# mage_to_mascaret.py -- Pamhyr
+# Copyright (C) 2026  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
 #!/bin/env python3
 
 import sys
@@ -336,6 +353,3 @@ if __name__ == "__main__":
     print( 'Number of arguments:', len(sys.argv), 'arguments.')
     print( 'Argument List:', str(sys.argv))
     mage_to_mascaret(sys.argv[1])
-
-
-

src/Scripts/mascaret_to_mage.py

@@ -1,3 +1,20 @@
+# mascaret_to_mage.py -- Pamhyr
+# Copyright (C) 2026  INRAE
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
 #!/bin/env python3
 
 import sys

src/Solver/ASolver.py

@@ -1,5 +1,5 @@
 # ASolver.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Solver/AdisTS.py

@@ -1,5 +1,5 @@
 # AdisTS.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -164,13 +164,194 @@ class AdisTS(CommandLineSolver):
         return lst
 
     def input_param(self):
-        name = self._study.name
+        name = self._study.name.replace(" ", "_")
         return f"{name}.REP"
 
     def log_file(self):
-        name = self._study.name
+        name = self._study.name.replace(" ", "_")
         return f"{name}.TRA"
 
+    def _export_ST(self, study, repertory, qlog, name="0"):
+        files = []
+
+        if qlog is not None:
+            qlog.put("Export ST file")
+
+        os.makedirs(os.path.join(repertory, "net"), exist_ok=True)
+
+        # Write header
+        edges = study.river.enable_edges()
+        for edge in edges:
+            name = f"Reach_{edge.id + 1:>3}".replace(" ", "0")
+
+            with adists_file_open(
+                    os.path.join(repertory, "net", f"{name}.ST"),
+                    "w+"
+            ) as f:
+                files.append(str(os.path.join("net", f"{name}.ST")))
+
+                cnt_num = 1
+                for profile in edge.reach.profiles:
+                    self._export_ST_profile_header(
+                        f, files, profile, cnt_num
+                    )
+                    cnt_num += 1
+
+                    # Points
+                    for point in profile.points:
+                        self._export_ST_point_line(
+                            f, files, point
+                        )
+
+                    # Profile last line
+                    f.write(f"     999.9990     999.9990     999.9990\n")
+
+    def _export_ST_profile_header(self, wfile, files,
+                                  profile, cnt):
+        num = f"{cnt:>6}"
+        c1 = f"{profile.code1:>6}"
+        c2 = f"{profile.code2:>6}"
+        t = f"{len(profile.points):>6}"
+        rk = f"{profile.rk:>12f}"[0:12]
+        pname = profile.name
+        if profile.name == "":
+            # Generate name from profile id prefixed with
+            # 'p' (and replace space char with '0' char)
+            pname = f"p{profile.id:>3}".replace(" ", "0")
+            name = f"{pname:<19}"
+
+        # Generate sediment additional data if available
+        sediment = ""
+        if profile.sl is not None:
+            if not any(filter(lambda f: ".GRA" in f, files)):
+                files.append(self._gra_file)
+
+            # Number of layers
+            nl = len(profile.sl)
+            sediment = f" {nl:>3}"
+
+            # Layers data
+            for layer in profile.sl.layers:
+                sediment += (
+                    f" {layer.height:>10} {layer.d50:>10} " +
+                    f"{layer.sigma:>10} " +
+                    f"{layer.critical_constraint:>10}"
+                )
+
+        # Profile header line
+        wfile.write(f"{num}{c1}{c2}{t} {rk} {pname} {sediment}\n")
+
+    def _export_ST_point_line(self, wfile, files, point):
+        x = f"{point.x:<12.4f}"[0:12]
+        y = f"{point.y:<12.4f}"[0:12]
+        z = f"{point.z:<12.4f}"[0:12]
+        n = f"{point.name:<3}"
+
+        # Generate sediment additional data if available
+        sediment = ""
+        prev = point.z
+        if point.sl is not None:
+            # Number of layers
+            nl = len(point.sl)
+            sediment = f"{nl:>3}"
+
+            # Layers data
+            for layer in point.sl.layers:
+                prev = round(prev - layer.height, 5)
+                sediment += (
+                    f" {prev:>10} {layer.d50:>10} " +
+                    f"{layer.sigma:>10} " +
+                    f"{layer.critical_constraint:>10}"
+                )
+
+        # Point line
+        wfile.write(f"{x} {y} {z} {n} {sediment}\n")
+
+    def _export_NET(self, study, repertory, qlog=None, name="0"):
+
+        if qlog is not None:
+            qlog.put("Export NET file")
+
+        with adists_file_open(
+                os.path.join(repertory, f"{name}.NET"), "w+") as f:
+            edges = study.river.enable_edges()
+
+            for e in edges:
+                name = f"Reach_{e.id + 1:>3}".replace(" ", "0")
+                id = name
+
+                n1 = f"{self.get_node_name(e.node1):3}".replace(" ", "x")
+                n2 = f"{self.get_node_name(e.node2):3}".replace(" ", "x")
+                file = os.path.join("net", name + ".ST")
+
+                f.write(f"{id} {n1} {n2} {file}\n")
+
+    def _export_fake_INI(self, study, repertory, qlog=None, name="0"):
+        if qlog is not None:
+            qlog.put("Export fake INI file")
+
+        with adists_file_open(
+                os.path.join(
+                    repertory, "Mage_fin.ini"
+                ), "w+"
+        ) as f:
+            edges = study.river.enable_edges()
+            for i, edge in enumerate(edges):
+                lst = list(filter(
+                    lambda f: f.is_full_defined(),
+                    edge.frictions.frictions
+                ))
+                rk_min = 9999999.9
+                rk_max = -9999999.9
+                coeff_min = -1.0
+                coeff_max = -1.0
+                for s in lst:  # TODO optimise ?
+                    if s.begin_rk > rk_max:
+                        rk_max = s.begin_rk
+                        coeff_max = s.begin_strickler
+                    if s.begin_rk < rk_min:
+                        rk_min = s.begin_rk
+                        coeff_min = s.begin_strickler
+                    if s.end_rk > rk_max:
+                        rk_max = s.end_rk
+                        coeff_max = s.end_strickler
+                    if s.end_rk < rk_min:
+                        rk_min = s.end_rk
+                        coeff_min = s.end_strickler
+
+                print("min max", rk_min, rk_max)
+
+                def get_stricklers_from_rk(rk, lst):
+                    print("rk", rk)
+
+                    coeff = None
+                    if rk > rk_max:
+                        coeff = coeff_max
+                    elif rk < rk_min:
+                        coeff = coeff_min
+                    else:
+                        for s in lst:
+                            if (rk >= s.begin_rk and rk <= s.end_rk or
+                                    rk <= s.begin_rk and rk >= s.end_rk):
+                                coeff = s.begin_strickler  # TODO: inerpolate
+                                break
+
+                    # TODO interpolation if rk is not in frictons
+
+                    if coeff is None:
+                        logger.error(
+                            "Study frictions are not fully defined"
+                        )
+                        return None
+
+                    return coeff.minor, coeff.medium
+
+                for j, profile in enumerate(edge.reach.profiles):
+                    coef_min, coef_moy = get_stricklers_from_rk(profile.rk,
+                                                                lst)
+                    f.write(
+                        f" {i+1:3}{j+1:4}{' '*116}{coef_min:9}{coef_moy:9}\n")
+
     def _export_REP_additional_lines(self, study, rep_file):
         lines = filter(
             lambda line: line.is_enabled(),
@@ -192,7 +373,7 @@ class AdisTS(CommandLineSolver):
                 ), "w+"
         ) as f:
             path = os.path.join("..", mage_rep, name)
-            f.write(f"NET {path}.NET\n")
+            f.write(f"NET {name}.NET\n")
             f.write(f"REP {path}.REP\n")
 
             for file in files:
@@ -201,13 +382,25 @@ class AdisTS(CommandLineSolver):
 
             self._export_REP_additional_lines(study, f)
 
-        path_mage_net = os.path.join(os.path.abspath(
-                os.path.join(repertory, os.pardir)
-        ), os.path.join(mage_rep, "net"))
-        path_adists_net = os.path.join(repertory, "net")
+        self._export_ST(study, repertory, qlog, name=name)
+        self._export_NET(study, repertory, qlog, name=name)
 
-        if os.path.exists(path_mage_net):
-            shutil.copytree(path_mage_net, path_adists_net, dirs_exist_ok=True)
+        # fake mage_fin.ini:
+
+        path_mage = os.path.join(os.path.abspath(
+                os.path.join(repertory, os.pardir)), mage_rep)
+        self._export_fake_INI(study, path_mage,
+                              qlog, name=name)
+
+        # path_mage_net = os.path.join(os.path.abspath(
+        #         os.path.join(repertory, os.pardir)
+        # ), os.path.join(mage_rep, "net"))
+        # path_adists_net = os.path.join(repertory, "net")
+
+        # if os.path.exists(path_mage_net):
+        #     shutil.copytree(path_mage_net,
+        #                     path_adists_net,
+        #                     dirs_exist_ok=True)
 
     @timer
     def export(self, study, repertory, qlog=None):
@@ -262,47 +455,6 @@ class AdisTS(CommandLineSolver):
     def get_reach_name(self, reach):
         return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
 
-    def get_node_name(self, node):
-        """Generate a 3 char name for node
-
-        Args:
-            node: The node
-
-        Returns:
-            A 3 char name string
-        """
-        n = node.pamhyr_id
-
-        # print("node name id: ", n)
-
-        # if n in self._nodes_names:
-        #     return self._nodes_names[n]
-
-        name = ""
-
-        checked_new = False
-        while not checked_new:
-            self._nodes_cnt += 1
-            nc = self._nodes_cnt
-
-            name = "".join(
-                map(
-                    lambda i: self._alph[i % self._l_alph],
-                    [
-                        int(nc / (self._l_alph * self._l_alph)),
-                        int(nc / self._l_alph),
-                        nc
-                    ]
-                )
-            )
-
-            checked_new = name not in self._nodes_views
-
-        self._nodes_views.add(name)
-        self._nodes_names[n] = name
-
-        return name
-
 #################################
 # Adis-TS in weak coupling mode #
 #################################
@@ -749,29 +901,29 @@ class AdisTSwc(AdisTS):
                                                         ) - k)
                 data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
 
-                # fifth line (useless)
+            # fifth line (useless)
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+            zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+            # sixth line
+            zf = np.zeros(ismax, dtype=np.float32)
+            z = np.zeros(ismax * 3, dtype=np.float32)
+            for k in range(0, ismax, kbl):
                 data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
+                z[3 * k:3 * min(k + kbl, ismax)] = \
+                    np.fromfile(f,
+                                dtype=np.float32,
+                                count=3 * (min(k + kbl, ismax) - k)
+                                )
+                # z[i*3+1] and z[i*3+2] are useless
                 data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
-                # sixth line
-                zf = np.zeros(ismax, dtype=np.float32)
-                z = np.zeros(ismax * 3, dtype=np.float32)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                    z[3 * k:3 * min(k + kbl, ismax)] = \
-                        np.fromfile(f,
-                                    dtype=np.float32,
-                                    count=3 * (min(k + kbl, ismax) - k)
-                                    )
-                    # z[i*3+1] and z[i*3+2] are useless
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
-                zf = [z[i * 3] for i in range(ismax)]
-                # seventh line (useless)
-                for k in range(0, ismax, kbl):
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
-                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
-                # end header
+            zf = [z[i * 3] for i in range(ismax)]
+            # seventh line (useless)
+            for k in range(0, ismax, kbl):
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                zero = np.fromfile(f, dtype=np.int32, count=ismax)
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+            # end header
 
         def ip_to_r(i):
             return iprofiles[
@@ -793,6 +945,7 @@ class AdisTSwc(AdisTS):
         for file_bin in path_files:
             key_pol = os.path.basename(file_bin)[0:-4]
             data_tmp[key_pol] = {}
+            logger.info(f"read_bin: Start reading '{file_bin}' ...")
             with open(file_bin, 'rb') as f:
                 # header
                 # first line
@@ -844,7 +997,9 @@ class AdisTSwc(AdisTS):
                 # seventh line (useless)
                 for k in range(0, ismax, kbl):
                     data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
-                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
+                    zero = np.fromfile(
+                        f, dtype=np.int32, count=min(k + kbl, ismax) - k
+                    )
                     data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
                 # end header
                 # data
@@ -875,7 +1030,6 @@ class AdisTSwc(AdisTS):
         for r, reach in enumerate(reachs):
             for i in range(is1[r]-1, is2[r]):
                 p_i = ip_to_ri(reach, i)
-
                 for t_data in timestamps_keys:
                     pol_view = []
                     for pol in pollutants_keys:

src/Solver/CommandLine.py

@@ -1,5 +1,5 @@
 # CommandLine.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Solver/GenericSolver.py

@@ -1,5 +1,5 @@
 # GenericSolver.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/Solver/Mage.py

@@ -1,5 +1,5 @@
 # Mage.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
 import os
 import logging
 import numpy as np
+import time
+from functools import reduce
 
 from itertools import chain
 from tools import timer, trace, logger_exception
@@ -325,7 +327,7 @@ class Mage(CommandLineSolver):
                     v0 = d[0]
                     v1 = d[1]
 
-                    if t in ["HYD", "QSO", "LIM"]:
+                    if t in ["HYD", "LIM"]:
                         v0 /= 60  # Convert first column to minute
 
                     f.write(f"{v0:9} {v1:9} \n")
@@ -384,28 +386,28 @@ class Mage(CommandLineSolver):
         return files
 
     def _export_LC(self, study, lateral, f, qlog, name="0"):
-        if lateral.edge is None:
+        if lateral.reach is None:
             return
 
         if lateral.is_deleted():
             return
 
         edges = study.river.enable_edges()
-        if lateral.edge not in edges:
+        if lateral.reach not in edges:
             return
 
         eid, _ = next(
             filter(
-                lambda e: e[1] == lateral.edge,
+                lambda e: e[1] == lateral.reach,
                 enumerate(edges)
             )
         )
 
         name = f"{eid+1:>3}"
-        # name = f"Reach_{lateral.edge.id + 1:>3}".replace(" ", "0")
-        f.write(f"* {lateral.edge.name} ({name}) {lateral.lctype}\n")
+        # name = f"Reach_{lateral.reach.id + 1:>3}".replace(" ", "0")
+        f.write(f"* {lateral.reach.name} ({name}) {lateral.lctype}\n")
         f.write(
-            f"${name}    " +
+            f"${name}     " +
             f"{lateral.begin_rk:>10.4f} {lateral.end_rk:>10.4f}\n"
         )
         header = lateral.header
@@ -544,6 +546,15 @@ class Mage(CommandLineSolver):
 
         return files
 
+    def skip_hs(self, hs):
+        return (
+            hs.input_reach is None
+            or not hs.input_reach.is_enable()
+            or not hs.enabled
+            or hs.input_section is None
+            or hs.is_deleted()
+        )
+
     def _export_SIN(self, study, repertory, qlog, name="0"):
         files = []
 
@@ -569,19 +580,7 @@ class Mage(CommandLineSolver):
             files.append(f"{name}.SIN")
 
             for hs in hydraulic_structures:
-                if hs.input_reach is None:
-                    continue
-
-                if not hs.input_reach.is_enable():
-                    continue
-
-                if not hs.enabled:
-                    continue
-
-                if hs.input_section is None:
-                    continue
-
-                if hs.is_deleted():
+                if self.skip_hs(hs):
                     continue
 
                 f.write(
@@ -988,7 +987,7 @@ class Mage8(Mage):
 
                 # Data
                 for d in bound.data:
-                    f.write(f"{d[0]:10.3f}{d[1]:10.3f}\n")
+                    f.write(f"{d[0]/60:10.3f}{d[1]:10.3f}\n")
 
         return files
 
@@ -1028,6 +1027,75 @@ class Mage8(Mage):
             logger_exception(e)
             return False
 
+    def export_ensemble_variation(self, study, repertory,
+                                  qlog=None, name="0",
+                                  samples=None):
+        self._study = study
+        name = study.name.replace(" ", "_")
+
+        var_samples = self._export_ensemble_RUG(
+            study, repertory,
+            qlog, name=name,
+            samples=samples,
+        )
+
+        return var_samples
+
+    def _export_ensemble_RUG(self, study, repertory,
+                             qlog, name="0",
+                             samples={}):
+        files = []
+        var_samples = []
+
+        for ens in samples:
+            if ens.target_data is None:
+                continue
+
+            x = next(samples[ens])
+            var_samples.append(x)
+
+            qlog.put(f"*** Variation " +
+                     f"'{ens.target_data}' - {ens.data_type} x {x}")
+
+            if ens.data_type == "strickler_minor":
+                ens.target_data.minor = x
+            elif ens.data_type == "strickler_medium":
+                ens.target_data.medium = x
+
+        if qlog is not None:
+            qlog.put("Export variation of RUG file")
+
+        # Write header
+        with mage_file_open(os.path.join(repertory, f"{name}.RUG"), "w+") as f:
+            files.append(f"{name}.RUG")
+
+            edges = study.river.enable_edges()
+
+            id = 1
+            for edge in edges:
+                frictions = edge.frictions
+
+                for friction in frictions.frictions:
+                    if friction.begin_strickler is None:
+                        continue
+
+                    if friction.is_deleted():
+                        continue
+
+                    num = f"{id:>3}"
+                    brk = f"{friction.begin_rk:>10.3f}"
+                    erk = f"{friction.end_rk:>10.3f}"
+
+                    strickler = friction.begin_strickler
+                    coef_1 = f"{strickler.minor:>10.3f}"
+                    coef_2 = f"{strickler.medium:>10.3f}"
+
+                    f.write(f"K{num}      {brk}{erk}{coef_1}{coef_2}\n")
+
+                id += 1
+
+        return var_samples
+
     ###########
     # RESULTS #
     ###########
@@ -1035,6 +1103,7 @@ class Mage8(Mage):
     @timer
     def read_bin(self, study, fname, results, qlog=None, name="0"):
         logger.info(f"read_bin: Start reading '{fname}' ...")
+        start = time.time()
 
         with mage_file_open(fname, "r") as f:
             def newline(): return np.fromfile(f, dtype=np.int32, count=1)
@@ -1083,7 +1152,7 @@ class Mage8(Mage):
             newline()
 
             reachs = []
-            iprofiles = {}
+            iprofiles = []
             profile_len = []
             reach_offset = {}
 
@@ -1091,22 +1160,25 @@ class Mage8(Mage):
 
             for i in range(nb_reach):
                 # Add results reach to reach list
-                r = results.river.add(i)
+                r = results.river.reach(i)
                 reachs.append(r)
 
                 # ID of first and last reach profiles
                 i1 = data[2*i] - 1
                 i2 = data[2*i+1] - 1
 
+                # Keep profiles index of all river
+                r.set_global_index(range(i1, i2 + 1))
+
                 # Add profile id correspondance to reach
-                key = (i1, i2)
-                iprofiles[key] = r
+                for key in range(i1, i2 + 1):
+                    iprofiles.append(i)
 
                 # Profile ID offset
                 reach_offset[r] = i1
-                profile_len.append(i2-i1+1)
+                profile_len.append(i2 - i1 + 1)
 
-            logger.debug(f"read_bin: iprofiles = {iprofiles}")
+            logger.debug(f"read_bin: iprofiles = {len(iprofiles)}")
 
             endline()
 
@@ -1117,22 +1189,13 @@ class Mage8(Mage):
 
             # Z and Y (4th line)
             newline()
-            _ = read_float(3*nb_profile)
+            tmp = read_float(3*nb_profile)
+            zfd = tmp[::3]
             endline()
 
             # Data
             newline()
 
-            def ip_to_r(i): return iprofiles[
-                next(
-                    filter(
-                        lambda k: k[0] <= i <= k[1],
-                        iprofiles
-                    )
-                )
-            ]
-            def ip_to_ri(r, i): return i - reach_offset[r]
-
             # check results and geometry consistency
             for i, r in enumerate(reachs):
                 lp = len(r.profiles)
@@ -1143,6 +1206,8 @@ class Mage8(Mage):
                     return
 
             ts = set()
+            tmp_table = {}
+
             end = False
             while not end:
                 n = read_int(1)[0]
@@ -1151,18 +1216,21 @@ class Mage8(Mage):
                     f, dtype=np.byte, count=1)).decode()
                 data = read_float(n)
 
-                # logger.debug(f"read_bin: timestamp = {timestamp} sec")
+                if key not in tmp_table:
+                    tmp_table[key] = []
+
+                tmp_table[key].append(data)
                 ts.add(timestamp)
 
                 if key in ["Z", "Q"]:
                     for i, d in enumerate(data):
                         # Get reach corresponding to profile ID
-                        reach = ip_to_r(i)
+                        reach = reachs[iprofiles[i]]
                         # Get profile id in reach
-                        ri = ip_to_ri(reach, i)
+                        ri = i - reach_offset[reach]
 
                         # Set data for profile RI
-                        reach.set(ri, timestamp, key, d)
+                        # reach.set(ri, timestamp, key, d)
                         if key == "Z":
                             profile = reach.profile(ri)
                             limits = profile.geometry.get_water_limits(d)
@@ -1175,26 +1243,53 @@ class Mage8(Mage):
                 endline()
                 end = newline().size <= 0
 
+            ts_index = {}
+            for i, t in enumerate(sorted(ts)):
+                ts_index[t] = i
+            results.set_timestamp_index(ts_index)
+
+            table = {}
+            for k in tmp_table:
+                table[k] = np.array(tmp_table[k])
+
             results.set("timestamps", ts)
             ts_list = sorted(ts)
             logger.info(f"compute tab...")
             for r in reachs:
                 for p in r.profiles:
-                    if not p.geometry.tab_up_to_date:
-                        p.geometry.compute_tabulation()
+                    p.geometry.compute_tabulation()
 
-            logger.info(f"compute velocily...")
+            logger.info(f"compute velocity...")
 
-            for r in reachs:
-                for t in ts_list:
-                    for i, p in enumerate(r.profiles):
+            velocity_arr = np.zeros((len(ts), len(iprofiles)))
+            for ti, t in enumerate(ts_list):
+                j = 0
+                for r in reachs:
+                    for pi, p in enumerate(r.profiles):
                         v = p.geometry.speed(
-                                p.get_ts_key(t, "Q"),
-                                p.get_ts_key(t, "Z")
+                            table["Q"][ti, p.global_index],
+                            table["Z"][ti, p.global_index],
                         )
-                        r.set(i, t, "V", v)
+                        # r.set(pi, t, "V", v)
+                        velocity_arr[ti, j] = v
+                        j += 1
+
+            table["V"] = velocity_arr
+
+            for legend in table:
+                table[legend] = results.new_table_data(
+                    legend, table[legend]
+                )
+
+            results.set("table", table)
+
             logger.info(f"read_bin: ... end with {len(ts)} timestamp read")
 
+        # results.bufferize("Z")
+        # results.bufferize("Q")
+        # results.bufferize("V")
+        logger.info(f"reading time: '{time.time() - start}'")
+
     @timer
     def read_gra(self, study, repertory, results, qlog=None, name="0"):
         if not study.river.has_sediment():
@@ -1202,6 +1297,7 @@ class Mage8(Mage):
 
         fname = os.path.join(repertory, f"{name}.GRA")
         logger.info(f"read_gra: Start reading '{fname}' ...")
+        start = time.time()
 
         with mage_file_open(fname, "r") as f:
             def newline(): return np.fromfile(f, dtype=np.int32, count=1)
@@ -1261,8 +1357,8 @@ class Mage8(Mage):
                 reachs.append(r)
 
                 # ID of first and last reach profiles
-                i1 = data[2*i] - 1
-                i2 = data[2*i+1] - 1
+                i1 = data[2 * i] - 1
+                i2 = data[2 * i + 1] - 1
 
                 # Add profile id correspondance to reach
                 key = (i1, i2)
@@ -1316,6 +1412,7 @@ class Mage8(Mage):
                     newline()
                     npts = read_int(n)
                     endline()
+
                 sum_npts = sum(npts)
                 logger.debug(f"read_gra: Number of points: {sum_npts}")
 
@@ -1332,7 +1429,7 @@ class Mage8(Mage):
 
                 i_pts = 0
                 i_data = 0
-                # Loop on cross section
+                # Loop on cross sections
                 for i in range(n):
                     sec_sl = []
                     reach = ip_to_r(i)
@@ -1361,8 +1458,50 @@ class Mage8(Mage):
                 )
                 end = newline().size <= 0
 
+            ts_list = sorted(ts)
+
+            logger.info(f"compute river bed elevation...")
+
+            zfd_lst = []
+
+            for r in reachs:
+                z_min = r.geometry.get_z_min()
+                sls = map(
+                    lambda p: p.get_ts_key(ts_list[0], "sl")[0],
+                    r.profiles
+                )
+                z_br = list(map(
+                    lambda z, sl: reduce(
+                        lambda z, h: z - h[0],
+                        sl, z
+                    ),
+                    z_min,          # Original geometry
+                    sls             # Original sediment layers
+                ))
+                for its, t in enumerate(ts_list):
+                    sls = map(
+                        lambda p: p.get_ts_key(t, "sl")[0],
+                        r.profiles
+                    )
+                    zfd = list(map(
+                        lambda z, sl: reduce(
+                            lambda z, h: z + h[0],
+                            sl, z
+                        ),
+                        z_br,       # bedrock
+                        sls         # Original sediment layers
+                    ))
+
+                    zfd_lst.append(np.array(zfd))
+
+            table = results.get("table")
+            table["zfd"] = results.new_table_data(
+                "zfd", np.array(zfd_lst)
+            )
+
             results.set("sediment_timestamps", ts)
             logger.info(f"read_gra: ... end with {len(ts)} timestamp read")
+        logger.debug(f"reading time: '{time.time() - start}'")
 
     @timer
     def results(self, study, repertory,
@@ -1381,6 +1520,172 @@ class Mage8(Mage):
 
         return results
 
+    @timer
+    def read_ensemble_bin(self, study, fname, tables, run_number, qlog=None):
+        logger.info(f"read_ensemble_bin: Start reading '{fname}' ...")
+        start = time.time()
+
+        with mage_file_open(fname, "r") as f:
+            def newline(): return np.fromfile(f, dtype=np.int32, count=1)
+            def endline(): return np.fromfile(f, dtype=np.int32, count=1)
+
+            def read_int(size): return np.fromfile(
+                f, dtype=np.int32, count=size)
+
+            def read_float(size): return np.fromfile(
+                f, dtype=np.float32, count=size)
+
+            def read_float64(size): return np.fromfile(
+                f, dtype=np.float64, count=size)
+
+            # Meta data (1st line)
+            newline()
+            data = read_int(3)
+
+            nb_reach = data[0]
+            nb_profile = data[1]
+            mage_version = data[2]
+
+            if mage_version <= 80:
+                msg = (
+                    "Read BIN files: " +
+                    f"Possible incompatible mage version '{mage_version}', " +
+                    "please check your solver configuration..."
+                )
+                logger.warning(msg)
+
+                if qlog is not None:
+                    qlog.put("[WARNING] " + msg)
+
+            endline()
+
+            # Reach information (2nd line)
+            newline()
+            _ = read_int(2*nb_reach)
+            endline()
+
+            # X (3rd line)
+            newline()
+            _ = read_float(nb_profile)
+            endline()
+
+            # Z and Y (4th line)
+            newline()
+            _ = read_float(3*nb_profile)
+            endline()
+
+            # Data
+            newline()
+
+            ts = set()
+
+            tmp_table = {}
+            end = False
+            while not end:
+                n = read_int(1)[0]
+                timestamp = read_float64(1)[0]
+                key = bytearray(
+                    np.fromfile(
+                        f, dtype=np.byte, count=1
+                    )
+                ).decode()
+                data = read_float(n)
+
+                if key not in tmp_table:
+                    tmp_table[key] = []
+
+                tmp_table[key].append(data)
+
+                ts.add(timestamp)
+
+                endline()
+                end = newline().size <= 0
+
+            table = {}
+            for k in tmp_table:
+                table[k] = np.array(tmp_table[k])
+
+            self.read_ensemble_bin_agregate_data(
+                table, tables, run_number
+            )
+
+            tables["timestamps"] = ts
+
+        logger.info(f"reading time: '{time.time() - start}'")
+
+    def read_ensemble_bin_agregate_data(self, tables, res, run_number):
+        z = tables["Z"]
+        q = tables["Q"]
+
+        if "z_mean" not in res:
+            res["z_mean"] = z
+            res["q_mean"] = q
+
+            res["z_min"] = z
+            res["z_max"] = z
+
+            res["q_min"] = q
+            res["q_max"] = q
+
+            res["res_z_min"] = []
+            res["res_z_mean"] = []
+            res["res_z_max"] = []
+
+            res["res_q_min"] = []
+            res["res_q_mean"] = []
+            res["res_q_max"] = []
+
+            res["traces"] = []
+        else:
+            # Get mean results for Z and Q
+            res["z_mean"] = (res["z_mean"] + z) / 2
+            res["q_mean"] = (res["q_mean"] + q) / 2
+
+            # Z and Q min max values
+            res["z_min"] = np.minimum(z, res["z_min"])
+            res["z_max"] = np.maximum(z, res["z_max"])
+            res["q_min"] = np.minimum(q, res["q_min"])
+            res["q_max"] = np.maximum(q, res["q_max"])
+
+        # Keep results min, mean and max
+        # res["res_z_min"].append((run_number, np.min(z, axis=0)))
+        # res["res_z_mean"].append((run_number, np.mean(z, axis=0)))
+        # res["res_z_max"].append((run_number, np.max(z, axis=0)))
+
+        # res["res_q_min"].append((run_number, np.min(q, axis=0)))
+        # res["res_q_mean"].append((run_number, np.mean(q, axis=0)))
+        # res["res_q_max"].append((run_number, np.max(q, axis=0)))
+
+    @timer
+    def results_ensemble(self, study, repertory,
+                         tables, run_number,
+                         qlog=None, name=None):
+        self._study = study
+        if name is None:
+            name = study.name.replace(" ", "_")
+
+        fname = os.path.join(repertory, f"{name}.BIN".replace(" ", "_"))
+        if not os.path.isfile(fname):
+            logger.info(f"Result file {name}.BIN does not exist")
+            return None
+        try:
+            self.read_ensemble_bin(study, fname, tables, run_number, qlog)
+        except Exception as e:
+            logger.error(f"Failed to read results")
+            logger_exception(e)
+            return None
+
+        return True
+
+    def get_ensemble_empty_results(self, study, repertory, name=None):
+        return Results(
+            study=study,
+            solver=self,
+            repertory=repertory,
+            name=name,
+            is_ensemble=True,
+        )
+
 
 class MageFake7(Mage8):
     _type = "mage_fake7"