Manifest: Minor change.

packages: Fix setup.sh.
ci: Minor fixe.
2026-10-30 03:20:41 +01:00 · 2024-07-01 09:54:22 +02:00 · 2024-05-29 11:39:18 +02:00 · 2024-05-29 11:15:10 +02:00 · 2024-05-29 11:12:02 +02:00 · 2024-05-29 11:09:07 +02:00
232 changed files with 7941 additions and 6285 deletions
@@ -270,7 +270,6 @@ flycheck_*.el


 # End of https://www.toptal.com/developers/gitignore/api/emacs
-
 # Created by https://www.toptal.com/developers/gitignore/api/qt
 # Edit at https://www.toptal.com/developers/gitignore?templates=qt

@@ -646,233 +645,3 @@ TSWLatexianTemp*
 *.glstex

 # End of https://www.toptal.com/developers/gitignore/api/latex
-
-# Created by https://www.toptal.com/developers/gitignore/api/intellij
-# Edit at https://www.toptal.com/developers/gitignore?templates=intellij
-
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
-.idea/**/sonarlint/
-
-# SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
-.idea/**/sonarIssues.xml
-
-# Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
-.idea/**/markdown-navigator/
-
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
-
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
-
-# Azure Toolkit for IntelliJ plugin
-# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
-.idea/**/azureSettings.xml
-
-# End of https://www.toptal.com/developers/gitignore/api/intellij
-
-# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode
-# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode
-
-### VisualStudioCode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-!.vscode/*.code-snippets
-
-# Local History for Visual Studio Code
-.history/
-
-# Built Visual Studio Code Extensions
-*.vsix
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
-
-# Created by https://www.toptal.com/developers/gitignore/api/linux
-# Edit at https://www.toptal.com/developers/gitignore?templates=linux
-
-### Linux ###
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# End of https://www.toptal.com/developers/gitignore/api/linux
-
-# Created by https://www.toptal.com/developers/gitignore/api/macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=macos
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### macOS Patch ###
-# iCloud generated files
-*.icloud
-
-# End of https://www.toptal.com/developers/gitignore/api/macos
-
-# Created by https://www.toptal.com/developers/gitignore/api/windows
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# End of https://www.toptal.com/developers/gitignore/api/windows
@@ -30,6 +30,7 @@ stages:

 variables:
  MAGE_8_VERSION: "v8.3.6"
+  CUSTOM_PYTHON_VERSION: "3.10.14-build2"

 dl-mage8-doc:
  stage: downloads
@@ -83,6 +84,21 @@ dl-mage8-windows:
      - mage8-windows/mailleurTT.exe
      - mage8-windows/libbief.dll

+dl-python-linux:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'setup.py' || $CI_COMMIT_TAG
+  script:
+    - curl -L -o python.tar.xz https://gitlab.irstea.fr/parouby/custom-python-build/-/releases/$CUSTOM_PYTHON_VERSION/downloads/python.tar.xz
+    - mkdir -p linux-python/
+    - cd linux-python
+    - tar xvf ../python.tar.xz
+  artifacts:
+    paths:
+      - linux-python
+
 #############
 # CONFIGURE #
 #############
@@ -408,6 +424,41 @@ windows-package-exe:
    - copy ..\packages\pamhyr.nsi pamhyr.nsi
    - .\make-windows-exe.bat

+linux-python-with-sources:
+  stage: package
+  tags:
+    - release
+    - linux
+  needs:
+    - job: dl-python-linux
+      artifacts: true
+    - job: set-version
+      artifacts: true
+    - job: build-lang
+      artifacts: true
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'setup.py' || $CI_COMMIT_TAG
+  artifacts:
+    paths:
+      - linux-sources-with-python.tar.xz
+  script:
+    - git archive --format=tar.gz --output=src.tar.gz origin/$CI_COMMIT_BRANCH
+    - cd linux-python
+    - mkdir -p pamhyr
+    - cd pamhyr
+    - tar xvf ../../src.tar.gz
+    - cp -v ../../VERSION ./
+    - cp -v ../../src/lang/*.qm ./src/lang/
+    - cd ..
+    - cp ../packages/setup.sh ./setup.sh
+    - sed -i 's|python3|$(dirname $0)/python/python|' setup.sh
+    - sed -i 's|.pamhyr-env|$(dirname $0)/.pamhyr-env|' setup.sh
+    - sed -i 's|./pamhyr|$(dirname $0)/pamhyr|' setup.sh
+    - cd ..
+    - mv linux-python pamhyr
+    - tar cf linux-sources-with-python.tar.xz pamhyr
+    - mv pamhyr linux-python # Keep 'pamhyr' path avalaible
+
 ########
 # HASH #
 ########
@@ -3,38 +3,53 @@
 Pamhyr is a free and open source graphical user interface for 1D hydro-sedimentary
 modelling of rivers.

-![logo](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/raw/master/src/View/ui/ressources/Pamhyr2_logo.png)
-
 ## Features

-+ Define a complex river hydraulics network
+ Edit a complex river hydraulics network
 + Define the river geometry
 + Define boundary conditions
 + Define lateral contribution
-+ Define river friction
-+ Define reservoirs
-+ Define hydraulic structures
-+ Define or generate initial conditions
-+ Define river sedimentary layers
+ Edit river friction
+ Add reservoirs
+ Add hydraulic structures
+ Generate initial conditions
+ Edit river sedimentary layers
 + Save the study in a unique file
 + Run Mage 8 on a study and visualize results

 Let see the
 [documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home)
-([:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home-fr),
-[:gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home-en))
 for more details.

 ## Install

 ### GNU/Linux

-See documentation:
- [French :fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20GNULinux)
- [English :gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux)
+[See documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux)

 ### Windows

-See documentation:
- [French :fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20Windows)
- [English :gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows)
+[See documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows)
+
+### From source code
+
+```shell
+# Get mage
+mkdir mage
+cd mage
+
+curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/v8.3.2/downloads/packages/mage_linux.tgz
+tar xf mage.tgz
+
+cd ..
+
+# Get Pamhyr2 source code
+git clone https://gitlab.irstea.fr/theophile.terraz/pamhyr/
+cd pamhyr
+
+# Install dependencies
+pip3 install -r requirements.txt
+
+# Run pamhyr
+./src/pamhyr.py
+```
@@ -1334,7 +1334,7 @@ https://gitlab.irstea.fr/theophile.terraz/pamhyr

 You can improve or add translation for the project. To contribute to
 Pamhyr2 translate, you need to use Qt Linguist[fn:qt-linguist]. Open
-Qt-linguist and edit the translation ({{{file(.ts)}}}) file, finally,
+Qt-linguist and edite the translation ({{{file(.ts)}}}) file, finally,
 commit the new version of file and make a merge request.

 If you want add a new language, edit the script
@@ -1,487 +0,0 @@
-# presentation.org -- Pamhyr
-# Copyright (C) 2023  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 -*-
-
-#+STARTUP: indent hideblocks content beamer
-
-#+TITLE: SimHydro 2023
-#+SUBTITLE: \textbf{Pamhyr2}: a graphical user interface for 1D hydro-sedimentary modelling of rivers
-
-# #+AUTHOR: Pierre-Antoine Rouby
-#+LATEX_HEADER: \author[Pierre-Antoine Rouby]{\textbf{Pierre-Antoine Rouby$^{*}$}, Benoît Camenen, Lionel Pénard, Léa Kieffer, Théophile Terraz\\\texttt{<pierre-antoine.rouby@inrae.fr>}^{*}}
-#+EMAIL: pierre-antoine.rouby@inrae.fr
-#+INSTITUTE: INRAE Lyon-Villerbanne, teams River Hydraulics
-#+LATEX_HEADER: \institute{INRAE Lyon-Villerbanne, River Hydraulics team}
-#+DATE: 9th November
-
-#+KEYWORDS: g ui, hydraulics, sedimentary, hydro-sedimentary, 1D modelling, freesoftware, foss
-
-#+OPTIONS: H:2 toc:t num:t author:nil
-#+LATEX_CLASS: beamer
-#+LATEX_CLASS_OPTIONS: [slideopt,A4,showboxes,svgnames,aspectratio=169]
-# #+LATEX_CLASS_OPTIONS: [presentation]
-#+BEAMER_THEME: default
-#+COLUMNS: %45ITEM %10BEAMER_ENV(Env) %10BEAMER_ACT(Act) %4BEAMER_COL(Col)
-
-#+LANGUAGE: fr
-#+LATEX_HEADER: \usepackage[frenchb]{babel}
-
-#+BEGIN_SRC emacs-lisp :results silent :exports none
-  (setq org-latex-pdf-process (list
-    "latexmk -pdflatex='lualatex -shell-escape -interaction nonstopmode' -pdf -f  %f"))
-
-  (add-to-list 'org-latex-packages-alist '("" "minted"))
-  (setq org-latex-listings 'minted)
-  (setq org-src-fontify-natively t)
-
-  (org-add-link-type
-   "cite" 'ebib
-   (lambda (path desc format)
-     (cond
-      ((eq format 'html)
-       (format "(<cite>%s</cite>)" path))
-      ((eq format 'text)
-       (format "[%s]" path))
-      ((eq format 'latex)
-       (if (or (not desc) (equal 0 (search "cite:" desc)))
-           (format "\\cite{%s}" path)
-         (format "\\cite[%s][%s]{%s}"
-                 (cadr (split-string desc ";"))
-                 (car (split-string desc ";"))  path))))))
-#+END_SRC
-
-#+LATEX_HEADER: \setbeamertemplate{footline}[frame number]
-#+LATEX_HEADER: \setbeamertemplate{headline}{}
-#+LATEX_HEADER: \usepackage{multirow}
-#+LATEX_HEADER: \usepackage{fontawesome5}
-#+LATEX_HEADER: \usepackage{tcolorbox}
-#+LATEX_HEADER: \usepackage{tikz}
-
-#+LATEX_HEADER: \logo{\includegraphics[width=.1\textwidth]{../../../../../src/View/ui/ressources/Logo-INRAE.png}}
-
-#+LATEX_HEADER: \newcommand{\R}[1]{\rotatebox[origin=c]{90}{#1}}
-
-# Beamer colors
-#+LATEX_HEADER: \setbeamersize{text margin left=0.5cm,text margin right=0.5cm}
-#+LATEX_HEADER: \setbeamerfont{alerted text}{series=\bfseries}
-#+LATEX_HEADER: \setbeamerfont{example text}{series=\bfseries}
-
-#+LATEX_HEADER: \definecolor{inrae_1}{RGB}{102,193,191}
-#+LATEX_HEADER: \definecolor{inrae_2}{RGB}{0,150,152}
-#+LATEX_HEADER: \definecolor{inrae_3}{RGB}{39,86,98}
-
-#+LATEX_HEADER: \setbeamercolor{alerted text}{fg=inrae_1}
-#+LATEX_HEADER: \setbeamercolor{structure}{fg=inrae_2}
-#+LATEX_HEADER: \setbeamercolor{normal text}{fg=inrae_3}
-#+LATEX_HEADER: \setbeamercolor*{author}{fg=inrae_3}
-
-#+LATEX_HEADER: \usepackage[absolute,showboxes,overlay]{textpos}
-
-#+LATEX_HEADER: \TPshowboxesfalse
-#+LATEX_HEADER: \textblockorigin{5mm}{0mm}
-
-# Biblio
-#+LATEX_HEADER: \usepackage{natbib}
-# #+LATEX_HEADER: \bibliographystyle{apalike}
-#+LATEX_HEADER: \setbeamertemplate{bibliography item}{}
-#+LATEX_HEADER: \renewcommand\bibfont{\scriptsize}
-#+LATEX_HEADER: \setbeamertemplate{frametitle continuation}[from second]
-#+LATEX_HEADER: \setbeamercolor*{bibliography entry title}{fg=inrae_3}
-#+LATEX_HEADER: \setbeamercolor*{bibliography entry author}{fg=inrae_3}
-#+LATEX_HEADER: \setbeamercolor*{bibliography entry location}{fg=inrae_3}
-
-#+LATEX_HEADER: \usepackage{bbding}
-#+LATEX_HEADER: \usepackage{pdfpages}
-
-# Renew title page
-#+LATEX_HEADER: \defbeamertemplate*{title page}{customized}[1][]
-#+LATEX_HEADER: {
-# #+LATEX_HEADER:   {
-# #+LATEX_HEADER:     \usebeamerfont{date}\usebeamercolor[fg]{date}
-# #+LATEX_HEADER:     \tikz[overlay,remember picture]
-# #+LATEX_HEADER:     \node[xshift=-1cm,yshift=-1cm,text width=10cm] at (current page.north east) {
-# #+LATEX_HEADER:        7$^{th}$ International Conference\\
-# #+LATEX_HEADER:        8TH-10TH November\\
-# #+LATEX_HEADER:        EDF Lab - CHATOU, FRANCE
-# #+LATEX_HEADER:     }
-# #+LATEX_HEADER:   }
-#+LATEX_HEADER:   {
-#+LATEX_HEADER:     \usebeamerfont{title}\inserttitle\par
-#+LATEX_HEADER:     \usebeamerfont{title}\usebeamercolor[fg]{title}
-#+LATEX_HEADER:     \large New modeling paradigms for water issues?\par
-#+LATEX_HEADER:   }
-#+LATEX_HEADER:   \bigskip
-#+LATEX_HEADER:   \begin{center}
-#+LATEX_HEADER:     \usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}
-#+LATEX_HEADER:     {
-#+LATEX_HEADER:       \LARGE\insertsubtitle\par
-#+LATEX_HEADER:     }
-#+LATEX_HEADER:     \bigskip
-#+LATEX_HEADER:     \usebeamerfont{author}\usebeamercolor[fg]{author}\insertauthor\par
-#+LATEX_HEADER:     \bigskip
-#+LATEX_HEADER:     \usebeamerfont{institute}\usebeamercolor[fg]{institute}\insertinstitute\par
-#+LATEX_HEADER:     \bigskip
-#+LATEX_HEADER:     \usebeamerfont{date}\usebeamercolor[fg]{date}\insertdate\par
-#+LATEX_HEADER:     \usebeamercolor[fg]{titlegraphic}\inserttitlegraphic
-#+LATEX_HEADER:   \end{center}
-#+LATEX_HEADER: }
-
-# #+LATEX_HEADER: \newcommand{\tred}[1]{\textcolor{rouge_inrae}{#1}}
-
-#+TODO: TODO WIP TOREVIEW | DONE
-
-#+MACRO: pamhyr \textsc{PAMHyR}
-#+MACRO: pamhyr2 \textsc{Pamhyr2}
-
-#+MACRO: pause \pause
-#+MACRO: framebreak \framebreak
-#+MACRO: no
-# #+MACRO: OK  \checkmark
-#+MACRO: OK  \faIcon{check}
-#+MACRO: bf \textbf{$1}
-
-# #+latex: \frame{\tocpage}
-
-* 1D hydro-sedimentary simulation at INRAE
-** COMMENT 1D river flow simulation
-*** INRAE (Lyon-Villerbanne)
-
- Mage [fn:: Mage: https://gitlab.irstea.fr/jean-baptiste.faure/mage]
- RubarBE [fn:: RubarBE:
-  https://gitlab.irstea.fr/theophile.terraz/rubarbe]
-
-*** Other project
-
- Mascaret [fn:: OpenTeleMac: http://www.opentelemac.org]
- HEC-RAS [fn:: HEC-RAS:
-  https://www.hec.usace.army.mil/software/hec-ras]
- Mike 11 [fn:: Mike11:
-  https://www.mikepoweredbydhi.com/products/mike-11]
-
-** {{{pamhyr}}}
-#+BEGIN_EXPORT latex
-\tikz[overlay,remember picture]
-\node[xshift=-4cm,yshift=4cm] at (current page.south east) {
-  \includegraphics[width=7cm]{../images/PAMHyR.png}
-};
-#+END_EXPORT
-
-{{{pamhyr}}} developed at INRAE in Java since the end of 90s
-
-*** Features
- Graphical user interface
- Define and edit complexe 1D river models
- Run a solver
- Visualize simulation results
-
-*** Compatibility
- 2 solvers *Mage and RubarBE*
-# - Multi-reaches (Only for Mage)
- Multi-platform (Linux / Windows)
-
-** {{{pamhyr}}}
-#+BEGIN_EXPORT latex
-\tikz[overlay,remember picture]
-\node[xshift=-4cm,yshift=4cm] at (current page.south east) {
-  \includegraphics[width=7cm]{../images/PAMHyR.png}
-};
-#+END_EXPORT
-
-*** Conception issues
- Monolingual French
- Interface too different for each solver
- Impossible to undo an action
-
-*** Huge technical debts
- Out dated technologies (UML $\to$ Java)
- Unmaintained library
- Unstable development process
-
-Hard to maintain or add features to the interface
-
-(No modification since 2016)
-
-* Presentation of {{{pamhyr2}}}
-** {{{Pamhyr2}}} - Needs - General constraints
-
-Create a new version of {{{pamhyr}}} called {{{pamhyr2}}}
-
-{{{pause}}}
-
-*** Constraints for users experience
-:PROPERTIES:
-:BEAMER_COL: 0.5
-:BEAMER_ENV: block
-:END:
-+ *User friendly*
-+ *Multi platform* (at least Linux and Windows)
-+ *Multi language* (at least English and French)
-+ *Multi solver* (as much as possible, at least Mage and
-  RubarBE)
-+ *Single save file* per study
-
-{{{pause}}}
-
-*** Constraints for developers experience
-:PROPERTIES:
-:BEAMER_COL: 0.5
-:BEAMER_ENV: block
-:END:
- *Common used* code library and tools
-# - *Modular* and *flexible* code
- *Clear* architecture
- *Free and open sources software* (FOSS)
-
-** {{{Pamhyr2}}} - Needs - Features
-# #+BEGIN_EXPORT latex
-# \tikz[overlay,remember picture]
-# \node[xshift=-5cm,yshift=-2cm] at (current page.north east) {
-#   \includegraphics[width=6cm]{../images/geometry_saar.png}
-# };
-# #+END_EXPORT
-
-**** {{{no}}}
-:PROPERTIES:
-:BEAMER_COL: 0.30
-:BEAMER_ENV: block
-:END:
- Define and edit data
-  + River network
-  + Geometry
-  + Boundary conditions
-  + Friction
-  + Initial conditions
-  + *Sedimentary layers*
- User meshed geometry
- Run a solver
- Display results
-  + Default visualisation
-  + *Customized visualisation*
-
-**** {{{no}}}
-:PROPERTIES:
-:BEAMER_COL: 0.70
-:BEAMER_ENV: block
-:END:
-[[../images/geometry_saar.png]]
-
-** {{{pamhyr2}}} - Technical choices
-#+BEGIN_EXPORT latex
-\tikz[overlay,remember picture]
-\node[xshift=-9.3cm,yshift=-4cm] at (current page.north east) {
-  \includegraphics[width=6.3cm]{../images/BC.png}
-};
-#+END_EXPORT
-
-*** Technologies
-:PROPERTIES:
-:BEAMER_COL: 0.60
-:BEAMER_ENV: block
-:END:
- *Python*
- *PyQt*
- Qt Designer
- Qt Linguist
- *Matplotlib*
- SQLite (as =*.pamhyr=)
- *GPLv3* license (strong copyleft)
-
-*** Architecture
-:PROPERTIES:
-:BEAMER_COL: 0.35
-:BEAMER_ENV: block
-:END:
- Qt Model/View
- Multiple solvers configuration
- *Unified interface*, as much as possible
-
-** {{{pamhyr2}}} - State of the project
-#+BEGIN_EXPORT latex
-\tikz[overlay,remember picture]
-\node[xshift=-4.5cm,yshift=-2.5cm] at (current page.north east) {
-  \includegraphics[width=8cm]{../images/apply_sedi.png}
-};
-#+END_EXPORT
-
-*** {{{no}}}
-:PROPERTIES:
-:BEAMER_COL: 0.40
-:BEAMER_ENV: block
-:END:
-
-\vspace{-1.5cm}
-
-\begin{center}
-\emph{Last version:} \texttt{v0.0.3}
-\end{center}
-
-{{{pause}}}
-
-#+latex: \begin{center}
-#+latex: \resizebox{0.9\columnwidth}{!}{
-# #+caption: Tools by methods
-#+name: tab:current-state
-#+attr_latex: :align |l|c|
-|---------------------------------+-----------------|
-| {{{bf(Features)}}}              | {{{bf(State)}}} |
-|---------------------------------+-----------------|
-| Create save and load study      | {{{OK}}}        |
-| *Undo/Redo actions*             | {{{OK}}}        |
-| Edit river network              | {{{OK}}}        |
-| Edit geometry                   | {{{OK}}}        |
-| Edit boundary conditions        | {{{OK}}}        |
-| Edit lateral contributions      | {{{OK}}}        |
-| Edit frictions (Stricklers)     | {{{OK}}}        |
-| Edit initial conditions         | {{{OK}}}        |
-| *Edit sedimentary layers*       | {{{OK}}}        |
-| Edit hydraulics structures      |                 |
-| Edit suspended sediment         |                 |
-| Edit polluant                   |                 |
-| Use meshing tool                | WIP             |
-| Run a solver                    | {{{OK}}}        |
-| Read and display results        | {{{OK}}}        |
-| Customize results visualisation | WIP             |
-| Generic solver input/output     |                 |
-|---------------------------------+-----------------|
-#+latex: }
-#+latex: \end{center}
-
-{{{pause}}}
-
-*** {{{no}}}
-:PROPERTIES:
-:BEAMER_COL: 0.60
-:BEAMER_ENV: block
-:END:
-
-\vspace{2.5cm}
-
-#+latex: \begin{center}
-#+latex: \resizebox{0.8\columnwidth}{!}{
-# #+caption: Tools by methods
-#+name: tab:current-state-solver
-#+attr_latex: :align |l|c|c|c|
-|----------------------------+----------------+-------------------+--------------------|
-| {{{bf(Usage)}}}            | {{{bf(Mage)}}} | {{{bf(RubarBE)}}} | {{{bf(Mascaret)}}} |
-|----------------------------+----------------+-------------------+--------------------|
-| *Hydraulics* (mono reach)  | {{{OK}}}       |                   | {{{OK}}}           |
-| *Hydraulics* (multi reach) | {{{OK}}}       |                   |                    |
-| *Bed load evolution*       | {{{OK}}}       |                   |                    |
-|----------------------------+----------------+-------------------+--------------------|
-#+latex: }
-#+latex: \end{center}
-
-# #+LaTeX: \vspace{0.3cm}
-
-#+latex: \begin{center}
-#+latex: \resizebox{0.6\columnwidth}{!}{
-# #+caption: Tools by methods
-#+name: tab:current-state-package
-#+attr_latex: :align |l|c|c|
-|--------------------+---------------------+-------------------|
-| {{{bf(Packages)}}} | {{{bf(GNU/Linux)}}} | {{{bf(Windows)}}} |
-|--------------------+---------------------+-------------------|
-| Archive (tar/zip)  | {{{OK}}}            | {{{OK}}}          |
-| Installer          |                     | {{{OK}}}          |
-|--------------------+---------------------+-------------------|
-#+latex: }
-#+latex: \end{center}
-
-* Future work and perspective
-** Future work
-#+BEGIN_EXPORT latex
-\tikz[overlay,remember picture]
-\node[xshift=-4.8cm,yshift=-3.8cm] at (current page.north east) {
-  \includegraphics[width=8.7cm]{../images/results_hydro.png}
-};
-#+END_EXPORT
-
-*** Next step
- *Meshing tools integration*
- *Custom results visualisation*
-  + Python + matplotlib script
- RubarBE integration
- Hydraulics structures
- Unified graphics theme
-
-*** Open questions
- Generic solver input/output (HDF5? CGNS? SQLite?)
- GNU/Linux packages (Pip? Conda? Guix? Deb?)
-
-** Contribution
-#+LaTeX: \begin{center}
-\faIcon{gitlab} https://gitlab.irstea.fr/theophile.terraz/pamhyr/
-#+LaTeX: \end{center}
-
-*** For users
-:PROPERTIES:
-:BEAMER_COL: 0.45
-:BEAMER_ENV: block
-:END:
- Try {{{pamhyr2}}}
- Report bug
- Propose improvement
- Improve translation
- Improve user documentation
- Improve tests cases examples
- /Find better project name/
-
-*** For developers
-:PROPERTIES:
-:BEAMER_COL: 0.45
-:BEAMER_ENV: block
-:END:
- Add new solver / features
- Improve sources code
- Improve developers documentation
- Improve unit tests
-
-# * Conclusion
-** Thanks for listening
-# #+BEGIN_EXPORT latex
-# \tikz[overlay,remember picture]
-# \node[xshift=-6cm,yshift=-1.5cm,text width=10cm] at (current page.north east) {
-#    {\small\emph{\alert{Journées de la modélisation 1D hydro-sédimentaire} (in french) -}
-#    \emph{30 \& 31 janvier 2024, INRAE Villeurbanne - }
-#    \emph{Information and inscription: }\texttt{<benoit.camenen@inrae.fr>}}
-# };
-# #+END_EXPORT
-
-#+LaTeX: \begin{center}
-\faIcon{gitlab} https://gitlab.irstea.fr/theophile.terraz/pamhyr/
-#+LaTeX: \end{center}
-
-#+LaTeX: \begin{center}
-/*Journées de la modélisation 1D hydro-sédimentaire*/ (in French)
-#+LaTeX: \\
-/30 & 31 janvier 2024/, INRAE Villeurbanne
-#+LaTeX: \\
-Information and registration: =<benoit.camenen@inrae.fr>=
-#+LaTeX: \end{center}
-
- {{{pamhyr2}}} developers:
-  + =<pierre-antoine.rouby@inrae.fr>=,
-  + =<theophile.terraz@inrae.fr>=
- Mage/RubarBE developer:
-  + =<theophile.terraz@inrae.fr>=
-
-# #+LaTeX: \vspace{0.5cm}
-# #+LaTeX: \begin{center}
-# #+LaTeX: {\Large
-# *Thanks for listening*
-# #+LaTeX: }
-# #+LaTeX: \end{center}
@@ -11,8 +11,7 @@
 \usepackage[absolute]{textpos}
 \usepackage{titlesec}
 \usepackage{amssymb}
