Model: micropatch to ensure all data is included in the table model after the merge

doc/dev/documentation.org

@@ -1069,6 +1069,12 @@ gitlab-ci.
   sudo python3 -m pip install pyinstaller
 #+end_src
 
+In addition, you must install Glab[fn:glab] to allow the runner to
+proceed with the publication.
+
+[fn:glab] The Gitlab cli releases page:
+https://gitlab.com/gitlab-org/cli/-/releases
+
 *** Windows (Wine) {{{windows}}}
 
 The ci-runner environment for Wine need at least wine version 8, let

full-requirements.txt

@@ -4,7 +4,7 @@ PyQt5-sip==12.18.0
 PyQtWebEngine==5.15.6
 QScintilla>=2.14.1
 pyqtgraph>=0.12.1
-matplotlib==3.8.3
+matplotlib==3.10.8
 numpy>=1.24.2
 colorama>=0.4.3
 pyinstaller>=5.11.0
@@ -14,3 +14,4 @@ platformdirs>=4.2.0
 pyshp>=2.3.1
 rasterio==1.3.11
 #fortranformat==2.0.3
+psutil>=7.2.2

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

@@ -4,7 +4,7 @@ PyQt5-sip==12.18.0
 #PyQtWebEngine==5.15.6
 QScintilla>=2.14.1
 pyqtgraph>=0.12.1
-matplotlib==3.8.3
+matplotlib==3.10.8
 numpy>=1.24.2
 colorama>=0.4.3
 pyinstaller>=5.11.0
@@ -14,4 +14,4 @@ platformdirs>=4.2.0
 pyshp>=2.3.1
 rasterio==1.3.11
 #fortranformat==2.0.3
-
+psutil>=7.2.2

src/Meshing/Internal.py

@@ -137,10 +137,11 @@ class InternalMeshing(AMeshingTool):
                     p.points[k].z = pt1[k].z + \
                         dj*(pt2[k].z -
                             pt1[k].z)
-                    p.rk = profiles[i].rk + \
-                        dj*(profiles[i+1].rk -
-                            profiles[i].rk)
+                    p.rk = round(profiles[i].rk +
+                                 dj*(profiles[i+1].rk -
+                                 profiles[i].rk), 2)
                     p.name = f'interpol{p.rk}'
+                p.interpolated = True
                 new_profiles2.append(p)
             new_profiles.append(new_profiles2)
 
@@ -171,8 +172,8 @@ class InternalMeshing(AMeshingTool):
 
         ltot1 = 0.0
         ltot2 = 0.0
-        alpha = []
-        beta = []
+        alpha = [0.0]
+        beta = [0.0]
         # remove names
         sect2.points[start2].name = ''
         sect2.points[end2].name = ''
@@ -195,67 +196,38 @@ class InternalMeshing(AMeshingTool):
         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)
-            beta.append(0.0)  # beta[-1]
-            # loop on the points to insert
-            for k in range(len1-len2):
-                trouve = False
-                for j0 in range(len2):
-                    if trouve:
-                        break
-                    undeplus = True
-                    for j1 in range(j0, len2):
-                        if undeplus:
-                            if beta[j1] <= alpha[j1]:
-                                undeplus = False
-                                break
-                    if undeplus:
-                        if j0 == len2:
-                            trouve = True
-                        else:
-                            j1 = j0+1
-                            if beta[j0]-alpha[j0] > alpha[j1]-beta[j0]:
-                                trouve = True
+            match = self._match_indices(alpha, beta)
 
-                    if trouve:
-                        len2 += 1
-                        for i in reversed(range(j0, len2)):
-                            beta[i+1] = beta[i]
-                        if (beta[j0] == beta[j0-1]):
-                            # rien
-                            pass
-                        else:
-                            ratio = (alpha[j0] - beta[j0-1]) \
-                                    / (beta[j0] - beta[j0-1])
-                            if ratio < 0.0:
-                                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)
-                                sect2.point(start2+j0-1).name = ''
-                                beta[j0] = beta[j0-1]
-                            else:
-                                p = sect2.point(start2+j0).copy()
-                                sect2.insert_point(start2+j0, p)
-                                sect2.point(start2+j0+1).name = ''
-                                sect2.point(start2+j0+1).x = \
-                                    (1.0-ratio) * sect2.point(start2+j0).x + \
-                                    ratio * sect2.point(start2+j0+2).x
-                                sect2.point(start2+j0+1).y = \
-                                    (1.0-ratio) * sect2.point(start2+j0).y + \
-                                    ratio * sect2.point(start2+j0+2).y
-                                sect2.point(start2+j0+1).z = \
-                                    (1.0-ratio) * sect2.point(start2+j0).z + \
-                                    ratio * sect2.point(start2+j0+2).z
-                                beta[j0] = (1.-ratio)*beta[j0-1] \
-                                    + ratio*beta[j0+1]
+            insertions_per_segment = []  # liste de (index, [points])
+            for j in range(len2):
+                i_start = match[j]
+                i_end = match[j + 1]
+                q_start = sect2.point(start2 + j)
+                q_end = sect2.point(start2 + j + 1)
+
+                new_points = []
+                if i_end - i_start > 1:
+                    u_start, u_end = alpha[i_start], alpha[i_end]
+                    span = u_end - u_start
+                    for k in range(i_start + 1, i_end):
+                        ratio = (alpha[k] - u_start) / span  # dans [0,1]
+                        p = q_start.copy()
+                        p.name = ''
+                        p.x = (1.0-ratio) * q_start.x + ratio * q_end.x
+                        p.y = (1.0-ratio) * q_start.y + ratio * q_end.y
+                        p.z = (1.0-ratio) * q_start.z + ratio * q_end.z
+                        new_points.append(p)
+
+                # à insérer après l'indice j
+                insertions_per_segment.append((j, new_points))
+
+            # Insertion en ordre décroissant de j
+            # pour ne pas perturber les indices
+            for j, new_points in reversed(insertions_per_segment):
+                for offset, p in enumerate(new_points):
+                    sect2.insert_point(start2 + j + 1 + offset, p)
+                    len2 += 1
 
-        if len1 > len2:
-            for i in range(len1 - len2):
-                p = sect2.point(start2+len2).copy()
-                sect2.insert_point(start2+len2, p)
-                sect2.point(start2+len2).name = ''
         if tag1 != "un":
             sect2.point(start2).name = tag1
         if tag2 != "np":
@@ -263,6 +235,71 @@ class InternalMeshing(AMeshingTool):
 
         sect2.modified()
 
+    def _match_indices(self, u_ref, v_target):
+        # appariement optimal (ordre croissant) par programmation dynamique
+        """
+        Trouve, pour chaque v_target[j], un indice i_j dans u_ref tel que
+        i_0 < i_1 < ... < i_{m-1} et
+        Sum |u_ref[i_j] - v_target[j]| soit minimal.
+
+        Retourne la liste des indices i_j (longueur m),
+        avec i_0 = 0 et i_{m-1} = n-1 imposés
+        (les extrémités se correspondent forcément).
+
+        """
+        n = len(u_ref)
+        m = len(v_target)
+
+        # Les extrémités sont fixées.
+        fixed_first, fixed_last = 0, n - 1
+
+        # DP sur les indices disponibles entre fixed_first+1 et fixed_last-1
+        # dp[j][i] = coût minimal pour apparier v_target[1..j] aux indices
+        # se terminant à l'indice i (i croissant strict), j de 1 à m-2.
+        if m == 2:
+            return [fixed_first, fixed_last]
+
+        # indices internes possibles
+        candidates = list(range(fixed_first + 1, fixed_last))
+        inner_targets = v_target[1:-1]  # cibles internes (j = 1..m-2)
+
+        INF = float("inf")
+        # dp[j] : dict indice_candidat -> (coût_min, provenance)
+        dp = [{} for _ in range(len(inner_targets))]
+
+        for j, vt in enumerate(inner_targets):
+            for idx_pos, i in enumerate(candidates):
+                cost_here = abs(u_ref[i] - vt)
+                if j == 0:
+                    # doit être > fixed_first
+                    dp[j][i] = (cost_here, fixed_first)
+                else:
+                    best = (INF, None)
+                    for i_prev in candidates[:idx_pos]:
+                        if i_prev in dp[j - 1]:
+                            c = dp[j - 1][i_prev][0] + cost_here
+                            if c < best[0]:
+                                best = (c, i_prev)
+                    if best[1] is not None:
+                        dp[j][i] = best
+
+        # Reconstruction : on part du dernier niveau, on choisit le
+        # meilleur indice tel que la suite jusqu'à fixed_last
+        # reste croissante et valide.
+        last_level = dp[-1]
+        valid = {i: c for i, c in last_level.items() if i < fixed_last}
+        if not valid:
+            raise RuntimeError("Alignement impossible avec ces données.")
+        best_i = min(valid, key=lambda i: valid[i][0])
+
+        chain = [best_i]
+        for j in range(len(inner_targets) - 1, 0, -1):
+            prev_i = dp[j][chain[-1]][1]
+            chain.append(prev_i)
+        chain.reverse()
+
+        return [fixed_first] + chain + [fixed_last]
+
     def update_rk(self, reach, begin_rk, end_rk,
                   step: float = 50,
                   limites=[-1, -1],

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -531,7 +531,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
             new_0 = self._types[0](data[0].replace(",", "."))
             new_1 = self._types[1](data[1].replace(",", "."))
 
-        return (new_0, new_1)
+        return Data(new_0, new_1, types=self._types, status=self._status)
 
     def add(self, index: int):
         value = Data(
@@ -543,7 +543,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
         return value
 
     def insert(self, index: int, value):
-        self._data.insert(index, value)
+        if value in self._data:
+            value.set_as_not_deleted()
+        else:
+            self._data.insert(index, value)
         self.modified()
 
     def delete_i(self, indexes):

src/Model/BoundaryConditionsTemperature/BoundaryConditionTemperature.py

@@ -77,7 +77,7 @@ class Data(SQLSubModel):
                 created = True
 
         if major == "0" and (int(minor) < 2 or
-                             (int(minor) == 2 and int(release) < 7)):
+                             (int(minor) == 2 and int(release) <= 7)):
             if not cls.is_table_exists(execute,
                                        "boundary_condition_data_temperature"):
                 cls._db_create(execute)
@@ -205,7 +205,7 @@ class BoundaryConditionTemperature(SQLSubModel):
         created = False
 
         if major == "0" and (int(minor) < 2 or (
-         int(minor) == 2 and int(release) < 7)):
+         int(minor) == 2 and int(release) <= 7)):
             if not cls.is_table_exists(execute,
                                        "boundary_condition_temperature"):
                 cls._db_create(execute)
@@ -419,7 +419,7 @@ class BoundaryConditionTemperature(SQLSubModel):
             new_0 = self._types[0](data[0].replace(",", "."))
             new_1 = self._types[1](data[1].replace(",", "."))
 
-        return (new_0, new_1)
+        return Data(new_0, new_1, types=self._types, status=self._status)
 
     def add(self, index: int):
         value = Data(
@@ -431,7 +431,10 @@ class BoundaryConditionTemperature(SQLSubModel):
         return value
 
     def insert(self, index: int, value):
-        self._data.insert(index, value)
+        if value in self._data:
+            value.set_as_not_deleted()
+        else:
+            self._data.insert(index, value)
         self.modified()
 
     def delete_i(self, indexes):

src/Model/D90AdisTS/D90AdisTS.py

@@ -275,3 +275,44 @@ class D90AdisTS(SQLSubModel):
             x.set_as_not_deleted()
 
         self.modified()
+
+    def split_reach(self, reach, profile, reach1, reach2):
+        split_rk = profile.rk
+        reach_rks = reach.reach.get_rk()
+        if len(reach_rks) == 0:
+            return
+
+        parts = [
+            (reach1.id, min(reach_rks), split_rk),
+            (reach2.id, split_rk, max(reach_rks)),
+        ]
+        specifications = [
+            specification
+            for specification in self._data
+            if (not specification.is_deleted() and
+                specification.reach == reach.id)
+        ]
+
+        for specification in specifications:
+            begin = specification.start_rk
+            end = specification.end_rk
+            if begin is None or end is None:
+                continue
+
+            lower, upper = sorted((begin, end))
+            reverse = begin > end
+
+            for new_reach, part_lower, part_upper in parts:
+                clipped_lower = max(lower, part_lower)
+                clipped_upper = min(upper, part_upper)
+                if clipped_lower >= clipped_upper:
+                    continue
+
+                start_rk = clipped_upper if reverse else clipped_lower
+                end_rk = clipped_lower if reverse else clipped_upper
+                self._data.append(specification.cloned_for(
+                    new_reach, start_rk, end_rk
+                ))
+
+        if len(specifications) != 0:
+            self.modified()

src/Model/D90AdisTS/D90AdisTSList.py

@@ -61,6 +61,10 @@ class D90AdisTSList(PamhyrModelList):
         self._status.modified()
         return n
 
+    def split_reach(self, reach, profile, reach1, reach2):
+        for d90 in self.lst:
+            d90.split_reach(reach, profile, reach1, reach2)
+
     @property
     def D90_AdisTS_List(self):
         return self.lst

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -261,3 +261,13 @@ class D90AdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self.modified()
+
+    def cloned_for(self, reach, start_rk, end_rk):
+        new = D90AdisTSSpec(name=self._name_section, status=self._status)
+        new._reach = reach
+        new._start_rk = start_rk
+        new._end_rk = end_rk
+        new._d90 = self._d90
+        new._enabled = self._enabled
+        new.modified()
+        return new

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -329,3 +329,44 @@ class DIFAdisTS(SQLSubModel):
             x.set_as_not_deleted()
 
         self.modified()
+
+    def split_reach(self, reach, profile, reach1, reach2):
+        split_rk = profile.rk
+        reach_rks = reach.reach.get_rk()
+        if len(reach_rks) == 0:
+            return
+
+        parts = [
+            (reach1.id, min(reach_rks), split_rk),
+            (reach2.id, split_rk, max(reach_rks)),
+        ]
+        specifications = [
+            specification
+            for specification in self._data
+            if (not specification.is_deleted() and
+                specification.reach == reach.id)
+        ]
+
+        for specification in specifications:
+            begin = specification.start_rk
+            end = specification.end_rk
+            if begin is None or end is None:
+                continue
+
+            lower, upper = sorted((begin, end))
+            reverse = begin > end
+
+            for new_reach, part_lower, part_upper in parts:
+                clipped_lower = max(lower, part_lower)
+                clipped_upper = min(upper, part_upper)
+                if clipped_lower >= clipped_upper:
+                    continue
+
+                start_rk = clipped_upper if reverse else clipped_lower
+                end_rk = clipped_lower if reverse else clipped_upper
+                self._data.append(specification.cloned_for(
+                    new_reach, start_rk, end_rk
+                ))
+
+        if len(specifications) != 0:
+            self.modified()

src/Model/DIFAdisTS/DIFAdisTSList.py

@@ -61,6 +61,10 @@ class DIFAdisTSList(PamhyrModelList):
         self._status.modified()
         return n
 
+    def split_reach(self, reach, profile, reach1, reach2):
+        for dif in self.lst:
+            dif.split_reach(reach, profile, reach1, reach2)
+
     @property
     def DIF_AdisTS_List(self):
         return self.lst

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -293,3 +293,15 @@ class DIFAdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
+
+    def cloned_for(self, reach, start_rk, end_rk):
+        new = DIFAdisTSSpec(method=self._method, status=self._status)
+        new._reach = reach
+        new._start_rk = start_rk
+        new._end_rk = end_rk
+        new._dif = self._dif
+        new._b = self._b
+        new._c = self._c
+        new._enabled = self._enabled
+        new.modified()
+        return new

src/Model/Ensembles/Distribution.py

@@ -0,0 +1,307 @@
+# 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 = []
+        self._default_values = []
+        self._params_checkers = []
+        self._params_tips = []
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def labels(self):
+        return self._labels
+
+    @property
+    def default_values(self):
+        return self._default_values
+
+    @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 is_valid_parameters(self, parameters):
+        valid = True
+        tips = []
+
+        for i, checker in enumerate(self._params_checkers):
+            ok = checker(parameters)
+            if not ok:
+                tips.append(self._params_tips[i])
+                valid = False
+
+        return (valid, tips)
+
+    def check_params(self, params):
+        return True
+
+    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"]
+        self._default_values = [20.0, 40.0]
+        self._params_checkers = [self.check_params, self.check_params]
+        self._params_tips = ["uniform_low_tips", "uniform_high_tips"]
+
+    def check_params(self, params):
+        return (params[0] < params[1])
+
+    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"]
+        self._default_values = [30.0, 5.0]
+        self._params_checkers = [self.check_params, self.check_scale]
+        self._params_tips = ["normal_loc_tips", "normal_scale_tips"]
+
+    def check_scale(self, params):
+        return 0 <= params[1]
+
+    def random(self, params, nb):
+        lst = params.copy()
+        lst.append(nb)
+
+        return np.random.normal(*lst)
+
+
+class Binomial(Distribution):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1,
+                 name: str = "binomial", script: str = "",
+                 status=None):
+        super(Binomial, self).__init__(
+            id=id, status=status,
+            name=name, script=script
+        )
+
+        self._labels = ["binomial_n", "binomial_p"]
+        self._default_values = [100.0, 0.3]
+        self._params_checkers = [self.check_n, self.check_p]
+        self._params_tips = ["binomial_n_tips", "binomial_p_tips"]
+
+    def check_n(self, params):
+        n = params[0]
+        return (0 <= n) and (n == round(n))
+
+    def check_p(self, params):
+        p = params[1]
+        return 0 <= p <= 1
+
+    def random(self, params, nb):
+        lst = params.copy()
+        lst.append(nb)
+
+        return np.random.binomial(*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 = ["poisson_lam"]
+        self._default_values = [5.0]
+        self._params_checkers = [self.check_lam]
+        self._params_tips = ["poisson_lam_tips"]
+
+    def check_lam(self, params):
+        lam = params[0]
+        return 0 <= 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"
+        self._default_values = [""]
+        self._params_checkers = [self.check_params]
+        self._params_tips = ["custom_params_tips"]
+
+    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,62 @@
+# 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
+        d = {"status": data['status']}
+        new._lst = [
+            Uniform(**d),
+            Normal(**d),
+            Binomial(**d),
+            Poisson(**d),
+        ]
+
+        # 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,279 @@
+# 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()
+
+    def get_data_dict(self, use_ids=False):
+        target_data = self.target_data
+        distribution = self.distribution
+
+        if use_ids:
+            if self.target_data:
+                target_data = self.target_data.pamhyr_id
+            if self.distribution:
+                distribution = self.distribution.name
+
+        return {
+            "name": self.name,
+            "data_type": self.data_type,
+            "target_data": target_data,
+            "distribution": distribution,
+            "params": self.params,
+        }
+
+    def set_data_dict(self, data):
+        self.name = data["name"]
+        self.data_type = data["data_type"]
+        self.target_data = data["target_data"]
+        self.distribution = data["distribution"]
+        self.params = data["params"]

src/Model/Ensembles/EnsembleList.py

@@ -0,0 +1,62 @@
+# 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
+
+    def new_with_data(self, index, data):
+        r = Ensemble(status=self._status)
+
+        r.set_data_dict(data)
+
+        self._lst.insert(index, r)
+        self._status.modified()
+        return r

src/Model/Friction/FrictionList.py

@@ -109,16 +109,22 @@ class FrictionList(PamhyrModelList):
             ((999 ** 100), -(999 ** 100))
         )
 
-        frictions = list(
-            filter(
-                lambda f: ((rk_min <= f.begin_rk <= rk_max) or
-                           (rk_min <= f.end_rk <= rk_max)),
-                self._lst))
+        for friction in self.lst:
+            lower, upper = sorted((friction.begin_rk, friction.end_rk))
+            clipped_lower = max(lower, rk_min)
+            clipped_upper = min(upper, rk_max)
+            if clipped_lower >= clipped_upper:
+                continue
 
-        for ind, friction in enumerate(frictions):
             n = friction.cloned_for(reach)
+            if friction.begin_rk > friction.end_rk:
+                n.begin_rk = clipped_upper
+                n.end_rk = clipped_lower
+            else:
+                n.begin_rk = clipped_lower
+                n.end_rk = clipped_upper
 
-            new._lst.insert(ind, n)
+            new._lst.append(n)
             new._status.modified()
 
         return new

src/Model/Geometry/Point.py

@@ -55,8 +55,11 @@ class Point(SQLSubModel):
 
     @name.setter
     def name(self, name):
+        changed = self._name != name
         self._name = name
         self.modified()
+        if changed and self._profile is not None:
+            self._profile.content_modified()
 
     def is_named(self):
         """

src/Model/Geometry/PointXYZ.py

@@ -95,12 +95,11 @@ class PointXYZ(Point):
                     "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
                 )
 
-        if major == "0" and minor == "2":
-            if int(release) < 5:
-                execute(
-                    "CREATE INDEX idx_point " +
-                    "ON geometry_pointXYZ(profile, scenario);"
-                )
+        # 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)
 
@@ -329,8 +328,11 @@ class PointXYZ(Point):
 
     @x.setter
     def x(self, value):
+        changed = self._x != float(value)
         self._x = float(value)
         self.modified()
+        if changed and self._profile is not None:
+            self._profile.content_modified()
 
     @property
     def y(self):
@@ -338,8 +340,11 @@ class PointXYZ(Point):
 
     @y.setter
     def y(self, value):
+        changed = self._y != float(value)
         self._y = float(value)
         self.modified()
+        if changed and self._profile is not None:
+            self._profile.content_modified()
 
     @property
     def z(self):
@@ -347,8 +352,11 @@ class PointXYZ(Point):
 
     @z.setter
     def z(self, value):
+        changed = self._z != float(value)
         self._z = float(value)
         self.modified()
+        if changed and self._profile is not None:
+            self._profile.content_modified()
 
     def shift(self, x, y, z):
         self.x += x

src/Model/Geometry/Profile.py

@@ -47,6 +47,8 @@ class Profile(object):
         self._sl = None
 
         self._points: List[Point] = []
+        self._modification_count = 0
+        self._old_interpolated = ""
 
         self._profile_type = _type
 
@@ -160,8 +162,13 @@ class Profile(object):
 
     @rk.setter
     def rk(self, value: float):
-        self._rk = float(value)
-        self.modified()
+        value = float(value)
+        changed = value != self._rk
+        self._rk = value
+        if changed:
+            self.content_modified()
+        else:
+            self.modified()
 
     @property
     def name(self):
@@ -173,8 +180,13 @@ class Profile(object):
 
     @name.setter
     def name(self, value: str):
-        self._name = value.strip()
-        self.modified()
+        value = value.strip()
+        changed = value != self._name
+        self._name = value
+        if changed:
+            self.content_modified()
+        else:
+            self.modified()
 
     @property
     def sl(self):
@@ -217,6 +229,38 @@ class Profile(object):
         return [point for point in self.points
                 if point.is_named()]
 
+    @property
+    def modification_count(self):
+        """Content revision for this session; not stored in the database."""
+        return self._modification_count
+
+    def increase_modification_count(self):
+        """Increase content revision for this session;
+        not stored in the database."""
+        self._modification_count += 1
+
+    def decrease_modification_count(self):
+        """Decrease content revision for this session;
+        not stored in the database."""
+        self._modification_count -= 1
+
+    @property
+    def old_interpolated(self):
+        """Old interpolated value for this session;
+        not stored in the database."""
+        return self._old_interpolated
+
+    @old_interpolated.setter
+    def old_interpolated(self, value):
+        self._old_interpolated = value
+
+    def content_modified(self):
+        """An edited profile is no longer an interpolation result."""
+        # self._modification_count += 1
+        if hasattr(self, "_interpolated"):
+            self._interpolated = False
+        self.modified()
+
     def insert_point(self, index: int, point: Point):
         """Insert point at index.
 
@@ -232,7 +276,7 @@ class Profile(object):
         else:
             self._points.insert(index, point)
 
-        self.modified()
+        self.content_modified()
 
     def delete_i(self, indexes: list):
         list(
@@ -245,7 +289,7 @@ class Profile(object):
             )
         )
 
-        self.modified()
+        self.content_modified()
 
     def delete_points(self, points):
         """Delete some elements in profile list
@@ -262,7 +306,7 @@ class Profile(object):
                 points
             )
         )
-        self.modified()
+        self.content_modified()
 
     # Move
 
@@ -272,7 +316,7 @@ class Profile(object):
 
             p = self._points
             p[index], p[next] = p[next], p[index]
-            self.modified()
+            self.content_modified()
 
     def move_down_point(self, index: int):
         if index >= 0:
@@ -280,7 +324,7 @@ class Profile(object):
 
             p = self._points
             p[index], p[prev] = p[prev], p[index]
-            self.modified()
+            self.content_modified()
 
     # Sort
 
@@ -297,7 +341,7 @@ class Profile(object):
             key=predicate,
             reverse=is_reversed
         )
-        self.modified()
+        self.content_modified()
 
     @timer
     def sort_with_indexes(self, indexes: list):
@@ -313,12 +357,12 @@ class Profile(object):
                 )
             )
         )
-        self.modified()
+        self.content_modified()
 
     @timer
     def reverse(self):
         self._points.reverse()
-        self.modified()
+        self.content_modified()
 
     # Sediment Layers
 

src/Model/Geometry/ProfileXYZ.py

@@ -59,7 +59,7 @@ class ProfileXYZ(Profile, SQLSubModel):
                  nb_point: int = 0,
                  code1: int = 0, code2: int = 0,
                  status=None, owner_scenario=-1,
-                 enabled=True):
+                 enabled=True, interpolated=False):
         """ProfileXYZ constructor
 
         Args:
