debug old .INI file read

.gitlab-ci.yml

@@ -29,7 +29,8 @@ stages:
 #############
 
 variables:
-  MAGE_8_VERSION: "v8.3.6"
+  MAGE_8_VERSION: "permalink/latest"
+  ADISTS_VERSION: "permalink/latest"
 
 dl-mage8-doc:
   stage: downloads
@@ -40,7 +41,7 @@ dl-mage8-doc:
   script:
     - mkdir -p doc
     - cd doc
-    - curl -L -o mage8.pdf https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf
+    - curl -L -o mage8.pdf https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf
   artifacts:
     paths:
       - doc/mage8.pdf
@@ -52,17 +53,13 @@ dl-mage8-linux:
   rules:
     - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   script:
-    - curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz
+    - curl -L -o mage8.tgz https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz
     - mkdir -p mage8-linux
     - cd mage8-linux
     - tar xvf ../mage8.tgz
   artifacts:
     paths:
       - mage8-linux/mage
-      - mage8-linux/mage_as7
-      - mage8-linux/mage_extraire
-      - mage8-linux/mailleurTT
-      - mage8-linux/libbief.so
 
 dl-mage8-windows:
   stage: downloads
@@ -71,17 +68,13 @@ dl-mage8-windows:
   rules:
     - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   script:
-    - curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz
+    - curl -L -o mage8.tgz https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz
     - mkdir -p mage8-windows
     - cd mage8-windows
     - tar xvf ../mage8.tgz
   artifacts:
     paths:
       - mage8-windows/mage.exe
-      - mage8-windows/mage_as7.exe
-      - mage8-windows/mage_extraire.exe
-      - mage8-windows/mailleurTT.exe
-      - mage8-windows/libbief.dll
 
 dl-adists-linux:
   stage: downloads
@@ -92,7 +85,7 @@ dl-adists-linux:
   script:
     - mkdir -p adists-linux
     - cd adists-linux
-    - curl -L -o adists https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/v1.0.1/downloads/executables/adists
+    - curl -L -o adists https://forge.inrae.fr/river-hydraulics/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists
   artifacts:
     paths:
       - adists-linux/adists
@@ -106,7 +99,7 @@ dl-adists-windows:
   script:
     - mkdir -p adists-windows
     - cd adists-windows
-    - curl -L -o adists.exe https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/v1.0.1/downloads/executables/adists_win64.exe
+    - curl -L -o adists.exe https://forge.inrae.fr/river-hydraulics/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists_win64.exe
   artifacts:
     paths:
       - adists-windows/adists.exe
@@ -363,7 +356,7 @@ build-linux:
     - cp ../doc/users/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr pamhyr/doc/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr
     # Copy TP charriage
     - mkdir -p pamhyr/doc/TP_charriage/