-\usepackage[minted,xparse,breakable]{tcolorbox}
-\usepackage{pmboxdraw}
+\usepackage{tcolorbox}

 \usepackage{enumitem}
 \setlist[enumerate]{itemsep=-0.5em}
@@ -134,7 +133,6 @@
 \setminted[c]{fontsize=\footnotesize,encoding=utf8,linenos}
 \setminted[c++]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
 \setminted[python]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
-\setminted[sql]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
 \setminted[shell]{breaklines,fontsize=\footnotesize,encoding=utf8}
 \setminted[scheme]{breaklines,fontsize=\footnotesize,encoding=utf8}
 \setminted[commun-lisp]{breaklines,fontsize=\footnotesize,encoding=utf8}
@@ -142,7 +140,7 @@
 \setminted[llvm]{breaklines,fontsize=\footnotesize,encoding=utf8}

 %% Add box arrond of minted
-\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[breakable, boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
+\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
 \AfterEndEnvironment{minted}{\end{tcolorbox}}%

 \makeatletter
@@ -1,6 +1,4 @@
 #! /bin/sh

-pdflatex -no-shell-escape step-by-step.tex
 pdflatex -no-shell-escape step-by-step.tex
 pdflatex -no-shell-escape pas-a-pas.tex
-pdflatex -no-shell-escape pas-a-pas.tex
@@ -0,0 +1,2 @@
+0:00:00:00	15
+0:00:01:00	15
@@ -0,0 +1,25 @@
+**************** SINGULARITES **********************
+*BieSec Nb Longueur  Cote dev Cote charg Coef deb            Impression         
+*===---===----------==========----------==========----------------------------- 
+*****************************************************
+* Bief n°  1
+*****************************************************
+* Ouvrage au pk 36270.0  seuil_aval
+*SeuilR type D
+D  1  36270.00    18.250    15.500     0.000     0.400 99999.000 seuil palplanches
+* Ouvrage au pk 31875.0  PontRS101
+*OrificeR type O
+O  1  31875.00     9.660    18.710    21.890     0.400  9999.000 
+*SeuilR type D
+D  1  31875.00    14.000    22.890     0.000     0.400 99999.000 
+* Ouvrage au pk 34335.0  PontThivencelle
+*SeuilR type D
+D  1  34335.00    13.000    21.740     0.000     0.400 99999.000 
+*OrificeR type O
+O  1  34335.00     9.070    17.280    20.740     0.400  9999.000 
+*****************************************************
+* Bief n°  3
+*****************************************************
+* Ouvrage au pk 0.0  Orifice
+*OrificeR type O
+*O  3     0.000     6.000    19.000    19.001     0.400    20.000 Clapet_001
@@ -0,0 +1,2 @@
+0:00:00:00	4
+0:00:01:00	4
@@ -0,0 +1,24 @@
+16,03	0
+16,13	1,29
+16,23	3,64
+16,33	6,7
+16,43	10,31
+16,53	14,41
+16,63	18,94
+16,73	23,87
+16,83	29,16
+16,93	34,79
+17,03	40,75
+17,13	47,01
+17,23	53,57
+17,33	60,4
+17,43	67,5
+17,53	74,86
+17,63	82,47
+17,73	90,33
+17,83	98,41
+17,93	106,73
+18,03	115,26
+18,13	124,01
+18,23	132,98
+18,33	142,14
@@ -80,7 +80,7 @@ RiverLy, Hydraulique des rivi

 \begin{center}
 \begin{tabular}{lll}
-Auteurs : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
+Autors : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
 & Théophile TERRAZ & theophile.terraz@inrae.fr\tabularnewline
 & Lionel Pénard & lionel.penard@inrae.fr\tabularnewline

@@ -110,64 +110,43 @@ Auteurs : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline

 Pamhyr2 peut être téléchargé ici : \url{https://gitlab.irstea.fr/theophile.terraz/pamhyr}.

-Si vous arrivez sur une fenêtre de connexion, cliquez sur "parcourir la liste des dépôts publics" et cherchez l'URL donnée plus haut.
-Utilisez le bouton de téléchargement GNU Linux ou Windows en fonction de votre système.
-
 \begin{center}
 \includegraphics[width=15cm]{img/dl.png}
 \par\end{center}

-Décompressez l'archive et lancez Pamhyr2.
+
+Utilisez le bouton de téléchargement GNU Linux ou Windows en fonction de votre système. Sous Windows, lancez le programme d'installation. Sous Linux, décompressez l'archive et lancez Pamhyr2.
+

 \section{Créer une première étude}

-Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude.
-Choisissez un nom, par exemple \textit{Hogneau}, et validez.
+Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude. Choisissez un nom, par exemple Hogneau, et validez

-\begin{center}
-\includegraphics[width=15cm]{img/NEWSTUDY.png}
-\par\end{center}
+Cliquez sur \texttt{[Réseau] => [Editer le réseau]} pour créer les biefs de votre rivière. Dans cette fenêtre, vous devez définir un graphe orienté qui représente les biefs de votre réseau fluvial : les arêtes sont les biefs et les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
+Appuyez sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud. Appuyez à nouveau sur \includegraphics[width=0.5cm]{img/gtk_add.png} pour quitter le mode \textit{Ajout}. Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval. Dans la partie inférieure de la fenêtre \textit{Editer le réseau hydrographique}, vous pouvez renommer les n½uds et les biefs. Comme le bief que vous avez créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief. La fenêtre doit se présenter comme suit :

-Pendant que vous travaillez sur votre étude, n'oubliez pas de sauvegarder régulièrement, à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} de la fenêtre principale.
-
-\section{Créer la structure de la rivière}
-
-Cliquez sur \texttt{[Réseau] => [Éditer le réseau]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} pour créer la structure de votre rivière.
-Nous voici dans la fenêtre \textit{Réseau}.
-Dans cette fenêtre, nous allons définir un graphe orienté qui représente les biefs de notre réseau fluvial : les arêtes sont les biefs, les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
-Un bief par défaut existe dans la nouvelle étude.
-Pour les besoins de ce tutoriel, nous allons le supprimer :
-cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} pour entrer dans le mode \textit{Suppression} puis cliquez sur les n½uds.
-Nous voilà repartis sur une fenêtre vierge.
-Appuyez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud.
-Appuyez à nouveau sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour quitter le mode \textit{Ajout}.
-Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval.
-Dans la partie inférieure de la fenêtre \textit{Réseau}, vous pouvez renommer les n½uds et les biefs.
-Comme le bief que nous avons créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief.
-La fenêtre doit se présenter comme suit :

 \begin{center}
 \includegraphics[width=15cm]{img/network.png}
 \par\end{center}

-Fermez la fenêtre \textit{Réseau}.

-\section{Éditer la géométrie de la rivière}
+Fermer la fenêtre \textit{Editer le réseau}.
+
+
+\section{Editer la géometrie de la rivière}
+
+Cliquez sur \texttt{[Géometrie] => [Editer la géometrie]} pour définir la géométrie du bief sélectionné. Cliquez sur le bouton \texttt{[Importer]} et sélectionnez le fichier \texttt{Data/Bief\_1.st}. Vous devriez voir :

-Cliquez sur \texttt{[Géométrie] => [Éditer 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électionné.
-Pour Importer une géométrie depuis un fichier, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png}.
-Sélectionnez le fichier \texttt{Data/Bief\_1.st}.
-Vous devriez voir :

 \begin{center}
 \includegraphics[width=15cm]{img/Geo.png}
 \par\end{center}

-Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK).
-Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière; dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs).
-Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou sur les sections dans les deux vues du haut.

-Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
+Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK). Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière, dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs). Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou à l'aide de l'ascenseur situé entre le tableau et les graphiques.
+
+Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"img/edit.png"}.

 Sélectionnez la section en travers nommée \textit{PontRD101m} et ouvrez la fenêtre d'édition. Vous devriez voir :

@@ -175,268 +154,145 @@ S
 \includegraphics[width=15cm]{img/editsect.png}
 \par\end{center}

-Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale.
-La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom.
-Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice).
-Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.

-Sur le graphique figure une projection de la section en travers.
-Vous pouvez utiliser \texttt{[clic droit]} pour afficher une ligne d'eau fictive et visualiser des données géométriques utiles.
-Vous pouvez ensuite enlever cette ligne avec \texttt{[clic molette]}.
-Vous pouvez maintenant fermer la fenêtre d'édition de la section en travers.
+Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale. La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom. Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice). Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.

-Revenons à la fenêtre \textit{Géométrie}.
-Le jeu de sections importé est inégalement espacé, ce qui peut entraîner des difficultés de calcul.
-Nous allons utiliser l'outil de maillage pour interpoler des nouvelles sections entre les sections trop espacées.
-Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/meshing.png"}.
-Dans la fenêtre \textit{Maillage}, vous avez accès à quelques options basiques.
-L'option \textit{Limites} vous permet de définir deux sections entre lesquelles le maillage sera effectué.
-L'option \textit{Lignes directrices pour le calcul des distances} permet de spécifier au mailleur les points sur lesquels calculer les distances entre les sections.
-La distance sera la moyenne des deux distances entre les points de chaque sections qui portent ces lignes directrices.
-Pour ne choisir qu'une seule ligne, rentrez simplement deux fois la même valeur.
-Il existe toujours au moins deux lignes directrices : les deux extrémités des sections, nommés \textit{un} et \textit{np}, même si les points correspondants ne portent pas de nom.
-Les options \textit{Paramètres} permettent de définir l'interval souhaité entre les nouvelles sections, et la méthode d'interpolation.
-Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
+Sur le graphique figure une projection de la section en travers. Vous pouvez utiliser \texttt{[ctrl + clic]} pour sélectionner un point dans le tracé et \texttt{[maj + clic]} pour sélectionner une ligne d'eau et visualiser des données géométriques utiles. Vous pouvez fermer la fenêtre d'édition de la section en travers et la fenêtre d'édition de la géométrie.

-\begin{center}
-\includegraphics[width=15cm]{img/maillage.png}
-\par\end{center}
+\section{Editer les conditions aux limites}

-% L'option d'interpolation \textit{Spline} modifie les longueurs longitudinales.
-% Les abscices en long (Pk) des sections sont donc obsolètes.
-% Pour les recalculer, cliquez sur \texttt{[Mise à jour des PK]} dans la fenêtre \textit{Géométrie}.
-% Vous êtes maintenant dans la fenêtre \textit{Mise à jour des PK}.
-% Vous pouvez choisir la section d'origine pour le calcul des PK, ainsi que la valeur du PK à cette section.
-% Le choix des deux lignes directrices sert à calculer les distances entre sections, comme dans la fenêtre \textit{Maillage}.
-% L'orientation vous permet de choisir dans quelle direction les PK seront croissants.
-% Cette option n'a pas d'impact sur les résultats du calcul hydraulique.
-% Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
-%
-% \begin{center}
-% \includegraphics[width=15cm]{img/mjpk.png}
-% \par\end{center}
-
-La fenêtre \textit{Géométrie} doit maintenant ressembler à ça :
-
-\begin{center}
-\includegraphics[width=15cm]{img/Geo2.png}
-\par\end{center}
-
-
-\section{Éditer les conditions aux limites}
-
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
-Vous arrivez sur la fenêtre \textit{Conditions aux limites} :
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} :

 \begin{center}
 \includegraphics[width=15cm]{img/boundary.png}
 \par\end{center}

-Utilisez le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
-Nous pouvons cliquer sur la nouvelle ligne pour sélectionner la ligne en entier, et double-cliquer pour sélectionner une seule cellule.
-Ici, nous définirons le débit mesuré lors de la crue de février 2002.
-Sélectionnez la cellule \textit{Nom} pour donner un nom à la condition limite par exemple "crue2002".
-Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi \textit{Q(t)} : débit en fonction du temps (hydrogramme).
-Sélectionnez la cellule \textit{N½ud} et attribuez cette condition au n½ud amont.
-Les noms des n½uds sont rappelés dans le panneau de droite, avec une vue du réseau.
-Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
-Vous avez ouvert la fenêtre \textit{Éditer les conditions aux limites}.
-Dans un éditeur de texte, ouvrez le fichier \texttt{data/Fevrier\_2002.txt}.
-Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau de gauche de la fenêtre \textit{Éditer les conditions aux limites} avec \textit{ctrl+v}.
-Vous pouvez maintenant voir la courbe de débit :
+
+ Utilisez le bouton \textit{ajouter} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
+ Sur la nouvelle ligne, on peut cliquer pour sélectionner la ligne entière, et double-cliquer pour sélectionner la cellule.
+ Sélectionnez la cellule \textit{Type} pour donner un nom à la condition limite. Ici, nous définirons le débit mesuré lors de la crue de février 2002. Vous pouvez nommer cette condition limite "crue2002".
+ Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi Q(t).
+ Sélectionnez la cellule \textit{Noeud} et attribuez cette condition au noeud amont.
+ Les noms des noeuds sont rappelés dans le réseau du panneau de droite.
+ Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"img/edit.png"}. Vous avez ouvert la fenêtre \textit{Éditer les conditions aux limites}.
+ Dans un éditeur de texte, ouvrez le fichier \texttt{Données/Fevrier\_2002.txt}. Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau gauche de la fenêtre \textit{Éditer les conditions aux limites} avec \textit{ctrl+v}. Vous pouvez maintenant voir la courbe de débit :

 \begin{center}
 \includegraphics[width=15cm]{img/fev2002.png}
 \par\end{center}