@@ -92,6 +92,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         self._station = []
         self.station_up_to_date = False
         self._enabled = bool(enabled)
+        self._interpolated = bool(interpolated)
 
         self._get_water_limits_cache = {}
         self._get_water_limits_ac_cache = {}
@@ -111,6 +112,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             code2 INTEGER NOT NULL,
             sl INTEGER,
             enabled BOOLEAN NOT NULL DEFAULT TRUE,
+            interpolated BOOLEAN NOT NULL DEFAULT FALSE,
             {Scenario.create_db_add_scenario()},
             {Scenario.create_db_add_scenario_fk()},
             FOREIGN KEY(reach) REFERENCES river_reach(pamhyr_id),
@@ -155,13 +157,27 @@ class ProfileXYZ(Profile, SQLSubModel):
                     "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
                 )
 
-        if major == "0" and int(minor) <=2:
-            if int(release) < 9:
+        if major == "0" and int(minor) <= 2:
+            if int(release) < 10:
                 execute(
                     "ALTER TABLE geometry_profileXYZ " +
                     "ADD COLUMN enabled BOOLEAN NOT NULL DEFAULT TRUE"
                 )
 
+        if major == "0" and (int(minor) < 2 or
+                             (minor == "2" and int(release) < 10)):
+            if minor != "0":
+                execute(
+                    "ALTER TABLE geometry_profileXYZ " +
+                    "ADD COLUMN interpolated BOOLEAN NOT NULL DEFAULT FALSE"
+                )
+            execute(
+                "UPDATE geometry_profileXYZ " +
+                "SET interpolated = CASE " +
+                "WHEN LOWER(name) LIKE 'interpol%' THEN TRUE " +
+                "ELSE FALSE END"
+            )
+
         return cls._update_submodel(execute, version, data)
 
     @classmethod
@@ -247,7 +263,7 @@ class ProfileXYZ(Profile, SQLSubModel):
 
         table = execute(
             "SELECT pamhyr_id, ind, deleted, name, rk, num, " +
-            "code1, code2, sl, scenario, enabled " +
+            "code1, code2, sl, scenario, enabled, interpolated " +
             "FROM geometry_profileXYZ " +
             f"WHERE reach = {reach.id} " +
             f"AND scenario = {scenario.id} " +
@@ -269,6 +285,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             sl = next(it)
             owner_scenario = next(it)
             enabled = (next(it) == 1)
+            interpolated = (next(it) == 1)
 
             profile = cls(
                 id=pid, ind=ind, num=num,
@@ -277,7 +294,8 @@ class ProfileXYZ(Profile, SQLSubModel):
                 reach=reach,
                 status=status,
                 owner_scenario=owner_scenario,
-                enabled=enabled
+                enabled=enabled,
+                interpolated=interpolated
             )
             if deleted:
                 profile.set_as_deleted()
@@ -330,12 +348,14 @@ class ProfileXYZ(Profile, SQLSubModel):
         execute(
             "INSERT OR REPLACE INTO " +
             "geometry_profileXYZ(pamhyr_id, deleted, ind, name, reach, " +
-            "rk, num, code1, code2, sl, scenario, enabled) " +
+            "rk, num, code1, code2, sl, scenario, enabled, interpolated) " +
             "VALUES (" +
             f"{self.pamhyr_id}, {self._db_format(self.is_deleted())}, " +
             f"{ind}, '{self._db_format(self._name)}', " +
             f"{self.reach.pamhyr_id}, {self.rk}, {self.num}, " +
-            f"{self.code1}, {self.code1}, {sl}, {self._status.scenario_id}, {self._db_format(self._enabled)}" +
+            f"{self.code1}, {self.code1}, {sl}, {self._status.scenario_id}, " +
+            f"{self._db_format(self._enabled)}, " +
+            f"{self._db_format(self._interpolated)}" +
             ")"
         )
 
@@ -403,7 +423,8 @@ class ProfileXYZ(Profile, SQLSubModel):
             rk=self.rk,
             reach=self.reach,
             status=self._status,
-            enabled=self.is_enabled
+            enabled=self.is_enabled,
+            interpolated=self.interpolated
         )
         if self.is_deleted():
             new_p.set_as_deleted()
@@ -424,7 +445,8 @@ class ProfileXYZ(Profile, SQLSubModel):
             rk=self.rk,
             reach=new_reach,
             status=self._status,
-            enabled=self.is_enabled
+            enabled=self.is_enabled,
+            interpolated=self.interpolated
         )
         if self.is_deleted():
             new_p.set_as_deleted()
@@ -537,7 +559,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             )
             self._points.append(pt)
 
-        self.modified()
+        self.content_modified()
 
     def get_point_i(self, index: int) -> PointXYZ:
         """Get point at index.
@@ -602,7 +624,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         )
         self.points.append(point_xyz)
 
-        self.modified()
+        self.content_modified()
 
     def insert(self, index: int):
         """Insert a new point at index.
@@ -621,7 +643,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         point = PointXYZ(x=x, y=y, z=z, profile=self, status=self._status)
         self._points.insert(index, point)
 
-        self.modified()
+        self.content_modified()
 
         return point
 
@@ -840,6 +862,13 @@ class ProfileXYZ(Profile, SQLSubModel):
 
         return n_zones
 
+    def froude(self, z, v):
+        return v / np.sqrt(
+            9.81 * (
+                self.wet_area(z) / self.wet_width(z)
+            )
+        )
+
     @timer
     def get_all_water_limits_ac(self, z):
         """
@@ -981,7 +1010,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             Projection of the points of the profile on a plane.
         """
         if self.nb_points < 2:
-            return [0.0]
+            return [0.0] * self.nb_points
         else:
             if self.station_up_to_date:
                 return self._station
@@ -1146,11 +1175,13 @@ class ProfileXYZ(Profile, SQLSubModel):
                        rk=self.rk,
                        reach=self.reach,
                        status=self._status,
-                       enabled=self.is_enabled)
+                       enabled=self.is_enabled,
+                       interpolated=self.interpolated)
 
         for i, k in enumerate(self.points):
-            p.insert_point(i, k.copy())
+            p.insert_point(i, k.cloned_for(p))
 
+        p._interpolated = self.interpolated
         return p
 
     def purge_aligned_points(self):
@@ -1193,3 +1224,12 @@ class ProfileXYZ(Profile, SQLSubModel):
     def enabled(self, value):
         self._enabled = bool(value)
         self.modified()
+
+    @property
+    def interpolated(self):
+        return self._interpolated
+
+    @interpolated.setter
+    def interpolated(self, value):
+        self._interpolated = bool(value)
+        self.modified()

src/Model/Geometry/Reach.py

@@ -80,11 +80,13 @@ class Reach(SQLSubModel):
     @classmethod
     def _db_load(cls, execute, data=None):
         new = cls(status=data["status"], parent=data["reach"])
+        profile_data = data.copy()
+        profile_data["reach"] = new
 
         new._profiles = sorted(
             ProfileXYZ._db_load(
                 execute,
-                data=data.copy()
+                data=profile_data
             ),
             key=lambda p: p._db_ind
         )
@@ -375,6 +377,28 @@ class Reach(SQLSubModel):
             )
         )
 
+    def get_z_min_enabled_profiles(self):
+        return list(
+            map(
+                lambda profile: profile.z_min(),
+                filter(
+                    lambda profile: len(profile) > 0 and profile.is_enabled,
+                    self.profiles
+                )
+            )
+        )
+
+    def get_z_max_enabled_profiles(self):
+        return list(
+            map(
+                lambda profile: profile.z_max(),
+                filter(
+                    lambda profile: len(profile) > 0 and profile.is_enabled,
+                    self.profiles
+                )
+            )
+        )
+
     def get_rk(self):
         """List of profiles rk
 
@@ -383,6 +407,17 @@ class Reach(SQLSubModel):
         """
         return [profile.rk for profile in self.profiles]
 
+    def get_rk_enabled_profiles(self):
+        return list(
+            map(
+                lambda profile: profile.rk,
+                filter(
+                    lambda profile: len(profile) > 0 and profile.is_enabled,
+                    self.profiles
+                )
+            )
+        )
+
     def get_rk_complete_profiles(self):
         return list(
             map(

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -47,9 +47,7 @@ class HydraulicStructure(SQLSubModel):
 
         self._name = name
         self._input_section = None
-        self._output_section = None
         self._input_reach = None
-        self._output_reach = None
         self._enabled = True
         self._data = []
 
@@ -62,17 +60,12 @@ class HydraulicStructure(SQLSubModel):
             name TEXT NOT NULL,
             enabled BOOLEAN NOT NULL,
             input_reach INTEGER,
-            output_reach INTEGER,
             input_section INTEGER,
-            output_section INTEGER,
             {Scenario.create_db_add_scenario()},
             {Scenario.create_db_add_scenario_fk()},
             FOREIGN KEY(input_reach) REFERENCES river_reach(pamhyr_id),
-            FOREIGN KEY(output_reach) REFERENCES river_reach(pamhyr_id),
             FOREIGN KEY(input_section)
               REFERENCES geometry_profileXYZ(pamhyr_id),
-            FOREIGN KEY(output_section)
-              REFERENCES geometry_profileXYZ(pamhyr_id),
             PRIMARY KEY(pamhyr_id, scenario)
           )
         """)
@@ -92,13 +85,12 @@ class HydraulicStructure(SQLSubModel):
                 return True
 
             if rl < 11:
-                for v in ["input", "output"]:
-                    execute(
-                        f"""
-                        ALTER TABLE hydraulic_structures
-                        RENAME COLUMN {v}_kp TO {v}_rk
-                        """
-                    )
+                execute(
+                    """
+                    ALTER TABLE hydraulic_structures
+                    RENAME COLUMN input_kp TO input_rk
+                    """
+                )
 
             cls._db_update_to_0_2_0(execute, data)
 
@@ -112,8 +104,28 @@ class HydraulicStructure(SQLSubModel):
                     "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
                 )
 
+        if major == "0" and (int(minor) < 2 or
+                             (minor == "2" and rl < 10)):
+            cls._db_update_to_0_2_10(execute)
+
         return cls._update_submodel(execute, version, data)
 
+    @classmethod
+    def _db_update_to_0_2_10(cls, execute):
+        table = "hydraulic_structures"
+        cls._db_create(execute, ext="_tmp")
+
+        execute(
+            f"INSERT INTO {table}_tmp " +
+            "(pamhyr_id, deleted, name, enabled, input_section, " +
+            "input_reach, scenario) " +
+            "SELECT pamhyr_id, deleted, name, enabled, input_section, " +
+            f"input_reach, scenario FROM {table}"
+        )
+
+        execute(f"DROP TABLE {table}")
+        execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
+
     @classmethod
     def _db_update_to_0_2_0(cls, execute, data):
         table = "hydraulic_structures"
@@ -131,11 +143,10 @@ class HydraulicStructure(SQLSubModel):
 
         execute(
             f"INSERT INTO {table}_tmp " +
-            "(pamhyr_id, name, enabled, input_section, output_section, " +
-            "input_reach, output_reach, scenario) " +
+            "(pamhyr_id, name, enabled, input_section, " +
+            "input_reach, scenario) " +
             "SELECT pamhyr_id, name, enabled, " +
-            "input_section, output_section, " +
-            "input_reach, output_reach, scenario " +
+            "input_section, input_reach, scenario " +
             f"FROM {table}"
         )
 
@@ -145,44 +156,38 @@ class HydraulicStructure(SQLSubModel):
     @classmethod
     def _db_update_to_0_2_0_set_reach_pid(cls, execute, table, reachs):
         els = execute(
-            f"SELECT pamhyr_id, input_reach, output_reach FROM {table}"
+            f"SELECT pamhyr_id, input_reach FROM {table}"
         )
 
         for row in els:
             it = iter(row)
             pid = next(it)
             in_reach_id = next(it)
-            out_reach_id = next(it)
 
             if in_reach_id == -1:
                 return
 
-            if out_reach_id == -1:
-                out_reach_id = in_reach_id
-
             execute(
                 f"UPDATE {table} " +
-                f"SET input_reach = {reachs[in_reach_id]}, " +
-                f"output_reach = {reachs[out_reach_id]} " +
+                f"SET input_reach = {reachs[in_reach_id]} " +
                 f"WHERE pamhyr_id = {pid}"
             )
 
     @classmethod
     def _db_update_to_0_1_1(cls, execute, data,
                             origin_version="0.1.0"):
-        for v in ["input", "output"]:
-            execute(
-                "ALTER TABLE hydraulic_structures " +
-                f"ADD COLUMN {v}_section INTEGER"
-            )
+        execute(
+            "ALTER TABLE hydraulic_structures " +
+            "ADD COLUMN input_section INTEGER"
+        )
 
-            cls._db_update_to_0_1_1_assoc_section_from_rk(
-                execute, "hydraulic_structures",
-                reach_column=f"{v}_reach",
-                rk_column=f"{v}_rk",
-                section_column=f"{v}_section",
-                origin_version=origin_version
-            )
+        cls._db_update_to_0_1_1_assoc_section_from_rk(
+            execute, "hydraulic_structures",
+            reach_column="input_reach",
+            rk_column="input_rk",
+            section_column="input_section",
+            origin_version=origin_version
+        )
 
     @classmethod
     def _db_load(cls, execute, data=None):
@@ -196,8 +201,7 @@ class HydraulicStructure(SQLSubModel):
 
         table = execute(
             "SELECT pamhyr_id, deleted, name, enabled, " +
-            "input_section, output_section, " +
-            "input_reach, output_reach, scenario " +
+            "input_section, input_reach, scenario " +
             "FROM hydraulic_structures " +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
@@ -227,12 +231,7 @@ class HydraulicStructure(SQLSubModel):
         input_section_id = (
             -1 if input_section_id is None else input_section_id
         )
-        output_section_id = next(it)
-        output_section_id = (
-            -1 if output_section_id is None else output_section_id
-        )
         input_reach_id = next(it)
-        output_reach_id = next(it)
         owner_scenario = next(it)
 
         hs = cls(
@@ -243,27 +242,19 @@ class HydraulicStructure(SQLSubModel):
             hs.set_as_deleted()
 
         hs.enabled = enabled
-        hs.input_reach, hs.output_reach = reduce(
-            lambda acc, n: (
-                n if n.pamhyr_id == input_reach_id else acc[0],
-                n if n.pamhyr_id == output_reach_id else acc[1]
-            ),
+        hs.input_reach = reduce(
+            lambda acc, n: n if n.pamhyr_id == input_reach_id else acc,
             data["edges"],
-            [None, None]
+            None
         )
         sections = []
         if hs.input_reach is not None:
             sections += hs.input_reach.reach.profiles
-        if hs.output_reach is not None:
-            sections += hs.output_reach.reach.profiles
 
-        hs.input_section, hs.output_section = reduce(
-            lambda acc, s: (
-                s if s.pamhyr_id == input_section_id else acc[0],
-                s if s.pamhyr_id == output_section_id else acc[1]
-            ),
+        hs.input_section = reduce(
+            lambda acc, s: s if s.pamhyr_id == input_section_id else acc,
             sections,
-            [None, None]
+            None
         )
 
         loaded.add(hs_id)
@@ -287,24 +278,15 @@ class HydraulicStructure(SQLSubModel):
         if self._input_reach is not None:
             input_reach_id = self._input_reach.pamhyr_id
 
-        output_reach_id = -1
-        if self._output_reach is not None:
-            output_reach_id = self._output_reach.pamhyr_id
-
         input_section = 'NULL'
         if self.input_section is not None:
             input_section = self.input_section.pamhyr_id
 
-        output_section = 'NULL'
-        if self.output_section is not None:
-            output_section = self.output_section.pamhyr_id
-
         execute(
             "INSERT INTO " +
             "hydraulic_structures(" +
             "  pamhyr_id, deleted, name, enabled, " +
-            "  input_section, output_section, " +
-            "  input_reach, output_reach, " +
+            "  input_section, input_reach, " +
             "  scenario" +
             ") " +
             "VALUES (" +
@@ -312,8 +294,7 @@ class HydraulicStructure(SQLSubModel):
             f"{self._db_format(self.is_deleted())}, " +
             f"'{self._db_format(self._name)}', " +
             f"{self._db_format(self.enabled)}, " +
-            f"{input_section}, {output_section}, " +
-            f"{input_reach_id}, {output_reach_id}, " +
+            f"{input_section}, {input_reach_id}, " +
             f"{self._status.scenario_id}"
             ")"
         )
@@ -371,13 +352,6 @@ class HydraulicStructure(SQLSubModel):
 
         return self._input_section
 
-    @property
-    def output_rk(self):
-        if self._output_section is None:
-            return None
-
-        return self._output_section
-
     @property
     def input_section(self):
         return self._input_section
@@ -387,15 +361,6 @@ class HydraulicStructure(SQLSubModel):
         self._input_section = input_section
         self.modified()
 
-    @property
-    def output_section(self):
-        return self._output_section
-
-    @output_section.setter
-    def output_section(self, output_section):
-        self._output_section = output_section
-        self.modified()
-
     @property
     def enabled(self):
         return self._enabled
@@ -414,27 +379,15 @@ class HydraulicStructure(SQLSubModel):
         self._input_reach = input_reach
         self.modified()
 
-    @property
-    def output_reach(self):
-        return self._output_reach
-
-    @output_reach.setter
-    def output_reach(self, output_reach):
-        self._output_reach = output_reach
-        self.modified()
-
     @property
     def basic_structures(self):
         return self.lst.copy()
 
-    def cloned_for(self, input_reach, input_section,
-                   output_reach, output_section):
+    def cloned_for(self, input_reach, input_section):
         new = HydraulicStructure(name=self._name, status=self._status)
         new._enabled = self._enabled
         new._input_reach = input_reach
         new._input_section = input_section
-        new._output_reach = output_reach
-        new._output_section = output_section
         new._data = [structure.cloned() for structure in self.lst]
         new.modified()
         return new

src/Model/HydraulicStructures/HydraulicStructuresList.py

@@ -87,8 +87,7 @@ class HydraulicStructureList(PamhyrModelList):
         structures = [
             structure
             for structure in self.lst
-            if (structure.input_reach is reach or
-                structure.output_reach is reach)
+            if structure.input_reach is reach
         ]
 
         for structure in structures:
@@ -96,15 +95,9 @@ class HydraulicStructureList(PamhyrModelList):
                 structure.input_reach,
                 structure.input_section
             )
-            output_reach, output_section = split_endpoint(
-                structure.output_reach,
-                structure.output_section
-            )
             self._lst.append(structure.cloned_for(
                 input_reach,
-                input_section,
-                output_reach,
-                output_section
+                input_section
             ))
 
         if len(structures) != 0:

src/Model/InitialConditions/InitialConditions.py

@@ -19,6 +19,7 @@
 import logging
 
 from copy import copy, deepcopy
+from math import isclose
 from tools import trace, timer
 from functools import reduce
 from numpy import interp
@@ -439,15 +440,28 @@ class InitialConditions(SQLSubModel):
 
     def new_from_data(self, rk, discharge, elevation):
         n = Data(reach=self._reach, status=self._status)
+        # Values read from Mage INI files are strings, whereas profile RK
+        # values are stored as floats.  Normalize the imported value before
+        # looking up its associated profile.
+        rk = float(rk)
 
         section = reduce(
             lambda acc, s: (
-                s if s.rk == rk else acc
+                # Mage INI files store RK values with two decimal places.
+                # Allow for the rounding introduced by that format.
+                s if isclose(s.rk, rk, rel_tol=0.0, abs_tol=0.0051)
+                else acc
             ),
             self._reach.reach.profiles,
             None
         )
 
+        if section is None:
+            raise ValueError(
+                f"No profile with RK {rk} exists in reach "
+                f"{self._reach.name}"
+            )
+
         n['section'] = section
         n['discharge'] = discharge
         n['elevation'] = elevation

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -391,7 +391,7 @@ class InitialConditionsAdisTS(SQLSubModel):
             for new_reach, part_lower, part_upper in parts:
                 clipped_lower = max(lower, part_lower)
                 clipped_upper = min(upper, part_upper)
-                if clipped_lower > clipped_upper:
+                if clipped_lower >= clipped_upper:
                     continue
 
                 start_rk = clipped_upper if reverse else clipped_lower

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -192,7 +192,7 @@ class ICAdisTSSpec(SQLSubModel):
                 new_spec.rate = rate
                 new_spec.enabled = enabled
 
-                # loaded.add(pid)
+                loaded.add(id)
                 new.append(new_spec)
 
         data["scenario"] = scenario.parent
@@ -237,6 +237,7 @@ class ICAdisTSSpec(SQLSubModel):
     def name(self, name):
         self._name_section = name
         self.modified()
+        self.modified()
 
     @property
     def reach(self):
@@ -246,6 +247,7 @@ class ICAdisTSSpec(SQLSubModel):
     def reach(self, reach):
         self._reach = reach
         self.modified()
+        self.modified()
 
     @property
     def start_rk(self):
@@ -255,6 +257,7 @@ class ICAdisTSSpec(SQLSubModel):
     def start_rk(self, start_rk):
         self._start_rk = start_rk
         self.modified()
+        self.modified()
 
     @property
     def end_rk(self):
@@ -264,6 +267,7 @@ class ICAdisTSSpec(SQLSubModel):
     def end_rk(self, end_rk):
         self._end_rk = end_rk
         self.modified()
+        self.modified()
 
     @property
     def concentration(self):
@@ -273,6 +277,7 @@ class ICAdisTSSpec(SQLSubModel):
     def concentration(self, concentration):
         self._concentration = concentration
         self.modified()
+        self.modified()
 
     @property
     def eg(self):
@@ -282,6 +287,7 @@ class ICAdisTSSpec(SQLSubModel):
     def eg(self, eg):
         self._eg = eg
         self.modified()
+        self.modified()
 
     @property
     def em(self):
@@ -291,6 +297,7 @@ class ICAdisTSSpec(SQLSubModel):
     def em(self, em):
         self._em = em
         self.modified()
+        self.modified()
 
     @property
     def ed(self):
@@ -300,6 +307,7 @@ class ICAdisTSSpec(SQLSubModel):
     def ed(self, ed):
         self._ed = ed
         self.modified()
+        self.modified()
 
     @property
     def rate(self):
@@ -309,6 +317,7 @@ class ICAdisTSSpec(SQLSubModel):
     def rate(self, rate):
         self._rate = rate
         self.modified()
+        self.modified()
 
     @property
     def enabled(self):

src/Model/InitialConditionsTemperature/InitialConditionsTemperature.py

@@ -68,7 +68,7 @@ class InitialConditionsTemperature(SQLSubModel):
         major, minor, release = version.strip().split(".")
 
         if major == "0":
-            if int(minor) < 2 or (int(minor) == 2 and int(release) < 7):
+            if int(minor) < 2 or (int(minor) == 2 and int(release) <= 7):
                 table_name = "initial_conditions_temperature"
                 if not cls.is_table_exists(execute, table_name):
                     cls._db_create(execute)
@@ -167,7 +167,11 @@ class InitialConditionsTemperature(SQLSubModel):
         return True
 
     def __len__(self):
-        return len(self._data)
+        return len(self.data)
+
+    @property
+    def data(self):
+        return list(filter(lambda item: not item.is_deleted(), self._data))
 
     @property
     def name(self):
@@ -254,7 +258,7 @@ class InitialConditionsTemperature(SQLSubModel):
             for new_reach, part_lower, part_upper in parts:
                 clipped_lower = max(lower, part_lower)
                 clipped_upper = min(upper, part_upper)
-                if clipped_lower > clipped_upper:
+                if clipped_lower >= clipped_upper:
                     continue
 
                 start_rk = clipped_upper if reverse else clipped_lower

src/Model/InitialConditionsTemperature/InitialConditionsTemperatureSpec.py

@@ -31,10 +31,11 @@ class ICTemperatureSpec(SQLSubModel):
     _sub_classes = []
 
     def __init__(self, id: int = -1, name: str = "",
-                 status=None, owner_scenario=None):
-        super(ICTemperatureSpec, self).__init__()
-
-        self._status = status
+                 status=None, owner_scenario=-1):
+        super(ICTemperatureSpec, self).__init__(
+            id=id, status=status,
+            owner_scenario=owner_scenario
+        )
 
         self._name_section = name
         self._reach = None
@@ -69,7 +70,7 @@ class ICTemperatureSpec(SQLSubModel):
         major, minor, release = version.strip().split(".")
 
         if major == "0":
-            if int(minor) < 2 or (int(minor) == 2 and int(release) < 7):
+            if int(minor) < 2 or (int(minor) == 2 and int(release) <= 7):
                 table_name = "initial_conditions_temperature_spec"
                 if not cls.is_table_exists(execute, table_name):
                     cls._db_create(execute)
@@ -122,7 +123,7 @@ class ICTemperatureSpec(SQLSubModel):
                 new_spec.end_rk = end_rk
                 new_spec.temperature = temperature
 
-                # loaded.add(pid)
+                loaded.add(id)
                 new.append(new_spec)
 
         data["scenario"] = scenario.parent
@@ -163,7 +164,7 @@ class ICTemperatureSpec(SQLSubModel):
     @name.setter
     def name(self, name):
         self._name_section = name
-        self._status.modified()
+        self.modified()
 
     @property
     def reach(self):
@@ -172,7 +173,7 @@ class ICTemperatureSpec(SQLSubModel):
     @reach.setter
     def reach(self, reach):
         self._reach = reach
-        self._status.modified()
+        self.modified()
 
     @property
     def start_rk(self):
@@ -181,7 +182,7 @@ class ICTemperatureSpec(SQLSubModel):
     @start_rk.setter
     def start_rk(self, start_rk):
         self._start_rk = start_rk
-        self._status.modified()
+        self.modified()
 
     @property
     def end_rk(self):
@@ -190,7 +191,7 @@ class ICTemperatureSpec(SQLSubModel):
     @end_rk.setter
     def end_rk(self, end_rk):
         self._end_rk = end_rk
-        self._status.modified()
+        self.modified()
 
     @property
     def temperature(self):

src/Model/LateralContribution/LateralContributionList.py

@@ -117,7 +117,7 @@ class LateralContributionList(PamhyrModelListWithTab):
                 for new_reach, part_lower, part_upper, sections in parts:
                     clipped_lower = max(lower, part_lower)
                     clipped_upper = min(upper, part_upper)
-                    if clipped_lower > clipped_upper:
+                    if clipped_lower >= clipped_upper:
                         continue
 
                     begin_index = (

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

@@ -95,7 +95,7 @@ class LateralContributionsAdisTSList(PamhyrModelList):
             for new_reach, part_lower, part_upper in parts:
                 clipped_lower = max(lower, part_lower)
                 clipped_upper = min(upper, part_upper)
-                if clipped_lower > clipped_upper:
+                if clipped_lower >= clipped_upper:
                     continue
 
                 begin_rk = clipped_upper if reverse else clipped_lower

src/Model/Results/Results.py

@@ -202,13 +202,8 @@ class TableData(SQLSubModel):
 
     @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
+        if not cls.is_table_exists(execute, "results_table_data"):
+            cls._db_create(execute)
 
         return cls._update_submodel(execute, version, data)
 
@@ -277,9 +272,9 @@ class TableData(SQLSubModel):
 
         if len(shape) == 2:
             shape_x, shape_y = shape
-        elif len(shape == 1):
+        elif len(shape) == 1:
             shape_x, = shape
-        elif len(shape == 3):
+        elif len(shape) == 3:
             shape_x, shape_y, shape_z = shape
         else:
             logger.error(
@@ -331,14 +326,14 @@ class TableData(SQLSubModel):
         if isinstance(key, tuple):
             return self._data[key[0], key[1]]
 
-        self._date[key]
+        self._data[key]
 
 
 class Results(SQLSubModel):
     _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
@@ -346,11 +341,14 @@ class Results(SQLSubModel):
 
         self._name = name
         self._study = study
-        self._river = River(self._study, self)
+        # Solver readers add their own reaches; ensembles need them upfront.
+        self._river = River(self._study, self, init=is_ensemble)
 
         self._solver = solver
         self._repertory = repertory
 
+        self._is_ensemble = is_ensemble
+
         self._meta_data = {
             # Keep results creation date
             "creation_date": datetime.now(),
@@ -364,6 +362,9 @@ class Results(SQLSubModel):
         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"]
@@ -431,9 +432,11 @@ class Results(SQLSubModel):
             solver_name TEXT NOT NULL,
             solver_type TEXT NOT NULL,
             study_revision INTEGER NOT NULL,
-            creation_data DATE NOT NULL,
+            creation_date DATE NOT NULL,
             nb_timestamps INTEGER NOT NULL,
             timestamps BLOB NOT NULL,
+            seed INTEGER,
+            number_of_run INTEGER,
             {Scenario.create_db_add_scenario()},
             {Scenario.create_db_add_scenario_fk()},
             PRIMARY KEY(pamhyr_id, scenario)
@@ -459,6 +462,21 @@ class Results(SQLSubModel):
                 cls._db_create(execute)
                 create = True
 
+        if major == "0" and int(minor) <= 2:
+            if int(release) < 9 and not create:
+                execute(
+                    "ALTER TABLE results ADD COLUMN " +
+                    "seed INTEGER"
+                )
+                execute(
+                    "ALTER TABLE results ADD COLUMN " +
+                    "number_of_run INTEGER"
+                )
+                execute(
+                    "ALTER TABLE results RENAME COLUMN " +
+                    "creation_data TO creation_date"
+                )
+
         return cls._update_submodel(execute, version, data)
 
     @classmethod
@@ -471,7 +489,9 @@ class Results(SQLSubModel):
 
         table = execute(
             "SELECT pamhyr_id, solver_name, solver_type, " +
-            "study_revision, creation_data, nb_timestamps, timestamps, " +
+            "study_revision, creation_date, " +
+            "seed, number_of_run, " +
+            "nb_timestamps, timestamps, " +
             "scenario " +
             "FROM results " +
             f"WHERE scenario = {scenario.id}"
@@ -491,6 +511,8 @@ class Results(SQLSubModel):
             solver_type = next(it)
             revision = next(it)
             creation_date = next(it)
+            seed = next(it)
+            number_of_run = next(it)
             nb_timestamps = next(it)
             timestamps_bytes = next(it)
             owner_scenario = next(it)
@@ -501,6 +523,9 @@ class Results(SQLSubModel):
             new_results.set("solver_type", solver_type)
             new_results.set("study_revision", revision)
             new_results.set("creation_date", creation_date)
+            if seed is not None:
+                new_results.set("seed", seed)
+                new_results.set("number_of_run", number_of_run)
 
             data["result_pid"] = pid
             data["result"] = new_results
@@ -527,7 +552,7 @@ class Results(SQLSubModel):
             i = 0
             for reach in new_results._river.reachs:
                 nb = len(reach.profiles)
-                reach.set_global_index(range(i, i + nb + 1))
+                reach.set_global_index(range(i, i + nb))
                 i += nb
 
             if "Z" in table_data:
@@ -593,15 +618,25 @@ class Results(SQLSubModel):
         ts = sorted(self.get("timestamps"))
         sf = ">" + ''.join(itertools.repeat("d", len(ts)))
 
+        if "seed" in self._meta_data:
+            seed = int(self.get("seed"))
+            number_of_run = int(self.get("number_of_run"))
+        else:
+            seed = None
+            number_of_run = None
+
         execute(
             "INSERT INTO " +
             "results (pamhyr_id, solver_name, solver_type, " +
-            "study_revision, creation_data, " +
+            "study_revision, creation_date, " +
+            "seed, number_of_run, " +
             "nb_timestamps, timestamps, " +
-            "scenario) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+            "scenario) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             self._pamhyr_id, solver_name, solver_type,
             self._status.version, self.get("creation_date"),
-            len(ts), struct.pack(sf, *ts), self._owner_scenario
+            seed, number_of_run,
+            len(ts), struct.pack(sf, *ts),
+            self._owner_scenario
         )
 
         data["result"] = self._pamhyr_id

src/Model/Results/River/River.py

@@ -154,6 +154,7 @@ class Profile(SQLSubModel):
             "len_data, data, scenario " +
             "FROM results_data " +
             f"WHERE scenario = {scenario.id} " +
+            f"AND result = {data['result_pid']} " +
             f"AND reach = {reach.pamhyr_id} " +
             f"AND section = {profile.pamhyr_id}"
         )
@@ -402,7 +403,7 @@ class Reach(SQLSubModel):
 class River(SQLSubModel):
     _sub_classes = [Reach]
 
-    def __init__(self, study, parent):
+    def __init__(self, study, parent, init=True):
         super(River, self).__init__(
             id=-1, status=study.status,
             owner_scenario=study.status.scenario.id
@@ -413,6 +414,9 @@ class River(SQLSubModel):
 
         # Dict with timestamps as key
         self._reachs = []
+        if init:
+            for i, _ in enumerate(self._study.river.enable_edges()):
+                self.add(i)
 
     def __len__(self):
         return len(self._reachs)
@@ -452,7 +456,7 @@ class River(SQLSubModel):
 
             reach.update_water_limits(
                 timestamp,
-                data[ind[0]:ind[1]]
+                data[ind[0]:ind[1] + 1]
             )
 
     @classmethod
@@ -468,7 +472,7 @@ class River(SQLSubModel):
         study = data["study"]
         parent = data["parent"]
 
-        new_river = cls(study, parent)
+        new_river = cls(study, parent, init=False)
 
         for reach in study.river.reachs():
             data["reach"] = reach.reach

src/Model/Results/River/RiverAdisTS.py

@@ -64,13 +64,15 @@ class Profile(object):
 
 
 class Reach(object):
-    def __init__(self, reach, study):
+    def __init__(self, reach, study, profiles=None):
         self._study = study
         self._reach = reach  # Source reach in the study
+        if profiles is None:
+            profiles = reach.profiles
         self._profiles = list(
             map(
                 lambda p: Profile(p, self._study),
-                reach.profiles
+                profiles
             )
         )
 
@@ -89,6 +91,10 @@ class Reach(object):
     def profiles(self):
         return self._profiles.copy()
 
+    def get_rk(self):
+        """Return the PK values for profiles present in the results."""
+        return [profile.rk for profile in self._profiles]
+
     def profile(self, id):
         return self._profiles[id]
 
@@ -119,10 +125,10 @@ class River(object):
     def has_reach(self, id):
         return 0 <= id < len(self._reachs)
 
-    def add(self, reach_id):
+    def add(self, reach_id, profiles=None):
         reachs = self._study.river.enable_edges()
 
-        new = Reach(reachs[reach_id].reach, self._study)
+        new = Reach(reachs[reach_id].reach, self._study, profiles=profiles)
 
         self._reachs.append(new)
         return new

src/Model/River.py

@@ -69,6 +69,7 @@ from Model.WeatherParameters.WeatherParametersList \
     import WeatherParametersList
 
 from Model.GeoTIFF.GeoTIFFList import GeoTIFFList
+from Model.Ensembles.EnsembleList import EnsembleList
 from Model.Results.Results import Results
 
 logger = logging.getLogger()
@@ -487,6 +488,7 @@ class River(Graph):
         BoundaryConditionsTemperatureList,
         WeatherParametersList,
         GeoTIFFList,
+        EnsembleList,
         Results
     ]
 
@@ -532,6 +534,9 @@ class River(Graph):
 
         self._geotiff = GeoTIFFList(status=self._status)
 
+        # Scenario ensemble
+        self._ensembles = EnsembleList(status=self._status)
+
         self._results = {}
 
     @classmethod
@@ -650,6 +655,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):
@@ -688,6 +695,8 @@ class River(Graph):
 
         objs.append(self._geotiff)
 
+        objs.append(self._ensembles)
+
         for solv_type in self.results:
             objs.append(self.results[solv_type])
 
@@ -766,7 +775,7 @@ class River(Graph):
             self._InitialConditionsTemperature,
             self._BoundaryConditionsTemperature,
             self._WeatherParameters,
-            self._geotiff,
+            self._geotiff, self._ensembles,
         ]
 
         for solver in self._parameters:
@@ -907,6 +916,55 @@ Last export at: @date."""
     def weather_parameters(self):
         return self._WeatherParameters
 
+    def profile_dependencies(self, profile):
+        """Return model data which directly reference *profile*.
+
+        PK-based intervals are deliberately not included: only explicit
+        references to the profile object prevent it from being disabled.
+        """
+        dependencies = []
+
+        def add(kind, item, association):
+            dependencies.append({
+                "kind": kind,
+                "item": item,
+                "association": association,
+            })
+
+        for structure in self._hydraulic_structures.lst:
+            if structure.input_section is profile:
+                add("hydraulic_structure", structure, "")
+
+        for tab in self._lateral_contribution._tabs_list:
+            for contribution in self._lateral_contribution.get_tab(tab):
+                if contribution.begin_section is profile:
+                    add("lateral_contribution", contribution, "begin_section")
+                if contribution.end_section is profile:
+                    add("lateral_contribution", contribution, "end_section")
+
+        for parameter in self._WeatherParameters.lst:
+            if parameter.begin_section is profile:
+                add("weather_parameter", parameter, "begin_section")
+            if parameter.end_section is profile:
+                add("weather_parameter", parameter, "end_section")
+
+        reach_id = profile.reach.pamhyr_id
+        for initial_condition in self._InitialConditionsTemperature.lst:
+            for specification in initial_condition.data:
+                same_reach = specification.reach == reach_id
+                same_rk = (
+                    specification.start_rk == profile.rk or
+                    specification.end_rk == profile.rk
+                )
+                if same_reach and same_rk:
+                    add(
+                        "initial_condition_temperature",
+                        specification,
+                        "cross_section_pk",
+                    )
+
+        return dependencies
+
     def get_params(self, solver):
         if solver in self._parameters:
             return self._parameters[solver]
@@ -963,6 +1021,12 @@ Last export at: @date."""
         self._results[solv_type] = results
 
     def _split_reach(self, reach, profile):
+        profiles = reach.reach.profiles
+        if not profiles or profile not in profiles[1:-1]:
+            raise ValueError(
+                "A reach cannot be split at its first or last profile"
+            )
+
         node1 = reach.node1
         node2 = reach.node2
 
@@ -1000,5 +1064,11 @@ Last export at: @date."""
         self._WeatherParameters.split_reach(
             reach, profile, r1, r2
         )
+        self._D90AdisTS.split_reach(
+            reach, profile, r1, r2
+        )
+        self._DIFAdisTS.split_reach(
+            reach, profile, r1, r2
+        )
 
         return r1, r2

src/Model/Scenario.py

@@ -58,6 +58,7 @@ class Scenario(SQLSubModel):
         "initial_conditions_temperature",
         "initial_conditions_temperature_spec",
         "weather_parameters", "weather_parameters_data",
+        "ensemble",
     ]
 
     related_tables = tables_with_deleted_column + [
@@ -72,6 +73,7 @@ class Scenario(SQLSubModel):
                  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__()
@@ -81,6 +83,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
 
@@ -103,6 +106,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)
           )
