pep8

.gitignore

@@ -41,6 +41,9 @@ __old__
 
 *-venv
 
+mage8
+adists
+
 ### END CUSTOM ###
 
 # Created by https://www.toptal.com/developers/gitignore/api/python
@@ -272,6 +275,7 @@ 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
 
@@ -647,3 +651,233 @@ 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

.gitlab-ci.yml

@@ -83,6 +83,34 @@ dl-mage8-windows:
       - mage8-windows/mailleurTT.exe
       - mage8-windows/libbief.dll
 
+dl-adists-linux:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - mkdir -p adists-linux
+    - cd adists-linux
+    - curl -L -o adists https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/v1.0.1/downloads/executables/adists
+  artifacts:
+    paths:
+      - adists-linux/adists
+
+dl-adists-windows:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - mkdir -p adists-windows
+    - cd adists-windows
+    - curl -L -o adists.exe https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/v1.0.1/downloads/executables/adists_win64.exe.exe
+  artifacts:
+    paths:
+      - adists-windows/adists.exe
+
 #############
 # CONFIGURE #
 #############
@@ -224,6 +252,8 @@ build-linux:
   rules:
     - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   needs:
+    - job: dl-adists-linux
+      artifacts: true
     - job: dl-mage8-linux
       artifacts: true
     - job: dl-mage8-doc