-Fermez cette fenêtre. Revenez sur la fenêtre \textit{Conditions aux limites}.
-Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Z(T)} (limnigramme) et associez là au n½ud aval du réseau.
-Ouvrez la fenêtre d'édition des conditions aux limites (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
-Ajoutez deux lignes et rentrez les valeurs suivantes :
-\begin{center}
-\begin{tabular}{|c|c|}
-\hline
-temps & cote \\ \hline
-0.00.00 & 15.000\\ \hline
-1.00.00 & 15.000\\ \hline
-\end{tabular}\\
-\par\end{center}
-Cela crée une cote constante de l'eau en aval.
-Pour le calcul, le solveur extrapolera continûment l'élévation de l'eau si le temps de la simulation dépasse le dernier point de la courbe.
-Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.

-% Fermer cette fenêtre.
-% Revenez sur la fenêtre \textit{Conditions aux limites}.
-% Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Q(Z)} (courbe de tarage) et associez-la au noeud aval du réseau.
-% Cette condition limite se trouve au niveau d'un seuil.
-% A cet endroit, l'écoulement passe d'un régime fluvial à un régime torentiel.
-% Nous allons donc calculer une courbe de tarage qui correspond au régime critique de l'écoulement au niveau du seuil.
-% Sélectionnez la condition limite et ouvrez la fenêtre \textit{Éditer les conditions aux limites} :  (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
-% Dans la fenêtre \textit{Éditer les conditions aux limites} cliquez sur \texttt{[Générer régime critique]} pour générer cette courbe.
-% Cliquez ensuite sur \texttt{[Rendre croissant]} pour suprimer les points de la courbe qui ne sont pas strictement croissants.
-% Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.
+Fermer cette fenêtre. Revenir sur la fenêtre \textit{Conditions aux limites}. Ajouter une nouvelle ligne, lui donner un nom, lui donner le type \textit{Z(T)} et l'associer au noeud aval du réseau. Ouvrez la fenêtre \textit{Éditer les conditions aux limites} (\includegraphics[width=0.5cm]{"img/edit.png"}). Ajoutez deux lignes. Dans la première, entrez le temps : 0.00.00 et Z : 15.000.
+Dans la seconde, saisissez le temps : 1.00.00 et Z : 15.000. Cela crée une côte constante de l'eau en aval. Pour le calcul, Mage extrapolera continuellement l'élévation de l'eau.
+Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.

 \section{Créer les conditions initiales}

-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]} ou sur le raccourci \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
-Pour démarrer, le code de calcul hydraulique a besoin de connaître le débit et la cote de la surface libre de la rivière en tout point à l'instant initial.
-Si vous ne connaissez pas ces conditions initiales, vous pouvez utiliser les boutons \texttt{[Générer une profondeur uniforme]}, \texttt{[Générer un débit uniforme]} ou \texttt{[Générer une cote uniforme]} pour laisser Pamhyr2 estimer une condition initiale.
-Cliquez sur \texttt{[Générer un débit uniforme]} et saisissez un débit de 4 m$^3$/s dans la fenêtre contextuelle, et cochez \texttt{[Générer une profondeur]} pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler pour le débit donné.
-Vous devriez voir :
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]}.
+Si vous ne connaissez pas les conditions initiales de la côte de l'eau et du débit de la rivière, vous pouvez utiliser les boutons \texttt{[Générer une hauteur minimale]} ou \texttt{[Générer un débit constant]} pour laisser Pamhyr2 estimer une condition initiale à l'aide de la formule de Manning-Strickler.
+Cliquez sur \texttt{[Générer à partir du débit]} et saisissez un débit de $4 m^3$ dans la fenêtre contextuelle pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler et un débit uniforme de $4 m^3$. Vous devriez voir :


 \begin{center}
 \includegraphics[width=15cm]{img/ic.png}
 \par\end{center}

-% Vous pouvez également utiliser \texttt{[Générer une cote uniforme]} et saisir une cote de 21 m à l'amont et à l'aval avec un débit nul.
-% Cela revient à créer une bassine et à laisser le solveur la vider pour trouver un écoulement initial satisfaisant.

-Lors des prochaines simulations, vous pourrez utiliser l'état final de la simulation précédente comme état initial.
-Pour cela, cliquez sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} et retrouvez le résultat sous forme de fichier \textit{.BIN}.
-Ce fichier de résultats se trouve normalement dans le sous-dossier \texttt{\_PAMHYR\_/Hogneau/default-mage}.
-
-Fermer la fenêtre \textit{Conditions initiales}.
+Fermer la fenêtre \textit{Conditions initiales}


-\section{Éditer les coefficients de frottement}
+\section{Editer les coefficients de frottement}
+
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Editer les frottements]}.
+Vous devez d'abord définir des jeux de coefficients de Strickler. Cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour ouvrir la fenêtre \textit{Strickler}. Vous pouvez y créer des couples de coefficients de Strickler, le premier pour le lit mineur, le second pour le lit moyen. Cliquez quatre fois sur \textit{add} pour créer quatre nouveaux couples. Donnez-leur les valeurs suivantes :

-Nous allons maintenant définir les coefficients de frottement du fond de la rivière.
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Éditer les frottements]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"}.
-Dans un premier temps, vous devez définir des jeux de coefficients de Strickler.
-Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour ouvrir la fenêtre \textit{coefficients de Strickler}.
-Vous pouvez y créer des couples de coefficients de Strickler, le premier pour le lit mineur, le second pour le lit moyen.
-Cliquez quatre fois sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre nouveaux couples.
-Donnez-leur les valeurs suivantes :

 \begin{center}
 \includegraphics[width=15cm]{img/K.png}
 \par\end{center}

-Vous pouvez utiliser le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} pour trier les couples par ordre alphadétique.
-Fermez la fenêtre \textit{Strickler}.

-Dans la fenêtre \textit{Éditer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre zones de frottement.
-Chaque zone est définie par un PK de \textit{début} et de \textit{fin} associés à un couple de coefficients de Strickler.
-% Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{début} et \textit{fin}.
-% Dans notre cas, nous utiliserons des coefficients uniformes par zone.
-Définissez les zones comme suit :
+Fermez la fenêtre \textit{Strickler}. Dans la fenêtre \textit{Editer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour créer quatre zones de frottement. Chaque zone est définie par un PK \textit{début} et de \textit{fin} PK et un couple \textit{begin} et \textit{end} couple de Strickler. Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{begin} et \textit{end}. Dans notre cas, nous utiliserons des coefficients constants par zone. Définissez les zones comme suit :
+

 \begin{center}
 \includegraphics[width=15cm]{img/frictions.png}
 \par\end{center}

-La zone sélectionnée est surlignée en bleu.
-Vous pouvez maintenant fermer la fenêtre \textit{Éditer les frottements}.
+
+La zone sélectionnée est surlignée en bleu. Fermez la fenêtre \textit{Editer les frottements}.
+

 \section{Modélisation des ouvrages hydrauliques}

-Parfois, il peut y avoir des sections en travers dans lesquelles les équations de Saint-Venant ne peuvent pas être utilisées pour modéliser l'écoulement de l'eau.
-Dans ce cas, nous devons définir une autre loi pour relier la cote de l'eau et le débit.
-C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée et que l'écoulement passe en charge.
-Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrables.
-Dans notre cas, nous allons devoir modéliser deux ponts et un seuil par des ouvrages hydrauliques.
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques.
-Cliquez trois fois sur le bouton \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour créer trois ouvrages hydrauliques.
-% Cliquez deux fois sur le bouton \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour créer deux ouvrages hydrauliques.
-Chaque structure peut avoir un nom et doit avoir un bief et un PK.
-Définissez-les comme suit :
+Parfois, il peut y avoir des sections en travers dans lesquelles les équations de Saint-Venant ne peuvent pas être utilisées pour modéliser l'écoulement de l'eau. Dans ce cas, nous devons définir une autre loi pour relier la côte de l'eau et le débit. C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée, ce qui entraîne un écoulement en charge. Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrables. Dans notre cas, on doit représenter un seuil et deux ponts comme ouvrages hydrauliques.
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques. Cliquez trois fois sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour créer trois ouvrages hydrauliques. Chaque structure peut avoir un nom et doit avoir une portée et un PK. Définissez-les comme suit :
+

 \begin{center}
 \includegraphics[width=15cm]{img/hs.png}
 \par\end{center}

-Sélectionnez le seuil aval et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour modifier les lois de cet ouvrage. Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires. Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage. Pour ce seuil, nous n'avons besoin que d'un ouvrage hydraulique élémentaire de type déversoir. Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour ajouter un nouvel ouvrage hydraulique élémentaire, donnez-lui le type \textit{Déversoir rectangulaire} et configurez-le comme suit :
+
+Sélectionnez le seuil aval et cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour modifier les lois de cette ouvrage. Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires. Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage. Pour ce seuil, nous n'avons besoin que d'un ouvrage hydraulique élémentaire de type déversoir. Cliquez sur \includegraphics[width=0.5cm]{img/gtk_add.png} pour ajouter un nouvel ouvrage hydraulique élémentaire, donnez-lui le type \textit{seuil} et configurez-le comme suit :
+

 \begin{center}
-\includegraphics[width=15cm]{img/Seuil.png}
+\includegraphics[width=15cm]{img/seuil.png}
 \par\end{center}

+
 Retournez à la fenêtre \textit{Ouvrages hydrauliques}.

-Sélectionnez le pont RD101 et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour éditer les lois de cet ouvrage.
-% Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires.
-% Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage.
-Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont.
-Créez deux ouvrages hydrauliques élémentaires à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} et définissez-les comme suit :
+Sélectionnez le pont RS101 et cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour éditer les lois de cet ouvrage. Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont. Créez deux ouvrages hydrauliques élémentaires et définissez-les comme suit :

 \begin{center}
-\includegraphics[width=15cm]{img/SeuilRD101.png}
+\includegraphics[width=15cm]{img/seuilRS101.png}

-\includegraphics[width=15cm]{img/OrificeRD101.png}
+\includegraphics[width=15cm]{img/orificeRS101.png}
 \par\end{center}

+
 Revenez à la fenêtre \textit{Ouvrages hydrauliques} et appliquez la même procédure pour le pont de Thivencelle :

-% \begin{center}
-% \includegraphics[width=15cm]{img/SeuilThivencelle.png}
-%
-% \includegraphics[width=15cm]{img/OrificeThivencelle.png}
-% \par\end{center}
-
 \begin{center}
-  \begin{tabular}{|c|c|}
-  \hline
-  \multicolumn{2}{|c|}{Orifice Thivencelle} \\ \hline
-  Largeur & 9.07 \\ \hline
-  cote & 17.28\\ \hline
-  cote de mise en charge & 20.74\\ \hline
-  coefficient de débit & 0.4\\ \hline
-  cote de mise en charge maximale & 9999.999\\ \hline
-  \end{tabular}
-  \hspace{1cm}
-  \begin{tabular}{|c|c|}
-  \hline
-  \multicolumn{2}{|c|}{Seuil Thivencelle} \\ \hline
-  Largeur & 13.0 \\ \hline
-  cote & 21.74\\ \hline
-  coefficient de débit & 0.4\\ \hline
-  \end{tabular}\\
+\includegraphics[width=15cm]{img/orificeThivencelle.png}
+
+\includegraphics[width=15cm]{img/seuilThivencelle.png}
 \par\end{center}


 Vous pouvez maintenant fermer les fenêtres \textit{Ouvrages hydrauliques}.
-Si vous réouvrez la fenêtre \textit{Géométrie} vous pouvez voir apparaitre la position des ouvrages hydrauliques sur la vue longitudinale.

 \section{Paramètres du solveur}

 Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Parameters numériques des solveurs]}.
-Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \texttt{[Mage v8]}.
-Ces paramètres pilotent le comportement du solveur numérique.
-la valeur 999:99:00:00 du temps final indique au solveur de s'arrêter lorsqu'il a atteint un régime permanent.
-Vous pouvez changer la fréquence d'écriture des résultats dans la ligne \textit{Pas de temps d'écriture dans le fichier .BIN}.
-Une valeur inférieure à 1 seconde indique que la valeur de la ligne  \textit{Pas de temps d'écriture dans le fichier .TRA} s sera prise à la place.
-% En effet, durant la montée du pic de crue, le solveur a besoin de réduire le pas de temps suffisament pour permettre la convergence des itérations.
-Pour accélérer les calculs et pour aider le solveur à démarer, nous allons l'autoriser à dégrader la précision, à l'aide des facteurs de réduction de la précision.
-Les précisions internes du solveur sont de 10$^{-9}$.
-Cette précision est multipliée par le facteur de réduction de la précision : un facteur de 1000 ramènera donc la précision à 10$^{-5}$.
-Pour utiliser ce facteur de réduction de la précision, il faut donner un \textit{nombre d'itérations à précision maximum} inférieur au \textit{nombre maximum d'itérations} : le solveur va d'abord tenter de converger avec un certain nombre d'itératons à la précision maximum avant de basculer sur une précision dégradée pour le reste des itérations.
-Dans notre cas, c'est nécessaire pour lancer le solveur à partir de la condition initiale calculée par Pamhyr2.
-rentrez 1000 dans les trois lignes \textit{facteurs de réduction de la précision}, rentrez 99 pour le \textit{Nombre d'itérations} et 5 pour le \textit{nombre d'itérations à la précision maximum}.
-Gardez les autres paramètres du solveur par défaut.
+Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \textit{Mage v8}. Réglez les paramètres du solveur comme suit :
+
+
+\begin{center}
+\includegraphics[width=15cm]{img/param.png}
+\par\end{center}
+
+
 Fermer la fenêtre \textit{Paramètres du solveur}.

 \section{Lancer la simulation}

 Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Lancer le solveur]}.
-Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Lancer}.
-La fenêtre \textit{Log du solveur} s'ouvre.
-Cette fenêtre affiche les sorties texte du solveur.
-À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul en cliquant sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.
+Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Exécuter}.
+Deux fenêtres s'ouvrent : la fenêtre \textit{check list} et la fenêtre \textit{Log du solveur}.
+La fenêtre \textit{Check list} donne quelques indications sur la validité de votre modèle, et la fenêtre \textit{Log du solveur} affiche les résultats du solveur.
+À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.

 \section{Visualiser les résultats}

-il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale.
-Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section dans ce bief.
-Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}.
-Vous pouvez utiliser le curseur du bas pour visualiser les résultats à différents pas de temps.
-Les croix rouges dans les deux vues du haut correspondent aux points ou l'eau déborde de la géométrie au moins une fois dans la simulation.
-En pratique il n'y a pas de perte de volume par débordement en dehors du modèle, car le solveur ajoute un mur virtuel aux extrémités des sections.
+il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale. Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section en travers dans ce bief. Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}. Vous pouvez utiliser le curseur du bas pour visualiser la côte de l'eau à différents pas de temps.
 Pour visualiser le débit, passez à l'onglet \textit{Hydrogramme}.
-Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre.
-Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \texttt{[OK]}.
-Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Résultats}.
-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.
+Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} en haut à gauche de la fenêtre. Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \textit{OK}.
+Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Results}.
+
+

 \pagebreak{}
 \end{document}
@@ -112,28 +112,9 @@ Use the GNU Linux or the Windows download button depending on your system. On wi
 \section{Create your first study}

 On the main windows, click on \texttt{[Files] => [New Study]} to create a new study.
-Give it a name, for example \textit{Hogneau}, and validate.

-\begin{center}
-\includegraphics[width=15cm]{img/NEWSTUDY.png}
-\par\end{center}
-
-During study, don't forget to save periodicaly your work, using the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} button on the main window.
-
-\section{Create the structure of the river}
-
-Click on \texttt{[River Network] => [Edit River Network]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} shortcut to create the structure of your river.
-In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
-A default reach exists in a new study.
-For this tutorial, we will delete it:
-click on the  \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} button to enter the \textit{Delete} mode, then click on the nodes.
-We can now start with an empty window.
-Press the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to enter the \textit{Add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node.
-Press \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} again to exit the \textit{Add} mode.
-You created your first reach, with an upstream node and a downstream node.
-In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches.
-As the reach you created is automaticaly selected, all the next steps will apply to this reach.
-The window should look like that:
+Click on \texttt{[River Network] => [Edit River Network]} to create the reaches of your river. In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
+Press the \includegraphics[width=0.5cm]{img/gtk_add.png} to enter the \textit{add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node. press \includegraphics[width=0.5cm]{img/gtk_add.png} again to exit the \textit{add} mode. You created your first reach, with an upstream node and a downstream node. In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches. As the reach you created is automaticaly selected, all the next steps will apply to this reach. The window should look like that:

 \begin{center}
 \includegraphics[width=15cm]{img/network.png}
@@ -144,19 +125,15 @@ Close the \textit{Edit River Network} window.

 \section{Edit the river geometry}

-Click on \texttt{[Geometry] => [Edit Geometry]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} shortcut to define the geometry of the selected reach.
-Click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} button and select the file \texttt{Data/Bief\_1.st}.
-You should see:
+Click on \texttt{[Geometry] => [Edit Geometry]} to define the geometry of the selected bief. Click on the \texttt{[Import]} button and select the file \texttt{Data/Bief\_1.st}. You should see:

 \begin{center}
 \includegraphics[width=15cm]{img/Geo.png}
 \par\end{center}

-On the left panel is a list of all the cross sections with their name and longitudinal abscisa.
-In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black).
-You can move in the section list using the right table or by clicking on the sections on one of the two upper plot.
+On the left panel is a list of all the cross sections with their name and longitudinal abscisa. In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black). You can move in the section list using the slider at the very right of the window.

-You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} icon.
+You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"img/edit.png"} icon.

 select the cross section named \textit{PontRD101m} and open the edition window. You should see:

@@ -164,100 +141,58 @@ select the cross section named \textit{PontRD101m} and open the edition window.
 \includegraphics[width=15cm]{img/editsect.png}
 \par\end{center}

-On the left panel is the list of all the points of the section, with their coordinates, their name and their transversal absisa.
-The Z coordinate of the highest point is written in blue and the lowest in red.
-Points can have a name.
-If a point with the same name exists in every section in a reach, it forms a longitudinal line.
-For example, here we have \textit{rg} and \textit{rd} which represent the left bank and the right bank of the main chanel.
+On the left panel is the list of all the points of the section, with their coordinates, their name and their transversal absisa. The Z coordinate of the highest point is written in blue and the lowest in red. Points can have a name. If a point with the same name exists in every section in a reach, it forms a longitudinal line. For example, here we have \textit{rg} and \textit{rd} which represent the left bank and the right bank of the main chanel.

-On the plot is a projection of the cross section. You can click on a point to select it in the plot and \texttt{[right click]} to draw a water line and visualize usefull geometric data.
-You can then remove this line with \texttt{[scroll wheel click]}.
-You can close the cross section edition window and the geometry edition window.
-
-% TODO mesh
+On the plot is a projection of the cross section. You can use \texttt{[ctrl + click]} to select a point in the plot and \texttt{[shift + click]} to select a water line and visualize usefull geometric data. You can close the cross section edition window and the geometry edition window.

 \section{Edit the boundary conditions}