@@ -138,6 +142,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
@@ -158,7 +169,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"
         )
@@ -170,6 +182,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)
 
@@ -179,7 +192,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
 
@@ -189,21 +204,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
@@ -328,6 +340,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
@@ -345,6 +360,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

@@ -57,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
 

src/Model/Study.py

@@ -21,7 +21,7 @@ import shutil
 import logging
 from datetime import datetime
 
-from tools import timer, timestamp
+from tools import timer, timestamp, parse_datetime
 from functools import reduce
 
 from Model.Tools.PamhyrListExt import PamhyrModelList
@@ -32,7 +32,9 @@ from Model.Scenario import Scenario
 from Model.Status import StudyStatus
 from Model.Except import NotImplementedMethodeError
 from Model.River import River
+from Model.TimeShift import shift_river_times, shift_database_times
 from Model.Geometry.Reach import Reach
+from Model.Ensembles.DistributionList import DistributionList
 from Model.HydraulicStructures.HydraulicStructures import (
     HydraulicStructure
 )
@@ -46,10 +48,11 @@ logger = logging.getLogger()
 
 
 class Study(SQLModel):
-    _version = "0.2.9"
+    _version = "0.2.10"
 
     _sub_classes = [
         Scenario,
+        DistributionList,
         River,
     ]
 
@@ -72,6 +75,7 @@ class Study(SQLModel):
         self.description = ""
         # Time system
         self._time_system = "time"
+        self._pending_time_offset = 0.0
         self._date = datetime.fromtimestamp(0)
 
         if init_new:
@@ -84,6 +88,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)
@@ -198,6 +205,16 @@ class Study(SQLModel):
         self._date = date
         self.status.modified()
 
+    def change_start_date(self, date, preserve_dates=False):
+        """Change the origin, optionally preserving series calendar dates."""
+        new_date = parse_datetime(date)
+        offset = (parse_datetime(self.date) - new_date).total_seconds()
+        if preserve_dates and offset:
+            shift_river_times(self.river, offset)
+            self._pending_time_offset += offset
+            self._river_scenario_cache.clear()
+        self.use_date(new_date)
+
     @property
     def date(self):
         return self._date
@@ -217,8 +234,7 @@ class Study(SQLModel):
         me.name = name
         me.description = description
         if date is not None:
-            me.use_date()
-            me.date = date
+            me.use_date(date)
         return me
 
     @classmethod
@@ -290,7 +306,14 @@ class Study(SQLModel):
         if major == "0" and int(minor) < 2:
             self._add_into_info_if_not_exists('current_scenario', '0')
 
-        if major == "0" and int(minor) < 2:
+        needs_foreign_keys_disabled = (
+            major == "0" and (
+                int(minor) < 2 or
+                (minor == "2" and int(release) < 10)
+            )
+        )
+
+        if needs_foreign_keys_disabled:
             # Need to temporary disable the sqlite foreign keys
             # checking to update db dans change the table id fk to
             # table pamhyr_id fk
@@ -300,7 +323,7 @@ class Study(SQLModel):
 
         ok = self._update_submodel(version[0], data={})
 
-        if major == "0" and int(minor) < 2:
+        if needs_foreign_keys_disabled:
             # Reactivate foreign keys checking
             self.execute(
                 "PRAGMA foreign_keys = ON;"
@@ -388,12 +411,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
@@ -454,8 +484,38 @@ class Study(SQLModel):
         )
         progress()
 
+        if self._pending_time_offset:
+            self._db.execute('SAVEPOINT shift_time_origin')
+            try:
+                shift_database_times(self._db, self._pending_time_offset)
+                self._db.execute('RELEASE SAVEPOINT shift_time_origin')
+            except Exception:
+                self._db.execute('ROLLBACK TO SAVEPOINT shift_time_origin')
+                self._db.execute('RELEASE SAVEPOINT shift_time_origin')
+                raise
+            self._pending_time_offset = 0.0
+
+        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
         )
 
@@ -573,7 +633,8 @@ class Study(SQLModel):
         data = {
             "status": self.status,
             "loaded_pid": set(),
-            "scenario": scenario
+            "scenario": scenario,
+            "ens_distributions": self._ens_distributions,
         }
 
         self.status.start_loading()
@@ -588,6 +649,9 @@ class Study(SQLModel):
             self.status.stop_loading()
             self.status.scenario = old_scenario
 
+        if self._pending_time_offset:
+            shift_river_times(river, self._pending_time_offset)
+
         # FIXME: Disable scenario cache to save memory usage
         # self._river_scenario_cache[scenario] = river
 
@@ -647,6 +711,7 @@ class Study(SQLModel):
                     self.status.scenario.y + 100)
 
         new.name = self.status.scenario.name + " (copy)"
+        new.is_ensemble = self.status.scenario.is_ensemble
 
         self.status.scenario = new
         self.river._data_traversal(
@@ -658,6 +723,25 @@ class Study(SQLModel):
         self.status.set_as_editable()
         return new
 
+    def create_ensemble_scenario(self, pos=None, switch=True):
+        new = self.scenarios.new(
+            self.status.scenario,
+            is_ensemble=True
+        )
+
+        new.name = self.status.scenario.name + " (ensemble)"
+        if pos is not None:
+            new.set_pos(pos.x(), pos.y())
+        else:
+            new.set_pos(self.status.scenario.x + 100,
+                        self.status.scenario.y)
+
+        if switch:
+            self.status.scenario = new
+
+        self.status.set_as_read_only()
+        return new
+
     @property
     def results(self):
         return self._river.results

src/Model/TimeShift.py

@@ -0,0 +1,82 @@
+"""Shift temporal series when preserving calendar dates across a new origin."""
+from Model.BoundaryCondition.BoundaryCondition import BoundaryCondition
+from Model.LateralContribution.LateralContribution import LateralContribution
+from Model.WeatherParameters.WeatherParameters import WeatherParameters
+from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
+    BoundaryConditionAdisTS
+)
+from Model.LateralContributionsAdisTS.LateralContributionAdisTS import (
+    LateralContributionAdisTS
+)
+from Model.BoundaryConditionsTemperature.BoundaryConditionTemperature import (
+    BoundaryConditionTemperature
+)
+
+
+def shift_river_times(river, offset):
+    changes = []
+    seen = set()
+
+    def collect(obj, data):
+        temporal = isinstance(obj, (
+            BoundaryConditionAdisTS,
+            LateralContributionAdisTS,
+            BoundaryConditionTemperature
+        ))
+        if isinstance(obj, (
+            BoundaryCondition, LateralContribution, WeatherParameters
+        )):
+            temporal = bool(obj.header) and obj.header[0] == 'time'
+        if temporal:
+            for point in obj._data:
+                if id(point) not in seen:
+                    changes.append((point, float(point[0]) + offset))
+                    seen.add(id(point))
+
+    river._data_traversal(modifier=collect)
+    for point, value in changes:
+        # This is a global change of origin, not a scenario-specific edit.
+        point[0] = value
+
+
+def shift_database_times(connection, offset):
+    tables = [
+        (
+            'boundary_condition_data', 'boundary_condition',
+            'bc', BoundaryCondition
+        ),
+        (
+            'lateral_contribution_data', 'lateral_contribution',
+            'lc', LateralContribution
+        ),
+        (
+            'weather_parameters_data', 'weather_parameters',
+            'wp', WeatherParameters
+        ),
+        ('boundary_condition_data_adists', None, None, None),
+        ('lateral_contribution_data_adists', None, None, None),
+        ('boundary_condition_data_temperature', None, None, None),
+    ]
+    for table, parent, fk, model in tables:
+        if model is None:
+            rows = connection.execute(
+                f'SELECT rowid, data0 FROM {table}'
+            ).fetchall()
+        else:
+            rows = []
+            for kind, in connection.execute(
+                f'SELECT DISTINCT type FROM {parent}'
+            ):
+                headers = model._get_ctor_from_type(kind)().header
+                if not headers or headers[0] != 'time':
+                    continue
+                rows.extend(connection.execute(
+                    f'SELECT d.rowid, d.data0 FROM {table} d JOIN {parent} p '
+                    f'ON p.pamhyr_id=d.{fk} AND p.scenario=d.scenario '
+                    f'WHERE p.type=?',
+                    (kind,)
+                ).fetchall())
+        connection.executemany(
+            f'UPDATE {table} SET data0=? WHERE rowid=?',
+            [(float(value) + offset, rowid) for rowid, value in rows]
+        )

src/Model/Tools/PamhyrDB.py

@@ -185,6 +185,13 @@ class SQLSubModel(PamhyrID):
         else:
             self._owner_scenario = owner_scenario
 
