Results: Add results model, view scheme and mage results reading.

2026-10-30 03:20:41 +01:00 · 2023-08-08 14:12:08 +02:00
567 changed files with 10279 additions and 47995 deletions
@@ -1,12 +0,0 @@
-# Pamhyr .editorconfig
-
-root = true
-
-[*.py]
-charset = utf-8
-indent_style = space
-indent_size = 4
-tab_width = 8
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
@@ -1,7 +1,6 @@
 ### CUSTOM ###

 *.exe
-*.msi
 *.tar.xz
 *.zip
 *.spec
@@ -10,35 +9,15 @@

 tmp

-*.tar
 *.tar.*
-*.tgz
 *.zip

-*.html
-*.pdf
-*.odt
-
-!doc/**/*.pdf
-
-doc/dev/images/auto_*
-doc/dev/documentation.*
-!doc/dev/*.org
-
-doc/dev/images/auto_*
-doc/users/documentation.*
-!doc/users/*.org
-
-TAGS
-
 pamhyrBuild
 wine-pamhyr-build*

 _PAMHYR_
 __old__

-*-venv
-
 ### END CUSTOM ###

 # Created by https://www.toptal.com/developers/gitignore/api/python
@@ -330,318 +309,3 @@ compile_commands.json
 *_qmlcache.qrc

 # End of https://www.toptal.com/developers/gitignore/api/qt
-
-# Created by https://www.toptal.com/developers/gitignore/api/latex
-# Edit at https://www.toptal.com/developers/gitignore?templates=latex
-
-### LaTeX ###
-## Core latex/pdflatex auxiliary files:
-*.aux
-*.lof
-*.log
-*.lot
-*.fls
-*.out
-*.toc
-*.fmt
-*.fot
-*.cb
-*.cb2
-.*.lb
-
-## Intermediate documents:
-*.dvi
-*.xdv
-*-converted-to.*
-# these rules might exclude image files for figures etc.
-# *.ps
-# *.eps
-# *.pdf
-
-## Generated if empty string is given at "Please type another file name for output:"
-.pdf
-
-## Bibliography auxiliary files (bibtex/biblatex/biber):
-*.bbl
-*.bcf
-*.blg
-*-blx.aux
-*-blx.bib
-*.run.xml
-
-## Build tool auxiliary files:
-*.fdb_latexmk
-*.synctex
-*.synctex(busy)
-*.synctex.gz
-*.synctex.gz(busy)
-*.pdfsync
-
-## Build tool directories for auxiliary files
-# latexrun
-latex.out/
-
-## Auxiliary and intermediate files from other packages:
-# algorithms
-*.alg
-*.loa
-
-# achemso
-acs-*.bib
-
-# amsthm
-*.thm
-
-# beamer
-*.nav
-*.pre
-*.snm
-*.vrb
-
-# changes
-*.soc
-
-# comment
-*.cut
-
-# cprotect
-*.cpt
-
-# elsarticle (documentclass of Elsevier journals)
-*.spl
-
-# endnotes
-*.ent
-
-# fixme
-*.lox
-
-# feynmf/feynmp
-*.mf
-*.mp
-*.t[1-9]
-*.t[1-9][0-9]
-*.tfm
-
-#(r)(e)ledmac/(r)(e)ledpar
-*.end
-*.?end
-*.[1-9]
-*.[1-9][0-9]
-*.[1-9][0-9][0-9]
-*.[1-9]R
-*.[1-9][0-9]R
-*.[1-9][0-9][0-9]R
-*.eledsec[1-9]
-*.eledsec[1-9]R
-*.eledsec[1-9][0-9]
-*.eledsec[1-9][0-9]R
-*.eledsec[1-9][0-9][0-9]
-*.eledsec[1-9][0-9][0-9]R
-
-# glossaries
-*.acn
-*.acr
-*.glg
-*.glo
-*.gls
-*.glsdefs
-*.lzo
-*.lzs
-*.slg
-*.slo
-*.sls
-
-# uncomment this for glossaries-extra (will ignore makeindex's style files!)
-# *.ist
-
-# gnuplot
-*.gnuplot
-*.table
-
-# gnuplottex
-*-gnuplottex-*
-
-# gregoriotex
-*.gaux
-*.glog
-*.gtex
-
-# htlatex
-*.4ct
-*.4tc
-*.idv
-*.lg
-*.trc
-*.xref
-
-# hyperref
-*.brf
-
-# knitr
-*-concordance.tex
-# TODO Uncomment the next line if you use knitr and want to ignore its generated tikz files
-# *.tikz
-*-tikzDictionary
-
-# listings
-*.lol
-
-# luatexja-ruby
-*.ltjruby
-
-# makeidx
-*.idx
-*.ilg
-*.ind
-
-# minitoc
-*.maf
-*.mlf
-*.mlt
-*.mtc[0-9]*
-*.slf[0-9]*
-*.slt[0-9]*
-*.stc[0-9]*
-
-# minted
-_minted*
-*.pyg
-
-# morewrites
-*.mw
-
-# newpax
-*.newpax
-
-# nomencl
-*.nlg
-*.nlo
-*.nls
-
-# pax
-*.pax
-
-# pdfpcnotes
-*.pdfpc
-
-# sagetex
-*.sagetex.sage
-*.sagetex.py
-*.sagetex.scmd
-
-# scrwfile
-*.wrt
-
-# svg
-svg-inkscape/
-
-# sympy
-*.sout
-*.sympy
-sympy-plots-for-*.tex/
-
-# pdfcomment
-*.upa
-*.upb
-
-# pythontex
-*.pytxcode
-pythontex-files-*/
-
-# tcolorbox
-*.listing
-
-# thmtools
-*.loe
-
-# TikZ & PGF
-*.dpth
-*.md5
-*.auxlock
-
-# titletoc
-*.ptc
-
-# todonotes
-*.tdo
-
-# vhistory
-*.hst
-*.ver
-
-# easy-todo
-*.lod
-
-# xcolor
-*.xcp
-
-# xmpincl
-*.xmpi
-
-# xindy
-*.xdy
-
-# xypic precompiled matrices and outlines
-*.xyc
-*.xyd
-
-# endfloat
-*.ttt
-*.fff
-
-# Latexian
-TSWLatexianTemp*
-
-## Editors:
-# WinEdt
-*.bak
-*.sav
-
-# Texpad
-.texpadtmp
-
-# LyX
-*.lyx~
-
-# Kile
-*.backup
-
-# gummi
-.*.swp
-
-# KBibTeX
-*~[0-9]*
-
-# TeXnicCenter
-*.tps
-
-# auto folder when using emacs and auctex
-./auto/*
-*.el
-
-# expex forward references with \gathertags
-*-tags.tex
-
-# standalone packages
-*.sta
-
-# Makeindex log files
-*.lpz
-
-# xwatermark package
-*.xwm
-
-# REVTeX puts footnotes in the bibliography by default, unless the nofootinbib
-# option is specified. Footnotes are the stored in a file with suffix Notes.bib.
-# Uncomment the next line to have this generated file ignored.
-#*Notes.bib
-
-### LaTeX Patch ###
-# LIPIcs / OASIcs
-*.vtc
-
-# glossaries
-*.glstex
-
-# End of https://www.toptal.com/developers/gitignore/api/latex
@@ -1,5 +1,5 @@
 # .gitlab-ci.yml -- Pamhyr gitlab-ci
-# Copyright (C) 2023-2024  INRAE
+# 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
@@ -15,80 +15,97 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.

 stages:
-  - downloads
-  - configure
-  - test
  - build
+  - test
  - package
-  - hash
-  - antivirus
  - release

-#############
-# DOWNLOADS #
-#############
+#########
+# BUILD #
+#########

-variables:
-  MAGE_8_VERSION: "v8.3.6"
-
-dl-mage8-doc:
-  stage: downloads
+build-mage-linux:
+  stage: build
  tags:
    - linux
  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
  script:
-    - mkdir -p doc
-    - cd doc
-    - curl -L -o mage8.pdf https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf
+    - curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test5/downloads/packages/mage_linux.tgz
+    - mkdir -p mage
+    - cd mage
+    - tar xvf ../mage.tgz
  artifacts:
    paths:
-      - doc/mage8.pdf
+      - mage/mage
+      - mage/mage_extraire
+      - mage/mailleurPF

-dl-mage8-linux:
-  stage: downloads
+# build-mage-linux:
+#   stage: build
+#   tags:
+#     - linux
+#   rules:
+#     - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+#   variables:
+#     GIT_SUBMODULE_STRATEGY: recursive
+#     GIT_SUBMODULE_DEPTH: 20
+#   script:
+#     - cd mage/src/
+#     - mkdir -p build
+#     - cd build
+#     - cmake ..
+#     - make
+#   artifacts:
+#     paths:
+#       - mage/src/build/mage
+#       - mage/src/build/mage_extraire
+#       - mage/src/build/mailleurPF
+
+build-mage-windows:
+  stage: build
  tags:
    - linux
  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
  script:
-    - curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz
-    - mkdir -p mage8-linux
-    - cd mage8-linux
-    - tar xvf ../mage8.tgz
+    - curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test5/downloads/packages/mage_windows.tgz
+    - mkdir -p mage
+    - cd mage
+    - tar xvf ../mage.tgz
  artifacts:
    paths:
-      - mage8-linux/mage
-      - mage8-linux/mage_as7
-      - mage8-linux/mage_extraire
-      - mage8-linux/mailleurTT
-      - mage8-linux/libbief.so
+      - mage/mage.exe
+      - mage/mage_extraire.exe
+      - mage/mailleurPF.exe

-dl-mage8-windows:
-  stage: downloads
-  tags:
-    - linux
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
-  script:
-    - curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz
-    - mkdir -p mage8-windows
-    - cd mage8-windows
-    - tar xvf ../mage8.tgz
-  artifacts:
-    paths:
-      - mage8-windows/mage.exe
-      - mage8-windows/mage_as7.exe
-      - mage8-windows/mage_extraire.exe
-      - mage8-windows/mailleurTT.exe
-      - mage8-windows/libbief.dll
+# build-mage-windows:
+#   stage: build
+#   tags:
+#     - wine
+#   rules:
+#     - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+#   variables:
+#     GIT_SUBMODULE_STRATEGY: recursive
+#     GIT_SUBMODULE_DEPTH: 20
+#   script:
+#     - cd mage/src/
+#     - sed s/add_compile_definitions(win)/add_compile_definitions(windows)/ CMakeLists.txt > __tmp__
+#     - echo set(CMAKE_Fortran_COMPILER "C:/Program\ Files/gcc/bin/gfortran.exe") > CMakeLists.txt
+#     - echo set(CMAKE_MAKE_PROGRAM "C:/Program Files\ \(x86\)/GnuWin32/bin/make.exe") >> CMakeLists.txt
+#     - type __tmp__ >> CMakeLists.txt
+#     - mkdir build
+#     - cd build
+#     - cmake -G "MinGW Makefiles" ..
+#     - make
+#   artifacts:
+#     paths:
+#       - mage/src/build/mage.exe
+#       - mage/src/build/mage_extraire.exe
+#       - mage/src/build/mailleurPF.exe

-#############
-# CONFIGURE #
-#############
-
-set-version:
-  stage: configure
+build:
+  stage: build
  tags:
    - linux
  script:
@@ -99,7 +116,7 @@ set-version:
      - VERSION

 build-lang:
-  stage: configure
+  stage: build
  tags:
    - linux
  script:
@@ -113,405 +130,56 @@ build-lang:
 # TESTS #
 #########

-unittest:
+test:
  stage: test
-  tags:
-    - linux
-  needs:
-    - job: set-version
-      artifacts: true
  script:
-    - python3 -m venv venv
-    - . venv/bin/activate
-    - pip3 install -U pip
-    - pip3 install -r ./full-requirements.txt
-    - pip3 install -U -r ./full-requirements.txt
-    - cd src
-    - python3 -m unittest discover -t .
-
-test-pep8:
-  stage: test
-  tags:
-    - linux
-  needs:
-    - job: set-version
-      artifacts: true
-    - job: unittest
-  script:
-    # Setup virtual env
-    - python3 -m venv venv
-    - . venv/bin/activate
-    - pip3 install -U pip
-    - pip3 install -r ./requirements.txt
-    - pip3 install -U -r ./requirements.txt
-    - pip3 install pycodestyle
-    - pycodestyle --exclude="*_to_*.py" ./src
-  allow_failure: true
-
-#########
-# BUILD #
-#########
-
-# build-users-doc:
-#   stage: build
-#   tags:
-#     - linux
-#   needs:
-#     - job: set-version
-#       artifacts: true
-#   script:
-#     - cd ./doc/users/
-#     - ./build.sh
-#   artifacts:
-#     paths:
-#       - doc/users/documentation.pdf
-#       - doc/users/documentation.html
-#       - doc/users/images/
-#   allow_failure: true
-
-build-td:
-  stage: build
-  tags:
-    - linux
-  needs:
-    - job: set-version
-      artifacts: true
-  script:
-    - cd ./doc/users/Tuto1/
-    - ./build.sh
-  artifacts:
-    paths:
-      - doc/users/Tuto1/step-by-step.pdf
-      - doc/users/Tuto1/pas-a-pas.pdf
-      - doc/users/Tuto1/data/
-  allow_failure: true
-
-build-developers-doc:
-  stage: build
-  tags:
-    - linux
-  needs:
-    - job: set-version
-      artifacts: true
-  script:
-    - cd ./doc/dev/
-    - ./build.sh
-    # Create html documentation
-    - cd ../../src
-    - python3 -m venv doc-venv
-    - . doc-venv/bin/activate
-    - pip3 install -U pip
-    - pip3 install -r ../full-requirements.txt
-    - pip3 install -U -r ../full-requirements.txt
-    - pip3 install pdoc3
-    - pdoc --html .
-    # Create archive
-    - tar cf html.tar ./html
-    - cd ../doc/dev
-    - mv ../../src/html.tar ./
-  artifacts:
-    paths:
-      - doc/dev/documentation.pdf
-      - doc/dev/documentation.html
-      - doc/dev/html.tar
-      - doc/dev/images/
-  allow_failure: true
-
-build-linux:
-  stage: build
-  tags:
-    - linux
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
-  needs:
-    - job: dl-mage8-linux
-      artifacts: true
-    - job: dl-mage8-doc
-      artifacts: true
-    - job: set-version
-      artifacts: true
-    - job: build-lang
-      artifacts: true
-    - job: build-developers-doc
-      artifacts: true
-    # - job: build-users-doc
-    #   artifacts: true
-    - job: build-td
-      artifacts: true
-  script:
-    - mkdir -p linux
-    - cd linux
-    # Setup virtual env
-    - python3 -m venv linux-venv
-    - . linux-venv/bin/activate
-    - pip3 install -U pip
-    - pip3 install -r ../requirements.txt
-    - pip3 install -U -r ../requirements.txt
-    # Run Pyinstaller
-    - pyinstaller -y --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py
-    # Create directory
-    - mkdir -p pamhyr
-    - mkdir -p pamhyr/_internal
-    # Copy Pamhyr info
-    - cp -v ../VERSION pamhyr/_internal/
-    - cp -v ../AUTHORS pamhyr/_internal/
-    - cp -v ../LICENSE pamhyr/_internal/
-    - cp -v ../src/motd.txt pamhyr/_internal/
-    # Copy mage
-    - mkdir -p pamhyr/mage8
-    - cp -v ../mage8-linux/* pamhyr/mage8/
-    # Copy Pamhyr
-    - cp -r dist/pamhyr/* pamhyr/
-    # Pamhyr script to force x11
-    - echo '#!/usr/bin/env bash' > pamhyr/pamhyr-x11
-    - echo "" >> pamhyr/pamhyr-x11
-    - echo "GDK_BACKEND=x11 ./pamhyr $@" >> pamhyr/pamhyr-x11
-    - chmod +x pamhyr/pamhyr-x11
-    # Copy Pamhyr resources
-    - mkdir -p pamhyr/_internal/View
-    - mkdir -p pamhyr/_internal/View/ui
-    - mkdir -p pamhyr/_internal/View/ui/Widgets
-    - cp -r ../src/View/ui/*.ui pamhyr/_internal/View/ui/
-    - cp -r ../src/View/ui/ressources/ pamhyr/_internal/View/ui
-    - cp -r ../src/View/ui/Widgets/*.ui pamhyr/_internal/View/ui/Widgets
-    # Copy lang
-    - mkdir -p pamhyr/_internal/lang
-    - cp -r ../src/lang/*.qm pamhyr/_internal/lang
-    # Copy tests cases
-    - mkdir -p pamhyr/tests_cases/
-    - mkdir -p pamhyr/tests_cases/Saar
-    - cp ../tests_cases/Saar/Saar.pamhyr pamhyr/tests_cases/Saar/
-    # Copy documentations
-    - mkdir -p pamhyr/doc/
-    - mkdir -p pamhyr/doc/images/
-    - mkdir -p pamhyr/doc/html/
-    # - cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
-    # - cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html
-    - cp ../doc/mage8.pdf pamhyr/doc/mage8.pdf
-    - cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf
-    - cp ../doc/dev/documentation.html pamhyr/doc/Pamhyr2-dev.html
-    #- cp ../doc/users/images/* pamhyr/doc/images
-    - cp -r ../doc/dev/images/* pamhyr/doc/images
-    - cp -r ../doc/images/* pamhyr/doc/images
-    # Copy Tuto
-    - mkdir -p pamhyr/doc/Tuto1/
-    - mkdir -p pamhyr/doc/Tuto1/data
-    - cp ../doc/users/Tuto1/Hogneau_Engees2022.pdf pamhyr/doc/Tuto1/Hogneau_Engees2022.pdf
-    - cp ../doc/users/Tuto1/step-by-step.pdf pamhyr/doc/Tuto1/Tuto1-en.pdf
-    - cp ../doc/users/Tuto1/pas-a-pas.pdf pamhyr/doc/Tuto1/Tuto1-fr.pdf
-    - cp ../doc/users/Tuto1/*.pamhyr pamhyr/doc/Tuto1/
-    - cp ../doc/users/Tuto1/data/* pamhyr/doc/Tuto1/data/
-    # Copy TP charriage
-    - mkdir -p pamhyr/doc/TP_charriage/
-    - cp ../doc/users/TP_charriage/* pamhyr/doc/TP_charriage
-  artifacts:
-    paths:
-      - linux/pamhyr
-
-build-windows:
-  stage: build
-  tags:
-    - wine
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
-  needs:
-    - job: dl-mage8-windows
-      artifacts: true
-    - job: dl-mage8-doc
-      artifacts: true
-    - job: set-version
-      artifacts: true
-    - job: build-lang
-      artifacts: true
-    - job: build-developers-doc
-      artifacts: true
-    # - job: build-users-doc
-    #   artifacts: true
-    - job: build-td
-      artifacts: true
-  script:
-    - mkdir windows
-    - cd windows
-    # Setup env
-    - python -m pip install -U pip
-    - python -m pip install -r ..\requirements.txt
-    - python -m pip install -U -r ..\requirements.txt
-    # Run Pyinstaller
-    # - pyinstaller --noconsole -y ..\src\pamhyr.py
-    - pyinstaller -i ../src/View/ui/ressources/icon.ico --hide-console hide-early -y ..\src\pamhyr.py
-    # Create directory
-    - mkdir pamhyr
-    - dir
-    - copy ..\packages\make-windows-dir.bat .\make-windows-dir.bat
-    - .\make-windows-dir.bat
-  artifacts:
-    paths:
-      - windows/pamhyr
+    - echo "TODO PAMHYR tests"

 ############
 # PACKAGES #
 ############

-linux-package-tar:
+linux-package:
  stage: package
  tags:
    - release
    - linux
  needs:
-    # - job: test-linux
-    - job: build-linux
+    - job: build-lang
+      artifacts: true
+    - job: build
+      artifacts: true
+    - job: build-mage-linux
      artifacts: true
  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
  artifacts:
    paths:
-      - linux/pamhyr-gnulinux.tar.xz
+      - packages/pamhyr-gnulinux-amd64.tar.xz
  script:
-    - cd linux
-    - tar --xz -cf pamhyr-gnulinux.tar.xz ./pamhyr --checkpoint=.100
+    - cd packages
+    - ./linux.sh

-windows-package-zip:
-  stage: package
-  tags:
-    - release
-    - linux
-  needs:
-    # - job: test-windows
-    - job: build-windows
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
-  artifacts:
-    paths:
-      - windows/pamhyr-windows.zip
-  script:
-    - cd windows
-    - zip -r pamhyr-windows.zip pamhyr
-
-windows-package-exe:
+windows-package:
  stage: package
  tags:
    - release
    - wine
  needs:
-    # - job: test-windows
-    - job: build-windows
+    - job: build-lang
+      artifacts: true
+    - job: build
+      artifacts: true
+    - job: build-mage-windows
      artifacts: true
  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
  artifacts:
    paths:
-      - windows/pamhyr-windows.exe
-  script:
-    - cd windows
-    - copy ..\packages\make-windows-exe.bat make-windows-exe.bat
-    - copy ..\packages\pamhyr.nsi pamhyr.nsi
-    - .\make-windows-exe.bat
-
-########
-# HASH #
-########
-
-linux-build-hash:
-  stage: hash
-  tags:
-    - release
-    - linux
-  needs:
-    - job: build-linux
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
-  script:
-    - cd linux
-    - sha256sum -b pamhyr/pamhyr > pamhyr/pamhyr.sha256
-  artifacts:
-    paths:
-      - linux/pamhyr/pamhyr.sha256
-
-windows-build-hash:
-  stage: hash
-  tags:
-    - release
-    - linux
-  needs:
-    - job: build-windows
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
-  script:
-    - cd windows
-    - sha256sum -b pamhyr/pamhyr.exe > pamhyr/pamhyr.exe.sha256
-  artifacts:
-    paths:
-      - windows/pamhyr/pamhyr.exe.sha256
-
-pkg-hash:
-  stage: hash
-  tags:
-    - release
-    - linux
-  needs:
-    - job: linux-package-tar
-      artifacts: true
-    - job: windows-package-zip
-      artifacts: true
-    - job: windows-package-exe
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
-  script:
-    - cd windows
-    - sha256sum -b pamhyr-windows.exe > pamhyr-windows.exe.sha256
-    - sha256sum -b pamhyr-windows.zip > pamhyr-windows.zip.sha256
-    - cd ..
-    - cd linux
-    - sha256sum -b pamhyr-gnulinux.tar.xz > pamhyr-gnulinux.tar.xz.sha256
-  artifacts:
-    paths:
-    - windows/pamhyr-windows.exe.sha256
-    - windows/pamhyr-windows.zip.sha256
-    - linux/pamhyr-gnulinux.tar.xz.sha256
-
-#############
-# ANTIVIRUS #
-#############
-
-build-check-clamav:
-  stage: antivirus
-  tags:
-    - release
-    - linux
-  needs:
-    - job: build-linux
-      artifacts: true
-    - job: build-windows
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+      - packages/pamhyr-win-amd64.exe
  script:
    - cd packages
-    - ./clamav-scan.sh builds
-  allow_failure: true
-
-pkg-check-clamav:
-  stage: antivirus
-  tags:
-    - release
-    - linux
-  needs:
-    - job: linux-package-tar
-      artifacts: true
-    - job: windows-package-zip
-      artifacts: true
-    - job: windows-package-exe
-      artifacts: true
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
-  script:
-    - cd packages
-    - ./clamav-scan.sh packages
-  allow_failure: true
+    - ./windows.bat

 ###########
 # RELEASE #
@@ -523,64 +191,30 @@ tag-release:
    - release
    - linux
  needs:
-    - job: linux-package-tar
+    - job: linux-package
      artifacts: true
-    - job: windows-package-zip
-      artifacts: true
-    - job: windows-package-exe
-      artifacts: true
-    # - job: build-users-doc
-    #   artifacts: true
-    - job: build-developers-doc
-      artifacts: true
-    - job: pkg-hash
+    - job: windows-package
      artifacts: true
  rules:
    - if: $CI_COMMIT_TAG
  artifacts:
    paths:
-      - linux/pamhyr-gnulinux.tar.xz
-      - windows/pamhyr-windows.zip
-      - windows/pamhyr-windows.exe
-      - linux/pamhyr-gnulinux.tar.xz.sha256
-      - windows/pamhyr-windows.zip.sha256
-      - windows/pamhyr-windows.exe.sha256
-      - doc/dev/documentation.pdf
-      # - doc/users/documentation.pdf
+      - packages/pamhyr-gnulinux-amd64.tar.xz
+      - packages/pamhyr-win-amd64.exe
  script:
    - cd packages
  release:
    name: '$CI_COMMIT_TAG'
-    description: '$CI_COMMIT_TAG_MESSAGE'
+    description: 'Automatic release from tag $CI_COMMIT_TAG'
    tag_name: '$CI_COMMIT_TAG'
    ref: '$CI_COMMIT_SHA'
    assets:
      links:
-        - name: 'GNU/Linux CHECKSUM SHA256 (tar.xz)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/linux/pamhyr-gnulinux.tar.xz.sha256'
-          filepath: '/linux/pamhyr-gnulinux.tar.xz.sha256'
+        - name: 'GNU/Linux amd64 (tar.xz)'
+          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-gnulinux-amd64.tar.xz'
+          filepath: '/packages/pamhyr-gnulinux-amd64.tar.xz'
          link_type: 'package'
-        - name: 'GNU/Linux (tar.xz)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/linux/pamhyr-gnulinux.tar.xz'
-          filepath: '/linux/pamhyr-gnulinux.tar.xz'
+        - name: 'Windows amd64 (exe)'
+          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-win-amd64.exe'
+          filepath: '/packages/pamhyr-win-amd64.exe'
          link_type: 'package'
-        - name: 'Windows CHECKSUM SHA256 (exe)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.exe.sha256'
-          filepath: '/windows/pamhyr-windows.exe.sha256'
-          link_type: 'package'
-        - name: 'Windows (exe)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.exe'
-          filepath: '/windows/pamhyr-windows.exe'
-          link_type: 'package'
-        - name: 'Windows CHECKSUM SHA256 (zip)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.zip.sha256'
-          filepath: '/windows/pamhyr-windows.zip.sha256'
-          link_type: 'package'
-        - name: 'Windows (zip)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.zip'
-          filepath: '/windows/pamhyr-windows.zip'
-          link_type: 'package'
-        - name: 'Dev documentations (pdf)'
-          url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/doc/dev/documentation.pdf'
-          filepath: '/doc/dev/documentation.pdf'
-          link_type: 'other'
@@ -1,3 +1,3 @@
 Sylvain COULIBALY, INRAE, 2020 - 2022
-Théophile TERRAZ, INRAE, 2022 - 2024
-Pierre-Antoine ROUBY, INRAE, 2023 - 2024
+Théophile TERRAZ, INRAE, 2022 - 2023
+Pierre-Antoine ROUBY, INRAE, 2023
@@ -1,55 +1 @@
-# Pamhyr2
-
-Pamhyr is a free and open source graphical user interface for 1D hydro-sedimentary
-modelling of rivers.
-
-## Features
-
-+ Edit 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
-+ 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)
-for more details.
-
-## Install
-
-### GNU/Linux
-
-[See documentation](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
-```
+# PamHyr (Programme d’Aide à la Modélisation en Hydraulique des Rivières)
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-echo " PDF  documentation.org"
-emacs -nw --batch                                       \
-      --eval "(require 'org)"                           \
-      --eval "(require 'ox-latex)"                      \
-      --eval "(load-file \"../tools/setup.el\")"        \
-      --file ./documentation.org                        \
-      -f org-latex-export-to-pdf
-
-echo " HTML documentation.org"
-emacs -nw --batch                                       \
-      --eval "(require 'org)"                           \
-      --eval "(require 'ox-latex)"                      \
-      --eval "(require 'ox-html)"                       \
-      --eval "(load-file \"../tools/setup.el\")"        \
-      --file ./documentation.org                        \
-      -f org-html-export-to-html
@@ -1 +0,0 @@
-../tools/ref.bib
@@ -1,692 +0,0 @@
-diff --git a/packages/linux.sh b/packages/linux.sh
-index 215047e..a19bfb6 100755
--- a/packages/linux.sh
-+++ b/packages/linux.sh
-@@ -76,11 +76,11 @@ mv ../pamhyr-src.tar.gz ./
- 
- echo " *** MAKE BIN PACKAGE"
- 
-OLD_PWD=$PWD
-cd dist/
-tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100
-cd $OLD_PWD
-+# OLD_PWD=$PWD
-+# cd dist/
-+# tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100
-+# cd $OLD_PWD
- 
-mv dist/pamhyr-gnulinux-amd64.tar.xz ./
-+# mv dist/pamhyr-gnulinux-amd64.tar.xz ./
- 
- echo " *** DONE"
-diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
-index 18167a8..5bf2302 100644
--- a/src/Model/Friction/Friction.py
-+++ b/src/Model/Friction/Friction.py
-@@ -170,6 +170,7 @@ class Friction(SQLSubModel):
-     @begin_strickler.setter
-     def begin_strickler(self, strickler):
-         self._begin_strickler = strickler
-+        self._end_strickler = strickler # HACK: Only one Strickler
-         self._status.modified()
- 
-     @property
-diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
-index baa484f..a5670d2 100644
--- a/src/Model/Stricklers/Stricklers.py
-+++ b/src/Model/Stricklers/Stricklers.py
-@@ -38,7 +38,7 @@ class Stricklers(SQLSubModel):
-         else:
-             self.id = id
- 
-        Stricklers._id_cnt = max(Stricklers._id_cnt + 1, self.id)
-+        Stricklers._id_cnt = max(Stricklers._id_cnt + 1, id + 1)
- 
-         self._name = name
-         self._comment = comment
-diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py
-index c4ff8f8..172999a 100644
--- a/src/View/BoundaryCondition/translate.py
-+++ b/src/View/BoundaryCondition/translate.py
-@@ -29,9 +29,9 @@ _translate = QCoreApplication.translate
- long_types = {
-     "ND": _translate("BoundaryCondition", "Not defined"),
-     "PC": _translate("BoundaryCondition", "Ponctual contribution"),
-    "TZ": _translate("BoundaryCondition", "Time over Z"),
-    "TD": _translate("BoundaryCondition", "Time over Discharge"),
-    "ZD": _translate("BoundaryCondition", "Z over Discharge"),
-+    "TZ": _translate("BoundaryCondition", "TimeZ"),
-+    "TD": _translate("BoundaryCondition", "TimeDischarge"),
-+    "ZD": _translate("BoundaryCondition", "ZDischarge"),
-     "SL": _translate("BoundaryCondition", "Solid"),
- }
- 
-diff --git a/src/View/Frictions/PlotStricklers.py b/src/View/Frictions/PlotStricklers.py
-index 71ff6e6..b9060bc 100644
--- a/src/View/Frictions/PlotStricklers.py
-+++ b/src/View/Frictions/PlotStricklers.py
-@@ -106,6 +106,8 @@ class PlotStricklers(APlot):
-                 )
-                 self.draw_frictions(lst, color="b")
- 
-+        self.canvas.axes.invert_xaxis()
-+
-         self.canvas.figure.tight_layout()
-         self.canvas.figure.canvas.draw_idle()
-         if self.toolbar is not None:
-diff --git a/src/View/Frictions/Window.py b/src/View/Frictions/Window.py
-index 4af3b66..f46fae3 100644
--- a/src/View/Frictions/Window.py
-+++ b/src/View/Frictions/Window.py
-@@ -112,10 +112,10 @@ class FrictionsWindow(ASubMainWindow, ListedSubWindow):
-         )
- 
-         table.setItemDelegateForColumn(
-            3, self._delegate_stricklers
-+            2, self._delegate_stricklers
-         )
-         table.setItemDelegateForColumn(
-            4, self._delegate_stricklers
-+            3, self._delegate_stricklers
-         )
- 
-         table.setSelectionBehavior(QAbstractItemView.SelectRows)
-diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py
-index 21981ab..82071e9 100644
--- a/src/View/Frictions/translate.py
-+++ b/src/View/Frictions/translate.py
-@@ -21,10 +21,10 @@ from PyQt5.QtCore import QCoreApplication
- _translate = QCoreApplication.translate
- 
- table_headers = {
-    "name": _translate("Frictions", "Name"),
-+    # "name": _translate("Frictions", "Name"),
-     # "edge": _translate("Frictions", "Reach"),
-     "begin_kp": _translate("Frictions", "Begin kp (m)"),
-     "end_kp": _translate("Frictions", "End kp (m)"),
-    "begin_strickler": _translate("Frictions", "Begin strickler"),
-    "end_strickler": _translate("Frictions", "End strickler"),
-+    "begin_strickler": _translate("Frictions", "Strickler"),
-+    # "end_strickler": _translate("Frictions", "End strickler"),
- }
-diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py
-index fe6d933..e43f39e 100644
--- a/src/View/Geometry/PlotAC.py
-+++ b/src/View/Geometry/PlotAC.py
-@@ -67,18 +67,18 @@ class PlotAC(APlot):
-         gl = self.data.profile(selected_profile).names()
- 
-         self.canvas.axes.set_xlabel(
-            _translate("MainWindow_reach", "Abscisse en travers (m)"),
-+            _translate("MainWindow_reach", "Transverse abscissa (m)"),
-             color='green', fontsize=12
-         )
-         self.canvas.axes.set_ylabel(
-            _translate("MainWindow_reach", "Cote (m)"),
-+            _translate("MainWindow_reach", "Height (m)"),
-             color='green', fontsize=12
-         )
-         self.canvas.figure.tight_layout()
- 
-        label_before_plot_selected = _translate("MainWindow_reach", "Profil précédent")
-        label_plot_selected = _translate("MainWindow_reach", "Profil sélectionné")
-        label_after_plot_selected = _translate("MainWindow_reach", "Profil suivant")
-+        label_before_plot_selected = _translate("MainWindow_reach", "Previous cross-section")
-+        label_plot_selected = _translate("MainWindow_reach", "Cross-section")
-+        label_after_plot_selected = _translate("MainWindow_reach", "Next cross-section")
-         color_before_plot_selected = "k"  # 'grey'
-         color_plot_selected = 'b'
-         color_after_plot_selected = 'm'
-diff --git a/src/View/Geometry/PlotKPZ.py b/src/View/Geometry/PlotKPZ.py
-index eb7d5e2..64057aa 100644
--- a/src/View/Geometry/PlotKPZ.py
-+++ b/src/View/Geometry/PlotKPZ.py
-@@ -158,6 +158,8 @@ class PlotKPZ(APlot):
-             color='lightgrey'
-         )
- 
-+        self.canvas.axes.invert_xaxis()
-+
-         self.canvas.figure.tight_layout()
-         self.canvas.figure.canvas.draw_idle()
-         if self.toolbar is not None:
-diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py
-index 7776d73..1c8cb5d 100644
--- a/src/View/Geometry/Window.py
-+++ b/src/View/Geometry/Window.py
-@@ -111,7 +111,7 @@ class GeometryWindow(ASubMainWindow, ListedSubWindow):
-         self.ui.btn_sort_desc.triggered.connect(self.sort_descending)
-         self.ui.btn_move_up.triggered.connect(self.move_row_up)
-         self.ui.btn_move_down.triggered.connect(self.move_row_down)
-        self.ui.btn_end_editing.triggered.connect(self.handleSave)
-+        # self.ui.btn_end_editing.triggered.connect(self.handleSave)
-         self.ui.btn_add.triggered.connect(self.insert_row)
-         self.ui.btn_delete.triggered.connect(self.delete_rows)
-         self.ui.btn_edit.triggered.connect(self.edit_profile)
-diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py
-index 897b698..60bcfa6 100644
--- a/src/View/Geometry/mainwindow_ui_reach.py
-+++ b/src/View/Geometry/mainwindow_ui_reach.py
-@@ -95,29 +95,29 @@ class Ui_MainWindow(object):
-         self.btn_edit.setIcon(icon_btn_edit)
-         self.toolBar.addAction(self.btn_edit)
- 
-        self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
-        self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
-        icon_btn_copy_selected_profile = QtGui.QIcon()
-        icon_btn_copy_selected_profile.addPixmap(
-            QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
-        self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
-        self.toolBar.addAction(self.btn_copy_selected_profile)
-
-        self.btn_paste_selected_profile = QtWidgets.QAction(self.widget)
-        self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
-        icon_btn_paste_selected_profile = QtGui.QIcon()
-        icon_btn_paste_selected_profile.addPixmap(
-            QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
-        self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
-        self.toolBar.addAction(self.btn_paste_selected_profile)
-
-        self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget)
-        self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
-        icon_btn_duplicate_selected_profile = QtGui.QIcon()
-        icon_btn_duplicate_selected_profile.addPixmap(
-            QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
-        self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
-        self.toolBar.addAction(self.btn_duplicate_selected_profile)
-+        # self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
-+        # self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
-+        # icon_btn_copy_selected_profile = QtGui.QIcon()
-+        # icon_btn_copy_selected_profile.addPixmap(
-+        #     QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
-+        # self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
-+        # self.toolBar.addAction(self.btn_copy_selected_profile)
-+
-+        # self.btn_paste_selected_profile = QtWidgets.QAction(self.widget)
-+        # self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
-+        # icon_btn_paste_selected_profile = QtGui.QIcon()
-+        # icon_btn_paste_selected_profile.addPixmap(
-+        #     QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
-+        # self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
-+        # self.toolBar.addAction(self.btn_paste_selected_profile)
-+
-+        # self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget)
-+        # self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
-+        # icon_btn_duplicate_selected_profile = QtGui.QIcon()
-+        # icon_btn_duplicate_selected_profile.addPixmap(
-+        #     QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
-+        # self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
-+        # self.toolBar.addAction(self.btn_duplicate_selected_profile)
- 
-         self.btn_sort_asc = QtWidgets.QAction(self.widget)
-         self.btn_sort_asc.setObjectName("btn_sort_asc")
-@@ -151,13 +151,13 @@ class Ui_MainWindow(object):
-         self.btn_move_down.setIcon(icon_btn_move_down)
-         self.toolBar.addAction(self.btn_move_down)
- 
-        self.btn_end_editing = QtWidgets.QAction(self.widget)
-        self.btn_end_editing.setObjectName("btn_end_editing")
-        icon_btn_save = QtGui.QIcon()
-        icon_btn_save.addPixmap(
-            QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
-        self.btn_end_editing.setIcon(icon_btn_save)
-        self.toolBar.addAction(self.btn_end_editing)
-+        # self.btn_end_editing = QtWidgets.QAction(self.widget)
-+        # self.btn_end_editing.setObjectName("btn_end_editing")
-+        # icon_btn_save = QtGui.QIcon()
-+        # icon_btn_save.addPixmap(
-+        #     QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
-+        # self.btn_end_editing.setIcon(icon_btn_save)
-+        # self.toolBar.addAction(self.btn_end_editing)
- 
-         self.verticalLayout.addLayout(self.horizontalLayout)
-         self.tableView = QtWidgets.QTableView(self.widget)
-@@ -314,30 +314,23 @@ class Ui_MainWindow(object):
-     def retranslateUi(self, MainWindow_reach):
-         _translate = QtCore.QCoreApplication.translate
-         self.name_reach = ""
-        self.mainwindow_title = _translate("MainWindow_reach", "Jeu de sections du Bief")
-+        self.mainwindow_title = _translate("MainWindow_reach", "Geometry reach edit")
-         MainWindow_reach.setWindowTitle(self.mainwindow_title + f"{self.name_reach}")
-        self.text_section_order = _translate("MainWindow_reach", "\nOrdre des sections : "
-                                                                 "Amont --> Aval")
-         # self.label_section_order.setText(f"{self.text_section_order}")
-         self.vertical_slider_value = ""
-        self.vertical_slider_label.setText(_translate("MainWindow_reach", "Pk = ") + f"{self.vertical_slider_value}")
-        self.btn_open.setToolTip(_translate("MainWindow_reach", " Importer une géométrie"))
-        self.btn_add.setToolTip(_translate("MainWindow_reach", " Nouveau profil"))
-        self.btn_delete.setToolTip(_translate("MainWindow_reach", " Supprimer le profil sélectionné"))
-        self.btn_edit.setToolTip(_translate("MainWindow_reach", " Éditer le profil sélectionné"))
-        self.btn_copy_selected_profile.setToolTip(_translate("MainWindow_reach", " Copier le profil sélectionné"))
-        self.btn_paste_selected_profile.setToolTip(_translate("MainWindow_reach", "Coller le profil en fin de liste ("
-                                                                                  "penser à modifier le Pk avant de "
-                                                                                  "trier)"))
-        self.btn_duplicate_selected_profile.setToolTip(
-            _translate("MainWindow_reach", " Dupliquer la section sélectionnée"))
-+        self.vertical_slider_label.setText(_translate("MainWindow_reach", "Kp = ") + f"{self.vertical_slider_value}")
-+        self.btn_open.setToolTip(_translate("MainWindow_reach", " Import geometry"))
-+        self.btn_add.setToolTip(_translate("MainWindow_reach", " New profile"))
-+        self.btn_delete.setToolTip(_translate("MainWindow_reach", " Delete selected profile"))
-+        self.btn_edit.setToolTip(_translate("MainWindow_reach", " Editer selected profile"))
-+
-         self.btn_sort_asc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre croissant des Pk"))
-         self.btn_sort_desc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre décroissant des Pk"))
-         self.btn_move_up.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
-                                                                    "profil sélectionné vers le haut)"))
-         self.btn_move_down.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
-                                                                      "profil sélectionné vers le bas)"))
-        self.btn_end_editing.setToolTip(_translate("MainWindow_reach", " Terminer l'édition"))
-+        # self.btn_end_editing.setToolTip(_translate("MainWindow_reach", " Terminer l'édition"))
-         self.tableView_header = [_translate("MainWindow_reach", "Name"),
-                                  _translate("MainWindow_reach", "Kp (m)"),
-                                  _translate("MainWindow_reach", "Type")]
-diff --git a/src/View/InitialConditions/PlotDKP.py b/src/View/InitialConditions/PlotDKP.py
-index 58a8321..445cc08 100644
--- a/src/View/InitialConditions/PlotDKP.py
-+++ b/src/View/InitialConditions/PlotDKP.py
-@@ -71,6 +71,8 @@ class PlotDKP(APlot):
-                 color='b', marker='+', lw=1.
-             )
- 
-+        self.canvas.axes.invert_xaxis()
-+
-         self.canvas.figure.tight_layout()
-         self.canvas.figure.canvas.draw_idle()
-         if self.toolbar is not None:
-diff --git a/src/View/InitialConditions/PlotDischarge.py b/src/View/InitialConditions/PlotDischarge.py
-index 1fe05de..0703c59 100644
--- a/src/View/InitialConditions/PlotDischarge.py
-+++ b/src/View/InitialConditions/PlotDischarge.py
-@@ -65,6 +65,8 @@ class PlotDischarge(APlot):
-                 color='r', lw=1.
-             )
- 
-+        self.canvas.axes.invert_xaxis()
-+
-         self.canvas.figure.tight_layout()
-         self.canvas.figure.canvas.draw_idle()
-         if self.toolbar is not None:
-diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py
-index 370d4a2..3fe45f7 100644
--- a/src/View/InitialConditions/translate.py
-+++ b/src/View/InitialConditions/translate.py
-@@ -21,11 +21,11 @@ from PyQt5.QtCore import QCoreApplication
- _translate = QCoreApplication.translate
- 
- table_headers = {
-    "name": _translate("LateralContribution", "Name"),
-+    # "name": _translate("LateralContribution", "Name"),
-     "kp": _translate("LateralContribution", "KP (m)"),
-     # "speed": _translate("LateralContribution", "Speed (m/s)"),
-     "discharge": _translate("LateralContribution", "Discharge (m³/s)"),
-     "elevation": _translate("LateralContribution", "Elevation (m)"),
-     "height": _translate("LateralContribution", "Height (m)"),
-    "comment": _translate("LateralContribution", "Comment"),
-+    # "comment": _translate("LateralContribution", "Comment"),
- }
-diff --git a/src/View/SedimentLayers/Edit/translate.py b/src/View/SedimentLayers/Edit/translate.py
-index fe9e44a..f9f02cb 100644
--- a/src/View/SedimentLayers/Edit/translate.py
-+++ b/src/View/SedimentLayers/Edit/translate.py
-@@ -6,7 +6,7 @@ _translate = QCoreApplication.translate
- 
- table_headers = {
-     "name": _translate("SedimentLayers", "Name"),
-    "type": _translate("SedimentLayers", "Type"),
-+    # "type": _translate("SedimentLayers", "Type"),
-     "height": _translate("Sedimentlayers", "Height"),
-     "d50": _translate("Sedimentlayers", "D50"),
-     "sigma": _translate("Sedimentlayers", "Sigma"),
-diff --git a/src/View/SedimentLayers/Reach/Plot.py b/src/View/SedimentLayers/Reach/Plot.py
-index a312a8c..5764abf 100644
--- a/src/View/SedimentLayers/Reach/Plot.py
-+++ b/src/View/SedimentLayers/Reach/Plot.py
-@@ -78,6 +78,8 @@ class Plot(APlot):
-                 color='grey' if i == len(z_sl) - 1 else None
-             )
- 
-+        self.canvas.axes.invert_xaxis()
-+
-         self.canvas.figure.tight_layout()
-         self.canvas.figure.canvas.draw_idle()
-         if self.toolbar is not None:
-diff --git a/src/lang/fr.ts b/src/lang/fr.ts
-index 8034809..031f349 100644
--- a/src/lang/fr.ts
-+++ b/src/lang/fr.ts
-@@ -60,21 +60,6 @@
-         <source>Ponctual contribution</source>
-         <translation>Contributions ponctuelles</translation>
-     </message>
-    <message>
-        <location filename="../View/BoundaryCondition/translate.py" line="32"/>
-        <source>Time over Z</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/BoundaryCondition/translate.py" line="33"/>
-        <source>Time over Discharge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/BoundaryCondition/translate.py" line="34"/>
-        <source>Z over Discharge</source>
-        <translation type="unfinished"></translation>
-    </message>
-     <message>
-         <location filename="../View/BoundaryCondition/translate.py" line="39"/>
-         <source>Name</source>
-@@ -110,6 +95,21 @@
-         <source>Solid</source>
-         <translation type="unfinished">Solide</translation>
-     </message>
-+    <message>
-+        <location filename="../View/BoundaryCondition/translate.py" line="32"/>
-+        <source>TimeZ</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/BoundaryCondition/translate.py" line="33"/>
-+        <source>TimeDischarge</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/BoundaryCondition/translate.py" line="34"/>
-+        <source>ZDischarge</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>Checker</name>
-@@ -533,7 +533,7 @@
-     <message>
-         <location filename="../View/Frictions/translate.py" line="24"/>
-         <source>Name</source>
-        <translation>Nom</translation>
-+        <translation type="obsolete">Nom</translation>
-     </message>
-     <message>
-         <location filename="../View/Frictions/translate.py" line="26"/>
-@@ -548,12 +548,17 @@
-     <message>
-         <location filename="../View/Frictions/translate.py" line="28"/>
-         <source>Begin strickler</source>
-        <translation>strickler de départ</translation>
-+        <translation type="obsolete">strickler de départ</translation>
-     </message>
-     <message>
-         <location filename="../View/Frictions/translate.py" line="29"/>
-         <source>End strickler</source>
-        <translation>Strickler de fin</translation>
-+        <translation type="obsolete">Strickler de fin</translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Frictions/translate.py" line="28"/>
-+        <source>Strickler</source>
-+        <translation type="unfinished"></translation>
-     </message>
- </context>
- <context>
-@@ -587,7 +592,7 @@
- <context>
-     <name>LateralContribution</name>
-     <message>
-        <location filename="../View/InitialConditions/translate.py" line="24"/>
-+        <location filename="../View/LateralContribution/translate.py" line="35"/>
-         <source>Name</source>
-         <translation>Nom</translation>
-     </message>
-@@ -602,7 +607,7 @@
-         <translation>Lit moyen</translation>
-     </message>
-     <message>
-        <location filename="../View/InitialConditions/translate.py" line="30"/>
-+        <location filename="../View/Stricklers/translate.py" line="31"/>
-         <source>Comment</source>
-         <translation>Commentaire</translation>
-     </message>
-@@ -1715,7 +1720,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
-         <translation type="unfinished"></translation>
-     </message>
- </context>
-<context>
-+<context encoding="UTF-8">
-     <name>MainWindow_reach</name>
-     <message>
-         <location filename="../View/Frictions/PlotStricklers.py" line="76"/>
-@@ -1723,7 +1728,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
-         <translation></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="335"/>
-         <source>Kp (m)</source>
-         <translation>Pk (m)</translation>
-     </message>
-@@ -1778,68 +1783,47 @@ sur le plan défini par les deux points nommés extrêmes </source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="317"/>
-        <source>Jeu de sections du Bief</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="319"/>
-        <source>
-Ordre des sections : Amont --&gt; Aval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="323"/>
-        <source>Pk = </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="325"/>
-        <source> Nouveau profil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="327"/>
-         <source> Trier les profils par ordre croissant des Pk</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="341"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
-         <source>Name</source>
-         <translation>Nom</translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="343"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="336"/>
-         <source>Type</source>
-         <translation>Type</translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="345"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="338"/>
-         <source>Alt+Z</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="348"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="341"/>
-         <source>Alt+E</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="351"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="344"/>
-         <source>Alt+R</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="355"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="348"/>
-         <source>Vue globale automatique (Alt+S)</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="359"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="352"/>
-         <source>Vue globale automatique (Alt+D)</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="363"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="356"/>
-         <source>Vue globale automatique (Alt+F)</source>
-         <translation type="unfinished"></translation>
-     </message>
-@@ -1889,68 +1873,33 @@ Seuls les 5 premiers seront édités.</source>
-         <source>Profil sélectionné</source>
-         <translation type="unfinished"></translation>
-     </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="324"/>
-        <source> Importer une géométrie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="326"/>
-        <source> Supprimer le profil sélectionné</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="327"/>
-        <source> Éditer le profil sélectionné</source>
-        <translation type="unfinished"></translation>
-    </message>
-     <message encoding="UTF-8">
-         <location filename="../View/Geometry/mainwindow_ui_reach.py" line="328"/>
-        <source> Copier le profil sélectionné</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="329"/>
-        <source>Coller le profil en fin de liste (penser à modifier le Pk avant de trier)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="332"/>
-        <source> Dupliquer la section sélectionnée</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="335"/>
-         <source> Trier les profils par ordre décroissant des Pk</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="336"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="329"/>
-         <source> Changer l&apos;ordre des profils (en décalant le profil sélectionné vers le haut)</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="338"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="331"/>
-         <source> Changer l&apos;ordre des profils (en décalant le profil sélectionné vers le bas)</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="340"/>
-        <source> Terminer l&apos;édition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="346"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="339"/>
-         <source>Vue isométrique (Alt+Z)</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="349"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
-         <source>Vue isométrique (Alt+E)</source>
-         <translation type="unfinished"></translation>
-     </message>
-     <message encoding="UTF-8">
-        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="352"/>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="345"/>
-         <source>Vue isométrique (Alt+R)</source>
-         <translation type="unfinished"></translation>
-     </message>
-@@ -1960,7 +1909,7 @@ Seuls les 5 premiers seront édités.</source>
-         <translation type="unfinished">Altitude (m)</translation>
-     </message>
-     <message>
-        <location filename="../View/Geometry/PlotKPZ.py" line="66"/>
-+        <location filename="../View/Geometry/PlotAC.py" line="73"/>
-         <source>Height (m)</source>
-         <translation type="unfinished">Hauteur (m)</translation>
-     </message>
-@@ -1969,6 +1918,56 @@ Seuls les 5 premiers seront édités.</source>
-         <source>Select destination file</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="317"/>
-+        <source>Geometry reach edit</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="321"/>
-+        <source>Kp = </source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="322"/>
-+        <source> Import geometry</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="323"/>
-+        <source> New profile</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="324"/>
-+        <source> Delete selected profile</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/mainwindow_ui_reach.py" line="325"/>
-+        <source> Editer selected profile</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/PlotAC.py" line="69"/>
-+        <source>Transverse abscissa (m)</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/PlotAC.py" line="79"/>
-+        <source>Previous cross-section</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/PlotAC.py" line="80"/>
-+        <source>Cross-section</source>
-+        <translation type="unfinished"></translation>
-+    </message>
-+    <message>
-+        <location filename="../View/Geometry/PlotAC.py" line="81"/>
-+        <source>Next cross-section</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>Network</name>
-@@ -2071,7 +2070,7 @@ Seuls les 5 premiers seront édités.</source>
-     <message>
-         <location filename="../View/SedimentLayers/Edit/translate.py" line="9"/>
-         <source>Type</source>
-        <translation type="unfinished">Type</translation>
-+        <translation type="obsolete">Type</translation>
-     </message>
-     <message>
-         <location filename="../View/SedimentLayers/Reach/Profile/Window.py" line="68"/>
@@ -1,131 +0,0 @@
-Pamhyr2: a graphical user interface for 1D hydro-sedimentary modelling of rivers 
-Pierre-Antoine Rouby1, Benoît Camenen, Lionel Pénard, Léa Kieffer, Théophile Terraz1
-INRAE, UR RiverLy, centre de Lyon-Grenoble, 5 rue de la Doua, CS20244, 69625, Villeurbanne, France.
-pierre-antoine.rouby@inrae.fr, benoit.camenen@inrae.fr, lionel.penard@inrae.fr, 
-lea.kieffer@inrae.fr, theophile.terraz@inrae.fr
-KEY WORDS
-1D modelling, sedimentary modelling, user interface
-Abstract
-In numerical river simulation, one-dimensional models are commonly used to study water level and discharge for large domains or long time series. These models are less time-consuming than two- and three-dimensional numerical models, and require fewer input parameters and allow ensemble runs. To build a one-dimensional hydraulic model, a pre- and post-processing tool is needed for creating reach geometry, specifying initial and boundary conditions, friction coefficients and other numerical parameters. Such a tool needs to ensure the consistency of the model and provide a user-friendly graphical user interface. In this article, we present Pamhyr2, the fully rebuilt version of the PAMHYR modelling platform. It is developed using Python, PyQt and Matplotlib. Pamhyr2 is free and open-source, multilingual, cross-platform (Linux, Windows) and is generic enough to accept various one-dimensional solvers. Pamhyr2 includes and enhances all the features from the previous version: multiple-reach modelling, geometry definition from cross-section data, initial and boundary conditions, friction coefficients, hydraulic structures, lateral inflow, punctual intake and the results visualization window. In addition, this version includes new features such as pollutants modelling, bed-load and bed evolution. We describe several windows: the creation of sedimentary layers in the river bed, the sediment characteristics for each layer, the sediment, and pollutant boundary conditions and the lateral inputs. These functionalities are illustrated with simple examples. We finally show the visualization windows for bed evolution. 
-1.	introduction
-Numerous tools are available to simulate river flow. Among them, one-dimensional (1D) numerical hydraulic models have the advantage of being accurate while being inexpensive in terms of computation time, making it possible to simulate long rivers over very long timescales. A lot of 1D numerical solvers for river hydraulics are available, including HEC-RAS2, Mike 113 and Mascaret4 for example. However, in order to investigate specific research issues it is essential to have the ability to edit the source code of numeric solvers and to have an ergonomic Graphical User Interace (GUI). Most of the widespread 1D modeling tools are either written with a proprietary source code (such as HEC-RAS and Mike 11) or are research tools with irregularly maintained GUI. On its side, INRAE has been developing two 1D solvers for over 40 years: Mage5 [5]  and RubarBE6. In parallel, a GUI named PAMHyR has been developed to enable modelers to build river models, parameterize calculations, launch Mage and RubarBE solvers and post-process the results [3].
-
-	PAMHyR, developed in Java since the end of 90s (originally named X-NT), it is written with the following constraints in mind: 
-    • Multi-platform Windows, Unix-like,
-    • no dependence on an external graphics library with a paid license for user, 
-    • generate as much code as possible from a UML diagram.
-Now, PAMHyR suffers from complexity due to highly specific interface, as well as a significant technological debt [4]: old external library no longer maintained, over dated project architecture, and numerous modifications by multiple developers (and internship) over short periods of time, with no vision of long-term maintainability. What's more, the software is only in French and the code is closed (the sources are not available), which is a hindrance to the notoriety of the software as well as to the vitality of development. In addition, no significant changes have been made in the application since 2016, even if PAMHyR is still often used for river modeling [2].
-INRAE needs a new tool to keep up with today’s technologies and with the development of its numerical solvers. In this paper we introduce the current work on the new graphical user interface Pamhyr2.
-2.	Objective
-2.1	History and need 
-PAMHyR is available for two solvers, with two different types of studies: Mage and RubarBE. These two different kinds of studies have mostly similar interfaces, but have their own specific features. They can both be used to: define reach geometry, boundary conditions, lateral inflows, overflows, friction, and structures. In addition, you can run the solver on the study you are editing, and view the solver's results. Firstly, although both Mage and RubarBE are multiple-reach compatible, only the Mage interface enables multiple-reach study editing. Secondly, many small details change from one interface to the next. In addition, the latest Mage features, for example, are not available for modeling in the interface.
-
-	A total overhaul of the Java code would be too much work, given the technological debt accumulated since the beginning of its development. Given the workload involved in modernizing PAMHyR, the decision is made to develop a new version of the software from scratch. This version should be equivalent to the Java version in terms of functionality, and add new features, notably the new Mage functionalities. The aim is also to have an interface that is more modern, more user-friendly, more flexible, available on multiple platforms and in different languages. The interface must also have a certain degree of generality and be able to adapt to different solvers without major changes to the interface. It is also important that the code is open to contributions, to keep the project as lively as possible.
-2.2	Technical choices
-From a technical point of view, choices were made on the basis of the above-mentioned objectives (modernity, maintainability, multiplatform, multilingual, user-friendliness, flexibility), as well as: the ease of learning the technology to facilitate contribution to the software, the popularity of the technology in the scientific community and the interoperability of this technology.
-
-	We chose Python7 as our programming language. It is a popular language in the scientific world, but also in many other fields, with lot of very active software libraries. Moreover, it is a simple and interpreted language, often recommended for beginners, and practiced by beginners and experienced developers. In addition, there is the PyQT8 software library that lets you use the Qt9 GUI library, which is ideal for this project. It is very popular and active, and available on many platforms (GNU/Linux, Windows, MacOS, Unix, BSD, Android, iOS). Qt also includes a number of tools for translating interfaces into different languages. Here we use the community version of Qt, with no paid features. For graphics and visualization, the choice fell on Matplotlib10, which is very popular in the scientific community and can be used to draw a wide variety of graphics. For saving studies, the choice was made to use SQLite11, unlike the previous version which used a text file formatted in XML. The advantages of a SQLite database, in addition to being supplied with Python, include ease of use, interoperability, fast, formal structuring by table and consistency checking between tables. We have chosen to version the database to allow it to evolve with the software, and to make it possible to add columns to tables or make other minor modifications to the database without breaking the compatibility of studies from previous versions. However, PAMHyR and Pamhyr2 study files will not be compatible anymore, and previous studies have to be recreated for this version.
-
-	This new version Pamhyr2 remains closely linked to the Mage solver with which it is supplied. But the ambition of flexibility and generalization gives us the opportunity to develop an interface that can be adapted to other solvers. There can be two solutions for using a solver with Pamhyr2: either the solver adapts to Pamhyr2, or Pamhyr2 adapts to the solver. So Pamhyr2 must integrate a generic output containing the study data that can be used by other solvers, which will be launched via an external executable, and then a generic result input that must be supplied by the solver. In addition, Pamhyr2 must be able to handle the execution and reading of results for specific solvers, and the addition of a solver to Pamhyr2 must be reasonably easy for the solver developer. We have opted for the free and open source software (FOSS) [6] license GPLv312, which guarantees freedom to access, study, modify, redistribute and share. In addition, it guarantees that Pamhyr2's code will remain free and is not allowed to be added any closed-source modifications. However, it will still be possible to use closed-source solvers, because solver is not a part of Pamhyr2.
-3.	DEVELOPMENTS
-3.1	New version of PAMHYR 
-Pamhyr2 currently features the following interfaces: Editing of river network, geometry, boundary conditions, lateral contribution, friction, initial conditions, solver numerical parameters, as well as the interface for launching a solver and displaying hydraulic and sediment results.
-3.1.1	River network
-The river network corresponds to the topology of the hydraulic network of the river. River network editing (Figure 1) is performed via a window featuring a graphical network area and two tables, one with a list of nodes (zone 3) and the other with a list of reaches (zone 2). The graphic area (zone 1) lets you add, delete and move nodes. It can also be used to link nodes in the network by arrows that represent reaches. The color of the node in the graphic area depends on whether it is a downstream, upstream or internal network node. If there is more than one reach, you can use this interface to select a reach, which will then be selected for editing in the following reach-dependent windows. It is also possible to deactivate reaches, in which case they will not be used for the solver run. Tables can be used to edit additional information on nodes and reaches, such as giving them names.
-
-
-
-Figure 1: River network window for a dummy river with 8 reaches, 2 upstream node (yellow), 1 downstream node (green) and 5 internal node (blue).
-
-3.1.2	Geometry
-Geometry editing (Figure 2) is linked to a reach; the reach used will be the last reach selected in the river network window. This window contains a table with the list of the reach’s cross-sections (zone 1) and three graphics. A top view based on the XY positions of the cross-sections’ points and guidelines (zone 2). A longitudinal view of all cross-sections with the height of the guidelines’ points for each profile (zone 3). Finally, a cross-sectional view is displayed (zone 4)  showing the selected cross-section with the previous and the following one in dotted line. Each cross-section is defined by a Kilometer Point (KP) and an optional name. The KP represents the longitudinal coordinate of the cross-section in the numerical solver. It is possible to add cross-sections and then select them to access an editing window, or to import cross-sections from file. Cross-section editing window takes the form of a table showing the raw data of the points that make up the cross-section, and a graph showing the current cross-section.
-
-
-
-Figure 2: Geometry window for Saar river on the unique reach of the Saar river study.
-
-3.1.3	Boundary conditions
-Boundary conditions (BC) are associated with a network node. There are three different types: hydrograph, water level chart or rating curve, in three different categories: Liquid, solid and suspension. Boundary conditions can be added, deleted and edited. Editing a BC (Figure 3) takes the form of a two-column table (the type of column varies according to the type of BC) and a graph representing the data. Data can be copied and pasted from a spreadsheet, or edited by hand.
-
-
-
-Figure 3: Edition window of the boundary conditions hydrograph for the Saar river upstream node.
-
-
-3.1.3	Lateral contribution
-The user interface for lateral contributions is similar to that for boundary conditions, except that it applies to a part of a reach between two KP, and not to a node.
-3.1.4	Friction
-Friction editing is linked to a reach, a friction coefficient is defined and then applied to a portion of the reach between two KP (Figure 4). Friction is defined by two Strickler coefficients, one for the river's main channel and one for the flood plain. The list of available Strickler coefficients is defined at the study level.
-
-
-
-Figure 4: The reach portions for friction coefficient edition window for the Saar study.
-
-3.1.5	Initial conditions
-The initial conditions (Figure 5) are also linked to the reach, corresponding to the water level and flow rate at the initial time of the simulation. These two values can be defined separately for each cross-section of the reach. It is also possible to use predefined functions to generate a water line and flow rate.
-
-
-
-Figure 5:  Initial conditions edition window for the Saar study and the Saar reach. Initial conditions initialized with minimal height of 3 meter and a constant flow rate of 100 m3/s.
-
-3.1.6	Running a solver
-Solver numerical parameters are defined using a key/value table specific to each type of solver known to Pamhyr2. You can select and run the desired solver from the list of configured solvers. Then a window appears with a text area where you can follow the progress of file export and solver output in Figure 6 (zone 3). You can also pause, stop or restart the solver using buttons (zone 1). Once the simulation has finished, you can open a solver trace file, and if the simulation has finished correctly, you can open the results using the “results” button (zone 2).
-
-
-
-Figure 6:  Solver log window for “Elargissement” tests case with a mage solver named “src”.
-
-3.1.7	Results processing and visualization
-The post processing window is made up of tables allowing you to select the reaches, profiles, and timestamps for visualizing the results. The results are presented in different tabs according to the type of data displayed. The Figure 7 shows hydraulic data with water level at a given reach, profile, and time. The graphs shown here are the same as those in the geometry window, with the addition of water level results at a given time.
-
-
-
-Figure 7: Hydraulics results window for “Elargissement” tests case with a Mage solver at timestamps 2113200.0 sec for reach R1 and cross-section at KP 427.7778.
-
-3.2	New features
-Some new features are already implemented in Pamhyr2. First of all, the software is multilingual with English and French currently available. An other very useful enhancement, is the possibility to use the “Ctrl+Z” or “Ctrl+Shift+Z” shortcuts to undo or redo the user actions.
-
-	Another novelty lies in the initial conditions window. Previously the water line could be generated by constant height or altitude. It is now possible to give a minimum height with an increasing function from downstream to upstream, thus avoiding physically unrealistic water holes and getting a little closer to a real and physically coherent water line (Figure 5).
-
-	An important new feature in this version is the presence of sediment layers. They can be defined as shown in Figure 8. Sediment layers can be applied separately for each cross-section (Figure 9). As with friction, they must first be defined and then applied to a profile. They can also be applied separately to each point of a cross-section. Layers are defined by a thickness, a median diameter (D50), a grain size sorting coefficient (Sigma) and a critical shear stress as described in Pierre Balayn PhD thesis [1]. The visualization of sedimentary results is currently done using a plot of the river profile, which shows the evolution of the bed bottom and the thickness of layers as a function of time (Figure 10).
-
-
-
-Figure 8: Sediment layers definition window for Saar study. This sediment layers has three layers (L1, L2 and F).
-
-
-
-
-Figure 9: Sediment layers defined in Figure 8 applied to the reach Saar.
-
-
-
-
-Figure 10: Sedimentary results window for “Elargissement” tests case at timestamps 2113200.0 sec for reach R1 and cross-section at KP 427.7778. This example has only two sediment layers.
-
-4.	Future work
-Old PAMHyR functionalities and additional functionalities, allowed the definition of structures, traps, suspended solids or dissolved pollutants in water, have yet to be developed. Additional options for visualizing results also need to be added. One possibility would be a graph generation tool that would allow the user to select x-axis and y-axis values, as well as the time range, to create a customized graph. We also planned an advanced feature with code-editing window to enable the user to define his own Matplotlib drawing function, which would be saved in the study. Presentation work is also planned to harmonize the application's icons and visuals (images, graphics, etc.). The aim is to make the application clearer and more user-friendly.
-
-	Supporting new solvers and generic solvers will also be an important part of the remaining work. To use any solver, we need to define a generic output format for Pamhyr2 that is simple enough to be given as solver input without major code modification, or that can be processed by a simple Python script (for example). The same applies to the results file that Pamhyr2 will have to read. The main candidates for these generic formats are :
-    • SQLite, because it is easy to use and the library is compatible with most programming languages,
-    • HDF513, a hierarchical file format widely used in scientific circles and compatible with many programming languages.
-
-	As the project progresses, it becomes more and more complicated to test all the functionalities by hand. A suite of tests and unit tests is needed to prevent regression bugs and ensure that the code remains maintainable. For the moment, no such test has been defined. Unit tests will have to be developed on the model and each sub-module will have to include tests, but higher-level functionalities will also have to be tested, such as the recording and playback of a complete study. It will be difficult to test the graphical part automatically, so tests will continue to be carried out manually.
-
-	Full documentation must also be provided to give users an overview of the features offered by Pamhyr2. This documentation must include descriptions of the configuration options, as well as explanations and examples of how to use each feature. In addition, this documentation must include a section for contributors and developers, with a technical presentation of the application, as well as a presentation of the translation, development and debugging tools available.
-
-	For translations into other languages than English and French, we hope that external contributors will take on this work. But no languages other are currently planned by the development team. The application packages are currently available for GNU/Linux and Windows. Under GNU/Linux, a “.tar.xz” archive is available for download. For Windows, this is an installer for application and a compatible version of Mage. An installer for GNU/Linux systems is a work in progress. There are many choices for creating an installer, but their scope depends on the distribution for which they are intended. “.deb”, for example, is intended for Debian distributions and their derivatives (Ubuntu, Linux Mint, and so on). We do not exclude other, more generic options.
-5.	Conclusion
-After a great deal of preparatory work, experimentation, technical selection, proof-of-concept and several months of development, Pamhyr2 is currently in version “v0.0.0”14 and contains almost 20,000 lines of Python code. It allows to create a minimal 1D hydro-sedimentary study, run a Mage simulation and visualize some of the results obtained, all with a more user-friendly interface. But the software is still unstable and under development, and many modifications and improvements are still to be made before it can really be used by everyone. Furthermore, even though many of the features of the original version of PAMHyR are already available (see 3.1 page 3), there are still many to be added to make Pamhyr2 a complete, useful and fully functional piece of software.
-ACKNOWLEDGEMENTS
-The results presented here partially come from the Pamhyr PITI project funded by the Carnot Eau & Environnement institute and the French National Research Agency. Carnot Eau & Environnement was accredited in March 2020 by the French Ministry of Research and Higher Education on the proposal of the Agence Nationale de la Recherche. The signatory members are INRAE, CNRS, Aix Marseille University, IFTS, INSA Lyon, IRD, Université de Montpellier and Université de Savoie Mont-Blanc.
-
-The authors thank Sylvain Coulibaly for his preparatory work and his technical choices.
-REFERENCES and Citations
-[1]	Balayn, P. (2001). Contribution à la modélisation numérique de l'évolution morphologique des cours d'eau aménagés lors de crues. Université Claude Bernard - Lyon 1
-[2]	Camenen, B., Faure, J. Décanis, S. Diéval, L. (2021) A 1D numerical tool for real time modelling of a complex river network, SimHydro 2021
-[3]	Faure, J. (2013). An Integrated Simulation platform - PAMHyR. In John Wiley & Sons, Inc. eBooks (pp. 245–252). https://doi.org/10.1002/9781118557891.ch21
-[4]	Faure, J. (2017). Développement d’Adis-TS. OSR4 | Action V.1. https://hal.science/hal-03749339
-[5]	Faure, J-B., (2019). Mage, Résolution des équations de Barré de St Venant 1D en réseaux complexes, Documentation théorique et mode d’emploi. Techreport (in French)
-[6]	Walt, S. 2007. Free/open source software development. In Proceedings of the the 6th joint meeting of the European software engineering conference and the ACM SIGSOFT symposium on The foundations of software engineering (ESEC-FSE '07). Association for Computing Machinery, New York, NY, USA, 459–468. https://doi.org/10.1145/1287624.1287689
-
@@ -1,164 +0,0 @@
-\ProvidesClass{Pamhyr}[Pamhyr class]
-\NeedsTeXFormat{LaTeX2e}
-\ProcessOptions\relax
-\LoadClass[11pt,a4paper]{article}
-
-\usepackage[hmargin=2cm, vmargin=3cm]{geometry}
-\usepackage[british,UKenglish,USenglish,english,american]{babel}
-\usepackage[T1]{fontenc}
-\usepackage{times}
-\usepackage[usenames,dvipsnames]{xcolor}
-\usepackage[absolute]{textpos}
-\usepackage{titlesec}
-\usepackage{amssymb}
-\usepackage[minted,xparse,breakable]{tcolorbox}
-\usepackage{pmboxdraw}
-
-\usepackage{enumitem}
-\setlist[enumerate]{itemsep=-0.5em}
-\setlist[itemize]{itemsep=-0.5em}
-
-%%
-%% Bibtex
-%%
-
-\bibliographystyle{plain}
-
-%%
-%% Colors
-%%
-
-\definecolor{primary}{HTML}{212121}
-\definecolor{lightheadings}{HTML}{5c5c5c}
-\definecolor{headings}{HTML}{212121}
-\definecolor{links}{HTML}{e12121}
-
-%%
-%% Title
-%%
-
-\setlength{\columnsep}{20pt}
-\setlength{\parskip}{0pt}      %% inter paragraph space
-
-\renewcommand{\maketitle}{
-    {
-      \centering
-      {
-        \fontsize{35}{40}
-        \selectfont
-        \scshape
-        Pamhyr2 \\
-        \medskip
-      }
-      {
-        %\centering
-        \scshape
-        \fontsize{20pt}{24pt}
-        \selectfont
-        A graphical user interface for 1D hydro-sedimentary modelling
-        of rivers \\
-        \medskip
-      }
-      \rule{3cm}{0.4pt}\\
-      \vspace{0.3cm}
-      {
-        %\centering
-        \scshape
-        \fontsize{26pt}{24pt}
-        \selectfont
-        \@title \\
-        Document licence: GPLv3 \\
-        \medskip
-        \includegraphics[width=3cm]{../images/GPLv3_Logo.png} \\
-        \medskip
-        \fontsize{14pt}{16pt}
-        \selectfont
-        © \@author \\
-        \medskip
-      }
-      {
-        %\centering
-        %\scshape
-        \fontsize{12pt}{14pt}
-        \selectfont
-        \@date
-        %\medskip
-      }\\
-      \vspace{0.3cm}
-      \rule{3cm}{0.4pt}\\
-      \vspace{0.3cm}
-      {
-        \begin{minipage}[h]{0.24\textwidth}
-          \includegraphics[width=4cm]{../../src/View/ui/ressources/Logo-INRAE.png}
-        \end{minipage}
-        \begin{minipage}[h]{0.24\textwidth}
-          \includegraphics[width=4cm]{../images/riverly.png}
-        \end{minipage}
-      }\\
-      \vspace{0.3cm}
-      %%\rule{\textwidth}{0.4pt}
-      %%\newpage
-    }
-}
-
-
-%%
-%% Texttt
-%%
-
-\usepackage[htt]{hyphenat}      % Make texttt split at end of line
-
-%%
-%% Verbatim
-%%
-
-\AtBeginEnvironment{verbatim}{\footnotesize}
-
-%% Add box arrond of verbatim
-\BeforeBeginEnvironment{verbatim}{\begin{tcolorbox}[boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
-\AfterEndEnvironment{verbatim}{\end{tcolorbox}}%
-
-\makeatletter
-\AtBeginEnvironment{verbatim}{\dontdofcolorbox}
-
-\def\dontdofcolorbox{\renewcommand\fcolorbox[4][]{##4}}
-\makeatother
-
-%%
-%% Source code blocks
-%%
-
-%% Use minted
-\usepackage{minted}
-\usemintedstyle{tango}
-\setminted[c]{fontsize=\footnotesize,encoding=utf8,linenos}
-\setminted[c++]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
-\setminted[python]{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}
-\setminted[text]{breaklines,fontsize=\footnotesize,encoding=utf8}
-\setminted[llvm]{breaklines,fontsize=\footnotesize,encoding=utf8}
-
-%% Add box arrond of minted
-\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[breakable, boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
-\AfterEndEnvironment{minted}{\end{tcolorbox}}%
-
-\makeatletter
-\AtBeginEnvironment{minted}{\dontdofcolorbox}
-
-\def\dontdofcolorbox{\renewcommand\fcolorbox[4][]{##4}}
-\makeatother
-
-
-%%
-%% Water mark
-%%
-
-%% FIXME: Delete me for the first realease
-\usepackage{draftwatermark}
-\SetWatermarkLightness{0.8}
-\SetWatermarkAngle{25}
-\SetWatermarkScale{3}
-\SetWatermarkFontSize{1cm}
-\SetWatermarkText{Work in progress}
@@ -1,19 +0,0 @@
-# latex.org -- Pamhyr documentation latex config
-# 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 -*-
-
-#+LaTeX_CLASS: PamhyrDoc
@@ -1,51 +0,0 @@
-# macro.org -- Pamhyr documentation macro
-# 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 -*-
-
-# Constant name
-#+MACRO: oldPamhyr     PAMHyR
-#+MACRO: Pamhyr        Pamhyr2
-#+MACRO: Mage          Mage
-#+MACRO: Rubarbe       RubarBE
-#+MACRO: Inrae         INRAE
-#+MACRO: latex         \LaTeX
-
-# Information
-#+MACRO: version       (eval (pamhyr-version))
-#+MACRO: current-file  (eval (pamhyr-current-file))
-
-# Special format
-#+MACRO: file          =$1=
-
-# Biblio
-#+MACRO: cite          [cite:$1]
-#+MACRO: biblio        \bibliography{documentation}
-
-# Wrapper
-#+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
@@ -1,66 +0,0 @@
-(require 'org)
-(require 'subr-x)
-
-;; LaTeX config
-
-(add-to-list
- 'org-latex-classes
- '("PamhyrDoc"
-   "\\documentclass{../tools/PamhyrDoc}"
-   ("\\section{%s}" . "\\section*{%s}")
-   ("\\subsection{%s}" . "\\subsection*{%s}")
-   ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
-   ("\\paragraph{%s}" . "\\paragraph*{%s}")
-   ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))
-
-(setq org-confirm-babel-evaluate nil)
-(setq org-latex-caption-above nil)
-
-(org-babel-do-load-languages
-   'org-babel-load-languages
-   (add-to-list 'org-babel-load-languages '(shell . t)))
-
-(org-babel-do-load-languages
- 'org-babel-load-languages
- (add-to-list 'org-babel-load-languages '(dot . t)))
-
-(org-babel-do-load-languages
- 'org-babel-load-languages
- (add-to-list 'org-babel-load-languages '(python . t)))
-
-(add-to-list 'org-latex-packages-alist '("" "minted"))
-(setq org-latex-listings 'minted)
-(setq org-src-fontify-natively t)
-
-(setq org-latex-pdf-process
-      '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
-        "bibtex documentation"
-        "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
-        "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
-
-;; Citations
-
-(org-add-link-type
- "cite" 'ebib
- (lambda (path desc format)
-   (cond
-    ((eq format 'html)
-     (format "(<cite>%s</cite>)" 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))))))
-
-;; Functools
-
-(defun pamhyr-version ()
-  "Return the contents of the pamhyr version file."
-  (with-temp-buffer
-    (insert-file-contents "../../VERSION")
-    (buffer-string)))
-
-(defun pamhyr-current-file ()
-  (let ((lst (split-string (buffer-file-name) "/")))
-    (string-join (nthcdr (- (length lst) 3) lst) "/")))
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-pdflatex -no-shell-escape step-by-step.tex
-pdflatex -no-shell-escape pas-a-pas.tex
@@ -1,442 +0,0 @@
-     1     0     0     8   31090.0000   
-   31090.0000       0.0000      23.7300 
-   31090.0000       2.5000      20.2800 rg
-   31090.0000       2.5000      19.2900 
-   31090.0000       4.4000      19.2900 
-   31090.0000      10.7000      19.5900 
-   31090.0000      10.7000      20.5900 rd
-   31090.0000      14.5000      21.7100 
-   31090.0000      17.6000      23.7300 
-     999.9990     999.9990     999.9990 
-     2     0     0     8   31165.0000   
-   31165.0000       0.0000      22.8400 
-   31165.0000       2.5000      20.1300 rg
-   31165.0000       2.5000      19.2300 
-   31165.0000       4.4000      19.2300 
-   31165.0000      10.7000      19.5300 
-   31165.0000      10.7000      20.5300 rd
-   31165.0000      14.5000      21.7500 
-   31165.0000      17.6000      23.5000 
-     999.9990     999.9990     999.9990 
-     3     0     0    10   31425.0000   
-   31425.0000      -1.0000      22.8000 
-   31425.0000       0.0000      21.9000 
-   31425.0000       1.7000      20.3600 rg
-   31425.0000       2.5000      19.6300 
-   31425.0000       2.5000      19.0300 
-   31425.0000       4.4000      19.0300 
-   31425.0000      10.7000      19.3300 
-   31425.0000      10.7000      20.3300 rd
-   31425.0000      14.5000      21.9200 
-   31425.0000      17.6000      23.4200 
-     999.9990     999.9990     999.9990 
-     4     0     0    10   31590.0000   
-   31590.0000      -1.0000      22.7500 
-   31590.0000       0.0000      22.0500 
-   31590.0000       1.6700      20.2200 rg
-   31590.0000       2.5000      19.3100 
-   31590.0000       2.5000      18.9000 
-   31590.0000       4.4000      18.9000 
-   31590.0000      10.7000      19.2000 
-   31590.0000      10.7000      20.2000 rd
-   31590.0000      14.5000      22.0200 
-   31590.0000      17.6000      23.2500 
-     999.9990     999.9990     999.9990 
-     5     0     0    10   31780.0000   
-   31780.0000      -1.0000      22.7000 
-   31780.0000       0.0000      22.0500 
-   31780.0000       1.6000      20.0500 rg
-   31780.0000       2.5000      18.9400 
-   31780.0000       2.5000      18.7500 
-   31780.0000       4.4000      18.7500 
-   31780.0000      10.7000      19.0500 
-   31780.0000      10.7000      20.0500 rd
-   31780.0000      14.5000      22.1400 
-   31780.0000      17.6000      23.0000 
-     999.9990     999.9990     999.9990 
-     6     0     0     9   31874.0000   
-   31874.0000       0.0000      22.9900 
-   31874.0000       0.0000      22.6900 
-   31874.0000       2.5000      19.6900 rg
-   31874.0000       2.5000      18.6900 
-   31874.0000       4.4000      18.6900 
-   31874.0000      10.7000      18.9900 
-   31874.0000      10.7000      19.9900 rd
-   31874.0000      14.5000      22.1900 
-   31874.0000      17.6000      22.9900 
-     999.9990     999.9990     999.9990 
-     7     0     0     9   31875.0000   PontRD101m
-   31875.0000       0.5400      23.0000 
-   31875.0000       0.5400      21.8900 
-   31875.0000       2.5000      19.6900 rg
-   31875.0000       2.5000      18.6900 
-   31875.0000       4.4000      18.6900 
-   31875.0000      10.7000      18.9900 
-   31875.0000      10.7000      19.9900 rd
-   31875.0000      13.8900      21.8900 
-   31875.0000      13.8900      23.0000 
-     999.9990     999.9990     999.9990 
-     8     0     0     9   31885.0000   PontRD101v
-   31885.0000       0.5400      23.0000 
-   31885.0000       0.5400      21.8900 
-   31885.0000       2.5000      19.6900 rg
-   31885.0000       2.5000      18.6900 
-   31885.0000       4.4000      18.6900 
-   31885.0000      10.7000      18.9900 
-   31885.0000      10.7000      19.9900 rd
-   31885.0000      13.8900      21.8900 
-   31885.0000      13.8900      23.0000 
-     999.9990     999.9990     999.9990 
-     9     0     0     9   31886.0000   
-   31886.0000       0.0000      22.9900 
-   31886.0000       0.0000      22.6900 
-   31886.0000       2.5000      19.6900 rg
-   31886.0000       2.5000      18.6900 
-   31886.0000       4.4000      18.6900 
-   31886.0000      10.7000      18.9900 
-   31886.0000      10.7000      19.9900 rd
-   31886.0000      14.5000      22.1900 
-   31886.0000      17.6000      22.9900 
-     999.9990     999.9990     999.9990 
-    10     0     0    13   32015.0000   
-   32015.0000       0.0000      22.6400 
-   32015.0000       0.2000      22.2200 
-   32015.0000       1.3000      20.9900 
-   32015.0000       2.0000      19.8800 rg
-   32015.0000       3.0000      18.6600 
-   32015.0000       3.0000      18.5800 
-   32015.0000       5.5000      18.5800 
-   32015.0000      10.0000      18.9100 
-   32015.0000      11.5000      19.2500 
-   32015.0000      11.5000      20.0800 rd
-   32015.0000      15.1000      22.0600 
-   32015.0000      17.6000      22.5100 
-   32015.0000      18.0000      22.8100 
-     999.9990     999.9990     999.9990 
-    11     0     0    13   32205.0000   
-   32205.0000       0.0000      22.3300 
-   32205.0000       0.2000      22.1800 
-   32205.0000       1.5000      21.0600 
-   32205.0000       2.5000      19.7700 rg
-   32205.0000       3.6000      18.5100 
-   32205.0000       3.6000      18.4500 
-   32205.0000       6.9000      18.4500 
-   32205.0000       8.8000      19.0500 
-   32205.0000      12.5000      19.5700 rd
-   32205.0000      12.5000      20.1800 
-   32205.0000      15.8000      21.9000 
-   32205.0000      18.1000      22.4000 
-   32205.0000      18.6000      22.5500 
-     999.9990     999.9990     999.9990 
-    12     0     0    13   32460.0000   
-   32460.0000       0.0000      22.1500 
-   32460.0000       0.3000      22.1300 
-   32460.0000       1.8000      21.1600 
-   32460.0000       3.0000      19.6400 rg
-   32460.0000       4.4000      18.3100 
-   32460.0000       4.4000      18.2800 
-   32460.0000       8.7000      18.2800 
-   32460.0000      10.4000      19.2400 rd
-   32460.0000      13.7000      19.9900 
-   32460.0000      13.7000      20.3300 
-   32460.0000      16.8000      21.6800 
-   32460.0000      18.9000      22.2500 
-   32460.0000      19.3000      22.5500 
-     999.9990     999.9990     999.9990 
-    13     0     0    13   32655.0000   
-   32655.0000       0.0000      22.4500 
-   32655.0000       0.3000      22.0900 
-   32655.0000       2.1000      21.2300 
-   32655.0000       3.4000      19.5300 rg
-   32655.0000       5.0000      18.1600 
-   32655.0000       5.0000      18.1400 
-   32655.0000      10.1000      18.1400 
-   32655.0000      11.6000      19.3900 rd
-   32655.0000      14.7000      20.3100 
-   32655.0000      14.7000      20.4300 
-   32655.0000      17.5000      21.5200 
-   32655.0000      19.4000      22.1400 
-   32655.0000      19.8000      22.4500 
-     999.9990     999.9990     999.9990 
-    14     0     0    13   32755.0000   
-   32755.0000       0.0000      22.4500 
-   32755.0000       0.3000      22.0900 
-   32755.0000       2.1000      21.2300 
-   32755.0000       3.4000      19.5300 rg
-   32755.0000       4.0000      18.0500 
-   32755.0000       5.0000      18.0100 
-   32755.0000      10.1000      18.0100 
-   32755.0000      13.0000      19.3900 rd
-   32755.0000      14.7000      20.3100 
-   32755.0000      14.7000      20.4300 
-   32755.0000      17.5000      21.5200 
-   32755.0000      19.4000      22.1400 
-   32755.0000      19.8000      22.4500 
-     999.9990     999.9990     999.9990 
-    15     0     0    10   32770.0000   PontA2
-   32770.0000       0.0000      25.0000 
-   32770.0000       1.9000      25.0000 
-   32770.0000       1.9000      21.2700 
-   32770.0000       3.3000      19.4700 rg
-   32770.0000       5.0000      18.0100 
-   32770.0000      10.5000      18.0100 
-   32770.0000      12.0000      19.4700 rd
-   32770.0000      19.4000      21.4700 
-   32770.0000      19.4000      25.0000 
-   32770.0000      20.3000      25.0000 
-     999.9990     999.9990     999.9990 
-    16     0     0    10   32800.0000   PontA2
-   32800.0000       0.0000      25.0000 
-   32800.0000       1.9000      25.0000 
-   32800.0000       1.9000      21.2700 
-   32800.0000       3.3000      19.4700 rg
-   32800.0000       5.0000      18.0100 
-   32800.0000      10.5000      18.0100 
-   32800.0000      12.0000      19.4700 rd
-   32800.0000      19.4000      21.4700 
-   32800.0000      19.4000      25.0000 
-   32800.0000      20.3000      25.0000 
-     999.9990     999.9990     999.9990 
-    17     0     0    13   32820.0000   
-   32820.0000       0.0000      22.4500 
-   32820.0000       0.3000      22.0900 
-   32820.0000       2.1000      21.2300 
-   32820.0000       3.4000      19.5300 rg
-   32820.0000       4.0000      18.0500 
-   32820.0000       5.0000      18.0100 
-   32820.0000      10.1000      18.0100 
-   32820.0000      13.0000      19.3900 rd
-   32820.0000      14.7000      20.3100 
-   32820.0000      14.7000      20.4300 
-   32820.0000      17.5000      21.5200 
-   32820.0000      19.4000      22.1400 
-   32820.0000      19.8000      22.4500 
-     999.9990     999.9990     999.9990 
-    18     0     0    11   32915.0000   
-   32915.0000       0.0000      22.5500 
-   32915.0000       0.4000      21.9500 
-   32915.0000       1.7000      21.2200 
-   32915.0000       2.4000      20.9700 
-   32915.0000       3.8000      19.4100 rg
-   32915.0000       3.9000      19.3100 
-   32915.0000       5.8000      18.0100 
-   32915.0000      11.0000      18.0100 
-   32915.0000      12.4000      19.3400 rd
-   32915.0000      19.4000      21.9900 
-   32915.0000      19.7000      22.5500 
-     999.9990     999.9990     999.9990 
-    19     0     0    10   33140.0000   
-   33140.0000       0.4000      21.7700 
-   33140.0000       1.9000      20.7600 
-   33140.0000       2.7000      20.5100 
-   33140.0000       4.2000      19.1500 rg
-   33140.0000       4.3000      19.0600 
-   33140.0000       6.4000      17.9200 
-   33140.0000      11.3000      17.9200 
-   33140.0000      12.6000      19.1400 rd
-   33140.0000      18.9000      21.8700 
-   33140.0000      19.2000      22.1800 
-     999.9990     999.9990     999.9990 
-    20     0     0    10   33425.0000   
-   33425.0000       0.0000      21.6800 
-   33425.0000       0.5000      21.5300 
-   33425.0000       2.2000      20.1600 
-   33425.0000       3.0000      19.9400 
-   33425.0000       4.8000      18.8200 rg
-   33425.0000       4.9000      18.7500 
-   33425.0000       7.2000      17.8000 
-   33425.0000      11.7000      17.8000 
-   33425.0000      12.8000      18.8800 rd
-   33425.0000      18.2000      21.6800 
-     999.9990     999.9990     999.9990 
-    21     0     0    10   33685.0000   
-   33685.0000       0.0000      21.5300 
-   33685.0000       0.5000      21.3200 
-   33685.0000       2.4000      19.6200 
-   33685.0000       3.3000      19.4200 
-   33685.0000       5.2000      18.5300 rg
-   33685.0000       5.4000      18.4700 
-   33685.0000       7.9000      17.7000 
-   33685.0000      12.0000      17.7000 
-   33685.0000      12.9000      18.6500 rd
-   33685.0000      17.6000      21.5300 
-     999.9990     999.9990     999.9990 
-    22     0     0     9   33920.0000   
-   33920.0000       0.6000      20.9800 
-   33920.0000       2.6000      19.1300 
-   33920.0000       3.6000      18.9400 
-   33920.0000       5.7000      18.2600 rg
-   33920.0000       5.8000      18.2200 
-   33920.0000       8.5000      17.6000 
-   33920.0000      12.3000      17.6000 
-   33920.0000      13.1000      18.4400 rd
-   33920.0000      17.0000      21.1300 
-     999.9990     999.9990     999.9990 
-    23     0     0     9   34095.0000   
-   34095.0000       0.6000      20.9500 
-   34095.0000       2.7000      18.7700 
-   34095.0000       3.8000      18.5900 
-   34095.0000       6.0000      18.0600 rg
-   34095.0000       6.1000      18.0300 
-   34095.0000       9.0000      17.5300 
-   34095.0000      12.5000      17.5300 
-   34095.0000      13.2000      18.2800 rd
-   34095.0000      16.6000      20.9800 
-     999.9990     999.9990     999.9990 
-    24     0     0    10   34295.0000   
-   34295.0000       0.0000      21.3600 
-   34295.0000       0.6000      20.8300 
-   34295.0000       2.4000      18.3500 
-   34295.0000       3.5000      18.1900 
-   34295.0000       5.8000      17.8300 rg
-   34295.0000       6.5000      17.3400 
-   34295.0000       9.5000      17.3600 
-   34295.0000      12.8000      17.4100 
-   34295.0000      14.0000      18.1000 rd
-   34295.0000      16.1000      21.3600 
-     999.9990     999.9990     999.9990 
-    25     0     0    10   34334.0000   amontPontThivencel
-   34334.0000       0.0000      21.3600 
-   34334.0000       0.6000      20.8300 
-   34334.0000       2.4000      18.3500 
-   34334.0000       3.5000      18.1900 
-   34334.0000       5.8000      17.8300 rg
-   34334.0000       6.5000      17.3400 
-   34334.0000       9.5000      17.3600 
-   34334.0000      12.8000      17.4100 
-   34334.0000      14.0000      18.1000 rd
-   34334.0000      16.1000      21.1300 
-     999.9990     999.9990     999.9990 
-    26     0     0     9   34335.0000   PontmThivencelle
-   34335.0000       2.9000      22.0000 
-   34335.0000       2.9000      20.7400 
-   34335.0000       2.9000      18.2900 rg
-   34335.0000       6.4000      17.7900 
-   34335.0000       9.6000      17.2600 
-   34335.0000      12.8000      17.2600 
-   34335.0000      12.8000      18.3100 rd
-   34335.0000      12.8000      20.7400 
-   34335.0000      12.8000      22.0000 
-     999.9990     999.9990     999.9990 
-    27     0     0     9   34343.0000   PontvThivencelle
-   34343.0000       2.9000      22.0000 
-   34343.0000       2.9000      20.7400 
-   34343.0000       2.9000      18.2900 rg
-   34343.0000       6.4000      17.7900 
-   34343.0000       9.6000      17.2600 
-   34343.0000      12.8000      17.2600 
-   34343.0000      12.8000      18.2900 rd
-   34343.0000      12.8000      20.7400 
-   34343.0000      12.8000      22.0000 
-     999.9990     999.9990     999.9990 
-    28     0     0    10   34345.0000   avalPontThivencell
-   34345.0000       0.0000      21.3600 
-   34345.0000       0.6000      20.8300 
-   34345.0000       2.4000      18.3500 
-   34345.0000       3.5000      18.1900 
-   34345.0000       5.8000      17.8300 rg
-   34345.0000       6.5000      17.3400 
-   34345.0000       9.5000      17.2600 
-   34345.0000      12.8000      17.4100 
-   34345.0000      14.0000      18.1000 rd
-   34345.0000      16.1000      21.1300 
-     999.9990     999.9990     999.9990 
-    29     0     0     7   34405.0000   
-   34405.0000       0.0000      21.1400 
-   34405.0000       2.9000      17.8400 rg
-   34405.0000       6.4000      17.4400 
-   34405.0000       9.6000      17.2000 
-   34405.0000      12.8000      17.2200 
-   34405.0000      13.9000      17.8400 rd
-   34405.0000      19.0000      21.0000 
-     999.9990     999.9990     999.9990 
-    30     0     0     7   34535.0000   
-   34535.0000       0.0000      20.5900 
-   34535.0000       2.9000      17.7400 rg
-   34535.0000       6.4000      17.2400 
-   34535.0000       9.6000      17.0300 
-   34535.0000      12.8000      17.0300 
-   34535.0000      13.5000      17.7400 rd
-   34535.0000      15.8000      20.6000 
-     999.9990     999.9990     999.9990 
-    31     0     0     7   34705.0000   
-   34705.0000       0.0000      20.5000 
-   34705.0000       2.9000      17.6100 rg
-   34705.0000       6.4000      17.1100 
-   34705.0000       9.6000      16.8500 
-   34705.0000      12.8000      16.8500 
-   34705.0000      14.0000      18.0000 rd
-   34705.0000      16.2000      20.5300 
-     999.9990     999.9990     999.9990 
-    32     0     0     7   34825.0000   
-   34825.0000       0.0000      20.6200 
-   34825.0000       2.9000      17.5200 rg
-   34825.0000       6.4000      17.0200 
-   34825.0000       9.6000      16.7100 
-   34825.0000      12.8000      16.7100 
-   34825.0000      13.5000      17.5200 rd
-   34825.0000      16.2000      20.5000 
-     999.9990     999.9990     999.9990 
-    33     0     0     7   34995.0000   
-   34995.0000       0.0000      20.3900 
-   34995.0000       2.9000      17.3900 rg
-   34995.0000       6.4000      16.8900 
-   34995.0000       9.6000      16.5300 
-   34995.0000      12.8000      16.5300 
-   34995.0000      13.6000      17.4300 rd
-   34995.0000      16.2000      20.3200 
-     999.9990     999.9990     999.9990 
-    34     0     0     7   35135.0000   
-   35135.0000       0.0000      20.1600 
-   35135.0000       2.9000      17.2900 rg
-   35135.0000       6.4000      16.7900 
-   35135.0000       9.6000      16.4300 
-   35135.0000      12.8000      16.4300 
-   35135.0000      13.9000      17.3700 rd
-   35135.0000      16.2000      20.0600 
-     999.9990     999.9990     999.9990 
-    35     0     0     7   35360.0000   
-   35360.0000       0.0000      19.8600 
-   35360.0000       2.9000      17.1200 rg
-   35360.0000       6.4000      16.6200 
-   35360.0000       9.6000      16.2600 
-   35360.0000      12.8000      16.2600 
-   35360.0000      13.7000      17.1200 rd
-   35360.0000      16.2000      19.4600 
-     999.9990     999.9990     999.9990 
-    36     0     0     7   35580.0000   
-   35580.0000       0.0000      20.0000 
-   35580.0000       2.9000      16.9500 rg
-   35580.0000       3.0000      16.0900 
-   35580.0000      11.5000      16.0500 
-   35580.0000      20.0000      16.0900 
-   35580.0000      21.0000      17.0300 rd
-   35580.0000      23.0000      19.5000 
-     999.9990     999.9990     999.9990 
-    37     0     0     7   35920.0000   
-   35920.0000       0.0000      20.0000 
-   35920.0000       2.2000      16.0200 rg
-   35920.0000       3.0000      14.5500 
-   35920.0000      11.5000      14.5000 
-   35920.0000      20.0000      14.5500 
-   35920.0000      20.9000      16.0200 rd
-   35920.0000      23.0000      19.5000 
-     999.9990     999.9990     999.9990 
-    38     0     0     7   36270.0000   S1
-   36270.0000       0.0000      20.0000 
-   36270.0000       1.8000      17.0100 rg
-   36270.0000       3.0000      15.0800 
-   36270.0000      11.5000      15.0500 
-   36270.0000      20.0000      15.0800 
-   36270.0000      21.3000      17.0100 rd
-   36270.0000      23.0000      19.5000 
-     999.9990     999.9990     999.9990 
-    39     0     0     7   36271.0000   S1bis
-   36271.0000       0.0000      20.0000 
-   36271.0000       1.8000      17.0100 rg
-   36271.0000       3.0000      13.0800 
-   36271.0000      11.5000      13.0500 
-   36271.0000      20.0000      13.0800 
-   36271.0000      21.3000      17.0100 rd
-   36271.0000      23.0000      19.5000 
-     999.9990     999.9990     999.9990 
@@ -1,2 +0,0 @@
-0:00:00:00	15
-0:00:01:00	15
@@ -1,25 +0,0 @@
-0:00:00:00	5,53
-0:11:37:00	5,72
-0:16:17:00	5,82
-0:22:57:00	5,92
-1:00:00:00	6,6
-1:00:57:00	8,04
-1:02:29:00	14,3
-1:04:38:00	24,4
-1:08:48:00	40
-1:11:27:00	46,3
-1:13:47:00	48,8
-1:16:07:00	47,9
-1:17:17:00	44,8
-1:20:23:00	27,8
-1:21:57:00	24,3
-2:01:15:00	19,2
-2:05:15:00	15,8
-2:11:25:00	11,5
-2:11:57:00	11,1
-2:13:17:00	10,5
-2:19:07:00	9,84
-2:23:59:00	8,43
-3:04:51:00	7,02
-3:09:43:00	5,61
-3:14:35:00	5,53
@@ -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
@@ -1 +0,0 @@
-$Clapet_001  clapet
@@ -1,2 +0,0 @@
-0:00:00:00	4
-0:00:01:00	4
@@ -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
@@ -1,9 +0,0 @@
-0:00:00:00	4
-0:01:16:48	4
-0:16:00:00	50
-1:11:46:28	36,8
-2:07:27:22	23,3
-5:04:24:58	13,8
-10:03:00:06	9,38
-20:02:19:58	7,29
-30:01:54:37	5,97
@@ -1,10 +0,0 @@
-0:00:00:00	4
-0:01:49:48	4
-0:16:00:00	35
-1:11:25:48	25
-2:07:30:00	16,4
-5:03:55:12	9,66
-10:03:00:00	6,56
-27:00:54:00	4,91
-30:01:48:36	4
-31:06:00:00	4