-From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]} or on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
-You are now on the \textit{Boundary conditions} window:
+From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]}.You should see:

 \begin{center}
 \includegraphics[width=15cm]{img/boundary.png}
 \par\end{center}

- Use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window to add a liquid boundary condition.
+ Use the \textit{add} button on the top left of the window to add a liquid boundary condition.
 On the new line, click to select the whole line, double click to select the cell.
- Select the \textit{Type} cell to give a name to the boundary condition.
- Here, we will define the flow discharge mesured during the february 2002 flood.
- You can name this boundary condition "flood2002".
- Select the \textit{Type} cell and use the combo box to put a \textit{Q(t)} law.
+ Select the \textit{Type} cell to give a name to the boundary condition. here, we will define the flow discharge mesured during the february 2002 flood. You can name this boundary condition "flood2002".
+ Select the \textit{Type} cell and use the combo box to put a Q(t) law.
 Select the \textit{Node} cell and atribute this condition to the upstream node.
- Names of the nodes are recalled in the right panel with the network view.
- Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
- You opened the \textit{Edit Boundary Conditions} window.
- In a text editor, open the \texttt{Data/Fevrier\_2002.txt} file.
- Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}.
- You can now see the flow discharge curve:
+ Names of the nodes are recalled in network in the right panel.
+ Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"img/edit.png"}. You opened the \textit{Edit Boundary Conditions} window.
+ On a text editor, open the \texttt{Data/Fevrier\_2002.txt} file. Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}. You can now see the flow discharge curve:

 \begin{center}
 \includegraphics[width=15cm]{img/fev2002.png}
 \par\end{center}

-Close this window.
-Go back on the \textit{Boundary Conditions} window.
-Add a new line, give it a name, give it the textit{Q(Z)} type (rating curve) and associate it to the downstream node of the network.
-This downstream boundary condition corresponds to a weir.
-There, the river transition from a fluvial flow to a torrential flow.
-This allows us to compute a rating curve corresponding to the critical flow located over the weir.
-Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
-In the \textit{Edit boundary conditions} window click on \texttt{[Générer régime critique]} to comput the said rating curve.
-Click on \texttt{[Make increasing]} to remove the points of the curve that are not strictly increasing.
+Close this window. Go back on the \textit{Boundary Conditions} window. Add a new line, give it a name, give it the textit{Z(T)} type and associate it to the downstream node of the network. Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"img/edit.png"}). Add two lines. In the first one, enter time: 0.00.00 and Z: 15.000.
+On the second one, time: 1.00.00 and Z: 15.000. It creates a constant downstream water elevation. For the computaion, Mage will extrapolate continuously the water elevation, that's why we only need to define one hour.
 You can close the the \textit{Edit Boundary Conditions} and the \textit{Boundary Conditions} window.

 \section{Create initial conditions}

-From the main window, click on \texttt{[Hydraulics] => [Initial conditions]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"} shortcut.
-To start, the numerical solver needs to know the water elevation and the discharge at every cross-section of the river.
-If you don't know the initial water elevation and flow discharge conditions of the river, you can use the \texttt{[Generate minimal depth]}, \texttt{[Generate from discharge]} or \texttt{[Generate elevation]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
-Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window, and check the \texttt{[Generate depth]} to generate an initial water elevation condition based on the Manning-Strickler formula.
-You should see:
+From the main window, click on \texttt{[Hydraulics] => [Initial conditions]}.
+If you don't know the initial conditions in water elevation and flow discharge of the river, you can use \texttt{[Generate minimal height]} or \texttt{[Generate from discharge]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
+Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window to generate an initial water height condition based on the Manning-Strickler formula and a uniform discharge of $4 m^3$. You should see:

 \begin{center}
 \includegraphics[width=15cm]{img/ic.png}
 \par\end{center}

-You can alternately use \texttt{[Generate elevation]} to enter a constant elevation of $21 m$ (upstream and downstream) associated with a null discharge.
-The goal is to create a lake and to let the solver drain it to find a suitable initial state.
-
-In your next simulations, you can use the final timestep of the previous simulation as an initial condition.
-To do that, click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} and find the results contained in a \textit{.BIN} file.
-This file should be in the sub-directory \textit{\_PAMHYR\_/Hogneau/default-mage}.
-
 Close the \textit{Initial conditions} window.


 \section{Edit friction coefficients}

-We will now define the friction coefficients of the bottom of the river.
-From the main window, click on \texttt{[Hydraulics] => [Edit friction]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"} shortcut.
-You have to define sets of Strickler coefficients first.
-Click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to open the \textit{Strickler} window.
-Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed.
-Click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} four times to create four new couples.
-Give them the folowing values:
+From the main window, click on \texttt{[Hydraulics] => [Edit friction]}.
+You fist have to define sets of Strickler coefficients. Click on \includegraphics[width=0.5cm]{"img/edit.png"} to open the \textit{Strickler} window. Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed. Click on \textit{add} four times to create four new couple. Give them the folowing values:

 \begin{center}
 \includegraphics[width=15cm]{img/K.png}
 \par\end{center}

-You can use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} button to sort the couples by alphabetical order.
-Close the \textit{Strickler} window.
-
-On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to create four friction zones.
-Each zone is defined by a \textit{begin} and \textit{end} KP associated with a \textit{begin} and \textit{end} Strickler couple.
-The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples.
-In our case, we will use uniform coefficients per zone.
-Set the zones as follow:
+Close the \textit{Strickler} window. On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{img/gtk_add.png} to create four friction zones. Each zone is defined by a \textit{begin} and \textit{end} KP and a \textit{begin} and \textit{end} Strickler couple. The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples. In our case, we will use constant coefficients per zone. Set the zones as follow:

 \begin{center}
 \includegraphics[width=15cm]{img/frictions.png}
@@ -265,53 +200,50 @@ Set the zones as follow:

 The selected zone is highlighted in blue. Close the \textit{Edit friction} window.

+
 \section{Model hydraulic structures}

-Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow.
-In that case, we have to define an other law to link the water elevation and the flow discharge.
-This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge.
-Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized.
-In our case, two bridges have to be represented as hydraulic structures.
-From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window.
-Click two times on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button to create two hydraulic structures.
-Each structure can have a name and must have a reach and a KP.
-Set them as follow:
+Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow. In that case, we have to define an other law to link the water elevation and the flow discharge. This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge. Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized. In our case, a weir and two bridges have to be represented as hydraulic structures.
+From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window. Click tree times on the \includegraphics[width=0.5cm]{img/gtk_add.png} button to create three hydraulic structures. Each structure can have a name and must have a reach and a KP. Set them as follow:

 \begin{center}
 \includegraphics[width=15cm]{img/hs.png}
 \par\end{center}

-Select the RD101 bridge and click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to edit the laws of this structure.
-Hydraulic structures are composed of basic hydraulic structures.
-You can combine the laws of several basic hydraulic structures to setup your structure.
-A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge.
-Create two basic hydraulic structures with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} and set them as folow:
+Select the downstream weir and click on \includegraphics[width=0.5cm]{"img/edit.png"} to edit the laws of this structure. Hydraulic structures are composed of basic hydraulic structures. You can combine the laws of several basic hydraulic structures to setup your structure. For this weir, we only need a weir basic hydraulic structure. Click on \includegraphics[width=0.5cm]{img/gtk_add.png} to add a new basic hydraulic structure, give it the \textit{weir} type and set it up as folow:

 \begin{center}
-\includegraphics[width=15cm]{img/seuilRD101.png}
+\includegraphics[width=15cm]{img/seuil.png}
+\par\end{center}

-\includegraphics[width=15cm]{img/orificeRD101.png}
+Go back to the \textit{hydraulic structures} window.
+
+Select the RS101 bridge and click on \includegraphics[width=0.5cm]{"img/edit.png"} to edit the laws of this structure. A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge. Create two basic hydraulic structures and set them as folow:
+
+\begin{center}
+\includegraphics[width=15cm]{img/seuilRS101.png}
+
+\includegraphics[width=15cm]{img/orificeRS101.png}
 \par\end{center}

 Go back to the \textit{hydraulic structures} window and aply the same procedure for the Thivencelle bridge:

 \begin{center}
-\includegraphics[width=15cm]{img/seuilThivencelle.png}
-
 \includegraphics[width=15cm]{img/orificeThivencelle.png}
+
+\includegraphics[width=15cm]{img/seuilThivencelle.png}
 \par\end{center}

 You can now close the \textit{hydraulic structures} windows.
-If you open the \textit{geometry} window you can see the structure position in the longitudinal view.

 \section{Solver parameters}

 From the main window, click on \texttt{[Execute] => [Numerical parameters for solvers]}.
-In the window \textit{solver parameters} select the \textit{Mage v8} tab.
-Set the minimul timestep to 0.1. and keep the default values for the other parameters.
-We need a smaller minimum timester because the solver needs to reduce the timestep in order to converge during the steep increase of discharge at the begining of the flood.
+In the window \textit{solver parameters} select the \textit{Mage v8} tab. Set the solver parameters as follow:

-% TODO precision
+\begin{center}
+\includegraphics[width=15cm]{img/param.png}
+\par\end{center}

 Close the \textit{solver parameters} window.

@@ -319,23 +251,17 @@ Close the \textit{solver parameters} window.

 From the main window, click on \texttt{[Execute] => [Run solver]}.
 Select \textit{Defaut-Mage - (Mage8)} anc click on the \textit{Run} button.
-It will open the \textit{Solver log} window.
-The \textit{Solver log} window displays the outputs of the solver.
-From the \textit{Solver log} window you can re-run the computation with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, and you can click on the \textit{Results} button to open the \textit{Results} window.
+It will open two windows: the \textit{Check list} window and the \textit{Solver log} window.
+The \textit{Check list} window gives som hints about the validity of your model, and the \textit{Solver log} window displays the outputs of the solver.
+From the \textit{Solver log} window you can re-run the computation, and from the textit{Solver log} window you can click on the \textit{Results} button to open the \textit{Results} window.

 \section{Visualize the results}

-If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window.
-The top left panel let you select your reach, the bottom left panel lets you select a cross-section in that reach.
-the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window.
-You can use the bottom slider to visualize the results at different timesteps.
-The red crosses in the graphs corresponds to sections where the water level exceeds the limits of the geometry at least one time during the simulation.
-This does not corresponds to water leaks, as the solver artificialy adds a virtual wall at both ends of the cross-sections geometry.
+If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window. The top lets panel let you select your reach, the bottom left panel lets you select a cross-section in that reach. the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window. You can use the bottom slider to visualize the water elevation at different timesteps.
 To visualize the flow discharge, switch to the \textit{Hydrograph} tab.
-To create custom 2D plots, click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window.
-Select the values you want on the $X$ and $Y$ axis and click on \texttt{[OK]}.
+To create custom 2D plots, click on the \includegraphics[width=0.5cm]{img/gtk_add.png} button on the top left of the window. Select the values you want on the $X$ and $Y$ axis and click on \textit{OK}.
 You can now see a new tab with the custom 2D plot in the right panel of the \textit{Results} window.
-The button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} allows you to export your results to a CSV file if you want to post-process them outside Pamhyr2.
+

 \pagebreak{}
 \end{document}
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+guix shell --manifest=manifest.scm -- python3 ./src/pamhyr.py $@
@@ -0,0 +1,22 @@
+;; manifest.scm -- Pamhyr
+;; Copyright (C) 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/>.
+
+(specifications->manifest
+ (list "python" "zlib" "python-platformdirs" "python-lxml"
+       "python-pyqt@5" "python-pyqt5-sip"
+       "python-pyqtgraph" "python-qscintilla"
+       "python-numpy" "python-shapely" "python-pyshp"
+       "python-matplotlib"))
@@ -0,0 +1,54 @@
+#! /usr/bin/env bash
+# setup.sh -- Pamhyr
+# Copyright (C) 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/>.
+
+function perr() {
+    >&2 echo $1
+}
+
+function try() {
+    echo "$1"
+    res=$($1)
+    if [ $? -ne 0 ];
+    then
+        perr " !!! Command failed with exit value $?: '$1'"
+        perr " - $res"
+        exit 2
+    fi
+}
+
+if [ $# -ne 0 ];
+then
+    perr "usage: $0"
+    exit 1
+fi
+
+OLD_PWD=$PWD
+
+try "python3 -m venv .pamhyr-env"
+try "source .pamhyr-env/bin/activate"
+try "python3 -m pip install -r ./pamhyr/requirements.txt"
+
+echo '#! /usr/bin/env bash' > run-pamhyr
+echo 'source .pamhyr-env/bin/activate' >> run-pamhyr
+echo 'if [ $XDG_SESSION_TYPE == wayland ]; then' >> run-pamhyr
+echo '  export QT_QPA_PLATFORM=wayland' >> run-pamhyr
+echo 'fi' >> run-pamhyr
+echo 'python3 ./pamhyr/src/pamhyr.py $@' >> run-pamhyr
+
+try "chmod +x run-pamhyr"
+
+cd $OLD_PWD
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import os
+
+from setuptools import find_packages, setup
+
+def read_requirements():
+    req = []
+
+    with open("requirements.txt", "r") as f:
+        for line in f:
+            if line[0] == "#":
+                continue
+
+            req.append(line)
+
+    return req
+
+setup(
+    name="Pamhyr2",
+    version="0.0.8",
+    description='River 1D modelling interface',
+    maintainer='INRAE',
+    maintainer_email='pierre-antoine.rouby@inrae.fr',
+    url='https://gitlab.irstea.fr/theophile.terraz/pamhyr',
+    packages=find_packages("."),
+    package_dir={"Pamhyr2": "Pamhyr2"},
+    scripts=[os.path.join("src", "pamhyr.py")],
+    install_requires=read_requirements(),
+)
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -363,7 +363,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
            self.import_m_file(reach, m_file)
            return reach

-    def update_rk(self, reach,
+    def update_kp(self, reach,
                  step: float = 50,
                  limites=[-1, -1],
                  origin=0,
@@ -371,8 +371,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
                  lplan: bool = False,
                  lm: int = 3,
                  linear: bool = False,
-                  origin_value=0.0,
-                  orientation=0):
+                  origin_value=0.0):
        if reach is None or len(reach.profiles) == 0:
            return reach

@@ -381,6 +380,8 @@ class MeshingWithMageMailleurTT(AMeshingTool):
            st_file = self.export_reach_to_st(reach, tmp)
            m_file = st_file.rsplit(".ST", 1)[0] + ".M"

+            os.sync()
+
            proc = QProcess()
            proc.setWorkingDirectory(tmp)

@@ -399,9 +400,8 @@ class MeshingWithMageMailleurTT(AMeshingTool):
                f"{str(step)} " +
                f"{limites[0]} {limites[1]} " +
                f"{directrices[0]} {directrices[1]} " +
-                f"{orientation} {lm} {linear} " +
-                f"{origin} " +
-                f"{origin_value} "
+                f"{lplan} {lm} {linear} " +
+                f"{origin} "
            )
            proc.start(
                self._exe_path(),
@@ -413,7 +413,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
                            "update_kp", step,
                            limites[0], limites[1],
                            directrices[0], directrices[1],
-                            orientation, lm, linear, origin, origin_value
+                            lplan, lm, linear, origin, origin_value
                        ]
                    )
                )
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -315,9 +315,6 @@ class BoundaryCondition(SQLSubModel):
            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]

@@ -371,15 +368,3 @@ class BoundaryCondition(SQLSubModel):
            d = self._data
            d[index], d[prev] = d[prev], d[index]
            self._status.modified()
-
-    def reach(self, river):
-        r = []
-        if self._node is not None:
-            if river is not None:
-                for edge in river.edges():
-                    if edge.node1.name == self._node.name:
-                        r.append(edge.reach)
-                    if edge.node2.name == self._node.name:
-                        r.append(edge.reach)
-
-        return r
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -22,8 +22,6 @@ from tools import trace, timer

 from Model.Tools.PamhyrDB import SQLSubModel

-from numpy import interp
-
 logger = logging.getLogger()


@@ -45,8 +43,8 @@ class Friction(SQLSubModel):

        self._name = name
        self._edge = None
-        self._begin_rk = 0.0
-        self._end_rk = 0.0
+        self._begin_kp = 0.0
+        self._end_kp = 0.0
        self._begin_strickler = None
        self._end_strickler = None