+    def __str__(self):
+        t = type(self)
+        return (
+            f"'{t.__module__}.{t.__name__}" +
+            f"@{self._pamhyr_id}.{self._owner_scenario}'"
+        )
+
     def must_be_saved(self):
         """Return True if this object MUST be save in the save file.
 

src/Model/WeatherParameters/WeatherParameters.py

@@ -73,7 +73,7 @@ class Data(SQLSubModel):
         major, minor, release = version.strip().split(".")
 
         if major == "0" and (int(minor) < 2 or
-                             (int(minor) == 2 and int(release) < 7)):
+                             (int(minor) == 2 and int(release) <= 7)):
             if not cls.is_table_exists(execute, "air_temperature_data"):
                 cls._db_create(execute)
 
@@ -341,7 +341,7 @@ class WeatherParameters(SQLSubModel):
         created = False
 
         if major == "0" and (int(minor) < 2 or
-                             (int(minor) == 2 and int(release) < 7)):
+                             (int(minor) == 2 and int(release) < 10)):
             if not cls.is_table_exists(execute, "air_temperature"):
                 cls._db_create(execute)
                 created = True
@@ -652,14 +652,38 @@ class WeatherParameters(SQLSubModel):
 
     def add(self, index: int):
         value = Data(self._default_0, self._default_1, status=self._status)
-        self._data.insert(index, value)
-        self.modified()
+        self.insert(index, value)
         return value
 
     def insert(self, index: int, value):
+        visible_data = self.data
+        if index < len(visible_data):
+            index = self._data.index(visible_data[index])
+        else:
+            index = len(self._data)
         self._data.insert(index, value)
         self.modified()
 
+    def set_data_value(self, value, column, data):
+        value[column] = self._types[column](data)
+        self.modified()
+
+    def set_deleted(self, values, deleted):
+        for value in values:
+            if deleted:
+                value.set_as_deleted()
+            else:
+                value.set_as_not_deleted()
+        self.modified()
+
+    def reorder(self, values):
+        values = iter(values)
+        self._data = [
+            value if value.is_deleted() else next(values)
+            for value in self._data
+        ]
+        self.modified()
+
     def delete_i(self, indexes):
         self._data = list(
             map(
@@ -708,10 +732,7 @@ class WeatherParameters(SQLSubModel):
         return lst
 
     def _set_i_c_v(self, index, column, value):
-        v = self._data[index]
-        v[column] = self._types[column](value)
-        self._data[index] = v
-        self.modified()
+        self.set_data_value(self.get_i(index), column, value)
 
     def set_i_0(self, index: int, value):
         self._set_i_c_v(index, 0, value)
@@ -742,15 +763,13 @@ class WeatherParameters(SQLSubModel):
         return new
 
     def move_up(self, index):
-        if index < len(self):
-            next = index - 1
-            d = self._data
-            d[index], d[next] = d[next], d[index]
-            self.modified()
+        if 0 < index < len(self):
+            data = self.data
+            data[index - 1], data[index] = data[index], data[index - 1]
+            self.reorder(data)
 
     def move_down(self, index):
-        if index >= 0:
-            prev = index + 1
-            d = self._data
-            d[index], d[prev] = d[prev], d[index]
-            self.modified()
+        if 0 <= index < len(self) - 1:
+            data = self.data
+            data[index], data[index + 1] = data[index + 1], data[index]
+            self.reorder(data)

src/Model/WeatherParameters/WeatherParametersList.py

@@ -204,7 +204,7 @@ class WeatherParametersList(PamhyrModelList):
             for new_reach, part_lower, part_upper, sections in parts:
                 clipped_lower = max(lower, part_lower)
                 clipped_upper = min(upper, part_upper)
-                if clipped_lower > clipped_upper:
+                if clipped_lower >= clipped_upper:
                     continue
 
                 begin_index = clipped_upper if reverse else clipped_lower

src/Solver/AdisTS.py

@@ -408,6 +408,41 @@ class AdisTS(CommandLineSolver):
     # RESULTS #
     ###########
 
+    @staticmethod
+    def _remove_temperature_results(repertory):
+        """Remove temperature outputs generated but unused by AdisTS."""
+        results_directory = os.path.join(repertory, "resultats")
+        if not os.path.isdir(results_directory):
+            results_directory = repertory
+
+        if not os.path.isdir(results_directory):
+            return
+
+        for filename in os.listdir(results_directory):
+            if not (filename.startswith("TEM.") or
+                    filename.startswith("TEM_")):
+                continue
+
+            filepath = os.path.join(results_directory, filename)
+            if os.path.isfile(filepath):
+                try:
+                    os.remove(filepath)
+                    logger.debug(
+                        f"Removed unused AdisTS result '{filepath}'"
+                    )
+                except OSError as error:
+                    logger.warning(
+                        f"Unable to remove AdisTS result '{filepath}': "
+                        f"{error}"
+                    )
+
+    def run_output_data_fomater(self, study):
+        # AdisTS generates temperature results that are not used by the solver,
+        # but they are still present in the output directory.
+        # Remove them to avoid confusion.
+        self._remove_temperature_results(self._process.workingDirectory())
+        return super(AdisTS, self).run_output_data_fomater(study)
+
     def read_bin(self, study, repertory, results, qlog=None, name="0"):
         return
 

src/Solver/CommandLine.py

@@ -19,8 +19,9 @@
 import os
 import logging
 
-from datetime import datetime
+from datetime import datetime, timezone
 from tools import timer, parse_command_line, get_version, logger_exception
+from tools import parse_datetime
 
 try:
     # Installation allow Unix-like signal
@@ -158,11 +159,15 @@ class CommandLineSolver(AbstractSolver):
             txt = add_file.text
             txt = txt.replace("@version", get_version())
             txt = txt.replace("@date", datetime.now().isoformat(sep=" "))
+            txt = self._prepare_additional_file_text(add_file.path, txt)
 
             f.write(txt)
 
         return files
 
+    def _prepare_additional_file_text(self, path, text):
+        return text
+
     def export_study_description(self, study, repertory, qlog, name="0"):
         files = []
 

src/Solver/Mage.py

@@ -303,7 +303,7 @@ class Mage(CommandLineSolver):
         # Point line
         wfile.write(f"{x} {y} {z} {n} {sediment}\n")
 
-    def _export_BC(self, t, bounds, repertory, qlog, name="0"):
+    def _export_BC(self, study, t, bounds, repertory, qlog, name="0"):
         files = []
 
         if len(bounds) == 0:
@@ -333,7 +333,7 @@ class Mage(CommandLineSolver):
                     v1 = d[1]
 
                     if t in ["HYD", "LIM"]:
-                        v0 /= 60  # Convert first column to minute
+                        v0 /= 60  # Convert first column to minutes
 
                     f.write(f"{v0:9} {v1:9} \n")
 
@@ -365,10 +365,17 @@ class Mage(CommandLineSolver):
                 elif bound.bctype == "SL":
                     QSO.append(bound)
 
-        files = files + self._export_BC("AVA", AVA, repertory, qlog, name=name)
-        files = files + self._export_BC("HYD", HYD, repertory, qlog, name=name)
-        files = files + self._export_BC("LIM", LIM, repertory, qlog, name=name)
-        files = files + self._export_QSO(QSO, repertory, qlog, name=name)
+        files = files + self._export_BC(
+            study, "AVA", AVA, repertory, qlog, name=name
+        )
+        files = files + self._export_BC(
+            study, "HYD", HYD, repertory, qlog, name=name
+        )
+        files = files + self._export_BC(
+            study, "LIM", LIM, repertory, qlog, name=name
+        )
+        files = files + self._export_QSO(study, QSO, repertory,
+                                         qlog, name=name)
 
         return files
 
@@ -422,10 +429,11 @@ class Mage(CommandLineSolver):
             if d.is_deleted():
                 continue
 
+            time = d[0]
             if lateral.lctype in ["EV"]:
-                f.write(f"{d[0]:10.3f}{-d[1]:10.3f}\n")
+                f.write(f"{time:10.3f}{-d[1]:10.3f}\n")
             else:
-                f.write(f"{d[0]:10.3f}{d[1]:10.3f}\n")
+                f.write(f"{time:10.3f}{d[1]:10.3f}\n")
 
     def _export_RUG(self, study, repertory, qlog, name="0"):
         files = []
@@ -686,6 +694,23 @@ class Mage(CommandLineSolver):
 
         return res
 
+    def _prepare_additional_file_text(self, path, text):
+        if os.path.splitext(path)[1].lower() != ".var":
+            return text
+
+        lines = []
+        for line in text.splitlines(keepends=True):
+            stripped = line.lstrip()
+            fields = stripped.split()
+            if stripped.startswith("$"):
+                # MAGE only recognizes rule markers in the first column.
+                line = stripped
+            elif (not stripped.startswith("*") and len(fields) >= 2
+                  and fields[1] == "W2Z"):
+                line = "$ " + stripped
+            lines.append(line)
+        return "".join(lines)
+
     def _export_VAR(self, study, repertory, qlog, name="0"):
         files = []
 
@@ -736,9 +761,11 @@ class Mage(CommandLineSolver):
                         name = bhs.name
                         if name == "":
                             name = f"HS_{bhs.id:>3}".replace(" ", "0")
+                        else:
+                            name = name.replace(" ", "_")
 
                         f.write(
-                            f"${name} clapet"
+                            f"${name} clapet\n"
                         )
         return files
 
@@ -964,7 +991,7 @@ class Mage8(Mage):
 
         return files
 
-    def _export_QSO(self, bounds, repertory, qlog, name="0"):
+    def _export_QSO(self, study, bounds, repertory, qlog, name="0"):
         files = []
 
         if len(bounds) == 0:
@@ -994,7 +1021,8 @@ class Mage8(Mage):
 
                 # Data
                 for d in bound.data:
-                    f.write(f"{d[0]/60:10.3f}{d[1]:10.3f}\n")
+                    time = d[0] / 60
+                    f.write(f"{time:10.3f}{d[1]:10.3f}\n")
 
         return files
 
@@ -1035,6 +1063,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 #
     ###########
@@ -1465,6 +1562,171 @@ 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_tmp_M2"] = np.zeros(z.shape)
+            res["q_tmp_M2"] = np.zeros(q.shape)
+
+            res["z_std_derivation"] = np.zeros(z.shape)
+            res["q_std_derivation"] = np.zeros(q.shape)
+
+            res["z_min"] = z
+            res["z_max"] = z
+
+            res["q_min"] = q
+            res["q_max"] = q
+        else:
+            # Get mean results for Z and Q
+            n = run_number
+            for x, txt in [(z, "z"), (q, "q")]:
+                t_mean = f"{txt}_mean"
+                t_M2 = f"{txt}_tmp_M2"
+                t_std_deriv = f"{txt}_std_derivation"
+
+                delta = x - res[t_mean]
+
+                res[t_mean] += delta / n
+
+                delta_2 = x - res[t_mean]
+
+                res[t_M2] += delta * delta_2
+                res[t_std_deriv] = np.sqrt(res[t_M2] / n)
+
+            # 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"])
+
+    @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"

src/View/BoundaryCondition/Edit/Table.py

@@ -24,7 +24,7 @@ from datetime import date, time, datetime, timedelta
 from tools import (
     trace, timer,
     timestamp_to_old_pamhyr_date,
-    old_pamhyr_date_to_timestamp
+    old_pamhyr_date_to_timestamp, format_datetime, parse_datetime
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -94,10 +94,13 @@ class TableModel(PamhyrTableModel):
                     v = v.replace(',', '.')
                 value = f"{float(v):.4f}"
             elif self._data.header[column] == "time":
-                if self._opt_data == "time":
+                if self.time_system == "time":
                     value = timestamp_to_old_pamhyr_date(int(v))
                 else:
-                    value = str(datetime.fromtimestamp(v))
+                    value = format_datetime(
+                        parse_datetime(self.start_date)
+                        + timedelta(seconds=float(v))
+                    )
             else:
                 value = f"{v}"
 
@@ -114,6 +117,10 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         try:
+            if (self._data.header[column] == "time"
+                    and self.time_system == "date"):
+                value = self.date_to_elapsed_seconds(value)
+
             row = self.get_true_data_row(row)
 
             self._undo.push(
@@ -232,17 +239,18 @@ class TableModel(PamhyrTableModel):
         if len(data) == 0:
             return
 
+        try:
+            rows = [self._data.new_from_data(header, d) for d in data]
+        except (ValueError, TypeError, IndexError) as error:
+            logger.warning(error)
+            return False
+
         self.layoutAboutToBeChanged.emit()
 
         self._undo.push(
             PasteCommand(
                 self._data, row,
-                list(
-                    map(
-                        lambda d: self._data.new_from_data(header, d),
-                        data
-                    )
-                )
+                rows
             )
         )
 

src/View/BoundaryCondition/Edit/Window.py

@@ -18,6 +18,8 @@
 
 import logging
 
+from Modules import Modules
+
 from tools import timer, trace
 
 from numpy import sqrt
@@ -173,7 +175,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             },
             data=self._data,
             undo=self._undo_stack,
-            opt_data=self._study.time_system
+            opt_data=self._study.time_system,
+            study=self._study
         )
 
         table.setModel(self._table)
@@ -261,6 +264,11 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             self._d50sigma.set_d50(self._data.d50)
             self._d50sigma.set_sigma(self._data.sigma)
 
+    def _propagated_update(self, key=Modules(0)):
+        if Modules.STUDY in key:
+            self._table.layoutChanged.emit()
+            self.plot.update()
+
     def update(self):
         self.plot.update()
 

src/View/BoundaryCondition/UndoCommand.py

@@ -124,7 +124,7 @@ class DelCommand(QUndoCommand):
             self._bcs.insert(self._tab, row, el)
 
     def redo(self):
-        self._bcs.delete_i(self._tab, self._rows)
+        self._bcs.delete(self._tab, [el for _, el in self._bc])
 
 
 class SortCommand(QUndoCommand):

src/View/BoundaryConditionsAdisTS/Edit/Table.py

@@ -21,10 +21,11 @@ import traceback
 
 from datetime import date, time, datetime, timedelta
 
+from tools import parse_datetime
 from tools import (
     trace, timer,
     timestamp_to_old_pamhyr_date,
-    old_pamhyr_date_to_timestamp
+    old_pamhyr_date_to_timestamp, format_datetime
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -84,10 +85,13 @@ class TableModel(PamhyrTableModel):
             if self._data._types[column] == float:
                 value = f"{v:.4f}"
             elif self._data.header[column] == "time":
-                if self._opt_data == "time":
+                if self.time_system == "time":
                     value = timestamp_to_old_pamhyr_date(int(v))
                 else:
-                    value = str(datetime.fromtimestamp(v))
+                    value = format_datetime(
+                        parse_datetime(self.start_date)
+                        + timedelta(seconds=float(v))
+                    )
             else:
                 value = f"{v}"
 
@@ -104,6 +108,10 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         try:
+            if (self._data.header[column] == "time"
+                    and self.time_system == "date"):
+                value = self.date_to_elapsed_seconds(value)
+
             row = self.get_true_data_row(row)
 
             self._undo.push(
@@ -163,17 +171,18 @@ class TableModel(PamhyrTableModel):
         if len(data) == 0:
             return
 
+        try:
+            rows = [self._data.new_from_data(header, d) for d in data]
+        except (ValueError, TypeError, IndexError) as error:
+            logger.warning(error)
+            return False
+
         self.layoutAboutToBeChanged.emit()
 
         self._undo.push(
             PasteCommand(
                 self._data, row,
-                list(
-                    map(
-                        lambda d: self._data.new_from_data(header, d),
-                        data
-                    )
-                )
+                rows
             )
         )
 

src/View/BoundaryConditionsAdisTS/Edit/Window.py

@@ -18,6 +18,8 @@
 
 import logging
 
+from Modules import Modules
+
 from tools import timer, trace
 
 from View.Tools.PamhyrWindow import PamhyrWindow
@@ -64,14 +66,22 @@ class EditBoundaryConditionWindow(PamhyrWindow):
         name = trad[self._pamhyr_name]
 
         if self._data is not None:
+            pollutant_name = next(
+                (
+                    pollutant.name
+                    for pollutant in study.river.Pollutants.Pollutants_List
+                    if pollutant.id == self._data.pollutant
+                ),
+                None
+            )
             n = self._data.node
             node_name = next(filter(
                 lambda x: x.id == n, study.river._nodes
             )).name
-            name += (
-                f" - {study.name} " +
-                f"({node_name})"
-            )
+            name += f" - {study.name}"
+            if pollutant_name is not None:
+                name += f" - {pollutant_name}"
+            name += f" ({node_name})"
 
         super(EditBoundaryConditionWindow, self).__init__(
             title=name,
@@ -120,7 +130,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             },
             data=self._data,
             undo=self._undo_stack,
-            opt_data=self._study.time_system
+            opt_data=self._study.time_system,
+            study=self._study
         )
 
         table.setModel(self._table)
@@ -153,6 +164,11 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             self.find(QAction, "action_sort").triggered.connect(self.sort)
         self._table.dataChanged.connect(self.update)
 
+    def _propagated_update(self, key=Modules(0)):
+        if Modules.STUDY in key:
+            self._table.layoutChanged.emit()
+            self.plot.update()
+
     def update(self):
         self.plot.update()
         self.plot.fit_to_data()

src/View/BoundaryConditionsTemperature/Edit/Table.py

@@ -21,10 +21,11 @@ import traceback
 
 from datetime import date, time, datetime, timedelta
 
+from tools import parse_datetime
 from tools import (
     trace, timer,
     timestamp_to_old_pamhyr_date,
-    old_pamhyr_date_to_timestamp
+    old_pamhyr_date_to_timestamp, format_datetime
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -84,10 +85,13 @@ class TableModel(PamhyrTableModel):
             if self._data._types[column] == float:
                 value = f"{v:.2f}"
             elif self._data.header[column] == "time":
-                if self._opt_data == "time":
+                if self.time_system == "time":
                     value = timestamp_to_old_pamhyr_date(int(v))
                 else:
-                    value = str(datetime.fromtimestamp(v))
+                    value = format_datetime(
+                        parse_datetime(self.start_date)
+                        + timedelta(seconds=float(v))
+                    )
             else:
                 value = f"{v}"
 
@@ -104,6 +108,10 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         try:
+            if (self._data.header[column] == "time"
+                    and self.time_system == "date"):
+                value = self.date_to_elapsed_seconds(value)
+
             row = self.get_true_data_row(row)
 
             self._undo.push(
@@ -163,17 +171,18 @@ class TableModel(PamhyrTableModel):
         if len(data) == 0:
             return
 
+        try:
+            rows = [self._data.new_from_data(header, d) for d in data]
+        except (ValueError, TypeError, IndexError) as error:
+            logger.warning(error)
+            return False
+
         self.layoutAboutToBeChanged.emit()
 
         self._undo.push(
             PasteCommand(
                 self._data, row,
-                list(
-                    map(
-                        lambda d: self._data.new_from_data(header, d),
-                        data
-                    )
-                )
+                rows
             )
         )
 

src/View/BoundaryConditionsTemperature/Edit/Window.py

@@ -18,6 +18,8 @@
 
 import logging
 
+from Modules import Modules
+
 from tools import timer, trace
 
 from View.Tools.PamhyrWindow import PamhyrWindow
@@ -117,7 +119,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             },
             data=self._data,
             undo=self._undo_stack,
-            opt_data=self._study.time_system
+            opt_data=self._study.time_system,
+            study=self._study
         )
 
         table.setModel(self._table)
@@ -150,6 +153,11 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             self.find(QAction, "action_sort").triggered.connect(self.sort)
         self._table.dataChanged.connect(self.update)
 
+    def _propagated_update(self, key=Modules(0)):
+        if Modules.STUDY in key:
+            self._table.layoutChanged.emit()
+            self.plot.update()
+
     def update(self):
         self.plot.update()
         self.plot.fit_to_data()

src/View/D90AdisTS/Table.py

@@ -123,9 +123,16 @@ class D90TableModel(PamhyrTableModel):
             self._undo.indexChanged.connect(lambda _: self.update())
 
     def _setup_lst(self):
+        enabled_reaches = {
+            reach.id for reach in self._river.enable_edges()
+        }
         self._lst = list(
             filter(
-                lambda d90: d90._deleted is False,
+                lambda d90: (
+                    d90._deleted is False
+                    and (d90.reach in (None, -1)
+                         or d90.reach in enabled_reaches)
+                ),
                 self._data._data
             )
         )

src/View/DIFAdisTS/Table.py

@@ -125,9 +125,16 @@ class DIFTableModel(PamhyrTableModel):
             self._undo.indexChanged.connect(lambda _: self.update())
 
     def _setup_lst(self):
+        enabled_reaches = {
+            reach.id for reach in self._river.enable_edges()
+        }
         self._lst = list(
             filter(
-                lambda dif: dif._deleted is False,
+                lambda dif: (
+                    dif._deleted is False
+                    and (dif.reach in (None, -1)
+                         or dif.reach in enabled_reaches)
+                ),
                 self._data._data
             )
         )

src/View/Debug/Window.py

@@ -16,6 +16,8 @@
 
 # -*- coding: utf-8 -*-
 
+import os
+import psutil
 import logging
 import traceback
 
@@ -120,7 +122,10 @@ class TimerWindow(PamhyrWindow):
             parent=parent
         )
 
+        self._process = psutil.Process(os.getpid())
+
         self.setup_table()
+        self.setup_label()
         self.setup_alarm()
         self.setup_connections()
 
@@ -136,6 +141,15 @@ class TimerWindow(PamhyrWindow):
             data=None,
         )
 
+    def setup_label(self):
+        label = self.find(QLabel, "label")
+        label.setText(
+            f" Memory usage:\t" +
+            "<b>" +
+            f"{self._process.memory_info().rss / (1000 * 1000):.3f}" +
+            "</b> MB"
+        )
+
     def setup_alarm(self):
         self._alarm = QTimer()
         self._alarm.start(2000)
@@ -148,6 +162,7 @@ class TimerWindow(PamhyrWindow):
 
     def update(self):
         self._table.update_lst()
+        self.setup_label()
 
     # def reset(self):
     #     self._table.reset_timers()

src/View/Ensembles/Edit/Translate.py

@@ -0,0 +1,64 @@
+# Translate.py -- Pamhyr
+# 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
+# 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 PyQt5.QtCore import QCoreApplication
+
+from View.Ensembles.Translate import EnsemblesTranslate
+
+_translate = QCoreApplication.translate
+
+
+class EnsembleEditTranslate(EnsemblesTranslate):
+    def __init__(self):
+        super(EnsembleEditTranslate, self).__init__()
+
+        self._dict["binomial_n"] = _translate("Ensemble", "n")
+        self._dict["binomial_p"] = _translate("Ensemble", "p")
+
+        self._dict["poisson_lam"] = _translate("Ensemble", "Lam")
+
+        self._dict["checker_failed_title"] = _translate(
+            "Ensemble",
+            "Invalid parameter"
+        )
+        self._dict["checker_failed_text"] = _translate(
+            "Ensemble",
+            "This parameter is not valid for selected distribution: "
+        )
+
+        uniform = _translate(
+            "Ensemble", "(High - Low) must be non-negative."
+        )
+        self._dict["uniform_low_tips"] = uniform
+        self._dict["uniform_high_tips"] = uniform
+
+        self._dict["normal_scale_tips"] = _translate(
+            "Ensemble", "Scale must be non-negative."
+        )
+
+        self._dict["binomial_n_tips"] = _translate(
+            "Ensemble", "N must be non-negative and must be an integers."
+        )
+
+        self._dict["binomial_p_tips"] = _translate(
+            "Ensemble", "P must be >= 0 and <=1."
+        )
+
+        self._dict["poisson_lam_tips"] = _translate(
+            "Ensemble", "Lam must be >= 0."
+        )

src/View/Ensembles/Edit/Window.py

@@ -0,0 +1,320 @@
+# Window.py -- Pamhyr
+# 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
+# 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 logging
+
+from tools import trace, timer, logger_exception
+
+from View.Tools.PamhyrWindow import PamhyrWindow, PamhyrDialog
+from View.Tools.PamhyrWidget import PamhyrWidget
+from View.Tools.PamhyrTree import (
+    PamhyrModelItem, PamhyrModelListItem,
+)
+
+from PyQt5.QtGui import (
+    QKeySequence,
+)
+
+from PyQt5 import QtWidgets
+from PyQt5.QtCore import (
+    Qt, QVariant, QAbstractTableModel,
+    QCoreApplication, QModelIndex, pyqtSlot,
+    QRect, QSettings,
+)
+
+from PyQt5.QtWidgets import (
+    QDialogButtonBox, QPushButton, QLineEdit,
+    QFileDialog, QTableView, QAbstractItemView,
+    QUndoStack, QShortcut, QAction, QItemDelegate,
+    QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
+    QGroupBox, QTreeWidget,
+)
+
+from View.Ensembles.Edit.Translate import EnsembleEditTranslate
+
+logger = logging.getLogger()
+
+
+class StricklersCoefModelItem(PamhyrModelItem):
+    def get_value(self):
+        return (self._data, self.parent()._data)
+
+
+class StricklersModelItem(PamhyrModelItem):
+    def __init__(self, data=None, trad=None, parent=None):
+        super(StricklersModelItem, self).__init__(
+            data=data, trad=trad, parent=parent,
+        )
+
+    def _setup_children(self):
+        for coef in ["strickler_minor", "strickler_medium"]:
+            self.addChild(
+                StricklersCoefModelItem(data=coef, parent=self)
+            )
+
+    def get_value(self):
+        return self._data
+
+
+class EnsembleEditDialog(PamhyrDialog):
+    _pamhyr_ui = "EnsembleEditDialog"
+    _pamhyr_name = "Parameters"
+
+    def __init__(self, study=None, ensemble=None,
+                 parent=None):
+        trad = EnsembleEditTranslate()
+
+        super(EnsembleEditDialog, self).__init__(
+            title=trad[self._pamhyr_name],
+            trad=trad,
+            options=[],
+            parent=parent
+        )
+
+        self._study = study
+        self._ensemble = ensemble
+        self._target_data = None
+
+        self._tree = self.find(QTreeWidget, "treeWidget_target_data")
+        self._tg_group_box = self.find(QGroupBox, "groupBox_target_data")
+
+        self._init_tree()
+        self._init_default_values()
+        self._init_connection()
+
+    def _init_tree(self):
+        self._tree.setColumnCount(1)
+        self._tree.setHeaderLabels(["Name"])
+
+        stricklers = PamhyrModelListItem(
+            name="Stricklers",
+            lst=self._study.river.stricklers,
+            child_item_ctor=StricklersModelItem,
+            parent=self._tree
+        )
+
+        self._target_data = (
+            self._ensemble.data_type,
+            self._ensemble.target_data
+        )
+
+        self._tg_group_box.setTitle(
+            self._format_target_data(self._target_data)
+        )
+
+        item = stricklers.find_item_by_value(self._target_data)
+        if item:
+            self._tree.setCurrentItem(item)
+
+    def _init_default_values(self):
+        self.set_line_edit_text("lineEdit_name", self._ensemble.name)
+
+        self.combobox_add_items(
+            "comboBox_distribution",
+            [self._trad["not_defined"]] +
+            list(
+                map(
+                    lambda d: d.name,
+                    self._study._ens_distributions.lst
+                )
+            )
+        )
+
+        self._params_widget = None
+        if self._ensemble.distribution is not None:
+            self.set_combobox_text("comboBox_distribution",
+                                   self._ensemble.distribution.name)
+
+            self._set_widget(self._ensemble.distribution)
+
+    def _init_connection(self):
+        self.find(QComboBox, "comboBox_distribution")\
+            .currentTextChanged.connect(self.update_distribution)
+
+        self._tree.itemClicked.connect(self._tree_item_select)
+
+    def _tree_item_select(self, item):
+        if type(item) is StricklersCoefModelItem:
+            self._target_data = item.get_value()
+
+            self._tg_group_box.setTitle(
+                self._format_target_data(self._target_data)
+            )
+
+    def _format_target_data(self, data):
+        return f" Selection: {str(data[1])}, {data[0]}"
+
+    def update_distribution(self, txt):
+        # txt = self.get_combobox_text("comboBox_distribution")
+        distribution = next(
+            filter(
+                lambda d: d.name == txt,
+                self._study._ens_distributions.lst
+            ),
+            None
+        )
+
+        self._set_widget(distribution)
+
+    def _set_widget(self, distribution):
+        box = self.find(QGroupBox, "groupBox_params")
+        vbox = self.find(QVBoxLayout, "verticalLayout_params")
+
+        if self._params_widget is not None:
+            vbox.removeWidget(self._params_widget)
+            self._params_widget.setParent(None)
+
+        if distribution is None:
+            return
+
+        size = len(distribution._labels)
+        if size == 1:
+            self._params_widget = Ensemble1ParamsWidget(
+                ensemble=self._ensemble,
+                distribution=distribution,
+                trad=self._trad, parent=box,
+            )
+            vbox.addWidget(self._params_widget)
+        elif size == 2:
+            self._params_widget = Ensemble2ParamsWidget(
+                ensemble=self._ensemble,
+                distribution=distribution,
+                trad=self._trad, parent=box,
+            )
+            vbox.addWidget(self._params_widget)
+        else:
+            self._params_widget = None
+
+    @property
+    def values(self):
+        return self._values
+
+    def accept(self):
+        txt = self.get_combobox_text("comboBox_distribution")
+        distribution = next(
+            filter(
+                lambda d: d.name == txt,
+                self._study._ens_distributions.lst
+            ),
+            None
+        )
+        parameters = self._params_widget.values
+
+        if distribution is not None:
+            ok, tips = distribution.is_valid_parameters(parameters)
+            if not ok:
+                self.message_box(
+                    text=self._trad["checker_failed_text"],
+                    informative_text="\n".join(
+                        map(lambda t: " - " + self._trad[t], tips)
+                    ),
+                    window_title=self._trad["checker_failed_title"],
+                )
+                return
+
+        self._values = {
+            "name": self.get_line_edit_text("lineEdit_name"),
+            "data_type": self._target_data[0],
+            "target_data": self._target_data[1],
+            "distribution": distribution,
+            "params": parameters,
+        }
+
+        super().accept()
+
+    def reject(self):
+        self.close()
+
+
+class Ensemble1ParamsWidget(PamhyrWidget):
+    _pamhyr_ui = "Ensemble1ParamsWidget"
+    _pamhyr_name = "Parameters"
+
+    def __init__(self, ensemble=None,
+                 distribution=None,
+                 trad=None, parent=None):
+        super(Ensemble1ParamsWidget, self).__init__(
+            parent=parent
+        )
+        self._trad = trad
+
+        self._ensemble = ensemble
+        self._distribution = distribution
+        self._labels = distribution.labels
+
+        self._init_default_labels()
+        self._init_default_values()
+
+    def _init_default_labels(self):
+        self.set_label_text("label_0", self._trad[self._labels[0]])
+
+    def _init_default_values(self):
+        self._values = self._ensemble.params
+        if len(self._values) != 1:
+            self._values = self._distribution.default_values.copy()
+
+        self.set_double_spin_box("doubleSpinBox_0", self._values[0])
+
+    @property
+    def values(self):
+        self._values = [
+            self.get_double_spin_box("doubleSpinBox_0"),
+        ]
+
+        return self._values
+
+
+class Ensemble2ParamsWidget(PamhyrWidget):
+    _pamhyr_ui = "Ensemble2ParamsWidget"
+    _pamhyr_name = "Parameters"
+
+    def __init__(self, ensemble=None,
+                 distribution=None,
+                 trad=None, parent=None):
+        super(Ensemble2ParamsWidget, self).__init__(
+            parent=parent
+        )
+        self._trad = trad
+
+        self._ensemble = ensemble
+        self._distribution = distribution
+        self._labels = distribution.labels
+
+        self._init_default_labels()
+        self._init_default_values()
+
+    def _init_default_labels(self):
+        self.set_label_text("label_0", self._trad[self._labels[0]])
+        self.set_label_text("label_1", self._trad[self._labels[1]])
+
+    def _init_default_values(self):
+        self._values = self._ensemble.params
+        if len(self._values) != 2:
+            self._values = self._distribution.default_values.copy()
+
+        self.set_double_spin_box("doubleSpinBox_0", self._values[0])
+        self.set_double_spin_box("doubleSpinBox_1", self._values[1])
+
+    @property
+    def values(self):
+        self._values = [
+            self.get_double_spin_box("doubleSpinBox_0"),
+            self.get_double_spin_box("doubleSpinBox_1")
+        ]
+
+        return self._values

src/View/Ensembles/Table.py

@@ -0,0 +1,268 @@
+# Table.py -- Pamhyr
+# 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
+# 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 logging
+import traceback
+
+from tools import trace, timer
+
+from PyQt5.QtCore import (
+    Qt, QVariant, QAbstractTableModel,
+    QCoreApplication, QModelIndex, pyqtSlot,
+    QRect,
+)
+
+from PyQt5.QtWidgets import (
+    QDialogButtonBox, QPushButton, QLineEdit,
+    QFileDialog, QTableView, QAbstractItemView,
+    QUndoStack, QShortcut, QAction, QItemDelegate,
+    QComboBox,
+)
+
+from View.Ensembles.UndoCommand import (
+    SetNameCommand, SetTypeCommand, SetDataCommand,
+    SetDistributionCommand,
+    AddCommand, DelCommand,
+)
+
+from View.Tools.PamhyrTable import PamhyrTableModel
+
+from View.Ensembles.Translate import *
+
+logger = logging.getLogger()
+
+_translate = QCoreApplication.translate
+
+
+class ComboBoxDelegate(QItemDelegate):
+    def __init__(self, data=None, study=None,
+                 mode="stricklers", trad=None, parent=None):
+        super(ComboBoxDelegate, self).__init__(parent)
+
+        self._data = data
+        self._study = study
+        self._trad = trad
+        self._mode = mode
+
+    def createEditor(self, parent, option, index):
+        self.editor = QComboBox(parent)
+
+        if self._mode == "data_type":
+            self.editor.addItems(
+                [
+                    self._trad["not_defined"],
+                    self._trad["strickler_minor"],
+                    self._trad["strickler_medium"],
+                ]
+            )
+        elif self._mode == "stricklers":
+            used = list(
+                map(
+                    lambda e: (e.data_type, e._target_data),
+                    self._data.lst
+                )
+            )
+            current = self._data.get(index.row())
+
+            self.editor.addItems(
+                [self._trad["not_defined"]] +
+                list(
+                    map(
+                        lambda s: str(s),
+                        filter(
+                            # Exclude target data already used for
+                            # this data type
+                            lambda s: (
+                                current.target_data == s or
+                                (current.data_type, s) not in used
+                            ),
+                            self._study.river.stricklers.stricklers
+                        )
+                    )
+                )
+            )
+        elif self._mode == "distribution":
+            self.editor.addItems(
+                [self._trad["not_defined"]] +
+                list(
+                    map(
+                        lambda f: f.name,
+                        self._study._ens_distributions.lst
+                    )
+                )
+            )
+
+        self.editor.setCurrentText(index.data(Qt.DisplayRole))
+        return self.editor
+
+    def setEditorData(self, editor, index):
+        value = index.data(Qt.DisplayRole)
+        self.editor.currentTextChanged.connect(self.currentItemChanged)
+
+    def setModelData(self, editor, model, index):
+        text = str(editor.currentText())
+
+        if self._mode == "data_type":
+            value = next(
+                filter(
+                    lambda x: self._trad[x] == text,
+                    ["strickler_minor", "strickler_medium"],
+                ),
+                ""
+            )
+        elif self._mode == "stricklers":
+            value = next(
+                filter(
+                    lambda s: str(s) == text,
+                    self._study.river.stricklers.stricklers
+                ),
+                None
+            )
+        elif self._mode == "distribution":
+            value = next(
+                filter(
+                    lambda f: f.name == text,
+                    self._study._ens_distributions.lst
+                ),
+                None
+            )
+        else:
+            value = text
+
+        model.setData(index, value)
+
+        editor.close()
+        editor.deleteLater()
+
+    def updateEditorGeometry(self, editor, option, index):
+        r = QRect(option.rect)
+        if self.editor.windowFlags() & Qt.Popup:
+            if editor.parent() is not None:
+                r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
+        editor.setGeometry(r)
+
+    @pyqtSlot()
+    def currentItemChanged(self):
+        self.commitData.emit(self.sender())
+
+
+class EnsembleTableModel(PamhyrTableModel):
+    def _setup_lst(self):
+        self._lst = self._data
+        self._study = self._opt_data
+
+    def data(self, index, role):
+        if role != Qt.ItemDataRole.DisplayRole:
+            return QVariant()
+
+        row = index.row()
+        column = index.column()
+
+        if self._headers[column] == "name":
+            return self._lst.get(row).name
+        elif self._headers[column] == "type":
+            return self._trad[self._lst.get(row).data_type]
+        elif self._headers[column] == "target_data":
+            value = self._lst.get(row).target_data
+            if value is None:
+                return self._trad["not_defined"]
+            return str(value)
+        elif self._headers[column] == "distribution":
+            value = self._lst.get(row).distribution
+            if value is None:
+                return self._trad["not_defined"]
+            return value.name
+        elif self._headers[column] == "parameters":
+            value = self._lst.get(row).params
+            return str(value)
+
+        return QVariant()
+
+    def setData(self, index, value, role=Qt.EditRole):
+        if not index.isValid() or role != Qt.EditRole:
+            return False
+
+        if self.is_same_data(index, value):
+            return False
+
+        row = index.row()
+        column = index.column()
+
+        try:
+            if self._headers[column] == "name":
+                self._undo.push(
+                    SetNameCommand(
+                        self._lst, row, value
+                    )
+                )
+            elif self._headers[column] == "type":
+                self._undo.push(
+                    SetTypeCommand(
+                        self._lst, row, value
+                    )
+                )
+            elif self._headers[column] == "target_data":
+                self._undo.push(
+                    SetDataCommand(
+                        self._lst, row, value
+                    )
+                )
+            elif self._headers[column] == "distribution":
+                self._undo.push(
+                    SetDistributionCommand(
+                        self._lst, row, value
+                    )
+                )
+        except Exception as e:
+            logger.info(e)
+            logger.debug(traceback.format_exc())
+
+        self.dataChanged.emit(index, index)
+        return True
+
+    def add(self, row, parent=QModelIndex()):
+        self.beginInsertRows(parent, row, row - 1)
+
+        self._undo.push(
+            AddCommand(
+                self._lst, row,
+            )
+        )
+
+        self.endInsertRows()
+        self.layoutChanged.emit()
+
+    def delete(self, rows, parent=QModelIndex()):
+        self.beginRemoveRows(parent, rows[0], rows[-1])
+
+        self._undo.push(
+            DelCommand(
+                self._lst, rows
+            )
+        )
+
+        self.endRemoveRows()
+        self.layoutChanged.emit()
+
+    def undo(self):
+        self._undo.undo()
+        self.layoutChanged.emit()
+
+    def redo(self):
+        self._undo.redo()
+        self.layoutChanged.emit()

src/View/Ensembles/Translate.py

@@ -0,0 +1,50 @@
+# Translate.py -- Pamhyr
+# 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
+# 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 PyQt5.QtCore import QCoreApplication
+
+from View.Translate import MainTranslate
+
+_translate = QCoreApplication.translate
+
+
+class EnsemblesTranslate(MainTranslate):
+    def __init__(self):
+        super(EnsemblesTranslate, self).__init__()
+
+        self._dict["Ensembles"] = _translate(
+            "Ensembles", "Ensembles"
+        )
+
+        self._dict["ensemble"] = _translate(
+            "Ensembles", "Ensembles scenario"
+        )
+        self._dict["strickler_minor"] = _translate(
+            "Ensembles", "Stricklers minor"
+        )
+        self._dict["strickler_medium"] = _translate(
+            "Ensembles", "Stricklers medium"
+        )
+
+        self._sub_dict["table_headers"] = {
+            "name": self._dict["name"],
+            "type": _translate("Ensembles", "Type"),
+            "target_data": _translate("Ensembles", "Target data"),
+            "distribution": _translate("Ensembles", "Distribution"),
+            "parameters": _translate("Ensembles", "Parameters"),
+        }

src/View/Ensembles/UndoCommand.py

@@ -0,0 +1,178 @@
+# UndoCommand.py -- Pamhyr
+# 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
+# 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 copy import deepcopy
+from tools import trace, timer
+
+from PyQt5.QtWidgets import (
+    QMessageBox, QUndoCommand, QUndoStack,
+)
+
+from Model.Friction.Friction import Friction
+from Model.Friction.FrictionList import FrictionList
+
+
+class SetNameCommand(QUndoCommand):
+    def __init__(self, ensembles, index, new_value):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._index = index
+        self._old = self._ensembles.get(self._index).name
+        self._new = str(new_value)
+
+    def undo(self):
+        self._ensembles.get(self._index).name = self._old
+
+    def redo(self):
+        self._ensembles.get(self._index).name = self._new
+
+
+class SetTypeCommand(QUndoCommand):
+    def __init__(self, ensembles, index, new_value):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._index = index
+        self._old = self._ensembles.get(self._index)\
+                                   .data_type
+        self._new = new_value
+
+    def undo(self):
+        self._ensembles.get(self._index).data_type = self._old
+
+    def redo(self):
+        self._ensembles.get(self._index).data_type = self._new
+
+
+class SetDataCommand(QUndoCommand):
+    def __init__(self, ensembles, index, data):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._index = index
+        self._old = self._ensembles.get(self._index)\
+                                   .target_data
+        self._new = data
+
+    def undo(self):
+        self._ensembles.get(self._index).target_data = self._old
+
+    def redo(self):
+        self._ensembles.get(self._index).target_data = self._new
+
+
+class SetDistributionCommand(QUndoCommand):
+    def __init__(self, ensembles, index, distribution):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._index = index
+        self._old = self._ensembles.get(self._index).distribution
+        self._old_params = self._ensembles.get(self._index).params
+        self._new = distribution
+
+    def undo(self):
+        self._ensembles.get(self._index).distribution = self._old
+        self._ensembles.get(self._index).params = self._old_params
+
+    def redo(self):
+        self._ensembles.get(self._index).distribution = self._new
+        if self._new is not None:
+            self._ensembles.get(self._index).params = self._new.default_values
+
+
+class AddCommand(QUndoCommand):
+    def __init__(self, ensembles, index):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._index = index
+        self._new = None
+
+    def undo(self):
+        self._ensembles.delete_i([self._index])
+
+    def redo(self):
+        if self._new is None:
+            self._new = self._ensembles.new(self._index)
+        else:
+            self._ensembles.insert(self._index, self._new)
+
+
+class ImportCommand(QUndoCommand):
+    def __init__(self, ensembles, data, index):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._index = index
+        self._data = data
+        self._news = None
+
+    def undo(self):
+        for new in self._news:
+            new.set_as_deleted()
+
+    def redo(self):
+        if self._news is None:
+            self._news = list(
+                map(
+                    lambda d: self._ensembles.new_with_data(
+                        self._index, d
+                    ),
+                    self._data,
+                )
+            )
+        else:
+            for new in self._news:
+                new.set_as_not_deleted()
+
+
+class DelCommand(QUndoCommand):
+    def __init__(self, ensembles, rows):
+        QUndoCommand.__init__(self)
+
+        self._ensembles = ensembles
+        self._rows = rows
+
+        self._friction = []
+        for row in rows:
+            self._friction.append((row, self._ensembles.get(row)))
+        self._friction.sort()
+
+    def undo(self):
+        for row, el in self._friction:
+            self._ensembles.insert(row, el)
+
+    def redo(self):
+        self._ensembles.delete_i(self._rows)
+
+
+class SetAllCommand(QUndoCommand):
+    def __init__(self, ensemble, data):
+        QUndoCommand.__init__(self)
+
+        self._ensemble = ensemble
+        self._old = self._ensemble.get_data_dict()
+        self._new = data
+
+    def undo(self):
+        self._ensemble.set_data_dict(self._old)
+
+    def redo(self):
+        self._ensemble.set_data_dict(self._new)

src/View/Ensembles/Window.py

@@ -0,0 +1,280 @@
+# Window.py -- Pamhyr
+# 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
+# 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 logging
+import json
+
+from tools import trace, timer, logger_exception
+
+from View.Tools.PamhyrWindow import PamhyrWindow, PamhyrDialog
+
+from PyQt5.QtGui import (
+    QKeySequence,
+)
+
+from PyQt5 import QtWidgets
+from PyQt5.QtCore import (
+    Qt, QVariant, QAbstractTableModel,
+    QCoreApplication, QModelIndex, pyqtSlot,
+    QRect, QSettings,
+)
+
+from PyQt5.QtWidgets import (
+    QDialogButtonBox, QPushButton, QLineEdit,
+    QFileDialog, QTableView, QAbstractItemView,
+    QUndoStack, QShortcut, QAction, QItemDelegate,
+    QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
+)
+
+from Modules import Modules
+
+from View.Ensembles.Edit.Window import EnsembleEditDialog
+from View.Ensembles.Table import (
+    EnsembleTableModel, ComboBoxDelegate
+)
+from View.Ensembles.Translate import EnsemblesTranslate
+from View.Ensembles.UndoCommand import SetAllCommand, ImportCommand
+
+logger = logging.getLogger()
+
+
+class EnsemblesWindow(PamhyrWindow):
+    _pamhyr_ui = "Ensembles"
+    _pamhyr_name = "Ensembles"
+
+    def __init__(self, ensembles=None,
+                 study=None, config=None,
+                 parent=None):
+        trad = EnsemblesTranslate()
+
+        self._ensembles = ensembles
+
+        name = (
+            trad[self._pamhyr_name] + " - " +
+            study.name
+        )
+
+        super(EnsemblesWindow, self).__init__(
+            title=name,
+            study=study,
+            config=config,
+            trad=trad,
+            parent=parent
+        )
+
+        self.setup_table()
+        self.setup_connections()
+
+    def setup_table_delegate(self):
+        self._delegate_stricklers = ComboBoxDelegate(
+            data=self._ensembles,
+            study=self._study,
+            mode="stricklers",
+            trad=self._trad,
+            parent=self
+        )
+
+        self._delegate_data_type = ComboBoxDelegate(
+            data=self._ensembles,
+            study=self._study,
+            mode="data_type",
+            trad=self._trad,
+            parent=self
+        )
+
+        self._delegate_distribution = ComboBoxDelegate(
+            data=self._ensembles,
+            study=self._study,
+            mode="distribution",
+            trad=self._trad,
+            parent=self
+        )
+
+        return {
+            "type": self._delegate_data_type,
+            "target_data": self._delegate_stricklers,
+            "distribution": self._delegate_distribution,
+        }
+
+    def setup_table(self):
+        self._table = {}
+
+        delegates = self.setup_table_delegate()
+
+        editable_headers = [
+            "name",
+        ]
+
+        table = self.find(QTableView, f"tableView")
+        self._table = EnsembleTableModel(
+            table_view=table,
+            table_headers=self._trad.get_dict("table_headers"),
+            editable_headers=editable_headers,
+            delegates=delegates,
+            data=self._ensembles,
+            trad=self._trad,
+            undo=self._undo_stack,
+            opt_data=self._study
+        )
+
+        table.setModel(self._table)
+        table.setSelectionBehavior(QAbstractItemView.SelectRows)
+        table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
+        table.setAlternatingRowColors(True)
+
+    def setup_connections(self):
+        self.find(QAction, "action_add").triggered.connect(self.add)
+        self.find(QAction, "action_del").triggered.connect(self.delete)
+        self.find(QAction, "action_edit").triggered.connect(self.edit)
+        self.find(QAction, "action_export").triggered.connect(
+            self.export_to_json
+        )
+        self.find(QAction, "action_import").triggered.connect(
+            self.import_from_json
+        )
+
+        table = self.find(QTableView, f"tableView")
+        table.selectionModel()\
+             .selectionChanged\
+             .connect(self.update)
+
+        self._table.dataChanged\
+                   .connect(self.update)
+
+    def index_selected_rows(self):
+        table = self.find(QTableView, f"tableView")
+        return list(
+            # Delete duplicate
+            set(
+                map(
+                    lambda i: i.row(),
+                    table.selectedIndexes()
+                )
+            )
+        )
+
+    def add(self):
+        rows = self.index_selected_rows()
+        if len(self._ensembles) == 0 or len(rows) == 0:
+            self._table.add(0)
+        else:
+            self._table.add(rows[0])
+
+    def delete(self):
+        rows = self.index_selected_rows()
+        if len(rows) == 0:
+            return
+
+        self._table.delete(rows)
+
+    def _undo(self):
+        self._table.undo()
+
+    def _redo(self):
+        self._table.redo()
+
+    def edit(self):
+        rows = self.index_selected_rows()
+
+        for row in rows:
+            try:
+                ens = self._ensembles.get(row)
+                dlg = EnsembleEditDialog(
+                    study=self._study,
+                    ensemble=ens,
+                    parent=self
+                )
+
+                if dlg.exec():
+                    self._undo_stack.push(
+                        SetAllCommand(
+                            ens, dlg.values
+                        )
+                    )
+            except Exception as e:
+                logger_exception(e)
+                return
+
+    def export_to_json(self):
+        ens = []
+        for e in self._ensembles.lst:
+            ens.append(e.get_data_dict(use_ids=True))
+
+        data = {"ensembles": ens}
+
+        def aux(filename):
+            with open(filename[0], 'w') as f:
+                f.write(json.dumps(data))
+
+        self.file_dialog(
+            select_file=None,
+            callback=aux,
+            default_suffix='.json',
+            file_filter=[self._trad["file_json"]]
+        )
+
+    def import_from_json(self):
+        def aux(filename):
+            with open(filename[0], 'r') as f:
+                return json.load(f)
+
+        data = self.file_dialog(
+            select_file=None,
+            callback=aux,
+            default_suffix='.json',
+            file_filter=[self._trad["file_json"]]
+        )
+
+        dtarget = dict(
+            map(
+                lambda s: (s.pamhyr_id, s),
+                self._study.river.stricklers.stricklers
+            )
+        )
+
+        ddistr = dict(
+            map(
+                lambda d: (d.name, d),
+                self._study._ens_distributions.lst
+            )
+        )
+
+        def update(d, values):
+            d.update(values)
+            return d
+
+        updated = list(
+            map(
+                lambda d: update(
+                    d, {"target_data": dtarget[d["target_data"]]}
+                ),
+                map(
+                    lambda d: update(
+                        d, {"distribution": ddistr[d["distribution"]]}
+                    ),
+                    data["ensembles"]
+                )
+            )
+        )
+
+        self._undo_stack.push(
+            ImportCommand(
+                self._ensembles, updated, 0
+            )
+        )
+        self._table.update()

src/View/Geometry/PlotAC.py

@@ -112,7 +112,7 @@ class PlotAC(PamhyrPlot):
             profile_id = 0
 
         profile = self.data.profile(profile_id)
-        if profile is None:
+        if profile is None or self._parent.tableView.isRowHidden(profile_id):
             return
 
         station = profile.get_station()
@@ -192,21 +192,24 @@ class PlotAC(PamhyrPlot):
             self.plot_selected.set_data([], [])
             self.next_plot_selected.set_data([], [])
 
-            if 0 <= previous_id < self.data.number_profiles:
+            if (0 <= previous_id < self.data.number_profiles
+                    and not self._parent.tableView.isRowHidden(previous_id)):
                 self.previous_plot_selected.set_data(
                     self.data.profile(previous_id).get_station(),
                     self.data.profile(previous_id).z()
                 )
                 self.previous_plot_selected.set_visible(True)
 
-            if 0 <= profile_id < self.data.number_profiles:
+            if (0 <= profile_id < self.data.number_profiles
+                    and not self._parent.tableView.isRowHidden(profile_id)):
                 self.plot_selected.set_data(
                     self.data.profile(profile_id).get_station(),
                     self.data.profile(profile_id).z()
                 )
                 self.plot_selected.set_visible(True)
 
-            if 0 <= next_id < self.data.number_profiles:
+            if (0 <= next_id < self.data.number_profiles
+                    and not self._parent.tableView.isRowHidden(next_id)):
                 self.next_plot_selected.set_data(
                     self.data.profile(next_id).get_station(),
                     self.data.profile(next_id).z()

src/View/Geometry/PlotRKZ.py

@@ -20,6 +20,7 @@ import logging
 
 from tools import timer
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtCore import (
     Qt, QItemSelectionModel,
@@ -64,7 +65,7 @@ class PlotRKZ(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
@@ -110,9 +111,9 @@ class PlotRKZ(PamhyrPlot):
     def _closest_rk(self, event):
 
         s = event.artist.get_segments()
-        x = [i[0, 0] for i in s]
         mx = event.mouseevent.xdata
-        points = enumerate(x)
+        points = [(i, segment[0, 0]) for i, segment in enumerate(s)
+                  if len(segment)]
 
         def dist_mouse(point):
             x = point[1]
@@ -136,6 +137,7 @@ class PlotRKZ(PamhyrPlot):
         if len(ind) == 0:
             return
 
+        ind = [i for i in ind if not self._table.isRowHidden(i)]
         for i in ind:
             index.append(QItemSelectionRange(self._table.model().index(i, 0)))
 
@@ -150,18 +152,7 @@ class PlotRKZ(PamhyrPlot):
             self._table.scrollTo(self._table.model().index(ind[-1], 0))
 
     def _select_range_in_table(self, ind1, ind2):
-        if self._table is not None:
-            self._table.setFocus()
-            selection = self._table.selectionModel()
-            index = QItemSelection(self._table.model().index(ind1, 0),
-                                   self._table.model().index(ind2, 0))
-            selection.select(
-                index,
-                QItemSelectionModel.Rows |
-                QItemSelectionModel.ClearAndSelect |
-                QItemSelectionModel.Select
-            )
-            self._table.scrollTo(self._table.model().index(ind2, 0))
+        self._select_in_table(list(range(ind1, ind2 + 1)))
 
     @timer
     def redraw(self, data):
@@ -213,13 +204,23 @@ class PlotRKZ(PamhyrPlot):
             picker=10,
         )
 
+        if self._table is not None:
+            segments = self.line_rk_zmin_zmax.get_segments()
+            self.line_rk_zmin_zmax.set_segments([
+                segment[:0] if self._table.isRowHidden(row) else segment
+                for row, segment in enumerate(segments)
+            ])
+
     def color_highlight(self):
         rows = sorted(list(
             set(
                 (i.row() for i in self.parent.tableView.selectedIndexes())
             )
         ))
-        colors = [self.color_plot for row in range(len(self._data))]
+        colors = [
+            "darkorange" if profile.interpolated else self.color_plot
+            for profile in self._data.profiles
+        ]
         style = ["-" for row in range(len(self._data))]
         if len(rows) > 0:
             for row in rows:

src/View/Geometry/PlotXY.py

@@ -18,6 +18,7 @@
 
 from tools import timer, trace
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 from matplotlib import collections
 import numpy as np
 
@@ -60,7 +61,7 @@ class PlotXY(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
@@ -136,6 +137,7 @@ class PlotXY(PamhyrPlot):
         index = QItemSelection()
         if len(ind) == 0:
             return
+        ind = [i for i in ind if not self._table.isRowHidden(i)]
         for i in ind:
             index.append(QItemSelectionRange(self._table.model().index(i, 0)))
         selection.select(
@@ -149,18 +151,7 @@ class PlotXY(PamhyrPlot):
             self._table.scrollTo(self._table.model().index(ind[-1], 0))
 
     def _select_range_in_table(self, ind1, ind2):
-        if self._table is not None:
-            self._table.setFocus()
-            selection = self._table.selectionModel()
-            index = QItemSelection(self._table.model().index(ind1, 0),
-                                   self._table.model().index(ind2, 0))
-            selection.select(
-                index,
-                QItemSelectionModel.Rows |
-                QItemSelectionModel.ClearAndSelect |
-                QItemSelectionModel.Select
-            )
-            self._table.scrollTo(self._table.model().index(ind2, 0))
+        self._select_in_table(list(range(ind1, ind2 + 1)))
 
     @timer
     def redraw(self, data):
@@ -189,10 +180,14 @@ class PlotXY(PamhyrPlot):
 
     def draw_xy(self):
         self.line_xy = []
-        for xy in zip(self.data.get_x(), self.data.get_y()):
-            self.line_xy.append(np.column_stack(xy))
+        for row, profile in enumerate(self.data.profiles):
+            hidden = self._table is not None and self._table.isRowHidden(row)
+            self.line_xy.append(
+                np.empty((0, 2)) if hidden or len(profile) == 0
+                else np.column_stack((profile.x(), profile.y()))
+            )
 
-        self._colors, self._style = self.color_hightlight()
+        self._colors, self._style = self.color_highlight()
         self.line_xy_collection = collections.LineCollection(
             self.line_xy,
             colors=self._colors,
@@ -201,13 +196,16 @@ class PlotXY(PamhyrPlot):
         )
         self.canvas.axes.add_collection(self.line_xy_collection)
 
-    def color_hightlight(self):
+    def color_highlight(self):
         rows = sorted(list(
             set(
                 (i.row() for i in self.parent.tableView.selectedIndexes())
             )
         ))
-        colors = [self.color_plot for row in range(len(self._data))]
+        colors = [
+            "darkorange" if profile.interpolated else self.color_plot
+            for profile in self._data.profiles
+        ]
         style = ["-" for row in range(len(self._data))]
         if len(rows) > 0:
             for row in rows:
@@ -320,7 +318,7 @@ class PlotXY(PamhyrPlot):
 
     def update_current(self):
         if self._current_data_update:
-            self._colors, self._style = self.color_hightlight()
+            self._colors, self._style = self.color_highlight()
             self.line_xy_collection.set_colors(self._colors)
             self.line_xy_collection.set_linestyle(self._style)
 

src/View/Geometry/Profile/Plot.py

@@ -22,6 +22,7 @@ from math import dist, sqrt
 
 from tools import timer, trace
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 
 from PyQt5.QtCore import (
     Qt, QCoreApplication, QItemSelectionModel,
@@ -111,7 +112,7 @@ class Plot(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
@@ -126,11 +127,11 @@ class Plot(PamhyrPlot):
     def onclick(self, event):
         if event.inaxes != self.canvas.axes:
             return
-        if event.button.value == 1:
+        if event.button not in (MouseButton.MIDDLE, MouseButton.RIGHT):
             return
 
         z = self._get_z_from_click(event)
-        if z < self.data.z_min() or event.button.value == 2:
+        if z < self.data.z_min() or event.button == MouseButton.MIDDLE:
             self.highlight = None
             self.draw_highligth()
             self.update_idle()

src/View/Geometry/Profile/UndoCommand.py

@@ -37,6 +37,11 @@ class SetDataCommand(QUndoCommand):
         self._index = index
         self._old = old_value
         self._new = self.type(new_value)
+        if self._profile.old_interpolated == "":
+            if self._profile.interpolated:
+                self._profile.old_interpolated = "interpolated"
+            else:
+                self._profile.old_interpolated = "not_interpolated"
 
 
 class SetXCommand(SetDataCommand):
@@ -46,10 +51,19 @@ class SetXCommand(SetDataCommand):
 
     def undo(self):
         self._profile.point(self._index).x = self._old
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._profile.point(self._index).x = self._new
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -60,10 +74,19 @@ class SetYCommand(SetDataCommand):
 
     def undo(self):
         self._profile.point(self._index).y = self._old
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._profile.point(self._index).y = self._new
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -74,10 +97,19 @@ class SetZCommand(SetDataCommand):
 
     def undo(self):
         self._profile.point(self._index).z = self._old
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._profile.point(self._index).z = self._new
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -89,9 +121,20 @@ class SetNameCommand(SetDataCommand):
 
     def undo(self):
         self._profile.point(self._index).name = self._old
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
+        self._profile.modified()
 
     def redo(self):
         self._profile.point(self._index).name = self._new
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
+        self._profile.modified()
 
 
 class AddCommand(QUndoCommand):
@@ -104,6 +147,13 @@ class AddCommand(QUndoCommand):
 
     def undo(self):
         self._profile.delete_i([self._index])
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
@@ -111,7 +161,8 @@ class AddCommand(QUndoCommand):
             self._point = self._profile.insert(self._index)
         else:
             self._profile.insert_point(self._index, self._point)
-
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -125,10 +176,19 @@ class DelCommand(QUndoCommand):
     def undo(self):
         for point in self._points:
             point.set_as_not_deleted()
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._profile.delete_points(self._points)
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -153,10 +213,19 @@ class SortCommand(QUndoCommand):
 
     def undo(self):
         self._profile.sort_with_indexes(self._indexes)
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._profile.sort(self._column, self._reverse)
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -173,6 +242,13 @@ class MoveCommand(QUndoCommand):
             self._profile.move_up_point(self._i)
         else:
             self._profile.move_down_point(self._i)
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
@@ -180,6 +256,8 @@ class MoveCommand(QUndoCommand):
             self._profile.move_up_point(self._i)
         else:
             self._profile.move_down_point(self._i)
+        self._profile.increase_modification_count()
+        self._profile.interpolated = False
         self._profile.modified()
 
 
@@ -191,10 +269,19 @@ class ReverseCommand(QUndoCommand):
 
     def undo(self):
         self._profile.reverse()
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._profile.reverse()
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -209,10 +296,19 @@ class PurgeCommand(QUndoCommand):
     def undo(self):
         for point in self._deleted:
             point.set_as_not_deleted()
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         self._deleted = self._profile.purge(self._np_purge)
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()
 
 
@@ -228,9 +324,18 @@ class PasteCommand(QUndoCommand):
 
     def undo(self):
         self._profile.delete_points(self._points)
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
         self._profile.modified()
 
     def redo(self):
         for point in self._points:
             self._profile.insert_point(self._row, point)
+        self._profile.interpolated = False
+        self._profile.increase_modification_count()
         self._profile.modified()

src/View/Geometry/Profile/Window.py

@@ -171,7 +171,7 @@ class ProfileWindow(PamhyrWindow):
 
     def profiles(self):
         """Return profiles from the geometry model owning this profile."""
-        return self._profile.reach.reach.profiles
+        return self._profile.reach.profiles
 
     def navigate_profile(self, offset):
         profiles = self.profiles()
@@ -204,7 +204,6 @@ class ProfileWindow(PamhyrWindow):
 
         self._tablemodel.beginResetModel()
         self._tablemodel._data = profile
-        # update lst to display correct data and apply connexions to add/remove points
         self._tablemodel._setup_lst()
         self._tablemodel.endResetModel()
 

src/View/Geometry/Translate.py

@@ -19,6 +19,7 @@
 from PyQt5.QtCore import QCoreApplication
 
 from View.Translate import MainTranslate
+from View.WeatherParameters.translate import WeatherParametersTranslate
 
 _translate = QCoreApplication.translate
 
@@ -44,9 +45,63 @@ class GeometryTranslate(MainTranslate):
         self._dict["cross_sections"] = _translate("Geometry", "cross-sections")
         self._dict["profile"] = _translate("Geometry", "cross-section")
         self._dict["profiles"] = _translate("Geometry", "cross-sections")
+        self._dict["show_interpolated_profiles"] = _translate(
+            "Geometry", "Show interpolated profiles"
+        )
         self._dict["cross_section_enabled_count"] = _translate(
             "Geometry", "Cross-section enabled ({count} disabled)"
         )
+        self._dict["profile_disable_blocked"] = _translate(
+            "Geometry", "The cross-section cannot be disabled."
+        )
+        self._dict["profile_disable_blocked_info"] = _translate(
+            "Geometry",
+            "It is referenced by the following data:\n{dependencies}\n\n"
+            "Change or remove these associations before disabling it."
+        )
+        self._dict["profile_dependency"] = _translate(
+            "Geometry", "{kind} “{name}” ({association})"
+        )
+        self._dict["initial_condition"] = _translate(
+            "Geometry", "Initial condition"
+        )
+        self._dict["initial_condition_temperature"] = _translate(
+            "Geometry", "Initial condition temperature"
+        )
+        self._dict["hydraulic_structure"] = _translate(
+            "Geometry", "Hydraulic structure"
+        )
+        self._dict["lateral_contribution"] = _translate(
+            "Geometry", "Lateral contribution"
+        )
+        self._dict["weather_parameter"] = _translate(
+            "Geometry", "Weather parameter"
+        )
+        self._dict["section"] = _translate("Geometry", "cross-section")
+        self._dict["begin_section"] = _translate(
+            "Geometry", "beginning cross-section"
+        )
+        self._dict["end_section"] = _translate(
+            "Geometry", "end cross-section"
+        )
+        self._dict["cross_section_pk"] = _translate(
+            "Geometry", "cross-section PK"
+        )
+
+        weather_parameters = WeatherParametersTranslate().get_dict(
+            "weather_parameters"
+        )
+        self._sub_dict["weather_parameter_types"] = {
+            "AT": weather_parameters["air_temperature"],
+            "SH": weather_parameters["specific_humidity"],
+            "GR": weather_parameters["global_radiation"],
+            "RWS": weather_parameters["reference_wind_speed"],
+            "GT": weather_parameters["surface_temperature"],
+            "GFR": weather_parameters["surface_flow_rate"],
+            "ALB": weather_parameters["albedo"],
+            "SC": weather_parameters["shading_coefficient"],
+            "CCF": weather_parameters["cloud_cover_fraction"],
+        }
 
         self._dict["transverse_abscissa"] = _translate(
             "Geometry", "Transverse abscissa (m)"
@@ -104,10 +159,10 @@ class GeometryTranslate(MainTranslate):
             "Geometry", "Export options"
         )
         self._dict["export_options_text"] = _translate(
-            "Geometry", "Choose which cross-sections to export."
+            "Geometry", "Exportation of the cross-sections."
         )
         self._dict["export_interpolated_profiles"] = _translate(
-            "Geometry", "Export interpolated cross-sections"
+            "Geometry", "Export with interpolated cross-sections"
         )
         self._dict["update_rk_error"] = _translate(
             "Geometry",

src/View/Geometry/UndoCommand.py

@@ -41,6 +41,7 @@ class SetDataCommand(QUndoCommand):
         self._index = index
         self._old = old_value
         self._new = self.type(new_value)
+        self._profile = self._reach.profile(self._index)
 
 
 class SetNameCommand(SetDataCommand):
@@ -48,24 +49,52 @@ class SetNameCommand(SetDataCommand):
         self.type = str
         super(SetNameCommand, self).__init__(
             reach, index, old_value, new_value)
+        if self._profile.old_interpolated == "":
+            if self._profile.interpolated:
+                self._profile.old_interpolated = "interpolated"
+            else:
+                self._profile.old_interpolated = "not_interpolated"
 
     def undo(self):
-        self._reach.profile(self._index).name = self._old
+        self._profile.name = self._old
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
 
     def redo(self):
-        self._reach.profile(self._index).name = self._new
+        # Name setter will automatically update the interpolated attribute
+        self._profile.name = self._new
+        self._profile.increase_modification_count()
 
 
 class SetRKCommand(SetDataCommand):
     def __init__(self, reach, index, old_value, new_value):
         self.type = float
         super(SetRKCommand, self).__init__(reach, index, old_value, new_value)
+        if self._profile.old_interpolated == "":
+            if self._profile.interpolated:
+                self._profile.old_interpolated = "interpolated"
+            else:
+                self._profile.old_interpolated = "not_interpolated"
 
     def undo(self):
-        self._reach.profile(self._index).rk = self._old
+        self._profile.rk = self._old
+        self._profile.decrease_modification_count()
+        if self._profile.modification_count == 0:
+            if self._profile.old_interpolated == "interpolated":
+                self._profile.interpolated = True
+            else:
+                self._profile.interpolated = False
+            self._profile.old_interpolated = ""
 
     def redo(self):
-        self._reach.profile(self._index).rk = self._new
+        # RK setter will automatically update the interpolated attribute
+        self._profile.rk = self._new
+        self._profile.increase_modification_count()
 
 
 class SetEnabledCommand(QUndoCommand):

src/View/Geometry/Window.py

@@ -103,6 +103,7 @@ class GeometryWindow(PamhyrWindow):
         self.setup_plots()
         self.setup_statusbar()
         self.setup_connections()
+        self.update_meshing_action()
 
     def setup_table(self):
         if self._study.is_read_only():
@@ -126,6 +127,9 @@ class GeometryWindow(PamhyrWindow):
         table.setAlternatingRowColors(True)
 
     def setup_checkbox(self):
+        self.find(QCheckBox, "checkBox_show_interpolated").setText(
+            self._trad["show_interpolated_profiles"]
+        )
         self._checkbox = self.find(QCheckBox, "checkBox_enabled")
         self._set_checkbox_state()
 
@@ -196,6 +200,18 @@ class GeometryWindow(PamhyrWindow):
         self._status_label.setText(txt)
 
     def setup_connections(self):
+        self.find(QCheckBox, "checkBox_show_interpolated").toggled.connect(
+            self.update_interpolated_profiles_visibility
+        )
+        self.find(QCheckBox, "checkBox_show_interpolated").toggled.connect(
+            self.update_redraw
+        )
+        self._table.modelReset.connect(
+            self.update_interpolated_profiles_visibility)
+        self._table.rowsInserted.connect(
+            self.update_interpolated_profiles_visibility)
+        self._table.rowsRemoved.connect(
+            self.update_interpolated_profiles_visibility)
         if self._study.is_read_only():
             actions = {
                 "action_export": self.export_to_file,
@@ -236,10 +252,38 @@ class GeometryWindow(PamhyrWindow):
     def update(self):
         self._update()
 
+    def update_interpolated_profiles_visibility(self):
+        show_interpolated = self.find(
+            QCheckBox, "checkBox_show_interpolated"
+        ).isChecked()
+        selection = self.tableView.selectionModel()
+        for row in range(self._table.rowCount()):
+            hidden = not show_interpolated \
+                     and self._reach.profile(row).interpolated
+            self.tableView.setRowHidden(row, hidden)
+            if hidden:
+                selection.select(
+                    self._table.index(row, 0),
+                    QItemSelectionModel.Deselect | QItemSelectionModel.Rows
+                )
+                if selection.currentIndex().row() == row:
+                    selection.setCurrentIndex(QModelIndex(),
+                                              QItemSelectionModel.NoUpdate)
+
     def update_redraw(self):
         self._update(redraw=True)
 
+    def update_meshing_action(self):
+        enabled = (
+            not self._study.is_read_only()
+            and self._reach.number_profiles > 0
+        )
+        self.find(QAction, "action_meshing").setEnabled(enabled)
+
     def _update(self, redraw=False, propagate=True):
+        self.update_interpolated_profiles_visibility()
+        self.update_meshing_action()
+
         if redraw:
             self._plot_xy.redraw(data=self._reach)
             self._plot_rkc.redraw(data=self._reach)
@@ -311,6 +355,9 @@ class GeometryWindow(PamhyrWindow):
         self.tableView.model().blockSignals(False)
 
     def edit_meshing(self):
+        if self._reach.number_profiles == 0:
+            return
+
         rows = list(
             set(
                 (i.row() for i in self.tableView.selectedIndexes())
@@ -485,6 +532,7 @@ class GeometryWindow(PamhyrWindow):
             data=self._reach,
             trad=self._trad,
             toolbar=self._toolbar_ac,
+            parent=self,
         )
         self._plot_ac.draw()
 
@@ -544,7 +592,8 @@ class GeometryWindow(PamhyrWindow):
     def _set_checkbox_state(self):
         rows = self.index_selected_rows()
         editable = not self._study.is_read_only()
-        disabled_count = self._reach.number_profiles - self._reach.number_enabled_profiles
+        disabled_count = (self._reach.number_profiles -
+                          self._reach.number_enabled_profiles)
         self._checkbox.setText(
             self._trad["cross_section_enabled_count"].format(
                 count=disabled_count
@@ -573,6 +622,49 @@ class GeometryWindow(PamhyrWindow):
         if len(rows) == 0:
             return
 
+        if not enabled:
+            blocked = []
+            for row in rows:
+                profile = self._reach.profile(row)
+                dependencies = self._study.river.profile_dependencies(profile)
+                if len(dependencies) != 0:
+                    blocked.append((profile, dependencies))
+
+            if len(blocked) != 0:
+                details = []
+                for profile, dependencies in blocked:
+                    details.append(f"{profile.name}:")
+                    for dependency in dependencies:
+                        item = dependency["item"]
+                        if dependency["kind"] == "weather_parameter":
+                            name = self._trad.get_dict(
+                                "weather_parameter_types"
+                            ).get(item.type, item.type)
+                        else:
+                            name = getattr(item, "name", "")
+                        if name == "":
+                            name = self._trad[dependency["kind"]]
+                        details.append(
+                            "  - " +
+                            self._trad["profile_dependency"].format(
+                                kind=self._trad[dependency["kind"]],
+                                name=name,
+                                association=self._trad[
+                                    dependency["association"]
+                                ],
+                            )
+                        )
+
+                self._set_checkbox_state()
+                self.message_box(
+                    self._trad["profile_disable_blocked"],
+                    self._trad["profile_disable_blocked_info"].format(
+                        dependencies="\n".join(details)
+                    ),
+                    window_title=self._trad["warning"],
+                )
+                return
+
         self._checkbox.setTristate(False)
         self._table.enabled(rows, enabled)
 
@@ -761,6 +853,10 @@ class GeometryWindow(PamhyrWindow):
         # self.update_plot_rkc()
 
     def export_to_file(self):
+        export_interpolated = self._ask_export_options()
+        if export_interpolated is None:
+            return
+
         settings = QSettings(
             QSettings.IniFormat,
             QSettings.UserScope, 'MyOrg'
@@ -790,11 +886,9 @@ class GeometryWindow(PamhyrWindow):
             suffix = Path(filename).suffix
             if suffix != "":
                 if suffix == ".st" or suffix == ".ST":
-                    export_interpolated = self._ask_export_options()
-                    if export_interpolated is not None:
-                        self._export_to_file_st(
-                            filename[:-3], export_interpolated
-                        )
+                    self._export_to_file_st(
+                        filename[:-3], export_interpolated
+                    )
                 else:
                     # Warning popup when the format is not exportable
                     win = QtWidgets.QMessageBox()
@@ -805,9 +899,7 @@ class GeometryWindow(PamhyrWindow):
 
                     pass
             else:
-                export_interpolated = self._ask_export_options()
-                if export_interpolated is not None:
-                    self._export_to_file_st(filename, export_interpolated)
+                self._export_to_file_st(filename, export_interpolated)
 
     def _ask_export_options(self):
         win = QtWidgets.QMessageBox(self)
@@ -844,8 +936,9 @@ class GeometryWindow(PamhyrWindow):
             if is_interpolated and not export_interpolated:
                 continue
 
-            self._export_to_file_st_profile(wfile, profile, pid)
-            pid += 1
+            if profile.enabled:
+                self._export_to_file_st_profile(wfile, profile, pid)
+                pid += 1
 
     def _export_to_file_st_profile(self, wfile, profile, pid):
         num = f"{pid:>6}"

src/View/HydraulicStructures/PlotRKC.py

@@ -18,6 +18,7 @@
 
 from tools import timer
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 
 from PyQt5.QtCore import (
     QCoreApplication, Qt,
@@ -243,7 +244,7 @@ class PlotRKC(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()

src/View/HydraulicStructures/Table.py

@@ -96,14 +96,17 @@ class ComboBoxDelegate(QItemDelegate):
             reach = self._data.hydraulic_structures\
                               .get_for_enabled_reaches(index.row())\
                               .input_reach
-            profiles = list(
-                filter(
-                    lambda p: p.display_name() == text,
-                    reach.reach.profiles
+            if reach is None:
+                value = None
+            else:
+                profiles = list(
+                    filter(
+                        lambda p: p.display_name() == text,
+                        reach.reach.profiles
+                    )
                 )
-            )
 
-            value = profiles[0] if len(profiles) > 0 else None
+                value = profiles[0] if len(profiles) > 0 else None
         else:
             value = text
 

src/View/InitialConditions/Table.py

@@ -31,7 +31,7 @@ from PyQt5.QtWidgets import (
     QDialogButtonBox, QPushButton, QLineEdit,
     QFileDialog, QTableView, QAbstractItemView,
     QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
+    QComboBox, QMessageBox
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -290,8 +290,6 @@ class InitialConditionTableModel(PamhyrTableModel):
             logger.error("No results data")
             return
 
-        self.layoutAboutToBeChanged.emit()
-
         ts = max(results.get("timestamps"))
         res_reach = results.river.get_reach_by_geometry(
             self._reach.reach
@@ -307,19 +305,15 @@ class InitialConditionTableModel(PamhyrTableModel):
             )
         )
 
-        self._undo.push(
-            ReplaceDataCommand(
-                self._lst,
-                list(
-                    map(
-                        lambda d: self._lst.new_from_data(*d),
-                        data
-                    )
-                )
+        new_data = list(
+            map(
+                lambda d: self._lst.new_from_data(*d),
+                data
             )
         )
 
         self.layoutAboutToBeChanged.emit()
+        self._undo.push(ReplaceDataCommand(self._lst, new_data))
         self.layoutChanged.emit()
 
     def read_from_ini(self, file_name):
@@ -355,17 +349,31 @@ class InitialConditionTableModel(PamhyrTableModel):
                                         line_split[2],
                                         line_split[3]])
 
-        self._undo.push(
-            ReplaceDataCommand(
-                self._lst,
-                list(
-                    map(
-                        lambda d: self._lst.new_from_data(*d),
-                        data
-                    )
+        new_data = []
+        missing_rks = []
+        for row in data:
+            rk = row[0].strip()
+            try:
+                new_data.append(self._lst.new_from_data(*row))
+            except ValueError:
+                missing_rks.append(rk)
+                logger.warning(
+                    f"No profile found for imported RK {rk} "
+                    f"in reach {self._reach.name}"
+                )
+
+        self.layoutAboutToBeChanged.emit()
+        self._undo.push(ReplaceDataCommand(self._lst, new_data))
+        self.layoutChanged.emit()
+
+        if missing_rks:
+            QMessageBox.warning(
+                self._table_view,
+                self._trad["missing_rk_title"],
+                self._trad["missing_rk_text"].format(
+                    rks=", ".join(missing_rks)
                 )
             )
-        )
 
     def undo(self):
         self._undo.undo()

src/View/InitialConditions/translate.py

@@ -42,6 +42,13 @@ class ICTranslate(MainTranslate):
             "InitialCondition", "Mage initial conditions file (*.INI *.ini)")
         self._dict["file_all"] = _translate(
             "InitialCondition", "All files (*)")
+        self._dict["missing_rk_title"] = _translate(
+            "InitialCondition", "Profiles not found")
+        self._dict["missing_rk_text"] = _translate(
+            "InitialCondition",
+            "No profile was found for the following RK values: {rks}. "
+            "They were not imported and must be entered manually."
+        )
 
         self._sub_dict["table_headers"] = {
             # "name": _translate("InitialCondition", "Name"),

src/View/InitialConditionsAdisTS/Table.py

@@ -205,13 +205,14 @@ class InitialConditionTableModel(PamhyrTableModel):
             if self._headers[column] != "reach":
                 self._undo.push(
                     SetCommandSpec(
-                        self._lst, row, self._headers[column], value
+                        self._data, self._lst, row,
+                        self._headers[column], value
                     )
                 )
             elif self._headers[column] == "reach":
                 self._undo.push(
                     SetCommandSpec(
-                        self._lst, row, self._headers[column],
+                        self._data, self._lst, row, self._headers[column],
                         self._river.edge(value).id
                     )
                 )

src/View/InitialConditionsAdisTS/UndoCommand.py

@@ -80,31 +80,31 @@ class SetCommand(QUndoCommand):
 
 
 class SetCommandSpec(QUndoCommand):
-    def __init__(self, data, row, column, new_value):
+    def __init__(self, parent, data, row, column, new_value):
         QUndoCommand.__init__(self)
 
-        self._data = data
-        self._row = row
+        self._parent = parent
+        self._value = data[row]
         self._column = column
 
         if self._column == "name":
-            self._old = self._data[self._row].name
+            self._old = self._value.name
         elif self._column == "reach":
-            self._old = self._data[self._row].reach
+            self._old = self._value.reach
         elif self._column == "start_rk":
-            self._old = self._data[self._row].start_rk
+            self._old = self._value.start_rk
         elif self._column == "end_rk":
-            self._old = self._data[self._row].end_rk
+            self._old = self._value.end_rk
         elif self._column == "concentration":
-            self._old = self._data[self._row].concentration
+            self._old = self._value.concentration
         elif self._column == "eg":
-            self._old = self._data[self._row].eg
+            self._old = self._value.eg
         elif self._column == "em":
-            self._old = self._data[self._row].em
+            self._old = self._value.em
         elif self._column == "ed":
-            self._old = self._data[self._row].ed
+            self._old = self._value.ed
         elif self._column == "rate":
-            self._old = self._data[self._row].rate
+            self._old = self._value.rate
 
         _type = float
         if column == "name":
@@ -115,44 +115,12 @@ class SetCommandSpec(QUndoCommand):
         self._new = _type(new_value)
 
     def undo(self):
-        if self._column == "name":
-            self._data[self._row].name = self._old
-        elif self._column == "reach":
-            self._data[self._row].reach = self._old
-        elif self._column == "start_rk":
-            self._data[self._row].start_rk = self._old
-        elif self._column == "end_rk":
-            self._data[self._row].end_rk = self._old
-        elif self._column == "concentration":
-            self._data[self._row].concentration = self._old
-        elif self._column == "eg":
-            self._data[self._row].eg = self._old
-        elif self._column == "em":
-            self._data[self._row].em = self._old
-        elif self._column == "ed":
-            self._data[self._row].ed = self._old
-        elif self._column == "rate":
-            self._data[self._row].rate = self._old
+        setattr(self._value, self._column, self._old)
+        self._parent.modified()
 
     def redo(self):
-        if self._column == "name":
-            self._data[self._row].name = self._new
-        elif self._column == "reach":
-            self._data[self._row].reach = self._new
-        elif self._column == "start_rk":
-            self._data[self._row].start_rk = self._new
-        elif self._column == "end_rk":
-            self._data[self._row].end_rk = self._new
-        elif self._column == "concentration":
-            self._data[self._row].concentration = self._new
-        elif self._column == "eg":
-            self._data[self._row].eg = self._new
-        elif self._column == "em":
-            self._data[self._row].em = self._new
-        elif self._column == "ed":
-            self._data[self._row].ed = self._new
-        elif self._column == "rate":
-            self._data[self._row].rate = self._new
+        setattr(self._value, self._column, self._new)
+        self._parent.modified()
 
 
 class AddCommand(QUndoCommand):

src/View/InitialConditionsTemperature/Table.py

@@ -30,13 +30,13 @@ from PyQt5.QtWidgets import (
     QDialogButtonBox, QPushButton, QLineEdit,
     QFileDialog, QTableView, QAbstractItemView,
     QUndoStack, QShortcut, QAction, QItemDelegate,
-    QComboBox,
+    QComboBox, QMessageBox,
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
 
 from View.InitialConditionsTemperature.UndoCommand import (
-    SetCommand, AddCommand, SetCommandSpec,
+    AddCommand, SetCommandSpec,
     DelCommand,
 )
 
@@ -229,13 +229,22 @@ class InitialConditionTableModel(PamhyrTableModel):
 
         row = index.row()
         column = index.column()
+        column_name = self._headers[column]
 
         try:
-            if self._headers[column] in ["name", "temperature"]:
-                self._undo.push(
-                    SetCommand(
-                        self._lst, row, self._headers[column], value
-                    )
+            new_value = (
+                self._river.edge(value).id
+                if column_name == "reach"
+                else value
+            )
+            if (column_name in ("reach", "rk")
+                    and self._overlaps_existing_rk(
+                        row, column_name, new_value
+                    )):
+                QMessageBox.warning(
+                    self._table_view,
+                    self._trad["msg_rk_overlap_title"],
+                    self._trad["msg_rk_overlap_text"]
                 )
             else:
                 new_value = value
@@ -248,7 +257,8 @@ class InitialConditionTableModel(PamhyrTableModel):
 
                 self._undo.push(
                     SetCommandSpec(
-                        self._lst, row, self._headers[column],
+                        self._data, self._lst, row,
+                        self._headers[column],
                         new_value
                     )
                 )
@@ -265,6 +275,25 @@ class InitialConditionTableModel(PamhyrTableModel):
             self.dataChanged.emit(index, index)
         return True
 
+    def _overlaps_existing_rk(self, row, column, value):
+        current = self._lst[row]
+        reach = value if column == "reach" else current.reach
+        rk = value if column == "rk" else current.start_rk
+        if reach in (None, -1) or rk is None:
+            return False
+
+        rk = float(rk)
+        return any(
+            other is not current
+            and not other.is_deleted()
+            and other.reach == reach
+            and other.start_rk is not None
+            and other.end_rk is not None
+            and min(other.start_rk, other.end_rk) <= rk
+            <= max(other.start_rk, other.end_rk)
+            for other in self._data._data
+        )
+
     def add(self, row, parent=QModelIndex()):
         self.beginInsertRows(parent, row, row - 1)
 

src/View/InitialConditionsTemperature/UndoCommand.py

@@ -62,23 +62,23 @@ class SetCommand(QUndoCommand):
 
 
 class SetCommandSpec(QUndoCommand):
-    def __init__(self, data, row, column, new_value):
+    def __init__(self, parent, data, row, column, new_value):
         QUndoCommand.__init__(self)
 
-        self._data = data
-        self._row = row
+        self._parent = parent
+        self._value = data[row]
         self._column = column
 
         if self._column == "name":
-            self._old = self._data[self._row].name
+            self._old = self._value.name
         elif self._column == "reach":
-            self._old = self._data[self._row].reach
-            self._old_start_rk = self._data[self._row].start_rk
-            self._old_end_rk = self._data[self._row].end_rk
+            self._old = self._value.reach
+            self._old_start_rk = self._value.start_rk
+            self._old_end_rk = self._value.end_rk
         elif self._column == "rk":
-            self._old = self._data[self._row].start_rk
+            self._old = self._value.start_rk
         elif self._column == "temperature":
-            self._old = self._data[self._row].temperature
+            self._old = self._value.temperature
 
         _type = float
         if column == "name":
@@ -94,29 +94,31 @@ class SetCommandSpec(QUndoCommand):
 
     def undo(self):
         if self._column == "name":
-            self._data[self._row].name = self._old
+            self._value.name = self._old
         elif self._column == "reach":
-            self._data[self._row].reach = self._old
-            self._data[self._row].start_rk = self._old_start_rk
-            self._data[self._row].end_rk = self._old_end_rk
+            self._value.reach = self._old
+            self._value.start_rk = self._old_start_rk
+            self._value.end_rk = self._old_end_rk
         elif self._column == "rk":
-            self._data[self._row].start_rk = self._old
-            self._data[self._row].end_rk = self._old
+            self._value.start_rk = self._old
+            self._value.end_rk = self._old
         elif self._column == "temperature":
-            self._data[self._row].temperature = self._old
+            self._value.temperature = self._old
+        self._parent.modified()
 
     def redo(self):
         if self._column == "name":
-            self._data[self._row].name = self._new
+            self._value.name = self._new
         elif self._column == "reach":
-            self._data[self._row].reach = self._new
-            self._data[self._row].start_rk = self._new_rk
-            self._data[self._row].end_rk = self._new_rk
+            self._value.reach = self._new
+            self._value.start_rk = self._new_rk
+            self._value.end_rk = self._new_rk
         elif self._column == "rk":
-            self._data[self._row].start_rk = self._new
-            self._data[self._row].end_rk = self._new
+            self._value.start_rk = self._new
+            self._value.end_rk = self._new
         elif self._column == "temperature":
-            self._data[self._row].temperature = self._new
+            self._value.temperature = self._new
+        self._parent.modified()
 
 
 class AddCommand(QUndoCommand):

src/View/InitialConditionsTemperature/translate.py

@@ -32,6 +32,16 @@ class IcTemperatureTranslate(MainTranslate):
 
         self._dict["rk"] = self._dict["unit_rk"]
 
+        self._dict["msg_rk_overlap_title"] = _translate(
+            "InitialConditionTemperature",
+            "Chainage already used"
+        )
+        self._dict["msg_rk_overlap_text"] = _translate(
+            "InitialConditionTemperature",
+            "An initial temperature condition is already defined at this "
+            "chainage on the selected reach."
+        )
+
         self._sub_dict["table_headers"] = {
             "name": self._dict["name"],
             "temperature": self._dict["unit_temperature"],

src/View/LateralContribution/Edit/Table.py

@@ -20,10 +20,11 @@ import logging
 import traceback
 from datetime import date, time, datetime, timedelta
 
+from tools import parse_datetime
 from tools import (
     trace, timer,
     timestamp_to_old_pamhyr_date,
-    old_pamhyr_date_to_timestamp
+    old_pamhyr_date_to_timestamp, format_datetime
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -73,10 +74,13 @@ class TableModel(PamhyrTableModel):
             if self._data.get_type_column(column) == float:
                 value = f"{v:.4f}"
             elif self._data.header[column] == "time":
-                if self._opt_data == "time":
+                if self.time_system == "time":
                     value = timestamp_to_old_pamhyr_date(int(v))
                 else:
-                    value = str(datetime.fromtimestamp(v))
+                    value = format_datetime(
+                        parse_datetime(self.start_date)
+                        + timedelta(seconds=float(v))
+                    )
             else:
                 value = f"{v}"
 
@@ -93,6 +97,10 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         try:
+            if (self._data.header[column] == "time"
+                    and self.time_system == "date"):
+                value = self.date_to_elapsed_seconds(value)
+
             self._undo.push(
                 SetDataCommand(
                     self._data, row, column, value
@@ -178,17 +186,18 @@ class TableModel(PamhyrTableModel):
         if len(data) == 0:
             return
 
+        try:
+            rows = [self._data.new_from_data(header, d) for d in data]
+        except (ValueError, TypeError, IndexError) as error:
+            logger.warning(error)
+            return False
+
         self.layoutAboutToBeChanged.emit()
 
         self._undo.push(
             PasteCommand(
                 self._data, row,
-                list(
-                    map(
-                        lambda d: self._data.new_from_data(header, d),
-                        data
-                    )
-                )
+                rows
             )
         )
 

src/View/LateralContribution/Edit/Window.py

@@ -25,6 +25,8 @@ from PyQt5.QtGui import (
     QKeySequence,
 )
 
+from Modules import Modules
+
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel, QCoreApplication,
 )
@@ -109,7 +111,8 @@ class EditLateralContributionWindow(PamhyrWindow):
             data=self._data,
             undo=self._undo_stack,
             trad=self._trad,
-            opt_data=self._study.time_system
+            opt_data=self._study.time_system,
+            study=self._study
         )
 
         table.setModel(self._table)
@@ -145,6 +148,11 @@ class EditLateralContributionWindow(PamhyrWindow):
         self._table.dataChanged.connect(self.update)
         self._table.layoutChanged.connect(self.update)
 
+    def _propagated_update(self, key=Modules(0)):
+        if Modules.STUDY in key:
+            self._table.layoutChanged.emit()
+            self.plot.update()
+
     def update(self):
         self.plot.update()
         self.plot.fit_to_data()

src/View/LateralContribution/PlotXY.py

@@ -127,7 +127,7 @@ class PlotXY(PamhyrPlot):
         for xy in zip(self.data.get_x(), self.data.get_y()):
             self.line_xy.append(np.column_stack(xy))
 
-        self._colors, self._style = self.color_hightlight()
+        self._colors, self._style = self.color_highlight()
         self.line_xy_collection = collections.LineCollection(
                 self.line_xy,
                 colors=self._colors,
@@ -136,7 +136,7 @@ class PlotXY(PamhyrPlot):
             )
         self.canvas.axes.add_collection(self.line_xy_collection)
 
-    def color_hightlight(self):
+    def color_highlight(self):
         rk_min, rk_max = (-1, -1)
         if self._highlight_data is not None:
             rk_min, rk_max = self._highlight_data
@@ -250,7 +250,7 @@ class PlotXY(PamhyrPlot):
 
     def update_current(self):
         if self._current_data_update:
-            self._colors, self._style = self.color_hightlight()
+            self._colors, self._style = self.color_highlight()
             self.line_xy_collection.set_colors(self._colors)
             self.line_xy_collection.set_linestyle(self._style)
 

src/View/LateralContributionsAdisTS/Edit/Table.py

@@ -20,11 +20,12 @@ import logging
 import traceback
 from datetime import date, time, datetime, timedelta
 
+from tools import parse_datetime
 from tools import (
     trace, timer,
     timestamp_to_old_pamhyr_date,
     old_pamhyr_date_to_timestamp,
-    timestamp_to_old_pamhyr_date_adists
+    timestamp_to_old_pamhyr_date_adists, format_datetime
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -87,10 +88,13 @@ class TableModel(PamhyrTableModel):
             if self._data._types[column] == float:
                 value = f"{v:.4f}"
             elif self._data.header[column] == "time":
-                if self._opt_data == "time":
+                if self.time_system == "time":
                     value = timestamp_to_old_pamhyr_date_adists(int(v))
                 else:
-                    value = str(datetime.fromtimestamp(v))
+                    value = format_datetime(
+                        parse_datetime(self.start_date)
+                        + timedelta(seconds=float(v))
+                    )
             else:
                 value = f"{v}"
 
@@ -107,6 +111,10 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         try:
+            if (self._data.header[column] == "time"
+                    and self.time_system == "date"):
+                value = self.date_to_elapsed_seconds(value)
+
             row = self.get_true_data_row(row)
 
             self._undo.push(

src/View/LateralContributionsAdisTS/Edit/Window.py

@@ -29,6 +29,8 @@ from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel, QCoreApplication,
 )
 
+from Modules import Modules
+
 from PyQt5.QtWidgets import (
     QDialogButtonBox, QPushButton, QLineEdit,
     QFileDialog, QTableView, QAbstractItemView,
@@ -57,6 +59,15 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
         name = trad[self._pamhyr_name]
 
         if self._data is not None:
+            pollutant_name = next(
+                (
+                    pollutant.name
+                    for pollutant in study.river.Pollutants.Pollutants_List
+                    if pollutant.id == self._data.pollutant
+                ),
+                None
+            )
+
             if self._data.reach is not None:
                 reach_name = next(filter(
                     lambda reach: reach.id == self._data.reach,
@@ -75,12 +86,10 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
             else:
                 end_rk = trad['not_associated']
 
-            name += (
-                f" - {study.name} - " +
-                f"{reach_name} - " +
-                f"({begin_rk} - " +
-                f"{end_rk})"
-            )
+            name += f" - {study.name}"
+            if pollutant_name is not None:
+                name += f" - {pollutant_name}"
+            name += f" - {reach_name} - ({begin_rk} - {end_rk})"
 
         super(EditLateralContributionAdisTSWindow, self).__init__(
             title=name,
@@ -124,7 +133,8 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
             data=self._data,
             undo=self._undo_stack,
             trad=self._trad,
-            opt_data=self._study.time_system
+            opt_data=self._study.time_system,
+            study=self._study
         )
 
         table.setModel(self._table)
@@ -158,6 +168,11 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
 
         self._table.dataChanged.connect(self.update)
 
+    def _propagated_update(self, key=Modules(0)):
+        if Modules.STUDY in key:
+            self._table.layoutChanged.emit()
+            self.plot.update()
+
     def update(self):
         self.plot.update()
         self.plot.fit_to_data()

src/View/LateralContributionsAdisTS/PlotXY.py

@@ -0,0 +1,36 @@
+# PlotXY.py -- Pamhyr
+# 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
+# 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/>.
+
+from View.Geometry.PlotXY import PlotXY as GeometryPlotXY
+
+
+class PlotXY(GeometryPlotXY):
+    """Geometry plot highlighting the lateral-contribution extent."""
+
+    def color_highlight(self):
+        rk_min, rk_max = (-1, -1)
+        if self.highlight is not None:
+            rk_min, rk_max = self.highlight
+
+        colors = [
+            self.color_plot_river_bottom for _ in range(len(self.data))
+        ]
+        for index, rk in enumerate(self.data.get_rk_complete_profiles()):
+            if rk_min <= rk <= rk_max:
+                colors[index] = self.color_plot_current
+
+        styles = ["-" for _ in range(len(self.data))]
+        return colors, styles

src/View/LateralContributionsAdisTS/Window.py

@@ -45,7 +45,7 @@ from View.LateralContributionsAdisTS.Table import (
 )
 
 from View.Tools.Plot.PamhyrCanvas import MplCanvas
-from View.Geometry.PlotXY import PlotXY
+from View.LateralContributionsAdisTS.PlotXY import PlotXY
 from View.LateralContributionsAdisTS.translate \
     import LCTranslate
 from View.LateralContributionsAdisTS.Edit.Window \

src/View/MainWindow.py

@@ -61,11 +61,13 @@ from View.WaitingDialog import WaitingDialog
 
 from View.MainWindowTabInfo import WidgetInfo
 from View.MainWindowTabChecker import WidgetChecker
+from View.MainWindowTabGraph import WidgetGraph
 
 from View.Configure.Window import ConfigureWindow
 from View.Study.Window import NewStudyWindow
 from View.About.Window import AboutWindow
 from View.Scenarios.Window import ScenariosWindow
+from View.Ensembles.Window import EnsemblesWindow
 from View.Network.Window import NetworkWindow
 from View.Geometry.Window import GeometryWindow
 from View.BoundaryCondition.Window import BoundaryConditionWindow
@@ -82,11 +84,14 @@ from View.GeoTIFF.Window import GeoTIFFListWindow
 from View.REPLines.Window import REPLineListWindow
 from View.SolverParameters.Window import SolverParametersWindow
 from View.RunSolver.Window import (
+    EnsembleRunNumberDialog,
     SelectSolverWindow,
     SolverLogWindow,
+    SolverLogEnsWindow,
 )
 
-from View.Results.Window import ResultsWindow
+
+from View.Results.Window import ResultsWindow, ResultsEnsembleWindow
 from View.Results.CompareDialog import (
     CompareScenariosWindow
 )
@@ -235,6 +240,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
 
     def setup_tab(self):
         self.setup_tab_info()
+        self.setup_tab_graph()
         self.setup_tab_checker()
 
     def setup_tab_info(self):
@@ -261,6 +267,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             self._trad["tab_checker_name"]
         )
 
+    def setup_tab_graph(self):
+        tab_widget = self.findChild(QTabWidget, "tabWidget")
+
+        self._tab_widget_graph = WidgetGraph(
+            study=self._study, trad=self._trad, parent=self
+        )
+
+        tab_widget.insertTab(
+            0, self._tab_widget_graph,
+            self._trad["tab_graph_name"]
+        )
+        tab_widget.setCurrentWidget(self._tab_widget_graph)
+
     def enable_actions(self, action: str, enable: bool):
         """Enable of disable an action componant
 
