InitialConditions: sort rows after each generation (single undo step), and fix undo of generation and sort (avoid STOP7 error on Hogneau example)

(cherry picked from commit 674247db09)

.gitlab-ci.yml

@@ -38,6 +38,7 @@ variables:
 variables:
   MAGE_8_VERSION: "permalink/latest"
   ADISTS_VERSION: "permalink/latest"
+  RUBAR_VERSION: "permalink/latest"
 
 dl-mage8-doc:
   stage: downloads
@@ -111,6 +112,36 @@ dl-adists-windows:
     paths:
       - adists-windows/adists.exe
 
+dl-rubar-linux:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - mkdir -p rubar-linux
+    - cd rubar-linux
+    - curl -L -o rubar.tgz https://forge.inrae.fr/river-hydraulics/rubarbe/-/releases/$RUBAR_VERSION/downloads/packages/rubar_linux.tgz
+    - tar xf rubar.tgz
+  artifacts:
+    paths:
+      - rubar-linux/rubarbe
+
+dl-rubar-windows:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - mkdir -p rubar-windows
+    - cd rubar-windows
+    - curl -L -o rubar.tgz https://forge.inrae.fr/river-hydraulics/rubarbe/-/releases/$RUBAR_VERSION/downloads/packages/rubar_windows.tgz
+    - tar xf rubar.tgz
+  artifacts:
+    paths:
+      - rubar-windows/rubarbe.exe
+
 #############
 # CONFIGURE #
 #############
@@ -149,13 +180,13 @@ unittest:
     - job: set-version
       artifacts: true
   script:
-    - python3 -m venv venv
+    - python3.12 -m venv venv
     - . venv/bin/activate
     - pip3 install -U pip
     - pip3 install -r ./full-requirements.txt
     - pip3 install -U -r ./full-requirements.txt
     - cd src
-    - python3 -m unittest discover -t .
+    - python3.12 -m unittest discover -t .
 
 test-pep8:
   stage: test
@@ -167,7 +198,7 @@ test-pep8:
     - job: unittest
   script:
     # Setup virtual env
-    - python3 -m venv venv
+    - python3.12 -m venv venv
     - . venv/bin/activate
     - pip3 install -U pip
     - pip3 install -r ./requirements.txt
@@ -245,7 +276,7 @@ build-developers-doc:
     - ./build.sh
     # Create html documentation
     - cd ../../src
-    - python3 -m venv doc-venv
+    - python3.12 -m venv doc-venv
     - . doc-venv/bin/activate
     - pip3 install -U pip
     - pip3 install -r ../full-requirements.txt
@@ -273,6 +304,8 @@ build-linux:
   needs:
     - job: dl-adists-linux
       artifacts: true
+    - job: dl-rubar-linux
+      artifacts: true
     - job: dl-mage8-linux
       artifacts: true
     - job: dl-mage8-doc
@@ -293,13 +326,13 @@ build-linux:
     - mkdir -p linux
     - cd linux
     # Setup virtual env
-    - python3 -m venv linux-venv
+    - python3.12 -m venv linux-venv
     - . linux-venv/bin/activate
     - pip3 install -U pip
     - pip3 install -r ../requirements.txt
     - pip3 install -U -r ../requirements.txt
     # Run Pyinstaller
-    - pyinstaller -y $HIDDEN_IMPORTS --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py
+    - pyinstaller -y $HIDDEN_IMPORTS --paths linux-venv/lib/python3.12/site-packages ../src/pamhyr.py
     # Create directory
     - mkdir -p pamhyr
     - mkdir -p pamhyr/_internal