@@ -56,8 +54,8 @@ class Friction(SQLSubModel):
          CREATE TABLE friction(
            id INTEGER NOT NULL PRIMARY KEY,
            ind INTEGER NOT NULL,
-            begin_rk REAL NOT NULL,
-            end_rk REAL NOT NULL,
+            begin_kp REAL NOT NULL,
+            end_kp REAL NOT NULL,
            reach INTEGER NOT NULL,
            begin_strickler INTEGER NOT NULL,
            end_strickler INTEGER NOT NULL,
@@ -71,13 +69,6 @@ class Friction(SQLSubModel):

    @classmethod
    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 11:
-                execute("ALTER TABLE friction " +
-                        "RENAME COLUMN begin_kp TO begin_rk")
-                execute("ALTER TABLE friction RENAME COLUMN end_kp TO end_rk")
-
        return True

    @classmethod
@@ -89,7 +80,7 @@ class Friction(SQLSubModel):
        stricklers = data["stricklers"].stricklers

        table = execute(
-            "SELECT id, ind, begin_rk, end_rk, " +
+            "SELECT id, ind, begin_kp, end_kp, " +
            "begin_strickler, end_strickler " +
            f"FROM friction WHERE reach = {reach.id}"
        )
@@ -111,8 +102,8 @@ class Friction(SQLSubModel):
            # Create friction
            sec = cls(status=status)
            sec.edge = reach
-            sec.begin_rk = row[2]
-            sec.end_rk = row[3]
+            sec.begin_kp = row[2]
+            sec.end_kp = row[3]
            sec.begin_strickler = bs
            sec.end_strickler = es

@@ -133,11 +124,11 @@ class Friction(SQLSubModel):

        execute(
            "INSERT INTO " +
-            "friction(id, ind, begin_rk, end_rk, " +
+            "friction(id, ind, begin_kp, end_kp, " +
            "reach, begin_strickler, end_strickler) " +
            "VALUES (" +
            f"{self.id}, {ind}, " +
-            f"{self._begin_rk}, {self._end_rk}, " +
+            f"{self._begin_kp}, {self._end_kp}, " +
            f"{self._edge.id}, " +
            f"{b_s_id}, {e_s_id}" +
            ")"
@@ -166,10 +157,10 @@ class Friction(SQLSubModel):
    def edge(self, edge):
        self._edge = edge
        if (edge is not None and
-            self._begin_rk == 0.0 and
-                self._end_rk == 0.0):
-            self._begin_rk = self._edge.reach.get_rk_min()
-            self._end_rk = self._edge.reach.get_rk_max()
+            self._begin_kp == 0.0 and
+                self._end_kp == 0.0):
+            self._begin_kp = self._edge.reach.get_kp_min()
+            self._end_kp = self._edge.reach.get_kp_max()
        self._status.modified()

    def has_edge(self):
@@ -177,52 +168,53 @@ class Friction(SQLSubModel):

    def has_coefficient(self):
        return (
-            self._begin_strickler is not None
+            self._begin_strickler is not None and
+            self._end_strickler is not None
        )

    def is_full_defined(self):
        return self.has_edge() and self.has_coefficient()

    @property
-    def begin_rk(self):
-        return self._begin_rk
+    def begin_kp(self):
+        return self._begin_kp

-    @begin_rk.setter
-    def begin_rk(self, begin_rk):
+    @begin_kp.setter
+    def begin_kp(self, begin_kp):
        if self._edge is None:
-            self._begin_rk = begin_rk
+            self._begin_kp = begin_kp
        else:
-            _min = self._edge.reach.get_rk_min()
-            _max = self._edge.reach.get_rk_max()
+            _min = self._edge.reach.get_kp_min()
+            _max = self._edge.reach.get_kp_max()

-            if _min <= begin_rk <= _max:
-                self._begin_rk = begin_rk
+            if _min <= begin_kp <= _max:
+                self._begin_kp = begin_kp

        self._status.modified()

    @property
-    def end_rk(self):
-        return self._end_rk
+    def end_kp(self):
+        return self._end_kp

-    @end_rk.setter
-    def end_rk(self, end_rk):
+    @end_kp.setter
+    def end_kp(self, end_kp):
        if self._edge is None:
-            self._end_rk = end_rk
+            self._end_kp = end_kp
        else:
-            _min = self._edge.reach.get_rk_min()
-            _max = self._edge.reach.get_rk_max()
+            _min = self._edge.reach.get_kp_min()
+            _max = self._edge.reach.get_kp_max()

-            if _min <= end_rk <= _max:
-                self._end_rk = end_rk
+            if _min <= end_kp <= _max:
+                self._end_kp = end_kp

        self._status.modified()

-    def __contains__(self, rk):
-        return self.contains_rk(rk)
+    def __contains__(self, kp):
+        return self.contains_kp(kp)

-    def contains_rk(self, rk):
+    def contains_kp(self, kp):
        return (
-            self._begin_rk <= rk <= self._end_rk
+            self._begin_kp <= kp <= self._end_kp
        )

    @property
@@ -236,28 +228,9 @@ class Friction(SQLSubModel):

    @property
    def end_strickler(self):
-        # return self._end_strickler
-        return self._begin_strickler
+        return self._end_strickler

    @end_strickler.setter
    def end_strickler(self, strickler):
        self._end_strickler = strickler
        self._status.modified()
-
-    def get_friction(self, rk):
-        if not self.contains_rk(rk):
-            return None
-
-        minor = self.begin_strickler.minor
-        medium = self.begin_strickler.medium
-
-        # minor = interp(rk,
-        #                [self.begin_rk, self.end_rk],
-        #                [self.begin_strickler.minor,
-        #                 self.end_strickler.minor])
-        # medium = interp(rk,
-        #                 [self.begin_rk, self.end_rk],
-        #                 [self.begin_strickler.medium,
-        #                  self.end_strickler.medium])
-
-        return minor, medium
@@ -44,7 +44,7 @@ class FrictionList(PamhyrModelList):
            logger.info(f"Update friction TABLE from {version}")
            cls._db_update_0_0_1(execute, version)

-        return cls._update_submodel(execute, version)
+        return True

    @classmethod
    def _db_load(cls, execute, data=None):
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -31,7 +31,7 @@ class Profile(object):
    _id_cnt = 0

    def __init__(self, id: int = -1, num: int = 0,
-                 rk: float = 0.0, name: str = "",
+                 kp: float = 0.0, name: str = "",
                 code1: int = 0, code2: int = 0,
                 _type: str = "", reach=None,
                 status=None):
@@ -49,7 +49,7 @@ class Profile(object):
        self._num = int(num)
        self._code1 = int(code1)
        self._code2 = int(code2)
-        self._rk = float(rk)
+        self._kp = float(kp)
        self._name = str(name)
        self._reach = reach
        self._sl = None
@@ -136,16 +136,16 @@ class Profile(object):
        return len(self.points)

    @property
-    def rk(self):
+    def kp(self):
        """
        Returns:
            Kilometer point.
        """
-        return self._rk
+        return self._kp

-    @rk.setter
-    def rk(self, value: float):
-        self._rk = float(value)
+    @kp.setter
+    def kp(self, value: float):
+        self._kp = float(value)
        self._status.modified()

    @property
@@ -351,17 +351,8 @@ class Profile(object):
    def wet_points(self, z):
        raise NotImplementedMethodeError(self, self.wet_point)

-    def wet_width(self, z):
-        raise NotImplementedMethodeError(self, self.wet_width)
-
    def wet_perimeter(self, z):
        raise NotImplementedMethodeError(self, self.wet_perimeter)

    def wet_area(self, z):
        raise NotImplementedMethodeError(self, self.wet_area)
-
-    def wet_radius(self, z):
-        raise NotImplementedMethodeError(self, self.wet_radius)
-
-    def get_nb_wet_areas(self, z):
-        raise NotImplementedMethodeError(self, self.get_nb_wet_areas)
@@ -41,7 +41,7 @@ class ProfileXYZ(Profile, SQLSubModel):
    def __init__(self,
                 id: int = -1,
                 name: str = "",
-                 rk: float = 0.,
+                 kp: float = 0.,
                 reach=None,
                 num=0,
                 nb_point: int = 0,
@@ -53,7 +53,7 @@ class ProfileXYZ(Profile, SQLSubModel):
            num: The number of this profile
            code1: The interpolation code 1
            code2: The interpolation code 2
-            rk: Kilometer point
+            kp: Kilometer point
            name: The name of profile

        Returns:
@@ -63,7 +63,7 @@ class ProfileXYZ(Profile, SQLSubModel):
            id=id,
            num=num,
            name=name,
-            rk=rk,
+            kp=kp,
            code1=code1, code2=code2,
            _type="XYZ",
            reach=reach,
@@ -78,7 +78,7 @@ class ProfileXYZ(Profile, SQLSubModel):
            ind INTEGER NOT NULL,
            name TEXT,
            reach INTEGER NOT NULL,
-            rk REAL NOT NULL,
+            kp REAL NOT NULL,
            num INTEGER NOT NULL,
            code1 INTEGER NOT NULL,
            code2 INTEGER NOT NULL,
@@ -94,8 +94,7 @@ class ProfileXYZ(Profile, SQLSubModel):
    def _db_update(cls, execute, version):
        major, minor, release = version.strip().split(".")
        if major == minor == "0":
-            rl = int(release)
-            if rl < 2:
+            if int(release) < 2:
                execute(
                    """
                    ALTER TABLE geometry_profileXYZ
@@ -104,14 +103,6 @@ class ProfileXYZ(Profile, SQLSubModel):
                    """
                )

-            if rl < 11:
-                execute(
-                    """
-                    ALTER TABLE geometry_profileXYZ
-                    RENAME COLUMN kp TO rk
-                    """
-                )
-
        return cls._update_submodel(execute, version)

    @classmethod
@@ -121,7 +112,7 @@ class ProfileXYZ(Profile, SQLSubModel):
        reach = data["reach"]

        table = execute(
-            "SELECT id, ind, name, rk, num, code1, code2, sl " +
+            "SELECT id, ind, name, kp, num, code1, code2, sl " +
            "FROM geometry_profileXYZ " +
            f"WHERE reach = {reach.id}"
        )
@@ -130,7 +121,7 @@ class ProfileXYZ(Profile, SQLSubModel):
            id = row[0]
            ind = row[1]
            name = row[2]
-            rk = row[3]
+            kp = row[3]
            num = row[5]
            code1 = row[5]
            code2 = row[6]
@@ -138,7 +129,7 @@ class ProfileXYZ(Profile, SQLSubModel):

            new = cls(
                id=id, num=num,
-                name=name, rk=rk,
+                name=name, kp=kp,
                code1=code1, code2=code2,
                reach=reach,
                status=status
@@ -168,10 +159,10 @@ class ProfileXYZ(Profile, SQLSubModel):
        sql = (
            "INSERT OR REPLACE INTO " +
            "geometry_profileXYZ(id, ind, name, reach, " +
-            "rk, num, code1, code2, sl) " +
+            "kp, num, code1, code2, sl) " +
            "VALUES (" +
            f"{self.id}, {ind}, '{self._db_format(self._name)}', " +
-            f"{self.reach.id}, {self.rk}, {self.num}, " +
+            f"{self.reach.id}, {self.kp}, {self.num}, " +
            f"{self.code1}, {self.code1}, {sl}" +
            ")"
        )
@@ -196,19 +187,19 @@ class ProfileXYZ(Profile, SQLSubModel):
        try:
            if len(header) == 0:
                name = data[0]
-                rk = data[1]
+                kp = data[1]
                reach = data[2]
                status = data[3]

                profile = cls(
                    id=-1,
                    name=name,
-                    rk=rk,
+                    kp=kp,
                    reach=reach,
                    status=status
                )
            else:
-                valid_header = {'name', 'reach', 'rk', 'status'}
+                valid_header = {'name', 'reach', 'kp', 'status'}
                d = {}
                for i, v in enumerate(data):
                    h = header[i].strip().lower().split(' ')[0]
@@ -253,15 +244,6 @@ class ProfileXYZ(Profile, SQLSubModel):

        return point

-    def display_name(self):
-        name = ""
-        if self.name != "":
-            name += f"{self.name} "
-
-        name += f"({self.rk})"
-
-        return name
-
    def x(self):
        return [point.x for point in self.points]

@@ -341,7 +323,7 @@ class ProfileXYZ(Profile, SQLSubModel):
            logger.debug(f"{e}")
            raise IndexError(
                f"Invalid point name: {name} " +
-                f"for profile ({self.id}) rk = {self.rk}"
+                f"for profile ({self.id}) kp = {self.kp}"
            )

    def has_standard_named_points(self):
@@ -410,125 +392,31 @@ class ProfileXYZ(Profile, SQLSubModel):

        return abs(rg.dist(rd))

-    def wet_width(self, z):
-        start, end = self.get_all_water_limits_ac(z)
-
-        if len(start) == 0:
-            return 0
-
-        length = 0.0
-        for s, e in zip(start, end):
-            length += abs(s - e)
-        return length
-
    def wet_perimeter(self, z):
-        lines = self.wet_lines(z)
+        poly = self.wet_polygon(z)

-        if lines is None:
+        if poly is None:
            return 0

-        length = 0.0
-        for line in lines:
-            length += line.length
-        return length
+        return poly.length

    def wet_area(self, z):
-        lines = self.wet_lines(z)
+        poly = self.wet_polygon(z)

-        if lines is None:
+        if poly is None:
            return 0

-        area = 0.0
-        for line in lines:
-            if len(line.coords) > 2:
-                poly = geometry.Polygon(line)
-                area += poly.area
-        return area
-
-    def wet_radius(self, z):
-        p = self.wet_perimeter(z)
-        a = self.wet_area(z)
-
-        if p == 0:
-            return 0
-
-        return a/p
-
-    def wet_line(self, z):
-        points = self.wet_points(z)
-        if len(points) < 3:
-            return None
-
-        zz = map(lambda p: p.z, points)
-        station = self._get_station(points)
-
-        line = geometry.LineString(list(zip(station, zz)))
-        return line
-
-    def wet_lines(self, z):
-        points = self._points
-        if len(points) < 3:
-            return None
-
-        lines = []
-
-        zz = list(map(lambda p: p.z, points))
-        station = self._get_station(points)
-
-        line = []
-        for i in range(self.number_points-1):
-
-            if zz[i] >= z and zz[i+1] < z:
-                y = np.interp(
-                    z,
-                    [zz[i], zz[i+1]],
-                    [station[i], station[i+1]]
-                )
-                line.append([y, z])
-
-            if zz[i] < z:
-                line.append([station[i], zz[i]])
-
-            if zz[i] <= z and zz[i+1] >= z:
-                y = np.interp(
-                    z,
-                    [zz[i], zz[i+1]],
-                    [station[i], station[i+1]]
-                )
-                line.append([y, z])
-                if len(line) > 2:
-                    lines.append(geometry.LineString(line))
-                line = []
-
-        if zz[self.number_points-1] < z:
-            line.append([station[self.number_points-1], z])
-            if len(line) > 2:
-                lines.append(geometry.LineString(line))
-            line = []
-
-        return lines
-
-    def max_water_depth(self, z):
-        return z - self.z_min()
-
-    def mean_water_depth(self, z):
-        a = self.wet_area(z)
-        w = self.wet_width(z)
-
-        if w == 0:
-            return 0
-
-        return a/w
+        return poly.area

    def wet_polygon(self, z):
        points = self.wet_points(z)
        if len(points) < 3:
            return None

-        zz = map(lambda p: p.z, points)
+        z = map(lambda p: p.z, points)
        station = self._get_station(points)

-        poly = geometry.Polygon(list(zip(station, zz)))
+        poly = geometry.Polygon(list(zip(station, z)))
        return poly

    def wet_points(self, z):
@@ -540,63 +428,6 @@ class ProfileXYZ(Profile, SQLSubModel):

        return points

-    def get_nb_wet_areas(self, z):
-
-        n_zones = 0
-        points = self._points
-        if points[0].z <= z:
-            n_zones += 1
-
-        for i in range(self.number_points-1):
-            if points[i].z > z and points[i+1].z <= z:
-                n_zones += 1
-
-        return n_zones
-
-    def get_all_water_limits_ac(self, z):
-        """
-        Determine all water limits for z elevation.
-        """
-
-        points = self._points
-        if len(points) < 3:
-            return None
-
-        zz = list(map(lambda p: p.z, points))
-        station = self._get_station(points)
-
-        start = []
-        if points[0].z <= z:
-            start.append(station[0])
-
-        for i in range(self.number_points-1):
-            if zz[i] > z and zz[i+1] <= z:
-                y = np.interp(
-                    z,
-                    [zz[i], zz[i+1]],
-                    [station[i], station[i+1]]
-                )
-                start.append(y)
-
-        end = []
-        if points[-1].z <= z:
-            end.append(station[-1])
-
-        for i in reversed(range(self.number_points-1)):
-            if zz[i] <= z and zz[i+1] > z:
-                y = np.interp(
-                    z,
-                    [zz[i], zz[i+1]],
-                    [station[i], station[i+1]]
-                )
-                end.append(y)
-
-        if len(start) != len(end):
-            logger.error(f"ERROR in get_all_water_limits_ac")
-            return [], []
-
-        return start, list(reversed(end))
-
    def get_water_limits(self, z):
        """
        Determine left and right limits of water elevation.
@@ -660,8 +491,8 @@ class ProfileXYZ(Profile, SQLSubModel):
        Returns:
            Projection of the points of the profile on a plane.
        """
-        if self.nb_points < 2:
-            return [0.0]
+        if self.nb_points < 3:
+            return None
        else:
            return self._get_station(self.points)

@@ -793,9 +624,3 @@ class ProfileXYZ(Profile, SQLSubModel):
                        self.point(i),
                        self.point(i+1)
                    )
-
-    def shift(self, x, y, z):
-        for p in self.points:
-            p.x = p.x + x
-            p.y = p.y + y
-            p.z = p.z + z
@@ -141,10 +141,10 @@ class Reach(SQLSubModel):
    def profiles(self, profiles):
        self._profiles = profiles

-    def get_profiles_from_rk(self, rk):
+    def get_profiles_from_kp(self, kp):
        return list(
            filter(
-                lambda p: p.rk == rk, self.profiles
+                lambda p: p.kp == kp, self.profiles
            )
        )

@@ -335,18 +335,18 @@ class Reach(SQLSubModel):
            )
        )

-    def get_rk(self):
-        """List of profiles rk
+    def get_kp(self):
+        """List of profiles kp

        Returns:
-            List of profiles rk
+            List of profiles kp
        """
-        return [profile.rk for profile in self.profiles]
+        return [profile.kp for profile in self.profiles]

-    def get_rk_complete_profiles(self):
+    def get_kp_complete_profiles(self):
        return list(
            map(
-                lambda profile: profile.rk,
+                lambda profile: profile.kp,
                filter(
                    lambda profile: len(profile) > 0,
                    self.profiles
@@ -354,44 +354,41 @@ class Reach(SQLSubModel):
            )
        )

-    def get_rk_min(self):
-        if len(self.get_rk()) > 0:
-            return min(self.get_rk())
+    def get_kp_min(self):
+        if len(self.get_kp()) > 0:
+            return min(self.get_kp())
        else:
            return 0.0

-    def get_rk_max(self):
-        if len(self.get_rk()) > 0:
-            return max(self.get_rk())
+    def get_kp_max(self):
+        if len(self.get_kp()) > 0:
+            return max(self.get_kp())
        else:
            return 0.0

-    def inter_profiles_rk(self):
-        profiles = sorted(self.profiles, key=lambda p: p.rk)
-        if len(profiles) == 0:
-            return []
-
+    def inter_profiles_kp(self):
+        profiles = sorted(self.profiles, key=lambda p: p.kp)
        first = profiles[0]
        last = profiles[-1]

-        res_rk = [first.rk]
+        res_kp = [first.kp]

        profiles = iter(profiles)
        previous = next(profiles)

        for profile in profiles:
-            prev = previous.rk
-            curr = profile.rk
+            prev = previous.kp
+            curr = profile.kp

-            diff = abs(previous.rk - profile.rk)
+            diff = abs(previous.kp - profile.kp)

-            new = previous.rk + (diff / 2.0)
-            res_rk.append(new)
+            new = previous.kp + (diff / 2.0)
+            res_kp.append(new)

            previous = profile

-        res_rk.append(last.rk)
-        return res_rk
+        res_kp.append(last.kp)
+        return res_kp

    # Sediment Layers

@@ -539,7 +536,7 @@ class Reach(SQLSubModel):
    def sort(self, is_reversed: bool = False):
        self.profiles = sorted(
            self.profiles,
-            key=lambda profile: profile.rk,
+            key=lambda profile: profile.kp,
            reverse=is_reversed
        )
        self._status.modified()
@@ -616,7 +613,7 @@ class Reach(SQLSubModel):

        self.profiles = profiles + self.profiles
        self._update_profile_numbers()
-        self._recompute_rk()
+        self._recompute_kp()

        return profiles

@@ -635,8 +632,8 @@ class Reach(SQLSubModel):

        try:
            list_profile, list_header = self.read_file_st(str(file_path_name))
-            profile_header = ["num", "code1", "code2",
-                              "nb_point", "rk", "name"]
+            profile_header = ["num", "code1",
+                              "code2", "nb_point", "kp", "name"]

            if list_profile and list_header:
                for ind, profile in enumerate(list_profile):
@@ -710,15 +707,6 @@ class Reach(SQLSubModel):
                                line_is_header = True
                            else:
                                list_point_profile.append(line)
-                        elif len(line) > 4:
-                            x, y, z = line[:3]
-                            if stop_code in x and stop_code in y:
-                                line_is_header = True
-                                list_profile.append(list_point_profile)
-                                list_point_profile = []
-                            else:
-                                line.append("")
-                                list_point_profile.append(line[:3])
                        else:
                            pass

@@ -733,12 +721,12 @@ class Reach(SQLSubModel):
                c1 = f"{profile.code1:>6}"
                c2 = f"{profile.code2:>6}"
                t = f"{len(profile.points):>6}"
-                rk = f"{profile.rk:>12f}"[0:12]
+                kp = f"{profile.kp:>12f}"[0:12]
                pname = profile.name
                if profile.name == "":
                    pname = f"p{profile.id:>3}".replace(" ", "0")

-                st.write(f"{num}{c1}{c2}{t} {rk} {pname}\n")
+                st.write(f"{num}{c1}{c2}{t} {kp} {pname}\n")

                for point in profile.points:
                    x = f"{point.x:<12.4f}"[0:12]
@@ -753,44 +741,38 @@ class Reach(SQLSubModel):
                cnt += 1

    def get_incline(self):
-        if len(self.profiles) == 0:
-            return 0.0
-
        first = self.profile(0)
        last = self.profile(len(self) - 1)

        z_first = first.z_min()
-        rk_first = first.rk
+        kp_first = first.kp

        z_last = last.z_min()
-        rk_last = last.rk
+        kp_last = last.kp

        return (
            (z_last - z_first)
            /
-            (rk_last - rk_first)
+            (kp_last - kp_first)
        )

    def get_incline_mean(self):
        profiles = self.profiles
-        if len(profiles) == 0:
-            return 0.0
-
        previous = profiles[0]

        incline_acc = 0

        for profile in profiles[1:]:
            z_first = previous.z_min()
-            rk_first = previous.rk
+            kp_first = previous.kp

            z_last = profile.z_min()
-            rk_last = profile.rk
+            kp_last = profile.kp

            incline_acc += (
                (z_last - z_first)
                /
-                (rk_last - rk_first)
+                (kp_last - kp_first)
            )

            previous = profile
@@ -799,24 +781,21 @@ class Reach(SQLSubModel):

    def get_incline_median(self):
        profiles = self.profiles
-        if len(profiles) == 0:
-            return 0.0
-
        previous = profiles[0]

        incline_acc = []

        for profile in profiles[1:]:
            z_first = previous.z_min()
-            rk_first = previous.rk
+            kp_first = previous.kp

            z_last = profile.z_min()
-            rk_last = profile.rk
+            kp_last = profile.kp

            incline_acc += [
                (z_last - z_first)
                /
-                (rk_last - rk_first)
+                (kp_last - kp_first)
            ]

            previous = profile
@@ -826,27 +805,21 @@ class Reach(SQLSubModel):

    def get_incline_median_mean(self):
        profiles = self.profiles
-        if len(profiles) == 0:
-            return 0.0
-
        previous = profiles[0]

        incline_acc = []

        for profile in profiles[1:]:
            z_first = previous.z_min()
-            rk_first = previous.rk
+            kp_first = previous.kp

            z_last = profile.z_min()
-            rk_last = profile.rk
-
-            if (rk_last - rk_first) == 0:
-                continue
+            kp_last = profile.kp

            incline_acc += [
                (z_last - z_first)
                /
-                (rk_last - rk_first)
+                (kp_last - kp_first)
            ]

            previous = profile
@@ -874,14 +847,14 @@ class Reach(SQLSubModel):
            logger_exception(e)
            return 0

-    def _recompute_rk(self, offset=0.0):
-        self._recompute_rk_no_gl(offset=offset)
+    def _recompute_kp(self, offset=0.0):
+        self._recompute_kp_no_gl(offset=offset)

-    def _recompute_rk_no_gl(self, offset=0.0):
+    def _recompute_kp_no_gl(self, offset=0.0):
        profiles = iter(self.profiles)

        previous = next(profiles)
-        previous.rk = offset
+        previous.kp = offset

        for profile in profiles:
            prev_points = previous.points
@@ -892,5 +865,5 @@ class Reach(SQLSubModel):
                prev_points[-1].dist_2d(curr_points[-1])
            ) / 2.0

-            profile.rk = previous.rk + dist
+            profile.kp = previous.kp + dist
            previous = profile
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -50,8 +50,8 @@ class HydraulicStructure(SQLSubModel):
            self.id = id

        self._name = name
-        self._input_rk = None
-        self._output_rk = None
+        self._input_kp = None
+        self._output_kp = None
        self._input_reach = None
        self._output_reach = None
        self._enabled = True
@@ -69,8 +69,8 @@ class HydraulicStructure(SQLSubModel):
            id INTEGER NOT NULL PRIMARY KEY,
            name TEXT NOT NULL,
            enabled BOOLEAN NOT NULL,
-            input_rk REAL NOT NULL,
-            output_rk REAL NOT NULL,
+            input_kp REAL NOT NULL,
+            output_kp REAL NOT NULL,
            input_reach INTEGER,
            output_reach INTEGER,
            FOREIGN KEY(input_reach) REFERENCES river_reach(id),
@@ -84,25 +84,9 @@ class HydraulicStructure(SQLSubModel):
    def _db_update(cls, execute, version):
        major, minor, release = version.strip().split(".")
        if major == minor == "0":
-            rl = int(release)
-
-            if rl < 6:
+            if int(release) < 6:
                cls._db_create(execute)

-            if rl < 11:
-                execute(
-                    """
-                    ALTER TABLE hydraulic_structures
-                    RENAME COLUMN input_kp TO input_rk
-                    """
-                )
-                execute(
-                    """
-                    ALTER TABLE hydraulic_structures
-                    RENAME COLUMN output_kp TO output_rk
-                    """
-                )
-
        return True

    @classmethod
@@ -111,7 +95,7 @@ class HydraulicStructure(SQLSubModel):

        table = execute(
            "SELECT id, name, enabled, " +
-            "input_rk, output_rk, " +
+            "input_kp, output_kp, " +
            "input_reach, output_reach " +
            "FROM hydraulic_structures "
        )
@@ -122,8 +106,8 @@ class HydraulicStructure(SQLSubModel):
            hs_id = next(it)
            name = next(it)
            enabled = (next(it) == 1)
-            input_rk = next(it)
-            output_rk = next(it)
+            input_kp = next(it)
+            output_kp = next(it)
            input_reach_id = next(it)
            output_reach_id = next(it)

@@ -134,8 +118,8 @@ class HydraulicStructure(SQLSubModel):
            )

            hs.enabled = enabled
-            hs.input_rk = input_rk if input_rk != -1 else None
-            hs.output_rk = output_rk if output_rk != -1 else None
+            hs.input_kp = input_kp if input_kp != -1 else None
+            hs.output_kp = output_kp if output_kp != -1 else None

            hs.input_reach, hs.output_reach = reduce(
                lambda acc, n: (
@@ -164,24 +148,24 @@ class HydraulicStructure(SQLSubModel):
        if self._output_reach is not None:
            output_reach_id = self._output_reach.id

-        input_rk = -1
-        if self.input_rk is not None:
-            input_rk = self.input_rk
+        input_kp = -1
+        if self.input_kp is not None:
+            input_kp = self.input_kp

-        output_rk = -1
-        if self.output_rk is not None:
-            output_rk = self.output_rk
+        output_kp = -1
+        if self.output_kp is not None:
+            output_kp = self.output_kp

        sql = (
            "INSERT INTO " +
            "hydraulic_structures(" +
-            "  id, name, enabled, input_rk, output_rk, " +
+            "  id, name, enabled, input_kp, output_kp, " +
            "  input_reach, output_reach" +
            ") " +
            "VALUES (" +
            f"{self.id}, '{self._db_format(self._name)}', " +
            f"{self._db_format(self.enabled)}, " +
-            f"{input_rk}, {output_rk}, " +
+            f"{input_kp}, {output_kp}, " +
            f"{input_reach_id}, {output_reach_id}" +
            ")"
        )
@@ -214,24 +198,24 @@ class HydraulicStructure(SQLSubModel):
        self._status.modified()

    @property
-    def input_rk(self):
-        return self._input_rk
+    def input_kp(self):
+        return self._input_kp

-    @input_rk.setter
-    def input_rk(self, input_rk):
-        if input_rk is not None:
-            input_rk = float(input_rk)
+    @input_kp.setter
+    def input_kp(self, input_kp):
+        if input_kp is not None:
+            input_kp = float(input_kp)

-        self._input_rk = input_rk
+        self._input_kp = input_kp
        self._status.modified()

    @property
-    def output_rk(self):
-        return self._output_rk
+    def output_kp(self):
+        return self._output_kp

-    @output_rk.setter
-    def output_rk(self, output_rk):
-        self._output_rk = output_rk
+    @output_kp.setter
+    def output_kp(self, output_kp):
+        self._output_kp = output_kp
        self._status.modified()

    @property
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -21,7 +21,6 @@ import logging
 from copy import copy, deepcopy
 from tools import trace, timer
 from functools import reduce
-from numpy import interp

 from Model.Tools.PamhyrDB import SQLSubModel

@@ -31,7 +30,7 @@ logger = logging.getLogger()
 class Data(SQLSubModel):
    def __init__(self, name: str = "",
                 comment: str = "", reach=None,
-                 rk: float = 0.0, discharge: float = 0.0,
+                 kp: float = 0.0, discharge: float = 0.0,
                 height: float = 0.0,
                 status=None):
        super(Data, self).__init__()
@@ -43,14 +42,14 @@ class Data(SQLSubModel):
        self._name = name
        self._comment = comment

-        self._rk = rk
+        self._kp = kp
        self._discharge = discharge
        self._speed = 0.0
        self._elevation = 0.0
        self._height = height

-        if self._rk != 0.0:
-            self._update_from_rk()
+        if self._kp != 0.0:
+            self._update_from_kp()
        if self._height != 0.0:
            self._update_from_height()
        if self._discharge != 0.0:
@@ -65,7 +64,7 @@ class Data(SQLSubModel):
            name TEXT NOT NULL,
            comment TEXT NOT NULL,
            reach INTEGER,
-            rk REAL NOT NULL,
+            kp REAL NOT NULL,
            discharge REAL NOT NULL,
            height REAL NOT NULL,
            FOREIGN KEY(reach) REFERENCES river_reach(id)
@@ -76,20 +75,13 @@ class Data(SQLSubModel):

    @classmethod
    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 11:
-                execute(
-                    "ALTER TABLE initial_conditions RENAME COLUMN kp TO rk"
-                )
-
        return cls._update_submodel(execute, version)

    @classmethod
    def _db_load(cls, execute, data=None):
        id = data["reach"].id
        table = execute(
-            "SELECT ind, name, comment, rk, discharge, height " +
+            "SELECT ind, name, comment, kp, discharge, height " +
            "FROM initial_conditions " +
            f"WHERE reach = {id}"
        )
@@ -103,7 +95,7 @@ class Data(SQLSubModel):
            ind = row[0]
            name = row[1]
            comment = row[2]
-            rk = row[3]
+            kp = row[3]
            discharge = row[4]
            height = row[5]

@@ -112,7 +104,7 @@ class Data(SQLSubModel):
                status=data["status"],
                name=name,
                comment=comment,
-                rk=rk,
+                kp=kp,
                discharge=discharge,
                height=height,
            )
@@ -126,12 +118,12 @@ class Data(SQLSubModel):

        execute(
            "INSERT INTO " +
-            "initial_conditions(ind, name, comment, rk, " +
+            "initial_conditions(ind, name, comment, kp, " +
            "discharge, height, reach) " +
            "VALUES (" +
            f"{ind}, '{self._db_format(self.name)}', " +
            f"'{self._db_format(self._comment)}', " +
-            f"{self._rk}, {self._discharge}, {self._height}, " +
+            f"{self._kp}, {self._discharge}, {self._height}, " +
            f"{self._reach.id}" +
            ")"
        )
@@ -142,12 +134,13 @@ class Data(SQLSubModel):
        new = Data(
            name=self.name,
            comment=self._comment,
-            rk=self._rk,
+            kp=self._kp,
            discharge=self._discharge,
            height=self._height,
            reach=self._reach,
            status=self._status,
        )
+
        return new

    @property
@@ -161,8 +154,8 @@ class Data(SQLSubModel):
            val = self._name
        elif key == "comment":
            val = self._comment
-        elif key == "rk":
-            val = self._rk
+        elif key == "kp":
+            val = self._kp
        elif key == "speed":
            val = self._speed
        elif key == "discharge":
@@ -175,7 +168,7 @@ class Data(SQLSubModel):
        return val

    def _update_get_min(self):
-        profile = self._reach.reach.get_profiles_from_rk(self._rk)
+        profile = self._reach.reach.get_profiles_from_kp(self._kp)
        if len(profile) > 0:
            min = profile[0].z_min()
        else:
@@ -183,7 +176,7 @@ class Data(SQLSubModel):

        return min

-    def _update_from_rk(self):
+    def _update_from_kp(self):
        min = self._update_get_min()
        self._elevation = min + self._height

@@ -204,9 +197,9 @@ class Data(SQLSubModel):
            self._name = str(value)
        elif key == "comment":
            self._comment = str(value)
-        elif key == "rk":
-            self._rk = float(value)
-            self._update_from_rk()
+        elif key == "kp":
+            self._kp = float(value)
+            self._update_from_kp()
        elif key == "speed":
            # Not supposed to be modified
            self._speed = float(value)
@@ -305,10 +298,10 @@ class InitialConditions(SQLSubModel):
        self._data.insert(index, n)
        self._status.modified()

-    def new_from_data(self, rk, discharge, elevation):
+    def new_from_data(self, kp, discharge, elevation):
        n = Data(reach=self._reach, status=self._status)

-        n['rk'] = rk
+        n['kp'] = kp
        n['discharge'] = discharge
        n['elevation'] = elevation

@@ -351,8 +344,8 @@ class InitialConditions(SQLSubModel):
            )
        )

-    def get_rk(self):
-        return self._data_get("rk")
+    def get_kp(self):
+        return self._data_get("kp")

    def get_elevation(self):
        return self._data_get("elevation")
@@ -360,10 +353,10 @@ class InitialConditions(SQLSubModel):
    def get_discharge(self):
        return self._data_get("discharge")

-    def _sort_by_z_and_rk(self, profiles):
+    def _sort_by_z_and_kp(self, profiles):
        profiles.sort(
            reverse=False,
-            key=lambda p: p.rk
+            key=lambda p: p.kp
        )

        first_z = profiles[0].z()
@@ -372,42 +365,22 @@ class InitialConditions(SQLSubModel):
        if first_z > last_z:
            profiles.sort(
                reverse=True,
-                key=lambda p: p.rk
+                key=lambda p: p.kp
            )

-    def generate_growing_constant_depth(self, height: float,
-                                        compute_discharge: bool):
+    def generate_growing_constante_height(self, height: float):
+        self._data = []

        profiles = self._reach.reach.profiles.copy()
-        self._sort_by_z_and_rk(profiles)
-
-        previous_elevation = -99999.99
-
-        data_discharge = {}
-        if not compute_discharge:
-            if len(self._data) == 0:
-                for profile in profiles:
-                    data_discharge[profile.rk] = 0.0
-            else:
-                for data in self._data:
-                    data_discharge[data["rk"]] = data["discharge"]
+        self._sort_by_z_and_kp(profiles)

        incline = self._reach.reach.get_incline_median_mean()
        logger.debug(f"incline = {incline}")
-        self._data = []
-        for profile in profiles:
-            width = profile.wet_width(profile.z_min() + height)
-            frictions = self._reach.frictions.frictions
-            strickler = None
-            for f in frictions:
-                if f.contains_rk(profile.rk):
-                    strickler = f.get_friction(profile.rk)[0]
-            if strickler is None:
-                strickler = 25.0

-            if not compute_discharge:
-                discharge = data_discharge[profile.rk]
-            else:
+        previous_elevation = -99999.99
+        for profile in profiles:
+            width = profile.width_approximation()
+            strickler = 25
            discharge = (
                ((width * 0.8)
                 * strickler
@@ -420,53 +393,41 @@ class InitialConditions(SQLSubModel):
                previous_elevation
            )

-            logger.debug(f"({profile.rk}):")
+            logger.debug(f"({profile.kp}):")
            logger.debug(f"  width  = {width}")
            logger.debug(f"  strickler = {strickler}")
            logger.debug(f"  discharge = {discharge}")

            new = Data(reach=self._reach, status=self._status)
-            new["rk"] = profile.rk
+            new["kp"] = profile.kp
            new["discharge"] = discharge
+
            new["elevation"] = elevation

-            previous_elevation = elevation
            self._data.append(new)
+            previous_elevation = elevation

        self._generate_resort_data(profiles)

-    def generate_discharge(self, discharge: float, compute_height: bool):
+    def generate_discharge(self, discharge: float):
+        self._data = []

+        self._generate_height_estimation_from_discharge(
+            discharge
+        )
+
+    def _generate_height_estimation_from_discharge(self, discharge: float):
        profiles = self._reach.reach.profiles.copy()
-        self._sort_by_z_and_rk(profiles)
+        self._sort_by_z_and_kp(profiles)

        previous_elevation = -99999.99

-        data_height = {}
-        if not compute_height:
-            if len(self._data) == 0:
-                for profile in profiles:
-                    data_height[profile.rk] = 0.0
-            else:
-                for data in self._data:
-                    data_height[data["rk"]] = data["height"]
-
        incline = self._reach.reach.get_incline_median_mean()
        logger.debug(f"incline = {incline}")
-        self._data = []
+
        for profile in profiles:
            width = profile.width_approximation()
-            frictions = self._reach.frictions.frictions
-            strickler = None
-            for f in frictions:
-                if f.contains_rk(profile.rk):
-                    strickler = f.get_friction(profile.rk)[0]
-            if strickler is None:
-                strickler = 25.0
-
-            if not compute_height:
-                height = data_height[profile.rk]
-            else:
+            strickler = 25
            height = (
                discharge
                /
@@ -478,13 +439,13 @@ class InitialConditions(SQLSubModel):
                previous_elevation
            )

-            logger.debug(f"({profile.rk}):")
+            logger.debug(f"({profile.kp}):")
            logger.debug(f"  width  = {width}")
            logger.debug(f"  strickler = {strickler}")
            logger.debug(f"  height = {height}")

            new = Data(reach=self._reach, status=self._status)
-            new["rk"] = profile.rk
+            new["kp"] = profile.kp
            new["discharge"] = discharge
            new["elevation"] = elevation

@@ -493,45 +454,12 @@ class InitialConditions(SQLSubModel):

        self._generate_resort_data(profiles)

-    def generate_height(self,
-                        elevation1: float,
-                        elevation2: float,
-                        compute_discharge: bool,
-                        discharge: float):
-        profiles = self._reach.reach.profiles.copy()
-        upstream_rk = profiles[0].rk
-        downstream_rk = profiles[-1].rk
-        data_discharge = {}
-        if not compute_discharge:
-            if len(self._data) == 0:
-                for profile in profiles:
-                    data_discharge[profile.rk] = 0.0
-            else:
-                for data in self._data:
-                    data_discharge[data["rk"]] = data["discharge"]
-
-        self._data = []
-        for profile in profiles:
-
-            if not compute_discharge:
-                d = data_discharge[profile.rk]
-            else:
-                d = discharge
-            elevation = interp(profile.rk,
-                               [upstream_rk, downstream_rk],
-                               [elevation1, elevation2])
-            new = Data(reach=self._reach, status=self._status)
-            new["rk"] = profile.rk
-            new["discharge"] = d
-            new["elevation"] = elevation
-            self._data.append(new)
-
    def _generate_resort_data(self, profiles):
        is_reverse = False
-        if profiles[0].rk > profiles[-1].rk:
+        if profiles[0].kp > profiles[-1].kp:
            is_reverse = True

        self._data.sort(
            reverse=not is_reverse,
-            key=lambda d: d['rk']
+            key=lambda d: d['kp']
        )
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -48,8 +48,8 @@ class LateralContribution(SQLSubModel):
        self._name = name
        self._type = ""
        self._edge = None
-        self._begin_rk = 0.0
-        self._end_rk = 0.0
+        self._begin_kp = 0.0
+        self._end_kp = 0.0
        self._data = []
        self._header = []
        self._types = [float, float]
@@ -66,8 +66,8 @@ class LateralContribution(SQLSubModel):
            type TEXT NOT NULL,
            tab TEXT NOT NULL,
            edge INTEGER,
-            begin_rk REAL NOT NULL,
-            end_rk REAL NOT NULL,
+            begin_kp REAL NOT NULL,
+            end_kp REAL NOT NULL,
            FOREIGN KEY(edge) REFERENCES river_reach(id)
          )
        """)
@@ -87,22 +87,6 @@ class LateralContribution(SQLSubModel):

    @classmethod
    def _db_update(cls, execute, version):