@@ -545,6 +564,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             self._do_propagate_update_rec(window, keys)
 
         self._tab_widget_checker.update(modules=keys)
+        self._tab_widget_graph.update()
 
     def _do_propagate_update_info_tab(self, keys):
         modules = Modules.modelling_list()
@@ -570,6 +590,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             self._tab_widget_info.study = self._study
             self._tab_widget_info.update()
 
+        if self._tab_widget_graph.study != self._study:
+            self._tab_widget_graph.study = self._study
+            self._tab_widget_graph.update()
+
         if self._tab_widget_checker.study != self._study:
             self._tab_widget_checker.study = self._study
             self._tab_widget_checker.update(modules=Modules.STUDY)
@@ -898,13 +922,32 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
     # MSG AND DIALOG #
     ##################
 
-    def msg_select_reach(self):
-        self.message_box(
-            window_title=self._trad["Warning"],
-            text=self._trad["mb_select_reach_title"],
-            informative_text=self._trad["mb_select_reach_msg"]
+    def ensure_current_reach(self):
+        """Offer a reach selection when needed;
+        return False on cancellation."""
+        if self._study is None:
+            return False
+        river = self._study.river
+        if river.has_current_reach():
+            return True
+        edges = list(river.edges())
+        if not edges:
+            QMessageBox.information(
+                self, self._trad["Select reach"], self._trad["no_reach"]
+            )
+            return False
+        labels = [f"{edge.name or self._trad['reach']} (#{edge.id})"
+                  for edge in edges]
+        selected, accepted = QInputDialog.getItem(
+            self, self._trad["Select reach"],
+            self._trad["reach"] + ":", labels, 0, False
         )
-        self.open_network()
+        if not accepted:
+            return False
+        river.set_current_reach(edges[labels.index(selected)])
+        self._tab_widget_graph.update()
+        self._propagate_update(key=Modules.NETWORK)
+        return True
 
     def dialog_reopen_study(self):
         dlg = QMessageBox(self)
@@ -1287,6 +1330,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
                 return
 
             self.network = NetworkWindow(study=self._study, parent=self)
+            self.network.networkChanged.connect(
+                self._tab_widget_graph.update, Qt.QueuedConnection
+            )
             self.network.show()
 
     def open_scenarios(self):
@@ -1297,6 +1343,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         """
         if self._study is None:
             return
+
         if self._study.filename is None or self._study.filename == "":
             self.message_box(
                 window_title=self._trad["Warning"],
@@ -1330,13 +1377,36 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             self.scenarios = ScenariosWindow(study=self._study, parent=self)
             self.scenarios.show()
 
+    def open_ensemble_scenario(self):
+        """Open ensemble scenario window
+
+        Returns:
+            Nothing
+        """
+        if self._study is None:
+            return
+
+        if self.sub_window_exists(
+            EnsemblesWindow,
+            data=[self._study, self.conf]
+        ):
+            return
+
+        ensemble = EnsemblesWindow(
+            ensembles=self._study.river._ensembles,
+            study=self._study,
+            config=self.conf,
+            parent=self
+        )
+        ensemble.show()
+
     def open_geometry(self):
         """Open geometry window
 
         Returns:
             Nothing
         """
-        if (self._study is not None and self._study.river.has_current_reach()):
+        if self.ensure_current_reach():
             reach = self._study.river.current_reach().reach
 
             if self.sub_window_exists(
@@ -1356,9 +1426,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             )
             geometry.show()
             return geometry
-        else:
-            self.msg_select_reach()
-            return None
+        return None
 
     def open_meshing(self):
         """Open the current reach geometry and its meshing dialog."""
@@ -1441,27 +1509,24 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         strick.show()
 
     def open_frictions(self):
-        if self._study is not None:
-            if self._study.river.has_current_reach():
-                reach = self._study.river.current_reach()
+        if self.ensure_current_reach():
+            reach = self._study.river.current_reach()
 
-                if self.sub_window_exists(
-                    FrictionsWindow,
-                    data=[self._study, self.conf, reach]
-                ):
-                    return
+            if self.sub_window_exists(
+                FrictionsWindow,
+                data=[self._study, self.conf, reach]
+            ):
+                return
 
-                frictions = FrictionsWindow(
-                    study=self._study,
-                    config=self.conf,
-                    parent=self
-                )
-                frictions.show()
-            else:
-                self.msg_select_reach()
+            frictions = FrictionsWindow(
+                study=self._study,
+                config=self.conf,
+                parent=self
+            )
+            frictions.show()
 
     def open_initial_conditions(self):
-        if self._study.river.has_current_reach():
+        if self.ensure_current_reach():
             reach = self._study.river.current_reach()
 
             if self.sub_window_exists(
@@ -1477,8 +1542,6 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
                 parent=self
             )
             initial.show()
-        else:
-            self.msg_select_reach()
 
     def open_additional_files(self):
         if self._study is not None:
@@ -1552,8 +1615,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             )
             return
 
-        if not self._study.river.has_current_reach():
-            self.msg_select_reach()
+        if not self.ensure_current_reach():
             return
 
         reach = self._study.river.current_reach().reach
@@ -1694,6 +1756,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         sol.show()
 
     def solver_log(self, solver):
+        if self._study.status.scenario.is_ensemble():
+            return self._solver_log_ensemble(solver)
+
         sol = SolverLogWindow(
             study=self._study,
             config=self.conf,
@@ -1702,6 +1767,28 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         )
         sol.show()
 
+    def _solver_log_ensemble(self, solver):
+        run_number = 1
+
+        dlg = EnsembleRunNumberDialog(
+            trad=self._trad,
+            parent=self
+        )
+        if dlg.exec():
+            function = dlg.function
+            number_of_run = dlg.number
+            seed = dlg.seed
+
+            sol = SolverLogEnsWindow(
+                number_of_run=number_of_run,
+                seed=seed, function=function,
+                study=self._study,
+                config=self.conf,
+                solver=solver,
+                parent=self
+            )
+            sol.show()
+
     def msg_box_results_continue(self):
         dlg = QMessageBox(self)
 
@@ -1778,6 +1865,12 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             if not self.msg_box_results_continue():
                 return
 
+        if self._study.status.scenario.is_ensemble():
+            self.open_solver_ens_results_window(solver, results)
+        else:
+            self.open_solver_results_window(solver, results)
+
+    def open_solver_results_window(self, solver, results):
         # Windows already opened
         if self.sub_window_exists(
                 ResultsWindow,
@@ -1797,6 +1890,26 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         )
         res.show()
 
+    def open_solver_ens_results_window(self, solver, results):
+        # Windows already opened
+        if self.sub_window_exists(
+                ResultsEnsembleWindow,
+                data=[
+                    self._study,
+                    None,      # No config,
+                    results._solver,
+                    results._repertory,
+                    results._name]
+        ):
+            return
+
+        res = ResultsEnsembleWindow(
+            study=self._study,
+            results=[results],
+            parent=self
+        )
+        res.show()
+
     def msg_open_results_no_results(self):
         self.message_box(
             window_title=self._trad["Warning"],

src/View/MainWindowTabGraph.py

@@ -0,0 +1,139 @@
+# MainWindowTabGraph.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.
+
+# -*- coding: utf-8 -*-
+
+from View.Tools.Plot.PamhyrCanvas import MplCanvas
+from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
+from View.PlotXY import PlotXY
+from View.Network.GraphWidget import GraphWidget
+
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import (
+    QWidget, QGroupBox, QLabel, QHBoxLayout, QVBoxLayout, QSplitter,
+)
+
+
+class WidgetGraph(QWidget):
+    """Read-only network graph displayed in the main window."""
+
+    def __init__(self, study=None, trad=None, parent=None):
+        super(WidgetGraph, self).__init__(parent)
+
+        self._study = study
+        self._trad = trad
+        self._plot_river = None
+
+        layout = QHBoxLayout(self)
+        self._splitter = QSplitter(Qt.Horizontal, self)
+        self._splitter.setChildrenCollapsible(False)
+        layout.addWidget(self._splitter)
+        self._graph_widget = None
+
+        self._graph_group = QGroupBox(
+            self._trad["graph_network_title"], self
+        )
+        self._graph_layout = QVBoxLayout(self._graph_group)
+
+        self._graph_title = QLabel(self._graph_group)
+        self._graph_title.setTextFormat(Qt.PlainText)
+        self._graph_title.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
+        self._graph_title.setWordWrap(True)
+        self._graph_layout.addWidget(self._graph_title)
+        self._update_graph_title()
+        self._splitter.addWidget(self._graph_group)
+
+        self.canvas = MplCanvas(width=5, height=4, dpi=100)
+        self.canvas.setObjectName("canvas_graph")
+        self.toolbar = PamhyrPlotToolbar(
+            self.canvas, self,
+            items=["home", "zoom", "save", "iso", "back/forward", "move"]
+        )
+        self._plot_group = QGroupBox(
+            self._trad["graph_geographic_title"], self
+        )
+        self._plot_layout = QVBoxLayout(self._plot_group)
+        self._plot_layout.addWidget(self.toolbar)
+        self._plot_layout.addWidget(self.canvas, 1)
+        self._splitter.addWidget(self._plot_group)
+        self._splitter.setStretchFactor(0, 1)
+        self._splitter.setStretchFactor(1, 1)
+        self._splitter.setSizes([1000, 1000])
+
+        self.plot = PlotXY(
+            canvas=self.canvas,
+            data=None,
+            trad=self._trad,
+            toolbar=self.toolbar,
+            parent=self
+        )
+
+    @property
+    def study(self):
+        return self._study
+
+    @study.setter
+    def study(self, study):
+        self._study = study
+        self._update_graph_title()
+
+    def _update_graph_title(self):
+        self._graph_title.setText(
+            self._study.name if self._study is not None else ""
+        )
+
+    def update(self):
+        river = self._study.river if self._study is not None else None
+        view = None
+        if river is not None and river is self._plot_river:
+            axes = self.canvas.axes
+            if axes.has_data():
+                view = (axes.get_xlim(), axes.get_ylim(),
+                        axes.get_aspect(), axes.get_adjustable())
+
+        self._update_graph_title()
+        if (self._graph_widget is not None
+            and (self._study is None
+                 or self._graph_widget.graph is not self._study.river)):
+            self._graph_layout.removeWidget(self._graph_widget)
+            self._graph_widget.deleteLater()
+            self._graph_widget = None
+
+        if self._study is not None and self._graph_widget is None:
+            self._graph_widget = GraphWidget(
+                self._study.river,
+                parent=self,
+                only_display=True,
+                trad=self._trad,
+            )
+            self._graph_layout.addWidget(self._graph_widget, 1)
+        elif self._graph_widget is not None:
+            self._graph_widget.display_update()
+
+        data = None
+        geotiff = None
+        if self._study is not None:
+            data = self._study.river.enable_edges()
+            geotiff = self._study.river.geotiff
+
+        self.plot = PlotXY(
+            canvas=self.canvas,
+            data=data,
+            geotiff=geotiff,
+            trad=self._trad,
+            toolbar=self.toolbar,
+            parent=self
+        )
+        self.plot.update()
+        self._plot_river = river
+        if view is not None:
+            x_limits, y_limits, aspect, adjustable = view
+            self.canvas.axes.set_aspect(aspect, adjustable=adjustable)
+            self.canvas.axes.set_xlim(x_limits)
+            self.canvas.axes.set_ylim(y_limits)
+            self.canvas.draw_idle()

src/View/Network/GraphWidget.py

@@ -32,6 +32,7 @@ from PyQt5.QtGui import (
 from PyQt5.QtWidgets import (
     QApplication, QGraphicsScene, QGraphicsView,
     QGraphicsItem, QGraphicsTextItem, QMenu,
+    QMessageBox,
 )
 
 from Model.Network.Node import Node
@@ -447,6 +448,7 @@ class NewEdgeLine(QGraphicsItem):
 class GraphWidget(QGraphicsView):
     changeEdge = pyqtSignal(object)
     changeNode = pyqtSignal(object)
+    currentEdgeChanged = pyqtSignal()
 
     def __init__(self, graph, parent=None,
                  min_size=(400, 400), max_size=None,
@@ -475,6 +477,7 @@ class GraphWidget(QGraphicsView):
         self.m_origin_x = 0.0
         self.m_origin_y = 0.0
         self.clicked = False
+        self._panning = False
 
         self.setup_scene(min_size, max_size, size)
 
@@ -490,8 +493,8 @@ class GraphWidget(QGraphicsView):
         self.setTransformationAnchor(QGraphicsView.AnchorUnderMouse)
         self.setResizeAnchor(QGraphicsView.AnchorViewCenter)
 
-        self.scale(1, 1)
-        self.previousScale = 1
+        self.scale(0.7, 0.7)
+        self.previousScale = 0.7
         self.centerOn(1000.0, 1000.0)
 
         if min_size:
@@ -666,6 +669,13 @@ class GraphWidget(QGraphicsView):
         Returns:
             Nothing
         """
+        # Scene items are destroyed by clear(); do not retain hover/selection
+        # references to them when refreshing another view of the same graph.
+        self._selected_item = None
+        self._selected_new_edge_src_node = None
+        self._current_edge = None
+        self._current_moved_node = None
+        self.tmp_line = None
         self.scene().clear()
         self.create_items()
 
@@ -724,6 +734,16 @@ class GraphWidget(QGraphicsView):
 
     def split_edge(self, item):
         edge = item.edge
+        if len(edge.reach.profiles) < 3:
+            QMessageBox.information(
+                self,
+                self._trad["menu_split_edge"],
+                _translate(
+                    "Network",
+                    "No profile is available to split this reach."
+                )
+            )
+            return
 
         dlg = SelectProfileDialog(
             study=self.parent._study,
@@ -864,6 +884,9 @@ class GraphWidget(QGraphicsView):
 
             if previous_edge:
                 previous_edge.update()
+            edge.update()
+            if previous_edge is not edge:
+                self.currentEdgeChanged.emit()
         except Exception as e:
             logger.warning(str(e))
 
@@ -926,6 +949,8 @@ class GraphWidget(QGraphicsView):
 
     def mousePressEvent(self, event):
         if self._only_display:
+            if event.button() == Qt.LeftButton:
+                self._start_pan(event)
             return
 
         if event.button() == Qt.RightButton \
@@ -948,15 +973,22 @@ class GraphWidget(QGraphicsView):
             self._selected_new_edge_src_node = None
 
             items = self.items(event.pos())
+            if event.button() == Qt.LeftButton and not any(
+                isinstance(item, (NodeItem, EdgeItem, NodeText))
+                for item in items
+            ):
+                self._start_pan(event)
+                return
             if items and type(items[0]) is EdgeItem:
                 edge = items[0]
                 if edge:
                     self.set_current_edge(edge)
             if not locked:
                 if items and type(items[0]) is NodeItem:
-                    self._mouse_origin_x = pos.x()
-                    self._mouse_origin_y = pos.y()
                     self._current_moved_node = items[0]
+                    node_pos = self._current_moved_node.pos()
+                    self._mouse_origin_x = node_pos.x()
+                    self._mouse_origin_y = node_pos.y()
 
         if not locked:
             # Add nodes and edges
@@ -995,7 +1027,10 @@ class GraphWidget(QGraphicsView):
     def mouseReleaseEvent(self, event):
         self.clicked = False
 
-        if self._only_display:
+        if self._panning or self._only_display:
+            self._panning = False
+            self.viewport().unsetCursor()
+            event.accept()
             return
 
         locked = self.graph._status.is_read_only()
@@ -1011,11 +1046,34 @@ class GraphWidget(QGraphicsView):
                          self._mouse_origin_y)
                     )
                 )