@@ -260,6 +290,9 @@ build-linux:
     # Copy mage
     - mkdir -p pamhyr/mage8
     - cp -v ../mage8-linux/* pamhyr/mage8/
+    # Copy adists
+    - mkdir -p pamhyr/adists
+    - cp -v ../adists-linux/* pamhyr/adists/
     # Copy Pamhyr
     - cp -r dist/pamhyr/* pamhyr/
     # Pamhyr script to force x11
@@ -317,6 +350,8 @@ build-windows:
   needs:
     - job: dl-mage8-windows
       artifacts: true
+    - job: dl-adists-windows
+      artifacts: true
     - job: dl-mage8-doc
       artifacts: true
     - job: set-version

README.md

@@ -3,53 +3,38 @@
 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
 
-+ Edit a complex river hydraulics network
++ Define a complex river hydraulics network
 + Define the river geometry
 + Define boundary conditions
 + Define lateral contribution
-+ Edit river friction
-+ Add reservoirs
-+ Add hydraulic structures
-+ Generate initial conditions
-+ Edit river sedimentary layers
++ Define river friction
++ Define reservoirs
++ Define hydraulic structures
++ Define or generate initial conditions
++ Define 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](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux)
+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)
 
 ### Windows
 
-[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
-```
+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)

doc/dev/documentation.org

@@ -28,20 +28,6 @@
 #+OPTIONS: toc:t
 #+LANGUAGE: UKenglish
 
-#+NAME: attr_wrap
-#+HEADER: :var width="\\textwidth"
-#+HEADER: :var caption=""
-#+HEADER: :var smallcaption=""
-#+HEADER: :var name=""
-#+HEADER: :var data=""
-#+HEADER: :var float="nil"
-#+BEGIN_SRC sh :results output :exports none
-  echo "#+CAPTION[$smallcaption]: $caption"
-  echo "#+NAME: $name"
-  echo "#+ATTR_LATEX: :width $width :float $float"
-  echo "$data"
-#+END_SRC
-
 #+BEGIN_abstract
 This document is for the use of developers. It describes the project
 architecture, the tools available to assist development and
@@ -54,13 +40,13 @@ documentation, translations or code.
 
 * Introduction
 
-Pamhyr2 is free and open source software (FOSS) graphical user
+{{{pamhyr2}}} is free and open source software (FOSS) graphical user
 interface (GUI) for 1D hydro-sedimentary modelling of rivers developed
 in Python (with version 3.8). It use PyQt at version 5 and matplotlib
 in version 3.4.1 or later for the user insterface (see
 {{{file(/requirements.txt)}}} for details). The architecture of
 project code follow the Qt Model/View architecture [fn:qt-arch] (see
-details in section [[Architecture]]). Pamhyr2 packages can be build
+details in section [[Architecture]]). {{{pamhyr2}}} packages can be build
 manually (see section [[Building packages]]), but there are automatically
 build with the gitlab-ci (see the section [[Setup the CI
 environment]]). Documentation files are written with org-mode[fn:org],
@@ -75,7 +61,7 @@ https://doc.qt.io/qt-5/model-view-programming.html (last access
 
 * Architecture
 
-Pamhyr2's architecture is based on Qt Model/View, see Figure
+{{{pamhyr2}}}'s architecture is based on Qt Model/View, see Figure
 [[graph-architecture]]. It is made up of several different components: the
 model (in blue), the graphical components (in red), the
 actions/delegates (in green), the commands (in purple), the solvers
@@ -178,7 +164,7 @@ https://doc.qt.io/qt-5/model-view-programming.html
 
 ** Model
 
-The model is a set of Python classes. In Pamhyr2, this classes must
+The model is a set of Python classes. In {{{pamhyr2}}}, this classes must
 respect some constraint. Each model class must inherits
 =Model.Tools.SQLSubModel= abstract class, except the =Model.Study=
 class who inherits =Model.Tools.SQLModel= (see [[SQL]]).
@@ -456,12 +442,12 @@ of Bar (Listing [[sql-bar]] and [[sql-foo]]).
               bar._sql_save(execute, data=data)
 #+end_src
 
-Let see the results database scheme for Pamhyr2 at version v0.0.7 in
+Let see the results database scheme for {{{pamhyr2}}} at version v0.0.7 in
 Figure [[sql_schema]].
 
 #+NAME: sql_schema
 #+ATTR_LATEX: :width 16cm
-#+CAPTION: SQLite database scheme at Pamhyr2 version v0.0.7 (generate with [[https://gitlab.com/Screwtapello/sqlite-schema-diagram]])
+#+CAPTION: SQLite database scheme at {{{pamhyr2}}} version v0.0.7 (generate with [[https://gitlab.com/Screwtapello/sqlite-schema-diagram]])
 [[./images/schema_v0.0.7.png]]
 
 
@@ -486,7 +472,7 @@ PamhyrModelList but use a dictionary instead of list.
 
 ** View
 
-Pamhyr2 use Qt as graphical user interface library with the
+{{{pamhyr2}}} use Qt as graphical user interface library with the
 application "Qt designer" for windows or widget creation (see [[UI file]])
 and "Qt linguist" for interface translate (see [[Translate]]). In
 addition, we use matplotlib as ploting library (see [[Plot]]).
@@ -501,11 +487,11 @@ componant translate, and possible other files or sub-directories.
 
 *** UI file
 
-We define as possible all Pamhyr2 windows and custom widgets with "Qt
-designer". This application generate UI file who describes interface
-organisation with table, layout, button, etc. This method is faster
-than hand made windows and widget creation, and saves us some purely
-descriptive code. The UI files are saved into =src/View/ui= for
+We define as possible all {{{pamhyr2}}} windows and custom widgets
+with "Qt designer". This application generate UI file who describes
+interface organisation with table, layout, button, etc. This method is
+faster than hand made windows and widget creation, and saves us some
+purely descriptive code. The UI files are saved into =src/View/ui= for
 window, and =/src/View/ui/Widgets= for custom widget.
 
 *** Translate
@@ -533,10 +519,11 @@ window, and =/src/View/ui/Widgets= for custom widget.
 
 *** Window
 
-The abstract class PamhyrWindow and PamhyrDialog are used for most of
-Pamhyr2 window. These class allow to create an window for Pamhyr2 GUI
-and implemente some useful methods. The super class method difine some
-generic value from optional parameters, for examples:
+The abstract class =PamhyrWindow= and =PamhyrDialog= are used for most
+of {{{pamhyr2}}} window. These class allow to create an window for
+{{{pamhyr2}}} GUI and implemente some useful methods. The super class
+method difine some generic value from optional parameters, for
+examples:
 - =self._study=: The study giving in constructor parameters =study=
   (typically a =Model.Study= class object)
 - =self._config=: The configuration giving in constructor parameters
@@ -546,7 +533,7 @@ generic value from optional parameters, for examples:
   object)
 
 #+NAME: window
-#+CAPTION: Example of Pamhyr2 window
+#+CAPTION: Example of {{{pamhyr2}}} window
 #+begin_src python :python python3 :results output :noweb yes
   from View.Tools.PamhyrWindow import PamhyrWindow
   from View.My.Translate import MyTranslate
@@ -593,7 +580,7 @@ window componants or connections.
 
 *** Table
 
-An abstract class PamhyrTableModel is available to define a simple
+An abstract class =PamhyrTableModel= is available to define a simple
 QAbstractTableModel shortly. In simple cases, there are only =data=
 and =setData= methode to implement, but the constructor needs more
 information than a classic QAbstractTableModel class.
@@ -654,7 +641,7 @@ class AddNodeCommand(QUndoCommand):
 
 All undo command must be push into a =QUndoStack= (see Listing
 [[undo-cmd-push]]) to perform the action and allow user undo and redo this
-action. In PamhyrWindow (and PamhyrDialog) the undo stack is
+action. In =PamhyrWindow= (and =PamhyrDialog=) the undo stack is
 automatically create if the option ="undo"= is activate at window
 creation, this stack is accessible at =self._undo_stack=.
 
@@ -672,7 +659,7 @@ creation, this stack is accessible at =self._undo_stack=.
 *** Plot
 
 To define a new plot you can create a class who inherit to
-PamhyrPlot. The creator need at leaste five argument:
+=PamhyrPlot=. The creator need at leaste five argument:
  - A =canvas= of type =MplCanvas=
  - A (optional) =trad= of type =PamhyrTranslate=
  - A =data= used in =draw= and =update= to create and update the plot
@@ -719,8 +706,8 @@ data has changed.
 
 ** Solver
 
-The Pamhyr2 architecture allow to define multiple solver. A solver is
-define by a:
+The {{{pamhyr2}}} architecture allow to define multiple solver. A
+solver is define by a:
  - type
  - name
  - description,
@@ -736,11 +723,11 @@ different solver type, this solver type implement the code for export
 study to solver input format, and read the solver output to study
 results. There exists a generic solver with a generic input and output
 format, the type could be use to use a solver not implemented in
-Pamhyr2, but this solver must can read/write input and output generic
-format or use external script. There is possible to define different
-solver with the same type, for example two differents version of the
-same solver. Finaly, with input and output formater is possible to
-execute a code on distant computer, for example, over ssh.
+{{{pamhyr2}}}, but this solver must can read/write input and output
+generic format or use external script. There is possible to define
+different solver with the same type, for example two differents
+version of the same solver. Finaly, with input and output formater is
+possible to execute a code on distant computer, for example, over ssh.
 
 #+name: graph-multi-solver
 #+header: :results drawer
@@ -857,8 +844,8 @@ solver and get results:
  - (2.1) The solver read the input file(s)
  - (2.2) The solver compute results and write it to solver output
    file(s)
- - (3) Pamhyr2 create a =Results= object
- - (3.1) The Pamhyr2 solver class read solver output file(s) and
+ - (3) {{{pamhyr2}}} create a =Results= object
+ - (3.1) The {{{pamhyr2}}} solver class read solver output file(s) and
    complete Results with readed data
 
 #+name: graph-pipeline
@@ -976,7 +963,7 @@ the temporal order of action is prensented in Figure
   }
 #+end_src
 
-To implement a Solver in Pamhyr2, there exists a abstract class
+To implement a Solver in {{{pamhyr2}}}, there exists a abstract class
 =Solver.AbstractSolver=. A class who herits this class, must implement
 different methods:
  - =export=: Export the study to solver input file(s)
@@ -987,7 +974,7 @@ different methods:
 
 ** Unit tests
 
-A very small part of Pamhyr2 has unit test. This part is limited to the Model.
+A very small part of {{{pamhyr2}}} has unit test. This part is limited to the Model.
 
 #+begin_src shell
   python3 -m venv test
@@ -1000,9 +987,9 @@ A very small part of Pamhyr2 has unit test. This part is limited to the Model.
 
 ** The debug mode
 
-To activate an deactivate the Pamhyr2 debug mode you can open the
-configuration window and type "Ctrl+G" or run Pamhyr2 with command
-line:
+To activate an deactivate the {{{pamhyr2}}} debug mode you can open
+the configuration window and type "Ctrl+G" or run {{{pamhyr2}}} with
+command line:
 #+begin_src shell
 ./Pamhyr2 debug
 #+end_src
@@ -1015,7 +1002,7 @@ data base file.
 
 #+NAME: debug-repl
 #+ATTR_LATEX: :width 14cm
-#+CAPTION: Pamhyr2 debug Python REPL
+#+CAPTION: {{{pamhyr2}}} debug Python REPL
 [[./images/python-debug-repl.png]]
 
 * Build the project
@@ -1028,7 +1015,7 @@ to build packages manually.
 If you need an hand made package, you can script available in
 {{{file(packages)}}} directory.
 
-*** GNU/Linux
+*** GNU/Linux {{{linux}}}
 
 On GNU/Linux building GNU/Linux packages is easy, you just need python
 in version 3.8 must be installed with venv and pyinstaller packages
@@ -1050,7 +1037,7 @@ cd packages
 ./linux.sh
 #+end_src
 
-*** Windows
+*** Windows {{{windows}}}
 
 To make the Windows packages you have two choice: If you use Windows
 you can use the script {{{file(packages/windows.bat)}}}, other else
@@ -1065,10 +1052,10 @@ winetricks installed.
 
 ** Setup the CI environment
 
-Pamhyr2 need a Linux ci-runner and a Windows ci-runner for building
+{{{pamhyr2}}} need a Linux ci-runner and a Windows ci-runner for building
 package. The windows ci-runner could run on a Wine environement.
 
-*** Linux
+*** Linux {{{linux}}}
 
 The Linux ci-runner need some software and dependencies in addtion of
 gitlab-ci.
@@ -1078,10 +1065,11 @@ gitlab-ci.
        emacs emacs-goodies-el                     \
        texlive-full                               \
        python3.8 python3.8-venv
+
   sudo python3 -m pip install pyinstaller
 #+end_src
 
-*** Windows (Wine)
+*** Windows (Wine) {{{windows}}}
 
 The ci-runner environment for Wine need at least wine version 8, let
 [[https://www.numetopia.fr/comment-installer-wine-sur-ubuntu-ou-linux-mint/][see who to add wine official depot to your linux distribution]].
@@ -1090,18 +1078,77 @@ The ci-runner environment for Wine need at least wine version 8, let
 sudo apt install wine-stable winetricks
 #+end_src
 
-In addition, the environment need windows version of:
- - [[https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe][Python 3.8.10]]
- - Git
- - PowerShell
- - Gitlab-ci
+**** Setup environment
+
+Export Wine environment variable to set wine as 64 bits architecture
+and set the correct path for wine environment.
+
+#+begin_src shell
+  export WINARCH=win64
+  export WINEPREFIX=$PWD/my-wine-runner-prefix
+#+end_src
+
+Setup Wine environment to Windows 10 and install the minimal fonts
+with =winetricks=.
+
+#+begin_src shell
+  winetricks corefonts win10
+#+end_src
+
+**** Install dependencies
+
+First install 7zip with help of =winetricks=.
+
+#+begin_src shell
+  winetricks 7zip
+#+end_src
+
+In addition, install in the environment the Windows version of:
+ - [[https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe][Python 3.8.10]] (ensure the python path is set and Pip is enable)
+ - [[https://git-scm.com/downloads][Git]]
+ - [[https://github.com/PowerShell/PowerShell/releases/download/v7.0.1/PowerShell-7.0.1-win-x64.msi][PowerShell]]
  - [[https://freefr.dl.sourceforge.net/project/nsis/NSIS%203/3.08/nsis-3.08-setup.exe][Nsis]]
 
+To run a Windows executable into wine environement, use =wine64= command:
+
+#+begin_src shell
+  wine64 <the-exe-file>
+#+end_src
+
 Now, we can install =pyinstaller= on this windows environment:
 #+begin_src shell
 wine python -m pip install pyinstaller
 #+end_src
 
+Now, we can download [[https://docs.gitlab.com/runner/install/windows.html][Gitlab-ci]] runner for Windows an put it in the
+current path.
+
+**** Setup runner
+
+You can configure the runner with command:
+
+#+begin_src shell
+  wine64 gitlab-runner-windows-amd64.exe register
+#+end_src
+
+**** Run the runner
+
+Create a new executable shell script =runner.sh= with following lines:
+
+#+begin_src shell
+  #! /bin/sh
+
+  export WINARCH=win64
+  export WINEPREFIX=$PWD/my-wine-runner-prefix
+
+  wine64 gitlab-runner-windows-amd64.exe run
+#+end_src
+
+Now you can run the runner with command =./runner.sh=.
+
+{{{bulb}}} You can run this command into a =screen= terminal, detach
+the terminal and disconnect from runner machine to keep runner alive.
+
 * Documentation files
 
 This document and the user documentation are org files. This text file
@@ -1284,23 +1331,23 @@ Some org-mode configuration used in documentations files are define in
 
 * How to contribute?
 
-Pamhyr2 is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License[fn:license], either
-version 3 of the License, or any later version.
+{{{pamhyr2}}} is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License[fn:license],
+either version 3 of the License, or any later version.
 
 [fn:license] The GPLv3 web page:
 https://www.gnu.org/licenses/gpl-3.0.en.html
 
 ** Guidelines
 
-To contribute to Pamhyr2, we expect a minimum of respect between
+To contribute to {{{pamhyr2}}}, we expect a minimum of respect between
 contributors. We therefore ask you to respect the following rules
 regarding communication and contribution content:
 + No gender, racial, religious or social discrimination
 + No insults, personal attacks or potentially offensive remarks
-+ Pamhyr2 is free software, and intended to remain so, so take care
-  with the licensing of libraries and external content you want to add
-  to the project
++ {{{pamhyr2}}} is free software, and intended to remain so, so take
+  care with the licensing of libraries and external content you want
+  to add to the project
 + Humour or hidden easter eggs are welcome if they respect the
   previous rules
 
@@ -1311,11 +1358,12 @@ an issue on the project's gitlab page[fn:p2-gitlab], or you can create
 a merge request on the same page with the changes you have made to the
 code, translation or documentation.
 
-The Pamhyr2 copyright is owned by INRAE[fn:inrae], but we keep a
-record of each contributors. If you made a modification to pamhyr2
-software, please add your name at the end of {{{file(AUTHORS)}}} file
-and respect the Listing [[auth-format]] format. You can update this file
-information for following contribution.
+The {{{pamhyr2}}} copyright is owned by INRAE[fn:inrae], but we keep a
+record of each contributors. If you made a modification to
+{{{pamhyr2}}} software, please add your name at the end of
+{{{file(AUTHORS)}}} file and respect the Listing [[auth-format]]
+format. You can update this file information for following
+contribution.
 
 #+NAME: auth-format
 #+CAPTION: =AUTHORS= file format
@@ -1326,16 +1374,17 @@ information for following contribution.
 #+CAPTION: Current =AUTHORS= file
 #+INCLUDE: "../../AUTHORS" src text
 
-[fn:p2-gitlab] The Pamhyr2 Gitlab project page:
+[fn:p2-gitlab] The {{{pamhyr2}}} Gitlab project page:
 https://gitlab.irstea.fr/theophile.terraz/pamhyr
 [fn:inrae] The INRAE web site: https://www.inrae.fr/
 
 ** Translate
 
 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 edite the translation ({{{file(.ts)}}}) file, finally,
-commit the new version of file and make a merge request.
+{{{pamhyr2}}} translate, you need to use Qt
+Linguist[fn:qt-linguist]. Open Qt-linguist and edit 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
 {{{file(src/lang/create_ts.sh)}}} like Listing [[ts-it]]. Run the script
@@ -1344,7 +1393,7 @@ and open the new file with Qt-linguist, setup target language (Figure
 file and make a merge request.
 
 #+NAME: ts-it
-#+CAPTION: Example of modified {{{file(src/lang/create_ts.sh)}}} to add italian (it) translate for Pamhyr2
+#+CAPTION: Example of modified {{{file(src/lang/create_ts.sh)}}} to add italian (it) translate for {{{pamhyr2}}}
 #+begin_src shell
   ...
   LANG="fr it"
@@ -1362,7 +1411,7 @@ https://doc.qt.io/qt-5/qtlinguist-index.html (last access 2023-09-18)
 ** Code contribution
 
 If you are developper you can improve and/or add features to
-Pamhyr2. Please, follow the architecture described in section
+{{{pamhyr2}}}. Please, follow the architecture described in section
 [[Architecture]] as closely as possible. Keep the code simple, clear and
 efficient as possible. The master branch is reserved for the project
 maintainer; you can create a new branch or fork the project before the

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

@@ -0,0 +1,487 @@
+# 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}

doc/tools/PamhyrDoc.cls

@@ -11,7 +11,8 @@
 \usepackage[absolute]{textpos}
 \usepackage{titlesec}
 \usepackage{amssymb}
-\usepackage{tcolorbox}
+\usepackage[minted,xparse,breakable]{tcolorbox}
+\usepackage{pmboxdraw}
 
 \usepackage{enumitem}
 \setlist[enumerate]{itemsep=-0.5em}
@@ -133,6 +134,7 @@
 \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}
@@ -140,7 +142,7 @@
 \setminted[llvm]{breaklines,fontsize=\footnotesize,encoding=utf8}
 
 %% Add box arrond of minted
-\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
+\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[breakable, boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
 \AfterEndEnvironment{minted}{\end{tcolorbox}}%
 
 \makeatletter
@@ -161,3 +163,7 @@
 \SetWatermarkScale{3}
 \SetWatermarkFontSize{1cm}
 \SetWatermarkText{Work in progress}
+
+%% Icons
+
+\usepackage{fontawesome5}

doc/tools/macro.org

@@ -17,11 +17,15 @@
 # -*- coding: utf-8 -*-
 
 # Constant name
-#+MACRO: oldPamhyr     PAMHyR
-#+MACRO: Pamhyr        Pamhyr2
-#+MACRO: Mage          Mage
-#+MACRO: Rubarbe       RubarBE
-#+MACRO: Inrae         INRAE
+#+MACRO: pamhyr        \textsc{PAMHyR}
+#+MACRO: pamhyr2       \textsc{Pamhyr2}
+#+MACRO: mage          \textsc{Mage}
+#+MACRO: mage7         \textsc{Mage7}
+#+MACRO: mage8         \textsc{Mage8}
+#+MACRO: rubarbe       \textsc{RubarBE}
+#+MACRO: adists        \textsc{AdisTS}
+#+MACRO: mascaret      \textsc{Mascaret}
+#+MACRO: inrae         INRAE
 #+MACRO: latex         \LaTeX
 
 # Information
@@ -35,6 +39,16 @@
 #+MACRO: cite          [cite:$1]
 #+MACRO: biblio        \bibliography{documentation}
 
+# Icons
+#+MACRO: bulb \faIcon{lightbulb}
+#+MACRO: OK  \faIcon{check}
+
+#+MACRO: linux  \faIcon{linux}
+#+MACRO: windows  \faIcon{windows}
+
+#+MACRO: python  \faIcon{python}
+#+MACRO: java  \faIcon{java}
+
 # Wrapper
 #+NAME: attr_wrap
 #+HEADER: :var width="\\textwidth"

doc/users/Tuto1/build.sh

@@ -1,4 +1,6 @@
 #! /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

doc/users/Tuto1/data/Cote_canal

@@ -1,2 +0,0 @@
-0:00:00:00	15
-0:00:01:00	15

doc/users/Tuto1/data/Hogneau.SIN

@@ -1,25 +0,0 @@
-**************** 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

doc/users/Tuto1/data/Hogneau.var

@@ -1 +0,0 @@
-$Clapet_001  clapet

doc/users/Tuto1/data/Q_permanent

@@ -1,2 +0,0 @@
-0:00:00:00	4
-0:00:01:00	4

doc/users/Tuto1/data/Seuil_aval_23m

@@ -1,24 +0,0 @@
-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

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

@@ -1,3 +1,4 @@
+
 %% LyX 2.0.2 created this file.  For more info, see http://www.lyx.org/.
 %% Do not edit unless you really know what you are doing.
 \documentclass[12pt,french]{article}
@@ -8,6 +9,7 @@
 \usepackage{textcomp}
 \usepackage{graphicx}
 \usepackage{hyperref}
+\usepackage[frenchb]{babel}
 
 \makeatletter
 
@@ -80,7 +82,7 @@ RiverLy, Hydraulique des rivi
 
 \begin{center}
 \begin{tabular}{lll}
-Autors : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
+Auteurs : & 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,43 +112,64 @@ Autors : & 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}
 
-
-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.
-
+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 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 \textit{Hogneau}, et validez.
 
-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 :
+\begin{center}
+\includegraphics[width=15cm]{img/NEWSTUDY.png}
+\par\end{center}
 
+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] => [Modifier 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\oe{}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\oe{}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\oe{}uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n\oe{}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\oe{}ud amont et un n\oe{}ud aval.
+Dans la partie inférieure de la fenêtre \textit{Réseau}, vous pouvez renommer les n\oe{}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}.
 
-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 :
+\section{Éditer la géométrie de la rivière}
 
+Cliquez sur \texttt{[Géométrie] => [Modifier la géométrie]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} pour définir la géométrie du bief sé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.
 
-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"}.
+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"}.
 
 Sélectionnez la section en travers nommée \textit{PontRD101m} et ouvrez la fenêtre d'édition. Vous devriez voir :
 
@@ -154,146 +177,269 @@ 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 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 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.
+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]} :
 
-\section{Editer les conditions aux limites}
+\begin{center}
+\includegraphics[width=15cm]{img/maillage.png}
+\par\end{center}
 
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} :
+% 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} :
 
 \begin{center}
 \includegraphics[width=15cm]{img/boundary.png}
 \par\end{center}
 
-
- 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 :
+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\oe{}ud} et attribuez cette condition au n\oe{}ud amont.
+Les noms des n\oe{}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 :
 
 \begin{center}
 \includegraphics[width=15cm]{img/fev2002.png}
 \par\end{center}
 
-
-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.
+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\oe{}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}.
+
 \section{Créer les conditions initiales}
 
-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 :
+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 :
 
 
 \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.
 
-Fermer la fenêtre \textit{Conditions initiales}
+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}.
 
 
-\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 :
+\section{Éditer les coefficients de frottement}
 
+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}.
 
-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 :
-
+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 :
 
 \begin{center}
 \includegraphics[width=15cm]{img/frictions.png}
 \par\end{center}
 
-
-La zone sélectionnée est surlignée en bleu. Fermez la fenêtre \textit{Editer les frottements}.
-
+La zone sélectionnée est surlignée en bleu.
+Vous pouvez maintenant fermer la fenêtre \textit{Éditer 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 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 :
-
+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 :
 
 \begin{center}
 \includegraphics[width=15cm]{img/hs.png}
 \par\end{center}
 
-
-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 :
-
+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 :
 
 \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 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 :
+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 :
 
 \begin{center}
-\includegraphics[width=15cm]{img/seuilRS101.png}
+\includegraphics[width=15cm]{img/SeuilRD101.png}
 
-\includegraphics[width=15cm]{img/orificeRS101.png}
+\includegraphics[width=15cm]{img/OrificeRD101.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/orificeThivencelle.png}
+% \begin{center}
+% \includegraphics[width=15cm]{img/SeuilThivencelle.png}
+%
+% \includegraphics[width=15cm]{img/OrificeThivencelle.png}
+% \par\end{center}
 
-\includegraphics[width=15cm]{img/seuilThivencelle.png}
+\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}\\
 \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 \textit{Mage v8}. Réglez les paramètres du solveur comme suit :
-
-
-\begin{center}
-\includegraphics[width=15cm]{img/param.png}
-\par\end{center}
-
-
+Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Paramètres 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 {\NoAutoSpacing 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émarrer, 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 maximum 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.
 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{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}.
+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}.
 
 \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 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.
+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.
+
 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]{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}.
-
-
+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.
 
 \pagebreak{}
 \end{document}
-

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

@@ -112,9 +112,28 @@ 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.
 
-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/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:
 
 \begin{center}
 \includegraphics[width=15cm]{img/network.png}
@@ -125,15 +144,19 @@ Close the \textit{Edit River Network} window.
 
 \section{Edit the river geometry}
 
-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:
+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:
 
 \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 slider at the very right of the window.
+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.
 
-You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"img/edit.png"} icon.
+You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} icon.
 
 select the cross section named \textit{PontRD101m} and open the edition window. You should see:
 
@@ -141,58 +164,100 @@ 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 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.
+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
 
 \section{Edit the boundary conditions}
 
-From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]}.You should see:
+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:
 
 \begin{center}
 \includegraphics[width=15cm]{img/boundary.png}
 \par\end{center}
 
- Use the \textit{add} button on the top left of the window to add a liquid boundary condition.
+ 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.
  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 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 \textit{Q(t)} law.
  Select the \textit{Node} cell and atribute this condition to the upstream node.
- 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:
+ 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:
 
 \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{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.
+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.
 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]}.
-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:
+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:
 
 \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}
 
-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:
+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:
 
 \begin{center}
 \includegraphics[width=15cm]{img/K.png}
 \par\end{center}
 
-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:
+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:
 
 \begin{center}
 \includegraphics[width=15cm]{img/frictions.png}
@@ -200,50 +265,53 @@ Close the \textit{Strickler} window. On the \textit{Edit friction} window, add f
 
 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, 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:
+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:
 
 \begin{center}
 \includegraphics[width=15cm]{img/hs.png}
 \par\end{center}
 
-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:
+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:
 
 \begin{center}
-\includegraphics[width=15cm]{img/seuil.png}
-\par\end{center}
+\includegraphics[width=15cm]{img/seuilRD101.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}
+\includegraphics[width=15cm]{img/orificeRD101.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/orificeThivencelle.png}
-
 \includegraphics[width=15cm]{img/seuilThivencelle.png}
+
+\includegraphics[width=15cm]{img/orificeThivencelle.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 solver parameters as follow:
+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.
 
-\begin{center}
-\includegraphics[width=15cm]{img/param.png}
-\par\end{center}
+% TODO precision
 
 Close the \textit{solver parameters} window.
 
@@ -251,17 +319,23 @@ 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 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.
+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.
 
 \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 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.
+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.
 To visualize the flow discharge, switch to the \textit{Hydrograph} tab.
-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}.
+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]}.
 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}

packages/make-windows-dir.bat

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

src/Checker/Adists.py

@@ -29,15 +29,16 @@ _translate = QCoreApplication.translate
 
 logger = logging.getLogger()
 
-class AdistsOutputKpChecker(AbstractModelChecker):
-    def __init__(self):
-        super(AdistsOutputKpChecker, self).__init__()
 
-        self._name = _translate("Checker", "AdisTS output Kp checker")
+class AdistsOutputRKChecker(AbstractModelChecker):
+    def __init__(self):
+        super(AdistsOutputRKChecker, self).__init__()
+
+        self._name = _translate("Checker", "AdisTS output RK checker")
         self._description = _translate(
-            "Checker", "Check output Kp"
+            "Checker", "Check output RK"
         )
-        self._modules = Modules.OUTPUT_KP
+        self._modules = Modules.OUTPUT_RK
 
     def run(self, study):
         ok = True

src/Meshing/Mage.py

@@ -363,7 +363,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
             self.import_m_file(reach, m_file)
             return reach
 
-    def update_kp(self, reach,
+    def update_rk(self, reach,
                   step: float = 50,
                   limites=[-1, -1],
                   origin=0,
@@ -381,8 +381,6 @@ 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)
 
@@ -397,12 +395,13 @@ class MeshingWithMageMailleurTT(AMeshingTool):
             logger.info(
                 f"! {self._exe_path()} " +
                 f"{st_file} {m_file} " +
-                f"update_kp " +
+                f"update_rk " +
                 f"{str(step)} " +
                 f"{limites[0]} {limites[1]} " +
                 f"{directrices[0]} {directrices[1]} " +
                 f"{orientation} {lm} {linear} " +
-                f"{origin} "
+                f"{origin} " +
+                f"{origin_value} "
             )
             proc.start(
                 self._exe_path(),
@@ -411,7 +410,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
                         str,
                         [
                             st_file, m_file,
-                            "update_kp", step,
+                            "update_rk", step,
                             limites[0], limites[1],
                             directrices[0], directrices[1],
                             orientation, lm, linear, origin, origin_value

src/Model/BoundaryCondition/BoundaryCondition.py

@@ -128,7 +128,8 @@ class BoundaryCondition(SQLSubModel):
 
             bc.node = None
             if row[3] != -1:
-                bc.node = next(filter(lambda n: n.id == row[3], data["nodes"]))
+                bc.node = next(filter(lambda n: n.id == row[3], data["nodes"]),
+                               None)
 
             values = execute(
                 "SELECT ind, data0, data1 FROM boundary_condition_data " +
@@ -371,3 +372,15 @@ 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

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -53,7 +53,8 @@ class BoundaryConditionAdisTS(SQLSubModel):
         self._header = []
         self._types = [self.time_convert, float]
 
-        BoundaryConditionAdisTS._id_cnt = max(BoundaryConditionAdisTS._id_cnt + 1, self.id)
+        BoundaryConditionAdisTS._id_cnt = max(
+            BoundaryConditionAdisTS._id_cnt + 1, self.id)
 
     @classmethod
     def _db_create(cls, execute):
@@ -105,10 +106,17 @@ class BoundaryConditionAdisTS(SQLSubModel):
 
                 bc.node = None
                 if row[3] != -1:
-                    bc.node = next(filter(lambda n: n.id == row[3], data["nodes"])).id
+                    tmp = next(filter(
+                        lambda n: n.id == row[3], data["nodes"]),
+                        None)
+                    if tmp is not None:
+                        bc.node = tmp.id
+                    else:
+                        bc.node = -1
 
                 values = execute(
-                    "SELECT data0, data1 FROM boundary_condition_data_adists " +
+                    "SELECT data0, data1 FROM " +
+                    "boundary_condition_data_adists " +
                     f"WHERE bc = '{bc.id}'"
                 )
 
@@ -126,7 +134,8 @@ class BoundaryConditionAdisTS(SQLSubModel):
     def _db_save(self, execute, data=None):
 
         execute(f"DELETE FROM boundary_condition_adists WHERE id = {self.id}")
-        execute(f"DELETE FROM boundary_condition_data_adists WHERE bc = {self.id}")
+        execute(f"DELETE FROM boundary_condition_data_adists" +
+                f" WHERE bc = {self.id}")
 
         node = -1
         if self._node is not None:
@@ -196,6 +205,11 @@ class BoundaryConditionAdisTS(SQLSubModel):
     def pollutant(self):
         return self._pollutant
 
+    @pollutant.setter
+    def pollutant(self, pollutant):
+        self._pollutant = pollutant
+        self._status.modified()
+
     @property
     def type(self):
         return self._type
@@ -208,14 +222,3 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @property
     def data(self):
         return self._data.copy()
-
-
-
-
-
-
-
-
-
-
-

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

@@ -22,7 +22,9 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Except import NotImplementedMethodeError
 
-from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS
+from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS \
+    import BoundaryConditionAdisTS
+
 
 class BoundaryConditionsAdisTSList(PamhyrModelList):
     _sub_classes = [
@@ -63,6 +65,3 @@ class BoundaryConditionsAdisTSList(PamhyrModelList):
     @property
     def BCs_AdisTS_List(self):
         return self.lst
-
-
-

src/Model/D90AdisTS/D90AdisTS.py

@@ -28,6 +28,7 @@ from Model.D90AdisTS.D90AdisTSSpec import D90AdisTSSpec
 
 logger = logging.getLogger()
 
+
 class D90AdisTS(SQLSubModel):
     _sub_classes = [
         D90AdisTSSpec,
@@ -71,7 +72,7 @@ class D90AdisTS(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
-        if major == minor == "0":
+        if major == 0 and minor < 1:
             if int(release) < 6:
                 cls._db_create(execute)
 
@@ -193,9 +194,3 @@ class D90AdisTS(SQLSubModel):
     def insert(self, index, data):
         self._data.insert(index, data)
         self._status.modified()
-
-
-
-
-
-

src/Model/D90AdisTS/D90AdisTSList.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.D90AdisTS.D90AdisTS import D90AdisTS
 
+
 class D90AdisTSList(PamhyrModelList):
     _sub_classes = [
         D90AdisTS,
@@ -60,7 +61,3 @@ class D90AdisTSList(PamhyrModelList):
     @property
     def D90_AdisTS_List(self):
         return self.lst
-
-
-
-

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -25,6 +25,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class D90AdisTSSpec(SQLSubModel):
     _sub_classes = [
     ]
@@ -43,8 +44,8 @@ class D90AdisTSSpec(SQLSubModel):
 
         self._name_section = name
         self._reach = None
-        self._start_kp = None
-        self._end_kp = None
+        self._start_rk = None
+        self._end_rk = None
         self._d90 = None
         self._enabled = True
 
@@ -58,8 +59,8 @@ class D90AdisTSSpec(SQLSubModel):
                 d90_default INTEGER NOT NULL,
                 name TEXT NOT NULL,
                 reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
+                start_rk REAL NOT NULL,
+                end_rk REAL NOT NULL,
                 d90 REAL NOT NULL,
                 enabled BOOLEAN NOT NULL,
                 FOREIGN KEY(d90_default) REFERENCES d90_adists(id),
@@ -72,7 +73,7 @@ class D90AdisTSSpec(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
-        if major == minor == "0":
+        if major == 0 and minor < 1:
             if int(release) < 6:
                 cls._db_create(execute)
 
@@ -83,34 +84,35 @@ class D90AdisTSSpec(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, d90_default, name, reach, start_kp, end_kp, " +
+            "SELECT id, d90_default, name, reach, start_rk, end_rk, " +
             "d90, enabled " +
             "FROM d90_spec " +
             f"WHERE d90_default = {data['d90_default_id']} "
         )
 
-        for row in table:
-            id            = row[0]
-            name          = row[2]
-            reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
-            d90 = row[6]
-            enabled       = (row[7] == 1)
+        if table is not None:
+            for row in table:
+                id = row[0]
+                name = row[2]
+                reach = row[3]
+                start_rk = row[4]
+                end_rk = row[5]
+                d90 = row[6]
+                enabled = (row[7] == 1)
 
-            new_spec = cls(
-                id=id,
-                name=name,
-                status=data['status']
-            )
+                new_spec = cls(
+                    id=id,
+                    name=name,
+                    status=data['status']
+                )
 
-            new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
-            new_spec.d90 = d90
-            new_spec.enabled = enabled
+                new_spec.reach = reach
+                new_spec.start_rk = start_rk
+                new_spec.end_rk = end_rk
+                new_spec.d90 = d90
+                new_spec.enabled = enabled
 
-            new.append(new_spec)
+                new.append(new_spec)
 
         return new
 
@@ -120,14 +122,14 @@ class D90AdisTSSpec(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "d90_spec(id, d90_default, name, reach, " +
-            "start_kp, end_kp, d90, enabled) " +
+            "start_rk, end_rk, d90, enabled) " +
             "VALUES (" +
             f"{self.id}, " +
             f"{d90_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
+            f"{self._start_rk}, " +
+            f"{self._end_rk}, " +
             f"{self._d90}, " +
             f"{self._enabled}" +
             ")"
@@ -155,21 +157,21 @@ class D90AdisTSSpec(SQLSubModel):
         self._status.modified()
 
     @property
-    def start_kp(self):
-        return self._start_kp
+    def start_rk(self):
+        return self._start_rk
 
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
+    @start_rk.setter
+    def start_rk(self, start_rk):
+        self._start_rk = start_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 
     @property
@@ -189,12 +191,3 @@ class D90AdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -28,6 +28,7 @@ from Model.DIFAdisTS.DIFAdisTSSpec import DIFAdisTSSpec
 
 logger = logging.getLogger()
 
+
 class DIFAdisTS(SQLSubModel):
     _sub_classes = [
         DIFAdisTSSpec,
@@ -78,7 +79,7 @@ class DIFAdisTS(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
-        if major == minor == "0":
+        if major == 0 and minor < 1:
             if int(release) < 6:
                 cls._db_create(execute)
 
@@ -250,9 +251,3 @@ class DIFAdisTS(SQLSubModel):
     def insert(self, index, data):
         self._data.insert(index, data)
         self._status.modified()
-
-
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTSList.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.DIFAdisTS.DIFAdisTS import DIFAdisTS
 
+
 class DIFAdisTSList(PamhyrModelList):
     _sub_classes = [
         DIFAdisTS,
@@ -60,7 +61,3 @@ class DIFAdisTSList(PamhyrModelList):
     @property
     def DIF_AdisTS_List(self):
         return self.lst
-
-
-
-

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -25,6 +25,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class DIFAdisTSSpec(SQLSubModel):
     _sub_classes = [
     ]
@@ -43,8 +44,8 @@ class DIFAdisTSSpec(SQLSubModel):
 
         self._method = method
         self._reach = None
-        self._start_kp = None
-        self._end_kp = None
+        self._start_rk = None
+        self._end_rk = None
         self._dif = None
         self._b = None
         self._c = None
@@ -60,8 +61,8 @@ class DIFAdisTSSpec(SQLSubModel):
                 dif_default INTEGER NOT NULL,
                 method TEXT NOT NULL,
                 reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
+                start_rk REAL NOT NULL,
+                end_rk REAL NOT NULL,
                 dif REAL NOT NULL,
                 b REAL,
                 c REAL,
@@ -76,7 +77,7 @@ class DIFAdisTSSpec(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
-        if major == minor == "0":
+        if major == 0 and minor < 1:
             if int(release) < 6:
                 cls._db_create(execute)
 
@@ -87,38 +88,39 @@ class DIFAdisTSSpec(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, dif_default, method, reach, start_kp, end_kp, " +
+            "SELECT id, dif_default, method, reach, start_rk, end_rk, " +
             "dif, b, c, enabled " +
             "FROM dif_spec " +
             f"WHERE dif_default = {data['dif_default_id']} "
         )
 
-        for row in table:
-            id            = row[0]
-            method          = row[2]
-            reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
-            dif = row[6]
-            b = row[7]
-            c = row[8]
-            enabled       = (row[9] == 1)
+        if table is not None:
+            for row in table:
+                id = row[0]
+                method = row[2]
+                reach = row[3]
+                start_rk = row[4]
+                end_rk = row[5]
+                dif = row[6]
+                b = row[7]
+                c = row[8]
+                enabled = (row[9] == 1)
 
-            new_spec = cls(
-                id=id,
-                method=method,
-                status=data['status']
-            )
+                new_spec = cls(
+                    id=id,
+                    method=method,
+                    status=data['status']
+                )
 
-            new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
-            new_spec.dif = dif
-            new_spec.b = b
-            new_spec.c = c
-            new_spec.enabled = enabled
+                new_spec.reach = reach
+                new_spec.start_rk = start_rk
+                new_spec.end_rk = end_rk
+                new_spec.dif = dif
+                new_spec.b = b
+                new_spec.c = c
+                new_spec.enabled = enabled
 
-            new.append(new_spec)
+                new.append(new_spec)
 
         return new
 
@@ -128,14 +130,14 @@ class DIFAdisTSSpec(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "dif_spec(id, dif_default, method, reach, " +
-            "start_kp, end_kp, dif, b, c, enabled) " +
+            "start_rk, end_rk, dif, b, c, enabled) " +
             "VALUES (" +
             f"{self.id}, " +
             f"{dif_default}, " +
             f"'{self._db_format(self._method)}', " +
             f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
+            f"{self._start_rk}, " +
+            f"{self._end_rk}, " +
             f"{self._dif}, " +
             f"{self._b}, " +
             f"{self._c}, " +
@@ -165,21 +167,21 @@ class DIFAdisTSSpec(SQLSubModel):
         self._status.modified()
 
     @property
-    def start_kp(self):
-        return self._start_kp
+    def start_rk(self):
+        return self._start_rk
 
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
+    @start_rk.setter
+    def start_rk(self, start_rk):
+        self._start_rk = start_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 
     @property
@@ -217,12 +219,3 @@ class DIFAdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/Friction/Friction.py

@@ -22,6 +22,8 @@ from tools import trace, timer
 
 from Model.Tools.PamhyrDB import SQLSubModel
 
+from numpy import interp
+
 logger = logging.getLogger()
 
 
@@ -43,8 +45,8 @@ class Friction(SQLSubModel):
 
         self._name = name
         self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
+        self._begin_rk = 0.0
+        self._end_rk = 0.0
         self._begin_strickler = None
         self._end_strickler = None
 
@@ -54,8 +56,8 @@ class Friction(SQLSubModel):
           CREATE TABLE friction(
             id INTEGER NOT NULL PRIMARY KEY,
             ind INTEGER NOT NULL,
-            begin_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
+            begin_rk REAL NOT NULL,
+            end_rk REAL NOT NULL,
             reach INTEGER NOT NULL,
             begin_strickler INTEGER NOT NULL,
             end_strickler INTEGER NOT NULL,
@@ -69,6 +71,13 @@ 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_rk TO begin_rk")
+                execute("ALTER TABLE friction RENAME COLUMN end_rk TO end_rk")
+
         return True
 
     @classmethod
@@ -80,7 +89,7 @@ class Friction(SQLSubModel):
         stricklers = data["stricklers"].stricklers
 
         table = execute(
-            "SELECT id, ind, begin_kp, end_kp, " +
+            "SELECT id, ind, begin_rk, end_rk, " +
             "begin_strickler, end_strickler " +
             f"FROM friction WHERE reach = {reach.id}"
         )
@@ -102,8 +111,8 @@ class Friction(SQLSubModel):
             # Create friction
             sec = cls(status=status)
             sec.edge = reach
-            sec.begin_kp = row[2]
-            sec.end_kp = row[3]
+            sec.begin_rk = row[2]
+            sec.end_rk = row[3]
             sec.begin_strickler = bs
             sec.end_strickler = es
 
@@ -124,11 +133,11 @@ class Friction(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "friction(id, ind, begin_kp, end_kp, " +
+            "friction(id, ind, begin_rk, end_rk, " +
             "reach, begin_strickler, end_strickler) " +
             "VALUES (" +
             f"{self.id}, {ind}, " +
-            f"{self._begin_kp}, {self._end_kp}, " +
+            f"{self._begin_rk}, {self._end_rk}, " +
             f"{self._edge.id}, " +
             f"{b_s_id}, {e_s_id}" +
             ")"
@@ -157,10 +166,10 @@ class Friction(SQLSubModel):
     def edge(self, edge):
         self._edge = edge
         if (edge is not None and
-            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._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._status.modified()
 
     def has_edge(self):
@@ -168,53 +177,52 @@ class Friction(SQLSubModel):
 
     def has_coefficient(self):
         return (
-            self._begin_strickler is not None and
-            self._end_strickler is not None
+            self._begin_strickler is not None
         )
 
     def is_full_defined(self):
         return self.has_edge() and self.has_coefficient()
 
     @property
-    def begin_kp(self):
-        return self._begin_kp
+    def begin_rk(self):
+        return self._begin_rk
 
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
+    @begin_rk.setter
+    def begin_rk(self, begin_rk):
         if self._edge is None:
-            self._begin_kp = begin_kp
+            self._begin_rk = begin_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= begin_kp <= _max:
-                self._begin_kp = begin_kp
+            if _min <= begin_rk <= _max:
+                self._begin_rk = begin_rk
 
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
+    @end_rk.setter
+    def end_rk(self, end_rk):
         if self._edge is None:
-            self._end_kp = end_kp
+            self._end_rk = end_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= end_kp <= _max:
-                self._end_kp = end_kp
+            if _min <= end_rk <= _max:
+                self._end_rk = end_rk
 
         self._status.modified()
 
-    def __contains__(self, kp):
-        return self.contains_kp(kp)
+    def __contains__(self, rk):
+        return self.contains_rk(rk)
 
-    def contains_kp(self, kp):
+    def contains_rk(self, rk):
         return (
-            self._begin_kp <= kp <= self._end_kp
+            self._begin_rk <= rk <= self._end_rk
         )
 
     @property
@@ -228,9 +236,28 @@ class Friction(SQLSubModel):
 
     @property
     def end_strickler(self):
-        return self._end_strickler
+        # return self._end_strickler
+        return self._begin_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

src/Model/Friction/FrictionList.py

@@ -44,7 +44,7 @@ class FrictionList(PamhyrModelList):
             logger.info(f"Update friction TABLE from {version}")
             cls._db_update_0_0_1(execute, version)
 
-        return True
+        return cls._update_submodel(execute, version)
 
     @classmethod
     def _db_load(cls, execute, data=None):

src/Model/Geometry/Profile.py

@@ -31,7 +31,7 @@ class Profile(object):
     _id_cnt = 0
 
     def __init__(self, id: int = -1, num: int = 0,
-                 kp: float = 0.0, name: str = "",
+                 rk: 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._kp = float(kp)
+        self._rk = float(rk)
         self._name = str(name)
         self._reach = reach
         self._sl = None
@@ -136,16 +136,16 @@ class Profile(object):
         return len(self.points)
 
     @property
-    def kp(self):
+    def rk(self):
         """
         Returns:
             Kilometer point.
         """
-        return self._kp
+        return self._rk
 
-    @kp.setter
-    def kp(self, value: float):
-        self._kp = float(value)
+    @rk.setter
+    def rk(self, value: float):
+        self._rk = float(value)
         self._status.modified()
 
     @property
@@ -351,8 +351,17 @@ 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)

src/Model/Geometry/ProfileXYZ.py

@@ -41,7 +41,7 @@ class ProfileXYZ(Profile, SQLSubModel):
     def __init__(self,
                  id: int = -1,
                  name: str = "",
-                 kp: float = 0.,
+                 rk: 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
-            kp: Kilometer point
+            rk: Kilometer point
             name: The name of profile
 
         Returns:
@@ -63,7 +63,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             id=id,
             num=num,
             name=name,
-            kp=kp,
+            rk=rk,
             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,
-            kp REAL NOT NULL,
+            rk REAL NOT NULL,
             num INTEGER NOT NULL,
             code1 INTEGER NOT NULL,
             code2 INTEGER NOT NULL,
@@ -94,7 +94,8 @@ class ProfileXYZ(Profile, SQLSubModel):
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
         if major == minor == "0":
-            if int(release) < 2:
+            rl = int(release)
+            if rl < 2:
                 execute(
                     """
                     ALTER TABLE geometry_profileXYZ
@@ -103,6 +104,14 @@ class ProfileXYZ(Profile, SQLSubModel):
                     """
                 )
 
+            if rl < 11:
+                execute(
+                    """
+                    ALTER TABLE geometry_profileXYZ
+                    RENAME COLUMN rk TO rk
+                    """
+                )
+
         return cls._update_submodel(execute, version)
 
     @classmethod
@@ -112,7 +121,7 @@ class ProfileXYZ(Profile, SQLSubModel):
         reach = data["reach"]
 
         table = execute(
-            "SELECT id, ind, name, kp, num, code1, code2, sl " +
+            "SELECT id, ind, name, rk, num, code1, code2, sl " +
             "FROM geometry_profileXYZ " +
             f"WHERE reach = {reach.id}"
         )
@@ -121,7 +130,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             id = row[0]
             ind = row[1]
             name = row[2]
-            kp = row[3]
+            rk = row[3]
             num = row[5]
             code1 = row[5]
             code2 = row[6]
@@ -129,7 +138,7 @@ class ProfileXYZ(Profile, SQLSubModel):
 
             new = cls(
                 id=id, num=num,
-                name=name, kp=kp,
+                name=name, rk=rk,
                 code1=code1, code2=code2,
                 reach=reach,
                 status=status
@@ -159,10 +168,10 @@ class ProfileXYZ(Profile, SQLSubModel):
         sql = (
             "INSERT OR REPLACE INTO " +
             "geometry_profileXYZ(id, ind, name, reach, " +
-            "kp, num, code1, code2, sl) " +
+            "rk, num, code1, code2, sl) " +
             "VALUES (" +
             f"{self.id}, {ind}, '{self._db_format(self._name)}', " +
-            f"{self.reach.id}, {self.kp}, {self.num}, " +
+            f"{self.reach.id}, {self.rk}, {self.num}, " +
             f"{self.code1}, {self.code1}, {sl}" +
             ")"
         )
@@ -187,19 +196,19 @@ class ProfileXYZ(Profile, SQLSubModel):
         try:
             if len(header) == 0:
                 name = data[0]
-                kp = data[1]
+                rk = data[1]
                 reach = data[2]
                 status = data[3]
 
                 profile = cls(
                     id=-1,
                     name=name,
-                    kp=kp,
+                    rk=rk,
                     reach=reach,
                     status=status
                 )
             else:
-                valid_header = {'name', 'reach', 'kp', 'status'}
+                valid_header = {'name', 'reach', 'rk', 'status'}
                 d = {}
                 for i, v in enumerate(data):
                     h = header[i].strip().lower().split(' ')[0]
@@ -244,6 +253,15 @@ 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]
 
@@ -323,7 +341,7 @@ class ProfileXYZ(Profile, SQLSubModel):
             logger.debug(f"{e}")
             raise IndexError(
                 f"Invalid point name: {name} " +
-                f"for profile ({self.id}) kp = {self.kp}"
+                f"for profile ({self.id}) rk = {self.rk}"
             )
 
     def has_standard_named_points(self):
@@ -392,31 +410,125 @@ class ProfileXYZ(Profile, SQLSubModel):
 
         return abs(rg.dist(rd))
 
-    def wet_perimeter(self, z):
-        poly = self.wet_polygon(z)
+    def wet_width(self, z):
+        start, end = self.get_all_water_limits_ac(z)
 
-        if poly is None:
+        if len(start) == 0:
             return 0
 
-        return poly.length
+        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)
+
+        if lines is None:
+            return 0
+
+        length = 0.0
+        for line in lines:
+            length += line.length
+        return length
 
     def wet_area(self, z):
-        poly = self.wet_polygon(z)
+        lines = self.wet_lines(z)
 
-        if poly is None:
+        if lines is None:
             return 0
 
-        return poly.area
+        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
 
     def wet_polygon(self, z):
         points = self.wet_points(z)
         if len(points) < 3:
             return None
 
-        z = map(lambda p: p.z, points)
+        zz = map(lambda p: p.z, points)
         station = self._get_station(points)
 
-        poly = geometry.Polygon(list(zip(station, z)))
+        poly = geometry.Polygon(list(zip(station, zz)))
         return poly
 
     def wet_points(self, z):
@@ -428,6 +540,63 @@ 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.
@@ -491,8 +660,8 @@ class ProfileXYZ(Profile, SQLSubModel):
         Returns:
             Projection of the points of the profile on a plane.
         """
-        if self.nb_points < 3:
-            return None
+        if self.nb_points < 2:
+            return [0.0]
         else:
             return self._get_station(self.points)
 
@@ -624,3 +793,9 @@ 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

src/Model/Geometry/Reach.py

@@ -141,10 +141,10 @@ class Reach(SQLSubModel):
     def profiles(self, profiles):
         self._profiles = profiles
 
-    def get_profiles_from_kp(self, kp):
+    def get_profiles_from_rk(self, rk):
         return list(
             filter(
-                lambda p: p.kp == kp, self.profiles
+                lambda p: p.rk == rk, self.profiles
             )
         )
 
@@ -335,18 +335,18 @@ class Reach(SQLSubModel):
             )
         )
 
-    def get_kp(self):
-        """List of profiles kp
+    def get_rk(self):
+        """List of profiles rk
 
         Returns:
-            List of profiles kp
+            List of profiles rk
         """
-        return [profile.kp for profile in self.profiles]
+        return [profile.rk for profile in self.profiles]
 
-    def get_kp_complete_profiles(self):
+    def get_rk_complete_profiles(self):
         return list(
             map(
-                lambda profile: profile.kp,
+                lambda profile: profile.rk,
                 filter(
                     lambda profile: len(profile) > 0,
                     self.profiles
@@ -354,41 +354,44 @@ class Reach(SQLSubModel):
             )
         )
 
-    def get_kp_min(self):
-        if len(self.get_kp()) > 0:
-            return min(self.get_kp())
+    def get_rk_min(self):
+        if len(self.get_rk()) > 0:
+            return min(self.get_rk())
         else:
             return 0.0
 
-    def get_kp_max(self):
-        if len(self.get_kp()) > 0:
-            return max(self.get_kp())
+    def get_rk_max(self):
+        if len(self.get_rk()) > 0:
+            return max(self.get_rk())
         else:
             return 0.0
 
-    def inter_profiles_kp(self):
-        profiles = sorted(self.profiles, key=lambda p: p.kp)
+    def inter_profiles_rk(self):
+        profiles = sorted(self.profiles, key=lambda p: p.rk)
+        if len(profiles) == 0:
+            return []
+
         first = profiles[0]
         last = profiles[-1]
 
-        res_kp = [first.kp]
+        res_rk = [first.rk]
 
         profiles = iter(profiles)
         previous = next(profiles)
 
         for profile in profiles:
-            prev = previous.kp
-            curr = profile.kp
+            prev = previous.rk
+            curr = profile.rk
 
-            diff = abs(previous.kp - profile.kp)
+            diff = abs(previous.rk - profile.rk)
 
-            new = previous.kp + (diff / 2.0)
-            res_kp.append(new)
+            new = previous.rk + (diff / 2.0)
+            res_rk.append(new)
 
             previous = profile
 
-        res_kp.append(last.kp)
-        return res_kp
+        res_rk.append(last.rk)
+        return res_rk
 
     # Sediment Layers
 
@@ -536,7 +539,7 @@ class Reach(SQLSubModel):
     def sort(self, is_reversed: bool = False):
         self.profiles = sorted(
             self.profiles,
-            key=lambda profile: profile.kp,
+            key=lambda profile: profile.rk,
             reverse=is_reversed
         )
         self._status.modified()
@@ -613,7 +616,7 @@ class Reach(SQLSubModel):
 
         self.profiles = profiles + self.profiles
         self._update_profile_numbers()
-        self._recompute_kp()
+        self._recompute_rk()
 
         return profiles
 
@@ -632,8 +635,8 @@ class Reach(SQLSubModel):
 
         try:
             list_profile, list_header = self.read_file_st(str(file_path_name))
-            profile_header = ["num", "code1",
-                              "code2", "nb_point", "kp", "name"]
+            profile_header = ["num", "code1", "code2",
+                              "nb_point", "rk", "name"]
 
             if list_profile and list_header:
                 for ind, profile in enumerate(list_profile):
@@ -707,6 +710,15 @@ 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
 
@@ -721,12 +733,12 @@ class Reach(SQLSubModel):
                 c1 = f"{profile.code1:>6}"
                 c2 = f"{profile.code2:>6}"
                 t = f"{len(profile.points):>6}"
-                kp = f"{profile.kp:>12f}"[0:12]
+                rk = f"{profile.rk:>12f}"[0:12]
                 pname = profile.name
                 if profile.name == "":
                     pname = f"p{profile.id:>3}".replace(" ", "0")
 
-                st.write(f"{num}{c1}{c2}{t} {kp} {pname}\n")
+                st.write(f"{num}{c1}{c2}{t} {rk} {pname}\n")
 
                 for point in profile.points:
                     x = f"{point.x:<12.4f}"[0:12]
@@ -741,38 +753,44 @@ 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()
-        kp_first = first.kp
+        rk_first = first.rk
 
         z_last = last.z_min()
-        kp_last = last.kp
+        rk_last = last.rk
 
         return (
             (z_last - z_first)
             /
-            (kp_last - kp_first)
+            (rk_last - rk_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()
-            kp_first = previous.kp
+            rk_first = previous.rk
 
             z_last = profile.z_min()
-            kp_last = profile.kp
+            rk_last = profile.rk
 
             incline_acc += (
                 (z_last - z_first)
                 /
-                (kp_last - kp_first)
+                (rk_last - rk_first)
             )
 
             previous = profile
@@ -781,21 +799,24 @@ 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()
-            kp_first = previous.kp
+            rk_first = previous.rk
 
             z_last = profile.z_min()
-            kp_last = profile.kp
+            rk_last = profile.rk
 
             incline_acc += [
                 (z_last - z_first)
                 /
-                (kp_last - kp_first)
+                (rk_last - rk_first)
             ]
 
             previous = profile
@@ -805,21 +826,27 @@ 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()
-            kp_first = previous.kp
+            rk_first = previous.rk
 
             z_last = profile.z_min()
-            kp_last = profile.kp
+            rk_last = profile.rk
+
+            if (rk_last - rk_first) == 0:
+                continue
 
             incline_acc += [
                 (z_last - z_first)
                 /
-                (kp_last - kp_first)
+                (rk_last - rk_first)
             ]
 
             previous = profile
@@ -847,14 +874,14 @@ class Reach(SQLSubModel):
             logger_exception(e)
             return 0
 
-    def _recompute_kp(self, offset=0.0):
-        self._recompute_kp_no_gl(offset=offset)
+    def _recompute_rk(self, offset=0.0):
+        self._recompute_rk_no_gl(offset=offset)
 
-    def _recompute_kp_no_gl(self, offset=0.0):
+    def _recompute_rk_no_gl(self, offset=0.0):
         profiles = iter(self.profiles)
 
         previous = next(profiles)
-        previous.kp = offset
+        previous.rk = offset
 
         for profile in profiles:
             prev_points = previous.points
@@ -865,5 +892,5 @@ class Reach(SQLSubModel):
                 prev_points[-1].dist_2d(curr_points[-1])
             ) / 2.0
 
-            profile.kp = previous.kp + dist
+            profile.rk = previous.rk + dist
             previous = profile

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -50,8 +50,8 @@ class HydraulicStructure(SQLSubModel):
             self.id = id
 
         self._name = name
-        self._input_kp = None
-        self._output_kp = None
+        self._input_rk = None
+        self._output_rk = None
         self._input_reach = None
         self._output_reach = None
         self._enabled = True
@@ -70,8 +70,8 @@ class HydraulicStructure(SQLSubModel):
             id INTEGER NOT NULL PRIMARY KEY,
             name TEXT NOT NULL,
             enabled BOOLEAN NOT NULL,
-            input_kp REAL NOT NULL,
-            output_kp REAL NOT NULL,
+            input_rk REAL NOT NULL,
+            output_rk REAL NOT NULL,
             input_reach INTEGER,
             output_reach INTEGER,
             FOREIGN KEY(input_reach) REFERENCES river_reach(id),
@@ -85,9 +85,25 @@ class HydraulicStructure(SQLSubModel):
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
         if major == minor == "0":
-            if int(release) < 6:
+            rl = int(release)
+
+            if rl < 6:
                 cls._db_create(execute)
 
+            if rl < 11:
+                execute(
+                    """
+                    ALTER TABLE hydraulic_structures
+                    RENAME COLUMN input_rk TO input_rk
+                    """
+                )
+                execute(
+                    """
+                    ALTER TABLE hydraulic_structures
+                    RENAME COLUMN output_rk TO output_rk
+                    """
+                )
+
         return True
 
     @classmethod
@@ -96,7 +112,7 @@ class HydraulicStructure(SQLSubModel):
 
         table = execute(
             "SELECT id, name, enabled, " +
-            "input_kp, output_kp, " +
+            "input_rk, output_rk, " +
             "input_reach, output_reach " +
             "FROM hydraulic_structures "
         )
@@ -107,8 +123,8 @@ class HydraulicStructure(SQLSubModel):
             hs_id = next(it)
             name = next(it)
             enabled = (next(it) == 1)
-            input_kp = next(it)
-            output_kp = next(it)
+            input_rk = next(it)
+            output_rk = next(it)
             input_reach_id = next(it)
             output_reach_id = next(it)
 
@@ -119,8 +135,8 @@ class HydraulicStructure(SQLSubModel):
             )
 
             hs.enabled = enabled
-            hs.input_kp = input_kp if input_kp != -1 else None
-            hs.output_kp = output_kp if output_kp != -1 else None
+            hs.input_rk = input_rk if input_rk != -1 else None
+            hs.output_rk = output_rk if output_rk != -1 else None
 
             hs.input_reach, hs.output_reach = reduce(
                 lambda acc, n: (
@@ -150,24 +166,24 @@ class HydraulicStructure(SQLSubModel):
         if self._output_reach is not None:
             output_reach_id = self._output_reach.id
 
-        input_kp = -1
-        if self.input_kp is not None:
-            input_kp = self.input_kp
+        input_rk = -1
+        if self.input_rk is not None:
+            input_rk = self.input_rk
 
-        output_kp = -1
-        if self.output_kp is not None:
-            output_kp = self.output_kp
+        output_rk = -1
+        if self.output_rk is not None:
+            output_rk = self.output_rk
 
         sql = (
             "INSERT INTO " +
             "hydraulic_structures(" +
-            "  id, name, enabled, input_kp, output_kp, " +
+            "  id, name, enabled, input_rk, output_rk, " +
             "  input_reach, output_reach" +
             ") " +
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +
             f"{self._db_format(self.enabled)}, " +
-            f"{input_kp}, {output_kp}, " +
+            f"{input_rk}, {output_rk}, " +
             f"{input_reach_id}, {output_reach_id}" +
             ")"
         )
@@ -200,24 +216,24 @@ class HydraulicStructure(SQLSubModel):
         self._status.modified()
 
     @property
-    def input_kp(self):
-        return self._input_kp
+    def input_rk(self):
+        return self._input_rk
 
-    @input_kp.setter
-    def input_kp(self, input_kp):
-        if input_kp is not None:
-            input_kp = float(input_kp)
+    @input_rk.setter
+    def input_rk(self, input_rk):
+        if input_rk is not None:
+            input_rk = float(input_rk)
 
-        self._input_kp = input_kp
+        self._input_rk = input_rk
         self._status.modified()
 
     @property
-    def output_kp(self):
-        return self._output_kp
+    def output_rk(self):
+        return self._output_rk
 
-    @output_kp.setter
-    def output_kp(self, output_kp):
-        self._output_kp = output_kp
+    @output_rk.setter
+    def output_rk(self, output_rk):
+        self._output_rk = output_rk
         self._status.modified()
 
     @property

src/Model/InitialConditions/InitialConditions.py

@@ -21,6 +21,7 @@ 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
 
@@ -30,7 +31,7 @@ logger = logging.getLogger()
 class Data(SQLSubModel):
     def __init__(self, name: str = "",
                  comment: str = "", reach=None,
-                 kp: float = 0.0, discharge: float = 0.0,
+                 rk: float = 0.0, discharge: float = 0.0,
                  height: float = 0.0,
                  status=None):
         super(Data, self).__init__()
@@ -42,14 +43,14 @@ class Data(SQLSubModel):
         self._name = name
         self._comment = comment
 
-        self._kp = kp
+        self._rk = rk
         self._discharge = discharge
         self._speed = 0.0
         self._elevation = 0.0
         self._height = height
 
-        if self._kp != 0.0:
-            self._update_from_kp()
+        if self._rk != 0.0:
+            self._update_from_rk()
         if self._height != 0.0:
             self._update_from_height()
         if self._discharge != 0.0:
@@ -64,7 +65,7 @@ class Data(SQLSubModel):
             name TEXT NOT NULL,
             comment TEXT NOT NULL,
             reach INTEGER,
-            kp REAL NOT NULL,
+            rk REAL NOT NULL,
             discharge REAL NOT NULL,
             height REAL NOT NULL,
             FOREIGN KEY(reach) REFERENCES river_reach(id)
@@ -75,13 +76,20 @@ 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 rk 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, kp, discharge, height " +
+            "SELECT ind, name, comment, rk, discharge, height " +
             "FROM initial_conditions " +
             f"WHERE reach = {id}"
         )
@@ -95,7 +103,7 @@ class Data(SQLSubModel):
             ind = row[0]
             name = row[1]
             comment = row[2]
-            kp = row[3]
+            rk = row[3]
             discharge = row[4]
             height = row[5]
 
@@ -104,7 +112,7 @@ class Data(SQLSubModel):
                 status=data["status"],
                 name=name,
                 comment=comment,
-                kp=kp,
+                rk=rk,
                 discharge=discharge,
                 height=height,
             )
@@ -118,12 +126,12 @@ class Data(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "initial_conditions(ind, name, comment, kp, " +
+            "initial_conditions(ind, name, comment, rk, " +
             "discharge, height, reach) " +
             "VALUES (" +
             f"{ind}, '{self._db_format(self.name)}', " +
             f"'{self._db_format(self._comment)}', " +
-            f"{self._kp}, {self._discharge}, {self._height}, " +
+            f"{self._rk}, {self._discharge}, {self._height}, " +
             f"{self._reach.id}" +
             ")"
         )
@@ -134,13 +142,12 @@ class Data(SQLSubModel):
         new = Data(
             name=self.name,
             comment=self._comment,
-            kp=self._kp,
+            rk=self._rk,
             discharge=self._discharge,
             height=self._height,
             reach=self._reach,
             status=self._status,
         )
-
         return new
 
     @property
@@ -154,8 +161,8 @@ class Data(SQLSubModel):
             val = self._name
         elif key == "comment":
             val = self._comment
-        elif key == "kp":
-            val = self._kp
+        elif key == "rk":
+            val = self._rk
         elif key == "speed":
             val = self._speed
         elif key == "discharge":
@@ -168,7 +175,7 @@ class Data(SQLSubModel):
         return val
 
     def _update_get_min(self):
-        profile = self._reach.reach.get_profiles_from_kp(self._kp)
+        profile = self._reach.reach.get_profiles_from_rk(self._rk)
         if len(profile) > 0:
             min = profile[0].z_min()
         else:
@@ -176,7 +183,7 @@ class Data(SQLSubModel):
 
         return min
 
-    def _update_from_kp(self):
+    def _update_from_rk(self):
         min = self._update_get_min()
         self._elevation = min + self._height
 
@@ -197,9 +204,9 @@ class Data(SQLSubModel):
             self._name = str(value)
         elif key == "comment":
             self._comment = str(value)
-        elif key == "kp":
-            self._kp = float(value)
-            self._update_from_kp()
+        elif key == "rk":
+            self._rk = float(value)
+            self._update_from_rk()
         elif key == "speed":
             # Not supposed to be modified
             self._speed = float(value)
@@ -298,10 +305,10 @@ class InitialConditions(SQLSubModel):
         self._data.insert(index, n)
         self._status.modified()
 
-    def new_from_data(self, kp, discharge, elevation):
+    def new_from_data(self, rk, discharge, elevation):
         n = Data(reach=self._reach, status=self._status)
 
-        n['kp'] = kp
+        n['rk'] = rk
         n['discharge'] = discharge
         n['elevation'] = elevation
 
@@ -344,8 +351,8 @@ class InitialConditions(SQLSubModel):
             )
         )
 
-    def get_kp(self):
-        return self._data_get("kp")
+    def get_rk(self):
+        return self._data_get("rk")
 
     def get_elevation(self):
         return self._data_get("elevation")
@@ -353,113 +360,153 @@ class InitialConditions(SQLSubModel):
     def get_discharge(self):
         return self._data_get("discharge")
 
-    def _sort_by_z_and_kp(self, profiles):
-        profiles.sort(
-            reverse=False,
-            key=lambda p: p.kp
-        )
-
-        first_z = profiles[0].z()
-        last_z = profiles[-1].z()
-
-        if first_z > last_z:
-            profiles.sort(
-                reverse=True,
-                key=lambda p: p.kp
-            )
-
-    def generate_growing_constante_height(self, height: float):
-        self._data = []
+    def generate_growing_constant_depth(self, height: float,
+                                        compute_discharge: bool):
 
         profiles = self._reach.reach.profiles.copy()
-        self._sort_by_z_and_kp(profiles)
+        profiles.reverse()
+
+        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"]
 
         incline = self._reach.reach.get_incline_median_mean()
         logger.debug(f"incline = {incline}")
-
-        previous_elevation = -99999.99
+        self._data = []
         for profile in profiles:
-            width = profile.width_approximation()
-            strickler = 25
-            discharge = (
-                ((width * 0.8)
-                 * strickler
-                 * (height ** (5/3))
-                 * (abs(incline) ** (0.5)))
-            )
+            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:
+                discharge = (
+                    ((width * 0.8)
+                     * strickler
+                     * (height ** (5/3))
+                     * (abs(incline) ** (0.5)))
+                )
 
             elevation = max(
                 profile.z_min() + height,
                 previous_elevation
             )
 
-            logger.debug(f"({profile.kp}):")
+            logger.debug(f"({profile.rk}):")
             logger.debug(f"  width  = {width}")
             logger.debug(f"  strickler = {strickler}")
             logger.debug(f"  discharge = {discharge}")
 
             new = Data(reach=self._reach, status=self._status)
-            new["kp"] = profile.kp
+            new["rk"] = profile.rk
             new["discharge"] = discharge
-
             new["elevation"] = elevation
 
-            self._data.append(new)
             previous_elevation = elevation
+            self._data.append(new)
 
-        self._generate_resort_data(profiles)
+        self._data.reverse()
 
-    def generate_discharge(self, discharge: float):
-        self._data = []
+    def generate_discharge(self, discharge: float, compute_height: bool):
 
-        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_kp(profiles)
+        profiles.reverse()
 
         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()
-            strickler = 25
-            height = (
-                discharge
-                /
-                ((width * 0.8) * strickler * (abs(incline) ** (0.5)))
-            ) ** (0.6)
+            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:
+                height = (
+                    discharge
+                    /
+                    ((width * 0.8) * strickler * (abs(incline) ** (0.5)))
+                ) ** (0.6)
 
             elevation = max(
                 profile.z_min() + height,
                 previous_elevation
             )
 
-            logger.debug(f"({profile.kp}):")
+            logger.debug(f"({profile.rk}):")
             logger.debug(f"  width  = {width}")
             logger.debug(f"  strickler = {strickler}")
             logger.debug(f"  height = {height}")
 
             new = Data(reach=self._reach, status=self._status)
-            new["kp"] = profile.kp
+            new["rk"] = profile.rk
             new["discharge"] = discharge
             new["elevation"] = elevation
 
             previous_elevation = elevation
             self._data.append(new)
 
-        self._generate_resort_data(profiles)
+        self._data.reverse()
 
-    def _generate_resort_data(self, profiles):
-        is_reverse = False
-        if profiles[0].kp > profiles[-1].kp:
-            is_reverse = True
+    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.sort(
-            reverse=not is_reverse,
-            key=lambda d: d['kp']
-        )
+        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)

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -24,10 +24,12 @@ from tools import trace, timer, old_pamhyr_date_to_timestamp
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTSSpec import ICAdisTSSpec
+from Model.InitialConditionsAdisTS.InitialConditionsAdisTSSpec \
+    import ICAdisTSSpec
 
 logger = logging.getLogger()
 
+
 class InitialConditionsAdisTS(SQLSubModel):
     _sub_classes = [
         ICAdisTSSpec,
@@ -80,7 +82,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
-        if major == minor == "0":
+        if major == 0 and minor < 1:
             if int(release) < 6:
                 cls._db_create(execute)
 
@@ -264,9 +266,3 @@ class InitialConditionsAdisTS(SQLSubModel):
     def insert(self, index, data):
         self._data.insert(index, data)
         self._status.modified()
-
-
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py

@@ -20,7 +20,9 @@ from copy import copy
 from tools import trace, timer
 
 from Model.Tools.PamhyrList import PamhyrModelList
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTS import InitialConditionsAdisTS
+from Model.InitialConditionsAdisTS.InitialConditionsAdisTS \
+    import InitialConditionsAdisTS
+
 
 class InitialConditionsAdisTSList(PamhyrModelList):
     _sub_classes = [
@@ -60,7 +62,3 @@ class InitialConditionsAdisTSList(PamhyrModelList):
     @property
     def Initial_Conditions_List(self):
         return self.lst
-
-
-
-

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -25,6 +25,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class ICAdisTSSpec(SQLSubModel):
     _sub_classes = [
     ]
@@ -43,8 +44,8 @@ class ICAdisTSSpec(SQLSubModel):
 
         self._name_section = name
         self._reach = None
-        self._start_kp = None
-        self._end_kp = None
+        self._start_rk = None
+        self._end_rk = None
         self._concentration = None
         self._eg = None
         self._em = None
@@ -57,22 +58,22 @@ class ICAdisTSSpec(SQLSubModel):
     @classmethod
     def _db_create(cls, execute):
         execute("""
-              CREATE TABLE initial_conditions_spec(
-                id INTEGER NOT NULL PRIMARY KEY,
-                ic_default INTEGER NOT NULL,
-                name TEXT NOT NULL,
-                reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
-                concentration REAL NOT NULL,
-                eg REAL NOT NULL,
-                em REAL NOT NULL,
-                ed REAL NOT NULL,
-                rate REAL NOT NULL,
-                enabled BOOLEAN NOT NULL,
-                FOREIGN KEY(ic_default) REFERENCES initial_conditions_adists(id),
-                FOREIGN KEY(reach) REFERENCES river_reach(id)
-              )
+            CREATE TABLE initial_conditions_spec(
+              id INTEGER NOT NULL PRIMARY KEY,
+              ic_default INTEGER NOT NULL,
+              name TEXT NOT NULL,
+              reach INTEGER NOT NULL,
+              start_rk REAL NOT NULL,
+              end_rk REAL NOT NULL,
+              concentration REAL NOT NULL,
+              eg REAL NOT NULL,
+              em REAL NOT NULL,
+              ed REAL NOT NULL,
+              rate REAL NOT NULL,
+              enabled BOOLEAN NOT NULL,
+              FOREIGN KEY(ic_default) REFERENCES initial_conditions_adists(id),
+              FOREIGN KEY(reach) REFERENCES river_reach(id)
+            )
             """)
 
         return cls._create_submodel(execute)
@@ -80,7 +81,7 @@ class ICAdisTSSpec(SQLSubModel):
     @classmethod
     def _db_update(cls, execute, version):
         major, minor, release = version.strip().split(".")
-        if major == minor == "0":
+        if major == 0 and minor < 1:
             if int(release) < 6:
                 cls._db_create(execute)
 
@@ -91,44 +92,46 @@ class ICAdisTSSpec(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, ic_default, name, reach, start_kp, end_kp, " +
+            "SELECT id, ic_default, name, reach, start_rk, end_rk, " +
             "concentration, eg, em, ed, rate, enabled " +
             "FROM initial_conditions_spec " +
             f"WHERE ic_default = {data['ic_default_id']} "
         )
 
-        for row in table:
-            id            = row[0]
-            name          = row[2]
-            reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
-            concentration = row[6]
-            eg            = row[7]
-            em            = row[8]
-            ed            = row[9]
-            rate          = row[10]
-            enabled       = (row[11] == 1)
+        if table is not None:
+            for row in table:
+                id = row[0]
+                name = row[2]
+                reach = row[3]
+                start_rk = row[4]
+                end_rk = row[5]
+                concentration = row[6]
+                eg = row[7]
+                em = row[8]
+                ed = row[9]
+                rate = row[10]
+                enabled = (row[11] == 1)
 
-            #new_spec = [name, reach, start_kp, end_kp, concentration, eg, em, ed, rate, enabled]
+                # new_spec = [name, reach, start_rk, end_rk,
+                #     concentration, eg, em, ed, rate, enabled]
 
-            new_spec = cls(
-                id=id,
-                name=name,
-                status=data['status']
-            )
+                new_spec = cls(
+                    id=id,
+                    name=name,
+                    status=data['status']
+                )
 
-            new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
-            new_spec.concentration = concentration
-            new_spec.eg = eg
-            new_spec.em = em
-            new_spec.ed = ed
-            new_spec.rate = rate
-            new_spec.enabled = enabled
+                new_spec.reach = reach
+                new_spec.start_rk = start_rk
+                new_spec.end_rk = end_rk
+                new_spec.concentration = concentration
+                new_spec.eg = eg
+                new_spec.em = em
+                new_spec.ed = ed
+                new_spec.rate = rate
+                new_spec.enabled = enabled
 
-            new.append(new_spec)
+                new.append(new_spec)
 
         return new
 
@@ -138,14 +141,14 @@ class ICAdisTSSpec(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "initial_conditions_spec(id, ic_default, name, reach, " +
-            "start_kp, end_kp, concentration, eg, em, ed, rate, enabled) " +
+            "start_rk, end_rk, concentration, eg, em, ed, rate, enabled) " +
             "VALUES (" +
             f"{self.id}, " +
             f"{ic_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
+            f"{self._start_rk}, " +
+            f"{self._end_rk}, " +
             f"{self._concentration}, " +
             f"{self._eg}, " +
             f"{self._em}, " +
@@ -177,21 +180,21 @@ class ICAdisTSSpec(SQLSubModel):
         self._status.modified()
 
     @property
-    def start_kp(self):
-        return self._start_kp
+    def start_rk(self):
+        return self._start_rk
 
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
+    @start_rk.setter
+    def start_rk(self, start_rk):
+        self._start_rk = start_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 
     @property
@@ -247,12 +250,3 @@ class ICAdisTSSpec(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-
-
-
-

src/Model/LateralContribution/LateralContribution.py

@@ -48,8 +48,8 @@ class LateralContribution(SQLSubModel):
         self._name = name
         self._type = ""
         self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
+        self._begin_rk = 0.0
+        self._end_rk = 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_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
+            begin_rk REAL NOT NULL,
+            end_rk REAL NOT NULL,
             FOREIGN KEY(edge) REFERENCES river_reach(id)
           )
         """)
@@ -87,6 +87,22 @@ 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_rk TO begin_rk
+                    """
+                )
+                execute(
+                    """
+                    ALTER TABLE lateral_contribution
+                    RENAME COLUMN end_rk TO end_rk
+                    """
+                )
+
         return True
 
     @classmethod
@@ -110,7 +126,7 @@ class LateralContribution(SQLSubModel):
         tab = data["tab"]
 
         table = execute(
-            "SELECT id, name, type, edge, begin_kp, end_kp " +
+            "SELECT id, name, type, edge, begin_rk, end_rk " +
             f"FROM lateral_contribution WHERE tab = '{tab}'"
         )
 
@@ -125,8 +141,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_kp = row[4]
-            lc._end_kp = row[5]
+            lc._begin_rk = row[4]
+            lc._end_rk = row[5]
 
             values = execute(
                 "SELECT ind, data0, data1 FROM lateral_contribution_data " +
@@ -160,11 +176,11 @@ class LateralContribution(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "lateral_contribution(id, name, type, tab, " +
-            "edge, begin_kp, end_kp) " +
+            "edge, begin_rk, end_rk) " +
             "VALUES (" +
             f"{self.id}, '{self._db_format(self._name)}', " +
             f"'{self._db_format(self._type)}', '{tab}', {edge}, " +
-            f"{self._begin_kp}, {self._end_kp}" +
+            f"{self._begin_rk}, {self._end_rk}" +
             ")"
         )
         execute(sql)
@@ -231,44 +247,44 @@ class LateralContribution(SQLSubModel):
     def edge(self, edge):
         self._edge = edge
         if edge is not None:
-            self._begin_kp = self._edge.reach.get_kp_min()
-            self._end_kp = self._edge.reach.get_kp_max()
+            self._begin_rk = self._edge.reach.get_rk_min()
+            self._end_rk = self._edge.reach.get_rk_max()
         self._status.modified()
 
     def has_edge(self):
         return self._edge is not None
 
     @property
-    def begin_kp(self):
-        return self._begin_kp
+    def begin_rk(self):
+        return self._begin_rk
 
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
+    @begin_rk.setter
+    def begin_rk(self, begin_rk):
         if self._edge is None:
-            self._begin_kp = begin_kp
+            self._begin_rk = begin_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= begin_kp <= _max:
-                self._begin_kp = begin_kp
+            if _min <= begin_rk <= _max:
+                self._begin_rk = begin_rk
 
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
+    @end_rk.setter
+    def end_rk(self, end_rk):
         if self._edge is None:
-            self._end_kp = end_kp
+            self._end_rk = end_rk
         else:
-            _min = self._edge.reach.get_kp_min()
-            _max = self._edge.reach.get_kp_max()
+            _min = self._edge.reach.get_rk_min()
+            _max = self._edge.reach.get_rk_max()
 
-            if _min <= end_kp <= _max:
-                self._end_kp = end_kp
+            if _min <= end_rk <= _max:
+                self._end_rk = end_rk
 
         self._status.modified()
 
@@ -377,8 +393,8 @@ class LateralContribution(SQLSubModel):
     def convert(self, cls):
         new = cls(name=self.name, status=self._status)
         new.edge = self.edge
-        new.begin_kp = self.begin_kp
-        new.end_kp = self.end_kp
+        new.begin_rk = self.begin_rk
+        new.end_rk = self.end_rk
 
         for i, _ in enumerate(self.data):
             new.add(i)

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -30,11 +30,13 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class LateralContributionAdisTS(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
 
-    def __init__(self, id: int = -1, pollutant: int = -1, name: str = "", status=None):
+    def __init__(self, id: int = -1, pollutant: int = -1,
+                 name: str = "", status=None):
         super(LateralContributionAdisTS, self).__init__()
 
         self._status = status
@@ -46,11 +48,11 @@ class LateralContributionAdisTS(SQLSubModel):
 
         self._pollutant = pollutant
         self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
+        self._begin_rk = 0.0
+        self._end_rk = 0.0
         self._data = []
         self._header = ["time", "rate"]
-        self._types = [float, float]
+        self._types = [self.time_convert, float]
 
         LateralContributionAdisTS._id_cnt = max(
             LateralContributionAdisTS._id_cnt + 1, self.id)
@@ -62,8 +64,8 @@ class LateralContributionAdisTS(SQLSubModel):
             id INTEGER NOT NULL PRIMARY KEY,
             pollutant INTEGER NOT NULL,
             edge INTEGER NOT NULL,
-            begin_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
+            begin_rk REAL NOT NULL,
+            end_rk REAL NOT NULL,
             FOREIGN KEY(pollutant) REFERENCES Pollutants(id),
             FOREIGN KEY(edge) REFERENCES river_reach(id)
           )
@@ -90,7 +92,7 @@ class LateralContributionAdisTS(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, pollutant, edge, begin_kp, end_kp " +
+            "SELECT id, pollutant, edge, begin_rk, end_rk " +
             "FROM lateral_contribution_adists"
         )
 
@@ -103,11 +105,12 @@ class LateralContributionAdisTS(SQLSubModel):
                 )
 
                 lc.edge = row[2]
-                lc.begin_kp = row[3]
-                lc.end_kp = row[4]
+                lc.begin_rk = row[3]
+                lc.end_rk = row[4]
 
                 values = execute(
-                    "SELECT data0, data1 FROM lateral_contribution_data_adists " +
+                    "SELECT data0," +
+                    " data1 FROM lateral_contribution_data_adists " +
                     f"WHERE lc = '{lc.id}'"
                 )
 
@@ -124,15 +127,18 @@ class LateralContributionAdisTS(SQLSubModel):
 
     def _db_save(self, execute, data=None):
 
-        execute(f"DELETE FROM lateral_contribution_adists WHERE id = {self.id}")
-        execute(f"DELETE FROM lateral_contribution_data_adists WHERE lc = {self.id}")
+        execute(f"DELETE FROM lateral_contribution_adists" +
+                f" WHERE id = {self.id}")
+        execute(f"DELETE FROM lateral_contribution_data_adists" +
+                f" WHERE lc = {self.id}")
 
         sql = (
             "INSERT INTO " +
-            "lateral_contribution_adists(id, pollutant, edge, begin_kp, end_kp) " +
+            "lateral_contribution_adists(id, " +
+            "pollutant, edge, begin_rk, end_rk) " +
             "VALUES (" +
             f"{self.id}, {self._pollutant}, {self.edge}, " +
-            f"{self._begin_kp}, {self._end_kp}" +
+            f"{self._begin_rk}, {self._end_rk}" +
             ")"
         )
         execute(sql)
@@ -196,20 +202,19 @@ class LateralContributionAdisTS(SQLSubModel):
         return self._data.copy()
 
     @property
-    def begin_kp(self):
-        return self._begin_kp
+    def begin_rk(self):
+        return self._begin_rk
 
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
-        self._begin_kp = begin_kp
+    @begin_rk.setter
+    def begin_rk(self, begin_rk):
+        self._begin_rk = begin_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
-

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

@@ -22,7 +22,9 @@ from tools import trace, timer
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Except import NotImplementedMethodeError
 
-from Model.LateralContributionsAdisTS.LateralContributionAdisTS import LateralContributionAdisTS
+from Model.LateralContributionsAdisTS.LateralContributionAdisTS \
+    import LateralContributionAdisTS
+
 
 class LateralContributionsAdisTSList(PamhyrModelList):
     _sub_classes = [

src/Model/Network/Edge.py

@@ -51,9 +51,9 @@ class Edge(object):
         elif name == "id":
             ret = self.id
         elif name == "node1":
-            ret = self.node1.name
+            ret = self.node1
         elif name == "node2":
-            ret = self.node2.name
+            ret = self.node2
         elif name == "enable":
             ret = self._enable
 
@@ -75,10 +75,10 @@ class Edge(object):
 
     @property
     def name(self):
-        name = self._name
         if self._name == "":
-            name = f"{self.node1.name} -> {self.node2.name}"
-        return name
+            return f"R{self.id}"
+
+        return self._name
 
     def is_enable(self):
         return self._enable

src/Model/Network/Node.py

@@ -35,11 +35,7 @@ class Node(object):
         else:
             self.id = id
 
-        if name == "":
-            self._name = f"Node {self.id}"
-        else:
-            self._name = name
-
+        self._name = name
         self.pos = Point(x, y)
 
     def __getitem__(self, key):
@@ -64,6 +60,9 @@ class Node(object):
 
     @property
     def name(self):
+        if self._name == "":
+            return f"N{self.id}"
+
         return self._name
 
     @property

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -1,4 +1,4 @@
-# OutputKpAdists.py -- Pamhyr
+# OutputRKAdists.py -- Pamhyr
 # Copyright (C) 2023-2024  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
@@ -30,27 +30,29 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
-class OutputKpAdists(SQLSubModel):
+
+class OutputRKAdists(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
 
-    def __init__(self, id: int = -1, reach = None, kp = None, title: str = "",  status=None):
-        super(OutputKpAdists, self).__init__()
+    def __init__(self, id: int = -1, reach=None,
+                 rk=None, title: str = "",  status=None):
+        super(OutputRKAdists, self).__init__()
 
         self._status = status
 
         if id == -1:
-            self.id = OutputKpAdists._id_cnt
+            self.id = OutputRKAdists._id_cnt
         else:
             self.id = id
 
         self._reach = reach
-        self._kp = kp
+        self._rk = rk
         self._title = str(title)
         self._enabled = True
 
-        OutputKpAdists._id_cnt = max(
-            OutputKpAdists._id_cnt + 1, self.id)
+        OutputRKAdists._id_cnt = max(
+            OutputRKAdists._id_cnt + 1, self.id)
 
     @property
     def reach(self):
@@ -62,12 +64,12 @@ class OutputKpAdists(SQLSubModel):
         self._status.modified()
 
     @property
-    def kp(self):
-        return self._kp
+    def rk(self):
+        return self._rk
 
-    @kp.setter
-    def kp(self, profile_id):
-        self._kp = profile_id
+    @rk.setter
+    def rk(self, profile_id):
+        self._rk = profile_id
         self._status.modified()
 
     @property
@@ -79,15 +81,14 @@ class OutputKpAdists(SQLSubModel):
         self._title = title
         self._status.modified()
 
-
     @classmethod
     def _db_create(cls, execute):
 
         sql = (
-            "CREATE TABLE OutputKpAdists(" +
+            "CREATE TABLE OutputRKAdists(" +
             "id INTEGER NOT NULL PRIMARY KEY, " +
             "reach INTEGER NOT NULL, " +
-            "kp REAL NOT NULL, " +
+            "rk REAL NOT NULL, " +
             "title TEXT NOT NULL, " +
             "FOREIGN KEY(reach) REFERENCES river_reach(id)" +
             ")"
@@ -105,25 +106,25 @@ class OutputKpAdists(SQLSubModel):
     def _db_load(cls, execute, data=None):
         new = []
 
-        #reach   = data["reach"]
-        #profile = data["profile"]
-        status  = data["status"]
+        # reach   = data["reach"]
+        # profile = data["profile"]
+        status = data["status"]
 
         table = execute(
-            "SELECT id, reach, kp, title " +
-            f"FROM OutputKpAdists"
+            "SELECT id, reach, rk, title " +
+            f"FROM OutputRKAdists"
         )
 
         if table is not None:
             for row in table:
-                id       = row[0]
+                id = row[0]
                 id_reach = row[1]
-                id_kp    = row[2]
-                title    = row[3]
+                id_rk = row[2]
+                title = row[3]
 
                 new_output = cls(
                     id=id, reach=id_reach,
-                    kp=id_kp, title=title,
+                    rk=id_rk, title=title,
                     status=status
                 )
 
@@ -133,13 +134,13 @@ class OutputKpAdists(SQLSubModel):
 
     def _db_save(self, execute, data=None):
 
-        execute(f"DELETE FROM OutputKpAdists WHERE id = {self.id}")
+        execute(f"DELETE FROM OutputRKAdists WHERE id = {self.id}")
 
         sql = (
             "INSERT INTO " +
-            "OutputKpAdists(id, reach, kp, title) " +
+            "OutputRKAdists(id, reach, rk, title) " +
             "VALUES (" +
-            f"{self.id}, {self._reach}, {self._kp}, " +
+            f"{self.id}, {self._reach}, {self._rk}, " +
             f"'{self._db_format(self._title)}'" +
             ")"
         )
@@ -156,9 +157,3 @@ class OutputKpAdists(SQLSubModel):
     def enabled(self, enabled):
         self._enabled = enabled
         self._status.modified()
-
-
-
-
-
-

src/Model/OutputRKAdists/OutputRKListAdists.py

@@ -1,4 +1,4 @@
-# OutputKpListAdists.py -- Pamhyr
+# OutputRKListAdists.py -- Pamhyr
 # Copyright (C) 2024  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
@@ -20,17 +20,17 @@ from tools import trace, timer
 
 from Model.Except import NotImplementedMethodeError
 from Model.Tools.PamhyrList import PamhyrModelList
-from Model.OutputKpAdists.OutputKpAdists import OutputKpAdists
+from Model.OutputRKAdists.OutputRKAdists import OutputRKAdists
 
 
-class OutputKpAdistsList(PamhyrModelList):
-    _sub_classes = [OutputKpAdists]
+class OutputRKAdistsList(PamhyrModelList):
+    _sub_classes = [OutputRKAdists]
 
     @classmethod
     def _db_load(cls, execute, data=None):
         new = cls(status=data["status"])
 
-        new._lst = OutputKpAdists._db_load(execute, data)
+        new._lst = OutputRKAdists._db_load(execute, data)
 
         return new
 
@@ -38,7 +38,7 @@ class OutputKpAdistsList(PamhyrModelList):
         ok = True
 
         # Delete previous data
-        execute("DELETE FROM OutputKpAdists")
+        execute("DELETE FROM OutputRKAdists")
 
         for sl in self._lst:
             ok &= sl._db_save(execute, data)
@@ -46,11 +46,11 @@ class OutputKpAdistsList(PamhyrModelList):
         return ok
 
     @property
-    def OutputKp_List(self):
+    def OutputRK_List(self):
         return self.lst
 
     def new(self, lst, index):
-        n = OutputKpAdists(status=self._status)
+        n = OutputRKAdists(status=self._status)
         self._lst.insert(index, n)
         self._status.modified()
         return n

src/Model/Pollutants/Pollutants.py

@@ -30,6 +30,7 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
+
 class Pollutants(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
@@ -101,7 +102,7 @@ class Pollutants(SQLSubModel):
     def _db_load(cls, execute, data=None):
         new = []
 
-        status  = data["status"]
+        status = data["status"]
 
         table = execute(
             "SELECT id, name " +
@@ -110,7 +111,7 @@ class Pollutants(SQLSubModel):
 
         if table is not None:
             for row in table:
-                id   = row[0]
+                id = row[0]
                 name = row[1]
 
                 new_pollutant = cls(
@@ -138,7 +139,8 @@ class Pollutants(SQLSubModel):
     def _db_save(self, execute, data=None):
 
         execute(f"DELETE FROM Pollutants WHERE id = {self.id}")
-        execute(f"DELETE FROM Pollutants_characteristics WHERE pollutant = {self.id}")
+        execute(f"DELETE FROM Pollutants_characteristics" +
+                f" WHERE pollutant = {self.id}")
 
         sql = (
             "INSERT INTO " +
@@ -177,10 +179,3 @@ class Pollutants(SQLSubModel):
 
     def __len__(self):
         return len(self._data)
-
-
-
-
-
-
-

src/Model/Results/ResultsAdisTS.py

@@ -0,0 +1,88 @@
+# Results.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/>.
+
+import logging
+import numpy as np
+import os
+import glob
+
+from copy import deepcopy
+from datetime import datetime
+
+from Model.Results.River.RiverAdisTS import River
+
+logger = logging.getLogger()
+
+
+class Results(object):
+    def __init__(self, study=None, solver=None,
+                 repertory="", name="0", type_pol=None):
+        self._study = study
+        self._solver = solver
+        self._repertory = repertory
+        self._name = name
+
+        self._river = River(self._study)
+
+        self._meta_data = {
+            # Keep results creation date
+            "creation_date": datetime.now(),
+        }
+        repertory_results = os.path.join(repertory, "resultats")
+        self._pollutants_list = [
+            el.split("/")[-1][0:-4]
+            for el in glob.glob(repertory_results + "/*.bin")
+            ]
+
+        self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
+
+    @property
+    def date(self):
+        date = self._meta_data["creation_date"]
+        return f"{date.isoformat(sep=' ')}"
+
+    @property
+    def river(self):
+        return self._river
+
+    @property
+    def study(self):
+        return self._study
+
+    @property
+    def pollutants_list(self):
+        return self._pollutants_list
+
+    @property
+    def phys_var_list(self):
+        return self._phys_var_list
+
+    @property
+    def nb_pollutants(self):
+        return len(self._pollutants_list)
+
+    def set(self, key, value):
+        self._meta_data[key] = value
+
+    def get(self, key):
+        return self._meta_data[key]
+
+    def reload(self):
+        return self._solver.results(
+            self._study,
+            self._repertory,
+            qlog=None,
+        )

src/Model/Results/River/River.py

@@ -35,8 +35,8 @@ class Profile(object):
         return self._profile.name
 
     @property
-    def kp(self):
-        return self._profile.kp
+    def rk(self):
+        return self._profile.rk
 
     @property
     def geometry(self):

src/Model/Results/River/RiverAdisTS.py

@@ -0,0 +1,136 @@
+# River.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/>.
+
+import logging
+
+from datetime import datetime
+
+logger = logging.getLogger()
+
+
+class Profile(object):
+    def __init__(self, profile, study):
+        self._study = study
+        self._profile = profile  # Source profile in the study
+        self._data = {}  # Dict of dict {<ts>: {<key>: <value>, ...}, ...}
+
+    def __len__(self):
+        return len(self._data)
+
+    @property
+    def name(self):
+        return self._profile.name
+
+    @property
+    def rk(self):
+        return self._profile.rk
+
+    @property
+    def geometry(self):
+        return self._profile
+
+    def set(self, timestamp, key, data):
+        if timestamp not in self._data:
+            self._data[timestamp] = {}
+
+        self._data[timestamp][key] = data
+
+    def get_ts(self, timestamp):
+        return self._data[timestamp]
+
+    def get_key(self, key):
+        return list(
+            map(lambda ts: self._data[ts][key], self._data)
+        )
+
+    def get_ts_key(self, timestamp, key):
+        return self._data[timestamp][key]
+
+    def has_sediment(self):
+        return any(map(lambda ts: "sl" in self._data[ts], self._data))
+
+
+class Reach(object):
+    def __init__(self, reach, study):
+        self._study = study
+        self._reach = reach  # Source reach in the study
+        self._profiles = list(
+            map(
+                lambda p: Profile(p, self._study),
+                reach.profiles
+            )
+        )
+
+    def __len__(self):
+        return len(self._profiles)
+
+    @property
+    def name(self):
+        return self._reach.name
+
+    @property
+    def geometry(self):
+        return self._reach
+
+    @property
+    def profiles(self):
+        return self._profiles.copy()
+
+    def profile(self, id):
+        return self._profiles[id]
+
+    def set(self, profile_id, timestamp, key, data):
+        self._profiles[profile_id].set(timestamp, key, data)
+
+    def has_sediment(self):
+        return any(map(lambda profile: profile.has_sediment(), self._profiles))
+
+
+class River(object):
+    def __init__(self, study):
+        self._study = study
+
+        # Dict with timestamps as key
+        self._reachs = []
+
+    def __len__(self):
+        return len(self._reachs)
+
+    @property
+    def reachs(self):
+        return self._reachs.copy()
+
+    def reach(self, id):
+        return self._reachs[id]
+
+    def has_reach(self, id):
+        return 0 <= id < len(self._reachs)
+
+    def add(self, reach_id):
+        reachs = self._study.river.enable_edges()
+
+        new = Reach(reachs[reach_id].reach, self._study)
+
+        self._reachs.append(new)
+        return new
+
+    def get_reach_by_geometry(self, geometry_reach):
+        return next(
+            filter(
+                lambda r: r.geometry is geometry_reach,
+                self._reachs
+            )
+        )

src/Model/River.py

@@ -45,11 +45,14 @@ from Model.REPLine.REPLineList import REPLineList
 
 from Solver.Solvers import solver_type_list
 
-from Model.OutputKpAdists.OutputKpListAdists import OutputKpAdistsList
+from Model.OutputRKAdists.OutputRKListAdists import OutputRKAdistsList
 from Model.Pollutants.PollutantsList import PollutantsList
-from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList import InitialConditionsAdisTSList
-from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList import BoundaryConditionsAdisTSList
-from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList import LateralContributionsAdisTSList
+from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList \
+    import InitialConditionsAdisTSList
+from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList \
+    import BoundaryConditionsAdisTSList
+from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList \
+    import LateralContributionsAdisTSList
 from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
 from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
 
@@ -236,7 +239,7 @@ class River(Graph, SQLSubModel):
         HydraulicStructureList,
         AddFileList,
         REPLineList,
-        OutputKpAdistsList,
+        OutputRKAdistsList,
         PollutantsList,
         InitialConditionsAdisTSList,
         BoundaryConditionsAdisTSList,
@@ -266,11 +269,14 @@ class River(Graph, SQLSubModel):
         )
         self._additional_files = AddFileList(status=self._status)
         self._rep_lines = REPLineList(status=self._status)
-        self._Output_kp_adists = OutputKpAdistsList(status=self._status)
+        self._Output_rk_adists = OutputRKAdistsList(status=self._status)
         self._Pollutants = PollutantsList(status=self._status)
-        self._InitialConditionsAdisTS = InitialConditionsAdisTSList(status=self._status)
-        self._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList(status=self._status)
-        self._LateralContributionsAdisTS = LateralContributionsAdisTSList(status=self._status)
+        self._InitialConditionsAdisTS = InitialConditionsAdisTSList(
+            status=self._status)
+        self._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList(
+            status=self._status)
+        self._LateralContributionsAdisTS = LateralContributionsAdisTSList(
+            status=self._status)
         self._D90AdisTS = D90AdisTSList(status=self._status)
         self._DIFAdisTS = DIFAdisTSList(status=self._status)
 
@@ -347,17 +353,20 @@ class River(Graph, SQLSubModel):
         )
         new._rep_lines = REPLineList._db_load(execute, data)
 
-        new._Output_kp_adists = OutputKpAdistsList._db_load(
+        new._Output_rk_adists = OutputRKAdistsList._db_load(
             execute, data
         )
 
         new._Pollutants = PollutantsList._db_load(execute, data)
 
-        new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(execute, data)
+        new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(
+            execute, data)
 
-        new._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList._db_load(execute, data)
+        new._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList._db_load(
+            execute, data)
 
-        new._LateralContributionsAdisTS = LateralContributionsAdisTSList._db_load(execute, data)
+        new._LateralContributionsAdisTS = \
+            LateralContributionsAdisTSList._db_load(execute, data)
 
         new._D90AdisTS = D90AdisTSList._db_load(execute, data)
 
@@ -382,7 +391,7 @@ class River(Graph, SQLSubModel):
         for solver in self._parameters:
             objs.append(self._parameters[solver])
 
-        objs.append(self._Output_kp_adists)
+        objs.append(self._Output_rk_adists)
         objs.append(self._Pollutants)
         objs.append(self._InitialConditionsAdisTS)
         objs.append(self._BoundaryConditionsAdisTS)
@@ -513,15 +522,15 @@ Last export at: @date."""
         return self._parameters
 
     @property
-    def Output_kp_adists(self):
-        return self._Output_kp_adists
+    def Output_rk_adists(self):
+        return self._Output_rk_adists
 
     @property
     def Pollutants(self):
         return self._Pollutants
 
     @property
-    def initial_conditions_adists(self):
+    def ic_adists(self):
         return self._InitialConditionsAdisTS
 
     @property

src/Model/Stricklers/Stricklers.py

@@ -113,10 +113,7 @@ class Stricklers(SQLSubModel):
         return True
 
     def __str__(self):
-        if self._name != "":
-            return f"{self._name} ({self._minor}, {self._medium})"
-
-        return f"({self._minor}, {self._medium})"
+        return f"{self.name} ({self._minor}, {self._medium})"
 
     @property
     def name(self):

src/Model/Study.py

@@ -41,7 +41,7 @@ class Study(SQLModel):
 
     def __init__(self, filename=None, init_new=True):
         # Metadata
-        self._version = "0.0.10"
+        self._version = "0.0.11"
         self.creation_date = datetime.now()
         self.last_modification_date = datetime.now()
         self.last_save_date = datetime.now()
@@ -72,7 +72,7 @@ class Study(SQLModel):
             StudyNetworkReachChecker(),
             StudyGeometryChecker(),
             StudyInitialConditionsChecker(),
-            #StudyBoundaryConditionChecker(),
+            # StudyBoundaryConditionChecker(),
             # DummyOK(),
             # DummyWARNING(),
             # DummyERROR(),
@@ -230,16 +230,16 @@ class Study(SQLModel):
         )
         self.execute(
             "INSERT INTO info VALUES ('date', " +
-            f"'{self._date.timestamp()}')"
+            f"'{timestamp(self._date)}')"
         )
 
         self.execute(
             "INSERT INTO info VALUES ('creation_date', " +
-            f"'{self.creation_date.timestamp()}')"
+            f"'{timestamp(self.creation_date)}')"
         )
         self.execute(
             "INSERT INTO info VALUES ('last_save_date', " +
-            f"'{self.last_save_date.timestamp()}')"
+            f"'{timestamp(self.last_save_date)}')"
         )
 
         self._create_submodel()

src/Model/Tools/PamhyrDict.py

@@ -67,7 +67,7 @@ class PamhyrModelDict(SQLSubModel):
         if key in self._dict:
             v = self._dict[key]
 
-            if type(v) is types.GeneratorType:
+            if isinstance(v, types.GeneratorType):
                 return list(v)
 
             return v

src/Modules.py

@@ -54,7 +54,7 @@ class Modules(IterableFlag):
     RESERVOIR = auto()
     SEDIMENT_LAYER = auto()
     ADDITIONAL_FILES = auto()
-    OUTPUT_KP = auto()
+    OUTPUT_RK = auto()
 
     # Results
     RESULTS = auto()
@@ -78,7 +78,7 @@ class Modules(IterableFlag):
             cls.ADDITIONAL_FILES,
             cls.RESULTS,
             cls.WINDOW_LIST,
-            cls.OUTPUT_KP,
+            cls.OUTPUT_RK,
         ]
 
     @classmethod

src/Solver/AdisTS.py

@@ -17,7 +17,9 @@
 # -*- coding: utf-8 -*-
 
 import os
+import glob
 import logging
+
 import numpy as np
 
 import shutil
@@ -31,15 +33,18 @@ from tools import (
 
 from Solver.CommandLine import CommandLineSolver
 
-from Model.Results.Results import Results
+from Model.Results.ResultsAdisTS import Results
 from Model.Results.River.River import River, Reach, Profile
 
 from Checker.Adists import (
-    AdistsOutputKpChecker,
+    AdistsOutputRKChecker,
 )
 
+from itertools import chain
+
 logger = logging.getLogger()
 
+
 def adists_file_open(filepath, mode):
     f = open(filepath, mode)
 
@@ -56,6 +61,7 @@ def adists_file_open(filepath, mode):
 
     return f
 
+
 class AdisTS(CommandLineSolver):
     _type = "adists"
 
@@ -86,7 +92,7 @@ class AdisTS(CommandLineSolver):
     @classmethod
     def checkers(cls):
         lst = [
-            AdistsOutputKpChecker(),
+            AdistsOutputRKChecker(),
         ]
 
         return lst
@@ -112,7 +118,7 @@ class AdisTS(CommandLineSolver):
         for line in lines:
             rep_file.write(line.line)
 
-    def _export_REP(self, study, repertory, files, qlog, name="0"):
+    def _export_REP(self, study, repertory, mage_rep, files, qlog, name="0"):
 
         if qlog is not None:
             qlog.put("Export REP file")
@@ -124,8 +130,8 @@ class AdisTS(CommandLineSolver):
                 ), "w+"
         ) as f:
 
-            f.write(f"NET ../default-mage/{name}.NET\n")
-            f.write(f"REP ../default-mage/{name}.REP\n")
+            f.write(f"NET ../{mage_rep}/{name}.NET\n")
+            f.write(f"REP ../{mage_rep}/{name}.REP\n")
 
             for file in files:
                 EXT = file.split('.')[1]
@@ -133,7 +139,9 @@ class AdisTS(CommandLineSolver):
 
             self._export_REP_additional_lines(study, f)
 
-        path_mage_net = os.path.join(os.path.abspath(os.path.join(repertory, os.pardir)), f"default-mage/net")
+        path_mage_net = os.path.join(os.path.abspath(
+                os.path.join(repertory, os.pardir)
+        ), f"{mage_rep}/net")
         path_adists_net = os.path.join(repertory, "net")
 
         if os.path.exists(path_mage_net):
@@ -156,12 +164,13 @@ class AdisTS(CommandLineSolver):
         return
 
     @timer
-    def results(self, study, repertory, qlog=None, name="0"):
+    def results(self, study, repertory, qlog=None, name="0", type_pol=None):
         results = Results(
             study=study,
             solver=self,
             repertory=repertory,
             name=name,
+            type_pol=type_pol,
         )
         self.read_bin(study, repertory, results, qlog, name=name)
 
@@ -171,22 +180,83 @@ class AdisTS(CommandLineSolver):
         name = ""
         return f"{name}"
 
-################################
-# Adis-TS in low coupling mode #
-################################
+    _alph = list(
+        map(
+            chr,
+            chain(
+                range(48, 58),  # 0..9
+                range(65, 91),  # A..Z
+                range(97, 123)  # a..z
+            )
+        )
+    )
+
+    _l_alph = len(_alph)
+
+    _nodes_cnt = 0
+    _nodes_names = {}
+    _nodes_views = set()
+
+    def get_reach_name(self, reach):
+        return f"Reach_{reach.id:>3}".replace(" ", "0")
+
+    def get_node_name(self, node):
+        """Generate a 3 char name for node
+
+        Args:
+            node: The node
+
+        Returns:
+            A 3 char name string
+        """
+        n = node.id
+
+        # print("node name id: ", n)
+
+        # if n in self._nodes_names:
+        #     return self._nodes_names[n]
+
+        name = ""
+
+        checked_new = False
+        while not checked_new:
+            self._nodes_cnt += 1
+            nc = self._nodes_cnt
+
+            name = "".join(
+                map(
+                    lambda i: self._alph[i % self._l_alph],
+                    [
+                        int(nc / (self._l_alph * self._l_alph)),
+                        int(nc / self._l_alph),
+                        nc
+                    ]
+                )
+            )
+
+            checked_new = name not in self._nodes_views
+
+        self._nodes_views.add(name)
+        self._nodes_names[n] = name
+
+        return name
+
+#################################
+# Adis-TS in weak coupling mode #
+#################################
 
 
-class AdisTSlc(AdisTS):
-    _type = "adistslc"
+class AdisTSwc(AdisTS):
+    _type = "adistswc"
 
     def __init__(self, name):
-        super(AdisTSlc, self).__init__(name)
+        super(AdisTSwc, self).__init__(name)
 
-        self._type = "adistslc"
+        self._type = "adistswc"
 
     @classmethod
     def default_parameters(cls):
-        lst = super(AdisTSlc, cls).default_parameters()
+        lst = super(AdisTSwc, cls).default_parameters()
 
         # Insert new parameters at specific position
         names = list(map(lambda t: t[0], lst))
@@ -198,7 +268,7 @@ class AdisTSlc(AdisTS):
     ##########
 
     def cmd_args(self, study):
-        lst = super(AdisTSlc, self).cmd_args(study)
+        lst = super(AdisTSwc, self).cmd_args(study)
 
         return lst
 
@@ -213,34 +283,49 @@ class AdisTSlc(AdisTS):
 
         for pollutant in pollutants:
             name = pollutant.name
-            with adists_file_open(os.path.join(repertory, f"{name}.POL"), "w+") as f:
+            with adists_file_open(
+                    os.path.join(repertory, f"{name}.POL"), "w+"
+            ) as f:
                 files.append(f"{name}.POL")
-                f.write(f"*Polluant A contaminé aux PCB\n")
                 f.write(f"name = {name}\n")
 
-                self._export_POL_Characteristics(study, pollutant._data, f, qlog)
+                self._export_POL_Characteristics(
+                        study, pollutant._data, f, qlog
+                )
 
-                POL_ICs = next(filter(lambda ic: ic.pollutant == pollutant.id,\
-                                      study.river.initial_conditions_adists.Initial_Conditions_List))
+                POL_ICs = next(filter(
+                    lambda ic: ic.pollutant == pollutant.id,
+                    study.river.ic_adists.Initial_Conditions_List
+                ))
 
-                if POL_ICs.concentration != None:
+                if POL_ICs.concentration is not None:
                     f.write(f"file_ini = {name}.INI\n")
-                    self._export_ICs_AdisTS(study, repertory, POL_ICs, qlog, name)
+                    self._export_ICs_AdisTS(
+                        study, repertory, POL_ICs, qlog, name
+                    )
 
-                POL_BCs = list(filter(lambda bc: bc.pollutant == pollutant.id,\
-                                      study.river.boundary_conditions_adists.BCs_AdisTS_List))
+                POL_BCs = list(filter(
+                    lambda bc: bc.pollutant == pollutant.id,
+                    study.river.boundary_conditions_adists.BCs_AdisTS_List
+                ))
 
                 if len(POL_BCs) != 0:
                     f.write(f"file_cl = {name}.CDT\n")
-                    self._export_BCs_AdisTS(study, repertory, POL_BCs, qlog, name)
+                    self._export_BCs_AdisTS(
+                        study, repertory, POL_BCs, qlog, name
+                    )
 
-                POL_LAT_Cont = list(filter(lambda lc: lc.pollutant == pollutant.id,\
-                                      study.river.lateral_contributions_adists.Lat_Cont_List))
+                POL_LAT_Cont = list(filter(
+                    lambda lc: lc.pollutant == pollutant.id,
+                    study.river.lateral_contributions_adists.Lat_Cont_List
+                ))
 
                 if len(POL_LAT_Cont) != 0:
                     f.write(f"file_ald = {name}.ALD\n")
                     f.write(f"*\n")
-                    self._export_Lat_AdisTS(study, repertory, POL_LAT_Cont, qlog, name)
+                    self._export_Lat_AdisTS(
+                        study, repertory, POL_LAT_Cont, qlog, name
+                    )
 
         return files
 
@@ -249,15 +334,22 @@ class AdisTSlc(AdisTS):
         if qlog is not None:
             qlog.put("Export POL LCs files")
 
-        with adists_file_open(os.path.join(repertory, f"{POL_name}.ALD"), "w+") as f:
+        with adists_file_open(
+            os.path.join(repertory, f"{POL_name}.ALD"), "w+"
+        ) as f:
             for LC in POL_LC:
-                reach_name = next(filter(lambda edge: edge.id == LC.edge, study.river.edges())).name
-                f.write(f"${reach_name} {LC.begin_kp} {LC.end_kp}\n")
+                reach = next(filter(
+                    lambda edge: edge.id == LC.edge, study.river.edges()
+                ))  # .name
+                reach_name = self.get_reach_name(self, reach)
+                f.write(f"${reach_name} {LC.begin_rk} {LC.end_rk}\n")
                 f.write(f"*temps   |débit massique (kg/s)\n")
                 f.write(f"*---------++++++++++\n")
 
                 for LC_data in LC._data:
-                    f.write(f"{timestamp_to_old_pamhyr_date_adists(int(LC_data[0]))} {LC_data[1]}\n")
+                    tmp = timestamp_to_old_pamhyr_date_adists(int(LC_data[0]))
+                    f.write(" ".join((f"{tmp}",
+                            f"{LC_data[1]}\n")))
                 f.write(f"*\n")
 
         return True
@@ -267,9 +359,14 @@ class AdisTSlc(AdisTS):
         if qlog is not None:
             qlog.put("Export POL BCs files")
 
-        with adists_file_open(os.path.join(repertory, f"{POL_name}.CDT"), "w+") as f:
+        with adists_file_open(os.path.join(
+            repertory, f"{POL_name}.CDT"), "w+"
+        ) as f:
             for BC in POL_BC:
-                node_name = next(filter(lambda x: x.id == BC.node, study.river._nodes)).name
+                node = next(filter(
+                    lambda x: x.id == BC.node, study.river._nodes
+                ))
+                node_name = f"{node.id:3}".replace(" ", "x")
                 f.write(f"${node_name}\n")
 
                 if BC.type == "Concentration":
@@ -282,39 +379,59 @@ class AdisTSlc(AdisTS):
                     f.write(f"*---------++++++++++\n")
 
                 for BC_data in BC._data:
-                    f.write(f"{timestamp_to_old_pamhyr_date_adists(int(BC_data[0]))} {BC_data[1]}\n")
+                    tmp = timestamp_to_old_pamhyr_date_adists(int(BC_data[0]))
+                    f.write(" ".join((f"{tmp}",
+                            f"{BC_data[1]}\n")))
                 f.write(f"*\n")
 
         return True
 
-    def _export_ICs_AdisTS(self, study, repertory, POL_IC_default, qlog, POL_name):
+    def _export_ICs_AdisTS(self, study, repertory,
+                           POL_IC_default, qlog, POL_name):
 
         if qlog is not None:
             qlog.put("Export POL ICs files")
 
-        with adists_file_open(os.path.join(repertory, f"{POL_name}.INI"), "w+") as f:
+        with adists_file_open(os.path.join(
+            repertory, f"{POL_name}.INI"
+        ), "w+") as f:
             f.write(f"*État initial pour le polluant {POL_name}\n")
-            f.write(f"{POL_IC_default.name} = {POL_IC_default.concentration} {POL_IC_default.eg} "+
-            f"{POL_IC_default.em} {POL_IC_default.ed}\n")
+            f.write(" ".join(("DEFAULT =",
+                              f"{POL_IC_default.concentration}",
+                              f"{POL_IC_default.eg}",
+                              f"{POL_IC_default.em}",
+                              f"{POL_IC_default.ed}\n")))
 
             if len(POL_IC_default._data) != 0:
-                self._export_ICs_AdisTS_Spec(study, POL_IC_default._data, f, qlog)
+                self._export_ICs_AdisTS_Spec(
+                    study, POL_IC_default._data, f, qlog
+                )
 
-    def _export_ICs_AdisTS_Spec(self, study, pol_ics_spec_data, f, qlog, name="0"):
+    def _export_ICs_AdisTS_Spec(self, study, pol_ics_spec_data,
+                                f, qlog, name="0"):
 
         for ic_spec in pol_ics_spec_data:
-            f.write(f"{ic_spec.name} = {ic_spec.reach} {ic_spec.start_kp} {ic_spec.end_kp} " +
-                    f"{ic_spec.concentration} {ic_spec.eg} {ic_spec.em} {ic_spec.ed} {ic_spec.rate}")
+            f.write(" ".join((f"{ic_spec.name}",
+                              "=",
+                              f"{ic_spec.reach}",
+                              f"{ic_spec.start_rk}",
+                              f"{ic_spec.end_rk}",
+                              f"{ic_spec.concentration}",
+                              f"{ic_spec.eg}",
+                              f"{ic_spec.em}",
+                              f"{ic_spec.ed}",
+                              f"{ic_spec.rate}\n")))
 
         return True
 
     def _export_POL_Characteristics(self, study, pol_data, f, qlog, name="0"):
 
-        list_characteristics = ["type", "diametre", "rho", "porosity", "cdc_riv", "cdc_cas", "apd", "ac", "bc"]
+        list_characteristics = ["type", "diametre", "rho", "porosity",
+                                "cdc_riv", "cdc_cas", "apd", "ac", "bc"]
 
         if len(list_characteristics) == (len(pol_data[0])-1):
-            for l in range(len(list_characteristics)):
-                f.write(f"{list_characteristics[l]} = {pol_data[0][l]}\n")
+            for i in range(len(list_characteristics)):
+                f.write(f"{list_characteristics[i]} = {pol_data[0][i]}\n")
 
     def _export_D90(self, study, repertory, qlog=None, name="0"):
 
@@ -323,14 +440,16 @@ class AdisTSlc(AdisTS):
         if qlog is not None:
             qlog.put("Export D90 file")
 
-        with adists_file_open(os.path.join(repertory, f"{name}.D90"), "w+") as f:
+        with adists_file_open(
+            os.path.join(repertory, f"{name}.D90"), "w+"
+        ) as f:
             files.append(f"{name}.D90")
 
             f.write(f"*Diamètres caractéristiques du fond stable\n")
 
             d90AdisTS = study.river.d90_adists.D90_AdisTS_List
 
-            f.write(f"{d90AdisTS[0].name} = {d90AdisTS[0].d90}\n")
+            f.write(f"DEFAULT = {d90AdisTS[0].d90}\n")
 
             self._export_d90_spec(study, d90AdisTS[0]._data, f, qlog)
 
@@ -339,8 +458,11 @@ class AdisTSlc(AdisTS):
     def _export_d90_spec(self, study, d90_spec_data, f, qlog, name="0"):
 
         for d90_spec in d90_spec_data:
-            if (d90_spec.name is None) or (d90_spec.reach is None) or (d90_spec.start_kp is None) or \
-                (d90_spec.end_kp is None) or (d90_spec.d90 is None):
+            if (d90_spec.name is None
+                    or d90_spec.reach is None
+                    or d90_spec.start_rk is None
+                    or d90_spec.end_rk is None
+                    or d90_spec.d90 is None):
                 return
 
             edges = study.river.enable_edges()
@@ -352,7 +474,12 @@ class AdisTSlc(AdisTS):
             if id_reach not in id_edges:
                 return
 
-            f.write(f"{d90_spec.name} = {id_reach} {d90_spec.start_kp} {d90_spec.end_kp} {d90_spec.d90}\n")
+            f.write(" ".join((f"{d90_spec.name}",
+                              "=",
+                              f"{id_reach}",
+                              f"{d90_spec.start_rk}",
+                              f"{d90_spec.end_rk}",
+                              f"{d90_spec.d90}\n")))
 
     def _export_DIF(self, study, repertory, qlog=None, name="0"):
 
@@ -361,7 +488,9 @@ class AdisTSlc(AdisTS):
         if qlog is not None:
             qlog.put("Export DIF file")
 
-        with adists_file_open(os.path.join(repertory, f"{name}.DIF"), "w+") as f:
+        with adists_file_open(
+            os.path.join(repertory, f"{name}.DIF"), "w+"
+        ) as f:
             files.append(f"{name}.DIF")
 
             f.write(f"*Définition des paramètres des fonctions de calcul du\n")
@@ -370,9 +499,15 @@ class AdisTSlc(AdisTS):
             difAdisTS = study.river.dif_adists.DIF_AdisTS_List
 
             if difAdisTS[0].method != "generique":
-                f.write(f"defaut = {difAdisTS[0].method} {difAdisTS[0].dif }\n")
+                f.write(" ".join((f"defaut = ",
+                                  f"{difAdisTS[0].method}",
+                                  f"{difAdisTS[0].dif}\n")))
             else:
-                f.write(f"defaut = {difAdisTS[0].method} {difAdisTS[0].dif} {difAdisTS[0].b} {difAdisTS[0].c}\n")
+                f.write(" ".join((f"defaut ="
+                                  f"{difAdisTS[0].method}",
+                                  f"{difAdisTS[0].dif}",
+                                  f"{difAdisTS[0].b}",
+                                  f"{difAdisTS[0].c}\n")))
 
             self._export_dif_spec(study, difAdisTS[0]._data, f, qlog)
 
@@ -381,8 +516,12 @@ class AdisTSlc(AdisTS):
     def _export_dif_spec(self, study, dif_spec_data, f, qlog, name="0"):
 
         for dif_spec in dif_spec_data:
-            if (dif_spec.reach is None) or (dif_spec.start_kp is None) or \
-                (dif_spec.end_kp is None) or (dif_spec.dif is None) or (dif_spec.b is None) or (dif_spec.c is None):
+            if (dif_spec.reach is None
+                    or dif_spec.start_rk is None
+                    or dif_spec.end_rk is None
+                    or dif_spec.dif is None
+                    or dif_spec.b is None
+                    or dif_spec.c is None):
                 return
 
             edges = study.river.enable_edges()
@@ -395,28 +534,40 @@ class AdisTSlc(AdisTS):
                 return
 
             if dif_spec.method != "generique":
-                f.write(f"{dif_spec.method} = {id_reach} {dif_spec.start_kp} {dif_spec.end_kp} {dif_spec.dif}\n")
+                f.write(" ".join((f"{dif_spec.method}",
+                                  "=",
+                                  f"{id_reach}",
+                                  f"{dif_spec.start_rk}",
+                                  f"{dif_spec.end_rk}",
+                                  f"{dif_spec.dif}\n")))
             else:
-                f.write(f"{dif_spec.method} = {id_reach} {dif_spec.start_kp} {dif_spec.end_kp} {dif_spec.dif}" +
-                f"{dif_spec.b} {dif_spec.c}\n")
+                f.write(" ".join((f"{dif_spec.method}",
+                                  f"=" f"{id_reach}",
+                                  f"{dif_spec.start_rk}",
+                                  f"{dif_spec.end_rk}",
+                                  f"{dif_spec.dif}",
+                                  f"{dif_spec.b}",
+                                  f"{dif_spec.c}\n")))
 
     def _export_NUM(self, study, repertory, qlog=None, name="0"):
 
-        dict_names = {"init_time":"start_date",
-                      "final_time":"end_date",
-                      "timestep":"dt0",
-                      "implicitation_parameter":"theta",
-                      "timestep_screen":"dtscr",
-                      "timestep_bin":"dtbin",
-                      "timestep_csv":"dtcsv",
-                      "timestep_mage":"dtMage",
-                      "initial_concentration":"c_initiale"}
+        dict_names = {"init_time": "start_date",
+                      "final_time": "end_date",
+                      "timestep": "dt0",
+                      "implicitation_parameter": "theta",
+                      "timestep_screen": "dtscr",
+                      "timestep_bin": "dtbin",
+                      "timestep_csv": "dtcsv",
+                      "timestep_mage": "dtMage",
+                      "initial_concentration": "c_initiale"}
         files = []
 
         if qlog is not None:
             qlog.put("Export NUM file")
 
-        with adists_file_open(os.path.join(repertory, f"{name}.NUM"), "w+") as f:
+        with adists_file_open(
+            os.path.join(repertory, f"{name}.NUM"), "w+"
+        ) as f:
             files.append(f"{name}.NUM")
 
             params = study.river.get_params(self.type).parameters
@@ -433,29 +584,264 @@ class AdisTSlc(AdisTS):
                 if name != "command_line_arguments":
                     f.write(f"{dict_names[name]} = {value}\n")
 
-            outputkps = study.river.Output_kp_adists.OutputKp_List
+            outputrks = study.river.Output_rk_adists.OutputRK_List
 
-            for outputkp in outputkps:
-                self._export_outputkp(study, outputkp, f, qlog)
+            for outputrk in outputrks:
+                self._export_outputrk(study, outputrk, f, qlog)
 
         return files
 
-    def _export_outputkp(self, study, outputkp, f, qlog, name="0"):
-        if (outputkp.reach is None) or (outputkp.kp is None) or (outputkp.title is None):
+    def _export_outputrk(self, study, outputrk, f, qlog, name="0"):
+        if (outputrk.reach is None
+                or outputrk.rk is None
+                or outputrk.title is None):
             return
 
         edges = study.river.enable_edges()
 
         id_edges = list(map(lambda x: x.id, edges))
 
-        id_reach = outputkp.reach
-        kp = outputkp.kp
-        title = outputkp.title
+        id_reach = outputrk.reach
+        rk = outputrk.rk
+        title = outputrk.title
 
         if id_reach not in id_edges:
             return
 
-        f.write(f"output = {id_reach} {kp} {title}\n")
+        f.write(f"output = {id_reach} {rk} {title}\n")
+
+    @timer
+    def read_bin(self, study, repertory, results, qlog=None, name="0"):
+        repertory_results = os.path.join(repertory, "resultats")
+
+        files_bin_names = [el.split("/")[-1]
+                           for el in glob.glob(repertory_results+"/*.bin")]
+        print("files names resultats: ", files_bin_names)
+
+        ifilename = os.path.join(repertory_results, files_bin_names[0])
+
+        logger.info(f"read_bin: Start reading '{ifilename}' ...")
+
+        print("reading ", ifilename)
+        with open(ifilename, 'rb') as f:
+            # header
+            # first line
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+            data = np.fromfile(f, dtype=np.int32, count=3)
+            ibmax = data[0]  # number of reaches
+            ismax = data[1]  # total number of cross sections
+            kbl = data[2] * -1  # block size for .BIN header
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+            # second line
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+            ibu = np.fromfile(f, dtype=np.int32, count=ibmax)
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+            # third line
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+            data = np.fromfile(f, dtype=np.int32, count=2 * ibmax)
+            is1 = np.zeros(ibmax, dtype=np.int32)
+            is2 = np.zeros(ibmax, dtype=np.int32)
+            print("nombre de biefs : ", ibmax)
+
+            logger.debug(f"read_bin: nb_reach = {ibmax}")
+            logger.debug(f"read_bin: nb_profile = {ismax}")
+
+            results.set("nb_reach", f"{ibmax}")
+            results.set("nb_profile", f"{ismax}")
+
+            reachs = []
+            iprofiles = {}
+            reach_offset = {}
+
+            for i in range(ibmax):
+                # Add results reach to reach list
+                r = results.river.add(i)
+                reachs.append(r)
+
+                is1[i] = data[2 * i] - 1  # first section of reach i
+                is2[i] = data[2 * i + 1] - 1  # last section of reach i
+
+                key = (is1[i], is2[i])
+                iprofiles[key] = r
+
+                reach_offset[r] = is1[i]
+
+            logger.debug(f"read_bin: iprofiles = {iprofiles}")
+
+            data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+            # fourth line
+            pk = np.zeros(ismax, dtype=np.float32)
+            for k in range(0, ismax, kbl):
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                pk[k:min(k + kbl, ismax)] = np.fromfile(f,
+                                                        dtype=np.float32,
+                                                        count=min(
+                                                            k + kbl, ismax
+                                                        ) - k)
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+
+                # fifth line (useless)
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # sixth line
+                zf = np.zeros(ismax, dtype=np.float32)
+                z = np.zeros(ismax * 3, dtype=np.float32)
+                for k in range(0, ismax, kbl):
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                    z[3 * k:3 * min(k + kbl, ismax)] = \
+                        np.fromfile(f,
+                                    dtype=np.float32,
+                                    count=3 * (min(k + kbl, ismax) - k)
+                                    )
+                    # z[i*3+1] and z[i*3+2] are useless
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                zf = [z[i * 3] for i in range(ismax)]
+                # seventh line (useless)
+                for k in range(0, ismax, kbl):
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # end header
+
+        def ip_to_r(i):
+            return iprofiles[
+                next(
+                    filter(
+                        lambda k: k[0] <= i <= k[1],
+                        iprofiles
+                    )
+                )
+            ]
+
+        def ip_to_ri(r, i): return i - reach_offset[r]
+
+        path_files = map(lambda file: os.path.join(
+            repertory_results, file), files_bin_names)
+
+        data_tmp = {}
+
+        for file_bin in path_files:
+            key_pol = file_bin.split("/")[-1][0:-4]
+            data_tmp[key_pol] = {}
+            with open(file_bin, 'rb') as f:
+                # header
+                # first line
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                data = np.fromfile(f, dtype=np.int32, count=3)
+                ibmax = data[0]  # number of reaches
+                ismax = data[1]  # total number of cross sections
+                kbl = data[2] * -1  # block size for .BIN header
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # second line
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                ibu = np.fromfile(f, dtype=np.int32, count=ibmax)
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # third line
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                data = np.fromfile(f, dtype=np.int32, count=2 * ibmax)
+                is1 = np.zeros(ibmax, dtype=np.int32)
+                is2 = np.zeros(ibmax, dtype=np.int32)
+                for i in range(ibmax):
+                    # first section of reach i (FORTRAN numbering)
+                    is1[i] = data[2 * i]
+                    # last section of reach i (FORTRAN numbering)
+                    is2[i] = data[2 * i + 1]
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # fourth line
+                pk = np.zeros(ismax, dtype=np.float32)
+                for k in range(0, ismax, kbl):
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                    pk[k:min(k + kbl, ismax)] = np.fromfile(
+                        f, dtype=np.float32, count=min(k + kbl, ismax) - k
+                        )
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # fifth line (useless)
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                zmin_OLD = np.fromfile(f, dtype=np.float32, count=1)[0]
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # sixth line
+                zf = np.zeros(ismax, dtype=np.float32)
+                z = np.zeros(ismax * 3, dtype=np.float32)
+                for k in range(0, ismax, kbl):
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                    z[3 * k:3 * min(k + kbl, ismax)] = np.fromfile(
+                        f, dtype=np.float32,
+                        count=3 * (min(k + kbl, ismax) - k)
+                        )
+                    # z[i*3+1] and z[i*3+2] are useless
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                zf = [z[i * 3] for i in range(ismax)]
+                # seventh line (useless)
+                for k in range(0, ismax, kbl):
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                    zero = np.fromfile(f, dtype=np.int32, count=ismax)
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                # end header
+                # data
+                data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                while data.size > 0:
+                    ismax = np.fromfile(f, dtype=np.int32, count=1)[0]
+                    t = np.fromfile(f, dtype=np.float64, count=1)[0]
+                    if t not in data_tmp[key_pol]:
+                        data_tmp[key_pol][t] = {}
+                    c = np.fromfile(f, dtype=np.byte, count=1)
+                    # possible values :
+                    # sediment : C, G, M, D, L, N, R
+                    # polutant : C
+                    phys_var = bytearray(c).decode()
+                    data_tmp[key_pol][t][phys_var] = {}
+                    real_data = np.fromfile(f, dtype=np.float32, count=ismax)
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (end)
+                    data_tmp[key_pol][t][phys_var] = real_data
+                    data = np.fromfile(f, dtype=np.int32, count=1)  # (start)
+                # end data
+
+        pollutants_keys = list(data_tmp.keys())
+        timestamps_keys = list(data_tmp[pollutants_keys[0]].keys())
+        phys_data_names = list(data_tmp[pollutants_keys[0]]
+                               [timestamps_keys[0]].keys())
+        type_pol_index = len(phys_data_names)
+
+        # ##print("pol keys: ", pollutants_keys)
+        # ##print("t keys: ", timestamps_keys)
+        # ##print("phys var: ", phys_data_names)
+        # ##print("phys data names mass zero:",
+        #          list(data_tmp[pollutants_keys[1]][timestamps_keys[0]].keys()))
+        # print("set timestamps keys: ", set(timestamps_keys))
+        # print("isma")
+        # ##print("iprofiles: ", iprofiles)
+
+        for r, reach in enumerate(reachs):
+            for i in range(is1[r]-1, is2[r]):
+                p_i = ip_to_ri(reach, i)
+
+                for t_data in timestamps_keys:
+                    pol_view = []
+                    for pol in pollutants_keys:
+                        pol_view.append(tuple(list(map(
+                            lambda data_el: data_el[i],
+                            list(data_tmp[pol][t_data].values())
+                            ))))
+
+                    reach.set(p_i, t_data, "pols", pol_view)
+
+        results.set("timestamps", set(timestamps_keys))
+
+    @timer
+    def results(self, study, repertory, qlog=None, name=None):
+        self._study = study
+        if name is None:
+            name = study.name.replace(" ", "_")
+
+        print("adist ts results repertory: ", repertory)
+
+        results = super(AdisTSwc, self).results(study,
+                                                repertory,
+                                                qlog,
+                                                name=name)
+
+        return results
 
     def export_func_dict(self):
         return [
@@ -466,8 +852,8 @@ class AdisTSlc(AdisTS):
         ]
 
     @timer
-    def export(self, study, repertory, qlog=None, name="0"):
-        print("cmd solver adistslc : ", self._cmd_solver)
+    def export(self, study, repertory, mage_rep, qlog=None, name="0"):
+        print("cmd solver adistswc : ", self._cmd_solver)
         self._study = study
         name = study.name.replace(" ", "_")
 
@@ -479,16 +865,11 @@ class AdisTSlc(AdisTS):
                 files = files + func(study, repertory, qlog, name=name)
 
             self.export_additional_files(study, repertory, qlog, name=name)
-            self._export_REP(study, repertory, files, qlog, name=name)
+            self._export_REP(study, repertory, mage_rep,
+                             files, qlog, name=name)
 
             return True
         except Exception as e:
             logger.error(f"Failed to export study to {self._type}")
             logger_exception(e)
             return False
-
-
-
-
-
-

src/Solver/CommandLine.py

@@ -99,7 +99,10 @@ class CommandLineSolver(AbstractSolver):
         params = study.river.get_params(self.type)
         args = params.get_by_key("all_command_line_arguments")
 
-        return args.split(" ")
+        if args is None:
+            return []
+        else:
+            return args.split(" ")
 
     def input_param(self):
         """Return input command line parameter(s)
@@ -196,17 +199,11 @@ class CommandLineSolver(AbstractSolver):
             The executable and list of arguments
         """
         cmd = cmd.replace("@install_dir", self._install_dir())
-        print("format command installDir :", self._install_dir())
         cmd = cmd.replace("@path", "\"" + path + "\"")
-        print("format command path :", path)
         cmd = cmd.replace("@input", self.input_param().replace(" ", "_"))
-        print("format command input :", self.input_param().replace(" ", "_"))
         cmd = cmd.replace("@output", self.output_param())
-        print("format command output :", self.output_param())
         cmd = cmd.replace("@dir", self._process.workingDirectory())
-        print("format command dir :", self._process.workingDirectory())
         cmd = cmd.replace("@args", " ".join(self.cmd_args(study)))
-        print("format command args :", " ".join(self.cmd_args(study)))
 
         logger.debug(f"! {cmd}")
 
@@ -243,11 +240,7 @@ class CommandLineSolver(AbstractSolver):
             return True
 
         cmd = self._cmd_solver
-        print("run solver commandline cmd : ", cmd)
-        print("path solver : ", self._path_solver)
         exe, args = self._format_command(study, cmd, self._path_solver)
-        print("parsed cmd solver exe : ", exe)
-        print("parsed cmd solver args : ", args)
 
         if not os.path.exists(exe):
             error = f"[ERROR] Path {exe} do not exists"
@@ -318,11 +311,6 @@ class CommandLineSolver(AbstractSolver):
             self._output.put(res)
 
     def run(self, study, process=None, output_queue=None):
-        print("Run debug")
-        print("---------")
-        print("cmd input : ", self._cmd_input)
-        print("cmd solver : ", self._cmd_solver)
-        print("cmd output : ", self._cmd_output)
         self._study = study
 
         # Replace old values if needed

src/Solver/Mage.py

@@ -69,7 +69,7 @@ class Mage(CommandLineSolver):
         lst += [
             ("mage_min_timestep", "1.0"),
             ("mage_timestep_tra", "3600"),
-            ("mage_timestep_bin", "0"),
+            ("mage_timestep_bin", "3600"),
             # ("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", "10"),
+            ("mage_max_niter", "99"),
             ("mage_timestep_reduction_factor", "2"),
             ("mage_precision_reduction_factor_Z", "1"),
             ("mage_precision_reduction_factor_Q", "1"),
-            ("mage_niter_max_precision", "99"),
+            ("mage_niter_max_precision", "10"),
             ("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}"
-        kp = f"{profile.kp:>12f}"[0:12]
+        rk = f"{profile.rk:>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} {kp} {pname} {sediment}\n")
+        wfile.write(f"{num}{c1}{c2}{t} {rk} {pname} {sediment}\n")
 
     def _export_ST_point_line(self, wfile, files, point):
         x = f"{point.x:<12.4f}"[0:12]
@@ -264,7 +264,7 @@ class Mage(CommandLineSolver):
                     if t in ["HYD", "QSO", "LIM"]:
                         v0 /= 60  # Convert first column to minute
 
-                    f.write(f"{v0:10}{v1:10}\n")
+                    f.write(f"{v0:9} {v1:9} \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_kp:>10.4f} {lateral.end_kp:>10.4f}\n"
+            f"{lateral.begin_rk:>10.4f} {lateral.end_rk:>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}"
-                    bkp = f"{friction.begin_kp:>10.3f}"
-                    ekp = f"{friction.end_kp:>10.3f}"
+                    brk = f"{friction.begin_rk:>10.3f}"
+                    erk = f"{friction.end_rk:>10.3f}"
 
-                    # if friction.begin_kp != friction.end_kp:
+                    # if friction.begin_rk != friction.end_rk:
                     #     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}      {bkp}{ekp}{coef_1}{coef_2}\n")
+                    f.write(f"K{num}      {brk}{erk}{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         kp\n")
+            f.write(f"* IB IS    discharge  elevation         rk\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}"
-                    kp = f"{d['kp']:>9.2f}"
+                    rk = f"{d['rk']:>9.2f}"
 
-                    f.write(f"{IR} {IS} {discharge} {elevation} {kp}\n")
+                    f.write(f"{IR} {IS} {discharge} {elevation} {rk}\n")
                     id_sec += 1
 
                 id += 1
@@ -495,12 +495,12 @@ class Mage(CommandLineSolver):
                 if not hs.enabled:
                     continue
 
-                if hs.input_kp is None:
+                if hs.input_rk is None:
                     continue
 
                 f.write(
                     '* ouvrage au pk ' +
-                    f"{float(hs.input_kp):>12.1f}" + ' ' +
+                    f"{float(hs.input_rk):>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_kp):>12.3f} " +
+                    f"{reach_id} {float(hs.input_rk):>12.3f} " +
                     f"{param_str} {name}\n"
                 )
 
@@ -599,29 +599,50 @@ class Mage(CommandLineSolver):
         if qlog is not None:
             qlog.put("Export VAR file")
 
-        with mage_file_open(os.path.join(repertory, f"{name}.VAR"), "w+") as f:
-            files.append(f"{name}.VAR")
+        nb_cv = 0
+        for hs in hydraulic_structures:
+            if hs.input_reach is None:
+                continue
 
-            for hs in hydraulic_structures:
-                if hs.input_reach is None:
-                    continue
+            if not hs.input_reach.is_enable():
+                continue
 
-                if not hs.input_reach.is_enable():
-                    continue
+            if not hs.enabled:
+                continue
 
-                for bhs in hs.basic_structures:
+            for bhs in hs.basic_structures:
+                if bhs.enabled:
                     logger.info(bhs._type)
-                    if bhs._type != "CV":
+                    if bhs._type == "CV":
+                        nb_cv += 1
+
+        if nb_cv != 0:
+            with mage_file_open(os.path.join(
+                                repertory, f"{name}.VAR"), "w+") as f:
+                files.append(f"{name}.VAR")
+
+                for hs in hydraulic_structures:
+                    if hs.input_reach is None:
                         continue
 
-                    name = bhs.name
-                    if name == "":
-                        name = f"HS_{bhs.id:>3}".replace(" ", "0")
+                    if not hs.input_reach.is_enable():
+                        continue
 
-                    f.write(
-                        f"${name} clapet"
-                    )
+                    if not hs.enabled:
+                        continue
 
+                    for bhs in hs.basic_structures:
+                        logger.info(bhs._type)
+                        if bhs._type != "CV":
+                            continue
+
+                        name = bhs.name
+                        if name == "":
+                            name = f"HS_{bhs.id:>3}".replace(" ", "0")
+
+                        f.write(
+                            f"${name} clapet"
+                        )
         return files
 
     def _export_DEV(self, study, repertory, qlog, name="0"):
@@ -980,6 +1001,7 @@ class Mage8(Mage):
 
                 # Add profile id correspondance to reach
                 key = (i1, i2)
+                print("mage keys reachs: ", key)
                 iprofiles[key] = r
 
                 # Profile ID offset
@@ -1012,6 +1034,8 @@ class Mage8(Mage):
             ]
             def ip_to_ri(r, i): return i - reach_offset[r]
 
+            print("mage iprofiles: ", iprofiles)
+
             ts = set()
             end = False
             while not end:
@@ -1047,6 +1071,7 @@ class Mage8(Mage):
 
             logger.debug(reachs[0].profiles[0]._data)
             results.set("timestamps", ts)
+            print("set timestamps mage: ", ts)
             logger.info(f"read_bin: ... end with {len(ts)} timestamp read")
 
     @timer

src/Solver/RubarBE.py

@@ -30,13 +30,13 @@ from Model.Results.River.River import River, Reach, Profile
 logger = logging.getLogger()
 
 
-class RubarBE(CommandLineSolver):
-    _type = "rubarbe"
+class Rubar3(CommandLineSolver):
+    _type = "rubar3"
 
     def __init__(self, name):
-        super(RubarBE, self).__init__(name)
+        super(Rubar3, self).__init__(name)
 
-        self._type = "rubarbe"
+        self._type = "rubar3"
 
         self._cmd_input = ""
         self._cmd_solver = "@path @input -o @output"
@@ -44,9 +44,9 @@ class RubarBE(CommandLineSolver):
 
     @classmethod
     def default_parameters(cls):
-        lst = super(RubarBE, cls).default_parameters()
+        # lst = super(Rubar3, cls).default_parameters()
 
-        lst += [
+        lst = [
             ("rubarbe_cfl", "0.50000E+00"),
             ("rubarbe_condam", "1"),
             ("rubarbe_condav", "3"),
@@ -60,10 +60,10 @@ class RubarBE(CommandLineSolver):
             ("rubarbe_tinit", "000:00:00:00"),
             ("rubarbe_tmax", "999:99:99:00"),
             ("rubarbe_tiopdt", "000:00:00:00"),
-            ("rubarbe_dt", "3000.0"),
+            ("rubarbe_dt", "5.0"),
             ("rubarbe_ts", "999:99:99:00"),
-            ("rubarbe_dtsauv", "999:99:99:00"),
-            ("rubarbe_psave", "999:99:99:00"),
+            ("rubarbe_dtsauv", "00:00:00:05"),
+            ("rubarbe_psave", "00:00:00:05"),
             ("rubarbe_fdeb1", "1"),
             ("rubarbe_fdeb2", "10"),
             ("rubarbe_fdeb3", "100"),
@@ -119,21 +119,21 @@ class RubarBE(CommandLineSolver):
     ##########
 
     def cmd_args(self, study):
-        lst = super(RubarBE, self).cmd_args(study)
+        lst = super(Rubar3, self).cmd_args(study)
 
         return lst
 
     def input_param(self):
         name = self._study.name
-        return f"{name}.REP"
+        return f"{name}"
 
     def output_param(self):
         name = self._study.name
-        return f"{name}.BIN"
+        return f"{name}"
 
     def log_file(self):
         name = self._study.name
-        return f"{name}.TRA"
+        return f"{name}"
 
     def export(self, study, repertory, qlog=None):
         self._study = study
@@ -143,8 +143,12 @@ class RubarBE(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_tps(study, repertory, qlog, name=name)
+        self._export_condin(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:
@@ -168,6 +172,9 @@ class RubarBE(CommandLineSolver):
                 name = param.name
                 value = param.value
 
+                if "all_" in name:
+                    continue
+
                 if value != "":
                     # Value format
                     if value.count(':') == 3:
@@ -265,10 +272,10 @@ class RubarBE(CommandLineSolver):
 
                 ind = 1
                 for profile in reach.profiles:
-                    kp = profile.kp
+                    rk = profile.rk
                     n_points = len(profile)
 
-                    f.write(f"{ind:>4} {kp:>11.3f} {n_points:>4}\n")
+                    f.write(f"{ind:>4} {rk:>11.3f} {n_points:>4}\n")
 
                     for point in profile.points:
                         label = point.name.lower()
@@ -276,7 +283,9 @@ class RubarBE(CommandLineSolver):
                             if label[0] == "r":
                                 label = label[1].upper()
                             else:
-                                label = lable[0]
+                                label = label[1].upper()
+                        else:
+                            label = " "
 
                         y = point.y
                         z = point.z
@@ -307,8 +316,8 @@ class RubarBE(CommandLineSolver):
                 lm = len(reach) + 1
                 f.write(f"{lm:>13}\n")
 
-                for mails in [reach.inter_profiles_kp(),
-                              reach.get_kp()]:
+                for mails in [reach.inter_profiles_rk(),
+                              reach.get_rk()]:
                     ind = 0
                     for mail in mails:
                         f.write(f"{mail:15.3f}")
@@ -338,7 +347,7 @@ class RubarBE(CommandLineSolver):
                 lm = len(reach) + 1
                 f.write(f"{lm:>6}\n")
 
-                def get_stricklers_from_kp(kp):
+                def get_stricklers_from_rk(rk):
                     return next(
                         map(
                             lambda s: (
@@ -346,28 +355,28 @@ class RubarBE(CommandLineSolver):
                                 else s.begin_strickler.minor
                             ),
                             filter(
-                                lambda f: kp in f,
+                                lambda f: rk in f,
                                 edge.frictions.lst
                             )
                         )
                     )
 
                 ind = 1
-                for mail in edge.reach.inter_profiles_kp():
-                    coef = get_stricklers_from_kp(mail)
+                for mail in edge.reach.inter_profiles_rk():
+                    coef = get_stricklers_from_rk(mail)
 
                     f.write(f"{ind:>6} {coef:>12.5f}")
 
                     ind += 1
                     f.write("\n")
 
-    def _export_tps(self, study, repertory, qlog, name="0"):
+    def _export_condin(self, study, repertory, qlog, name="0"):
         if qlog is not None:
-            qlog.put("Export TPS file")
+            qlog.put("Export CONDIN file")
 
         with open(
                 os.path.join(
-                    repertory, f"tps.{name}"
+                    repertory, f"condin.{name}"
                 ), "w+"
         ) as f:
             for edge in study.river.enable_edges():
@@ -376,23 +385,23 @@ class RubarBE(CommandLineSolver):
                 f.write(f"0.0\n")
 
                 ics = study.river.initial_conditions.get(edge)
-                data = self._export_tps_init_data(ics)
+                data = self._export_condin_init_data(ics)
 
                 profiles = reach.profiles
                 first = profiles[0]
                 last = profiles[-1]
 
-                if first.kp not in data or last.kp not in data:
+                if first.rk not in data or last.rk not in data:
                     logger.error(
                         "Study initial condition is not fully defined"
                     )
                     return
 
-                f_h_s = self._export_tps_profile_height_speed(first, data)
-                l_h_s = self._export_tps_profile_height_speed(last, data)
+                f_h_s = self._export_condin_profile_height_speed(first, data)
+                l_h_s = self._export_condin_profile_height_speed(last, data)
 
                 # First mail
-                f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}")
+                f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}\n")
 
                 ind = 2
                 it = iter(profiles)
@@ -400,11 +409,11 @@ class RubarBE(CommandLineSolver):
 
                 prev_h, prev_s = f_h_s
                 for profile in it:
-                    if profile.kp not in data:
+                    if profile.rk not in data:
                         ind += 1
                         continue
 
-                    cur_h, cur_s = self._export_tps_profile_height_speed(
+                    cur_h, cur_s = self._export_condin_profile_height_speed(
                         profile, data
                     )
 
@@ -418,24 +427,83 @@ class RubarBE(CommandLineSolver):
                     ind += 1
 
                 # Last mail
-                f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}")
+                f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}\n")
 
-    def _export_tps_init_data(self, ics):
+    def _export_condin_init_data(self, ics):
         data = {}
 
         for d in ics.data:
-            data[d['kp']] = (
+            data[d['rk']] = (
                 d['elevation'],
                 d['discharge'],
             )
 
         return data
 
-    def _export_tps_profile_height_speed(self, profile, data):
-        z = data[profile.kp][0]
-        q = data[profile.kp][1]
+    def _export_condin_profile_height_speed(self, profile, data):
+        z = data[profile.rk][0]
+        q = data[profile.rk][1]
 
-        height = z - profile.z_min()
+        # height = z - profile.z_min()
         speed = profile.speed(q, z)
 
-        return height, speed
+        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 = ""

src/Solver/Solvers.py

@@ -22,8 +22,8 @@ from Solver.GenericSolver import GenericSolver
 from Solver.Mage import (
     Mage7, Mage8, MageFake7,
 )
-from Solver.RubarBE import RubarBE
-from Solver.AdisTS import AdisTSlc
+from Solver.AdisTS import AdisTSwc
+from Solver.RubarBE import Rubar3, RubarBE
 
 _translate = QCoreApplication.translate
 
@@ -32,8 +32,9 @@ solver_long_name = {
     # "mage7": "Mage v7",
     "mage8": "Mage v8",
     # "mage_fake7": "Mage fake v7",
-    "adistslc": "Adis-TS_LC",
+    "adistswc": "Adis-TS_WC",
     # "rubarbe": "RubarBE",
+    # "rubar3": "Rubar3",
 }
 
 solver_type_list = {
@@ -41,6 +42,7 @@ solver_type_list = {
     # "mage7": Mage7,
     "mage8": Mage8,
     # "mage_fake7": MageFake7,
-    "adistslc": AdisTSlc,
+    "adistswc": AdisTSwc,
     # "rubarbe": RubarBE,
+    # "rubar3": Rubar3,
 }

src/View/About/Window.py

@@ -55,6 +55,7 @@ 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
@@ -67,5 +68,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)

src/View/BoundaryCondition/Edit/GenerateDialog.py

@@ -0,0 +1,68 @@
+# 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)

src/View/BoundaryCondition/Edit/Table.py

@@ -48,6 +48,7 @@ from Model.BoundaryCondition.BoundaryConditionTypes import (
 from View.BoundaryCondition.Edit.UndoCommand import (
     SetDataCommand, AddCommand, DelCommand,
     SortCommand, MoveCommand, PasteCommand,
+    ReplaceDataCommand,
 )
 
 _translate = QCoreApplication.translate
@@ -200,3 +201,13 @@ class TableModel(PamhyrTableModel):
     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()

src/View/BoundaryCondition/Edit/UndoCommand.py

@@ -181,3 +181,30 @@ 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])

src/View/BoundaryCondition/Edit/Window.py

@@ -20,6 +20,8 @@ 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
@@ -48,6 +50,7 @@ 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
 
@@ -104,6 +107,7 @@ 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:
@@ -129,6 +133,7 @@ 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"
@@ -193,6 +198,23 @@ 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)
@@ -201,6 +223,13 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             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(
@@ -311,3 +340,87 @@ 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)