@@ -314,6 +347,9 @@ build-linux:
     # Copy adists
     - mkdir -p pamhyr/adists
     - cp -v ../adists-linux/* pamhyr/adists/
+    # Copy rubar
+    - mkdir -p pamhyr/rubar
+    - cp -v ../rubar-linux/* pamhyr/rubar/
     # Copy Pamhyr
     - cp -r dist/pamhyr/* pamhyr/
     # Pamhyr script to force x11
@@ -379,6 +415,8 @@ build-windows:
       artifacts: true
     - job: dl-adists-windows
       artifacts: true
+    - job: dl-rubar-windows
+      artifacts: true
     - job: dl-mage8-doc
       artifacts: true
     - job: set-version
@@ -600,7 +638,7 @@ shadow-release:
     - job: pkg-hash
       artifacts: true
   rules:
-    - if: $CI_COMMIT_BRANCH != 'master' && $CI_COMMIT_TAG
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^v/
   artifacts:
     paths:
       - linux/pamhyr-gnulinux.tar.xz
@@ -634,7 +672,7 @@ tag-release:
     - job: pkg-hash
       artifacts: true
   rules:
-    - if: $CI_COMMIT_BRANCH == 'master' && $CI_COMMIT_TAG
+    - if: $CI_COMMIT_TAG =~ /^v/
   artifacts:
     paths:
       - linux/pamhyr-gnulinux.tar.xz

AUTHORS

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

README.md

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

doc/tools/PamhyrDoc.cls

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

full-requirements.txt

@@ -1,10 +1,10 @@
-PyQt5==5.15.4
+PyQt5==5.15.11
 PyQt5-Qt5==5.15.2
-PyQt5-sip==12.12.2
+PyQt5-sip==12.18.0
 PyQtWebEngine==5.15.6
 QScintilla>=2.14.1
 pyqtgraph>=0.12.1
-matplotlib>=3.7.1
+matplotlib==3.8.3
 numpy>=1.24.2
 colorama>=0.4.3
 pyinstaller>=5.11.0

packages/make-windows-dir.bat

@@ -46,6 +46,10 @@ copy /y ..\mage8-windows\mage_extraire.exe pamhyr\mage8\
 copy /y ..\mage8-windows\mailleurTT.exe pamhyr\mage8\
 copy /y ..\mage8-windows\libbief.dll pamhyr\mage8\
 
+rem rubar
+mkdir pamhyr\rubar
+copy /y ..\rubar-windows\rubarbe.exe pamhyr\rubar\
+
 rem adists
 mkdir pamhyr\adists
 copy /y ..\adists-windows\adists.exe pamhyr\adists\

requirements.txt

@@ -1,10 +1,10 @@
-PyQt5==5.15.4
+PyQt5==5.15.11
 PyQt5-Qt5==5.15.2
-PyQt5-sip==12.12.2
+PyQt5-sip==12.18.0
 #PyQtWebEngine==5.15.6
 QScintilla>=2.14.1
 pyqtgraph>=0.12.1
-matplotlib>=3.7.1
+matplotlib==3.8.3
 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
+

src/Checker/Adists.py

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

src/Checker/Checker.py

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

src/Checker/Mage.py

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

src/Checker/Study.py

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

src/Meshing/AMeshingTool.py

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

src/Meshing/Internal.py

@@ -1,5 +1,5 @@
 # Internal.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,20 +40,31 @@ class InternalMeshing(AMeshingTool):
                 step: float = 50,
                 limites=[-1, -1],
                 linear: bool = True):
-        if reach is None or len(reach.profiles) == 0:
-            return reach
 
-        if limites[0] > limites[1]:
+        # pre process
-            lim = limites[1]
-            limites[1] = limites[0]
-            limites[0] = lim
-        elif limites[0] == limites[1]:
-            return reach
 
-        # we never modify original profiles, we work on copies
+        profiles = self.get_profiles(reach, limites)
-        m_profiles = self.st_to_m(reach, limites)
+        if profiles is None:
-        new_profiles = self.interpolate_transversal_step(m_profiles,
+            return []
-                                                         step)
+
+        for p in profiles:
+            if len(p) < 1:
+                return []
+
+        guide_list = self.get_guide_list(reach, profiles)
+        if guide_list is None:
+            return []
+
+        # we never modify original profiles, we work on the copies
+        m_profiles = self.st_to_m(profiles, guide_list)
+
+        # Adapt the spacing to the kilometre-point direction. The value from
+        # the dialog is a distance, so only its magnitude is significant.
+        step = self.signed_step(
+            step, m_profiles[0].rk, m_profiles[-1].rk
+        )
+
+        new_profiles = self.interpolate_transversal_step(m_profiles, step)
 
         for new_profiles2 in new_profiles:
             for p in new_profiles2:
@@ -61,52 +72,38 @@ class InternalMeshing(AMeshingTool):
 
         return new_profiles
 
-    def st_to_m(self, reach, limites):
+    @staticmethod
+    def signed_step(step, begin_rk, end_rk):
+        if end_rk < begin_rk:
+            return -abs(step)
+        return abs(step)
 
-        gl = reach.compute_guidelines()
+    def st_to_m(self, profiles, guide_list):
-        profiles = [reach.profile(i).copy()
+        guide_list = ["un"] + guide_list + ["np"]
-                    for i in range(limites[0], limites[1]+1)
+        max_values = [0] * (len(guide_list) - 1)
-                    ]
+        max_values_index = [0] * (len(guide_list) - 1)
-
-        # we make sure that the lines are in the left-to-right order
-        guide_list = [
-            x.name
-            for x in profiles[0].named_points()
-            if x.name in gl[0]
-        ]
-
-        gl1 = [""] + guide_list
-        gl2 = guide_list + [""]
-        max_values = [0] * (len(guide_list) + 1)
-        max_values_index = [0] * (len(guide_list) + 1)
         # we work between each couple of guidelines
         for j, p in enumerate(profiles):
-            index1 = 0
-            index2 = p.named_point_index(guide_list[0])
-            if index2 - index1 > max_values[0]:
-                max_values[0] = index2 - index1
-                max_values_index[0] = j
             for i in range(len(guide_list) - 1):
                 index1 = p.named_point_index(guide_list[i])
                 index2 = p.named_point_index(guide_list[i+1])
-                if index2 - index1 > max_values[i+1]:
+                if index2 - index1 > max_values[i]:
-                    max_values[i+1] = index2 - index1
+                    max_values[i] = index2 - index1
-                    max_values_index[i+1] = j
+                    max_values_index[i] = j
-            index1 = p.named_point_index(guide_list[-1])
-            index2 = len(p) - 1
-            if index2 - index1 > max_values[-1]:
-                max_values[-1] = index2 - index1
-                max_values_index[-1] = j
 
         for i in range(len(max_values)):
             for isect in range(max_values_index[i], len(profiles)-1):
                 self.compl_sect(profiles[isect],
                                 profiles[isect+1],
-                                gl1[i], gl2[i])
+                                guide_list[i],
+                                guide_list[i+1])
+
             for isect in reversed(range(0, max_values_index[i])):
                 self.compl_sect(profiles[isect+1],
                                 profiles[isect],
-                                gl1[i], gl2[i])
+                                guide_list[i],
+                                guide_list[i+1])
+
         return profiles
 
     def interpolate_transversal_step(self,
@@ -146,6 +143,7 @@ class InternalMeshing(AMeshingTool):
                     p.name = f'interpol{p.rk}'
                 new_profiles2.append(p)
             new_profiles.append(new_profiles2)
+
         return new_profiles
 
     def compl_sect(self, sect1, sect2, tag1, tag2):
@@ -156,17 +154,9 @@ class InternalMeshing(AMeshingTool):
         # len1 and 2: number of intervals
         # len1: target len
 
-        if tag1 == '':  # left end point
-            start1 = 0
-            start2 = 0
-        else:
         start1 = sect1.named_point_index(tag1)
         start2 = sect2.named_point_index(tag1)
 
-        if tag2 == '':  # right end point
-            end1 = sect1.nb_points-1
-            end2 = sect2.nb_points-1
-        else:
         end1 = sect1.named_point_index(tag2)
         end2 = sect2.named_point_index(tag2)
 
@@ -174,105 +164,141 @@ class InternalMeshing(AMeshingTool):
         len2 = end2 - start2
 
         if len1 < len2:
-            self.compl_sect(sect2, sect1, start2, start1,
+            self.compl_sect(sect2, sect1, tag1, tag2)
-                            len2, len1, tag1, tag2)
             return
         elif len1 == len2:
             return
 
         ltot1 = 0.0
         ltot2 = 0.0
-        alpha = []
+        alpha = [0.0]
-        beta = []
+        beta = [0.0]
         # remove names
         sect2.points[start2].name = ''
         sect2.points[end2].name = ''
         for i in range(len1):
             ltot1 += sect1.point(start1+i).dist(sect1.point(start1+i+1))
             alpha.append(ltot1)
-        alpha = list(map(lambda x: x/ltot1, alpha))  # target ratios
         for i in range(len2):
             ltot2 += sect2.point(start2+i).dist(sect2.point(start2+i+1))
             beta.append(ltot2)
-        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]
         if len2 < 1 or ltot2 < 0.0001:
             # unique point (copy len1 times)
             # we are at an edge of the profile
             for i in range(len1-len2):
                 p = sect2.point(start2).copy()
                 sect2.insert_point(start2, p)
-                if tag1 == '':  # left end point
+                len2 += 1
-                    sect2.point(start2).name = ''
-                if tag2 == '':  # left end point
-                    sect2.point(start2+1).name = ''
         elif ltot1 < 0.0001:
             sect2.add_npoints(len1-len2)
+            len2 = len1
         else:  # regular case
-            # loop on the points to insert
+            alpha = list(map(lambda x: x/ltot1, alpha))  # target ratios
-            for k in range(len1-len2):
+            beta = list(map(lambda x: x/ltot2, beta))  # current ratios
-                trouve = False
+            match = self._match_indices(alpha, beta)
-                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
 
-                    if trouve:
+            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
-                        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:
-                                print(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]
 
-        if len1 > len2:
+        if tag1 != "un":
-            for i in range(len1 - len2):
-                p = sect2.point(start2+len2).copy()
-                sect2.insert_point(start2+len2, p)
-                sect2.point(start2+len2).name = ''
             sect2.point(start2).name = tag1
+        if tag2 != "np":
             sect2.point(start2+len2).name = tag2
+
         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],
@@ -304,6 +330,8 @@ class InternalMeshing(AMeshingTool):
             sgn = -1.0
         else:
             sgn = old_orientation
+        if abs(sgn) < 0.5:
+            sgn = 1.0
 
         new_rk = [0.0]*nprof
         new_rk[origin] = origin_value
@@ -344,3 +372,42 @@ class InternalMeshing(AMeshingTool):
             return new_rk, new_end_rk, new_begin_rk
         else:
             return new_rk, new_begin_rk, new_end_rk
+
+    def get_guide_list(self, reach, profiles):
+
+        gl = reach.compute_guidelines()
+
+        # we make sure that the lines are in the left-to-right order
+        guide_list = [
+            [
+                x.name
+                for x in p.named_points()
+                if x.name in gl[0]
+            ]
+            for p in profiles]
+
+        # we make sure the lines never cross
+        for gl in guide_list:
+            for i in range(len(guide_list[0])):
+                if gl[i] != guide_list[0][i]:
+                    return None
+
+        return guide_list[0]
+
+    def get_profiles(self, reach, limites):
+
+        if reach is None or len(reach.profiles) == 0:
+            return None
+
+        if limites[0] > limites[1]:
+            lim = limites[1]
+            limites[1] = limites[0]
+            limites[0] = lim
+        elif limites[0] == limites[1]:
+            return None
+
+        profiles = [reach.profile(i).copy()
+                    for i in range(limites[0], limites[1]+1)
+                    ]
+
+        return profiles

src/Meshing/Mage.py

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

src/Meshing/__init__.py

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

src/Meshing/test_Meshing.py

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

src/Model/BoundaryCondition/BoundaryCondition.py

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

src/Model/BoundaryCondition/BoundaryConditionList.py

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

src/Model/BoundaryCondition/BoundaryConditionTypes.py

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

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

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

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

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

src/Model/D90AdisTS/D90AdisTS.py

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

src/Model/D90AdisTS/D90AdisTSList.py

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

src/Model/D90AdisTS/D90AdisTSSpec.py

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

src/Model/DIFAdisTS/DIFAdisTS.py

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

src/Model/DIFAdisTS/DIFAdisTSList.py

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

src/Model/DIFAdisTS/DIFAdisTSSpec.py

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

src/Model/Except.py

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

src/Model/Friction/Friction.py

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

src/Model/Friction/FrictionList.py

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

src/Model/GeoTIFF/GeoTIFF.py

@@ -0,0 +1,368 @@
+# GeoTIFF.py -- Pamhyr
+# Copyright (C) 2024-2025  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 os
+import struct
+import logging
+
+from functools import reduce
+
+from tools import trace, timer
+
+from Model.Tools.PamhyrDB import SQLSubModel
+from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
+
+try:
+    import rasterio
+    import rasterio.control
+    import rasterio.crs
+    import rasterio.sample
+    import rasterio.vrt
+    import rasterio._features
+
+    from rasterio.io import MemoryFile
+    _rasterio_loaded = True
+except Exception as e:
+    print(f"Module 'rasterio' is not available: {e}")
+    _rasterio_loaded = False
+
+logger = logging.getLogger()
+
+
+class GeoTIFF(SQLSubModel):
+    _sub_classes = []
+
+    def __init__(self, id: int = -1, enabled=True,
+                 name="", description="",
+                 path="", coordinates=None,
+                 status=None, owner_scenario=-1):
+        super(GeoTIFF, self).__init__(
+            id=id, status=status,
+            owner_scenario=owner_scenario
+        )
+
+        self._enabled = enabled
+        self._name = f"GeoTIFF #{self._pamhyr_id}" if name == "" else name
+        self._description = description
+
+        self._file_bytes = b''
+        if coordinates is None:
+            self._coordinates = {
+                "bottom": 0.0,
+                "top": 0.0,
+                "left": 0.0,
+                "right": 0.0,
+            }
+        else:
+            self._coordinates = coordinates
+        self._file_name = ""
+
+        if path != "":
+            self.read_file(path)
+
+        self._memfile = None
+
+    def __getitem__(self, key):
+        value = None
+
+        if key == "enabled":
+            value = self._enabled
+        elif key == "name":
+            value = self.name
+        elif key == "description":
+            value = self.description
+        elif key == "file_name":
+            value = self.file_name
+        elif key == "coordinates":
+            value = self.coordinates
+        elif key == "coordinates_bottom":
+            value = self.coordinates["bottom"]
+        elif key == "coordinates_top":
+            value = self.coordinates["top"]
+        elif key == "coordinates_left":
+            value = self.coordinates["left"]
+        elif key == "coordinates_right":
+            value = self.coordinates["right"]
+        elif key == "memfile":
+            value = self.memfile
+
+        return value
+
+    def __setitem__(self, key, value):
+        if key == "enabled":
+            self.enabled = value
+        elif key == "name":
+            self.name = value
+        elif key == "description":
+            self.description = value
+        elif key == "file_name":
+            if self._file_name != value:
+                self.read_file(value)
+        elif key == "coordinates":
+            self.coordinates = value
+        elif key == "coordinates_bottom" or key == "bottom":
+            self.coordinates["bottom"] = value
+        elif key == "coordinates_top" or key == "top":
+            self.coordinates["top"] = value
+        elif key == "coordinates_left" or key == "left":
+            self.coordinates["left"] = value
+        elif key == "coordinates_right" or key == "right":
+            self.coordinates["right"] = value
+
+        self.modified()
+
+    @property
+    def enabled(self):
+        return self._enabled
+
+    @enabled.setter
+    def enabled(self, enabled):
+        self._enabled = enabled
+        self.modified()
+
+    def is_enabled(self):
+        return self._enabled
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        self._name = name
+        self.modified()
+
+    @property
+    def description(self):
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        self._description = description
+        self.modified()
+
+    @property
+    def file_name(self):
+        return self._file_name
+
+    @file_name.setter
+    def file_name(self, file_name):
+        self._file_name = file_name
+        self.modified()
+
+    @property
+    def coordinates(self):
+        return self._coordinates
+
+    @coordinates.setter
+    def coordinates(self, coordinates):
+        self._coordinates = coordinates
+        self.modified()
+
+    @property
+    def coord_bottom(self):
+        if self._coordinates is None:
+            return 0.0
+
+        return self._coordinates["bottom"]
+
+    @property
+    def coord_top(self):
+        if self._coordinates is None:
+            return 0.0
+
+        return self._coordinates["top"]
+
+    @property
+    def coord_left(self):
+        if self._coordinates is None:
+            return 0.0
+
+        return self._coordinates["left"]
+
+    @property
+    def coord_right(self):
+        if self._coordinates is None:
+            return 0.0
+
+        return self._coordinates["right"]
+
+    @property
+    def memfile(self):
+        if not _rasterio_loaded:
+            return None
+
+        if self._file_bytes == b'':
+            return None
+
+        if self._memfile is None:
+            self._memfile = MemoryFile()
+            self._memfile.write(self._file_bytes)
+
+        return self._memfile
+
+    def read_file(self, path):
+        logger.debug(f"Read GeoTIFF file at : '{path}'")
+
+        self._file_name = path
+        self._file_bytes = b''
+        self._memfile = None
+
+        nbytes = 0
+
+        with open(path, "rb") as f:
+            while True:
+                data = f.read(4096)
+                if not data:
+                    break
+
+                nbytes += len(data)
+                self._file_bytes += data
+
+        logger.debug(f"Read GeoTIFF: {nbytes} bytes readed")
+
+    def write_file(self, path):
+        with open(path, "w+b") as f:
+            f.write(self._file_bytes)
+
+    @classmethod
+    def _db_create(cls, execute, ext=""):
+        execute(f"""
+          CREATE TABLE geotiff{ext} (
+            {cls.create_db_add_pamhyr_id()},
+            enabled BOOLEAN NOT NULL,
+            deleted BOOLEAN NOT NULL DEFAULT FALSE,
+            name TEXT NOT NULL,
+            description TEXT NOT NULL,
+            file_name TEXT NOT NULL,
+            file_bytes BLOB NOT NULL,
+            coordinates_bottom REAL NOT NULL,
+            coordinates_top REAL NOT NULL,
+            coordinates_left REAL NOT NULL,
+            coordinates_right REAL NOT NULL,
+            {Scenario.create_db_add_scenario()},
+            {Scenario.create_db_add_scenario_fk()},
+            PRIMARY KEY(pamhyr_id, scenario)
+          )
+        """)
+
+        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)
+
+        if major == "0" and int(minor) == 2:
+            if int(release) < 3:
+                cls._db_create(execute)
+
+        return True
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        new = []
+        scenario = data["scenario"]
+        loaded = data['loaded_pid']
+
+        if scenario is None:
+            return new
+
+        table = execute(
+            "SELECT pamhyr_id, enabled, deleted, " +
+            "name, description, file_name, file_bytes, " +
+            "coordinates_bottom, coordinates_top, " +
+            "coordinates_left, coordinates_right, " +
+            "scenario " +
+            "FROM geotiff " +
+            f"WHERE scenario = {scenario.id} " +
+            f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
+        )
+
+        if table is not None:
+            for row in table:
+                it = iter(row)
+
+                id = next(it)
+                enabled = (next(it) == 1)
+                deleted = (next(it) == 1)
+                name = next(it)
+                description = next(it)
+                file_name = next(it)
+                file_bytes = next(it)
+                coordinates_bottom = next(it)
+                coordinates_top = next(it)
+                coordinates_left = next(it)
+                coordinates_right = next(it)
+                owner_scenario = next(it)
+
+                f = cls(
+                    id=id, enabled=enabled, name=name,
+                    description=description, coordinates={
+                        "bottom": coordinates_bottom,
+                        "top": coordinates_top,
+                        "left": coordinates_left,
+                        "right": coordinates_right,
+                    },
+                    status=data['status'],
+                    owner_scenario=owner_scenario
+                )
+                if deleted:
+                    f.set_as_deleted()
+
+                f._file_bytes = file_bytes
+
+                loaded.add(id)
+                new.append(f)
+
+        data["scenario"] = scenario.parent
+        new += cls._db_load(execute, data)
+        data["scenario"] = scenario
+
+        return new
+
+    def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
+        execute(
+            "INSERT INTO geotiff (" +
+            "pamhyr_id, enabled, deleted, " +
+            "name, description, file_name, file_bytes, " +
+            "coordinates_bottom, coordinates_top, " +
+            "coordinates_left, coordinates_right, " +
+            "scenario) " +
+            "VALUES (?,?,?,?,?,?,?,?,?,?,?,?)",
+            self._pamhyr_id,
+            self._enabled,
+            self.is_deleted(),
+            self.name,
+            self.description,
+            self.file_name,
+            self._file_bytes,
+            self.coordinates['bottom'],
+            self.coordinates['top'],
+            self.coordinates['left'],
+            self.coordinates['right'],
+            self._status.scenario_id,
+        )
+
+        return True

src/Model/GeoTIFF/GeoTIFFList.py

@@ -0,0 +1,59 @@
+# GeoTIFFList.py -- Pamhyr
+# Copyright (C) 2024-2025  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.Except import NotImplementedMethodeError
+from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.GeoTIFF.GeoTIFF import GeoTIFF
+
+
+class GeoTIFFList(PamhyrModelList):
+    _sub_classes = [GeoTIFF]
+
+    @classmethod
+    def _db_load(cls, execute, data=None):
+        new = cls(status=data["status"])
+
+        new._lst = GeoTIFF._db_load(execute, data)
+
+        return new
+
+    def _db_save(self, execute, data=None):
+        ok = True
+
+        # Delete previous data
+        execute(
+            "DELETE FROM geotiff " +
+            f"WHERE scenario = {self._status.scenario_id}"
+        )
+
+        for gt in self._lst:
+            ok &= gt._db_save(execute, data)
+
+        return ok
+
+    @property
+    def files(self):
+        return self.lst
+
+    def new(self, index):
+        n = GeoTIFF(status=self._status)
+        self.insert(index, n)
+        self._status.modified()
+        return n

src/Model/Geometry/Point.py

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

src/Model/Geometry/PointXY.py

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

src/Model/Geometry/PointXYZ.py

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

src/Model/Geometry/Profile.py

@@ -1,5 +1,5 @@
 # Profile.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -76,11 +76,31 @@ class Profile(object):
         return self.points[index]
 
     def named_point(self, name):
+        if name == "un":
+            return self.points[0]
+        elif name == "np":
+            return self.points[-1]
+        elif name == "talweg":
+            zm = self.z_min()
+            return next((p for p in self.points if p.z == zm), None)
+        else:
             return next((p for p in self.points if p.name == name), None)
 
     def named_point_index(self, name):
+        if name == "un":
+            return 0
+        elif name == "np":
+            return len(self.points) - 1
+        elif name == "talweg":
+            zm = self.z_min()
             return next(
-            (p for p in enumerate(self.points) if p[1].name == name), None
+                (p for p in enumerate(self.points) if p[1].z == zm),
+                None
+            )[0]
+        else:
+            return next(
+                (p for p in enumerate(self.points) if p[1].name == name),
+                None
             )[0]
 
     @property

src/Model/Geometry/ProfileXYZ.py

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

src/Model/Geometry/Reach.py

@@ -1,5 +1,5 @@
 # Reach.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,6 +52,11 @@ class Reach(SQLSubModel):
         self._guidelines_is_valid = False
         self._guidelines = {}
 
+        super(Reach, self).__init__(
+            id=parent.pamhyr_id,
+            status=status,
+        )
+
     @property
     def pamhyr_id(self):
         return self._parent.pamhyr_id
@@ -60,6 +65,10 @@ class Reach(SQLSubModel):
     def _pamhyr_id(self):
         return self._parent.pamhyr_id
 
+    @_pamhyr_id.setter
+    def _pamhyr_id(self, id):
+        return
+
     @classmethod
     def _db_create(cls, execute):
         return cls._create_submodel(execute)
@@ -103,6 +112,9 @@ class Reach(SQLSubModel):
                         predicate=lambda obj, data: True,
                         modifier=lambda obj, data: None,
                         data={}):
+        if predicate(self, data):
+            modifier(self, data)
+
         for p in self._profiles:
             p._data_traversal(predicate, modifier, data)
 
@@ -195,13 +207,16 @@ class Reach(SQLSubModel):
         """
         if profile in self._profiles:
             self.undelete([profile])
+            profile.num = index
         else:
-            self._profiles.insert(index, profile)
+            gi = self.get_global_profil_index(index)
+            profile.num = gi
+            self._profiles.insert(gi, profile)
 
         self.modified()
 
     def delete(self, indexes):
-        """Delete some elements in profile list
+        """Set some elements as deleted in profile list
 
         Args:
             indexes: The list of index to delete
@@ -209,11 +224,12 @@ class Reach(SQLSubModel):
         Returns:
             Nothing.
         """
+        gi = [self.get_global_profil_index(i) for i in indexes]
         list(
             map(
                 lambda p: p[1].set_as_deleted(),
                 filter(
-                    lambda e: e[0] in indexes,
+                    lambda e: e[0] in gi,
                     enumerate(self._profiles)
                 )
             )
@@ -229,11 +245,12 @@ class Reach(SQLSubModel):
         Returns:
             Nothing.
         """
+        gi = [self.get_global_profil_index(i) for i in indexes]
         self._profiles = list(
             map(
                 lambda p: p[1],
                 filter(
-                    lambda e: e[0] not in indexes,
+                    lambda e: e[0] not in gi,
                     enumerate(self._profiles)
                 )
             )
@@ -241,7 +258,7 @@ class Reach(SQLSubModel):
         self.modified()
 
     def delete_profiles(self, profiles):
-        """Delete some elements in profile list
+        """Set profiles list as deleted
 
         Args:
             profiles: The list of profile to delete
@@ -929,3 +946,30 @@ class Reach(SQLSubModel):
         nr2._profiles = list(map(lambda p: p.cloned_for(nr2), nr2_profiles))
 
         return nr1, nr2
+
+    def get_local_profil_index(self, index):
+        local_index = -1
+        for i, p in enumerate(self._profiles):
+            if not p.is_deleted():
+                local_index += 1
+            if i == index:
+                break
+
+        return local_index
+
+    def get_global_profil_index(self, index):
+        local_index = -1
+        for i, p in enumerate(self._profiles):
+            if not p.is_deleted():
+                local_index += 1
+            if local_index == index:
+                global_index = i
+                break
+
+        return global_index
+
+    def update_rks(self, rks):
+        for rk, profile in zip(rks, self.profiles):
+            profile.rk = rk
+
+        self.modified()

src/Model/Geometry/Vector_1d.py

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

src/Model/HydraulicStructures/Basic/HydraulicStructures.py

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

src/Model/HydraulicStructures/Basic/Types.py

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

src/Model/HydraulicStructures/Basic/Value.py

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

src/Model/HydraulicStructures/HydraulicStructures.py

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

src/Model/HydraulicStructures/HydraulicStructuresList.py

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

src/Model/InitialConditions/InitialConditions.py

@@ -1,5 +1,5 @@
 # InitialConditions.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -225,6 +225,8 @@ class Data(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
         ind = data["ind"]
 
         execute(
@@ -396,7 +398,7 @@ class InitialConditions(SQLSubModel):
 
     @reach.setter
     def reach(self, new):
-        self._reach = reach
+        self._reach = new
         self.modified()
 
     @property
@@ -537,7 +539,10 @@ class InitialConditions(SQLSubModel):
                 strickler = 25.0
 
             if not compute_discharge:
+                if profile.rk in data_discharge:
                     discharge = data_discharge[profile.rk]
+                else:
+                    discharge = 0.0
             else:
                 discharge = (
                     # ((width * 0.8)
@@ -583,8 +588,6 @@ class InitialConditions(SQLSubModel):
                 for data in self._data:
                     data_height[data["rk"].rk] = data["height"]
 
-        print(data_height)
-
         incline = self._reach.reach.get_incline_median_mean()
         logger.debug(f"incline = {incline}")
 
@@ -605,7 +608,10 @@ class InitialConditions(SQLSubModel):
                 strickler = 25.0
 
             if not compute_height:
+                if profile.rk in data_height:
                     height = data_height[profile.rk]
+                else:
+                    height = 0.0
             else:
                 if abs(incline) <= 0:
                     height = 0.0
@@ -656,7 +662,10 @@ class InitialConditions(SQLSubModel):
         for profile in profiles:
 
             if not compute_discharge:
+                if profile.rk in data_discharge:
                     d = data_discharge[profile.rk]
+                else:
+                    d = 0.0
             else:
                 d = discharge
             elevation = interp(profile.rk,

src/Model/InitialConditions/InitialConditionsDict.py

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

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

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

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py

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

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

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

src/Model/LateralContribution/LateralContribution.py

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

src/Model/LateralContribution/LateralContributionList.py

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

src/Model/LateralContribution/LateralContributionTypes.py

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

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

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

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

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

src/Model/Network/Edge.py

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

src/Model/Network/Graph.py

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

src/Model/Network/Node.py

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

src/Model/Network/Point.py

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

src/Model/Network/__init__.py

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

src/Model/Network/test_network.py

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

src/Model/OutputRKAdists/OutputRKAdists.py

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

src/Model/Pollutants/Pollutants.py

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

src/Model/Pollutants/PollutantsList.py

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

src/Model/Reservoir/Reservoir.py

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

src/Model/Reservoir/ReservoirList.py

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

src/Model/Results/Results.py

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

src/Model/Results/ResultsAdisTS.py

@@ -1,5 +1,5 @@
 # Results.py -- Pamhyr
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,12 +21,13 @@ import os
 from copy import deepcopy
 from datetime import datetime
 
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Results.River.RiverAdisTS import River
 
 logger = logging.getLogger()
 
 
-class Results(object):
+class Results(SQLSubModel):
     def __init__(self, study=None, solver=None,
                  repertory="", name="0", type_pol=None):
         self._study = study
@@ -50,6 +51,9 @@ class Results(object):
 
         self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
 
+        if solver is not None:
+            self.set("solver_type", solver._type)
+
     @property
     def date(self):
         date = self._meta_data["creation_date"]
@@ -87,3 +91,6 @@ class Results(object):
             self._repertory,
             qlog=None,
         )
+
+    def _db_save(self, execute, data=None):
+        return False

src/Model/Results/River/River.py

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

src/Model/Results/River/RiverAdisTS.py

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

src/Model/River.py

@@ -1,5 +1,5 @@
 # River.py -- Pamhyr river model
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -59,6 +59,7 @@ from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList \
     import LateralContributionsAdisTSList
 from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
 from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
+from Model.GeoTIFF.GeoTIFFList import GeoTIFFList
 from Model.Results.Results import Results
 
 logger = logging.getLogger()
@@ -179,6 +180,9 @@ class RiverNode(Node):
         return nodes
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
         execute(
             "INSERT OR REPLACE INTO river_node(" +
             "pamhyr_id, deleted, name, x, y, scenario" +
@@ -360,7 +364,7 @@ class RiverReach(Edge):
             )
             new.enable(enable=enabled)
             if deleted:
-                nd.set_as_deleted()
+                new.set_as_deleted()
 
             data["reach"] = new
             new._reach = Reach._db_load(execute, data)
@@ -376,6 +380,9 @@ class RiverReach(Edge):
         return reachs
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
+
         execute(
             "INSERT OR REPLACE INTO " +
             "river_reach(" +
@@ -385,7 +392,7 @@ class RiverReach(Edge):
             "VALUES (" +
             f"{self.pamhyr_id}, {self._db_format(self.is_deleted())}, " +
             f"'{self._db_format(self._name)}', " +
-            f"{self._db_format(self.is_enable())},"
+            f"{self._db_format(self.is_enable())}," +
             f"{self.node1.pamhyr_id}, {self.node2.pamhyr_id}, " +
             f"{self._status.scenario_id}" +
             ")"
@@ -468,6 +475,7 @@ class River(Graph):
         LateralContributionsAdisTSList,
         D90AdisTSList,
         DIFAdisTSList,
+        GeoTIFFList,
         Results
     ]
 
@@ -505,6 +513,8 @@ class River(Graph):
         self._D90AdisTS = D90AdisTSList(status=self._status)
         self._DIFAdisTS = DIFAdisTSList(status=self._status)
 
+        self._geotiff = GeoTIFFList(status=self._status)
+
         self._results = {}
 
     @classmethod
@@ -539,7 +549,7 @@ class River(Graph):
         new._nodes = RiverNode._db_load(
             execute, data
         )
-        data["nodes"] = new.nodes()
+        data["nodes"] = new._nodes
         data['loaded_pid'] = set()
 
         new._edges = RiverReach._db_load(
@@ -617,6 +627,8 @@ class River(Graph):
 
         new._DIFAdisTS = DIFAdisTSList._db_load(execute, data)
 
+        new._geotiff = GeoTIFFList._db_load(execute, data)
+
         return new
 
     def _db_load_results(self, execute, data=None):
@@ -650,6 +662,8 @@ class River(Graph):
         objs.append(self._D90AdisTS)
         objs.append(self._DIFAdisTS)
 
+        objs.append(self._geotiff)
+
         for solv_type in self.results:
             objs.append(self.results[solv_type])
 
@@ -726,6 +740,7 @@ class River(Graph):
             self._BoundaryConditionsAdisTS,
             self._LateralContributionsAdisTS,
             self._D90AdisTS, self._DIFAdisTS,
+            self._geotiff,
         ]
 
         for solver in self._parameters:
@@ -818,6 +833,10 @@ Last export at: @date."""
     def additional_files(self):
         return self._additional_files
 
+    @property
+    def geotiff(self):
+        return self._geotiff
+
     @property
     def rep_lines(self):
         return self._rep_lines

src/Model/Scenario.py

@@ -17,21 +17,56 @@
 # -*- coding: utf-8 -*-
 
 import os
+import logging
 
-from tools import logger_exception
+from tools import logger_exception, timer, flatten
 
 from Model.Tools.PamhyrDB import SQLSubModel
 
+logger = logging.getLogger()
+
 
 class Scenario(SQLSubModel):
     _id_cnt = 0
     _sub_classes = []
 
+    tables_with_deleted_column = [
+        # Adists
+        "output_rk_adists",
+        "boundary_condition_adists", "boundary_condition_data_adists",
+        "lateral_contribution_adists", "lateral_contribution_data_adists",
+        "initial_conditions_adists", "initial_conditions_adists_spec",
+        "d90_adists", "d90_adists_spec",
+        "dif_adists_spec",
+        "pollutants", "pollutants_characteristics",
+        # Hydraulic
+        "additional_files",
+        "boundary_condition", "boundary_condition_data",
+        "lateral_contribution", "lateral_contribution_data",
+        "friction", "stricklers",
+        "hydraulic_structures",
+        "hydraulic_structures_basic",
+        "initial_conditions",
+        "sedimentary_layer", "sedimentary_layer_layer",
+        "reservoir", "reservoir_data",
+        "rep_lines",
+        "geometry_pointXYZ", "geometry_profileXYZ",
+        "river_reach", "river_node",
+        "geotiff", "reservoir", "reservoir_data",
+    ]
+
+    related_tables = tables_with_deleted_column + [
+        "dif_adists",
+        "solver_parameter",
+        "hydraulic_structures_basic_value",
+        "results", "results_data", "results_add_data",
+    ]
+
     def __init__(self,
                  id: int = -1,
                  name: str = "",
                  description: str = "",
-                 x: int = 0.0, y: int = 0.0,
+                 x: int = 1000.0, y: int = 1000.0,
                  revision: int = 0,
                  parent=None):
         super(Scenario, self).__init__()
@@ -171,29 +206,7 @@ class Scenario(SQLSubModel):
     def drop_all(self, execute):
         execute(f"DELETE FROM scenario WHERE id = {self.id}")
 
-        tables = [
+        tables = self.related_tables
-            # Adists
-            "output_rk_adists",
-            "boundary_condition_adists", "boundary_condition_data_adists",
-            "lateral_contribution_adists", "lateral_contribution_data_adists",
-            "initial_conditions_adists",
-            "d90_adists", "dif_adists",
-            "pollutants", "pollutants_characteristics",
-            # Hydraulic
-            "additional_files",
-            "boundary_condition", "boundary_condition_data",
-            "lateral_contribution", "lateral_contribution_data",
-            "friction", "stricklers",
-            "hydraulic_structures",
-            "hydraulic_structures_basic", "hydraulic_structures_basic_value",
-            "initial_conditions",
-            "sedimentary_layer", "sedimentary_layer_layer",
-            "reservoir", "reservoir_data",
-            "rep_lines",
-            "solver_parameter",
-            "geometry_pointXYZ", "geometry_profileXYZ",
-            "river_reach", "river_node",
-        ]
 
         for table in tables:
             execute(
@@ -203,6 +216,67 @@ class Scenario(SQLSubModel):
 
         return True
 
+    def get_parent_branch(self):
+        def aux(scenario, acc):
+            if scenario is None:
+                return acc
+
+            return aux(scenario.parent, [scenario.id] + acc)
+
+        return aux(self, [])
+
+    @timer
+    def clean_deleted_data(self, execute):
+        tables = self.tables_with_deleted_column
+        branch = self.get_parent_branch()
+
+        all_ids = []
+
+        for table in tables:
+            if self.parent is None:
+                # This scenario is the default scenario, so we can
+                # delete all data marked as deleted
+                execute(
+                    f"DELETE FROM {table} " +
+                    f"WHERE scenario = {self.id} " +
+                    "AND deleted = TRUE"
+                )
+                continue
+
+            # Select pamhyr_id for each deleted data in this scenario
+            # who do not exists into parents scenarios
+            ids = execute(
+                f"""
+                  SELECT pamhyr_id FROM {table}
+                  WHERE deleted = TRUE
+                  AND scenario = {self.id}
+                  AND pamhyr_id NOT IN (
+                    SELECT pamhyr_id FROM {table}
+                    WHERE scenario IN
+                      ({', '.join(map(str, branch[:-1]))})
+                  )
+                """, fetch_one=False
+            )
+            if ids is None or len(ids) == 0:
+                continue
+
+            ids = flatten(ids)
+
+            logger.debug(
+                f"({self.name}) Drop deleted data into '{table}' : {ids}"
+            )
+
+            execute(
+                f"DELETE FROM {table} " +
+                f"WHERE scenario = {self.id} " +
+                "AND pamhyr_id IN " +
+                f"({', '.join(map(str, ids))})"
+            )
+
+            all_ids += ids
+
+        return all_ids
+
     @property
     def id(self):
         return self._id

src/Model/Scenarios.py

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

src/Model/Serializable.py

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

src/Model/SolverParameters/SolverParametersList.py

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

src/Model/Status.py

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

src/Model/Stricklers/Stricklers.py

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

src/Model/Stricklers/StricklersList.py

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

src/Model/Study.py

@@ -1,5 +1,5 @@
 # Study.py -- Pamhyr Study class
-# Copyright (C) 2023-2025  INRAE
+# Copyright (C) 2023-2026  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,12 +24,21 @@ from datetime import datetime
 from tools import timer, timestamp
 from functools import reduce
 
+from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrDict import PamhyrModelDict
 from Model.Tools.PamhyrDB import SQLModel
 from Model.Scenarios import Scenarios
 from Model.Scenario import Scenario
 from Model.Status import StudyStatus
 from Model.Except import NotImplementedMethodeError
 from Model.River import River
+from Model.Geometry.Reach import Reach
+from Model.HydraulicStructures.HydraulicStructures import (
+    HydraulicStructure
+)
+from Model.HydraulicStructures.Basic.HydraulicStructures import (
+    BasicHS
+)
 
 from Checker.Study import *
 
@@ -37,7 +46,7 @@ logger = logging.getLogger()
 
 
 class Study(SQLModel):
-    _version = "0.2.1"
+    _version = "0.2.7"
 
     _sub_classes = [
         Scenario,
@@ -449,8 +458,60 @@ class Study(SQLModel):
             [self.scenarios, self._river],
             data=progress
         )
+
+        # Clear DB for current scenario
+        ids = self.status.scenario.clean_deleted_data(self.execute)
+        self.memory_clean(ids)
+
+        progress()
+
         self.commit()
 
+    @timer
+    def memory_clean(self, ids):
+        if len(ids) == 0:
+            return
+
+        reach_class = Reach
+        hs_classes = [HydraulicStructure, BasicHS]
+        list_classes = set(PamhyrModelList.__subclasses__())
+        dict_classes = set(PamhyrModelDict.__subclasses__())
+
+        def modifier(obj, data):
+            t = type(obj)
+
+            if t is reach_class:
+                obj._profiles = list(
+                    filter(
+                        lambda el: el.id not in ids,
+                        obj._profiles
+                    )
+                )
+            elif t in hs_classes:
+                obj._data = list(
+                    filter(
+                        lambda el: el.id not in ids,
+                        obj._data
+                    )
+                )
+            elif t in dict_classes:
+                new = {}
+                for key in obj._dict:
+                    if obj._dict[key].id not in ids:
+                        new[key] = obj._dict[key]
+                obj._dict = new
+            elif t in list_classes:
+                obj._lst = list(
+                    filter(
+                        lambda el: el.id not in ids,
+                        obj._lst
+                    )
+                )
+
+        self.river._data_traversal(
+            lambda o, d: True, modifier, {}
+        )
+
     def sql_save_request_count(self, *args, **kargs):
         return self._count()
 
@@ -459,7 +520,10 @@ class Study(SQLModel):
             [self.scenarios, self._river]
         )
         logger.debug(cnt)
-        return cnt + 7
+        # HACK: 8 is the number of SQL request do and dont counted in
+        # submodel save_count (let's count sql execute into the
+        # '_save' method)
+        return cnt + 8
 
     def close(self):
         """Close db connection
@@ -485,7 +549,8 @@ class Study(SQLModel):
         self.status.scenario = scenario
 
         if reduce(
-                lambda a, s: a or (s.parent is scenario),
+                lambda a, s: a or (s.parent is scenario
+                                   and not s.is_deleted()),
                 self.scenarios.lst,
                 False
         ):
@@ -511,16 +576,21 @@ class Study(SQLModel):
             "scenario": scenario
         }
 
+        self.status.start_loading()
+        try:
             # Load river data
             river = River._db_load(
                 sql_exec, data=data
             )
             data["study"] = self
             river._db_load_results(sql_exec, data=data)
-
+        finally:
-        self._river_scenario_cache[scenario] = river
+            self.status.stop_loading()
             self.status.scenario = old_scenario
 
+        # FIXME: Disable scenario cache to save memory usage
+        # self._river_scenario_cache[scenario] = river
+
         return river
 
     def copy_from_scenario(self, scenario):

src/Model/Tools/PamhyrDB.py

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

src/Model/Tools/PamhyrDict.py

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

src/Model/Tools/PamhyrList.py

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

src/Model/Tools/PamhyrListExt.py

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

src/Model/__init__.py

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

src/Model/test_Model.py

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

src/Modules.py

@@ -56,6 +56,7 @@ class Modules(IterableFlag):
     SEDIMENT_LAYER = auto()
     ADDITIONAL_FILES = auto()
     OUTPUT_RK = auto()
+    GEOTIFF = auto()
 
     # Results
     RESULTS = auto()
@@ -81,6 +82,7 @@ class Modules(IterableFlag):
             cls.RESULTS,
             cls.WINDOW_LIST,
             cls.OUTPUT_RK,
+            cls.GEOTIFF
         ]
 
     @classmethod
@@ -99,6 +101,7 @@ class Modules(IterableFlag):
             | cls.HYDRAULIC_STRUCTURES
             | cls.RESERVOIR
             | cls.SEDIMENT_LAYER
+            | cls.GEOTIFF
         )
 
     @classmethod
@@ -114,6 +117,7 @@ class Modules(IterableFlag):
             cls.HYDRAULIC_STRUCTURES,
             cls.RESERVOIR,
             cls.SEDIMENT_LAYER,
+            cls.GEOTIFF,
         ]
 
     @classmethod
@@ -129,6 +133,7 @@ class Modules(IterableFlag):
             cls.HYDRAULIC_STRUCTURES: "Hydraulic structures",
             cls.RESERVOIR: "Reservoir",
             cls.SEDIMENT_LAYER: "Sediment layer",
+            cls.GEOTIFF: "GeoTIFF",
         }
 
     def impact(self):
@@ -168,4 +173,5 @@ _impact = {
     Modules.HYDRAULIC_STRUCTURES: [],
     Modules.RESERVOIR: [],
     Modules.SEDIMENT_LAYER: [],
+    Modules.GEOTIFF: [],
 }

src/SQL.py

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

src/Scripts/AScript.py

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

src/Scripts/Hello.py

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

src/Scripts/ListSolver.py

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

src/Scripts/MageMesh.py

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

src/Scripts/P3DST.py

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

src/Scripts/Run.py

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

src/Scripts/mage_to_mascaret.py

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

src/Scripts/mascaret_to_mage.py

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

src/Solver/ASolver.py

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

src/Solver/AdisTS.py

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