+                # reset the current moved node
+                self._current_moved_node = None
 
         self.update()
         super(GraphWidget, self).mouseReleaseEvent(event)
 
+    def _start_pan(self, event):
+        self.clicked = True
+        self._panning = True
+        self.m_origin_x = event.x()
+        self.m_origin_y = event.y()
+        self.viewport().setCursor(Qt.ClosedHandCursor)
+        event.accept()
+
     def mouseMoveEvent(self, event):
+        if self._panning or self._only_display:
+            if self._panning and event.buttons() & Qt.LeftButton:
+                dx = event.x() - self.m_origin_x
+                dy = event.y() - self.m_origin_y
+                horizontal = self.horizontalScrollBar()
+                vertical = self.verticalScrollBar()
+                horizontal.setValue(horizontal.value() - dx)
+                vertical.setValue(vertical.value() - dy)
+                self.m_origin_x = event.x()
+                self.m_origin_y = event.y()
+                event.accept()
+            return
+
         pos = self.mapToScene(event.pos())
         locked = self.graph._status.is_read_only()
 
@@ -1047,20 +1105,6 @@ class GraphWidget(QGraphicsView):
 
         # If state is "move"
         if self._state == "move":
-            # Move on scene
-            if not self.selected_item():
-                if event.buttons() & Qt.LeftButton:
-                    old_p = self.mapToScene(
-                        int(self.m_origin_x), int(self.m_origin_y)
-                    )
-                    new_p = self.mapToScene(event.pos())
-                    translation = new_p - old_p
-
-                    self.translate(translation.x(), translation.y())
-
-                    self.m_origin_x = event.x()
-                    self.m_origin_y = event.y()
-
             # Propagate event
             self.update()
             super(GraphWidget, self).mouseMoveEvent(event)