-        major, minor, release = version.strip().split(".")
-        if major == minor == "0":
-            if int(release) < 11:
-                execute(
-                    """
-                    ALTER TABLE lateral_contribution
-                    RENAME COLUMN begin_kp TO begin_rk
-                    """
-                )
-                execute(
-                    """
-                    ALTER TABLE lateral_contribution
-                    RENAME COLUMN end_kp TO end_rk
-                    """
-                )
-
        return True

    @classmethod
@@ -126,7 +110,7 @@ class LateralContribution(SQLSubModel):
        tab = data["tab"]

        table = execute(
-            "SELECT id, name, type, edge, begin_rk, end_rk " +
+            "SELECT id, name, type, edge, begin_kp, end_kp " +
            f"FROM lateral_contribution WHERE tab = '{tab}'"
        )

@@ -141,8 +125,8 @@ class LateralContribution(SQLSubModel):
            lc.edge = None
            if row[3] != -1:
                lc.edge = next(filter(lambda e: e.id == row[3], data["edges"]))
-            lc._begin_rk = row[4]
-            lc._end_rk = row[5]
+            lc._begin_kp = row[4]
+            lc._end_kp = row[5]

            values = execute(
                "SELECT ind, data0, data1 FROM lateral_contribution_data " +
@@ -176,11 +160,11 @@ class LateralContribution(SQLSubModel):
        sql = (
            "INSERT INTO " +
            "lateral_contribution(id, name, type, tab, " +
-            "edge, begin_rk, end_rk) " +
+            "edge, begin_kp, end_kp) " +
            "VALUES (" +
            f"{self.id}, '{self._db_format(self._name)}', " +
            f"'{self._db_format(self._type)}', '{tab}', {edge}, " +
-            f"{self._begin_rk}, {self._end_rk}" +
+            f"{self._begin_kp}, {self._end_kp}" +
            ")"
        )
        execute(sql)
@@ -247,44 +231,44 @@ class LateralContribution(SQLSubModel):
    def edge(self, edge):
        self._edge = edge
        if edge is not None:
-            self._begin_rk = self._edge.reach.get_rk_min()
-            self._end_rk = self._edge.reach.get_rk_max()
+            self._begin_kp = self._edge.reach.get_kp_min()
+            self._end_kp = self._edge.reach.get_kp_max()
        self._status.modified()

    def has_edge(self):
        return self._edge is not None

    @property
-    def begin_rk(self):
-        return self._begin_rk
+    def begin_kp(self):
+        return self._begin_kp

-    @begin_rk.setter
-    def begin_rk(self, begin_rk):
+    @begin_kp.setter
+    def begin_kp(self, begin_kp):
        if self._edge is None:
-            self._begin_rk = begin_rk
+            self._begin_kp = begin_kp
        else:
-            _min = self._edge.reach.get_rk_min()
-            _max = self._edge.reach.get_rk_max()
+            _min = self._edge.reach.get_kp_min()
+            _max = self._edge.reach.get_kp_max()

-            if _min <= begin_rk <= _max:
-                self._begin_rk = begin_rk
+            if _min <= begin_kp <= _max:
+                self._begin_kp = begin_kp

        self._status.modified()

    @property
-    def end_rk(self):
-        return self._end_rk
+    def end_kp(self):
+        return self._end_kp

-    @end_rk.setter
-    def end_rk(self, end_rk):
+    @end_kp.setter
+    def end_kp(self, end_kp):
        if self._edge is None:
-            self._end_rk = end_rk
+            self._end_kp = end_kp
        else:
-            _min = self._edge.reach.get_rk_min()
-            _max = self._edge.reach.get_rk_max()
+            _min = self._edge.reach.get_kp_min()
+            _max = self._edge.reach.get_kp_max()

-            if _min <= end_rk <= _max:
-                self._end_rk = end_rk
+            if _min <= end_kp <= _max:
+                self._end_kp = end_kp

        self._status.modified()

@@ -393,8 +377,8 @@ class LateralContribution(SQLSubModel):
    def convert(self, cls):
        new = cls(name=self.name, status=self._status)
        new.edge = self.edge
-        new.begin_rk = self.begin_rk
-        new.end_rk = self.end_rk
+        new.begin_kp = self.begin_kp
+        new.end_kp = self.end_kp

        for i, _ in enumerate(self.data):
            new.add(i)
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -51,9 +51,9 @@ class Edge(object):
        elif name == "id":
            ret = self.id
        elif name == "node1":
-            ret = self.node1
+            ret = self.node1.name
        elif name == "node2":
-            ret = self.node2
+            ret = self.node2.name
        elif name == "enable":
            ret = self._enable

@@ -75,10 +75,10 @@ class Edge(object):

    @property
    def name(self):
+        name = self._name
        if self._name == "":
-            return f"R{self.id}"
-
-        return self._name
+            name = f"{self.node1.name} -> {self.node2.name}"
+        return name

    def is_enable(self):
        return self._enable
@@ -35,7 +35,11 @@ class Node(object):
        else:
            self.id = id

+        if name == "":
+            self._name = f"Node {self.id}"
+        else:
            self._name = name
+
        self.pos = Point(x, y)

    def __getitem__(self, key):
@@ -60,9 +64,6 @@ class Node(object):

    @property
    def name(self):
-        if self._name == "":
-            return f"N{self.id}"
-
        return self._name

    @property
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -35,8 +35,8 @@ class Profile(object):
        return self._profile.name

    @property
-    def rk(self):
-        return self._profile.rk
+    def kp(self):
+        return self._profile.kp

    @property
    def geometry(self):
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -22,19 +22,10 @@ logger = logging.getLogger()


 class SavedStatus(object):
-    def __init__(self, version=0):
+    def __init__(self):
        super(SavedStatus, self).__init__()
-        self._version = version
        self._saved = True

-    @property
-    def version(self):
-        return self._version
-
-    @version.setter
-    def version(self, version):
-        self._version = version
-
    def is_saved(self):
        return self._saved

@@ -43,11 +34,5 @@ class SavedStatus(object):
        self._saved = True

    def modified(self):
-        if self._saved:
-            self._version += 1
-
-        logger.debug(
-            "STATUS: Model status set as modified " +
-            f"at version {self._version}"
-        )
+        # logger.debug("model status set as modified")
        self._saved = False
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -113,7 +113,10 @@ class Stricklers(SQLSubModel):
        return True

    def __str__(self):
-        return f"{self.name} ({self._minor}, {self._medium})"
+        if self._name != "":
+            return f"{self._name} ({self._minor}, {self._medium})"
+
+        return f"({self._minor}, {self._medium})"

    @property
    def name(self):
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -41,7 +41,7 @@ class Study(SQLModel):

    def __init__(self, filename=None, init_new=True):
        # Metadata
-        self._version = "0.0.11"
+        self._version = "0.0.9"
        self.creation_date = datetime.now()
        self.last_modification_date = datetime.now()
        self.last_save_date = datetime.now()
@@ -117,9 +117,6 @@ class Study(SQLModel):
        if ".backup" in self.filename:
            is_new = True

-        if not os.path.exists(self.filename):
-            is_new = True
-
        self._init_db_file(self.filename, is_new=is_new)
        self.commit()

@@ -212,12 +209,7 @@ class Study(SQLModel):
    def _create(self):
        # Info (metadata)
        self.execute(
-            "INSERT INTO info VALUES ('study_release', '0')"
-        )
-
-        self.execute(
-            "CREATE TABLE info(key TEXT NOT NULL UNIQUE, value TEXT NOT NULL)"
-        )
+            "CREATE TABLE info(key TEXT NOT NULL UNIQUE, value TEXT NOT NULL)")
        self.execute(
            "INSERT INTO info VALUES ('version', " +
            f"'{self._db_format(self._version)}')",
@@ -226,20 +218,19 @@ class Study(SQLModel):
        self.execute("INSERT INTO info VALUES ('name', '')")
        self.execute("INSERT INTO info VALUES ('description', '')")
        self.execute(
-            f"INSERT INTO info VALUES ('time_system', '{self._time_system}')"
-        )
+            f"INSERT INTO info VALUES ('time_system', '{self._time_system}')")
        self.execute(
-            "INSERT INTO info VALUES ('date', " +
-            f"'{timestamp(self._date)}')"
+            f"INSERT INTO info VALUES ('date', " +
+            "'{self._date.timestamp()}')"
        )

        self.execute(
-            "INSERT INTO info VALUES ('creation_date', " +
-            f"'{timestamp(self.creation_date)}')"
+            f"INSERT INTO info VALUES ('creation_date', " +
+            "'{self.creation_time.timestamp()}')"
        )
        self.execute(
-            "INSERT INTO info VALUES ('last_save_date', " +
-            f"'{timestamp(self.last_save_date)}')"
+            f"INSERT INTO info VALUES ('last_save_date', " +
+            "'{self.last_save_time.timestamp()}')"
        )

        self._create_submodel()
@@ -254,12 +245,6 @@ class Study(SQLModel):

        logger.debug("Update database")

-        major, minor, release = version[0].split('.')
-        if major == "0" and minor == "0" and int(release) < 10:
-            self.execute(
-                "INSERT INTO info VALUES ('study_release', '0')"
-            )
-
        if self._update_submodel(version[0]):
            self.execute(
                f"UPDATE info SET value='{self._version}' WHERE key='version'"
@@ -273,11 +258,6 @@ class Study(SQLModel):
    def _load(cls, filename):
        new = cls(init_new=False, filename=filename)

-        version = new.execute(
-            "SELECT value FROM info WHERE key='study_release'"
-        )
-        new.status.version = int(version[0])
-
        # TODO: Load metadata
        new.name = new.execute("SELECT value FROM info WHERE key='name'")[0]
        new.description = new.execute(
@@ -312,11 +292,6 @@ class Study(SQLModel):
    def _save(self, progress=None):
        progress = progress if progress is not None else lambda: None

-        self.execute(
-            "INSERT INTO info VALUES ('study_release', " +
-            f"'{self.status.version}')"
-        )
-
        self.execute(
            f"UPDATE info SET " +
            f"value='{self._db_format(self.name)}' WHERE key='name'"
@@ -67,7 +67,7 @@ class PamhyrModelDict(SQLSubModel):
        if key in self._dict:
            v = self._dict[key]

-            if isinstance(v, types.GeneratorType):
+            if type(v) is types.GeneratorType:
                return list(v)

            return v
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -69,7 +69,7 @@ class Mage(CommandLineSolver):
        lst += [
            ("mage_min_timestep", "1.0"),
            ("mage_timestep_tra", "3600"),
-            ("mage_timestep_bin", "3600"),
+            ("mage_timestep_bin", "0"),
            # ("mage_timestep_melissa", "0"),
            ("mage_implicitation", "0.70"),
            ("mage_continuity_discretization", "S"),
@@ -79,11 +79,11 @@ class Mage(CommandLineSolver):
            ("mage_smooth_coef", "0"),
            ("mage_cfl_max", "-1."),
            ("mage_min_height", "0.1"),
-            ("mage_max_niter", "99"),
+            ("mage_max_niter", "10"),
            ("mage_timestep_reduction_factor", "2"),
            ("mage_precision_reduction_factor_Z", "1"),
            ("mage_precision_reduction_factor_Q", "1"),
-            ("mage_niter_max_precision", "10"),
+            ("mage_niter_max_precision", "99"),
            ("mage_niter_before_switch", "99"),
            ("mage_max_froude", "1.5"),
            ("mage_diffluence_node_height_balance", "-1"),
@@ -180,7 +180,7 @@ class Mage(CommandLineSolver):
        c1 = f"{profile.code1:>6}"
        c2 = f"{profile.code2:>6}"
        t = f"{len(profile.points):>6}"
-        rk = f"{profile.rk:>12f}"[0:12]
+        kp = f"{profile.kp:>12f}"[0:12]
        pname = profile.name
        if profile.name == "":
            # Generate name from profile id prefixed with
@@ -207,7 +207,7 @@ class Mage(CommandLineSolver):
                )

        # Profile header line
-        wfile.write(f"{num}{c1}{c2}{t} {rk} {pname} {sediment}\n")
+        wfile.write(f"{num}{c1}{c2}{t} {kp} {pname} {sediment}\n")

    def _export_ST_point_line(self, wfile, files, point):
        x = f"{point.x:<12.4f}"[0:12]
@@ -264,7 +264,7 @@ class Mage(CommandLineSolver):
                    if t in ["HYD", "QSO", "LIM"]:
                        v0 /= 60  # Convert first column to minute

-                    f.write(f"{v0:9} {v1:9} \n")
+                    f.write(f"{v0:10}{v1:10}\n")

        return files

@@ -339,7 +339,7 @@ class Mage(CommandLineSolver):
        f.write(f"* {lateral.edge.name} ({name}) {lateral.lctype}\n")
        f.write(
            f"${name}    " +
-            f"{lateral.begin_rk:>10.4f} {lateral.end_rk:>10.4f}\n"
+            f"{lateral.begin_kp:>10.4f} {lateral.end_kp:>10.4f}\n"
        )
        header = lateral.header
        f.write(f"*{header[0]:>9}|{header[1]:>10}\n")
@@ -371,17 +371,17 @@ class Mage(CommandLineSolver):
                        continue

                    num = f"{id:>3}"
-                    brk = f"{friction.begin_rk:>10.3f}"
-                    erk = f"{friction.end_rk:>10.3f}"
+                    bkp = f"{friction.begin_kp:>10.3f}"
+                    ekp = f"{friction.end_kp:>10.3f}"

-                    # if friction.begin_rk != friction.end_rk:
+                    # if friction.begin_kp != friction.end_kp:
                    #     print("TODO")

                    strickler = friction.begin_strickler
                    coef_1 = f"{strickler.minor:>10.3f}"
                    coef_2 = f"{strickler.medium:>10.3f}"

-                    f.write(f"K{num}      {brk}{erk}{coef_1}{coef_2}\n")
+                    f.write(f"K{num}      {bkp}{ekp}{coef_1}{coef_2}\n")

                id += 1

@@ -401,7 +401,7 @@ class Mage(CommandLineSolver):

            # TODO put real date...
            f.write(f"$ date en minutes :       0.00\n")
-            f.write(f"* IB IS    discharge  elevation         rk\n")
+            f.write(f"* IB IS    discharge  elevation         kp\n")

            id = 1
            for reach in reachs:
@@ -418,9 +418,9 @@ class Mage(CommandLineSolver):
                    IS = f"{id_sec}"
                    discharge = f"{d['discharge']:>10.5f}"
                    elevation = f"{d['elevation']:>11.6f}"
-                    rk = f"{d['rk']:>9.2f}"
+                    kp = f"{d['kp']:>9.2f}"

-                    f.write(f"{IR} {IS} {discharge} {elevation} {rk}\n")
+                    f.write(f"{IR} {IS} {discharge} {elevation} {kp}\n")
                    id_sec += 1

                id += 1
@@ -495,12 +495,12 @@ class Mage(CommandLineSolver):
                if not hs.enabled:
                    continue

-                if hs.input_rk is None:
+                if hs.input_kp is None:
                    continue

                f.write(
                    '* ouvrage au pk ' +
-                    f"{float(hs.input_rk):>12.1f}" + ' ' +
+                    f"{float(hs.input_kp):>12.1f}" + ' ' +
                    hs.name + '\n'
                )

@@ -527,7 +527,7 @@ class Mage(CommandLineSolver):

                f.write(
                    f"{sin_dict[bhs._type]} " +
-                    f"{reach_id} {float(hs.input_rk):>12.3f} " +
+                    f"{reach_id} {float(hs.input_kp):>12.3f} " +
                    f"{param_str} {name}\n"
                )

@@ -30,13 +30,13 @@ from Model.Results.River.River import River, Reach, Profile
 logger = logging.getLogger()


-class Rubar3(CommandLineSolver):
-    _type = "rubar3"
+class RubarBE(CommandLineSolver):
+    _type = "rubarbe"

    def __init__(self, name):
-        super(Rubar3, self).__init__(name)
+        super(RubarBE, self).__init__(name)

-        self._type = "rubar3"
+        self._type = "rubarbe"

        self._cmd_input = ""
        self._cmd_solver = "@path @input -o @output"
@@ -44,9 +44,9 @@ class Rubar3(CommandLineSolver):

    @classmethod
    def default_parameters(cls):
-        # lst = super(Rubar3, cls).default_parameters()
+        lst = super(RubarBE, cls).default_parameters()

-        lst = [
+        lst += [
            ("rubarbe_cfl", "0.50000E+00"),
            ("rubarbe_condam", "1"),
            ("rubarbe_condav", "3"),
@@ -60,10 +60,10 @@ class Rubar3(CommandLineSolver):
            ("rubarbe_tinit", "000:00:00:00"),
            ("rubarbe_tmax", "999:99:99:00"),
            ("rubarbe_tiopdt", "000:00:00:00"),
-            ("rubarbe_dt", "5.0"),
+            ("rubarbe_dt", "3000.0"),
            ("rubarbe_ts", "999:99:99:00"),
-            ("rubarbe_dtsauv", "00:00:00:05"),
-            ("rubarbe_psave", "00:00:00:05"),
+            ("rubarbe_dtsauv", "999:99:99:00"),
+            ("rubarbe_psave", "999:99:99:00"),
            ("rubarbe_fdeb1", "1"),
            ("rubarbe_fdeb2", "10"),
            ("rubarbe_fdeb3", "100"),
@@ -119,21 +119,21 @@ class Rubar3(CommandLineSolver):
    ##########

    def cmd_args(self, study):
-        lst = super(Rubar3, self).cmd_args(study)
+        lst = super(RubarBE, self).cmd_args(study)

        return lst

    def input_param(self):
        name = self._study.name
-        return f"{name}"
+        return f"{name}.REP"

    def output_param(self):
        name = self._study.name
-        return f"{name}"
+        return f"{name}.BIN"

    def log_file(self):
        name = self._study.name
-        return f"{name}"
+        return f"{name}.TRA"

    def export(self, study, repertory, qlog=None):
        self._study = study
@@ -143,12 +143,8 @@ class Rubar3(CommandLineSolver):
        self._export_ts(study, repertory, qlog, name=name)
        self._export_geomac_i(study, repertory, qlog, name=name)
        self._export_mail(study, repertory, qlog, name=name)
-        self._export_condin(study, repertory, qlog, name=name)
+        self._export_tps(study, repertory, qlog, name=name)
        self._export_stricklers(study, repertory, qlog, name=name)
-        self._export_hydro(study, repertory, qlog, name=name)
-        self._export_condav(study, repertory, qlog, name=name)
-
-        return True

    def _export_donnee(self, study, repertory, qlog, name="0"):
        if qlog is not None:
@@ -172,9 +168,6 @@ class Rubar3(CommandLineSolver):
                name = param.name
                value = param.value

-                if "all_" in name:
-                    continue
-
                if value != "":
                    # Value format
                    if value.count(':') == 3:
@@ -272,10 +265,10 @@ class Rubar3(CommandLineSolver):

                ind = 1
                for profile in reach.profiles:
-                    rk = profile.rk
+                    kp = profile.kp
                    n_points = len(profile)

-                    f.write(f"{ind:>4} {rk:>11.3f} {n_points:>4}\n")
+                    f.write(f"{ind:>4} {kp:>11.3f} {n_points:>4}\n")

                    for point in profile.points:
                        label = point.name.lower()
@@ -283,9 +276,7 @@ class Rubar3(CommandLineSolver):
                            if label[0] == "r":
                                label = label[1].upper()
                            else:
-                                label = label[1].upper()
-                        else:
-                            label = " "
+                                label = lable[0]

                        y = point.y
                        z = point.z
@@ -316,8 +307,8 @@ class Rubar3(CommandLineSolver):
                lm = len(reach) + 1
                f.write(f"{lm:>13}\n")

-                for mails in [reach.inter_profiles_rk(),
-                              reach.get_rk()]:
+                for mails in [reach.inter_profiles_kp(),
+                              reach.get_kp()]:
                    ind = 0
                    for mail in mails:
                        f.write(f"{mail:15.3f}")
@@ -347,7 +338,7 @@ class Rubar3(CommandLineSolver):
                lm = len(reach) + 1
                f.write(f"{lm:>6}\n")

-                def get_stricklers_from_rk(rk):
+                def get_stricklers_from_kp(kp):
                    return next(
                        map(
                            lambda s: (
@@ -355,28 +346,28 @@ class Rubar3(CommandLineSolver):
                                else s.begin_strickler.minor
                            ),
                            filter(
-                                lambda f: rk in f,
+                                lambda f: kp in f,
                                edge.frictions.lst
                            )
                        )
                    )

                ind = 1
-                for mail in edge.reach.inter_profiles_rk():
-                    coef = get_stricklers_from_rk(mail)
+                for mail in edge.reach.inter_profiles_kp():
+                    coef = get_stricklers_from_kp(mail)

                    f.write(f"{ind:>6} {coef:>12.5f}")

                    ind += 1
                    f.write("\n")

-    def _export_condin(self, study, repertory, qlog, name="0"):
+    def _export_tps(self, study, repertory, qlog, name="0"):
        if qlog is not None:
-            qlog.put("Export CONDIN file")
+            qlog.put("Export TPS file")

        with open(
                os.path.join(
-                    repertory, f"condin.{name}"
+                    repertory, f"tps.{name}"
                ), "w+"
        ) as f:
            for edge in study.river.enable_edges():
@@ -385,23 +376,23 @@ class Rubar3(CommandLineSolver):
                f.write(f"0.0\n")

                ics = study.river.initial_conditions.get(edge)
-                data = self._export_condin_init_data(ics)
+                data = self._export_tps_init_data(ics)

                profiles = reach.profiles
                first = profiles[0]
                last = profiles[-1]

-                if first.rk not in data or last.rk not in data:
+                if first.kp not in data or last.kp not in data:
                    logger.error(
                        "Study initial condition is not fully defined"
                    )
                    return

-                f_h_s = self._export_condin_profile_height_speed(first, data)
-                l_h_s = self._export_condin_profile_height_speed(last, data)
+                f_h_s = self._export_tps_profile_height_speed(first, data)
+                l_h_s = self._export_tps_profile_height_speed(last, data)

                # First mail
-                f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}\n")
+                f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}")

                ind = 2
                it = iter(profiles)
@@ -409,11 +400,11 @@ class Rubar3(CommandLineSolver):

                prev_h, prev_s = f_h_s
                for profile in it:
-                    if profile.rk not in data:
+                    if profile.kp not in data:
                        ind += 1
                        continue

-                    cur_h, cur_s = self._export_condin_profile_height_speed(
+                    cur_h, cur_s = self._export_tps_profile_height_speed(
                        profile, data
                    )

@@ -427,83 +418,24 @@ class Rubar3(CommandLineSolver):
                    ind += 1

                # Last mail
-                f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}\n")
+                f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}")

-    def _export_condin_init_data(self, ics):
+    def _export_tps_init_data(self, ics):
        data = {}

        for d in ics.data:
-            data[d['rk']] = (
+            data[d['kp']] = (
                d['elevation'],
                d['discharge'],
            )

        return data

-    def _export_condin_profile_height_speed(self, profile, data):
-        z = data[profile.rk][0]
-        q = data[profile.rk][1]
+    def _export_tps_profile_height_speed(self, profile, data):
+        z = data[profile.kp][0]
+        q = data[profile.kp][1]

-        # height = z - profile.z_min()
+        height = z - profile.z_min()
        speed = profile.speed(q, z)

-        return z, speed
-
-    def _export_hydro(self, study, repertory, qlog, name="0"):
-        if qlog is not None:
-            qlog.put("Export HYDRO file")
-
-        with open(
-                os.path.join(
-                    repertory, f"hydro.{name}"
-                ), "w+"
-        ) as f:
-            bcs = []
-            for edge in study.river.enable_edges():
-                for bound in study.river.boundary_condition.get_tab("liquid"):
-                    # BC is an hydrogramme
-                    if bound.bctype == "TD" or bound.bctype == "PC":
-                        # BC is on input node of this reach
-                        if bound.node == edge.node1:
-                            bcs.append(bound)
-
-            for bc in bcs:
-                f.write(f"{len(bc)}\n")
-                for d0, d1 in bc.data:
-                    f.write(f"{d0} {d1}\n")
-
-    def _export_condav(self, study, repertory, qlog, name="0"):
-        if qlog is not None:
-            qlog.put("Export CONDAV file")
-
-        with open(
-                os.path.join(
-                    repertory, f"condav.{name}"
-                ), "w+"
-        ) as f:
-            bcs = []
-            for edge in study.river.enable_edges():
-                for bound in study.river.boundary_condition.get_tab("liquid"):
-                    # BC is an hydrogramme
-                    if bound.bctype == "ZD" or bound.bctype == "TZ":
-                        # BC is on input node of this reach
-                        if bound.node == edge.node2:
-                            bcs.append(bound)
-
-            for bc in bcs:
-                f.write(f"{len(bc)}\n")
-                for d0, d1 in bc.data:
-                    f.write(f"{d0} {d1}\n")
-
-
-class RubarBE(Rubar3):
-    _type = "rubarbe"
-
-    def __init__(self, name):
-        super(RubarBE, self).__init__(name)
-
-        self._type = "rubarbe"
-
-        self._cmd_input = ""
-        self._cmd_solver = "@path @input -o @output"
-        self._cmd_output = ""
+        return height, speed
@@ -22,7 +22,7 @@ from Solver.GenericSolver import GenericSolver
 from Solver.Mage import (
    Mage7, Mage8, MageFake7,
 )
-from Solver.RubarBE import Rubar3, RubarBE
+from Solver.RubarBE import RubarBE

 _translate = QCoreApplication.translate

@@ -32,7 +32,6 @@ solver_long_name = {
    "mage8": "Mage v8",
    # "mage_fake7": "Mage fake v7",
    # "rubarbe": "RubarBE",
-    # "rubar3": "Rubar3",
 }

 solver_type_list = {
@@ -41,5 +40,4 @@ solver_type_list = {
    "mage8": Mage8,
    # "mage_fake7": MageFake7,
    # "rubarbe": RubarBE,
-    # "rubar3": Rubar3,
 }
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -55,7 +55,6 @@ class AboutWindow(PamhyrDialog):

            label = self.get_label_text("label_version")
            label = label.replace("@version", version)
-            label = label.replace("@codename", "(Tahiti)")
            self.set_label_text("label_version", label)

        # Authors
@@ -68,5 +67,5 @@ class AboutWindow(PamhyrDialog):
                    label = f"\n  - {author}" + label
            except StopIteration:
                label = _translate("About", "Contributors: ") + label
-                # label = "Copyright © 2022-2024  INRAE\n" + label
+                label = "Copyright © 2022-2024  INRAE\n" + label
                self.set_label_text("label_copyright", label)
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -0,0 +1,17 @@
+# __init__.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 -*-
@@ -1,68 +0,0 @@
-# GenerateDialog.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.QtGui import (
-    QKeySequence,
-)
-
-from PyQt5.QtCore import (
-    Qt, QVariant, QAbstractTableModel,
-)
-
-from PyQt5.QtWidgets import (
-    QDialogButtonBox, QComboBox, QUndoStack, QShortcut,
-    QDoubleSpinBox, QCheckBox, QPushButton
-)
-
-
-class GenerateDialog(PamhyrDialog):
-    _pamhyr_ui = "BoundaryConditionsDialogGenerator"
-    _pamhyr_name = "Boundary Condition Options"
-
-    def __init__(self,
-                 value,
-                 reach,
-                 title="Boundary Condition Options",
-                 trad=None,
-                 parent=None):
-        super(GenerateDialog, self).__init__(
-            title=trad[self._pamhyr_name],
-            options=[],
-            trad=trad,
-            parent=parent
-        )
-
-        self.value = value
-        self.find(QDoubleSpinBox, "doubleSpinBox").setValue(self.value)
-        self.reach = reach
-        self.find(QPushButton, "EstimateButton").clicked.connect(
-            self.estimate
-            )
-
-    def accept(self):
-        self.value = self.find(QDoubleSpinBox, "doubleSpinBox").value()
-        super().accept()
-
-    def reject(self):
-        self.close()
-
-    def estimate(self):
-        self.value = abs(self.reach.get_incline_median_mean())
-        self.find(QDoubleSpinBox, "doubleSpinBox").setValue(self.value)
@@ -48,7 +48,6 @@ from Model.BoundaryCondition.BoundaryConditionTypes import (
 from View.BoundaryCondition.Edit.UndoCommand import (
    SetDataCommand, AddCommand, DelCommand,
    SortCommand, MoveCommand, PasteCommand,
-    ReplaceDataCommand,
 )

 _translate = QCoreApplication.translate
@@ -100,7 +99,7 @@ class TableModel(PamhyrTableModel):
            logger.info(e)
            logger.debug(traceback.format_exc())

-        self.update()
+        self.dataChanged.emit(index, index)
        return True

    def add(self, row, parent=QModelIndex()):
@@ -113,7 +112,7 @@ class TableModel(PamhyrTableModel):
        )

        self.endInsertRows()
-        self.update()
+        self.layoutChanged.emit()

    def delete(self, rows, parent=QModelIndex()):
        self.beginRemoveRows(parent, rows[0], rows[-1])
@@ -136,7 +135,7 @@ class TableModel(PamhyrTableModel):
        )

        self.layoutAboutToBeChanged.emit()
-        self.update()
+        self.layoutChanged.emit()

    def move_up(self, row, parent=QModelIndex()):
        if row <= 0:
@@ -153,7 +152,7 @@ class TableModel(PamhyrTableModel):
        )

        self.endMoveRows()
-        self.update()
+        self.layoutChanged.emit()

    def move_down(self, index, parent=QModelIndex()):
        if row > len(self._data):
@@ -170,7 +169,7 @@ class TableModel(PamhyrTableModel):
        )

        self.endMoveRows()