-    - cp ../doc/users/TP_charriage/* pamhyr/doc/TP_charriage
+    - cp -r ../doc/users/TP_charriage/* pamhyr/doc/TP_charriage
   artifacts:
     paths:
       - linux/pamhyr

doc/dev/documentation.org

@@ -1375,7 +1375,7 @@ contribution.
 #+INCLUDE: "../../AUTHORS" src text
 
 [fn:p2-gitlab] The {{{pamhyr2}}} Gitlab project page:
-https://gitlab.irstea.fr/theophile.terraz/pamhyr
+https://gitlab.com/pamhyr/pamhyr2
 [fn:inrae] The INRAE web site: https://www.inrae.fr/
 
 ** Translate

doc/paper/2023/simhydro/presentation/presentation.org

@@ -424,7 +424,7 @@ Create a new version of {{{pamhyr}}} called {{{pamhyr2}}}
 
 ** Contribution
 #+LaTeX: \begin{center}
-\faIcon{gitlab} https://gitlab.irstea.fr/theophile.terraz/pamhyr/
+\faIcon{gitlab} https://gitlab.com/pamhyr/pamhyr2/
 #+LaTeX: \end{center}
 
 *** For users
@@ -462,7 +462,7 @@ Create a new version of {{{pamhyr}}} called {{{pamhyr2}}}
 # #+END_EXPORT
 
 #+LaTeX: \begin{center}
-\faIcon{gitlab} https://gitlab.irstea.fr/theophile.terraz/pamhyr/
+\faIcon{gitlab} https://gitlab.com/pamhyr/pamhyr2/
 #+LaTeX: \end{center}
 
 #+LaTeX: \begin{center}

doc/users/TP_AdisTS_Vieux_Rhone/pas-a-pas.tex

@@ -179,13 +179,13 @@ Ouvrez la fen
 \par\end{center}
 
 Éditez la condition aux limites \textit{Fines} en la mettant en surbrillance et en cliquant sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/edit.png}.\\
-Créez une condition aux limites de type concentration constante de 60 $kg/m³$ en insérant deux lignes \textit{Temps/Concentration} à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png}.
+Créez une condition aux limites de type concentration constante de 0.060 $kg/m³$ en insérant deux lignes \textit{Temps/Concentration} à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png}.
 
 \begin{center}
 	\includegraphics[width=15cm]{img/CL_edit.jpeg}
 \par\end{center}
 
-Procédez de la même façon pour la classe de sédiments \textit{Sables}, mais avec une concentration de 30 $kg/m³$.\\
+Procédez de la même façon pour la classe de sédiments \textit{Sables}, mais avec une concentration de 0.030 $kg/m³$.\\
 \\
 Fermez les fenêtres d'éditions des conditions aux limites et des polluants.
 

doc/users/TP_Hydraulique_Hogneau/Tuto-2-fr.tex

@@ -112,7 +112,7 @@ Auteurs : & Céline Berni & celine.berni@inrae.fr\tabularnewline
 % \pagebreak{}
 
 
-\section{Préambule}
+\section*{Préambule}
 
 Dans ce document, nous expliciterons les fonctionnalités de PamHyr utiles à la modélisation de scénarii d'aménagement de la rivière Hogneau comme décrit dans le document de TP.
 Il est utile au préalable d'avoir suivi le tutoriel pour la modélisation de la rivière Hogneau fourni avec le logiciel (Tuto1-fr.pdf).
@@ -121,16 +121,36 @@ Suivre le tutoriel 1 vous permettra de construire le modèle avec le scénario d
 Notez que l'outil PamHyr ne permet pas au stade actuel de comparer plusieurs scenarii.
 Vous devrez pour ce faire exporter les vos résultats à partir de la fenêtre \textit{Résultats} qui s'ouvre en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale.
 
-Le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} vous permet d'exporter les résultats au format CSV pour une utilisation en dehors de Pamhyr2.
-Vous pouvez soit vous placer en un point kilométrique (PK) donné (celui marqué en rouge sur la visualisation du profil en long ou sélectionné dans le tableau) et exporter la hauteur d'eau, le niveau d'eau le débit ou autre en fonction du temps (sélectionnez alors \texttt{Temps (s)} pour l'axe X), soit vous placer à un instant donné et exporter la grandeur de votre choix  pour tous les points kilométriques de votre maillage (sélectionnez alors \texttt{Point Kilométrique (m)} pour l'axe X).
-Si vous choisissez cette seconde option, cocher \texttt{envelop} vous permettra d'exporter en plus la valeur maximale au cours du temps pour la grandeur choisie.
-
-Ainsi dans l'exemple ci-dessous, les données exportées le seront au point kilométrique 34000\,m, à l'instant $t=1$ jour et 12h.
 \begin{center}
-\includegraphics[width=15cm]{img/export_resultats.png}
+\includegraphics[width=15cm]{img/export_resultats_commentee.png}
-\includegraphics[width=12cm]{img/export_resultats2.png}
+%\includegraphics[width=12cm]{../../../src/View/ui/ressources/export_resultats2.png}
 \par\end{center}
 
+Le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} vous permet d'exporter les résultats au format CSV pour une utilisation en dehors de Pamhyr2.
+
+Deux options s'offrent à vous :
+\begin{itemize}
+	\item Vous souhaitez avoir une vue d'ensemble du cours d'eau (et tracer une courbe de remous par exemple). Vous allez exporter une variable en un instant donné tout le long du cours d'eau. Il faut alors vous placer à un instant donné (à l'aide du curseur en bas à gauche) et exporter la grandeur de votre choix  pour tous les points kilométriques de votre maillage. Dans la fenêtre d'export, vous devrez sélectionner \texttt{Point Kilométrique (m)} pour l'axe X, et la variable que vous souhaitez exporter pour l'axe Y.
+
+Cocher \texttt{enveloppe} vous permettra d'exporter en plus les valeurs minimale et maximale au cours du temps pour la grandeur choisie.
+
+Par exemple, vous choisissez d'exporter la cote du fond et la cote de l'eau et vous cochez \texttt{enveloppe}. Vous obtiendrez un tableau avec les colonnes suivantes :
+\begin{itemize}
+	\item \texttt{Point Kilométrique (m)} : toutes les valeurs de PK le long de votre bief
+	\item \texttt{Cote du fond (m)} : la cote du fond correspondante à chaque PK
+	\item \texttt{Cote de l'eau (m)} : la cote de l'eau correspondante à chaque PK à l'instant sélectionné (voir figure ci-dessous)
+	\item \texttt{Cote de l'eau min (m)} : la cote de l'eau minimale atteinte correspondante à chaque PK
+	\item \texttt{Cote de l'eau max (m)} : la cote de l'eau maximale atteinte correspondante à chaque PK
+\end{itemize}
+ces deux dernières colonnes constituant l'enveloppe de la cote de l'eau.
+	\item Vous souhaitez regarder l'évolution au cours du temps de ce qu'il se passe en un point précis du cours d'eau (regarder l'hydrogramme de crue à l'aval d'un aménagement par exemple). Vous devez alors vous placer au point kilométrique (PK) qui vous intéresse (le PK sélectionné est marqué en rouge sur la visualisation du profil en long ou sélectionné dans le tableau) et exporter la hauteur d'eau, le niveau d'eau, le débit ou autre en fonction du temps. Dans la fenêtre d'export, vous devrez sélectionner \texttt{Temps (s)} pour l'axe X.
+\end{itemize}
+
+Ainsi dans l'exemple ci-dessus, les données exportées le seront au point kilométrique 34000\,m, à l'instant $t=1$ jour et 12h.
+
+
+\pagebreak{}
+
 \section{Premier scénario d'aménagement : abaissement du seuil}
 
 Parmi les 3 options d'aménagement évoquées par la collectivité locale, jouer sur le contrôle aval en abaissant le seuil qui marque la jonction avec le canal de Condé-Pommeroeul peut faire baisser le niveau à l’amont.
@@ -156,6 +176,8 @@ Sur quelle distance le seuil aval influence-t-il la hauteur d'eau ?
 Est-ce suffisant pour limiter la hauteur d'eau au niveau du pont de l'A2 ($PK \approx 33000$\,m) ?
 \end{remark}
 
+\pagebreak{}
+
 \section{Second scénario d'aménagement : élargissement du lit moyen}
 
 Ce scénario d'aménagement consiste à essayer d’augmenter le laminage en créant un lit moyen en rive droite entre les PKs 32 015 et 33 920\,m. Pour rappel, cette localisation est imposée pour des raisons de disponibilité des terrains et on ne peut pas envisager une largeur du lit moyen supérieure à 50 mètres.
@@ -166,8 +188,9 @@ Pourquoi élargir le lit moyen peut-il avoir un effet sur le niveau d'eau durant
 
 Pour élargir le lit moyen, la géométrie doit être modifiée.
 Il est judicieux d'enregistrer votre étude sous un autre nom avant de procéder à ces modifications (cliquez sur \texttt{[Fichier] => [Sauvegarder sous]}).
-Le plus simple est de repartir de la géométrie avant maillage avant de modifier les transects.
+
-Vous pouvez supprimer les sections interpolées en les sélectionnant dans la fenêtre \textit{Géométrie} et en appuyant sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png}.
+Vous aurez un certain nombre de sections à modifier. Pour limiter leur nombre, le plus simple est de repartir de la géométrie initiale (avant maillage) avant de modifier les transects et de mailler à nouveau après les modifications.
+Vous pouvez supprimer les sections interpolées (notées interpol\textit{i}) en les sélectionnant dans la fenêtre \textit{Géométrie} et en appuyant sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png}.
 
 Cliquez sur \texttt{[Géométrie] => [Modifier la géométrie]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} pour définir la géométrie du bief.
 Sélectionnez la section en travers que vous souhaitez modifier.
@@ -197,6 +220,8 @@ Quel est l'effet de cet aménagement sur l'hydrogramme de crue ?
 Peut-on s'attendre à ce résultat compte tenu du volume qu'il est possible de stocker en lit moyen et du volume total de la crue ?
 \end{remark}
 
+\pagebreak{}
+
 \section{Troisième scénario d'aménagement : casier de stockage}
 
 Ce troisième scénario consiste à faire baisser le débit dans la rivière en créant un déversement vers un casier de stockage en rive gauche juste en aval du pont de l'A2.
@@ -216,7 +241,7 @@ Cliquez sur \texttt{[Réseau] => [Modifier le réseau]} ou sur l'icône \include
 Le réseau pour la configuration de référence ne comportait qu'un seul bief entre deux noeuds.
 Pour ajouter un casier, il faut ajouter un noeud pour la diffluence, un noeud en amont du casier et un noeud en aval du casier.
 Le casier ne peut en effet pas être en limite aval du modèle ni directement au niveau de la confluence.
-Pour ajouter un noeud, cliquez \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour sélectionner l'outil ``d'addition'' et cliquez ensuite dans la fenêtre grise à l'endroit ou vous souhaitez ajouter un noeud.
+Pour ajouter un noeud, cliquez sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour sélectionner l'outil ``d'addition'' et cliquez ensuite dans la fenêtre grise à l'endroit ou vous souhaitez ajouter un noeud.
 De la même façon vous pourrez avec cet outil ajouter un bief entre deux noeuds en cliquant successivement sur l'un puis sur l'autre.
 Vous pourrez alors créer un réseau tel que celui ci-dessous où DevLat est le noeud marquant la diffluence.
 \begin{center}
@@ -236,6 +261,11 @@ Il vous faudra supprimer les sections dans l'un que vous implémenterez dans l'a
 L'outil d'import de géométrie pourra  vous aider.
 Il faudra le cas échéant réimplémenter également les ouvrages.
 
+Vous devrez ensuite implémenter le casier sur le noeud nommé casier. Cliquez sur \texttt{[Hydraulique] => [Casiers]}. Vous pouvez ajouter un casier en cliquant sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png}. Vous devrez ensuite configurer le casier  en cliquant sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}. Pour chaque altitude, vous pouvez définir l'aire de stockage (en ha). Vous pourrez ainsi configurer votre casier de la façon suivante :
+\begin{center}
+\includegraphics[width=10cm]{img/Casier.png}
+\par\end{center}
+
 Lancez le calcul pour chacune des crues proposées avec ce nouvel aménagement.
 
 \begin{remark}

doc/users/TP_Hydraulique_Hogneau/step-by-step.tex

@@ -101,7 +101,7 @@ Authors : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
 
 \section{Install Pamhyr2}
 
-Pamhyr2 can be downloaded from \url{https://gitlab.irstea.fr/theophile.terraz/pamhyr}.
+Pamhyr2 can be downloaded from \url{https://gitlab.com/pamhyr/pamhyr2}.
 \begin{center}
 \includegraphics[width=15cm]{img/dl.png}
 \par\end{center}

doc/users/TP_charriage/Donnees_TP_Pamhyr2_charriage/6_sections_elargissement.st

@@ -0,0 +1,235 @@
+# Exported from Pamhyr2
+     0     1     0    37     0.000000 p1013
+0.0000       0.0000       14.0000         
+0.0000       0.0134       12.9933         
+0.0000       0.9213       12.5393         
+0.0000       1.8292       12.0854         
+0.0000       2.7370       11.6315         
+0.0000       3.6449       11.1775         
+0.0000       4.5528       10.7236         
+0.0000       5.4607       10.2697         
+0.0000       6.3685       9.8157          
+0.0000       7.2764       9.3618          
+0.0000       8.1843       8.9079          
+0.0000       9.0921       8.4539          
+0.0000       10.0000      8.0000       FD 
+0.0000       10.8333      8.0000          
+0.0000       11.6667      8.0000          
+0.0000       12.5000      8.0000          
+0.0000       13.3333      8.0000          
+0.0000       14.1667      8.0000          
+0.0000       15.0000      8.0000          
+0.0000       15.8333      8.0000          
+0.0000       16.6667      8.0000          
+0.0000       17.5000      8.0000          
+0.0000       18.3333      8.0000          
+0.0000       19.1667      8.0000          
+0.0000       20.0000      8.0000       FG 
+0.0000       20.9079      8.4539          
+0.0000       21.8157      8.9079          
+0.0000       22.7236      9.3618          
+0.0000       23.6315      9.8157          
+0.0000       24.5393      10.2697         
+0.0000       25.4472      10.7236         
+0.0000       26.3551      11.1775         
+0.0000       27.2630      11.6315         
+0.0000       28.1708      12.0854         
+0.0000       29.0787      12.5393         
+0.0000       29.9866      12.9933         
+0.0000       30.0000      14.0000         
+     999.9990     999.9990     999.9990
+     1     2     0    37   350.000000 p1025
+350.0000     0.0000       13.6500         
+350.0000     0.0134       12.6433         
+350.0000     0.9213       12.1893         
+350.0000     1.8292       11.7354         
+350.0000     2.7370       11.2815         
+350.0000     3.6449       10.8275         
+350.0000     4.5528       10.3736         
+350.0000     5.4607       9.9197          
+350.0000     6.3685       9.4657          
+350.0000     7.2764       9.0118          
+350.0000     8.1843       8.5579          
+350.0000     9.0921       8.1039          
+350.0000     10.0000      7.6500       FD 
+350.0000     10.8333      7.6500          
+350.0000     11.6667      7.6500          
+350.0000     12.5000      7.6500          
+350.0000     13.3333      7.6500          
+350.0000     14.1667      7.6500          
+350.0000     15.0000      7.6500          
+350.0000     15.8333      7.6500          
+350.0000     16.6667      7.6500          
+350.0000     17.5000      7.6500          
+350.0000     18.3333      7.6500          
+350.0000     19.1667      7.6500          
+350.0000     20.0000      7.6500       FG 
+350.0000     20.9079      8.1039          
+350.0000     21.8157      8.5579          
+350.0000     22.7236      9.0118          
+350.0000     23.6315      9.4657          
+350.0000     24.5393      9.9197          
+350.0000     25.4472      10.3736         
+350.0000     26.3551      10.8275         
+350.0000     27.2630      11.2815         
+350.0000     28.1708      11.7354         
+350.0000     29.0787      12.1893         
+350.0000     29.9866      12.6433         
+350.0000     30.0000      13.6500         
+     999.9990     999.9990     999.9990
+     2     3     0    37   370.000000 p1026
+370.0000     0.0000       13.6300         
+370.0000     0.0134       12.6233         
+370.0000     0.9213       12.1693         
+370.0000     1.8292       11.7154         
+370.0000     2.7370       11.2615         
+370.0000     3.6449       10.8075         
+370.0000     4.5528       10.3536         
+370.0000     5.4607       9.8997          
+370.0000     6.3685       9.4457          
+370.0000     7.2764       8.9918          
+370.0000     8.1843       8.5379          
+370.0000     9.0921       8.0839          
+370.0000     10.0000      7.6300       FD 
+370.0000     11.2500      7.6300          
+370.0000     12.5000      7.6300          
+370.0000     13.7500      7.6300          
+370.0000     15.0000      7.6300          
+370.0000     16.2500      7.6300          
+370.0000     17.5000      7.6300          
+370.0000     18.7500      7.6300          
+370.0000     20.0000      7.6300          
+370.0000     21.2500      7.6300          
+370.0000     22.5000      7.6300          
+370.0000     23.7500      7.6300          
+370.0000     25.0000      7.6300       FG 
+370.0000     25.9079      8.0839          
+370.0000     26.8157      8.5379          
+370.0000     27.7236      8.9918          
+370.0000     28.6315      9.4457          
+370.0000     29.5393      9.8997          
+370.0000     30.4472      10.3536         
+370.0000     31.3551      10.8075         
+370.0000     32.2630      11.2615         
+370.0000     33.1708      11.7154         
+370.0000     34.0787      12.1693         
+370.0000     34.9866      12.6233         
+370.0000     35.0000      13.6300         
+     999.9990     999.9990     999.9990
+     3     4     0    37   630.000000 p1035
+630.0000     0.0000       13.3700         
+630.0000     0.0134       12.3633         
+630.0000     0.9213       11.9093         
+630.0000     1.8292       11.4554         
+630.0000     2.7370       11.0015         
+630.0000     3.6449       10.5475         
+630.0000     4.5528       10.0936         
+630.0000     5.4607       9.6397          
+630.0000     6.3685       9.1857          
+630.0000     7.2764       8.7318          
+630.0000     8.1843       8.2779          
+630.0000     9.0921       7.8239          
+630.0000     10.0000      7.3700       FD 
+630.0000     11.2500      7.3700          
+630.0000     12.5000      7.3700          
+630.0000     13.7500      7.3700          
+630.0000     15.0000      7.3700          
+630.0000     16.2500      7.3700          
+630.0000     17.5000      7.3700          
+630.0000     18.7500      7.3700          
+630.0000     20.0000      7.3700          
+630.0000     21.2500      7.3700          
+630.0000     22.5000      7.3700          
+630.0000     23.7500      7.3700          
+630.0000     25.0000      7.3700       FG 
+630.0000     25.9079      7.8239          
+630.0000     26.8157      8.2779          
+630.0000     27.7236      8.7318          
+630.0000     28.6315      9.1857          
+630.0000     29.5393      9.6397          
+630.0000     30.4472      10.0936         
+630.0000     31.3551      10.5475         
+630.0000     32.2630      11.0015         
+630.0000     33.1708      11.4554         
+630.0000     34.0787      11.9093         
+630.0000     34.9866      12.3633         
+630.0000     35.0000      13.3700         
+     999.9990     999.9990     999.9990
+     4     5     0    37   650.000000 p1036
+650.0000     0.0000       13.3500         
+650.0000     0.0134       12.3433         
+650.0000     0.9213       11.8893         
+650.0000     1.8292       11.4354         
+650.0000     2.7370       10.9815         
+650.0000     3.6449       10.5275         
+650.0000     4.5528       10.0736         
+650.0000     5.4607       9.6197          
+650.0000     6.3685       9.1657          
+650.0000     7.2764       8.7118          
+650.0000     8.1843       8.2579          
+650.0000     9.0921       7.8039          
+650.0000     10.0000      7.3500       FD 
+650.0000     10.8333      7.3500          
+650.0000     11.6667      7.3500          
+650.0000     12.5000      7.3500          
+650.0000     13.3333      7.3500          
+650.0000     14.1667      7.3500          
+650.0000     15.0000      7.3500          
+650.0000     15.8333      7.3500          
+650.0000     16.6667      7.3500          
+650.0000     17.5000      7.3500          
+650.0000     18.3333      7.3500          
+650.0000     19.1667      7.3500          
+650.0000     20.0000      7.3500       FG 
+650.0000     20.9079      7.8039          
+650.0000     21.8157      8.2579          
+650.0000     22.7236      8.7118          
+650.0000     23.6315      9.1657          
+650.0000     24.5393      9.6197          
+650.0000     25.4472      10.0736         
+650.0000     26.3551      10.5275         
+650.0000     27.2630      10.9815         
+650.0000     28.1708      11.4354         
+650.0000     29.0787      11.8893         
+650.0000     29.9866      12.3433         
+650.0000     30.0000      13.3500         
+     999.9990     999.9990     999.9990
+     5     6     0    37  1000.000000 p1048
+1000.0000    0.0000       13.0000         
+1000.0000    0.0134       11.9933         
+1000.0000    0.9213       11.5393         
+1000.0000    1.8292       11.0854         
+1000.0000    2.7370       10.6315         
+1000.0000    3.6449       10.1775         
+1000.0000    4.5528       9.7236          
+1000.0000    5.4607       9.2697          
+1000.0000    6.3685       8.8157          
+1000.0000    7.2764       8.3618          
+1000.0000    8.1843       7.9079          
+1000.0000    9.0921       7.4539          
+1000.0000    10.0000      7.0000       FD 
+1000.0000    10.8333      7.0000          
+1000.0000    11.6667      7.0000          
+1000.0000    12.5000      7.0000          
+1000.0000    13.3333      7.0000          
+1000.0000    14.1667      7.0000          
+1000.0000    15.0000      7.0000          
+1000.0000    15.8333      7.0000          
+1000.0000    16.6667      7.0000          
+1000.0000    17.5000      7.0000          
+1000.0000    18.3333      7.0000          
+1000.0000    19.1667      7.0000          
+1000.0000    20.0000      7.0000       FG 
+1000.0000    20.9079      7.4539          
+1000.0000    21.8157      7.9079          
+1000.0000    22.7236      8.3618          
+1000.0000    23.6315      8.8157          
+1000.0000    24.5393      9.2697          
+1000.0000    25.4472      9.7236          
+1000.0000    26.3551      10.1775         
+1000.0000    27.2630      10.6315         
+1000.0000    28.1708      11.0854         
+1000.0000    29.0787      11.5393         
+1000.0000    29.9866      11.9933         
+1000.0000    30.0000      13.0000         
+     999.9990     999.9990     999.9990

doc/users/TP_charriage/Donnees_TP_Pamhyr2_charriage/6_sections_fosse.st

@@ -0,0 +1,235 @@
+# Exported from Pamhyr2
+     0     1     0    37     0.000000 p1210
+0.0000       0.0000       14.0000         
+0.0000       0.0134       12.9933         
+0.0000       0.9213       12.5393         
+0.0000       1.8292       12.0854         
+0.0000       2.7370       11.6315         
+0.0000       3.6449       11.1775         
+0.0000       4.5528       10.7236         
+0.0000       5.4607       10.2697         
+0.0000       6.3685       9.8157          
+0.0000       7.2764       9.3618          
+0.0000       8.1843       8.9079          
+0.0000       9.0921       8.4539          
+0.0000       10.0000      8.0000       FD 
+0.0000       10.8333      8.0000          
+0.0000       11.6667      8.0000          
+0.0000       12.5000      8.0000          
+0.0000       13.3333      8.0000          
+0.0000       14.1667      8.0000          
+0.0000       15.0000      8.0000          
+0.0000       15.8333      8.0000          
+0.0000       16.6667      8.0000          
+0.0000       17.5000      8.0000          
+0.0000       18.3333      8.0000          
+0.0000       19.1667      8.0000          
+0.0000       20.0000      8.0000       FG 
+0.0000       20.9079      8.4539          
+0.0000       21.8157      8.9079          
+0.0000       22.7236      9.3618          
+0.0000       23.6315      9.8157          
+0.0000       24.5393      10.2697         
+0.0000       25.4472      10.7236         
+0.0000       26.3551      11.1775         
+0.0000       27.2630      11.6315         
+0.0000       28.1708      12.0854         
+0.0000       29.0787      12.5393         
+0.0000       29.9866      12.9933         
+0.0000       30.0000      14.0000         
+     999.9990     999.9990     999.9990
+     1     2     0    37   300.000000 p1225
+300.0000     0.0000       13.7000         
+300.0000     0.0134       12.6933         
+300.0000     0.9213       12.2393         
+300.0000     1.8292       11.7854         
+300.0000     2.7370       11.3315         
+300.0000     3.6449       10.8775         
+300.0000     4.5528       10.4236         
+300.0000     5.4607       9.9697          
+300.0000     6.3685       9.5157          
+300.0000     7.2764       9.0618          
+300.0000     8.1843       8.6079          
+300.0000     9.0921       8.1539          
+300.0000     10.0000      7.7000       FD 
+300.0000     10.8333      7.7000          
+300.0000     11.6667      7.7000          
+300.0000     12.5000      7.7000          
+300.0000     13.3333      7.7000          
+300.0000     14.1667      7.7000          
+300.0000     15.0000      7.7000          
+300.0000     15.8333      7.7000          
+300.0000     16.6667      7.7000          
+300.0000     17.5000      7.7000          
+300.0000     18.3333      7.7000          
+300.0000     19.1667      7.7000          
+300.0000     20.0000      7.7000       FG 
+300.0000     20.9079      8.1539          
+300.0000     21.8157      8.6079          
+300.0000     22.7236      9.0618          
+300.0000     23.6315      9.5157          
+300.0000     24.5393      9.9697          
+300.0000     25.4472      10.4236         
+300.0000     26.3551      10.8775         
+300.0000     27.2630      11.3315         
+300.0000     28.1708      11.7854         
+300.0000     29.0787      12.2393         
+300.0000     29.9866      12.6933         
+300.0000     30.0000      13.7000         
+     999.9990     999.9990     999.9990
+     2     3     0    37   310.000000 p1226
+310.0000     0.0000       13.1900         
+310.0000     0.0134       12.1833         
+310.0000     0.9213       11.7293         
+310.0000     1.8292       11.2754         
+310.0000     2.7370       10.8215         
+310.0000     3.6449       10.3675         
+310.0000     4.5528       9.9136          
+310.0000     5.4607       9.4597          
+310.0000     6.3685       9.0057          
+310.0000     7.2764       8.5518          
+310.0000     8.1843       8.0979          
+310.0000     9.0921       7.6439          
+310.0000     10.0000      7.1900       FD 
+310.0000     10.8333      7.1900          
+310.0000     11.6667      7.1900          
+310.0000     12.5000      7.1900          
+310.0000     13.3333      7.1900          
+310.0000     14.1667      7.1900          
+310.0000     15.0000      7.1900          
+310.0000     15.8333      7.1900          
+310.0000     16.6667      7.1900          
+310.0000     17.5000      7.1900          
+310.0000     18.3333      7.1900          
+310.0000     19.1667      7.1900          
+310.0000     20.0000      7.1900       FG 
+310.0000     20.9079      7.6439          
+310.0000     21.8157      8.0979          
+310.0000     22.7236      8.5518          
+310.0000     23.6315      9.0057          
+310.0000     24.5393      9.4597          
+310.0000     25.4472      9.9136          
+310.0000     26.3551      10.3675         
+310.0000     27.2630      10.8215         
+310.0000     28.1708      11.2754         
+310.0000     29.0787      11.7293         
+310.0000     29.9866      12.1833         
+310.0000     30.0000      13.1900         
+     999.9990     999.9990     999.9990
+     3     4     0    37   390.000000 p1230
+390.0000     0.0000       13.1900         
+390.0000     0.0134       12.1833         
+390.0000     0.9213       11.7293         
+390.0000     1.8292       11.2754         
+390.0000     2.7370       10.8215         
+390.0000     3.6449       10.3675         
+390.0000     4.5528       9.9136          
+390.0000     5.4607       9.4597          
+390.0000     6.3685       9.0057          
+390.0000     7.2764       8.5518          
+390.0000     8.1843       8.0979          
+390.0000     9.0921       7.6439          
+390.0000     10.0000      7.1900       FD 
+390.0000     10.8333      7.1900          
+390.0000     11.6667      7.1900          
+390.0000     12.5000      7.1900          
+390.0000     13.3333      7.1900          
+390.0000     14.1667      7.1900          
+390.0000     15.0000      7.1900          
+390.0000     15.8333      7.1900          
+390.0000     16.6667      7.1900          
+390.0000     17.5000      7.1900          
+390.0000     18.3333      7.1900          
+390.0000     19.1667      7.1900          
+390.0000     20.0000      7.1900       FG 
+390.0000     20.9079      7.6439          
+390.0000     21.8157      8.0979          
+390.0000     22.7236      8.5518          
+390.0000     23.6315      9.0057          
+390.0000     24.5393      9.4597          
+390.0000     25.4472      9.9136          
+390.0000     26.3551      10.3675         
+390.0000     27.2630      10.8215         
+390.0000     28.1708      11.2754         
+390.0000     29.0787      11.7293         
+390.0000     29.9866      12.1833         
+390.0000     30.0000      13.1900         
+     999.9990     999.9990     999.9990
+     4     5     0    37   400.000000 p1231
+400.0000     0.0000       13.6000         
+400.0000     0.0134       12.5933         
+400.0000     0.9213       12.1393         
+400.0000     1.8292       11.6854         
+400.0000     2.7370       11.2315         
+400.0000     3.6449       10.7775         
+400.0000     4.5528       10.3236         
+400.0000     5.4607       9.8697          
+400.0000     6.3685       9.4157          
+400.0000     7.2764       8.9618          
+400.0000     8.1843       8.5079          
+400.0000     9.0921       8.0539          
+400.0000     10.0000      7.6000       FD 
+400.0000     10.8333      7.6000          
+400.0000     11.6667      7.6000          
+400.0000     12.5000      7.6000          
+400.0000     13.3333      7.6000          
+400.0000     14.1667      7.6000          
+400.0000     15.0000      7.6000          
+400.0000     15.8333      7.6000          
+400.0000     16.6667      7.6000          
+400.0000     17.5000      7.6000          
+400.0000     18.3333      7.6000          
+400.0000     19.1667      7.6000          
+400.0000     20.0000      7.6000       FG 
+400.0000     20.9079      8.0539          
+400.0000     21.8157      8.5079          
+400.0000     22.7236      8.9618          
+400.0000     23.6315      9.4157          
+400.0000     24.5393      9.8697          
+400.0000     25.4472      10.3236         
+400.0000     26.3551      10.7775         
+400.0000     27.2630      11.2315         
+400.0000     28.1708      11.6854         
+400.0000     29.0787      12.1393         
+400.0000     29.9866      12.5933         
+400.0000     30.0000      13.6000         
+     999.9990     999.9990     999.9990
+     5     6     0    37  1000.000000 p1261
+1000.0000    0.0000       13.0000         
+1000.0000    0.0134       11.9933         
+1000.0000    0.9213       11.5393         
+1000.0000    1.8292       11.0854         
+1000.0000    2.7370       10.6315         
+1000.0000    3.6449       10.1775         
+1000.0000    4.5528       9.7236          
+1000.0000    5.4607       9.2697          
+1000.0000    6.3685       8.8157          
+1000.0000    7.2764       8.3618          
+1000.0000    8.1843       7.9079          
+1000.0000    9.0921       7.4539          
+1000.0000    10.0000      7.0000       FD 
+1000.0000    10.8333      7.0000          
+1000.0000    11.6667      7.0000          
+1000.0000    12.5000      7.0000          
+1000.0000    13.3333      7.0000          
+1000.0000    14.1667      7.0000          
+1000.0000    15.0000      7.0000          
+1000.0000    15.8333      7.0000          
+1000.0000    16.6667      7.0000          
+1000.0000    17.5000      7.0000          
+1000.0000    18.3333      7.0000          
+1000.0000    19.1667      7.0000          
+1000.0000    20.0000      7.0000       FG 
+1000.0000    20.9079      7.4539          
+1000.0000    21.8157      7.9079          
+1000.0000    22.7236      8.3618          
+1000.0000    23.6315      8.8157          
+1000.0000    24.5393      9.2697          
+1000.0000    25.4472      9.7236          
+1000.0000    26.3551      10.1775         
+1000.0000    27.2630      10.6315         
+1000.0000    28.1708      11.0854         
+1000.0000    29.0787      11.5393         
+1000.0000    29.9866      11.9933         
+1000.0000    30.0000      13.0000         
+     999.9990     999.9990     999.9990

full-requirements.txt

@@ -12,3 +12,5 @@ shapely>=2.0.1
 lxml>=4.9.3
 platformdirs>=4.2.0
 pyshp>=2.3.1
+rasterio==1.3.11
+#fortranformat==2.0.3

packages/make-windows-dir.bat

@@ -68,14 +68,24 @@ copy /y ..\doc\dev\images\* pamhyr\doc\images
 copy /y ..\doc\images\* pamhyr\doc\images
 
 rem Tuto
-mkdir pamhyr\doc\Tuto1\
+mkdir pamhyr\doc\TP_Hydraulique_Hogneau\
-mkdir pamhyr\doc\Tuto1\data
+mkdir pamhyr\doc\TP_Hydraulique_Hogneau\data
-copy /y ..\doc\users\Tuto1\Hogneau_Engees2022.pdf pamhyr\doc\Tuto1\Hogneau_Engees2022.pdf
+copy /y ..\doc\users\TP_Hydraulique_Hogneau\Hogneau_Engees2022.pdf pamhyr\doc\TP_Hydraulique_Hogneau\Hogneau_Engees2022.pdf
-copy /y ..\doc\users\Tuto1\step-by-step.pdf pamhyr\doc\Tuto1\Tuto1-en.pdf
+copy /y ..\doc\users\TP_Hydraulique_Hogneau\step-by-step.pdf pamhyr\doc\TP_Hydraulique_Hogneau\Tuto1-en.pdf
-copy /y ..\doc\users\Tuto1\pas-a-pas.pdf pamhyr\doc\Tuto1\Tuto1-fr.pdf
+copy /y ..\doc\users\TP_Hydraulique_Hogneau\pas-a-pas.pdf pamhyr\doc\TP_Hydraulique_Hogneau\Tuto1-fr.pdf
-copy /y ..\doc\users\Tuto1\*.pamhyr pamhyr\doc\Tuto1\
+copy /y ..\doc\users\TP_Hydraulique_Hogneau\Tuto-2-fr.pdf pamhyr\doc\TP_Hydraulique_Hogneau\Tuto2-fr.pdf
-copy /y ..\doc\users\Tuto1\data\* pamhyr\doc\Tuto1\data\
+copy /y ..\doc\users\TP_Hydraulique_Hogneau\*.pamhyr pamhyr\doc\TP_Hydraulique_Hogneau\
+copy /y ..\doc\users\TP_Hydraulique_Hogneau\data\* pamhyr\doc\TP_Hydraulique_Hogneau\data\
 
 rem TP charriage
 mkdir pamhyr\doc\TP_charriage
-copy /y ..\doc\users\TP_charriage\ pamhyr\doc\TP_charriage
+mkdir pamhyr\doc\TP_charriage\Donnees_TP_Pamhyr2_charriage
+copy /y ..\doc\users\TP_charriage\TP_Pamhyr2_charriage.pdf pamhyr\doc\TP_charriage\
+copy /y ..\doc\users\TP_charriage\Donnees_TP_Pamhyr2_charriage\* pamhyr\doc\TP_charriage\Donnees_TP_Pamhyr2_charriage\
+
+rem TP AdisTS
+mkdir pamhyr\doc\TP_AdisTS_Vieux_Rhone\
+mkdir pamhyr\doc\TP_AdisTS_Vieux_Rhone\data
+copy /y ..\doc\users\TP_AdisTS_Vieux_Rhone\*.pdf pamhyr\doc\TP_AdisTS_Vieux_Rhone\
+copy /y ..\doc\users\TP_AdisTS_Vieux_Rhone\*.pamhyr pamhyr\doc\TP_AdisTS_Vieux_Rhone\
+copy /y ..\doc\users\TP_AdisTS_Vieux_Rhone\data\* pamhyr\doc\TP_AdisTS_Vieux_Rhone\data\

requirements.txt

@@ -12,3 +12,5 @@ shapely>=2.0.1
 lxml>=4.9.3
 platformdirs>=4.2.0
 pyshp>=2.3.1
+rasterio==1.3.11
+#fortranformat==2.0.3

src/Meshing/Internal.py

@@ -0,0 +1,331 @@
+# Internal.py -- Pamhyr
+# Copyright (C) 2023-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 logging
+from numpy import sign
+from copy import deepcopy
+
+from tools import logger_color_red, logger_color_reset, logger_exception
+from Meshing.AMeshingTool import AMeshingTool
+
+from Model.Geometry.ProfileXYZ import ProfileXYZ
+
+logger = logging.getLogger()
+
+
+class InternalMeshing(AMeshingTool):
+    def __init__(self):
+        super(InternalMeshing, self).__init__()
+
+    ###########
+    # Meshing #
+    ###########
+
+    def meshing(self, reach,
+                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]:
+            lim = limites[1]
+            limites[1] = limites[0]
+            limites[0] = lim
+        elif limites[0] == limites[1]:
+            return reach
+
+        self.st_to_m(reach, limites)
+        self.interpolate_transversal_step(reach,
+                                          limites,
+                                          step)
+        self.purge_aligned_points(reach)
+
+        return reach
+
+    def st_to_m(self, reach, limites):
+
+        gl = reach.compute_guidelines()
+        profiles = reach.profiles[limites[0]:limites[1]+1]
+
+        print(profiles)
+
+        # 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]:
+                    max_values[i + 1] = index2 - index1
+                    max_values_index[i + 1] = 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])
+            for isect in reversed(range(0, max_values_index[i])):
+                self.compl_sect(profiles[isect+1],
+                                profiles[isect],
+                                gl1[i], gl2[i])
+
+    def interpolate_transversal_step(self,
+                                     reach,
+                                     limites,
+                                     step):
+        # calcul number of intermediate profiles
+        np = []
+        for i in range(limites[0], limites[1]):
+            np.append(int((reach.profiles[i+1].rk -
+                           reach.profiles[i].rk) / step) - 1)
+            if np[-1] < 0:
+                np[-1] = 0
+
+        d = []  # ratios
+        p = []  # new profiles
+        ptr = int(limites[0])
+        for i in range(limites[1] - limites[0]):
+            d = 1.0/float(np[i]+1)
+            ptr0 = ptr
+            for j in range(np[i]):
+                p = reach.profiles[ptr0].copy()
+                # RATIO entre les deux sections initiales
+                dj = float(j+1)*d
+                ptr += 1  # next profile, original
+                for k in range(len(reach.profiles[ptr0].points)):
+                    p.points[k].x = reach.profiles[ptr0].points[k].x + \
+                        dj*(reach.profiles[ptr].points[k].x -
+                            reach.profiles[ptr0].points[k].x)
+                    p.points[k].y = reach.profiles[ptr0].points[k].y + \
+                        dj*(reach.profiles[ptr].points[k].y -
+                            reach.profiles[ptr0].points[k].y)
+                    p.points[k].z = reach.profiles[ptr0].points[k].z + \
+                        dj*(reach.profiles[ptr].points[k].z -
+                            reach.profiles[ptr0].points[k].z)
+                    p.rk = reach.profiles[ptr0].rk + \
+                        dj*(reach.profiles[ptr].rk -
+                            reach.profiles[ptr0].rk)
+                    p.name = f'interpol{p.rk}'
+                reach.insert_profile(ptr, p)
+            ptr += 1  # next profile, original
+
+    def compl_sect(self, sect1, sect2, tag1, tag2):
+        # sect1: reference section
+        # sect2: section to complete
+        # start1 and 2: indices of the first point of the bed to complete
+        # end = start + len
+        # 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)
+
+        len1 = end1 - start1
+        len2 = end2 - start2
+
+        if len1 < len2:
+            self.compl_sect(sect2, sect1, start2, start1,
+                            len2, len1, tag1, tag2)
+            return
+        elif len1 == len2:
+            return
+
+        ltot1 = 0.0
+        ltot2 = 0.0
+        alpha = []
+        beta = []
+        # 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
+                    sect2.point(start2).name = ''
+                if tag2 == '':  # left end point
+                    sect2.point(start2+1).name = ''
+        elif ltot1 < 0.0001:
+            sect2.add_npoints(len1-len2)
+        else:  # regular case
+            # loop on the points to insert
+            for k in range(len1-len2):
+                trouve = False
+                for j0 in range(len2):
+                    if trouve:
+                        break
+                    undeplus = True
+                    for j1 in range(j0, len2):
+                        if undeplus:
+                            if beta[j1] <= alpha[j1]:
+                                undeplus = False
+                                break
+                    if undeplus:
+                        if j0 == len2:
+                            trouve = True
+                        else:
+                            j1 = j0+1
+                            if beta[j0]-alpha[j0] > alpha[j1]-beta[j0]:
+                                trouve = True
+
+                    if trouve:
+                        len2 += 1
+                        for i in reversed(range(j0, len2)):
+                            beta[i+1] = beta[i]
+                        if (beta[j0] == beta[j0-1]):
+                            # rien
+                            pass
+                        else:
+                            ratio = (alpha[j0] - beta[j0-1]) \
+                                    / (beta[j0] - beta[j0-1])
+                            if ratio < 0.0:
+                                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:
+            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
+        sect2.point(start2+len2).name = tag2
+        sect2.modified()
+
+    def update_rk(self, reach,
+                  step: float = 50,
+                  limites=[-1, -1],
+                  origin=0,
+                  directrices=['un', 'np'],
+                  lplan: bool = False,
+                  lm: int = 3,
+                  linear: bool = False,
+                  origin_value=0.0,
+                  orientation=0):
+        if reach is None or len(reach.profiles) == 0:
+            return reach
+
+        nprof = reach.number_profiles
+        if origin >= nprof or origin < 0:
+            logger.warning(
+                f"Origin outside reach"
+            )
+            return reach
+
+        # orientation is the orintation of the bief:
+        # 1: up -> downstream
+        # 2: down -> upstream
+        # else: keep current orientation
+        if orientation == 1:
+            sgn = 1.0
+        elif orientation == 2:
+            sgn = -1.0
+        else:
+            sgn = sign(reach.profiles[-1].rk - reach.profiles[0].rk)
+
+        reach.profiles[origin].rk = origin_value
+
+        if origin < nprof - 1:
+            for i in range(origin+1, nprof):
+                # 2D
+                d1 = reach.profiles[i-1].named_point(
+                    directrices[0]
+                ).dist_2d(reach.profiles[i].named_point(directrices[0]))
+                d2 = reach.profiles[i-1].named_point(
+                    directrices[1]
+                ).dist_2d(reach.profiles[i].named_point(directrices[1]))
+                reach.profiles[i].rk = reach.profiles[i-1].rk \
+                    + (sgn * (d1 + d2) / 2)
+        if origin > 0:
+            for i in reversed(range(0, origin)):
+                # 2D
+                d1 = reach.profiles[i+1].named_point(
+                    directrices[0]
+                ).dist_2d(reach.profiles[i].named_point(directrices[0]))
+                d2 = reach.profiles[i+1].named_point(
+                    directrices[1]
+                ).dist_2d(reach.profiles[i].named_point(directrices[1]))
+                reach.profiles[i].rk = reach.profiles[i+1].rk \
+                    - (sgn * (d1 + d2) / 2)
+
+    def purge_aligned_points(self, reach):
+        for p in reach.profiles:
+            p.purge_aligned_points()

src/Meshing/Mage.py

@@ -19,6 +19,7 @@
 import os
 import logging
 import tempfile
+from numpy import sign
 
 from ctypes import (
     cdll,

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -222,3 +222,82 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @property
     def data(self):
         return self._data.copy()
+
+    @property
+    def _default_0(self):
+        return self._types[0](0)
+
+    @property
+    def _default_1(self):
+        return self._types[1](0.0)
+
+    def new_from_data(self, header, data):
+        new_0 = self._default_0
+        new_1 = self._default_1
+
+        if len(header) != 0:
+            for i in [0, 1]:
+                for j in range(len(header)):
+                    if self._header[i] == header[j]:
+                        if i == 0:
+                            new_0 = self._types[i](data[j].replace(",", "."))
+                        else:
+                            new_1 = self._types[i](data[j].replace(",", "."))
+        else:
+            new_0 = self._types[0](data[0].replace(",", "."))
+            new_1 = self._types[1](data[1].replace(",", "."))
+
+        return (new_0, new_1)
+
+    def add(self, index: int):
+        value = (self._default_0, self._default_1)
+        self._data.insert(index, value)
+        self._status.modified()
+        return value
+
+    def insert(self, index: int, value):
+        self._data.insert(index, value)
+        self._status.modified()
+
+    def delete_i(self, indexes):
+        self._data = list(
+            map(
+                lambda e: e[1],
+                filter(
+                    lambda e: e[0] not in indexes,
+                    enumerate(self.data)
+                )
+            )
+        )
+        self._status.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()
+
+    def index(self, bc):
+        self._data.index(bc)
+
+    def get_i(self, index):
+        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, column, value):
+        v = list(self._data[index])
+        v[column] = self._types[column](value)
+        self._data[index] = tuple(v)
+        self._status.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/Geometry/PointXYZ.py

@@ -228,3 +228,25 @@ class PointXYZ(Point, SQLSubModel):
         c = PointXYZ.distance(p3, p1)
         s = (a + b + c) / 2
         return (s*(s-a) * (s-b)*(s-c)) ** 0.5
+
+    def dist_from_seg(self, p1, p2):
+        a2 = pow(PointXYZ.distance(self, p1), 2)
+        b2 = pow(PointXYZ.distance(self, p2), 2)
+        c2 = pow(PointXYZ.distance(p1, p2), 2)
+        if c2 < 0.00000001:
+            # si les deux points sont confondus
+            d = 0.0
+        else:
+            d = np.sqrt(abs(a2 - pow((c2 - b2 + a2) / (2*np.sqrt(c2)), 2)))
+
+        return d
+
+    def copy(self):
+        p = PointXYZ(self.x,
+                     self.y,
+                     self.z,
+                     self.name,
+                     self._profile,
+                     self._status)
+        p.sl = self.sl
+        return p

src/Model/Geometry/Profile.py

@@ -88,6 +88,14 @@ class Profile(object):
     def point(self, index):
         return self.points[index]
 
+    def named_point(self, name):
+        return next((p for p in self.points if p.name == name), None)
+
+    def named_point_index(self, name):
+        return next(
+            (p for p in enumerate(self.points) if p[1].name == name), None
+        )[0]
+
     @property
     def reach(self):
         return self._reach
@@ -206,7 +214,7 @@ class Profile(object):
         """Insert point at index.
 
         Args:
-            index: The index of new profile.
+            index: The index of new point.
             point: The point.
 
         Returns:

src/Model/Geometry/ProfileXYZ.py

@@ -167,8 +167,7 @@ class ProfileXYZ(Profile, SQLSubModel):
                     filter(
                         lambda s: s.id == sl,
                         data["sediment_layers_list"].sediment_layers
-                    )
+                    ), None)
-                )
 
             data["profile"] = new
             new._points = PointXYZ._db_load(execute, data.copy())
@@ -883,3 +882,46 @@ class ProfileXYZ(Profile, SQLSubModel):
     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):
+            disti = 0.0
+            i = 1
+            for j in range(len(self.points)-1):
+                distj = self.point(j).dist(self.point(j+1))
+                if distj > disti:
+                    disti = distj
+                    i = j
+            self.insert_point(i, self.point(i).copy())
+            self.point(i+1).name = ''
+            self.point(i+1).x = 0.5 * self.point(i).x + 0.5 * self.point(i+2).x
+            self.point(i+1).y = 0.5 * self.point(i).y + 0.5 * self.point(i+2).y
+            self.point(i+1).z = 0.5 * self.point(i).z + 0.5 * self.point(i+2).z
+
+    def copy(self):
+        p = ProfileXYZ(self.id,
+                       self.name,
+                       self.rk,
+                       self.reach,
+                       self.num,
+                       0,
+                       0, 0,
+                       self._status)
+        for i, k in enumerate(self.points):
+            p.insert_point(i, k.copy())
+
+        return p
+
+    def purge_aligned_points(self):
+
+        align = True
+        while (align):
+            align = False
+            for i in range(1, self.number_points - 1):
+                d = self.point(i).dist_from_seg(self.point(i-1),
+                                                self.point(i+1))
+                if d < 0.00001 and self.point(i).name == "":
+                    align = True
+                    self.delete_i([i])
+                    break

src/Model/HydraulicStructures/Basic/Types.py

@@ -83,8 +83,8 @@ class TriangularWeir(BasicHS):
         self._data = [
             BHSValue("elevation", float, 1.0, status=status),
             BHSValue("loading_elevation", float, 9999.999, status=status),
-            BHSValue("discharge_coefficient", float, 0.4, status=status),
+            BHSValue("discharge_coefficient", float, 0.31, status=status),
-            BHSValue("half-angle_tangent", float, 0.0, status=status),
+            BHSValue("half-angle_tangent", float, 1.0, status=status),
         ]
 
 

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -155,7 +155,6 @@ class HydraulicStructure(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
-        print("save hs unit")
         execute(f"DELETE FROM hydraulic_structures WHERE id = {self.id}")
 
         input_reach_id = -1

src/Model/InitialConditions/InitialConditions.py

@@ -382,8 +382,12 @@ class InitialConditions(SQLSubModel):
         self._data = []
         for profile in profiles:
             width = profile.wet_width(profile.z_min() + height)
+            area = profile.wet_area(profile.z_min() + height)
+            radius = profile.wet_radius(profile.z_min() + height)
             frictions = self._reach.frictions.frictions
             strickler = None
+            if frictions is not None:
+                if len(frictions) >= 1:
                     for f in frictions:
                         if f.contains_rk(profile.rk):
                             strickler = f.get_friction(profile.rk)[0]
@@ -394,9 +398,12 @@ class InitialConditions(SQLSubModel):
                 discharge = data_discharge[profile.rk]
             else:
                 discharge = (
-                    ((width * 0.8)
+                    # ((width * 0.8)
-                     * strickler
+                    # * strickler
-                     * (height ** (5/3))
+                    # * (height ** (5/3))
+                    # * (abs(incline) ** (0.5)))
+                    (area * strickler
+                     * (radius ** (2/3))
                      * (abs(incline) ** (0.5)))
                 )
 
@@ -423,6 +430,8 @@ class InitialConditions(SQLSubModel):
     def generate_discharge(self, discharge: float, compute_height: bool):
 
         profiles = self._reach.reach.profiles.copy()
+        if profiles is None:
+            return None
         profiles.reverse()
 
         previous_elevation = -99999.99
@@ -443,6 +452,8 @@ class InitialConditions(SQLSubModel):
             width = profile.width_approximation()
             frictions = self._reach.frictions.frictions
             strickler = None
+            if frictions is not None:
+                if len(frictions) >= 1:
                     for f in frictions:
                         if f.contains_rk(profile.rk):
                             strickler = f.get_friction(profile.rk)[0]
@@ -451,6 +462,9 @@ class InitialConditions(SQLSubModel):
 
             if not compute_height:
                 height = data_height[profile.rk]
+            else:
+                if abs(incline) <= 0:
+                    height = 0.0
                 else:
                     height = (
                         discharge

src/Model/Pollutants/Pollutants.py

@@ -45,6 +45,9 @@ class Pollutants(SQLSubModel):
         else:
             self.id = id
 
+        if name is None or name == "":
+            self.name = f"pol{self.id}"
+        else:
             self._name = str(name)
         self._enabled = True
 
@@ -179,7 +182,6 @@ class Pollutants(SQLSubModel):
 
     def new_from_data(self, data):
 
-        print("from_data before : ", data)
         try:
             new = [int(data[0])]
             new += [float(d) for d in data[1:]]
@@ -187,8 +189,6 @@ class Pollutants(SQLSubModel):
             logger.error(e)
             new = None
 
-        print("from_data after : ", new)
-
         return new
 
     def __len__(self):

src/Model/Results/Results.py

@@ -56,6 +56,10 @@ class Results(object):
     def set(self, key, value):
         self._meta_data[key] = value
 
+    @property
+    def is_valid(self):
+        return ("timestamps" in self._meta_data)
+
     def get(self, key):
         return self._meta_data[key]
 

src/Model/Results/ResultsAdisTS.py

@@ -17,7 +17,6 @@
 import logging
 import numpy as np
 import os
-import glob
 
 from copy import deepcopy
 from datetime import datetime
@@ -41,11 +40,10 @@ class Results(object):
             # Keep results creation date
             "creation_date": datetime.now(),
         }
-        repertory_results = os.path.join(repertory, "resultats")
+        filelist = [f for f in os.listdir(self._repertory)
-        self._pollutants_list = [
+                    if os.path.isfile(os.path.join(self._repertory, f))
-            el.split("/")[-1][0:-4]
-            for el in glob.glob(repertory_results + "/*.bin")
                     ]
+        self._pollutants_list = [f[0:-4] for f in filelist if f[-4:] == ".bin"]
         self._pollutants_list.insert(0, self._pollutants_list.pop(
             self._pollutants_list.index("total_sediment"))
         )

src/Model/Results/River/River.py

@@ -57,7 +57,10 @@ class Profile(object):
         )
 
     def get_ts_key(self, timestamp, key):
+        if timestamp in self._data:
+            if key in self._data[timestamp]:
                 return self._data[timestamp][key]
+        return None
 
     def has_sediment(self):
         return any(map(lambda ts: "sl" in self._data[ts], self._data))
@@ -74,6 +77,12 @@ class Reach(object):
             )
         )
 
+        self._profile_mask = list(
+            map(
+                lambda p: p.name[0:8] != 'interpol', self._profiles
+            )
+        )
+
     def __len__(self):
         return len(self._profiles)
 
@@ -89,6 +98,10 @@ class Reach(object):
     def profiles(self):
         return self._profiles.copy()
 
+    @property
+    def profile_mask(self):
+        return self._profile_mask
+
     def profile(self, id):
         return self._profiles[id]
 

src/Model/SedimentLayer/SedimentLayer.py

@@ -277,6 +277,7 @@ class SedimentLayer(SQLSubModel):
             "FROM sedimentary_layer "
         )
 
+        if table is not None:
             for row in table:
                 sl = cls(
                     id=row[0],

src/Model/Study.py

@@ -276,6 +276,7 @@ class Study(SQLModel):
         version = new.execute(
             "SELECT value FROM info WHERE key='study_release'"
         )
+        if version is not None:
             new.status.version = int(version[0])
 
         # TODO: Load metadata

src/Solver/AdisTS.py

@@ -17,7 +17,6 @@
 # -*- coding: utf-8 -*-
 
 import os
-import glob
 import logging
 
 import numpy as np
@@ -129,9 +128,9 @@ class AdisTS(CommandLineSolver):
                     repertory, f"{name}.REP"
                 ), "w+"
         ) as f:
-
+            path = os.path.join("..", mage_rep, name)
-            f.write(f"NET ../{mage_rep}/{name}.NET\n")
+            f.write(f"NET {path}.NET\n")
-            f.write(f"REP ../{mage_rep}/{name}.REP\n")
+            f.write(f"REP {path}.REP\n")
 
             for file in files:
                 EXT = file.split('.')[1]
@@ -141,7 +140,7 @@ class AdisTS(CommandLineSolver):
 
         path_mage_net = os.path.join(os.path.abspath(
                 os.path.join(repertory, os.pardir)
-        ), f"{mage_rep}/net")
+        ), os.path.join(mage_rep, "net"))
         path_adists_net = os.path.join(repertory, "net")
 
         if os.path.exists(path_mage_net):
@@ -620,15 +619,15 @@ class AdisTSwc(AdisTS):
     @timer
     def read_bin(self, study, repertory, results, qlog=None, name="0"):
 
-        repertory_results = os.path.join(repertory, "resultats")
+        filelist = [f for f in os.listdir(repertory)
-
+                    if os.path.isfile(os.path.join(repertory, f))
-        files_bin_names = [el.split("/")[-1]
+                    ]
-                           for el in glob.glob(repertory_results+"/*.bin")]
+        files_bin_names = [f for f in filelist if f[-4:] == ".bin"]
         files_bin_names.insert(0, files_bin_names.pop(
             files_bin_names.index("total_sediment.bin"))
         )
 
-        ifilename = os.path.join(repertory_results, files_bin_names[0])
+        ifilename = os.path.join(repertory, files_bin_names[0])
 
         logger.info(f"read_bin: Start reading '{ifilename}' ...")
 
@@ -725,12 +724,12 @@ class AdisTSwc(AdisTS):
         def ip_to_ri(r, i): return i - reach_offset[r]
 
         path_files = map(lambda file: os.path.join(
-            repertory_results, file), files_bin_names)
+            repertory, file), files_bin_names)
 
         data_tmp = {}
 
         for file_bin in path_files:
-            key_pol = file_bin.split("/")[-1][0:-4]
+            key_pol = os.path.basename(file_bin)[0:-4]
             data_tmp[key_pol] = {}
             with open(file_bin, 'rb') as f:
                 # header
@@ -833,8 +832,6 @@ class AdisTSwc(AdisTS):
         if name is None:
             name = study.name.replace(" ", "_")
 
-        print("adist ts results repertory: ", repertory)
-
         results = super(AdisTSwc, self).results(study,
                                                 repertory,
                                                 qlog,
@@ -852,15 +849,23 @@ class AdisTSwc(AdisTS):
 
     def rm_previous_results(self, study, repertory, qlog):
 
-        if "resultats" not in os.listdir(repertory):
+        if "resultats" in os.listdir(repertory):
+            repertory_results = os.path.join(repertory, "resultats")
+        else:
+            repertory_results = os.path.normpath(repertory)
+
+        if not os.path.isdir(repertory_results):
             return
 
-        repertory_results = os.path.join(repertory, "resultats")
+        filelist = [f for f in os.listdir(repertory_results)
+                    if os.path.isfile(os.path.join(repertory_results, f))
+                    ]
+        files_bin_names = [f for f in filelist if f[-4:] == ".bin"]
+        if len(files_bin_names) < 1:
+            return
 
-        files_bin_names = [el.split("/")[-1]
+        for el in files_bin_names:
-                           for el in glob.glob(repertory_results+"/*.bin")]
+            os.remove(os.path.join(repertory_results, el))
-        for el in glob.glob(repertory_results+"/*.bin"):
-            os.remove(el)
 
     @timer
     def export(self, study, repertory, mage_rep, qlog=None, name="0"):

src/Solver/Mage.py

@@ -135,7 +135,7 @@ class Mage(CommandLineSolver):
         )
 
         for line in lines:
-            rep_file.write(line.line)
+            rep_file.write(line.line+"\n")
 
     def _export_ST(self, study, repertory, qlog, name="0"):
         files = []
@@ -717,7 +717,7 @@ class Mage(CommandLineSolver):
     # RESULTS #
     ###########
 
-    def read_bin(self, study, repertory, results, qlog=None, name="0"):
+    def read_bin(self, study, fname, results, qlog=None, name="0"):
         return
 
     @timer
@@ -728,7 +728,16 @@ class Mage(CommandLineSolver):
             repertory=repertory,
             name=name,
         )
-        self.read_bin(study, repertory, results, qlog, name=name)
+        fname = os.path.join(repertory, f"{name}.BIN")
+        if not os.path.isfile(fname):
+            logger.info(f"Result file {name}.BIN does not exist")
+            return None
+        try:
+            self.read_bin(study, fname, results, qlog, name=name)
+        except Exception as e:
+            logger.error(f"Failed to read results")
+            logger_exception(e)
+            return None
 
         return results
 
@@ -934,8 +943,7 @@ class Mage8(Mage):
     ###########
 
     @timer
-    def read_bin(self, study, repertory, results, qlog=None, name="0"):
+    def read_bin(self, study, fname, results, qlog=None, name="0"):
-        fname = os.path.join(repertory, f"{name}.BIN")
         logger.info(f"read_bin: Start reading '{fname}' ...")
 
         with mage_file_open(fname, "r") as f:
@@ -986,6 +994,7 @@ class Mage8(Mage):
 
             reachs = []
             iprofiles = {}
+            profile_len = []
             reach_offset = {}
 
             data = read_int(2*nb_reach)
@@ -1005,6 +1014,7 @@ class Mage8(Mage):
 
                 # Profile ID offset
                 reach_offset[r] = i1
+                profile_len.append(i2-i1+1)
 
             logger.debug(f"read_bin: iprofiles = {iprofiles}")
 
@@ -1033,6 +1043,15 @@ class Mage8(Mage):
             ]
             def ip_to_ri(r, i): return i - reach_offset[r]
 
+            # check results and geometry consistency
+            for i, r in enumerate(reachs):
+                lp = len(r.profiles)
+                pl = profile_len[i]
+                if lp != pl:
+                    logger.warning(f"geometry reach {i} has {lp} profiles")
+                    logger.warning(f"results reach {i} has {pl} values")
+                    return
+
             ts = set()
             end = False
             while not end:
@@ -1042,7 +1061,7 @@ class Mage8(Mage):
                     f, dtype=np.byte, count=1)).decode()
                 data = read_float(n)
 
-                logger.debug(f"read_bin: timestamp = {timestamp} sec")
+                # logger.debug(f"read_bin: timestamp = {timestamp} sec")
                 ts.add(timestamp)
 
                 if key in ["Z", "Q"]:
@@ -1066,7 +1085,6 @@ class Mage8(Mage):
                 endline()
                 end = newline().size <= 0
 
-            logger.debug(reachs[0].profiles[0]._data)
             results.set("timestamps", ts)
             ts_list = sorted(ts)
             logger.info(f"compute tab...")
@@ -1265,6 +1283,8 @@ class Mage8(Mage):
             name = study.name.replace(" ", "_")
 
         results = super(Mage8, self).results(study, repertory, qlog, name=name)
+        if results is None:
+            return None
         if with_gra:
             self.read_gra(study, repertory, results, qlog, name=name)
 

src/Solver/RubarBE.py

@@ -74,10 +74,10 @@ class Rubar3(CommandLineSolver):
             ("rubarbe_tf_5", "y"),
             ("rubarbe_tf_6", "n"),
             ("rubarbe_trased", "y"),
-            ("rubarbe_optfpc", "0"),
+            # ("rubarbe_optfpc", "0"),
-            ("rubarbe_ros", "2650.0"),
+            # ("rubarbe_ros", "2650.0"),
-            ("rubarbe_dm", "0.1"),
+            # ("rubarbe_dm", "0.1"),
-            ("rubarbe_segma", "1.0"),
+            # ("rubarbe_segma", "1.0"),
             # Sediment parameters
             ("rubarbe_sediment_ros", "2650.0"),
             ("rubarbe_sediment_por", "0.4"),
@@ -167,7 +167,7 @@ class Rubar3(CommandLineSolver):
             it = iter(params)
 
             line = 0
-            while line < 29:
+            while line < 25:
                 param = next(it)
                 name = param.name
                 value = param.value
@@ -277,19 +277,20 @@ class Rubar3(CommandLineSolver):
 
                     f.write(f"{ind:>4} {rk:>11.3f} {n_points:>4}\n")
 
-                    for point in profile.points:
+                    station = profile.get_station()
+                    for i, point in enumerate(profile.points):
                         label = point.name.lower()
                         if label != "":
                             if label[0] == "r":
                                 label = label[1].upper()
                             else:
-                                label = label[1].upper()
+                                label = " "
                         else:
                             label = " "
 
-                        y = point.y
+                        y = station[i]
                         z = point.z
-                        dcs = 0.001
+                        dcs = 1.0
                         scs = 1.0
                         tmcs = 0.0
 
@@ -444,10 +445,10 @@ class Rubar3(CommandLineSolver):
         z = data[profile.rk][0]
         q = data[profile.rk][1]
 
-        # height = z - profile.z_min()
+        height = z - profile.z_min()
         speed = profile.speed(q, z)
 
-        return z, speed
+        return height, speed
 
     def _export_hydro(self, study, repertory, qlog, name="0"):
         if qlog is not None:
@@ -470,7 +471,7 @@ class Rubar3(CommandLineSolver):
             for bc in bcs:
                 f.write(f"{len(bc)}\n")
                 for d0, d1 in bc.data:
-                    f.write(f"{d0} {d1}\n")
+                    f.write(f"{d1} {d0}\n")
 
     def _export_condav(self, study, repertory, qlog, name="0"):
         if qlog is not None:
@@ -493,7 +494,7 @@ class Rubar3(CommandLineSolver):
             for bc in bcs:
                 f.write(f"{len(bc)}\n")
                 for d0, d1 in bc.data:
-                    f.write(f"{d0} {d1}\n")
+                    f.write(f"{d1} {d0}\n")
 
 
 class RubarBE(Rubar3):

src/Solver/Solvers.py

@@ -34,7 +34,7 @@ solver_long_name = {
     # "mage_fake7": "Mage fake v7",
     "adistswc": "Adis-TS_WC",
     # "rubarbe": "RubarBE",
-    # "rubar3": "Rubar3",
+    "rubar3": "Rubar3",
 }
 
 solver_type_list = {
@@ -44,5 +44,5 @@ solver_type_list = {
     # "mage_fake7": MageFake7,
     "adistswc": AdisTSwc,
     # "rubarbe": RubarBE,
-    # "rubar3": Rubar3,
+    "rubar3": Rubar3,
 }

src/View/BoundaryCondition/Edit/Table.py

@@ -211,3 +211,26 @@ class TableModel(PamhyrTableModel):
         )
         self.layoutAboutToBeChanged.emit()
         self.update()
+
+    def read_from_file(self, file_name, bctype):
+
+        logger.debug(f"Import boundary conditions from {file_name}")
+        data0 = []
+        data1 = []
+        if bctype == "ZD":
+            mult = 1
+        else:
+            mult = 60
+        with open(file_name, encoding="utf-8") as bc_file:
+            for line in bc_file:
+                if not (line.startswith("#") or
+                        line.startswith("*") or
+                        line.startswith("$")):
+                    line = line.split()
+                    if bctype == "ZD":
+                        data0.append(float(line[0]))
+                    else:
+                        data0.append(old_pamhyr_date_to_timestamp(line[0]))
+                    data1.append(line[1])
+
+        self.replace_data(data0, data1)

src/View/BoundaryCondition/Edit/Window.py

@@ -30,10 +30,10 @@ from PyQt5.QtGui import (
     QKeySequence,
 )
 
-from PyQt5 import QtCore
+from PyQt5 import QtCore, QtWidgets
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel, QCoreApplication,
-    pyqtSlot, pyqtSignal,
+    pyqtSlot, pyqtSignal, QSettings,
 )
 
 from PyQt5.QtWidgets import (
@@ -198,6 +198,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
         self.find(QAction, "action_add").triggered.connect(self.add)
         self.find(QAction, "action_del").triggered.connect(self.delete)
         self.find(QAction, "action_sort").triggered.connect(self.sort)
+        self.find(QAction, "action_import").triggered\
+                                           .connect(self.import_from_file)
         self.find(QAction, "action_generate_uniform").triggered.connect(
             self.generate_uniform
             )
@@ -293,6 +295,31 @@ class EditBoundaryConditionWindow(PamhyrWindow):
         self._table.sort(False)
         self.plot.update()
 
+    def import_from_file(self):
+        options = QFileDialog.Options()
+        settings = QSettings(QSettings.IniFormat,
+                             QSettings.UserScope, 'MyOrg', )
+        options |= QFileDialog.DontUseNativeDialog
+
+        if self._data.bctype == "TD":
+            file_types = [self._trad["file_hyd"]]
+        if self._data.bctype == "TZ":
+            file_types = [self._trad["file_lim"]]
+        if self._data.bctype == "ZD":
+            file_types = [self._trad["file_ava"]]
+        file_types.append(self._trad["file_all"])
+
+        file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
+            self,
+            self._trad["open_file"],
+            "",
+            ";; ".join(file_types),
+            options=options
+        )
+
+        if file_name != "":
+            self._table.read_from_file(file_name, self._data.bctype)
+
     def move_up(self):
         row = self.index_selected_row()
         self._table.move_up(row)
@@ -372,8 +399,12 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             if strickler is None:
                 strickler = 25.0
             height = [(i)*(z_max-z_min)/50 for i in range(51)]
-            q = [((profile.wet_width(z_min + h) * 0.8) * strickler
+            # q = [((profile.wet_width(z_min + h) * 0.8) * strickler
-                  * (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
+            #      * (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
+            #      for h in height]
+            q = [profile.wet_area(z_min + h) * strickler
+                 * (profile.wet_radius(z_min + h) ** (2/3))
+                 * (abs(self.slope_value) ** (0.5))
                  for h in height]
             for i in range(len(height)):
                 height[i] += z_min

src/View/BoundaryCondition/Edit/translate.py

@@ -35,6 +35,17 @@ class BCETranslate(BCTranslate):
         self._dict["Boundary Condition Options"] = _translate(
             "BoundaryCondition", "Boundary Condition Options")
 
+        self._dict["open_file"] = _translate(
+            "BoundaryCondition", "Open a file")
+        self._dict["file_hyd"] = _translate(
+            "BoundaryCondition", "Mage hydrograph file (*.HYD)")
+        self._dict["file_lim"] = _translate(
+            "BoundaryCondition", "Mage limnigraph file (*.LIM)")
+        self._dict["file_ava"] = _translate(
+            "BoundaryCondition", "Mage rating curve file (*.AVA)")
+        self._dict["file_all"] = _translate(
+            "BoundaryCondition", "All files (*)")
+
         self._sub_dict["table_headers"] = {
             "x": _translate("BoundaryCondition", "X"),
             "y": _translate("BoundaryCondition", "Y"),

src/View/BoundaryConditionsAdisTS/Edit/Table.py

@@ -41,7 +41,7 @@ from PyQt5.QtWidgets import (
 )
 
 from View.BoundaryConditionsAdisTS.Edit.UndoCommand import (
-    AddCommand, DelCommand, SetDataCommand,
+    AddCommand, DelCommand, SetDataCommand, PasteCommand, SortCommand,
 )
 
 _translate = QCoreApplication.translate
@@ -118,3 +118,40 @@ class TableModel(PamhyrTableModel):
         )
 
         self.endRemoveRows()
+
+    def sort(self, _reverse, parent=QModelIndex()):
+        self.layoutAboutToBeChanged.emit()
+
+        self._undo.push(
+            SortCommand(
+                self._data, _reverse
+            )
+        )
+
+        self.layoutAboutToBeChanged.emit()
+        self.update()
+
+    def paste(self, row, header, data):
+        if len(data) == 0:
+            return
+
+        self.layoutAboutToBeChanged.emit()
+
+        self._undo.push(
+            PasteCommand(
+                self._data, row,
+                list(
+                    map(
+                        lambda d: self._data.new_from_data(header, d),
+                        data
+                    )
+                )
+            )
+        )
+
+        self.layoutAboutToBeChanged.emit()
+        self.update()
+
+    def update(self):
+        # self.auto_sort()
+        self.layoutChanged.emit()

src/View/BoundaryConditionsAdisTS/Edit/UndoCommand.py

@@ -38,29 +38,14 @@ class SetDataCommand(QUndoCommand):
         self._data = data
         self._index = index
         self._column = column
-        self._old = self._data._data[self._index][self._column]
+        self._old = self._data.get_i(self._index)[self._column]
-        _type = self._data._types[self._column]
+        self._new = new_value
-        self._new = _type(new_value)
 
     def undo(self):
-        if self._column == 0:
+        self._data._set_i_c_v(self._index, self._column, self._old)
-            self._data._data[self._index] = (
-                self._old, self._data._data[self._index][1]
-            )
-        else:
-            self._data._data[self._index] = (
-                self._data._data[self._index][0], self._old
-            )
 
     def redo(self):
-        if self._column == 0:
+        self._data._set_i_c_v(self._index, self._column, self._new)
-            self._data._data[self._index] = (
-                self._new, self._data._data[self._index][1]
-            )
-        else:
-            self._data._data[self._index] = (
-                self._data._data[self._index][0], self._new
-            )
 
 
 class AddCommand(QUndoCommand):
@@ -76,11 +61,11 @@ class AddCommand(QUndoCommand):
 
     def redo(self):
         if self._new is None:
-            self._new = self._data._data.insert(self._index, (
+            self._new = self._data.insert(self._index, (
                 self._data._types[0](0), self._data._types[1](0.0)
             ))
         else:
-            self._data._data.insert(self._index, self._new)
+            self._data.insert(self._index, self._new)
 
 
 class DelCommand(QUndoCommand):
@@ -97,8 +82,57 @@ class DelCommand(QUndoCommand):
 
     def undo(self):
         for row, el in self._bc:
-            self._data._data.insert(row, el)
+            self._data.insert(row, el)
 
     def redo(self):
-        for row in self._rows:
+        self._data.delete_i(self._rows)
-            del self._data._data[row]
+
+
+class PasteCommand(QUndoCommand):
+    def __init__(self, data, row, bcs):
+        QUndoCommand.__init__(self)
+
+        self._data = data
+        self._row = row
+        self._bcs = bcs
+        self._bcs.reverse()
+
+    def undo(self):
+        self._data.delete_i(
+            range(self._row, self._row + len(self._bcs))
+        )
+
+    def redo(self):
+        for bc in self._bcs:
+            self._data.insert(self._row, bc)
+
+
+class SortCommand(QUndoCommand):
+    def __init__(self, data, _reverse):
+        QUndoCommand.__init__(self)
+
+        self._data = data
+        self._reverse = _reverse
+
+        self._old = self._data.data
+        self._indexes = None
+
+    def undo(self):
+        ll = self._data.data
+        self._data.sort(
+            key=lambda x: self._indexes[ll.index(x)]
+        )
+
+    def redo(self):
+        self._data.sort(
+            _reverse=self._reverse,
+            key=lambda x: x[0]
+        )
+        if self._indexes is None:
+            self._indexes = list(
+                map(
+                    lambda p: self._old.index(p),
+                    self._data.data
+                )
+            )
+            self._old = None

src/View/BoundaryConditionsAdisTS/Edit/Window.py

@@ -143,7 +143,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
     def setup_connections(self):
         self.find(QAction, "action_add").triggered.connect(self.add)
         self.find(QAction, "action_del").triggered.connect(self.delete)
-
+        self.find(QAction, "action_sort").triggered.connect(self.sort)
         self._table.dataChanged.connect(self.update)
 
     def update(self):
@@ -200,6 +200,22 @@ class EditBoundaryConditionWindow(PamhyrWindow):
 
         self.copyTableIntoClipboard(table)
 
+    def _paste(self):
+        header, data = self.parseClipboardTable()
+
+        logger.debug(f"paste: h:{header}, d:{data}")
+
+        if len(data) == 0:
+            return
+
+        row = 0
+        rows = self.index_selected_rows()
+        if len(rows) != 0:
+            row = rows[0]
+
+        self._table.paste(row, header, data)
+        self.plot.update()
+
     def _undo(self):
         self._table.undo()
         self.plot.update()

src/View/BoundaryConditionsAdisTS/Table.py

@@ -119,17 +119,10 @@ class TableModel(PamhyrTableModel):
 
         super(TableModel, self).__init__(trad=trad, **kwargs)
 
-    def _setup_lst(self):
-        self._lst = self._bc_list.lst
-
     def rowCount(self, parent):
-        return len(self._lst)
+        return len(self._bc_list)
 
     def data(self, index, role):
-        if len(self._lst) != 0:
-            data = self._lst
-        else:
-            data = []
 
         if role != Qt.ItemDataRole.DisplayRole:
             return QVariant()
@@ -138,12 +131,12 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         if self._headers[column] == "type":
-            n = data[row].type
+            n = self._bc_list.get(row).type
             if n is None or n == "":
                 return self._trad["not_associated"]
             return n
         elif self._headers[column] == "node":
-            n = data[row].node
+            n = self._bc_list.get(row).node
             if n is None:
                 return self._trad["not_associated"]
             tmp = next(filter(lambda x: x.id == n, self._data._nodes), None)
@@ -152,7 +145,7 @@ class TableModel(PamhyrTableModel):
             else:
                 return self._trad["not_associated"]
         elif self._headers[column] == "pol":
-            n = data[row].pollutant
+            n = self._bc_list.get(row).pollutant
             if n is None or n == "not_associated" or n == "":
                 return self._trad["not_associated"]
             tmp = next(filter(lambda x: x.id == n,
@@ -177,20 +170,20 @@ class TableModel(PamhyrTableModel):
             if self._headers[column] == "type":
                 self._undo.push(
                     SetTypeCommand(
-                        self._lst, row, value
+                        self._bc_list, row, value
                     )
                 )
             elif self._headers[column] == "node":
                 self._undo.push(
                     SetNodeCommand(
-                        self._lst, row, self._data.node(value)
+                        self._bc_list, row, self._data.node(value)
                     )
                 )
             elif self._headers[column] == "pol":
                 if value == self._trad["not_associated"]:
                     self._undo.push(
                         SetPolCommand(
-                            self._lst, row, None
+                            self._bc_list, row, None
                         )
                     )
                 else:
@@ -199,7 +192,7 @@ class TableModel(PamhyrTableModel):
                                )
                     self._undo.push(
                         SetPolCommand(
-                            self._lst, row, pol.id
+                            self._bc_list, row, pol.id
                         )
                     )
         except Exception as e:
@@ -214,7 +207,7 @@ class TableModel(PamhyrTableModel):
 
         self._undo.push(
             AddCommand(
-                self._pollutant, self._bc_list, self._lst, row
+                self._pollutant, self._bc_list, row
             )
         )
 
@@ -226,7 +219,7 @@ class TableModel(PamhyrTableModel):
 
         self._undo.push(
             DelCommand(
-                self._lst, rows
+                self._bc_list, rows
             )
         )
 

src/View/BoundaryConditionsAdisTS/UndoCommand.py

@@ -35,14 +35,14 @@ class SetNodeCommand(QUndoCommand):
 
         self._bcs = bcs
         self._index = index
-        self._old = self._bcs[self._index].node
+        self._old = self._bcs.get(self._index).node
         self._new = node.id
 
     def undo(self):
-        self._bcs[self._index].node = self._old
+        self._bcs.get(self._index).node = self._old
 
     def redo(self):
-        self._bcs[self._index].node = self._new
+        self._bcs.get(self._index).node = self._new
 
 
 class SetTypeCommand(QUndoCommand):
@@ -52,14 +52,14 @@ class SetTypeCommand(QUndoCommand):
         self._bcs = bcs
         self._index = index
         self._type = _type
-        self._old = self._bcs[self._index].type
+        self._old = self._bcs.get(self._index).type
         self._new = self._type
 
     def undo(self):
-        self._bcs[self._index].type = self._old
+        self._bcs.get(self._index).type = self._old
 
     def redo(self):
-        self._bcs[self._index].type = self._new
+        self._bcs.get(self._index).type = self._new
 
 
 class SetPolCommand(QUndoCommand):
@@ -68,32 +68,31 @@ class SetPolCommand(QUndoCommand):
 
         self._bcs = bcs
         self._index = index
-        self._old = self._bcs[self._index].pollutant
+        self._old = self._bcs.get(self._index).pollutant
         self._new = pollutant
 
     def undo(self):
-        self._bcs[self._index].pollutant = self._old
+        self._bcs.get(self._index).pollutant = self._old
 
     def redo(self):
-        self._bcs[self._index].pollutant = self._new
+        self._bcs.get(self._index).pollutant = self._new
 
 
 class AddCommand(QUndoCommand):
-    def __init__(self, pollutant, bcs_list, bcs, index):
+    def __init__(self, pollutant, bcs, index):
         QUndoCommand.__init__(self)
 
         self._bcs = bcs
-        self._bc_list = bcs_list
         self._pollutant = pollutant
         self._index = index
         self._new = None
 
     def undo(self):
-        del self._bcs[self._index]
+        self._bcs.delete_i([self._index])
 
     def redo(self):
         if self._new is None:
-            self._new = self._bc_list.new(self._index, self._pollutant)
+            self._new = self._bcs.new(self._index, self._pollutant)
         else:
             self._bcs.insert(self._index, self._new)
 
@@ -107,7 +106,7 @@ class DelCommand(QUndoCommand):
 
         self._bc = []
         for row in rows:
-            self._bc.append((row, self._bcs[row]))
+            self._bc.append((row, self._bcs.get(row)))
         self._bc.sort()
 
     def undo(self):
@@ -115,5 +114,4 @@ class DelCommand(QUndoCommand):
             self._bcs.insert(row, el)
 
     def redo(self):
-        for row in self._rows:
+        self._bcs.delete_i(self._rows)
-            del self._bcs[row]

src/View/BoundaryConditionsAdisTS/Window.py

@@ -180,7 +180,10 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
     def edit(self):
         rows = self.index_selected_rows()
         for row in rows:
-            data = self._bcs.lst[row]
+            data = self._bcs.get(row)
+
+            if data.node is None:
+                continue
 
             if self.sub_window_exists(
                 EditBoundaryConditionWindow,

src/View/D90AdisTS/Table.py

@@ -130,29 +130,29 @@ class D90TableModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] is "name":
+        if self._headers[column] == "name":
             n = self._lst[row].name
             if n is None or n == "":
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "reach":
+        elif self._headers[column] == "reach":
             n = self._lst[row].reach
             if n is None:
                 return self._trad['not_associated']
             return next(filter(
                 lambda edge: edge.id == n, self._river.edges()
             )).name
-        elif self._headers[column] is "start_rk":
+        elif self._headers[column] == "start_rk":
             n = self._lst[row].start_rk
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "end_rk":
+        elif self._headers[column] == "end_rk":
             n = self._lst[row].end_rk
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "d90":
+        elif self._headers[column] == "d90":
             n = self._lst[row].d90
             if n is None:
                 return self._trad['not_associated']
@@ -175,7 +175,6 @@ class D90TableModel(PamhyrTableModel):
                     )
                 )
             elif self._headers[column] == "reach":
-                print(self._river.edge(value).id)
                 self._undo.push(
                     SetCommandSpec(
                         self._lst, row, self._headers[column],

src/View/D90AdisTS/Window.py

@@ -279,9 +279,7 @@ class D90AdisTSWindow(PamhyrWindow):
             self._table_spec.add(rows[0])
 
     def delete(self):
-        print("del")
         rows = self.index_selected_rows()
         if len(rows) == 0:
-            print("len 0")
             return
         self._table_spec.delete(rows)

src/View/DIFAdisTS/Table.py

@@ -132,39 +132,39 @@ class DIFTableModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] is "method":
+        if self._headers[column] == "method":
             n = self._lst[row].method
             if n is None or n == "":
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "reach":
+        elif self._headers[column] == "reach":
             n = self._lst[row].reach
             if n is None:
                 return self._trad['not_associated']
             return next(filter(
                 lambda edge: edge.id == n, self._river.edges()
             )).name
-        elif self._headers[column] is "start_rk":
+        elif self._headers[column] == "start_rk":
             n = self._lst[row].start_rk
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "end_rk":
+        elif self._headers[column] == "end_rk":
             n = self._lst[row].end_rk
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "dif":
+        elif self._headers[column] == "dif":
             n = self._lst[row].dif
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "b":
+        elif self._headers[column] == "b":
             n = self._lst[row].b
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "c":
+        elif self._headers[column] == "c":
             n = self._lst[row].c
             if n is None:
                 return self._trad['not_associated']

src/View/DIFAdisTS/TableDefault.py

@@ -55,22 +55,22 @@ class DIFTableDefaultModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] is "method":
+        if self._headers[column] == "method":
             n = self._data[row].method
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "dif":
+        elif self._headers[column] == "dif":
             n = self._data[row].dif
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "b":
+        elif self._headers[column] == "b":
             n = self._data[row].b
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "c":
+        elif self._headers[column] == "c":
             n = self._data[row].c
             if n is None:
                 return self._trad['not_associated']

src/View/Frictions/Table.py

@@ -38,7 +38,7 @@ from View.Frictions.UndoCommand import (
     SetNameCommand, SetBeginCommand, SetEndCommand,
     SetBeginStricklerCommand, SetEndStricklerCommand,
     AddCommand, DelCommand, SortCommand,
-    MoveCommand, PasteCommand, DuplicateCommand,
+    MoveCommand, PasteCommand, DuplicateCommand, ReplaceDataCommand,
 )
 
 from View.Tools.PamhyrTable import PamhyrTableModel
@@ -99,7 +99,7 @@ class ComboBoxDelegate(QItemDelegate):
         self.commitData.emit(self.sender())
 
 
-class TableModel(PamhyrTableModel):
+class FrictionTableModel(PamhyrTableModel):
     def _setup_lst(self):
         self._lst = self._data.frictions
         self._study = self._opt_data
@@ -199,6 +199,18 @@ class TableModel(PamhyrTableModel):
         self.endRemoveRows()
         self.layoutChanged.emit()
 
+    def replace_data(self, new_data):
+        self.layoutAboutToBeChanged.emit()
+
+        self._undo.push(
+            ReplaceDataCommand(
+                self._lst, new_data
+            )
+        )
+
+        self.layoutAboutToBeChanged.emit()
+        self.layoutChanged.emit()
+
     def sort(self, _reverse, parent=QModelIndex()):
         self.layoutAboutToBeChanged.emit()
 
@@ -252,3 +264,32 @@ class TableModel(PamhyrTableModel):
     def redo(self):
         self._undo.redo()
         self.layoutChanged.emit()
+
+    def read_from_file(self, file_name):
+
+        reach_id = self._study.river.enable_edges().index(self._data) + 1
+
+        logger.debug(f"Import frictions from {file_name}")
+        data = []
+        with open(file_name, encoding="utf-8") as rug_file:
+            for line in rug_file:
+                if line.upper().startswith("K"):
+                    if int(line[1:4]) == reach_id:
+                        data.append(line[4:].split())
+
+        new_data = []
+        for d in data:
+            new = None
+            minor = float(d[2])
+            medium = float(d[3])
+            for s in self._study.river.stricklers.stricklers:
+                if s.minor == minor and s.medium == medium:
+                    new = s
+                    break
+            if new is None:
+                new = self._study.river.stricklers.new(len(
+                    self._study.river.stricklers))
+                new.minor = minor
+                new.medium = medium
+            new_data.append([self._data, float(d[0]), float(d[1]), new, new])
+        self.replace_data(new_data)

src/View/Frictions/UndoCommand.py

@@ -143,6 +143,42 @@ class AddCommand(QUndoCommand):
             self._frictions.insert(self._index, self._new)
 
 
+class ReplaceDataCommand(QUndoCommand):
+    def __init__(self, frictions, new_data):
+        QUndoCommand.__init__(self)
+
+        self._frictions = frictions
+        self._new_data = new_data
+        self._old_rows = list(range(len(frictions)))
+        self._new_rows = list(range(len(new_data)))
+        self._new = []
+
+        self._old_friction = []
+        for row in self._old_rows:
+            self._old_friction.append((row, self._frictions.lst[row]))
+
+    def undo(self):
+        self._frictions.delete_i(self._new_rows)
+        for row, el in self._old_friction:
+            self._frictions.insert(row, el)
+
+    def redo(self):
+        if len(self._new) == 0:
+            self._frictions.delete_i(self._old_rows)
+            for row in self._new_rows:
+                new = self._frictions.new(row)
+                d = self._new_data[row]
+                new.edge = d[0]
+                new.begin_rk = d[1]
+                new.end_rk = d[2]
+                new.begin_strickler = d[3]
+                new.end_strickler = d[4]
+                self._new.append((row, new))
+        else:
+            for row, el in self._new:
+                self._frictions.insert(row, el)
+
+
 class DelCommand(QUndoCommand):
     def __init__(self, frictions, rows):
         QUndoCommand.__init__(self)

src/View/Frictions/Window.py

@@ -26,10 +26,11 @@ from PyQt5.QtGui import (
     QKeySequence,
 )
 
+from PyQt5 import QtWidgets
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
     QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
+    QRect, QSettings,
 )
 
 from PyQt5.QtWidgets import (
@@ -46,7 +47,7 @@ from View.Frictions.UndoCommand import (
 )
 
 from View.Frictions.Table import (
-    TableModel, ComboBoxDelegate
+    FrictionTableModel, ComboBoxDelegate
 )
 
 from View.Tools.Plot.PamhyrCanvas import MplCanvas
@@ -106,7 +107,7 @@ class FrictionsWindow(PamhyrWindow):
         )
 
         table = self.find(QTableView, f"tableView")
-        self._table = TableModel(
+        self._table = FrictionTableModel(
             table_view=table,
             table_headers=self._trad.get_dict("table_headers"),
             editable_headers=[
@@ -157,6 +158,8 @@ class FrictionsWindow(PamhyrWindow):
         self.plot_2.draw()
 
     def setup_connections(self):
+        self.find(QAction, "action_import").triggered\
+                                           .connect(self.import_from_file)
         self.find(QAction, "action_add").triggered.connect(self.add)
         self.find(QAction, "action_del").triggered.connect(self.delete)
         self.find(QAction, "action_sort").triggered.connect(self.sort)
@@ -265,3 +268,22 @@ class FrictionsWindow(PamhyrWindow):
             parent=self
         )
         strick.show()
+
+    def import_from_file(self):
+        options = QFileDialog.Options()
+        settings = QSettings(QSettings.IniFormat,
+                             QSettings.UserScope, 'MyOrg', )
+        options |= QFileDialog.DontUseNativeDialog
+
+        file_types = [self._trad["file_rug"], self._trad["file_all"]]
+
+        file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
+            self,
+            self._trad["open_file"],
+            "",
+            ";; ".join(file_types),
+            options=options
+        )
+
+        if file_name != "":
+            self._table.read_from_file(file_name)

src/View/Frictions/translate.py

@@ -38,6 +38,10 @@ class FrictionsTranslate(MainTranslate):
         self._dict["Edit frictions"] = _translate(
             "Frictions", "Edit frictions"
         )
+        self._dict["file_rug"] = _translate(
+            "Frictions", "Mage initial frictions file (*.RUG *.rug)")
+        self._dict["file_all"] = _translate(
+            "Frictions", "All files (*)")
 
         self._sub_dict["table_headers"] = {
             # "name": self._dict["name"],

src/View/Geometry/MeshingDialog.py

@@ -23,12 +23,12 @@ from PyQt5.QtGui import (
 )
 
 from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
+    Qt, QVariant, QAbstractTableModel, QItemSelectionModel,
 )
 
 from PyQt5.QtWidgets import (
     QDialogButtonBox, QComboBox, QUndoStack, QShortcut,
-    QDoubleSpinBox,
+    QDoubleSpinBox, QRadioButton,
 )
 
 
@@ -55,7 +55,7 @@ class MeshingDialog(PamhyrDialog):
         self._space_step = 50.0
         self._lplan = False
         self._lm = "3"
-        self._linear = False
+        self._linear = True
         self._begin_cs = -1
         self._end_cs = -1
         self._begin_dir = "un"
@@ -71,7 +71,7 @@ class MeshingDialog(PamhyrDialog):
         self._origin = self._reach.profile(0)
 
         self._init_default_values_profiles()
-        self._init_default_values_guidelines()
+        # self._init_default_values_guidelines()
 
         self.set_double_spin_box(
             "doubleSpinBox_space_step",
@@ -83,14 +83,24 @@ class MeshingDialog(PamhyrDialog):
         else:
             self.set_radio_button("radioButton_spline", True)
 
+        self.find(QRadioButton, "radioButton_spline").setEnabled(False)
+        self.find(QRadioButton, "radioButton_linear").setEnabled(False)
+
     def _init_default_values_profiles(self):
         profiles = self.profiles
 
         self.combobox_add_items("comboBox_begin_rk", profiles)
         self.combobox_add_items("comboBox_end_rk", profiles)
 
+        r = self.parent.tableView\
+                .selectionModel()\
+                .selectedRows()
+        if len(r) <= 1:
             self.set_combobox_text("comboBox_begin_rk", profiles[0])
             self.set_combobox_text("comboBox_end_rk", profiles[-1])
+        else:
+            self.set_combobox_text("comboBox_begin_rk", profiles[r[0].row()])
+            self.set_combobox_text("comboBox_end_rk", profiles[r[-1].row()])
 
     @property
     def profiles(self):
@@ -167,8 +177,8 @@ class MeshingDialog(PamhyrDialog):
         self._begin_cs = self.profiles.index(p1)
         self._end_cs = self.profiles.index(p2)
 
-        self._begin_dir = self.get_combobox_text("comboBox_begin_gl")
+        # self._begin_dir = self.get_combobox_text("comboBox_begin_gl")
-        self._end_dir = self.get_combobox_text("comboBox_end_gl")
+        # self._end_dir = self.get_combobox_text("comboBox_end_gl")
 
         super().accept()
 

src/View/Geometry/PlotAC.py

@@ -51,6 +51,11 @@ class PlotAC(PamhyrPlot):
         self.plot_selected = None
         self.next_plot_selected = None
 
+    @timer
+    def redraw(self, data):
+        self._data = data
+        self.draw()
+
     @timer
     def draw(self):
         self.init_axes()

src/View/Geometry/PlotRKZ.py

@@ -163,6 +163,11 @@ class PlotRKZ(PamhyrPlot):
             )
             self._table.scrollTo(self._table.model().index(ind2, 0))
 
+    @timer
+    def redraw(self, data):
+        self._data = data
+        self.draw()
+
     @timer
     def draw(self):
         self.init_axes()

src/View/Geometry/PlotXY.py

@@ -162,6 +162,11 @@ class PlotXY(PamhyrPlot):
             )
             self._table.scrollTo(self._table.model().index(ind2, 0))
 
+    @timer
+    def redraw(self, data):
+        self._data = data
+        self.draw()
+
     @timer
     def draw(self):
         self.init_axes()

src/View/Geometry/Table.py

@@ -169,7 +169,7 @@ class GeometryReachTableModel(PamhyrTableModel):
         self.layoutChanged.emit()
 
     def move_down(self, row, parent=QModelIndex()):
-        if row > self._data.number_profiles:
+        if row >= self._data.number_profiles-1:
             return
 
         target = row
@@ -276,3 +276,12 @@ class GeometryReachTableModel(PamhyrTableModel):
             )
         )
         self.layoutChanged.emit()
+
+    def change_reach(self, new_reach, parent):
+
+        self._undo.push(
+            ChangeReachCommand(
+                new_reach,
+                parent
+            )
+        )

src/View/Geometry/UndoCommand.py

@@ -22,14 +22,12 @@ from copy import deepcopy
 from tools import trace, timer, logger_exception
 
 from PyQt5.QtWidgets import (
-    QMessageBox, QUndoCommand, QUndoStack,
+    QMessageBox, QUndoCommand, QUndoStack, QTableView
 )
 
 from Model.Geometry import Reach
 from Model.Except import exception_message_box
 
-from Meshing.Mage import MeshingWithMage
-
 logger = logging.getLogger()
 
 
@@ -240,7 +238,7 @@ class MeshingCommand(QUndoCommand):
         self._mesher = mesher
         self._command = command
 
-        self._profiles = reach.profiles.copy()
+        self._profiles = [p.copy() for p in reach.profiles]
         self._profiles.reverse()
 
         self._new_profiles = None
@@ -264,7 +262,7 @@ class MeshingCommand(QUndoCommand):
                     **self._data
                 )
 
-            self._new_profiles = self._reach.profiles.copy()
+            self._new_profiles = [p.copy() for p in self._reach.profiles]
             self._new_profiles.reverse()
         else:
             self._reach.purge()
@@ -293,6 +291,35 @@ class PurgeCommand(QUndoCommand):
             profile.purge(self._np_purge)
 
 
+class ChangeReachCommand(QUndoCommand):
+    def __init__(self, new_reach, parent):
+        QUndoCommand.__init__(self)
+
+        self._old_reach = parent._study.river.current_reach()
+        self._new_reach = new_reach
+        self._parent = parent
+
+    def undo(self):
+        p = self._parent
+        p._reach = self._old_reach.reach
+        p._study.river.set_current_reach(self._old_reach)
+        p.setup_table()
+        p.update_redraw()
+        p.find(QTableView, "tableView").selectionModel()\
+                                       .selectionChanged\
+                                       .connect(p.select_current_profile)
+
+    def redo(self):
+        p = self._parent
+        p._reach = self._new_reach.reach
+        p._study.river.set_current_reach(self._new_reach)
+        p.setup_table()
+        p.update_redraw()
+        p.find(QTableView, "tableView").selectionModel()\
+                                       .selectionChanged\
+                                       .connect(p.select_current_profile)
+
+
 class ShiftCommand(QUndoCommand):
     def __init__(self, reach, rows, dx, dy, dz):
         QUndoCommand.__init__(self)

src/View/Geometry/Window.py

@@ -32,6 +32,7 @@ from PyQt5.QtGui import (
 from PyQt5.QtCore import (
     QModelIndex, Qt, QSettings, pyqtSlot,
     QItemSelectionModel, QCoreApplication, QSize,
+    QItemSelection, QItemSelectionRange,
 )
 from PyQt5.QtWidgets import (
     QApplication, QMainWindow, QFileDialog, QCheckBox,
@@ -47,9 +48,9 @@ from View.Tools.PamhyrWindow import PamhyrWindow
 from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
 from View.Tools.Plot.PamhyrCanvas import MplCanvas
 
-from Meshing.Mage import (
+from View.SelectReach.Window import SelectReachWindow
-    MeshingWithMage, MeshingWithMageMailleurTT
+
-)
+from Meshing.Internal import InternalMeshing
 
 from View.Geometry.Table import GeometryReachTableModel
 from View.Geometry.PlotXY import PlotXY
@@ -196,6 +197,7 @@ class GeometryWindow(PamhyrWindow):
             "action_update_rk": self.update_rk,
             "action_purge": self.purge,
             "action_shift": self.shift,
+            "action_select_reach": self.select_reach,
         }
 
         for action in actions:
@@ -217,9 +219,9 @@ class GeometryWindow(PamhyrWindow):
 
     def _update(self, redraw=False, propagate=True):
         if redraw:
-            self._plot_xy.draw()
+            self._plot_xy.redraw(data=self._reach)
-            self._plot_rkc.draw()
+            self._plot_rkc.redraw(data=self._reach)
-            self._plot_ac.draw()
+            self._plot_ac.redraw(data=self._reach)
 
         self.select_current_profile()
 
@@ -285,6 +287,13 @@ class GeometryWindow(PamhyrWindow):
         self.tableView.model().blockSignals(False)
 
     def edit_meshing(self):
+
+        rows = list(
+            set(
+                (i.row() for i in self.tableView.selectedIndexes())
+            )
+        )
+        selected_rk = [self._reach.profile(r).rk for r in rows]
         try:
             dlg = MeshingDialog(
                 reach=self._reach,
@@ -295,8 +304,6 @@ class GeometryWindow(PamhyrWindow):
                 data = {
                     "step": dlg.space_step,
                     "limites": [dlg.begin_cs, dlg.end_cs],
-                    "directrices": [dlg.begin_dir, dlg.end_dir],
-                    "lplan": dlg.lplan,
                     "linear": dlg.linear,
                 }
                 self._edit_meshing(data)
@@ -304,18 +311,29 @@ class GeometryWindow(PamhyrWindow):
             logger_exception(e)
             return
 
+        ind = []
+        for i in range(self._reach.number_profiles):
+            if self._reach.profile(i).rk in selected_rk:
+                ind.append(i)
+        self.tableView.setFocus()
+        selection = self.tableView.selectionModel()
+        index = QItemSelection()
+        if len(ind) > 0:
+            for i in ind:
+                index.append(QItemSelectionRange(self.tableView.model().index(i, 0)))
+            selection.select(
+                index,
+                QItemSelectionModel.Rows |
+                QItemSelectionModel.ClearAndSelect |
+                QItemSelectionModel.Select
+            )
+
     def _edit_meshing(self, data):
         try:
-            mesher = MeshingWithMageMailleurTT()
+            mesher = InternalMeshing()
             self._table.meshing(mesher, data)
         except Exception as e:
             logger_exception(e)
-            raise ExternFileMissingError(
-                module="mage",
-                filename="MailleurTT",
-                path=MeshingWithMageMailleurTT._path(),
-                src_except=e
-            )
 
     def update_rk(self):
         try:
@@ -535,6 +553,20 @@ class GeometryWindow(PamhyrWindow):
             logger_exception(e)
             return
 
+    def select_reach(self):
+        try:
+            dlg = SelectReachWindow(
+                study=self._study,
+                trad=self._trad,
+                parent=self
+            )
+            if dlg.exec():
+                self._table.change_reach(dlg.reach, self)
+
+        except Exception as e:
+            logger_exception(e)
+            return
+
     def duplicate(self):
         rows = [
             row.row() for row in

src/View/InitialConditions/Table.py

@@ -244,7 +244,7 @@ class InitialConditionTableModel(PamhyrTableModel):
         self.layoutAboutToBeChanged.emit()
         self.layoutChanged.emit()
 
-    def import_from_results(self, index, results):
+    def import_from_results(self, results):
         if results is None:
             logger.error("No results data")
             return
@@ -281,6 +281,51 @@ class InitialConditionTableModel(PamhyrTableModel):
         self.layoutAboutToBeChanged.emit()
         self.layoutChanged.emit()
 
+    def read_from_ini(self, file_name):
+
+        reach_id = self._data.river.enable_edges().index(self._reach) + 1
+
+        logger.debug(f"Import initial conditions from {file_name}")
+        data = []
+        with open(file_name, encoding="utf-8") as ini_file:
+            for line in ini_file:
+                if not (line.startswith("#") or
+                        line.startswith("*") or
+                        line.startswith("$")):
+                    line_split = line.split()
+                    formated = False
+                    if len(line_split[0]) > 3:
+                        formated = True
+                    elif  len(line_split[2]) > 10:
+                        formated = True
+                    elif  len(line_split[3]) > 11:
+                        formated = True
+                    elif  len(line_split[4]) > 9:
+                        formated = True
+
+                    if formated:  # old PamHyr format
+                        if int(line[1:4]) == reach_id:
+                            data.append([line[31:40],
+                                        line[10:20],
+                                        line[20:31]])
+                    else:
+                        if int(line_split[0]) == reach_id:
+                            data.append([line_split[4],
+                                        line_split[2],
+                                        line_split[3]])
+
+        self._undo.push(
+            ReplaceDataCommand(
+                self._lst,
+                list(
+                    map(
+                        lambda d: self._lst.new_from_data(*d),
+                        data
+                    )
+                )
+            )
+        )
+
     def undo(self):
         self._undo.undo()
         self.layoutChanged.emit()

src/View/InitialConditions/Window.py

@@ -23,6 +23,7 @@ from tools import trace, timer, logger_exception
 
 from View.Tools.PamhyrWindow import PamhyrWindow
 
+from PyQt5 import QtWidgets
 from PyQt5.QtGui import (
     QKeySequence,
 )
@@ -30,7 +31,7 @@ from PyQt5.QtGui import (
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
     QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
+    QRect, QSettings, QItemSelectionModel,
 )
 
 from PyQt5.QtWidgets import (
@@ -219,6 +220,8 @@ class InitialConditionsWindow(PamhyrWindow):
     def _update_plot(self):
         self.plot_1.draw()
         self.plot_2.draw()
+        self.plot_1.idle()
+        self.plot_2.idle()
 
     def _propagated_update(self, key=Modules(0)):
         if Modules.GEOMETRY not in key:
@@ -260,17 +263,33 @@ class InitialConditionsWindow(PamhyrWindow):
         self._update()
 
     def import_from_file(self):
-        workdir = os.path.dirname(self._study.filename)
+        options = QFileDialog.Options()
+        settings = QSettings(QSettings.IniFormat,
+                             QSettings.UserScope, 'MyOrg', )
+        options |= QFileDialog.DontUseNativeDialog
 
-        return self.file_dialog(
+        file_types = [
-            select_file="ExistingFile",
+            self._trad["file_bin"],
-            callback=lambda d: self._import_from_file(d[0]),
+            self._trad["file_ini"],
-            directory=workdir,
+            self._trad["file_all"],
-            default_suffix=".BIN",
+        ]
-            file_filter=["Mage (*.BIN)"],
+        file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
+            self,
+            self._trad["open_file"],
+            "",
+            ";; ".join(file_types),
+            options=options
         )
 
-    def _import_from_file(self, file_name):
+        if file_name != "":
+            size = os.stat(file_name).st_size
+            # self._table.import_geometry(0, file_name)
+            if file_name[-4:] == ".BIN":
+                self._import_from_bin_file(file_name)
+            elif file_name[-4:].upper() == ".INI":
+                self._import_from_ini_file(file_name)
+
+    def _import_from_bin_file(self, file_name):
         solver = Mage8("dummy")
         name = os.path.basename(file_name)\
                       .replace(".BIN", "")
@@ -292,13 +311,18 @@ class InitialConditionsWindow(PamhyrWindow):
         )
         dlg.exec_()
         results = self._tmp_results
+        if results.is_valid:
             self._import_from_results(results)
 
     def _import_from_results(self, results):
         logger.debug(f"import from results: {results}")
-        row = self.index_selected_row()
+        self._table.import_from_results(results)
+        self._update()
 
-        self._table.import_from_results(row, results)
+    def _import_from_ini_file(self, file_name):
+        logger.debug(f"import from INI file: {file_name}")
+        self._table.read_from_ini(file_name)
+        self._update()
 
     def move_up(self):
         row = self.index_selected_row()

src/View/InitialConditions/translate.py

@@ -34,6 +34,15 @@ class ICTranslate(MainTranslate):
         self._dict["discharge"] = self._dict["unit_discharge"]
         self._dict["rk"] = self._dict["unit_rk"]
 
+        self._dict["open_file"] = _translate(
+            "InitialCondition", "Open a file")
+        self._dict["file_bin"] = _translate(
+            "InitialCondition", "Mage results file (*.BIN)")
+        self._dict["file_ini"] = _translate(
+            "InitialCondition", "Mage initial conditions file (*.INI *.ini)")
+        self._dict["file_all"] = _translate(
+            "InitialCondition", "All files (*)")
+
         self._sub_dict["table_headers"] = {
             # "name": _translate("InitialCondition", "Name"),
             "rk": self._dict["unit_rk"],

src/View/InitialConditionsAdisTS/Table.py

@@ -129,49 +129,49 @@ class InitialConditionTableModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] is "name":
+        if self._headers[column] == "name":
             n = self._lst[row].name
             if n is None or n == "":
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "reach":
+        elif self._headers[column] == "reach":
             n = self._lst[row].reach
             if n is None:
                 return self._trad['not_associated']
             return next(filter(
                 lambda edge: edge.id == n, self._river.edges()
             )).name
-        elif self._headers[column] is "start_rk":
+        elif self._headers[column] == "start_rk":
             n = self._lst[row].start_rk
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "end_rk":
+        elif self._headers[column] == "end_rk":
             n = self._lst[row].end_rk
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "concentration":
+        elif self._headers[column] == "concentration":
             n = self._lst[row].concentration
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "eg":
+        elif self._headers[column] == "eg":
             n = self._lst[row].eg
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "em":
+        elif self._headers[column] == "em":
             n = self._lst[row].em
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "ed":
+        elif self._headers[column] == "ed":
             n = self._lst[row].ed
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "rate":
+        elif self._headers[column] == "rate":
             n = self._lst[row].rate
             if n is None:
                 return self._trad['not_associated']
@@ -194,7 +194,6 @@ class InitialConditionTableModel(PamhyrTableModel):
                     )
                 )
             elif self._headers[column] == "reach":
-                print(self._river.edge(value).id)
                 self._undo.push(
                     SetCommandSpec(
                         self._lst, row, self._headers[column],

src/View/InitialConditionsAdisTS/TableDefault.py

@@ -55,24 +55,24 @@ class InitialConditionTableDefaultModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] is "name":
+        if self._headers[column] == "name":
             return self._data[row].name
-        elif self._headers[column] is "concentration":
+        elif self._headers[column] == "concentration":
             n = self._data[row].concentration
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "eg":
+        elif self._headers[column] == "eg":
             n = self._data[row].eg
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "em":
+        elif self._headers[column] == "em":
             n = self._data[row].em
             if n is None:
                 return self._trad['not_associated']
             return n
-        elif self._headers[column] is "ed":
+        elif self._headers[column] == "ed":
             n = self._data[row].ed
             if n is None:
                 return self._trad['not_associated']

src/View/InitialConditionsAdisTS/Window.py

@@ -281,9 +281,7 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
             self._table_spec.add(rows[0])
 
     def delete(self):
-        print("del")
         rows = self.index_selected_rows()
         if len(rows) == 0:
-            print("len 0")
             return
         self._table_spec.delete(rows)

src/View/LateralContribution/Table.py

@@ -19,7 +19,7 @@
 import logging
 import traceback
 
-from tools import trace, timer
+from tools import trace, timer, old_pamhyr_date_to_timestamp
 
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
@@ -38,7 +38,7 @@ from View.LateralContribution.UndoCommand import (
     SetNameCommand, SetEdgeCommand, SetTypeCommand,
     SetBeginCommand, SetEndCommand,
     AddCommand, DelCommand, SortCommand,
-    MoveCommand, PasteCommand, DuplicateCommand,
+    MoveCommand, PasteCommand, DuplicateCommand, ImportCommand,
 )
 
 from Model.LateralContribution.LateralContributionTypes import (
@@ -116,7 +116,10 @@ class ComboBoxDelegate(QItemDelegate):
     def setModelData(self, editor, model, index):
         text = str(editor.currentText())
 
-        if self._mode == "rk":
+        if self._data is None:
+            value = text
+        else:
+            if self._mode == "rk" and self._data.reach is not None:
                 profiles = list(
                     filter(
                         lambda p: p.display_name() == text,
@@ -293,3 +296,44 @@ class TableModel(PamhyrTableModel):
 
         self.endMoveRows()
         self.layoutChanged.emit()
+
+    def read_from_lat(self, file_name):
+        logger.debug(f"Import lateral contributions from {file_name}")
+        data = []
+        current_reach = -1
+        with open(file_name, encoding="utf-8") as lat_file:
+            for line in lat_file:
+                if not (line.startswith("#") or
+                        line.startswith("*") or
+                        len(line) < 1):
+                    line = line.split()
+                    if line[0] == "$":
+                        current_reach = int(line[1]) - 1
+                        if (current_reach <= len(self._data.enable_edges()) and
+                                current_reach >= 0):
+                            data.append(
+                                [self._data.enable_edges()[current_reach],
+                                 float(line[2]),
+                                 float(line[3])
+                                 ]
+                            )
+                    else:
+                        if (current_reach <= len(self._data.enable_edges()) and
+                                current_reach >= 0):
+                            data[-1].append(
+                                [
+                                    old_pamhyr_date_to_timestamp(line[0]),
+                                    float(line[1])
+                                ]
+                            )
+
+        self.layoutAboutToBeChanged.emit()
+
+        self._undo.push(
+            ImportCommand(
+                self._lst, self._tab, data
+            )
+        )
+
+        self.layoutAboutToBeChanged.emit()
+        self.layoutChanged.emit()

src/View/LateralContribution/UndoCommand.py

@@ -28,6 +28,10 @@ from Model.LateralContribution.LateralContributionList import (
     LateralContributionList
 )
 
+from Model.LateralContribution.LateralContributionTypes import (
+    NotDefined, LateralContrib,
+)
+
 
 class SetNameCommand(QUndoCommand):
     def __init__(self, lcs, tab, index, new_value):
@@ -143,13 +147,13 @@ class DelCommand(QUndoCommand):
         self._tab = tab
         self._rows = rows
 
-        self._bc = []
+        self._lc = []
         for row in rows:
-            self._bc.append((row, self._lcs.get(self._tab, row)))
+            self._lc.append((row, self._lcs.get(self._tab, row)))
-        self._bc.sort()
+        self._lc.sort()
 
     def undo(self):
-        for row, el in self._bc:
+        for row, el in self._lc:
             self._lcs.insert(self._tab, row, el)
 
     def redo(self):
@@ -213,36 +217,73 @@ class MoveCommand(QUndoCommand):
 
 
 class PasteCommand(QUndoCommand):
-    def __init__(self, lcs, tab, row, bc):
+    def __init__(self, lcs, tab, row, lc):
         QUndoCommand.__init__(self)
 
         self._lcs = lcs
         self._tab = tab
         self._row = row
-        self._bc = deepcopy(bc)
+        self._lc = deepcopy(lc)
-        self._bc.reverse()
+        self._lc.reverse()
 
     def undo(self):
-        self._lcs.delete(self._tab, self._bc)
+        self._lcs.delete(self._tab, self._lc)
 
     def redo(self):
-        for bc in self._bc:
+        for lc in self._lc:
-            self._lcs.insert(self._tab, self._row, bc)
+            self._lcs.insert(self._tab, self._row, lc)
+
+
+class ImportCommand(QUndoCommand):
+    def __init__(self, lcs, tab, data):
+        QUndoCommand.__init__(self)
+
+        self._tab = tab
+        self._lcs = lcs
+        self._data = data
+        self._old_rows = list(range(len(self._lcs.get_tab(self._tab))))
+        self._new_rows = list(range(len(self._data)))
+
+        self._new_lc = None
+        self._old_lc = []
+        for row in self._old_rows:
+            self._old_lc.append((row, self._lcs.get(self._tab, row)))
+
+    def undo(self):
+        self._lcs.delete_i(self._tab, self._new_rows)
+        for row, el in self._old_lc:
+            self._lcs.insert(self._tab, row, el)
+
+    def redo(self):
+        self._lcs.delete_i(self._tab, self._old_rows)
+        if self._new_lc is None:
+            self._new_lc = []
+            for row, data in enumerate(self._data):
+                new = LateralContrib(status=self._lcs._status)
+                new.edge = data[0]
+                new.begin_rk = data[1]
+                new.end_rk = data[2]
+                for i, val in enumerate(data[3:]):
+                    new.insert(i, val)
+                self._new_lc.append(new)
+
+        for row, el in enumerate(self._new_lc):
+            self._lcs.insert(self._tab, row, el)
 
 
 class DuplicateCommand(QUndoCommand):
-    def __init__(self, lcs, tab, rows, bc):
+    def __init__(self, lcs, tab, rows, lc):
         QUndoCommand.__init__(self)
 
         self._lcs = lcs
         self._tab = tab
         self._rows = rows
-        self._bc = deepcopy(bc)
+        self._lc = deepcopy(lc)
-        self._bc.reverse()
+        self._lc.reverse()
 
     def undo(self):
-        self._lcs.delete(self._tab, self._bc)
+        self._lcs.delete(self._tab, self._lc)
 
     def redo(self):
-        for bc in self._lcs:
+        for lc in self._lcs:
-            self._lcs.insert(self._tab, self._rows[0], bc)
+            self._lcs.insert(self._tab, self._rows[0], lc)

src/View/LateralContribution/Window.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 
 from View.Tools.PamhyrWindow import PamhyrWindow
 
+from PyQt5 import QtWidgets
 from PyQt5.QtGui import (
     QKeySequence,
 )
@@ -29,7 +30,7 @@ from PyQt5.QtGui import (
 from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
     QCoreApplication, QModelIndex, pyqtSlot,
-    QRect,
+    QRect, QSettings,
 )
 
 from PyQt5.QtWidgets import (
@@ -153,6 +154,8 @@ class LateralContributionWindow(PamhyrWindow):
         )
 
     def setup_connections(self):
+        self.find(QAction, "action_import").triggered.connect(
+            self.import_from_file)
         self.find(QAction, "action_add").triggered.connect(self.add)
         self.find(QAction, "action_del").triggered.connect(self.delete)
         self.find(QAction, "action_edit").triggered.connect(self.edit)
@@ -297,3 +300,26 @@ class LateralContributionWindow(PamhyrWindow):
                 parent=self
             )
             win.show()
+
+    def import_from_file(self):
+        options = QFileDialog.Options()
+        settings = QSettings(QSettings.IniFormat,
+                             QSettings.UserScope, 'MyOrg', )
+        options |= QFileDialog.DontUseNativeDialog
+
+        file_types = [
+            self._trad["file_lat"],
+            self._trad["file_all"],
+        ]
+
+        filename, _ = QtWidgets.QFileDialog.getOpenFileName(
+            self,
+            self._trad["open_file"],
+            "",
+            ";; ".join(file_types),
+            options=options
+        )
+
+        if filename != "":
+            tab = self.current_tab()
+            self._table[tab].read_from_lat(filename)

src/View/LateralContribution/translate.py

@@ -52,6 +52,10 @@ class LCTranslate(MainTranslate):
         self._dict["x"] = _translate("Geometry", "X (m)")
         self._dict["y"] = _translate("Geometry", "Y (m)")
         self._dict["z"] = _translate("Geometry", "Z (m)")
+        self._dict["file_lat"] = _translate(
+            "LateralContribution", "Shapefile (*.LAT *.lat)")
+        self._dict["file_all"] = _translate(
+            "LateralContribution", "All files (*)")
 
         self._sub_dict["table_headers"] = {
             "name": self._dict["name"],

src/View/MainWindow.py

@@ -77,14 +77,18 @@ from View.SedimentLayers.Reach.Window import ReachSedimentLayersWindow
 from View.AdditionalFiles.Window import AddFileListWindow
 from View.REPLines.Window import REPLineListWindow
 from View.SolverParameters.Window import SolverParametersWindow
-from View.RunSolver.Window import SelectSolverWindow, SolverLogWindow
+from View.RunSolver.Window import (
+                                   SelectSolverWindow,
+                                   SolverLogWindow,
+                                   CompareSolversWindow
+                                   )
+from View.Results.Window import ResultsWindow
 from View.RunSolver.WindowAdisTS import (
     SelectSolverWindowAdisTS,
     SolverLogWindowAdisTS
 )
 from View.CheckList.Window import CheckListWindow
 from View.CheckList.WindowAdisTS import CheckListWindowAdisTS
-from View.Results.Window import ResultsWindow
 from View.Results.WindowAdisTS import ResultsWindowAdisTS
 from View.Results.ReadingResultsDialog import ReadingResultsDialog
 from View.Debug.Window import ReplWindow
@@ -93,6 +97,10 @@ from View.Pollutants.Window import PollutantsWindow
 from View.D90AdisTS.Window import D90AdisTSWindow
 from View.DIFAdisTS.Window import DIFAdisTSWindow
 
+from Solver.Solvers import GenericSolver
+
+from Model.Results.Results import Results
+
 # Optional internal display of documentation for make the application
 # package lighter...
 try:
@@ -135,7 +143,7 @@ define_model_action = [
     "action_menu_edit_reach_sediment_layers", "action_menu_edit_reservoirs",
     "action_menu_edit_hydraulic_structures", "action_menu_additional_file",
     "action_menu_results_last", "action_open_results_from_file",
-    "action_menu_boundary_conditions_sediment",
+    "action_compare_results", "action_menu_boundary_conditions_sediment",
     "action_menu_rep_additional_lines", "action_menu_output_rk",
     "action_menu_run_adists", "action_menu_pollutants",
     "action_menu_d90", "action_menu_dif",
@@ -280,6 +288,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             "action_menu_close": self.close_model,
             "action_menu_results_last": self.open_last_results,
             "action_open_results_from_file": self.open_results_from_file,
+            "action_compare_results": self.compare_results,
             "action_open_results_adists": self.open_results_adists,
             # Help
             "action_menu_pamhyr_users_wiki": self.open_doc_user,
@@ -339,10 +348,12 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
     def closeEvent(self, event):
         if not self._close_question:
             if self._study is not None and not self._study.is_saved:
-                if self.dialog_close(cancel=False):
+                if self.dialog_close():
                     # PAMHYR is close correctly (no crash)
                     self.conf.set_close_correctly()
                     super(ApplicationWindow, self).closeEvent(event)
+                else:
+                    event.ignore()
         else:
             super(ApplicationWindow, self).closeEvent(event)
 
@@ -522,7 +533,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         self.update()
 
     def close_model(self):
-        if not self.dialog_close(cancel=True):
+        if not self.dialog_close():
             return
 
         self._study = None
@@ -824,20 +835,18 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
 
         return file
 
-    def dialog_close(self, cancel=True):
+    def dialog_close(self):
         dlg = QMessageBox(self)
 
         dlg.setWindowTitle(self._trad["mb_close_title"])
         dlg.setText(self._trad["mb_close_msg"])
         opt = QMessageBox.Save | QMessageBox.Close
-        if cancel:
         opt |= QMessageBox.Cancel
 
         dlg.setStandardButtons(opt)
         dlg.setIcon(QMessageBox.Warning)
         dlg.button(QMessageBox.Save).setText(self._trad["Save"])
         dlg.button(QMessageBox.Close).setText(self._trad["Close"])
-        if cancel:
         dlg.button(QMessageBox.Cancel).setText(self._trad["Cancel"])
 
         res = dlg.exec()
@@ -1310,7 +1319,6 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         #                      self.conf.solvers))
         # solver = next(filter(lambda x: x.name == "AdisTS-WC",
         #                      self.conf.solvers))
-        # print(solver._type)
         # self.run_solver(solver)
 
         run = SelectSolverWindowAdisTS(
@@ -1423,22 +1431,25 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         if results is None:
             return
 
+        # results does not have values, for example if geometry missmatch
+        if not results.is_valid:
+            return
+
         # Windows already opened
         if self.sub_window_exists(
                 ResultsWindow,
                 data=[
                     self._study,
-                    None,       # No config
+                    None,      # No config,
-                    solver,
+                    results._solver,
-                    results
+                    results._repertory,
-                ]
+                    results._name]
         ):
             return
 
         res = ResultsWindow(
             study=self._study,
-            solver=solver,
+            results=[results],
-            results=results,
             parent=self
         )
         res.show()
@@ -1487,7 +1498,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
                     self._study,
                     None,       # No config
                     solver,
-                    results
+                    results._repertory,
+                    results._name,
                 ]
         ):
             return
@@ -1525,9 +1537,6 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         if self._study is None:
             return
 
-        if self._study.filename == "":
-            return
-
         options = QFileDialog.Options()
         options |= QFileDialog.DontUseNativeDialog
 
@@ -1538,6 +1547,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         # dialog.setFilter(dialog.filter() | QtCore.QDir.Hidden)
         dialog.setNameFilters(['Mage (*.BIN)'])
 
+        if self._study.filename is not None:
             if self._last_solver is None:
                 dialog.setDirectory(
                     os.path.dirname(self._study.filename)
@@ -1555,6 +1565,134 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
                 results=file_name[0]
             )
 
+    def compare_results(self):
+        if self._study is None:
+            return
+
+        run = CompareSolversWindow(
+            study=self._study,
+            config=self.conf,
+            parent=self
+        )
+        if run.exec():
+            results = self.diff_results(run.solver1,
+                                        run.solver2)
+        else:
+            return
+
+        # At least one result not available
+        if results is None:
+            return
+
+        # Windows already opened
+        if self.sub_window_exists(
+                ResultsWindow,
+                data=[self._study, None] +
+                     [r._solver for r in results] +
+                     [r._repertory for r in results] +
+                     [r._name for r in results]
+        ):
+            return
+
+        res = ResultsWindow(
+            study=self._study,
+            results=results,
+            parent=self
+        )
+        res.show()
+
+    def diff_results(self, solver1, solver2):
+        if solver1 is None:
+            # TODO message
+            return None
+        if solver2 is None:
+            # TODO message
+            return None
+
+        solver3 = GenericSolver(solver1.name+" - "+solver2.name)
+        solver4 = GenericSolver(solver1.name)
+        solver5 = GenericSolver(solver2.name)
+
+        result1 = solver1.results(
+                        self._study,
+                        self._solver_workdir(solver1),
+                    )
+
+        if result1 is None:
+            # TODO message
+            return None
+
+        result2 = solver2.results(
+                        self._study,
+                        self._solver_workdir(solver2),
+                    )
+
+        if result2 is None:
+            # TODO message
+            return None
+
+        if result2.get("nb_reach") != result1.get("nb_reach"):
+            # TODO message
+            return None
+
+        if result2.get("nb_profile") != result1.get("nb_profile"):
+            # TODO message
+            return None
+
+        # return [result1, result2]
+
+        result3 = Results(self._study, solver3)
+        result4 = Results(self._study, solver1)
+        result5 = Results(self._study, solver2)
+        result3.set("nb_reach", result1.get("nb_reach"))
+        result4.set("nb_reach", result1.get("nb_reach"))
+        result5.set("nb_reach", result1.get("nb_reach"))
+        result3.set("nb_profile", result1.get("nb_profile"))
+        result4.set("nb_profile", result1.get("nb_profile"))
+        result5.set("nb_profile", result1.get("nb_profile"))
+        ts = sorted(list(result1.get("timestamps").intersection(
+            result2.get("timestamps"))))
+        result3.set("timestamps", ts)
+        result4.set("timestamps", ts)
+        result5.set("timestamps", ts)
+
+        for i in range(int(result1.get("nb_reach"))):
+            # Add reach to results reach list
+            r = result3.river.add(i)
+            r = result4.river.add(i)
+            r = result5.river.add(i)
+
+        for timestamp in result3.get("timestamps"):
+            for r in range(int(result1.get("nb_reach"))):
+                reach1 = result1.river.reach(r)
+                reach2 = result2.river.reach(r)
+                reach3 = result3.river.reach(r)
+                reach4 = result4.river.reach(r)
+                reach5 = result5.river.reach(r)
+                for p, (profile1, profile2) in enumerate(zip(
+                        reach1.profiles, reach2.profiles)):
+                    for key in ["Z", "Q", "V"]:
+                        d1 = profile1.get_ts_key(timestamp, key)
+                        d2 = profile2.get_ts_key(timestamp, key)
+                        d = d1-d2
+                        reach3.set(p, timestamp, key, d)
+                        reach4.set(p, timestamp, key, d1)
+                        reach5.set(p, timestamp, key, d2)
+                    limits = reach3.profile(p).geometry.get_water_limits(
+                            reach3.profile(p).get_ts_key(timestamp, "Z")
+                    )
+                    reach3.set(
+                            p, timestamp,
+                            "water_limits",
+                            limits
+                        )
+                    limits = profile1.get_ts_key(timestamp, "water_limits")
+                    reach4.set(p, timestamp, "water_limits", limits)
+                    limits = profile2.get_ts_key(timestamp, "water_limits")
+                    reach5.set(p, timestamp, "water_limits", limits)
+
+        return [result4, result5, result3]
+
     def open_results_adists(self):
         if self._study is None:
             return
@@ -1581,13 +1719,21 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         if dialog.exec_():
             dir_path = dialog.selectedFiles()[0]
             dir_list = os.listdir(dir_path)
+            if "resultats" in dir_list:
+                dir_path = os.path.join(dir_path, "resultats")
+                dir_list = os.listdir(dir_path)
+
             bin_list = list(filter(lambda s: "bin" in s, dir_list))
-            solver_name = dir_path.split("/")[-2]
+            if len(bin_list) < 1:
+                # TODO message
+                return
+            path = os.path.normpath(dir_path)
+            solver_name = path.split(os.sep)[-2]
             solver_results = next(filter(lambda x: x.name == solver_name,
                                          self.conf.solvers))
             solver_results_adists = solver_results.results(
                 self._study,
-                repertory=dir_path[:-10], qlog=None)  # self._output)
+                repertory=dir_path, qlog=None)  # self._output)
             logger.info(f"Select results: {dir_path}")
             if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list):
                 self.open_solver_results_adists(

src/View/Network/GraphWidget.py

@@ -475,7 +475,7 @@ class GraphWidget(QGraphicsView):
     def setup_scene(self, min_size, max_size, size):
         scene = QGraphicsScene(self)
         scene.setItemIndexMethod(QGraphicsScene.NoIndex)
-        scene.setSceneRect(0, 0, 2000, 2000)
+        scene.setSceneRect(0, 0, 6000, 6000)
 
         self.setScene(scene)
         self.setCacheMode(QGraphicsView.CacheBackground)
@@ -486,6 +486,7 @@ class GraphWidget(QGraphicsView):
 
         self.scale(1, 1)
         self.previousScale = 1
+        self.centerOn(1000.0, 1000.0)
 
         if min_size:
             self.setMinimumSize(*min_size)

src/View/Reservoir/Edit/Translate.py

@@ -35,5 +35,5 @@ class EditReservoirTranslate(ReservoirTranslate):
 
         self._sub_dict["table_headers"] = {
             "z": self._dict["unit_elevation"],
-            "area": self._dict["unit_area"],
+            "area": self._dict["unit_area_he"],
         }

src/View/Results/CoordinatesDialog.py

@@ -0,0 +1,78 @@
+# ShiftDialog.py -- Pamhyr
+# Copyright (C) 2023-2024  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 View.Tools.PamhyrWindow import PamhyrDialog
+from PyQt5.QtWidgets import QDoubleSpinBox, QPushButton
+
+
+class CoordinatesDialog(PamhyrDialog):
+    _pamhyr_ui = "GeotiffCoordinates"
+    _pamhyr_name = "ImageCoordinates"
+
+    def __init__(self, x, y, trad=None, parent=None):
+        super(CoordinatesDialog, self).__init__(
+            title=trad[self._pamhyr_name],
+            trad=trad,
+            options=[],
+            parent=parent
+        )
+
+        self.spinbox = {}
+        self._init_default_values(x, y)
+        self.setup_connections()
+
+    def _init_default_values(self, x, y):
+        self._x = x
+        self._y = y
+        self._values = {"bottom": x[0],
+                        "top": x[1],
+                        "left": y[0],
+                        "right": y[1]}
+        self.spinbox = {}
+        for t in self._values:
+            self.spinbox[t] = self.find(QDoubleSpinBox, f"doubleSpinBox_{t}")
+            self.reset(t)
+
+    def setup_connections(self):
+        for t in self._values:
+            self.find(QPushButton,
+                      f"pushButton_{t}").clicked.connect(
+                          lambda state, x=t: self.reset(x))
+
+    def reset(self, t):
+        self.spinbox[t].setValue(self._values[t])
+
+    @property
+    def x(self):
+        return [self._values["bottom"], self._values["top"]]
+
+    @property
+    def y(self):
+        return [self._values["left"], self._values["right"]]
+
+    @property
+    def values(self):
+        return [self._values[t] for t in self._values]
+
+    def accept(self):
+        for t in self._values:
+            self._values[t] = self.get_double_spin_box(f"doubleSpinBox_{t}")
+        super().accept()
+
+    def reject(self):
+        self.close()

src/View/Results/CustomExport/CustomExport.py

@@ -0,0 +1,151 @@
+# CustomExport.py -- Pamhyr
+# Copyright (C) 2023-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 View.Tools.PamhyrWindow import PamhyrDialog
+
+from PyQt5.QtWidgets import (
+    QRadioButton, QCheckBox, QVBoxLayout, QLabel,
+)
+
+from View.Results.translate import ResultsTranslate
+
+
+class CustomExportDialog(PamhyrDialog):
+    _pamhyr_ui = "CustomExportAdisDialog"
+    _pamhyr_name = "Custom Plot Selection"
+
+    def __init__(self, parent=None):
+        trad = ResultsTranslate()
+        super(CustomExportDialog, self).__init__(
+            title=trad[self._pamhyr_name],
+            options=[],
+            trad=trad,
+            parent=parent
+        )
+
+        self._available_values_x = self._trad.get_dict("values_x")
+        self._available_values_y = self._trad.get_dict("values_y")
+
+        self.setup_radio_buttons_x()
+        self.setup_radio_buttons_res()
+        self.setup_envelop_box()
+        self.setup_check_boxes()
+
+        self.value = None
+
+    def setup_radio_buttons_x(self):
+        self._radio = []
+        layout = self.find(QVBoxLayout, "verticalLayout_x")
+
+        for value in self._available_values_x:
+            btn = QRadioButton(
+                self._available_values_x[value],
+                parent=self
+            )
+            self._radio.append((value, btn))
+            layout.addWidget(btn)
+
+        self._radio[0][1].setChecked(True)
+        layout.addStretch()
+
+    def setup_radio_buttons_res(self):
+        self._radio2 = []
+        layout = self.find(QVBoxLayout, "verticalLayout_pol")
+        label = self.find(QLabel, "label_3")
+        label.setText(self._trad["solver"])
+
+        for solver in self.parent._solvers:
+            btn = QRadioButton(
+                solver.name,
+                parent=self
+            )
+            self._radio2.append((solver.name, btn))
+            layout.addWidget(btn)
+
+        self._radio2[0][1].setChecked(True)
+        if len(self.parent._results) == 1:
+            self._radio2[0][1].setEnabled(False)
+            label.setEnabled(False)
+        else:
+            self._radio2[0][1].setEnabled(True)
+            label.setEnabled(True)
+
+        layout.addStretch()
+
+    def setup_envelop_box(self):
+        layout = self.find(QVBoxLayout, "verticalLayout_x")
+        self._envelop = QCheckBox(
+            self._trad["envelop"],
+            parent=self
+        )
+        layout.addWidget(self._envelop)
+        self._envelop.setChecked(True)
+        for r in self._radio:
+            r[1].clicked.connect(self.envelop_box_status)
+
+    def envelop_box_status(self):
+        if self._radio[0][1].isChecked():
+            if len(self.parent._results) > 1:
+                self._envelop.setEnabled(False)
+            else:
+                self._envelop.setEnabled(True)
+        else:
+            self._envelop.setEnabled(False)
+
+    def setup_check_boxes(self):
+        self._check = []
+        layout = self.find(QVBoxLayout, "verticalLayout_y")
+
+        for value in self._available_values_y:
+            btn = QCheckBox(
+                self._available_values_y[value],
+                parent=self
+            )
+            self._check.append((value, btn))
+            layout.addWidget(btn)
+
+        self._check[0][1].setChecked(True)
+        layout.addStretch()
+
+    def accept(self):
+        x = next(
+            filter(
+                lambda r: r[1].isChecked(),
+                self._radio
+            )
+        )[0]
+
+        y = list(
+            map(
+                lambda b: b[0],
+                filter(
+                    lambda b: b[1].isChecked(),
+                    self._check
+                )
+            )
+        )
+
+        res = 0
+        for i, b in enumerate(self._radio2):
+            if b[1].isChecked():
+                res = i
+                break
+
+        self.value = x, y, self._envelop.isChecked(), res
+
+        super().accept()

src/View/Results/CustomExport/CustomExportAdis.py

@@ -1,5 +1,5 @@
-# CustomPlotValuesSelectionDialog.py -- Pamhyr
+# CustomExportAdis.py -- Pamhyr
-# Copyright (C) 2023-2024  INRAE
+# Copyright (C) 2023-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

src/View/Results/CustomPlot/Plot.py

@@ -49,7 +49,7 @@ unit = {
 
 class CustomPlot(PamhyrPlot):
     def __init__(self, x, y, envelop, reach, profile, timestamp,
-                 data=None, canvas=None, trad=None,
+                 data=None, canvas=None, trad=None, res_id=[0],
                  toolbar=None, parent=None):
         super(CustomPlot, self).__init__(
             canvas=canvas,
@@ -65,6 +65,8 @@ class CustomPlot(PamhyrPlot):
         self._reach = reach
         self._profile = profile
         self._timestamp = timestamp
+        self._current_res_id = res_id[0]
+        self._parent = parent
 
         logger.debug(
             "Create custom plot for: " +
@@ -83,6 +85,7 @@ class CustomPlot(PamhyrPlot):
         )
 
         self._axes = {}
+        self.lines = {}
 
     def draw_bottom_with_bedload(self, reach):
         self._bedrock = self.sl_compute_bedrock(reach)
@@ -130,7 +133,7 @@ class CustomPlot(PamhyrPlot):
         """
         Get SL list for profile p at initial time (initial data)
         """
-        t0 = min(list(self.data.get("timestamps")))
+        t0 = min(list(self.data[self._current_res_id[0]].get("timestamps")))
         return map(
             lambda p: p.get_ts_key(t0, "sl")[0],
             reach.profiles
@@ -145,8 +148,8 @@ class CustomPlot(PamhyrPlot):
             reach.profiles
         )
 
-    def get_ts_zmin(self, profile):
+    def get_ts_zmin(self, profile, res_id):
-        results = self.data
+        results = self.data[res_id]
         nt = len(list(results.get("timestamps")))
         reach = results.river.reach(self._reach)
         berdrock = self.sl_compute_bedrock(reach)
@@ -167,8 +170,11 @@ class CustomPlot(PamhyrPlot):
         return ts_z_min
 
     def _draw_rk(self):
-        results = self.data
+        results = self.data[self._current_res_id]
         reach = results.river.reach(self._reach)
+        if self._current_res_id == 2:  # compare results
+            reach1 = self.data[0].river.reach(self._reach)
+            reach2 = self.data[1].river.reach(self._reach)
         rk = reach.geometry.get_rk()
         if reach.has_sediment():
             z_min = self.draw_bottom_with_bedload(reach)
@@ -204,23 +210,45 @@ class CustomPlot(PamhyrPlot):
                 self._axes[ax].spines['right'].set_position(('outward', shift))
                 shift += 60
 
+        if len(self.lines) != 0:
             self.lines = {}
         if "bed_elevation" in self._y:
 
             ax = self._axes[unit["bed_elevation"]]
+            if self._current_res_id < 2:
                 line = ax.plot(
                     rk, z_min,
                     color='grey', lw=1.,
                 )
+            else:
+                if reach.has_sediment():
+                    z_min1 = self.draw_bottom_with_bedload(reach1)
+                    z_min2 = self.draw_bottom_with_bedload(reach2)
+                else:
+                    z_min1 = reach1.geometry.get_z_min()
+                    z_min2 = reach2.geometry.get_z_min()
+                dz = list(
+                    map(
+                        lambda x, y: x - y,
+                        z_min2, z_min2
+                        )
+                    )
+                line = ax.plot(
+                    rk, dz,
+                    color='grey', lw=1.,
+                )
+
             self.lines["bed_elevation"] = line
 
-            if self._envelop and reach.has_sediment():
+            if (self._envelop and
+                    reach.has_sediment() and
+                    self._current_res_id < 2):
 
                 ax = self._axes[unit["bed_elevation_envelop"]]
 
                 e = list(
                         map(
-                            lambda p: max(self.get_ts_zmin(p)),
+                            lambda p: max(self.get_ts_zmin(p, res_id)),
                             range(len(reach))
                         )
                     )
@@ -233,7 +261,7 @@ class CustomPlot(PamhyrPlot):
 
                 e = list(
                         map(
-                            lambda p: min(self.get_ts_zmin(p)),
+                            lambda p: min(self.get_ts_zmin(p, res_id)),
                             range(len(reach))
                         )
                     )
@@ -253,7 +281,7 @@ class CustomPlot(PamhyrPlot):
             )
             self.lines["water_elevation"] = line
 
-            if "bed_elevation" in self._y:
+            if "bed_elevation" in self._y and self._current_res_id < 2:
                 self.fill = ax.fill_between(
                     rk, z_min, z,
                     color='blue', alpha=0.5, interpolate=True
@@ -370,6 +398,7 @@ class CustomPlot(PamhyrPlot):
         if "depth" in self._y:
 
             ax = self._axes[unit["depth"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
@@ -377,13 +406,35 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.max_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.max_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             line = ax.plot(
                 rk, d,
                 color='brown', lw=1.,
             )
             self.lines["depth"] = line
 
-            if self._envelop:
+            if self._envelop and self._current_res_id < 2:
 
                 ax = self._axes[unit["depth_envelop"]]
 
@@ -416,6 +467,7 @@ class CustomPlot(PamhyrPlot):
         if "mean_depth" in self._y:
 
             ax = self._axes[unit["mean_depth"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
@@ -423,6 +475,27 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.mean_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.mean_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
 
             line = ax.plot(
                 rk, d,
@@ -433,6 +506,7 @@ class CustomPlot(PamhyrPlot):
         if "froude" in self._y:
 
             ax = self._axes[unit["froude"]]
+            if self._current_res_id < 2:
                 fr = list(
                     map(
                         lambda p:
@@ -446,6 +520,39 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                fr1 = list(
+                    map(
+                        lambda p:
+                            p.get_ts_key(self._timestamp, "V") /
+                            sqrt(9.81 * (
+                                p.geometry.wet_area(
+                                    p.get_ts_key(self._timestamp, "Z")) /
+                                p.geometry.wet_width(
+                                    p.get_ts_key(self._timestamp, "Z"))
+                                )),
+                        reach1.profiles
+                    )
+                )
+                fr2 = list(
+                    map(
+                        lambda p:
+                            p.get_ts_key(self._timestamp, "V") /
+                            sqrt(9.81 * (
+                                p.geometry.wet_area(
+                                    p.get_ts_key(self._timestamp, "Z")) /
+                                p.geometry.wet_width(
+                                    p.get_ts_key(self._timestamp, "Z"))
+                                )),
+                        reach2.profiles
+                    )
+                )
+                fr = list(
+                    map(
+                        lambda x, y: x - y,
+                        fr1, fr2
+                        )
+                    )
 
             line = ax.plot(
                 rk, fr, color='black', linestyle='--', lw=1.,
@@ -455,6 +562,7 @@ class CustomPlot(PamhyrPlot):
         if "wet_area" in self._y:
 
             ax = self._axes[unit["wet_area"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(
                         lambda p: p.geometry.wet_area(
@@ -462,6 +570,27 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.wet_area(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.wet_area(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
 
             line = ax.plot(
                 rk, d,
@@ -479,8 +608,12 @@ class CustomPlot(PamhyrPlot):
         self.canvas.axes.legend(lns, labs, loc="best")
 
     def _redraw_rk(self):
-        results = self.data
+        results = self.data[self._current_res_id]
         reach = results.river.reach(self._reach)
+        if self._current_res_id == 2:  # compare results
+            reach1 = self.data[0].river.reach(self._reach)
+            reach2 = self.data[1].river.reach(self._reach)
+
         rk = reach.geometry.get_rk()
         z_min = reach.geometry.get_z_min()
         if reach.has_sediment():
@@ -507,12 +640,27 @@ class CustomPlot(PamhyrPlot):
             )
         )
         if "bed_elevation" in self._y:
-            self.lines["bed_elevation"][0].set_ydata(z_min)
+            if self._current_res_id < 2:
+                dz = z_min
+            else:
+                if reach.has_sediment():
+                    z_min1 = self.draw_bottom_with_bedload(reach1)
+                    z_min2 = self.draw_bottom_with_bedload(reach2)
+                else:
+                    z_min1 = reach1.geometry.get_z_min()
+                    z_min2 = reach2.geometry.get_z_min()
+                dz = list(
+                    map(
+                        lambda x, y: x - y,
+                        z_min2, z_min2
+                        )
+                    )
+            self.lines["bed_elevation"][0].set_ydata(dz)
 
         if "water_elevation" in self._y:
             self.lines["water_elevation"][0].set_ydata(z)
 
-            if "bed_elevation" in self._y:
+            if "bed_elevation" in self._y and self._current_res_id < 2:
                 ax = self._axes[unit["water_elevation"]]
                 self.fill.remove()
                 self.fill = ax.fill_between(
@@ -527,6 +675,7 @@ class CustomPlot(PamhyrPlot):
             self.lines["velocity"][0].set_ydata(v)
 
         if "depth" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
@@ -534,9 +683,32 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.max_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.max_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["depth"][0].set_ydata(d)
 
         if "mean_depth" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
@@ -544,9 +716,32 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.mean_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.mean_water_depth(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["mean_depth"][0].set_ydata(d)
 
         if "froude" in self._y:
+            if self._current_res_id < 2:
                 fr = list(
                     map(
                         lambda p:
@@ -560,9 +755,44 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                fr1 = list(
+                    map(
+                        lambda p:
+                            p.get_ts_key(self._timestamp, "V") /
+                            sqrt(9.81 * (
+                                p.geometry.wet_area(
+                                    p.get_ts_key(self._timestamp, "Z")) /
+                                p.geometry.wet_width(
+                                    p.get_ts_key(self._timestamp, "Z"))
+                                )),
+                        reach1.profiles
+                    )
+                )
+                fr2 = list(
+                    map(
+                        lambda p:
+                            p.get_ts_key(self._timestamp, "V") /
+                            sqrt(9.81 * (
+                                p.geometry.wet_area(
+                                    p.get_ts_key(self._timestamp, "Z")) /
+                                p.geometry.wet_width(
+                                    p.get_ts_key(self._timestamp, "Z"))
+                                )),
+                        reach2.profiles
+                    )
+                )
+                fr = list(
+                    map(
+                        lambda x, y: x - y,
+                        fr1, fr2
+                        )
+                    )
+
             self.lines["froude"][0].set_ydata(fr)
 
         if "wet_area" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(
                         lambda p: p.geometry.wet_area(
@@ -570,6 +800,28 @@ class CustomPlot(PamhyrPlot):
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.wet_area(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.wet_area(
+                            p.get_ts_key(self._timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["wet_area"][0].set_ydata(d)
 
     def _customize_x_axes_time(self, ts, mode="time"):
@@ -611,9 +863,11 @@ class CustomPlot(PamhyrPlot):
             )
 
         self.canvas.axes.set_xticks(ticks=fx, labels=xt, rotation=45)
+        self.canvas.axes.relim(visible_only=True)
+        self.canvas.axes.autoscale_view()
 
     def _draw_time(self):
-        results = self.data
+        results = self.data[self._current_res_id]
         reach = results.river.reach(self._reach)
         profile = reach.profile(self._profile)
 
@@ -627,15 +881,29 @@ class CustomPlot(PamhyrPlot):
                 self._axes[ax].spines['right'].set_position(('outward', shift))
                 shift += 60
 
-        ts = list(results.get("timestamps"))
+        ts = self._parent._timestamps
-        ts.sort()
+
+        if self._current_res_id == 2:  # compare results
+            reach1 = self.data[0].river.reach(self._reach)
+            reach2 = self.data[1].river.reach(self._reach)
+            profile1 = reach1.profile(self._profile)
+            profile2 = reach2.profile(self._profile)
+
+            q1 = profile1.get_key("Q")
+            z1 = profile1.get_key("Z")
+            v1 = profile1.get_key("V")
+
+            q2 = profile2.get_key("Q")
+            z2 = profile2.get_key("Z")
+            v2 = profile2.get_key("V")
 
         q = profile.get_key("Q")
         z = profile.get_key("Z")
         v = profile.get_key("V")
         z_min = profile.geometry.z_min()
+        if self._current_res_id < 2:
             if reach.has_sediment():
-            ts_z_min = self.get_ts_zmin(self._profile)
+                ts_z_min = self.get_ts_zmin(self._profile, res_id)
             else:
                 ts_z_min = list(
                     map(
@@ -650,6 +918,26 @@ class CustomPlot(PamhyrPlot):
 
             ax = self._axes[unit["bed_elevation"]]
 
+            if self._current_res_id == 2:
+                if reach.has_sediment():
+                    ts_z_min1 = self.get_ts_zmin(self._profile1, 0)
+                    ts_z_min2 = self.get_ts_zmin(self._profile2, 1)
+                    ts_z_min = list(
+                        map(
+                            lambda x, y: x - y,
+                            ts_z_min1, ts_z_min2
+                            )
+                        )
+                else:
+                    z_min1 = profile1.geometry.z_min()
+                    z_min2 = profile2.geometry.z_min()
+                    ts_z_min = list(
+                        map(
+                            lambda ts:  z_min1 - z_min2,
+                            ts
+                        )
+                    )
+
             line = ax.plot(
                 ts, ts_z_min,
                 color='grey', lw=1.
@@ -665,7 +953,7 @@ class CustomPlot(PamhyrPlot):
             )
             self.lines["water_elevation"] = line
 
-            if "bed_elevation" in self._y:
+            if "bed_elevation" in self._y and self._current_res_id < 2:
 
                 self.fill = ax.fill_between(
                     ts, ts_z_min, z,
@@ -694,9 +982,23 @@ class CustomPlot(PamhyrPlot):
         if "depth" in self._y:
 
             ax = self._axes[unit["depth"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z: profile.geometry.max_water_depth(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.max_water_depth(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.max_water_depth(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
 
             line = ax.plot(
                 ts, d,
@@ -707,9 +1009,23 @@ class CustomPlot(PamhyrPlot):
         if "mean_depth" in self._y:
 
             ax = self._axes[unit["mean_depth"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z: profile.geometry.mean_water_depth(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.mean_water_depth(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.mean_water_depth(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
 
             line = ax.plot(
                 ts, d,
@@ -720,6 +1036,7 @@ class CustomPlot(PamhyrPlot):
         if "froude" in self._y:
 
             ax = self._axes[unit["froude"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z, v:
                         v /
@@ -728,6 +1045,29 @@ class CustomPlot(PamhyrPlot):
                             profile.geometry.wet_width(z))
                         ), z, v)
                     )
+            else:
+                d1 = list(
+                    map(lambda z, v:
+                        v /
+                        sqrt(9.81 * (
+                            profile1.geometry.wet_area(z) /
+                            profile1.geometry.wet_width(z))
+                        ), z1, v1)
+                    )
+                d2 = list(
+                    map(lambda z, v:
+                        v /
+                        sqrt(9.81 * (
+                            profile2.geometry.wet_area(z) /
+                            profile2.geometry.wet_width(z))
+                        ), z2, v2)
+                    )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
 
             line = ax.plot(
                 ts, d, color='black', linestyle='--', lw=1.,
@@ -737,9 +1077,23 @@ class CustomPlot(PamhyrPlot):
         if "wet_area" in self._y:
 
             ax = self._axes[unit["wet_area"]]
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z: profile.geometry.wet_area(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.wet_area(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.wet_area(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
 
             line = ax.plot(
                 ts, d, color='blue', linestyle='--', lw=1.,
@@ -759,15 +1113,30 @@ class CustomPlot(PamhyrPlot):
 
     def _redraw_time(self):
 
-        results = self.data
+        results = self.data[self._current_res_id]
         reach = results.river.reach(self._reach)
         profile = reach.profile(self._profile)
         ts = list(results.get("timestamps"))
         ts.sort()
 
+        if self._current_res_id == 2:  # compare results
+            reach1 = self.data[0].river.reach(self._reach)
+            reach2 = self.data[1].river.reach(self._reach)
+            profile1 = reach1.profile(self._profile)
+            profile2 = reach2.profile(self._profile)
+
+            q1 = profile1.get_key("Q")
+            z1 = profile1.get_key("Z")
+            v1 = profile1.get_key("V")
+
+            q2 = profile2.get_key("Q")
+            z2 = profile2.get_key("Z")
+            v2 = profile2.get_key("V")
+
         q = profile.get_key("Q")
         z = profile.get_key("Z")
         v = profile.get_key("V")
+        if self._current_res_id < 2:
             if reach.has_sediment():
                 ts_z_min = self.get_ts_zmin(self._profile)
             else:
@@ -779,12 +1148,31 @@ class CustomPlot(PamhyrPlot):
                     )
                 )
         if "bed_elevation" in self._y:
+            if self._current_res_id == 2:
+                if reach.has_sediment():
+                    ts_z_min1 = self.get_ts_zmin(self._profile1, 0)
+                    ts_z_min2 = self.get_ts_zmin(self._profile2, 1)
+                    ts_z_min = list(
+                        map(
+                            lambda x, y: x - y,
+                            ts_z_min1, ts_z_min2
+                            )
+                        )
+                else:
+                    z_min1 = profile1.geometry.z_min()
+                    z_min2 = profile2.geometry.z_min()
+                    ts_z_min = list(
+                        map(
+                            lambda ts:  z_min1 - z_min2,
+                            ts
+                        )
+                    )
             self.lines["bed_elevation"][0].set_ydata(ts_z_min)
 
         if "water_elevation" in self._y:
             self.lines["water_elevation"][0].set_ydata(z)
 
-            if "bed_elevation" in self._y:
+            if "bed_elevation" in self._y and self._current_res_id < 2:
                 ax = self._axes[unit["bed_elevation"]]
                 self.fill.remove()
                 self.fill = ax.fill_between(
@@ -799,18 +1187,49 @@ class CustomPlot(PamhyrPlot):
             self.lines["velocity"][0].set_ydata(v)
 
         if "depth" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z: profile.geometry.max_water_depth(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.max_water_depth(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.max_water_depth(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["depth"][0].set_ydata(d)
 
         if "mean_depth" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z: profile.geometry.mean_water_depth(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.mean_water_depth(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.mean_water_depth(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["mean_depth"][0].set_ydata(d)
 
         if "froude" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z, v:
                         v /
@@ -819,16 +1238,57 @@ class CustomPlot(PamhyrPlot):
                             profile.geometry.wet_width(z))
                         ), z, v)
                     )
+            else:
+                d1 = list(
+                    map(lambda z, v:
+                        v /
+                        sqrt(9.81 * (
+                            profile1.geometry.wet_area(z) /
+                            profile1.geometry.wet_width(z))
+                        ), z1, v1)
+                    )
+                d2 = list(
+                    map(lambda z, v:
+                        v /
+                        sqrt(9.81 * (
+                            profile2.geometry.wet_area(z) /
+                            profile2.geometry.wet_width(z))
+                        ), z2, v2)
+                    )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["froude"][0].set_ydata(d)
 
         if "wet_area" in self._y:
+            if self._current_res_id < 2:
                 d = list(
                     map(lambda z: profile.geometry.wet_area(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.wet_area(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.wet_area(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+
             self.lines["wet_area"][0].set_ydata(d)
 
+        self._current.set_visible(False)
         self.canvas.axes.relim(visible_only=True)
         self.canvas.axes.autoscale_view()
+        self._current.set_visible(True)
 
     def draw(self):
         self.draw_static()
@@ -847,35 +1307,58 @@ class CustomPlot(PamhyrPlot):
         if self.data is None:
             return
 
+        self._y_axes = sorted(
+            set(
+                map(
+                    lambda y: unit[y],
+                    self._y
+                )
+            )
+        )
+
         self.canvas.axes.set_xlabel(
             self._trad[self._x],
             color='black', fontsize=10
         )
 
+        if self._current_res_id < 2:
             self.canvas.axes.set_ylabel(
                 self._trad[self._y_axes[0]],
                 color='black', fontsize=10
             )
+        else:
+            self.canvas.axes.set_ylabel(
+                "Δ " + self._trad[self._y_axes[0]],
+                color='black', fontsize=10
+            )
 
         self._axes[self._y_axes[0]] = self.canvas.axes
+        if len(self.lines) != 0:
+            self.lines.clear()
         for axes in self._y_axes[1:]:
-            if axes in self._axes:
+            if axes in self._axes.keys():
-                self._axes[axes].clear()
+                for ll in self._axes[axes].lines:
-                continue
+                    ll.remove()
-
+            else:
                 ax_new = self.canvas.axes.twinx()
-            ax_new.set_ylabel(
+                self._axes[axes] = ax_new
+            if self._current_res_id < 2:
+                self._axes[axes].set_ylabel(
                     self._trad[axes],
                     color='black', fontsize=10
                 )
-            self._axes[axes] = ax_new
+            else:
+                self._axes[axes].set_ylabel(
+                    "Δ " + self._trad[axes],
+                    color='black', fontsize=10
+                )
 
         if self._x == "rk":
             self._draw_rk()
         elif self._x == "time":
             self._draw_time()
         if self._x == "rk":
-            reach = self.data.river.reach(self._reach)
+            reach = self.data[self._current_res_id].river.reach(self._reach)
             profile = reach.profile(self._profile)
             x = profile.rk
         elif self._x == "time":
@@ -905,7 +1388,7 @@ class CustomPlot(PamhyrPlot):
         self._reach = reach_id
         self._profile = 0
 
-        self.update()
+        self.draw()
 
     def set_profile(self, profile_id):
         self._profile = profile_id
@@ -915,6 +1398,10 @@ class CustomPlot(PamhyrPlot):
         else:
             self.draw_current()
 
+    def set_result(self, res_id):
+        self._current_res_id = res_id[0]
+        self.draw()
+
     def set_timestamp(self, timestamp):
         self._timestamp = timestamp
 
@@ -925,7 +1412,7 @@ class CustomPlot(PamhyrPlot):
 
     def draw_current(self):
         if self._x == "rk":
-            reach = self.data.river.reach(self._reach)
+            reach = self.data[self._current_res_id].river.reach(self._reach)
             profile = reach.profile(self._profile)
             x = profile.rk
         elif self._x == "time":

src/View/Results/PlotAC.py

@@ -29,7 +29,7 @@ _translate = QCoreApplication.translate
 
 class PlotAC(PamhyrPlot):
     def __init__(self, canvas=None, trad=None, toolbar=None,
-                 results=None, reach_id=0, profile_id=0,
+                 results=None, reach_id=0, profile_id=[0], res_id=[0],
                  parent=None):
         super(PlotAC, self).__init__(
             canvas=canvas,
@@ -39,9 +39,11 @@ class PlotAC(PamhyrPlot):
             parent=parent
         )
 
-        self._current_timestamp = max(results.get("timestamps"))
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
+        self._current_res_id = res_id[0]
+        self._timestamps = parent._timestamps
+        self._current_timestamp = max(self._timestamps)
 
         self.label_x = self._trad['x']
         self.label_y = self._trad["unit_elevation"]
@@ -62,7 +64,7 @@ class PlotAC(PamhyrPlot):
     @results.setter
     def results(self, results):
         self.data = results
-        self._current_timestamp = max(results.get("timestamps"))
+        self._current_timestamp = max(self._timestamps)
 
     @timer
     def draw(self, highlight=None):
@@ -71,12 +73,17 @@ class PlotAC(PamhyrPlot):
         if self.results is None:
             return
 
-        reach = self.results.river.reach(self._current_reach_id)
+        if self.results[self._current_res_id] is None:
+            return
+
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         profile = reach.profile(self._current_profile_id)
 
         self.draw_profile(reach, profile)
         self.draw_water_elevation(reach, profile)
         self.draw_water_elevation_max(reach, profile)
+        self.draw_gl()
 
         self.enable_legend()
 
@@ -128,6 +135,63 @@ class PlotAC(PamhyrPlot):
             lw=1., color=self.color_plot_river_water,
         )
 
+    def draw_gl(self):
+
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
+        profile = reach.profile(self._current_profile_id)
+        if profile is None:
+            return
+
+        station = profile.geometry.get_station()
+        elevation = profile.geometry.z()
+        gl = profile.geometry.names()
+
+        self.annotation = []
+        self.cgl, self.igl = reach.geometry.compute_guidelines()
+
+        lcomplete = list(self.cgl)
+        lincomplete = list(self.igl)
+
+        self.color_complete_gl = self.colors
+        self.color_incomplete_gl = 2 * ["grey"]
+
+        x_gl_complete = []
+        y_gl_complete = []
+        x_gl_incomplete = []
+        y_gl_incomplete = []
+
+        for i, txt in enumerate(gl):
+            if txt == "":
+                continue
+
+            if txt.strip() in self.cgl:
+                color = self.color_complete_gl[
+                    lcomplete.index(txt) % len(self.color_complete_gl)
+                ]
+            else:
+                color = self.color_incomplete_gl[
+                    lincomplete.index(txt)
+                ]
+
+            annotation = self.canvas.axes.annotate(
+                txt, (station[i], elevation[i]),
+                horizontalalignment='left',
+                verticalalignment='top',
+                annotation_clip=True,
+                fontsize=11, color=color
+            )
+
+            annotation.set_position((station[i] + 0., elevation[i] + 0.))
+            self.annotation.append(annotation)
+
+            if txt.strip() in self.cgl:
+                x_gl_complete.append(station[i])
+                y_gl_complete.append(elevation[i])
+            else:
+                x_gl_incomplete.append(station[i])
+                y_gl_incomplete.append(elevation[i])
+
     def set_reach(self, reach_id):
         self._current_reach_id = reach_id
         self._current_profile_id = 0
@@ -137,10 +201,15 @@ class PlotAC(PamhyrPlot):
         self._current_profile_id = profile_id
         self.update()
 
+    def set_result(self, res_id):
+        self._current_res_id = res_id[0]
+        self.update()
+
     def set_timestamp(self, timestamp):
         self._current_timestamp = timestamp
 
-        reach = self.results.river.reach(self._current_reach_id)
+        reach = self.results[self._current_res_id].river.reach(
+            self._current_reach_id)
         profile = reach.profile(self._current_profile_id)
         x = profile.geometry.get_station()
         z = profile.geometry.z()
@@ -152,7 +221,8 @@ class PlotAC(PamhyrPlot):
         if not self._init:
             self.draw()
 
-        reach = self.results.river.reach(self._current_reach_id)
+        reach = self.results[self._current_res_id].river.reach(
+            self._current_reach_id)
         profile = reach.profile(self._current_profile_id)
         x = profile.geometry.get_station()
         z = profile.geometry.z()
@@ -160,9 +230,17 @@ class PlotAC(PamhyrPlot):
         self.update_river_bottom(reach, profile, x, z)
         self.update_water(reach, profile, x, z)
         self.update_water_max(reach, profile, x, z)
+        self.update_gl()
 
         self.update_idle()
 
+    def update_gl(self):
+        for a in self.annotation:
+            a.remove()
+
+        self.annotation[:] = []
+        self.draw_gl()
+
     def update_river_bottom(self, reach, profile, x, z):
         self.line_rk.set_data(x, z)
 

src/View/Results/PlotH.py

@@ -35,7 +35,7 @@ logger = logging.getLogger()
 
 class PlotH(PamhyrPlot):
     def __init__(self, canvas=None, trad=None, toolbar=None,
-                 results=None, reach_id=0, profile_id=0,
+                 results=None, reach_id=0, profile_id=[0], res_id=[0],
                  parent=None):
         super(PlotH, self).__init__(
             canvas=canvas,
@@ -47,9 +47,11 @@ class PlotH(PamhyrPlot):
 
         self._mode = "time"
 
-        self._current_timestamp = max(results.get("timestamps"))
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
+        self._current_res_id = res_id
+        self._timestamps = parent._timestamps
+        self._current_timestamp = max(self._timestamps)
 
         self.label_x = self._trad["unit_time_s"]
         self.label_y = self._trad["unit_discharge"]
@@ -60,8 +62,11 @@ class PlotH(PamhyrPlot):
 
         self._isometric_axis = False
 
-        self._auto_relim_update = False
+        # self._auto_relim_update = False
-        self._autoscale_update = False
+        # self._autoscale_update = False
+
+        self._line_max = []
+        self._line = []
 
     @property
     def results(self):
@@ -70,47 +75,81 @@ class PlotH(PamhyrPlot):
     @results.setter
     def results(self, results):
         self.data = results
-        self._current_timestamp = max(results.get("timestamps"))
+        self._current_timestamp = max(self._timestamps)
 
     @timer
     def draw(self, highlight=None):
-        self.init_axes()
+        self.canvas.axes.cla()
+        self.canvas.axes.grid(color='grey', linestyle='--', linewidth=0.5)
 
         if self.results is None:
             return
 
-        reach = self.results.river.reach(self._current_reach_id)
+        if len(self._current_res_id) < 1:
-        profile = reach.profile(self._current_profile_id)
+            return
+
+        if len(self._current_res_id) == 1:
+            self.draw_max(self._current_res_id[0])
+
+        for res_id in self._current_res_id:
+            if self.results[res_id] is None:
+                continue
+
+            results = self.results[res_id]
+            reach = results.river.reach(self._current_reach_id)
 
             if reach.geometry.number_profiles == 0:
                 self._init = False
                 return
 
-        self.draw_max(reach)
+            self.draw_data(res_id)
-        self.draw_data(reach, profile)
+
-        self.draw_current()
+        self.canvas.axes.set_xlabel(
+            self._trad["unit_time_s"],
+            color='black', fontsize=10
+        )
+
+        self.canvas.axes.set_ylabel(
+            self._trad["unit_discharge"],
+            color='black', fontsize=10
+        )
 
         self.set_ticks_time_formater()
 
         self.enable_legend()
 
-        self.idle()
+        self.canvas.draw_idle()
-        self.update_current()
+        self.update_idle
+        self.draw_current()
         self._init = True
 
-    def draw_data(self, reach, profile):
+    def draw_data(self, res_id):
-        self.ts = list(self.results.get("timestamps"))
-        self.ts.sort()
 
-        x = self.ts
+        results = self.results[res_id]
+        reach = results.river.reach(self._current_reach_id)
+        for i, p in enumerate(self._current_profile_id):
+            profile = reach.profile(p)
+
+            x = self._timestamps
             y = profile.get_key("Q")
 
-        self._line, = self.canvas.axes.plot(
+            if res_id == 2:
+                label = "Δ " + self.label_discharge + f" {profile.name}"
+            else:
+                label = self.label_discharge + f" {profile.name}"
+
+            if len(self._current_res_id) > 1:
+                if res_id != 2:
+                    label += f" ({results._solver.name})"
+
+            line, = self.canvas.axes.plot(
                 x, y,
-            label=self.label_discharge,
+                label=label,
-            color=self.color_plot,
+                color=self.colors[res_id + 1],
+                linestyle=self.linestyle[i % len(self.linestyle)],
                 **self.plot_default_kargs
             )
+            self._line.append(line)
 
     def draw_current(self):
         self._current, = self.canvas.axes.plot(
@@ -122,12 +161,22 @@ class PlotH(PamhyrPlot):
             lw=1.,
         )
 
-    def draw_max(self, reach):
+    def draw_max(self, res_id):
-        self.ts = list(self.results.get("timestamps"))
+        results = self.results[res_id]
-        self.ts.sort()
+        reach = results.river.reach(self._current_reach_id)
 
-        x = self.ts
+        if reach.geometry.number_profiles == 0:
+            self._init = False
+            return
+
+        x = self._timestamps
         y = []
+
+        if res_id == 2:
+            label = "Δ " + self.label_discharge_max
+        else:
+            label = self.label_discharge_max
+
         for ts in x:
             ts_y = -9999
             for profile in reach.profiles:
@@ -135,22 +184,28 @@ class PlotH(PamhyrPlot):
                 ts_y = max(ts_y, q)
             y.append(ts_y)
 
-        self._line_max, = self.canvas.axes.plot(
+        m, = self.canvas.axes.plot(
             x, y,
-            label=self.label_discharge_max,
+            label=label,
             color=self.color_plot_highlight,
             linestyle='dotted',
             **self.plot_default_kargs
         )
+        self._line_max.append(m)
 
     def set_reach(self, reach_id):
         self._current_reach_id = reach_id
-        self._current_profile_id = 0
+        self._current_profile_id = [0]
         self.draw()
 
     def set_profile(self, profile_id):
         self._current_profile_id = profile_id
-        self.update()
+        # self.update()
+        self.draw()
+
+    def set_result(self, res_id):
+        self._current_res_id = res_id
+        self.draw()
 
     def set_timestamp(self, timestamp):
         self._current_timestamp = timestamp
@@ -162,24 +217,23 @@ class PlotH(PamhyrPlot):
             self.draw()
 
         self.update_data()
+        self.update_current()
         self.update_idle()
 
     def update_data(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        for res, res_id in enumerate(self._current_res_id):
+            results = self.results[res_id]
+            reach = results.river.reach(self._current_reach_id)
             profile = reach.profile(self._current_profile_id)
 
-        x = self.ts
+            x = self._timestamps
             y = profile.get_key("Q")
 
-        self._line.set_data(x, y)
+            self._line[res].set_data(x, y)
-
-        self._current.set_data(
-            [self._current_timestamp, self._current_timestamp],
-            self.canvas.axes.get_ylim()
-        )
 
     def update_current(self):
+        y = self._current.get_ydata()
         self._current.set_data(
             [self._current_timestamp, self._current_timestamp],
-            self.canvas.axes.get_ylim()
+            y
         )

src/View/Results/PlotRKC.py

@@ -32,7 +32,7 @@ logger = logging.getLogger()
 
 class PlotRKC(PamhyrPlot):
     def __init__(self, canvas=None, trad=None, toolbar=None,
-                 results=None, reach_id=0, profile_id=0,
+                 results=None, reach_id=0, profile_id=0, res_id=0,
                  parent=None):
         super(PlotRKC, self).__init__(
             canvas=canvas,
@@ -42,10 +42,11 @@ class PlotRKC(PamhyrPlot):
             parent=parent
         )
 
-        self._timestamps = results.get("timestamps")
-        self._current_timestamp = max(self._timestamps)
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
+        self._current_res_id = res_id[0]
+        self._timestamps = parent._timestamps
+        self._current_timestamp = max(self._timestamps)
 
         self.label_x = self._trad["unit_rk"]
         self.label_y = self._trad["unit_elevation"]
@@ -56,6 +57,9 @@ class PlotRKC(PamhyrPlot):
 
         self._isometric_axis = False
 
+        self._auto_relim_update = True
+        self._autoscale_update = True
+
     @property
     def results(self):
         return self.data
@@ -63,7 +67,7 @@ class PlotRKC(PamhyrPlot):
     @results.setter
     def results(self, results):
         self.data = results
-        self._current_timestamp = max(results.get("timestamps"))
+        self._current_timestamp = max(self._timestamps)
 
     @timer
     def draw(self, highlight=None):
@@ -72,7 +76,11 @@ class PlotRKC(PamhyrPlot):
         if self.results is None:
             return
 
-        reach = self.results.river.reach(self._current_reach_id)
+        if self.results[self._current_res_id] is None:
+            return
+
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
 
         self.draw_bottom(reach)
         self.draw_water_elevation(reach)
@@ -107,11 +115,12 @@ class PlotRKC(PamhyrPlot):
         self._river_bottom = z
 
     def draw_profiles_hs(self, reach):
+        results = self.results[self._current_res_id]
         lhs = filter(
             lambda hs: hs._input_reach.reach is reach.geometry,
             filter(
                 lambda hs: hs._input_reach is not None,
-                self.results.study.river.hydraulic_structures.lst
+                results.study.river.hydraulic_structures.lst
             )
         )
 
@@ -223,6 +232,7 @@ class PlotRKC(PamhyrPlot):
 
             self.water_fill = self.canvas.axes.fill_between(
                 rk, self._river_bottom, water_z,
+                where=[b <= z for b, z in zip(self._river_bottom, water_z)],
                 color=self.color_plot_river_water_zone,
                 alpha=0.7,
                 interpolate=True
@@ -312,6 +322,10 @@ class PlotRKC(PamhyrPlot):
         self._current_profile_id = profile_id
         self.update_current()
 
+    def set_result(self, res_id):
+        self._current_res_id = res_id[0]
+        self.update()
+
     def set_timestamp(self, timestamp):
         self._current_timestamp = timestamp
         self.update()
@@ -320,7 +334,8 @@ class PlotRKC(PamhyrPlot):
         if not self._init:
             self.draw()
 
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         if reach.has_sediment():
             self.update_bottom_with_bedload()
 
@@ -329,7 +344,8 @@ class PlotRKC(PamhyrPlot):
         self.update_idle()
 
     def update_water_elevation(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         rk = reach.geometry.get_rk()
         z_min = reach.geometry.get_z_min()
 
@@ -349,12 +365,14 @@ class PlotRKC(PamhyrPlot):
         self.water_fill.remove()
         self.water_fill = self.canvas.axes.fill_between(
             rk, self._river_bottom, water_z,
+            where=[rb <= wz for rb, wz in zip(self._river_bottom, water_z)],
             color=self.color_plot_river_water_zone,
             alpha=0.7, interpolate=True
         )
 
     def update_current(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         rk = reach.geometry.get_rk()
         z_min = reach.geometry.get_z_min()
         z_max = reach.geometry.get_z_max()
@@ -367,7 +385,8 @@ class PlotRKC(PamhyrPlot):
         self.canvas.figure.canvas.draw_idle()
 
     def update_bottom_with_bedload(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         rk = reach.geometry.get_rk()
         z = self.sl_compute_current_z(reach)
 

src/View/Results/PlotXY.py

@@ -38,7 +38,7 @@ logger = logging.getLogger()
 
 class PlotXY(PamhyrPlot):
     def __init__(self, canvas=None, trad=None, toolbar=None,
-                 results=None, reach_id=0, profile_id=0,
+                 results=None, reach_id=0, profile_id=0, res_id=0,
                  display_current=True, parent=None):
         super(PlotXY, self).__init__(
             canvas=canvas,
@@ -52,10 +52,11 @@ class PlotXY(PamhyrPlot):
         self.line_gl = []
         self.overflow = []
 
-        self._timestamps = results.get("timestamps")
+        self._timestamps = parent._timestamps
         self._current_timestamp = max(self._timestamps)
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
+        self._current_res_id = res_id[0]
 
         self.label_x = _translate("Results", "X (m)")
         self.label_y = _translate("Results", "Y (m)")
@@ -136,7 +137,7 @@ class PlotXY(PamhyrPlot):
     @results.setter
     def results(self, results):
         self.data = results
-        self._current_timestamp = max(results.get("timestamps"))
+        self._current_timestamp = max(self._timestamps)
 
     @timer
     def draw(self, highlight=None):
@@ -145,8 +146,12 @@ class PlotXY(PamhyrPlot):
         if self.results is None:
             return
 
-        reach = self.results.river.reach(self._current_reach_id)
+        if self.results[self._current_res_id] is None:
-        reaches = self.results.river.reachs
+            return
+
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
+        reaches = results.river.reachs
 
         self.draw_profiles(reach, reaches)
         self.draw_water_elevation(reach)
@@ -161,6 +166,7 @@ class PlotXY(PamhyrPlot):
         if reach.geometry.number_profiles == 0:
             self._init = False
             return
+        self.line_xy = []
         # TODO uncomment to draw all the reaches
         # self.draw_other_profiles(reaches)
         for xy in zip(reach.geometry.get_x(),
@@ -272,7 +278,8 @@ class PlotXY(PamhyrPlot):
         )
 
     def draw_water_elevation(self, reach):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         poly_l_x, poly_l_y, poly_r_x, poly_r_y = [], [], [], []
 
         for profile in reach.profiles:
@@ -308,6 +315,10 @@ class PlotXY(PamhyrPlot):
         self.update_profile()
         self.update_idle()
 
+    def set_result(self, res_id):
+        self._current_res_id = res_id[0]
+        self.update()
+
     def set_timestamp(self, timestamp):
         self._current_timestamp = timestamp
         self.update()
@@ -322,7 +333,8 @@ class PlotXY(PamhyrPlot):
         self.update_idle()
 
     def update_profile(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         profile = reach.profile(self._current_profile_id)
 
         self.plot_selected.set_data(
@@ -331,7 +343,8 @@ class PlotXY(PamhyrPlot):
         )
 
     def update_water_elevation(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         poly_l_x, poly_l_y, poly_r_x, poly_r_y = [], [], [], []
 
         for profile in reach.profiles:
@@ -358,7 +371,8 @@ class PlotXY(PamhyrPlot):
         self.water_fill[0].set_xy(poly)
 
     def update_water_elevation_overflow(self):
-        reach = self.results.river.reach(self._current_reach_id)
+        results = self.results[self._current_res_id]
+        reach = results.river.reach(self._current_reach_id)
         profile = reach.profile(self._current_profile_id)
 
         overflow = []

src/View/Results/Table.py

@@ -23,6 +23,8 @@ from numpy import sqrt
 
 from tools import timer, trace
 
+from itertools import compress
+
 from PyQt5.QtGui import (
     QKeySequence, QColor
 )
@@ -46,13 +48,19 @@ _translate = QCoreApplication.translate
 
 class TableModel(PamhyrTableModel):
     def _setup_lst(self):
-        _river = self._data.river
+        _river = self._data[0].river
         if self._opt_data == "reach":
             self._lst = _river.reachs
         elif self._opt_data == "profile":
             self._lst = _river.reach(0).profiles
+            # self._lst = list(filter(lambda x: x.name[0:8] != 'interpol',
+            #                        _river.reach(0).profiles))
         elif self._opt_data == "raw_data":
             self._lst = _river.reach(0).profiles
+            # self._lst = list(filter(lambda x: x.name[0:8] != 'interpol',
+            #                        _river.reach(0).profiles))
+        elif self._opt_data == "solver":
+            self._lst = self._parent._solvers
 
     def __init__(self, **kwargs):
         self._timestamp = 0.0
@@ -76,6 +84,10 @@ class TableModel(PamhyrTableModel):
             elif self._headers[column] == "rk":
                 v = self._lst[row].rk
                 return f"{v:.4f}"
+        elif self._opt_data == "solver":
+            if self._headers[column] == "solver":
+                v = self._lst[row].name
+                return str(v)
         elif self._opt_data == "raw_data":
             p = self._lst[row]
             if self._headers[column] == "name":
@@ -84,14 +96,18 @@ class TableModel(PamhyrTableModel):
                 return f"{p.name}"
             elif self._headers[column] == "water_elevation":
                 v = self._lst[row].get_ts_key(self._timestamp, "Z")
+                if v is None:
+                    v = 0.0
                 return f"{v:.4f}"
             elif self._headers[column] == "discharge":
                 v = self._lst[row].get_ts_key(self._timestamp, "Q")
+                if v is None:
+                    v = 0.0
                 return f"{v:.4f}"
             elif self._headers[column] == "velocity":
-                q = self._lst[row].get_ts_key(self._timestamp, "Q")
-                z = self._lst[row].get_ts_key(self._timestamp, "Z")
                 v = self._lst[row].get_ts_key(self._timestamp, "V")
+                if v is None:
+                    v = 0.0
                 return f"{v:.4f}"
             elif self._headers[column] == "width":
                 z = self._lst[row].get_ts_key(self._timestamp, "Z")
@@ -123,6 +139,9 @@ class TableModel(PamhyrTableModel):
                 v = self._lst[row].get_ts_key(self._timestamp, "V")
                 a = self._lst[row].geometry.wet_area(z)
                 b = self._lst[row].geometry.wet_width(z)
+                if b == 0.0 or a == 0.0:
+                    froude = 0.0
+                else:
                     froude = v / sqrt(9.81 * (a / b))
                 return f"{froude:.4f}"
             else:
@@ -132,12 +151,16 @@ class TableModel(PamhyrTableModel):
         return QVariant()
 
     def update(self, reach):
-        _river = self._data.river
+        _river = self._data[0].river
 
         if self._opt_data == "reach":
             self._lst = _river.reachs
         elif self._opt_data == "profile" or self._opt_data == "raw_data":
             self._lst = _river.reach(reach).profiles
+            # self._lst = list(compress(_river.reach(reach).profiles,
+                                      # _river.reach(reach).profile_mask))
+        elif self._opt_data == "solver":
+            self._lst = self._parent._solvers
 
         self.layoutChanged.emit()
 

src/View/Results/TableAdisTS.py

@@ -45,6 +45,7 @@ _translate = QCoreApplication.translate
 class TableModel(PamhyrTableModel):
     def _setup_lst(self):
         _river = self._data.river
+        self._timestamp = min(list(self._data.get("timestamps")))
         if self._opt_data == "reach":
             self._lst = _river.reachs
         elif self._opt_data == "profile":
@@ -57,7 +58,6 @@ class TableModel(PamhyrTableModel):
             self._lst = tmp_list
 
     def __init__(self, type_pol, **kwargs):
-        self._timestamp = 0.0
         self._type_pol = type_pol
         super(TableModel, self).__init__(**kwargs)
 
@@ -99,8 +99,8 @@ class TableModel(PamhyrTableModel):
                     v = self._lst[row].get_ts_key(
                         self._timestamp, "pols")[pol_index][0]
                     return f"{v:.4f}"
-                if (self._headers[column] == pol + " Mass"
+                if self._headers[column] == pol + " Mass":
-                        and self._type_pol[pol_index] == 7):
+                    if self._type_pol[pol_index] == 7:
                         m1 = self._lst[row].get_ts_key(
                             self._timestamp, "pols")[pol_index][1]
                         m2 = self._lst[row].get_ts_key(
@@ -109,6 +109,8 @@ class TableModel(PamhyrTableModel):
                             self._timestamp, "pols")[pol_index][3]
                         v = m1 + m2 + m3
                         return f"{v:.4f}"
+                    else:
+                        return ""
 
         return QVariant()
 

src/View/Results/Window.py

@@ -19,6 +19,7 @@
 import os
 import csv
 import logging
+# import rasterio
 
 from numpy import sqrt
 
@@ -35,6 +36,7 @@ from PyQt5.QtCore import (
     Qt, QVariant, QAbstractTableModel,
     QCoreApplication, QModelIndex, pyqtSlot,
     QItemSelectionModel, QTimer,
+    QSettings
 )
 
 from PyQt5.QtWidgets import (
@@ -59,10 +61,14 @@ from View.Results.CustomPlot.Plot import CustomPlot
 from View.Results.CustomPlot.CustomPlotValuesSelectionDialog import (
     CustomPlotValuesSelectionDialog,
 )
+from View.Results.CustomExport.CustomExport import CustomExportDialog
 
 from View.Results.Table import TableModel
-from View.Results.translate import ResultsTranslate
+from View.Results.translate import (
-from View.Stricklers.Window import StricklersWindow
+    ResultsTranslate,
+    CompareResultsTranslate
+)
+from View.Results.CoordinatesDialog import CoordinatesDialog
 
 _translate = QCoreApplication.translate
 
@@ -82,16 +88,17 @@ class ResultsWindow(PamhyrWindow):
         )
 
     def __init__(self, study=None, config=None,
-                 solver=None, results=None,
+                 results=None, parent=None, trad=None):
-                 parent=None):
+        self._solvers = [r._solver for r in results]
-        self._solver = solver
         self._results = results
+        self._current_results = [0]
 
+        if trad is None:
             trad = ResultsTranslate()
         name = (
             trad[self._pamhyr_name] + " - "
             + study.name + " - "
-            + self._solver.name
+            + " - ".join([s.name for s in self._solvers])
         )
 
         super(ResultsWindow, self).__init__(
@@ -102,14 +109,15 @@ class ResultsWindow(PamhyrWindow):
             parent=parent
         )
 
-        self._hash_data.append(self._solver)
+        for r in results:
-        self._hash_data.append(self._results)
+            self._hash_data.append(r._solver)
+            self._hash_data.append(r._repertory)
+            self._hash_data.append(r._name)
 
         self._additional_plot = {}
 
         try:
-            self._timestamps = sorted(list(self._results.get("timestamps")))
+            self.get_timestamps()
-
             self.setup_slider()
             self.setup_table()
             self.setup_plots()
@@ -119,22 +127,31 @@ class ResultsWindow(PamhyrWindow):
             logger_exception(e)
             return
 
+        self.update(reach_id=0,
+                    profile_id=[0])
+
+        self.update_table_selection_solver(0)
+
     def setup_table(self):
         self._table = {}
-        for t in ["reach", "profile", "raw_data"]:
+        for t in ["reach", "profile", "raw_data", "solver"]:
             table = self.find(QTableView, f"tableView_{t}")
             self._table[t] = TableModel(
                 table_view=table,
                 table_headers=self._trad.get_dict(f"table_headers_{t}"),
                 data=self._results,
                 undo=self._undo_stack,
-                opt_data=t
+                opt_data=t,
+                parent=self
             )
             self._table[t]._timestamp = self._timestamps[
                 self._slider_time.value()]
+        if len(self._results) <= 1:
+            table = self.find(QTableView, f"tableView_solver")
+            table.hide()
 
     def setup_slider(self):
-        default_reach = self._results.river.reach(0)
+        default_reach = self._results[self._current_results[0]].river.reach(0)
 
         self._slider_time = self.find(QSlider, f"horizontalSlider_time")
         self._slider_time.setMaximum(len(self._timestamps) - 1)
@@ -181,6 +198,7 @@ class ResultsWindow(PamhyrWindow):
             results=self._results,
             reach_id=0,
             profile_id=0,
+            res_id=self._current_results,
             trad=self._trad,
             toolbar=self.toolbar,
             display_current=True,
@@ -205,8 +223,10 @@ class ResultsWindow(PamhyrWindow):
             results=self._results,
             reach_id=0,
             profile_id=0,
+            res_id=self._current_results,
             trad=self._trad,
-            toolbar=self.toolbar_2
+            toolbar=self.toolbar_2,
+            parent=self
         )
         self.plot_rkc.draw()
 
@@ -227,8 +247,10 @@ class ResultsWindow(PamhyrWindow):
             results=self._results,
             reach_id=0,
             profile_id=0,
+            res_id=self._current_results,
             trad=self._trad,
-            toolbar=self.toolbar_3
+            toolbar=self.toolbar_3,
+            parent=self
         )
         self.plot_ac.draw()
 
@@ -249,9 +271,11 @@ class ResultsWindow(PamhyrWindow):
             canvas=self.canvas_4,
             results=self._results,
             reach_id=0,
-            profile_id=0,
+            profile_id=[0],
+            res_id=self._current_results,
             trad=self._trad,
-            toolbar=self.toolbar_4
+            toolbar=self.toolbar_4,
+            parent=self
         )
         self.plot_h.draw()
 
@@ -312,7 +336,13 @@ class ResultsWindow(PamhyrWindow):
             "action_add": self._add_custom_plot,
             "action_export": self._export,
             # "action_export": self.export_current,
+            "action_Geo_tiff": self.import_geotiff
         }
+        self.find(QAction, "action_Geo_tiff").setEnabled(False)
+        self.find(QAction, "action_Geo_tiff").setVisible(False)
+
+        if len(self._results) > 1:
+            self.find(QAction, "action_reload").setEnabled(False)
 
         for action in actions:
             self.find(QAction, action).triggered.connect(
@@ -324,9 +354,10 @@ class ResultsWindow(PamhyrWindow):
             "reach": self._set_current_reach,
             "profile": self._set_current_profile,
             "raw_data": self._set_current_profile_raw_data,
+            "solver": self._set_current_results,
         }
 
-        for t in ["reach", "profile", "raw_data"]:
+        for t in ["reach", "profile", "raw_data", "solver"]:
             table = self.find(QTableView, f"tableView_{t}")
 
             table.selectionModel()\
@@ -344,6 +375,10 @@ class ResultsWindow(PamhyrWindow):
         self._button_last.clicked.connect(self._last)
         self._timer.timeout.connect(self._update_slider)
 
+        # tabs
+        tab_widget = self.find(QTabWidget, f"tabWidget")
+        tab_widget.currentChanged.connect(self.tab_changed)
+
     def update_table_selection_reach(self, ind):
         table = self.find(QTableView, f"tableView_reach")
         selectionModel = table.selectionModel()
@@ -374,7 +409,25 @@ class ResultsWindow(PamhyrWindow):
             )
             table.scrollTo(index)
 
-    def update(self, reach_id=None, profile_id=None, timestamp=None):
+    def update_table_selection_solver(self, ind):
+        table = self.find(QTableView, f"tableView_solver")
+        selectionModel = table.selectionModel()
+        index = table.model().index(ind, 0)
+
+        selectionModel.select(
+            index,
+            QItemSelectionModel.Rows |
+            QItemSelectionModel.ClearAndSelect |
+            QItemSelectionModel.Select
+        )
+        table.scrollTo(index)
+
+    def update(self,
+               reach_id=None,
+               profile_id=None,
+               solver_id=None,
+               timestamp=None):
+
         if reach_id is not None:
             self.plot_xy.set_reach(reach_id)
             self.plot_ac.set_reach(reach_id)
@@ -388,15 +441,27 @@ class ResultsWindow(PamhyrWindow):
             self.update_table_selection_profile(0)
 
         if profile_id is not None:
-            self.plot_xy.set_profile(profile_id)
+            self.plot_xy.set_profile(profile_id[0])
-            self.plot_ac.set_profile(profile_id)
+            self.plot_ac.set_profile(profile_id[0])
-            self.plot_rkc.set_profile(profile_id)
+            self.plot_rkc.set_profile(profile_id[0])
             self.plot_h.set_profile(profile_id)
 
             for plot in self._additional_plot:
-                self._additional_plot[plot].set_profile(profile_id)
+                self._additional_plot[plot].set_profile(profile_id[0])
 
-            self.update_table_selection_profile(profile_id)
+            tab_widget = self.find(QTabWidget, f"tabWidget")
+            if tab_widget.currentIndex() != 2:
+                self.update_table_selection_profile(profile_id[0])
+
+        if solver_id is not None:
+            self._current_results = solver_id
+            self.plot_xy.set_result(solver_id)
+            self.plot_ac.set_result(solver_id)
+            self.plot_rkc.set_result(solver_id)
+            self.plot_h.set_result(solver_id)
+
+            for plot in self._additional_plot:
+                self._additional_plot[plot].set_result(solver_id)
 
         if timestamp is not None:
             self.plot_xy.set_timestamp(timestamp)
@@ -427,6 +492,14 @@ class ResultsWindow(PamhyrWindow):
 
         return indexes[0].row()
 
+    def _get_current_profiles_list(self):
+        table = self.find(QTableView, f"tableView_profile")
+        indexes = table.selectedIndexes()
+        if len(indexes) == 0:
+            return []
+
+        return [i.row() for i in indexes]
+
     def _get_current_timestamp(self):
         return self._timestamps[
             self._slider_time.value()
@@ -442,21 +515,22 @@ class ResultsWindow(PamhyrWindow):
 
     def _set_current_profile(self):
         table = self.find(QTableView, f"tableView_profile")
-        indexes = table.selectedIndexes()
+        indexes = table.selectionModel().selectedRows()
         if len(indexes) == 0:
             return
 
-        ind = indexes[0].row()
+        self.update(profile_id=[i.row() for i in indexes])
-        self.update(profile_id=ind)
 
     def _set_current_profile_raw_data(self):
-        table = self.find(QTableView, f"tableView_raw_data")
+        return
+
+    def _set_current_results(self):
+        table = self.find(QTableView, f"tableView_solver")
         indexes = table.selectedIndexes()
         if len(indexes) == 0:
             return
 
-        ind = indexes[0].row()
+        self.update(solver_id=[i.row() for i in indexes])
-        self.update(profile_id=ind)
 
     def _set_current_timestamp(self):
         timestamp = self._timestamps[self._slider_time.value()]
@@ -480,14 +554,17 @@ class ResultsWindow(PamhyrWindow):
 
     def _reload(self):
         logger.debug("Reload results...")
-        self._results = self._results.reload()
+        if len(self._results) == 1:
+            self._results[0] = self._results[0].reload()
 
-        self._timestamps = sorted(list(self._results.get("timestamps")))
+            self.get_timestamps()
 
             self._reload_plots()
             self._reload_slider()
 
     def _add_custom_plot(self):
+        profile_id = self._get_current_profile()
+        self.update_table_selection_profile(profile_id)
         dlg = CustomPlotValuesSelectionDialog(parent=self)
         if dlg.exec():
             x, y, envelop = dlg.value
@@ -526,6 +603,7 @@ class ResultsWindow(PamhyrWindow):
             self._get_current_timestamp(),
             data=self._results,
             canvas=canvas,
+            res_id=self._current_results,
             toolbar=toolbar,
             parent=self,
         )
@@ -541,6 +619,25 @@ class ResultsWindow(PamhyrWindow):
         tab_widget.setCurrentWidget(widget)
 
     def _copy(self):
+        # focus on raw data table
+        if self.find(QTabWidget, f"tabWidget").currentIndex() == 0:
+            table = self.find(QTableView, f"tableView_raw_data")
+            model = self._table["raw_data"]
+
+            coltext = []
+            for index in sorted(table.selectionModel().selectedRows()):
+                row = index.row()
+                rowtext = []
+                for column in range(model.columnCount()):
+                    i = model.createIndex(row, column)
+                    try:
+                        rowtext.append(model.data(i))
+                    except AttributeError:
+                        rowtext.append("")
+                coltext.append(rowtext)
+
+            self.copyTableIntoClipboard(coltext)
+        else:
             logger.info("TODO: copy")
 
     def _paste(self):
@@ -588,10 +685,12 @@ class ResultsWindow(PamhyrWindow):
             self._button_play.setIcon(self._icon_start)
 
     def _export(self):
+        profile_id = self._get_current_profile()
+        self.update_table_selection_profile(profile_id)
 
-        dlg = CustomPlotValuesSelectionDialog(parent=self)
+        dlg = CustomExportDialog(parent=self)
         if dlg.exec():
-            x, y, envelop = dlg.value
+            x, y, envelop, solver_id = dlg.value
         else:
             return
 
@@ -601,26 +700,26 @@ class ResultsWindow(PamhyrWindow):
         )
         self.file_dialog(
             select_file="AnyFile",
-            callback=lambda f: self.export_to(f[0], x, y, envelop),
+            callback=lambda f: self.export_to(f[0], x, y, envelop, solver_id),
             default_suffix=".csv",
             file_filter=["CSV (*.csv)"],
         )
 
-    def export_to(self, filename, x, y, envelop):
+    def export_to(self, filename, x, y, envelop, solver_id):
-        timestamps = sorted(self._results.get("timestamps"))
+        results = self._results[solver_id]
-        reach = self._results.river.reachs[self._get_current_reach()]
+        reach = results.river.reachs[self._get_current_reach()]
-        first_line = [f"Study: {self._results.study.name}",
+        first_line = [f"Study: {results.study.name}",
                       f"Reach: {reach.name}"]
         if x == "rk":
             timestamp = self._get_current_timestamp()
             first_line.append(f"Time: {timestamp}s")
-            val_dict = self._export_rk(timestamp, y, envelop)
+            val_dict = self._export_rk(timestamp, y, envelop, solver_id)
         elif x == "time":
             profile_id = self._get_current_profile()
             profile = reach.profile(profile_id)
             pname = profile.name if profile.name != "" else profile.rk
             first_line.append(f"Profile: {pname}")
-            val_dict = self._export_time(profile_id, y)
+            val_dict = self._export_time(profile_id, y, solver_id)
 
         with open(filename, 'w', newline='') as csvfile:
             writer = csv.writer(csvfile, delimiter=',',
@@ -667,7 +766,8 @@ class ResultsWindow(PamhyrWindow):
         )
 
     def export_current_to(self, directory):
-        reach = self._results.river.reachs[self._get_current_reach()]
+        results = self._results[self._current_results]
+        reach = results.river.reachs[self._get_current_reach()]
         self.export_all(reach, directory, [self._get_current_timestamp()])
 
     def delete_tab(self, index):
@@ -675,16 +775,32 @@ class ResultsWindow(PamhyrWindow):
         self._additional_plot.pop(tab_widget.tabText(index))
         tab_widget.removeTab(index)
 
-    def _export_rk(self, timestamp, y, envelop):
+    def _export_rk(self, timestamp, y, envelop, solver_id):
-        reach = self._results.river.reachs[self._get_current_reach()]
+        results = self._results[solver_id]
+        reach = results.river.reachs[self._get_current_reach()]
         dict_x = self._trad.get_dict("values_x")
         dict_y = self._trad.get_dict("values_y")
+        if self._current_results == 2:
+            envelop = False
+            reach1 = results[0].river.reachs[self._get_current_reach()]
+            reach2 = results[1].river.reachs[self._get_current_reach()]
         if envelop:
             dict_y.update(self._trad.get_dict("values_y_envelop"))
         my_dict = {}
         my_dict[dict_x["rk"]] = reach.geometry.get_rk()
         if "bed_elevation" in y:
-            my_dict[dict_y["bed_elevation"]] = reach.geometry.get_z_min()
+            if self._current_results != 2:
+                zmin = reach.geometry.get_z_min()
+            else:
+                z_min1 = reach1.geometry.get_z_min()
+                z_min2 = reach2.geometry.get_z_min()
+                zmin = list(
+                    map(
+                        lambda x, y: x - y,
+                        z_min2, z_min2
+                        )
+                    )
+            my_dict[dict_y["bed_elevation"]] = zmin
             # if envelop and reach.has_sediment():
         if "discharge" in y:
             my_dict[dict_y["discharge"]] = list(
@@ -744,13 +860,36 @@ class ResultsWindow(PamhyrWindow):
                 my_dict[dict_y["max_velocity"]] = [max(v) for v in velocities]
 
         if "depth" in y:
-            my_dict[dict_y["depth"]] = list(
+            if self._current_results != 2:
+                d = my_dict[dict_y["depth"]] = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
                             p.get_ts_key(timestamp, "Z")),
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.max_water_depth(
+                            p.get_ts_key(timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.max_water_depth(
+                            p.get_ts_key(timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+            my_dict[dict_y["depth"]] = d
             if envelop:
                 my_dict[dict_y["min_depth"]] = list(map(
                     lambda p1, p2: p1 - p2, map(
@@ -768,15 +907,39 @@ class ResultsWindow(PamhyrWindow):
                 )
 
         if "mean_depth" in y:
-            my_dict[dict_y["mean_depth"]] = list(
+            if self._current_results != 2:
+                d = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
                             p.get_ts_key(timestamp, "Z")),
                         reach.profiles
                     )
                 )
+            else:
+                d1 = list(
+                    map(
+                        lambda p: p.geometry.mean_water_depth(
+                            p.get_ts_key(timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                d2 = list(
+                    map(
+                        lambda p: p.geometry.mean_water_depth(
+                            p.get_ts_key(timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+            my_dict[dict_y["mean_depth"]] = d
         if "froude" in y:
-            my_dict[dict_y["froude"]] = list(
+            if self._current_results != 2:
+                fr = my_dict[dict_y["froude"]] = list(
                     map(
                         lambda p:
                             p.get_ts_key(timestamp, "V") /
@@ -789,32 +952,112 @@ class ResultsWindow(PamhyrWindow):
                         reach.profiles
                     )
                 )
+            else:
+                fr1 = list(
+                    map(
+                        lambda p:
+                            p.get_ts_key(timestamp, "V") /
+                            sqrt(9.81 * (
+                                p.geometry.wet_area(
+                                    p.get_ts_key(timestamp, "Z")) /
+                                p.geometry.wet_width(
+                                    p.get_ts_key(timestamp, "Z"))
+                                )),
+                        reach1.profiles
+                    )
+                )
+                fr2 = list(
+                    map(
+                        lambda p:
+                            p.get_ts_key(timestamp, "V") /
+                            sqrt(9.81 * (
+                                p.geometry.wet_area(
+                                    p.get_ts_key(timestamp, "Z")) /
+                                p.geometry.wet_width(
+                                    p.get_ts_key(timestamp, "Z"))
+                                )),
+                        reach2.profiles
+                    )
+                )
+                fr = list(
+                    map(
+                        lambda x, y: x - y,
+                        fr1, fr2
+                        )
+                    )
+            my_dict[dict_y["froude"]] = fr
         if "wet_area" in y:
-            my_dict[dict_y["wet_area"]] = list(
+            if self._current_results != 2:
+                wa = list(
                     map(
                         lambda p: p.geometry.wet_area(
                             p.get_ts_key(timestamp, "Z")),
                         reach.profiles
                     )
                 )
+            else:
+                wa1 = list(
+                    map(
+                        lambda p: p.geometry.wet_area(
+                            p.get_ts_key(timestamp, "Z")),
+                        reach1.profiles
+                    )
+                )
+                wa2 = list(
+                    map(
+                        lambda p: p.geometry.wet_area(
+                            p.get_ts_key(timestamp, "Z")),
+                        reach2.profiles
+                    )
+                )
+                wa = list(
+                    map(
+                        lambda x, y: x - y,
+                        wa1, wa2
+                        )
+                    )
+            my_dict[dict_y["wet_area"]] = wa
 
         return my_dict
 
-    def _export_time(self, profile, y):
+    def _export_time(self, profile, y, solver_id):
-        reach = self._results.river.reachs[self._get_current_reach()]
+        results = self._results[solver_id]
+        reach = results.river.reachs[self._get_current_reach()]
         profile = reach.profile(profile)
-        ts = list(self._results.get("timestamps"))
-        ts.sort()
         dict_x = self._trad.get_dict("values_x")
         dict_y = self._trad.get_dict("values_y")
         my_dict = {}
-        my_dict[dict_x["time"]] = ts
+        my_dict[dict_x["time"]] = self._timestamps
         z = profile.get_key("Z")
         q = profile.get_key("Q")
         v = profile.get_key("V")
+        if self._current_results == 2:
+            reach1 = self._results[0].river.reach(self._reach)
+            reach2 = self._results[1].river.reach(self._reach)
+            profile1 = reach1.profile(self._profile)
+            profile2 = reach2.profile(self._profile)
+
+            q1 = profile1.get_key("Q")
+            z1 = profile1.get_key("Z")
+            v1 = profile1.get_key("V")
+
+            q2 = profile2.get_key("Q")
+            z2 = profile2.get_key("Z")
+            v2 = profile2.get_key("V")
+
         if "bed_elevation" in y:
-            my_dict[dict_y["bed_elevation"]] = [
+            if self._current_results != 2:
-                profile.geometry.z_min()] * len(ts)
+                z_min = [profile.geometry.z_min()] * len(self._timestamps)
+            else:
+                z_min1 = profile1.geometry.z_min()
+                z_min2 = profile2.geometry.z_min()
+                z_min = list(
+                    map(
+                        lambda ts:  z_min1 - z_min2,
+                        self._timestamps
+                    )
+                )
+            my_dict[dict_y["bed_elevation"]] = z_min
         if "discharge" in y:
             my_dict[dict_y["discharge"]] = q
         if "water_elevation" in y:
@@ -822,24 +1065,151 @@ class ResultsWindow(PamhyrWindow):
         if "velocity" in y:
             my_dict[dict_y["velocity"]] = v
         if "depth" in y:
-            my_dict[dict_y["depth"]] = list(
+            if self._current_results != 2:
+                d = list(
                     map(lambda z: profile.geometry.max_water_depth(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.max_water_depth(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.max_water_depth(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+            my_dict[dict_y["depth"]] = d
         if "mean_depth" in y:
-            my_dict[dict_y["mean_depth"]] = list(
+            if self._current_results != 2:
+                d = list(
                     map(lambda z: profile.geometry.mean_water_depth(z), z)
                 )
+            else:
+                d1 = list(
+                    map(lambda z: profile1.geometry.mean_water_depth(z), z1)
+                )
+                d2 = list(
+                    map(lambda z: profile2.geometry.mean_water_depth(z), z2)
+                )
+                d = list(
+                    map(
+                        lambda x, y: x - y,
+                        d1, d2
+                        )
+                    )
+            my_dict[dict_y["mean_depth"]] = d
         if "froude" in y:
-            my_dict[dict_y["froude"]] = list(
+            if self._current_results != 2:
+                fr = my_dict[dict_y["froude"]] = list(
                     map(lambda z, v:
                         v / sqrt(9.81 * (
                             profile.geometry.wet_area(z) /
                             profile.geometry.wet_width(z))
                         ), z, v)
                     )
+            else:
+                fr1 = list(
+                    map(lambda z, v:
+                        v /
+                        sqrt(9.81 * (
+                            profile1.geometry.wet_area(z) /
+                            profile1.geometry.wet_width(z))
+                        ), z1, v1)
+                    )
+                fr2 = list(
+                    map(lambda z, v:
+                        v /
+                        sqrt(9.81 * (
+                            profile2.geometry.wet_area(z) /
+                            profile2.geometry.wet_width(z))
+                        ), z2, v2)
+                    )
+                fr = list(
+                    map(
+                        lambda x, y: x - y,
+                        fr1, fr2
+                        )
+                    )
+            my_dict[dict_y["froude"]] = fr
         if "wet_area" in y:
-            my_dict[dict_y["wet_area"]] = list(
+            if self._current_results != 2:
+                wa = list(
                     map(lambda z: profile.geometry.wet_area(z), z)
                 )
+            else:
+                wa1 = list(
+                    map(lambda z: profile1.geometry.wet_area(z), z1)
+                )
+                wa2 = list(
+                    map(lambda z: profile2.geometry.wet_area(z), z2)
+                )
+                wa = list(
+                    map(
+                        lambda x, y: x - y,
+                        wa1, wa2
+                        )
+                    )
+            my_dict[dict_y["wet_area"]] = wa
 
         return my_dict
+
+    def get_timestamps(self):
+        self._timestamps = sorted(list(self._results[0].get("timestamps")))
+
+    def tab_changed(self, i):
+        if i != 2:
+            if len(self._get_current_profiles_list()) > 1:
+                # unselect all profiles but the first one
+                profile_id = self._get_current_profile()
+                self.update_table_selection_profile(profile_id)
+
+    def import_geotiff(self):
+#        options = QFileDialog.Options()
+#        settings = QSettings(QSettings.IniFormat,
+#                             QSettings.UserScope, 'MyOrg', )
+#        options |= QFileDialog.DontUseNativeDialog
+#
+#        file_types = [
+#            self._trad["file_geotiff"],
+#            self._trad["file_all"],
+#        ]
+#
+#        filename, _ = QFileDialog.getOpenFileName(
+#            self,
+#            self._trad["open_file"],
+#            "",
+#            ";; ".join(file_types),
+#            options=options
+#        )
+#
+#        if filename != "":
+#            with rasterio.open(filename) as data:
+#                img = data.read()
+#                b = data.bounds[:]
+#                # b[0] left
+#                # b[1] bottom
+#                # b[2] right
+#                # b[3] top
+#                xlim = self.canvas.axes.get_xlim()
+#                ylim = self.canvas.axes.get_ylim()
+#                if b[2] > b[0] and b[1] < b[3]:
+#                    self.canvas.axes.imshow(img.transpose((1, 2, 0)),
+#                                            extent=[b[0], b[2], b[1], b[3]])
+#                else:
+#                    dlg = CoordinatesDialog(
+#                            xlim,
+#                            ylim,
+#                            trad=self._trad,
+#                            parent=self
+#                        )
+#                    if dlg.exec():
+#                        self.canvas.axes.imshow(img.transpose((1, 2, 0)),
+#                                                extent=dlg.values)
+#                self.plot_xy.idle()
+#                self.canvas.axes.set_xlim(xlim)
+#                self.canvas.axes.set_ylim(ylim)
+        return

src/View/Results/WindowAdisTS.py

@@ -49,7 +49,7 @@ from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
 from View.Results.PlotSedAdis import PlotAdis_dx, PlotAdis_dt
 
 from View.Results.CustomPlot.Plot import CustomPlot
-from View.Results.CustomExportAdis import (
+from View.Results.CustomExport.CustomExportAdis import (
     CustomExportAdisDialog,
 )
 
@@ -98,7 +98,8 @@ class ResultsWindowAdisTS(PamhyrWindow):
         )
 
         self._hash_data.append(self._solver)
-        self._hash_data.append(self._results)
+        self._hash_data.append(self._results._repertory)
+        self._hash_data.append(self._results._name)
 
         self._additional_plot = {}
         self._current_pol_id = [1]
@@ -380,8 +381,8 @@ class ResultsWindowAdisTS(PamhyrWindow):
                 self._results.pollutants_list[i.row()+1] for i in indexes
             ]
 
-        return (f"Reach: {reach.name} | " +
+        return (f"{self._trad['reach']}: {reach.name} | " +
-                f"Profile: {pname} | " +
+                f"{self._trad['cross_section']}: {pname} | " +
                 f"Pollutant: {', '.join(self.pollutant_label)} | " +
                 f"{self._trad['unit_time_s']} : {fts} ({ts} sec)")
 
@@ -554,15 +555,8 @@ class ResultsWindowAdisTS(PamhyrWindow):
         self.update(pol_id=rows)
 
     def _set_current_profile_raw_data(self):
-        table = self.find(QTableView, f"tableView_raw_data")
-        indexes = table.selectedIndexes()
-        if len(indexes) == 0:
         return
 
-        ind = indexes[0].row()
-        self.update(profile_id=ind)
-        self._slider_profile.setValue(ind)
-
     def _set_current_timestamp(self):
         timestamp = self._timestamps[self._slider_time.value()]
         self.update(timestamp=timestamp)
@@ -597,6 +591,25 @@ class ResultsWindowAdisTS(PamhyrWindow):
         self._reload_slider()
 
     def _copy(self):
+        # focus on raw data table
+        if self.find(QTabWidget, f"tabWidget").currentIndex() == 0:
+            table = self.find(QTableView, f"tableView_raw_data")
+            model = self._table["raw_data"]
+
+            coltext = []
+            for index in sorted(table.selectionModel().selectedRows()):
+                row = index.row()
+                rowtext = []
+                for column in range(model.columnCount()):
+                    i = model.createIndex(row, column)
+                    try:
+                        rowtext.append(str(model.data(i)))
+                    except AttributeError:
+                        rowtext.append("")
+                coltext.append(rowtext)
+
+            self.copyTableIntoClipboard(coltext)
+        else:
             logger.info("TODO: copy")
 
     def _paste(self):

src/View/Results/translate.py

@@ -42,7 +42,8 @@ class ResultsTranslate(MainTranslate):
         self._dict['day'] = _translate("Results", "day")
         self._dict['days'] = _translate("Results", "days")
 
-        self._dict['envelop'] = _translate("Results", "envelop")
+        self._dict['envelop'] = _translate("Results", "Envelop")
+        self._dict['solver'] = _translate("Results", "Solver")
 
         self._dict['x'] = _translate("Results", "X (m)")
 
@@ -52,6 +53,12 @@ class ResultsTranslate(MainTranslate):
             "Results",
             "Max water elevation"
         )
+        self._dict["file_all"] = _translate("Results", "All files (*)")
+        self._dict["file_geotiff"] = _translate(
+            "Results", "GeoTIFF file (*.tiff *.tif)")
+        self._dict["ImageCoordinates"] = _translate(
+            "Results", "Image coordinates"
+        )
 
         self._sub_dict["table_headers_reach"] = {
             "name": _translate("Results", "Reach name"),
@@ -62,10 +69,14 @@ class ResultsTranslate(MainTranslate):
         }
 
         self._sub_dict["table_headers_profile"] = {
-            "name": self._dict["name"],
+            "name": _translate("Results", "Profile name"),
             "rk": self._dict["unit_rk"],
         }
 
+        self._sub_dict["table_headers_solver"] = {
+            "solver": self._dict['solver'],
+        }
+
         self._sub_dict["table_headers_pollutants"] = {
             "name": _translate("Results", "Pollutant name"),
         }
@@ -134,3 +145,38 @@ class ResultsTranslate(MainTranslate):
             "unit_M": self._dict["unit_mass"],
             "unit_thickness": self._dict["unit_thickness"],
             }
+
+
+class CompareResultsTranslate(ResultsTranslate):
+    def __init__(self):
+        super(CompareResultsTranslate, self).__init__()
+
+        self._dict['label_water'] = u"Δ "+_translate(
+            "Results", "Water elevation"
+            )
+        self._dict['unit_elevation'] = u"Δ "+self._dict["unit_elevation"]
+
+        self._sub_dict["table_headers_raw_data"] = {
+            "name": _translate("Results", "Profile"),
+            "water_elevation": u"Δ "+self._dict["unit_water_elevation"],
+            "discharge": u"Δ "+self._dict["unit_discharge"],
+            "velocity": u"Δ "+self._dict["unit_velocity"],
+            "width": u"Δ "+self._dict["unit_width"],
+            "depth": u"Δ "+self._dict["unit_depth"],
+            "mean_depth": u"Δ "+self._dict["unit_mean_depth"],
+            "wet_area": u"Δ "+self._dict["unit_wet_area"],
+            "wet_perimeter": u"Δ "+self._dict["unit_wet_perimeter"],
+            "hydraulic_radius": u"Δ "+self._dict["unit_hydraulic_radius"],
+            "froude": u"Δ "+self._dict["unit_froude"],
+        }
+
+        self._sub_dict["values_y"] = {
+            "bed_elevation": u"Δ "+self._dict["unit_bed_elevation"],
+            "water_elevation": u"Δ "+self._dict["unit_water_elevation"],
+            "discharge": u"Δ "+self._dict["unit_discharge"],
+            "velocity": u"Δ "+self._dict["unit_velocity"],
+            "depth": u"Δ "+self._dict["unit_depth"],
+            "mean_depth": u"Δ "+self._dict["unit_mean_depth"],
+            "froude": u"Δ "+self._dict["unit_froude"],
+            "wet_area": u"Δ "+self._dict["unit_wet_area"],
+        }

src/View/RunSolver/Window.py

@@ -138,6 +138,107 @@ class SelectSolverWindow(PamhyrDialog):
         super(SelectSolverWindow, self).accept()
 
 
+class CompareSolversWindow(PamhyrDialog):
+    _pamhyr_ui = "CompareSolvers"
+    _pamhyr_name = "Compare solvers"
+
+    def __init__(self, study=None, config=None,
+                 parent=None):
+        self._solver1 = None
+        self._solver2 = None
+
+        name = _translate("Solver", "Compare solvers")
+        super(CompareSolversWindow, self).__init__(
+            title=name,
+            study=study,
+            config=config,
+            options=[],
+            parent=parent
+        )
+
+        self.setup_combobox1()
+        self.setup_combobox2()
+        self.setup_connections()
+        self.select_last_solver()
+
+    def setup_combobox1(self):
+        solvers = self._config.solvers
+        solvers_name = list(
+            map(
+                self._format_solver_name,
+                solvers
+            )
+        )
+
+        self.combobox_add_items("comboBox1", solvers_name)
+
+    def setup_combobox2(self):
+        solvers = self._config.solvers
+        solvers_name = list(
+            map(
+                self._format_solver_name,
+                solvers
+            )
+        )
+
+        self.combobox_add_items("comboBox2", solvers_name)
+
+    def setup_connections(self):
+        self.find(QPushButton, "pushButton_ok").clicked.connect(self.accept)
+        self.find(QPushButton, "pushButton_cancel")\
+            .clicked.connect(self.reject)
+
+    def select_last_solver(self):
+        solvers = self._config.solvers
+        last = self._config.last_solver_name
+
+        solver = list(
+            filter(
+                lambda s: s.name == last,
+                solvers
+            )
+        )
+
+        if len(solver) != 0:
+            self.set_combobox_text(
+                "comboBox1",
+                self._format_solver_name(solver[0])
+            )
+
+    def _format_solver_name(self, solver):
+        return f"{solver.name} - ({solver._type})"
+
+    @property
+    def solver1(self):
+        return self._solver1
+
+    @property
+    def solver2(self):
+        return self._solver2
+
+    def accept(self):
+        solver_name1 = self.get_combobox_text("comboBox1")
+        solver_name1 = solver_name1.rsplit(" - ", 1)[0]
+
+        self._solver1 = next(
+            filter(
+                lambda s: s.name == solver_name1,
+                self._config.solvers
+            )
+        )
+        solver_name2 = self.get_combobox_text("comboBox2")
+        solver_name2 = solver_name2.rsplit(" - ", 1)[0]
+
+        self._solver2 = next(
+            filter(
+                lambda s: s.name == solver_name2,
+                self._config.solvers
+            )
+        )
+
+        super(CompareSolversWindow, self).accept()
+
+
 class SolverLogWindow(PamhyrWindow):
     _pamhyr_ui = "SolverLog"
     _pamhyr_name = "Solver Log"

src/View/RunSolver/WindowAdisTS.py

@@ -414,9 +414,15 @@ class SolverLogWindowAdisTS(PamhyrWindow):
 
     def results(self):
         if self._results is None:
+            dir_list = os.listdir(self._workdir)
+            if "resultats" in dir_list:
+                dir_path = os.path.join(self._workdir, "resultats")
+            else:
+                dir_path = self._workdir
+
             def reading_fn():
                 self._results = self._solver.results(
-                    self._study, self._workdir, qlog=self._output
+                    self._study, dir_path, qlog=self._output
                 )
 
             dlg = ReadingResultsDialog(reading_fn=reading_fn, parent=self)

src/View/SelectReach/Window.py

@@ -0,0 +1,68 @@
+# Window.py -- Pamhyr
+# Copyright (C) 2023-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 View.Tools.PamhyrWindow import PamhyrDialog
+
+
+class SelectReachWindow(PamhyrDialog):
+    _pamhyr_ui = "SelectReach"
+    _pamhyr_name = "Select reach"
+
+    def __init__(self, study=None, config=None, trad=None, parent=None):
+
+        super(SelectReachWindow, self).__init__(
+            title=trad[self._pamhyr_name],
+            study=study,
+            config=config,
+            options=[],
+            parent=parent
+        )
+
+        self.setup_combobox()
+        self.select_current_reach()
+
+    def setup_combobox(self):
+        reaches = list(self._study.river.enable_edges())
+        reaches_name = [r.name for r in reaches]
+
+        self.combobox_add_items("comboBox", reaches_name)
+
+    def select_current_reach(self):
+        if self._study.river.has_current_reach():
+            reach = self._study.river.current_reach()
+            self.set_combobox_text(
+                "comboBox",
+                reach.name
+            )
+
+    def accept(self):
+        reach_name = self.get_combobox_text("comboBox")
+
+        reach = next(
+            filter(
+                lambda s: s.name == reach_name,
+                self._study.river.enable_edges()
+            )
+        )
+
+        self.reach = reach
+
+        super().accept()
+
+    def reject(self):
+        self.close()

src/View/Translate.py

@@ -39,6 +39,7 @@ class CommonWordTranslate(PamhyrTranslate):
 
         self._dict["reach"] = _translate("CommonWord", "Reach")
         self._dict["reaches"] = _translate("CommonWord", "Reaches")
+        self._dict["Select reach"] = _translate("CommonWord", "Select reach")
         self._dict["cross_section"] = _translate("CommonWord", "Cross-section")
         self._dict["main_channel"] = _translate("CommonWord", "Main channel")
         self._dict["floodway"] = _translate("CommonWord", "Floodway")
@@ -106,17 +107,15 @@ class UnitTranslate(CommonWordTranslate):
         self._dict["unit_min_velocity"] = _translate(
             "Unit", "Min Velocity (m/s)"
         )
-        self._dict["unit_discharge"] = _translate("Unit", "Discharge (m^3/s)")
+        self._dict["unit_discharge"] = _translate(
+                "Unit", "Discharge") + f" (m³/s)"
         self._dict["unit_discharge_envelop"] = _translate(
-            "Unit", "Discharge Envelop (m^3/s)"
+            "Unit", "Discharge Envelop") + " (m³/s)"
-        )
         self._dict["unit_max_discharge"] = _translate(
-            "Unit", "Max Discharge (m^3/s)"
+            "Unit", "Max Discharge") + " (m³/s)"
-        )
         self._dict["unit_min_discharge"] = _translate(
-            "Unit", "Min Discharge (m^3/s)"
+            "Unit", "Min Discharge") + " (m³/s)"
-        )
+        self._dict["unit_area_he"] = _translate("Unit", "Area (hectare)")
-        self._dict["unit_area"] = _translate("Unit", "Area (hectare)")
 
         self._dict["unit_time_s"] = _translate("Unit", "Time (sec)")
         self._dict["unit_time_p"] = _translate("Unit", "Time (JJJ:HH:MM:SS)")
@@ -136,7 +135,7 @@ class UnitTranslate(CommonWordTranslate):
         self._dict["unit_concentration"] = _translate(
             "Unit", "Concentration (g/l)"
         )
-        self._dict["unit_wet_area"] = _translate("Unit", "Wet Area (m²)")
+        self._dict["unit_wet_area"] = _translate("Unit", "Wet Area") + " (m²)"
         self._dict["unit_wet_perimeter"] = _translate(
             "Unit", "Wet Perimeter (m)"
         )
@@ -146,8 +145,7 @@ class UnitTranslate(CommonWordTranslate):
         self._dict["unit_froude"] = _translate("Unit", "Froude number")
         self._dict["unit_mass"] = _translate("Unit", "Mass (kg)")
         self._dict["unit_concentration"] = _translate(
-            "Unit", "Concentration (kg/m^3)"
+            "Unit", "Concentration") + " (kg/m³)"
-        )
 
 
 class MainTranslate(UnitTranslate):

src/View/ui/CompareSolvers.ui

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>320</width>
+    <height>80</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="locale">
+   <locale language="English" country="Europe"/>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QComboBox" name="comboBox1"/>
+   </item>
+   <item row="2" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_cancel">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_ok">
+       <property name="text">
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QComboBox" name="comboBox2"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/View/ui/EditBoundaryConditions.ui

@@ -70,6 +70,7 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="action_import"/>
    <addaction name="action_add"/>
    <addaction name="action_del"/>
    <addaction name="action_sort"/>
@@ -113,7 +114,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
+     <normaloff>ressources/sort_1-9.png</normaloff>ressources/sort_1-9.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
@@ -149,6 +150,18 @@
     <string>Remove points to make the curve increasing</string>
    </property>
   </action>
+  <action name="action_import">
+   <property name="icon">
+    <iconset>
+     <normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
+   </property>
+   <property name="text">
+    <string>Import</string>
+   </property>
+   <property name="toolTip">
+    <string>Import from file</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

src/View/ui/EditBoundaryConditionsAdisTS.ui

@@ -72,6 +72,7 @@
    </attribute>
    <addaction name="action_add"/>
    <addaction name="action_del"/>
+   <addaction name="action_sort"/>
   </widget>
   <action name="action_add">
    <property name="checkable">
@@ -106,6 +107,18 @@
     <string>Ctrl+D</string>
    </property>
   </action>
+  <action name="action_sort">
+   <property name="icon">
+    <iconset>
+     <normaloff>ressources/sort_1-9.png</normaloff>ressources/sort_1-9.png</iconset>
+   </property>
+   <property name="text">
+    <string>Sort</string>
+   </property>
+   <property name="toolTip">
+    <string>Sort points</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

src/View/ui/EditLateralContribution.ui

@@ -112,6 +112,18 @@
     <string>Sort points</string>
    </property>
   </action>
+  <action name="action_import">
+   <property name="icon">
+    <iconset>
+     <normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
+   </property>
+   <property name="text">
+    <string>Import</string>
+   </property>
+   <property name="toolTip">
+    <string>Import from file</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

src/View/ui/Frictions.ui

@@ -60,6 +60,7 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="action_import"/>
    <addaction name="action_add"/>
    <addaction name="action_del"/>
    <addaction name="action_sort"/>
@@ -107,6 +108,18 @@
     <string>Ctrl+E</string>
    </property>
   </action>
+  <action name="action_import">
+   <property name="icon">
+    <iconset>
+     <normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
+   </property>
+   <property name="text">
+    <string>Import</string>
+   </property>
+   <property name="toolTip">
+    <string>Import from file</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

src/View/ui/GeometryReach.ui

@@ -93,6 +93,7 @@
    <addaction name="action_update_rk"/>
    <addaction name="action_purge"/>
    <addaction name="action_shift"/>
+   <addaction name="action_select_reach"/>
   </widget>
   <action name="action_import">
    <property name="icon">
@@ -235,6 +236,14 @@
     <string>Shift selected sections coordinates</string>
    </property>
   </action>
+  <action name="action_select_reach">
+   <property name="text">
+    <string>Select reach</string>
+   </property>
+   <property name="toolTip">
+    <string>Change current reach</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>