src/View/Network/ProfileDialog.py

@@ -64,6 +64,17 @@ class SelectProfileDialog(PamhyrDialog):
 
         self._reach = reach
         self._profile = None
+        self._profiles = list(self._reach.reach.profiles)
+        structure_profiles = [
+            structure.input_section
+            for structure in study.river.hydraulic_structures.lst
+            if structure.input_reach is reach and not structure.is_deleted()
+        ]
+        self._selectable_indices = [
+            index for index, profile in enumerate(self._profiles)
+            if 0 < index < len(self._profiles) - 1
+            and profile not in structure_profiles
+        ]
 
         self.setup_combobox()
 
@@ -73,18 +84,32 @@ class SelectProfileDialog(PamhyrDialog):
             list(
                 map(
                     lambda p: p.display_name(),
-                    self._reach.reach.profiles)))
-
-    def accept(self):
-        profile = self.get_combobox_text("comboBox")
-
-        self._profile = next(
-            filter(
-                lambda p: p.display_name() == profile,
-                self._reach.reach.profiles
+                    self._profiles
+                )
             )
         )
 
+        combobox = self.find(QComboBox, "comboBox")
+        for index in range(len(self._profiles)):
+            if index not in self._selectable_indices:
+                item = combobox.model().item(index)
+                item.setFlags(item.flags() &
+                              ~(Qt.ItemIsEnabled | Qt.ItemIsSelectable))
+
+        combobox.setCurrentIndex(
+            self._selectable_indices[0] if self._selectable_indices else -1
+        )
+        self.find(QDialogButtonBox, "buttonBox")\
+            .button(QDialogButtonBox.Ok)\
+            .setEnabled(bool(self._selectable_indices))
+
+    def accept(self):
+        index = self.find(QComboBox, "comboBox").currentIndex()
+        if index not in self._selectable_indices:
+            return
+
+        self._profile = self._profiles[index]
+
         super(SelectProfileDialog, self).accept()
 
     def reject(self):