-        self.update()
+        self.layoutChanged.emit()

    def paste(self, row, header, data):
        if len(data) == 0:
@@ -191,23 +190,4 @@ class TableModel(PamhyrTableModel):
        )

        self.layoutAboutToBeChanged.emit()
-        self.update()
-
-    def auto_sort(self):
-        self.layoutAboutToBeChanged.emit()
-        self._data.sort(key=lambda x: x[0])
-        self.layoutAboutToBeChanged.emit()
-
-    def update(self):
-        # self.auto_sort()
        self.layoutChanged.emit()
-
-    def replace_data(self, data1, data2):
-        self.layoutAboutToBeChanged.emit()
-        self._undo.push(
-            ReplaceDataCommand(
-                self._data, data1, data2
-            )
-        )
-        self.layoutAboutToBeChanged.emit()
-        self.update()
@@ -181,30 +181,3 @@ class PasteCommand(QUndoCommand):
    def redo(self):
        for bc in self._bcs:
            self._data.insert(self._row, bc)
-
-
-class ReplaceDataCommand(QUndoCommand):
-    def __init__(self, data, data1, data2):
-        QUndoCommand.__init__(self)
-        self._data = data
-        self._old_rows = len(data)
-        self._data1 = data1
-        self._data2 = data2
-        self._rows = len(data1)
-
-        self._old_bc = []
-        for row in range(self._old_rows):
-            self._old_bc.append((row, self._data.get_i(row)))
-        self._old_bc.sort()
-
-    def undo(self):
-        self._data.delete_i(list(range(self._rows)))
-        for row, el in self._old_bc:
-            self._data.insert(row, el)
-
-    def redo(self):
-        self._data.delete_i(list(range(self._old_rows)))
-        for row in range(self._rows):
-            self._data.add(row)
-            self._data._set_i_c_v(row, 0, self._data1[row])
-            self._data._set_i_c_v(row, 1, self._data2[row])
@@ -20,8 +20,6 @@ import logging

 from tools import timer, trace

-from numpy import sqrt
-
 from View.Tools.PamhyrWindow import PamhyrWindow
 from View.Tools.PamhyrWidget import PamhyrWidget
 from View.Tools.PamhyrDelegate import PamhyrExTimeDelegate
@@ -50,7 +48,6 @@ from View.BoundaryCondition.Edit.translate import BCETranslate
 from View.BoundaryCondition.Edit.UndoCommand import SetMetaDataCommand
 from View.BoundaryCondition.Edit.Table import TableModel
 from View.BoundaryCondition.Edit.Plot import Plot
-from View.BoundaryCondition.Edit.GenerateDialog import GenerateDialog

 _translate = QCoreApplication.translate

@@ -107,7 +104,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
        self._data = data
        trad = BCETranslate()
        self._long_types = trad.get_dict("long_types")
-        self._study = study

        name = trad[self._pamhyr_name]
        if self._data is not None:
@@ -133,7 +129,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
        self.setup_plot()
        self.setup_data()
        self.setup_connections()
-        self.setup_dialog()

    def setup_data(self):
        self._is_solid = self._data.bctype == "SL"
@@ -198,38 +193,13 @@ 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_generate_uniform").triggered.connect(
-            self.generate_uniform
-            )
-        self.find(QAction, "action_generate_critical").triggered.connect(
-            self.generate_critical
-            )
-        self.find(QAction, "action_increasing").triggered.connect(
-            self.make_increasing
-            )
-        if self._data.bctype != "ZD" or not self._data.has_node:
-            self.find(QAction, "action_generate_uniform").setVisible(False)
-            self.find(QAction, "action_generate_critical").setVisible(False)
-            self.find(QAction, "action_increasing").setVisible(False)
-        else:
-            self.find(QAction, "action_generate_uniform").setVisible(True)
-            self.find(QAction, "action_generate_critical").setVisible(True)
-            self.find(QAction, "action_increasing").setVisible(True)

        self._table.dataChanged.connect(self.update)
-        self._table.layoutChanged.connect(self.update)

        if self._is_solid:
            self._d50sigma.d50Changed.connect(self.d50_changed)
            self._d50sigma.sigmaChanged.connect(self.sigma_changed)

-    def setup_dialog(self):
-        if len(self._data.reach(self._study.river)) > 0:
-            reach = self._data.reach(self._study.river)[0]
-            self.slope_value = abs(reach.get_incline_median_mean())
-        else:
-            self.slope_value = 0.0
-
    def d50_changed(self, value):
        self._undo_stack.push(
            SetMetaDataCommand(
@@ -340,87 +310,3 @@ class EditBoundaryConditionWindow(PamhyrWindow):
        self._table.redo()
        self.plot.update()
        self.widget_update()
-
-    def generate_uniform(self):
-        if self._data.has_node:
-            node = self._data.node
-            if node is None:
-                return
-            reach = self._data.reach(self._study.river)[0]
-            if len(reach.profiles) == 0:
-                self.message_box(
-                    window_title=self._trad["Warning"],
-                    text=self._trad["title_need_geometry"],
-                    informative_text=self._trad["msg_need_geometry"]
-                )
-                return
-
-            profile = reach.profiles[-1]
-            dlg = GenerateDialog(self.slope_value,
-                                 reach,
-                                 trad=self._trad,
-                                 parent=self)
-            if dlg.exec():
-                self.slope_value = dlg.value
-            frictions = reach._parent.frictions.frictions
-            z_min = profile.z_min()
-            z_max = profile.z_max()
-            strickler = None
-            for f in frictions:
-                if f.contains_rk(profile.rk):
-                    strickler = f.get_friction(profile.rk)[0]
-            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
-                  * (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
-                 for h in height]
-            for i in range(len(height)):
-                height[i] += z_min
-            self._table.replace_data(height, q)
-
-        return
-
-    def generate_critical(self):
-        if self._data.has_node:
-            node = self._data.node
-            if node is None:
-                return
-            reach = self._data.reach(self._study.river)[0]
-            if len(reach.profiles) == 0:
-                self.message_box(
-                    window_title=self._trad["Warning"],
-                    text=self._trad["title_need_geometry"],
-                    informative_text=self._trad["msg_need_geometry"]
-                )
-                return
-
-            profile = reach.profiles[-1]
-            z_min = profile.z_min()
-            z_max = profile.z_max()
-            height = [(i)*(z_max-z_min)/50 for i in range(51)]
-            q = [sqrt(9.81 * (profile.wet_area(z_min + h) ** 3)
-                      / profile.wet_width(z_min + h))
-                 for h in height]
-            for i in range(len(height)):
-                height[i] += z_min
-            self._table.replace_data(height, q)
-        return
-
-    def make_increasing(self):
-        if self._data.has_node:
-            node = self._data.node
-            if node is None:
-                return
-        if len(self._table._data) < 2:
-            return
-        h = [self._data.get_i(0)[0]]
-        q = [self._data.get_i(0)[1]]
-        for i in range(len(self._table._data)):
-            if i == 0:
-                continue
-            row = self._data.get_i(i)
-            if row[1] > q[-1]:
-                h.append(row[0])
-                q.append(row[1])
-        self._table.replace_data(h, q)
Author	SHA1	Message	Date
Pierre-Antoine Rouby	815716da07	Manifest: Minor change.	2024-07-01 09:54:22 +02:00
Pierre-Antoine Rouby	c288a390b5	packages: Fix setup.sh.	2024-05-29 11:39:18 +02:00
Pierre-Antoine Rouby	f1377f6336	ci: Minor fixe.	2024-05-29 11:15:10 +02:00
Pierre-Antoine Rouby	6ac808d842	ci: Try archive origin branch name.	2024-05-29 11:12:02 +02:00
Pierre-Antoine Rouby	b6aa0afdc7	ci: Fix path (again again and again).	2024-05-29 11:09:07 +02:00
Pierre-Antoine Rouby	03da38eeb0	ci: Update python version.	2024-05-29 11:04:49 +02:00
Pierre-Antoine Rouby	e970b2c07a	ci: Fix python dl path (again).	2024-05-29 11:02:50 +02:00
Pierre-Antoine Rouby	8d336b888a	ci: Minor fixes in dl path.	2024-05-29 10:38:39 +02:00
Pierre-Antoine Rouby	f4b7131b98	ci: Minor fixes.	2024-05-29 10:37:26 +02:00
Pierre-Antoine Rouby	07cdf72528	gitlab-ci: Add dl custom python and source with python packages.	2024-05-29 10:35:23 +02:00
Pierre-Antoine Rouby	7d235fdcc2	guix: Minor change.	2024-05-22 16:32:06 +02:00
Pierre-Antoine Rouby	45d6f228cf	tools: Add try to pwd user name get.	2024-05-22 16:16:40 +02:00
Pierre-Antoine Rouby	31974bc7b6	pamhyr: Add script to run pamhyr under guix shell env.	2024-05-22 16:02:33 +02:00
Pierre-Antoine Rouby	e87db62dce	pamhyr: Add setup.sh install script (not functionnal).	2024-05-22 16:00:06 +02:00
Pierre-Antoine Rouby	1eec6ffc85	pamhyr: Add guix manifest.	2024-05-22 15:59:22 +02:00
Pierre-Antoine Rouby	35dd851e08	pamhyr: Add setup.py file (not functionnal).	2024-05-22 15:58:43 +02:00