src/View/Network/Window.py

@@ -58,6 +58,8 @@ _translate = QCoreApplication.translate
 
 
 class NetworkWindow(PamhyrWindow):
+    networkChanged = pyqtSignal()
+
     _pamhyr_ui = "Network"
     _pamhyr_name = "River network"
 
@@ -140,6 +142,8 @@ class NetworkWindow(PamhyrWindow):
         self._graph_layout.addWidget(self._graph_widget)
 
     def setup_connections(self):
+        self._undo_stack.indexChanged.connect(self.networkChanged)
+        self._graph_widget.currentEdgeChanged.connect(self.networkChanged)
         self._nodes_model.dataChanged.connect(self.update)
         self._reachs_model.dataChanged.connect(
             self._graph_widget.display_update)

src/View/Pollutants/Table.py

@@ -26,6 +26,7 @@ from PyQt5.QtCore import (
     QCoreApplication, QModelIndex, pyqtSlot,
     QRect,
 )
+from PyQt5.QtGui import QColor
 
 from PyQt5.QtWidgets import (
     QDialogButtonBox, QPushButton, QLineEdit,
@@ -59,14 +60,23 @@ class TableModel(PamhyrTableModel):
         return len(self._lst)
 
     def data(self, index, role):
-        if role != Qt.ItemDataRole.DisplayRole:
+        if not index.isValid():
             return QVariant()
 
         row = index.row()
         column = index.column()
 
+        if role == Qt.BackgroundRole and not self._lst[row].enabled:
+            return QColor(190, 190, 190)
+
+        if role != Qt.ItemDataRole.DisplayRole:
+            return QVariant()
+
         if self._headers[column] == "name":
-            return self._lst[row].name
+            name = self._lst[row].name
+            if not self._lst[row].enabled:
+                name += f" ({self._trad['disabled']})"
+            return name
 
         return QVariant()
 
@@ -74,12 +84,19 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
-        if self.is_same_data(index, value):
-            return False
-
         row = index.row()
         column = index.column()
 
+        if self._headers[column] == "name":
+            suffix = f" ({self._trad['disabled']})"
+            if not self._lst[row].enabled and str(value).endswith(suffix):
+                value = str(value)[:-len(suffix)]
+
+            if str(self._lst[row].name) == str(value):
+                return False
+        elif self.is_same_data(index, value):
+            return False
+
         try:
             if self._headers[column] == "name":
                 self._undo.push(
@@ -110,14 +127,10 @@ class TableModel(PamhyrTableModel):
     def delete(self, rows, parent=QModelIndex()):
         self.beginRemoveRows(parent, rows[0], rows[-1])
 
-        data_rows = {
-            id(pol): i for i, pol in enumerate(self._data._Pollutants._lst)
-        }
         self._undo.push(
             DelCommand(
                 self._data._Pollutants,
-                [data_rows[id(self._lst[row])] for row in rows
-                    if 0 <= row < len(self._lst)],
+                [row for row in rows if 0 <= row < len(self._lst)],
                 self._data.ic_adists
             )
         )

src/View/Pollutants/Translate.py

@@ -32,6 +32,7 @@ class PollutantsTranslate(MainTranslate):
         )
 
         self._dict["x"] = _translate("Pollutants", "X (m)")
+        self._dict["disabled"] = _translate("Pollutants", "disabled")
 
         self._sub_dict["table_headers"] = {
             "name": self._dict["name"],

src/View/Results/CustomExport/CustomExport.py

@@ -26,10 +26,13 @@ from View.Results.translate import ResultsTranslate
 
 
 class CustomExportDialog(PamhyrDialog):
-    _pamhyr_ui = "CustomExportAdisDialog"
-    _pamhyr_name = "Custom Plot Selection"
+    _pamhyr_ui = "CustomExportDialog"
+    _pamhyr_name = "Custom Export"
 
-    def __init__(self, parent=None):
+    def __init__(self,
+                 tag_x="values_x",
+                 tag_y="values_y",
+                 parent=None):
         trad = ResultsTranslate()
         super(CustomExportDialog, self).__init__(
             title=trad[self._pamhyr_name],
@@ -38,8 +41,8 @@ class CustomExportDialog(PamhyrDialog):
             parent=parent
         )
 
-        self._available_values_x = self._trad.get_dict("values_x")
-        self._available_values_y = self._trad.get_dict("values_y")
+        self._available_values_x = self._trad.get_dict(tag_x)
+        self._available_values_y = self._trad.get_dict(tag_y)
 
         self.setup_radio_buttons_x()
         self.setup_radio_buttons_res()
@@ -66,8 +69,8 @@ class CustomExportDialog(PamhyrDialog):
 
     def setup_radio_buttons_res(self):
         self._radio2 = []
-        layout = self.find(QVBoxLayout, "verticalLayout_pol")
-        label = self.find(QLabel, "label_3")
+        layout = self.find(QVBoxLayout, "verticalLayout_solv")
+        label = self.find(QLabel, "label_solv")
         label.setText(self._trad["solver"])
 
         for solver in self.parent._solvers:
@@ -89,7 +92,7 @@ class CustomExportDialog(PamhyrDialog):
         layout.addStretch()
 
     def setup_label(self):
-        self._label = self.find(QLabel, "label_4")
+        self._label = self.find(QLabel, "label_data")
         self._label.setFrameStyle(QFrame.StyledPanel)
         self._label.setStyleSheet('background-color: white')
         self.set_label()
@@ -163,6 +166,15 @@ class CustomExportDialog(PamhyrDialog):
                 res = i
                 break
 
-        self.value = x, y, self._envelop.isChecked(), res
+        self.value = (x, y, self._envelop.isChecked(), res)
 
         super().accept()
+
+
+class CustomExportEnsembleDialog(CustomExportDialog):
+    def __init__(self, parent=None):
+        super(CustomExportEnsembleDialog, self).__init__(
+            tag_x="values_x_ens",
+            tag_y="values_y_ens",
+            parent=parent
+        )

src/View/Results/PlotHEnsemble.py

@@ -0,0 +1,261 @@
+# PlotHEnsemble.py -- Pamhyr
+# 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
+# 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 logging
+
+from functools import reduce
+from datetime import datetime
+
+from tools import timer, trace, logger_exception
+from View.Tools.PamhyrPlot import PamhyrPlot
+
+from PyQt5.QtCore import (
+    QCoreApplication
+)
+
+_translate = QCoreApplication.translate
+
+logger = logging.getLogger()
+
+
+class PlotHEnsemble(PamhyrPlot):
+    def __init__(self, canvas=None, trad=None, toolbar=None,
+                 results=None, reach_id=0, profile_id=[0], res_id=[0],
+                 parent=None):
+        super(PlotHEnsemble, self).__init__(
+            canvas=canvas,
+            trad=trad,
+            data=results,
+            toolbar=toolbar,
+            parent=parent
+        )
+
+        self._mode = "time"
+
+        self._parent = parent
+        self._current_reach_id = reach_id
+        self._current_profile_id = profile_id
+        self._current_res_id = res_id
+        self._timestamps = parent._timestamps
+        self._current_timestamp = max(self._timestamps)
+
+        self.label_x = self._trad["unit_time_s"]
+        self.label_y = self._trad["unit_discharge"]
+
+        self.label_discharge = _translate("Results", "Cross-section discharge")
+        self.label_discharge_max = _translate("Results", "Max discharge")
+        self.label_timestamp = _translate("Results", "Current timestamp")
+
+        self._isometric_axis = False
+
+        # self._auto_relim_update = False
+        # self._autoscale_update = False
+
+        self._line_max = []
+        self._line = []
+        self._add_data_lines = []
+
+    @property
+    def results(self):
+        return self.data
+
+    @results.setter
+    def results(self, results):
+        self.data = results
+        self._current_timestamp = max(self._timestamps)
+
+    @timer
+    def draw(self, highlight=None):
+        self.canvas.axes.cla()
+        self.canvas.axes.grid(color='grey', linestyle='--', linewidth=0.5)
+
+        if self.results is None:
+            return
+
+        if len(self._current_res_id) < 1:
+            return
+
+        for res_id in self._current_res_id:
+            if self.results[res_id] is None:
+                continue
+
+            results = self.results[res_id]
+            reach = results.river.reach(self._current_reach_id)
+
+            if reach.geometry.number_profiles == 0:
+                self._init = False
+                return
+
+            self.draw_data(res_id)
+            self.draw_data_std_derivation(res_id)
+
+        self.canvas.axes.set_xlabel(
+            self._trad["unit_time_s"],
+            color='black', fontsize=10
+        )
+
+        self.canvas.axes.set_ylabel(
+            self._trad["unit_discharge"],
+            color='black', fontsize=10
+        )
+
+        self.set_ticks_time_formater()
+
+        self.draw_additional_data(0)
+
+        self.enable_legend()
+
+        self.canvas.draw_idle()
+        self.update_idle()
+
+        self.draw_current()
+        self._init = True
+
+    @timer
+    def draw_data(self, res_id):
+        results = self.results[res_id]
+        reach = results.river.reach(self._current_reach_id)
+
+        colors = [
+            ("q_min", self.color_plot_ensemble_min),
+            ("q_mean", self.color_plot_ensemble_mean),
+            ("q_max", self.color_plot_ensemble_max),
+        ]
+
+        for t, c in colors:
+            q = results.get("table")[t]
+            profile = reach.profile(self._current_profile_id[0])
+
+            x = self._timestamps
+            y = q[:, profile.global_index]
+            # y = profile.get_key("Q")
+
+            if res_id == 2:
+                label = f"Δ {self.label_discharge} {t} {profile.name}"
+            else:
+                label = f"{self.label_discharge} {t} {profile.name}"
+
+            line, = self.canvas.axes.plot(
+                x, y,
+                label=label,
+                color=c,
+                # linestyle=self.linestyle[i % len(self.linestyle)],
+                **self.plot_default_kargs
+            )
+
+            self._line.append(line)
+
+    @timer
+    def draw_data_std_derivation(self, res_id):
+        results = self.results[res_id]
+        reach = results.river.reach(self._current_reach_id)
+
+        q = results.get("table")["q_mean"]
+        std_deriv = results.get("table")["q_std_derivation"]
+        profile = reach.profile(self._current_profile_id[0])
+
+        x = self._timestamps
+        y = q[:, profile.global_index]
+        std = std_deriv[:, profile.global_index]
+
+        y_b = y - std
+        y_t = y + std
+
+        plot = self.canvas.axes.fill_between(
+            x, y_b, y_t,
+            label=f"Standard derivation {profile.name}",
+            color=self.color_plot_ensemble_std_deriv,
+            alpha=0.3,
+        )
+
+    def draw_additional_data(self, res_id):
+        results = self.results[res_id]
+
+        self._add_data_lines = []
+
+        for data in results.get("additional_data"):
+            data = data._data
+            x, y = data['x'], data['y']
+            legend = data['legend']
+            unit = data['unit']
+
+            if data['type_x'] == 'time' and data['type_y'] == 'discharge':
+                line, = self.canvas.axes.plot(
+                    x, y, marker="+",
+                    label=legend + ' ' + unit
+                )
+
+                self._add_data_lines.append(line)
+
+        self.enable_legend()
+        self.canvas.draw_idle()
+
+    def draw_current(self):
+        self._current, = self.canvas.axes.plot(
+            [self._current_timestamp, self._current_timestamp],
+            self.canvas.axes.get_ylim(),
+            # label=self.label_timestamp,
+            color="grey",
+            linestyle="dashed",
+            lw=1.,
+        )
+
+    def set_reach(self, reach_id):
+        self._current_reach_id = reach_id
+        self._current_profile_id = [0]
+        self.draw()
+
+    def set_profile(self, profile_id):
+        self._current_profile_id = profile_id
+        # self.update()
+        self.draw()
+
+    def set_result(self, res_id):
+        self._current_res_id = res_id
+        self.draw()
+
+    def set_timestamp(self, timestamp):
+        self._current_timestamp = timestamp
+        self.update_current()
+        self.update_idle()
+
+    def update(self):
+        if not self._init:
+            self.draw()
+
+        self.update_current()
+        self.update_idle()
+
+    def update_additional_data(self):
+        self.draw_additional_data(0)
+        self.update_idle()
+
+    def update_all(self):
+        self._current_reach_id = self._parent._get_current_reach()
+        self._current_profile_id = self._parent._get_current_profiles_list()
+        self._current_res_id = self._parent._get_current_results()
+        self._current_timestamp = self._parent._get_current_timestamp()
+        self._init = False
+        self.update()
+
+    def update_current(self):
+        y = self._current.get_ydata()
+        self._current.set_data(
+            [self._current_timestamp, self._current_timestamp],
+            y
+        )