mirror of https://gitlab.com/pamhyr/pamhyr2
Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into terraz_dev
Theophile Terraz
commit
6000a91e74
|
|
@ -270,6 +270,7 @@ flycheck_*.el
|
|||
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/emacs
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/qt
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=qt
|
||||
|
||||
|
|
@ -645,3 +646,233 @@ TSWLatexianTemp*
|
|||
*.glstex
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/latex
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/intellij
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij
|
||||
|
||||
### Intellij ###
|
||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
.idea/**/tasks.xml
|
||||
.idea/**/usage.statistics.xml
|
||||
.idea/**/dictionaries
|
||||
.idea/**/shelf
|
||||
|
||||
# AWS User-specific
|
||||
.idea/**/aws.xml
|
||||
|
||||
# Generated files
|
||||
.idea/**/contentModel.xml
|
||||
|
||||
# Sensitive or high-churn files
|
||||
.idea/**/dataSources/
|
||||
.idea/**/dataSources.ids
|
||||
.idea/**/dataSources.local.xml
|
||||
.idea/**/sqlDataSources.xml
|
||||
.idea/**/dynamic.xml
|
||||
.idea/**/uiDesigner.xml
|
||||
.idea/**/dbnavigator.xml
|
||||
|
||||
# Gradle
|
||||
.idea/**/gradle.xml
|
||||
.idea/**/libraries
|
||||
|
||||
# Gradle and Maven with auto-import
|
||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||
# since they will be recreated, and may cause churn. Uncomment if using
|
||||
# auto-import.
|
||||
# .idea/artifacts
|
||||
# .idea/compiler.xml
|
||||
# .idea/jarRepositories.xml
|
||||
# .idea/modules.xml
|
||||
# .idea/*.iml
|
||||
# .idea/modules
|
||||
# *.iml
|
||||
# *.ipr
|
||||
|
||||
# CMake
|
||||
cmake-build-*/
|
||||
|
||||
# Mongo Explorer plugin
|
||||
.idea/**/mongoSettings.xml
|
||||
|
||||
# File-based project format
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Cursive Clojure plugin
|
||||
.idea/replstate.xml
|
||||
|
||||
# SonarLint plugin
|
||||
.idea/sonarlint/
|
||||
|
||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||
com_crashlytics_export_strings.xml
|
||||
crashlytics.properties
|
||||
crashlytics-build.properties
|
||||
fabric.properties
|
||||
|
||||
# Editor-based Rest Client
|
||||
.idea/httpRequests
|
||||
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
### Intellij Patch ###
|
||||
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
|
||||
|
||||
# *.iml
|
||||
# modules.xml
|
||||
# .idea/misc.xml
|
||||
# *.ipr
|
||||
|
||||
# Sonarlint plugin
|
||||
# https://plugins.jetbrains.com/plugin/7973-sonarlint
|
||||
.idea/**/sonarlint/
|
||||
|
||||
# SonarQube Plugin
|
||||
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
|
||||
.idea/**/sonarIssues.xml
|
||||
|
||||
# Markdown Navigator plugin
|
||||
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
|
||||
.idea/**/markdown-navigator.xml
|
||||
.idea/**/markdown-navigator-enh.xml
|
||||
.idea/**/markdown-navigator/
|
||||
|
||||
# Cache file creation bug
|
||||
# See https://youtrack.jetbrains.com/issue/JBR-2257
|
||||
.idea/$CACHE_FILE$
|
||||
|
||||
# CodeStream plugin
|
||||
# https://plugins.jetbrains.com/plugin/12206-codestream
|
||||
.idea/codestream.xml
|
||||
|
||||
# Azure Toolkit for IntelliJ plugin
|
||||
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
|
||||
.idea/**/azureSettings.xml
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/intellij
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode
|
||||
|
||||
### VisualStudioCode ###
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
!.vscode/*.code-snippets
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Built Visual Studio Code Extensions
|
||||
*.vsix
|
||||
|
||||
### VisualStudioCode Patch ###
|
||||
# Ignore all local history of files
|
||||
.history
|
||||
.ionide
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/linux
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=linux
|
||||
|
||||
### Linux ###
|
||||
*~
|
||||
|
||||
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||
.fuse_hidden*
|
||||
|
||||
# KDE directory preferences
|
||||
.directory
|
||||
|
||||
# Linux trash folder which might appear on any partition or disk
|
||||
.Trash-*
|
||||
|
||||
# .nfs files are created when an open file is removed but is still being accessed
|
||||
.nfs*
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/linux
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/macos
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=macos
|
||||
|
||||
### macOS ###
|
||||
# General
|
||||
.DS_Store
|
||||
.AppleDouble
|
||||
.LSOverride
|
||||
|
||||
# Icon must end with two \r
|
||||
Icon
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
# Files that might appear in the root of a volume
|
||||
.DocumentRevisions-V100
|
||||
.fseventsd
|
||||
.Spotlight-V100
|
||||
.TemporaryItems
|
||||
.Trashes
|
||||
.VolumeIcon.icns
|
||||
.com.apple.timemachine.donotpresent
|
||||
|
||||
# Directories potentially created on remote AFP share
|
||||
.AppleDB
|
||||
.AppleDesktop
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
### macOS Patch ###
|
||||
# iCloud generated files
|
||||
*.icloud
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/macos
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/windows
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=windows
|
||||
|
||||
### Windows ###
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
Thumbs.db:encryptable
|
||||
ehthumbs.db
|
||||
ehthumbs_vista.db
|
||||
|
||||
# Dump file
|
||||
*.stackdump
|
||||
|
||||
# Folder config file
|
||||
[Dd]esktop.ini
|
||||
|
||||
# Recycle Bin used on file shares
|
||||
$RECYCLE.BIN/
|
||||
|
||||
# Windows Installer files
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/windows
|
||||
|
|
|
|||
47
README.md
47
README.md
|
|
@ -3,53 +3,38 @@
|
|||
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 a complex river hydraulics network
|
||||
+ Define the river geometry
|
||||
+ Define boundary conditions
|
||||
+ Define lateral contribution
|
||||
+ Edit river friction
|
||||
+ Add reservoirs
|
||||
+ Add hydraulic structures
|
||||
+ Generate initial conditions
|
||||
+ Edit river sedimentary layers
|
||||
+ Define river friction
|
||||
+ Define reservoirs
|
||||
+ Define hydraulic structures
|
||||
+ Define or generate initial conditions
|
||||
+ Define river sedimentary layers
|
||||
+ Save the study in a unique file
|
||||
+ Run Mage 8 on a study and visualize results
|
||||
|
||||
Let see the
|
||||
[documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home)
|
||||
([:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home-fr),
|
||||
[:gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home-en))
|
||||
for more details.
|
||||
|
||||
## Install
|
||||
|
||||
### GNU/Linux
|
||||
|
||||
[See documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux)
|
||||
See documentation:
|
||||
- [French :fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20GNULinux)
|
||||
- [English :gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux)
|
||||
|
||||
### Windows
|
||||
|
||||
[See documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows)
|
||||
|
||||
### From source code
|
||||
|
||||
```shell
|
||||
# Get mage
|
||||
mkdir mage
|
||||
cd mage
|
||||
|
||||
curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/v8.3.2/downloads/packages/mage_linux.tgz
|
||||
tar xf mage.tgz
|
||||
|
||||
cd ..
|
||||
|
||||
# Get Pamhyr2 source code
|
||||
git clone https://gitlab.irstea.fr/theophile.terraz/pamhyr/
|
||||
cd pamhyr
|
||||
|
||||
# Install dependencies
|
||||
pip3 install -r requirements.txt
|
||||
|
||||
# Run pamhyr
|
||||
./src/pamhyr.py
|
||||
```
|
||||
See documentation:
|
||||
- [French :fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20Windows)
|
||||
- [English :gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows)
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 110 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 114 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 196 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -431,12 +431,3 @@
|
|||
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 @@
|
|||
**************** 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,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
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 150 KiB After Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 168 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 49 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 45 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 71 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 94 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
|
|
@ -120,33 +120,53 @@ Utilisez le bouton de t
|
|||
|
||||
\section{Créer une première étude}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude. Choisissez un nom, par exemple Hogneau, et validez
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude.
|
||||
Choisissez un nom, par exemple \textit{Hogneau}, et validez.
|
||||
|
||||
Cliquez sur \texttt{[Réseau] => [Editer le réseau]} pour créer les biefs de votre rivière. Dans cette fenêtre, vous devez définir un graphe orienté qui représente les biefs de votre réseau fluvial : les arêtes sont les biefs et les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
|
||||
Appuyez sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud. Appuyez à nouveau sur \includegraphics[width=0.5cm]{img/gtk_add.png} pour quitter le mode \textit{Ajout}. Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval. Dans la partie inférieure de la fenêtre \textit{Editer le réseau hydrographique}, vous pouvez renommer les n½uds et les biefs. Comme le bief que vous avez créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief. La fenêtre doit se présenter comme suit :
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/NEWSTUDY.png}
|
||||
\par\end{center}
|
||||
|
||||
Pendant que vous travaillez sur votre étude, noubliez pas de sauvegarder régulièrement, à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} de la fenêtre principale.
|
||||
|
||||
\section{Créer la structure de la rivière}
|
||||
|
||||
Cliquez sur \texttt{[Réseau] => [Modifier le réseau]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} pour créer la structure de votre rivière.
|
||||
Nous voici dans la fenêtre \textit{Réseau}.
|
||||
Dans cette fenêtre, nous allons définir un graphe orienté qui représente les biefs de notre réseau fluvial : les arêtes sont les biefs, les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
|
||||
Un bief par défaut existe dans la nouvelle étude.
|
||||
Pour les besoins de ce tutoriel, nous allons le suprimer :
|
||||
cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} pour entrer dans le mode \textit{Supression} puis cliquez sur les n½uds.
|
||||
Nous voilà repartis sur une fenêtre vierge.
|
||||
Appuyez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud.
|
||||
Appuyez à nouveau sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour quitter le mode \textit{Ajout}.
|
||||
Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval.
|
||||
Dans la partie inférieure de la fenêtre \textit{Réseau}, vous pouvez renommer les n½uds et les biefs.
|
||||
Comme le bief que nous avons créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief.
|
||||
La fenêtre doit se présenter comme suit :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/network.png}
|
||||
\par\end{center}
|
||||
|
||||
Fermez la fenêtre \textit{Réseau}.
|
||||
|
||||
Fermer la fenêtre \textit{Editer le réseau}.
|
||||
|
||||
|
||||
\section{Editer la géometrie de la rivière}
|
||||
|
||||
Cliquez sur \texttt{[Géometrie] => [Editer la géometrie]} pour définir la géométrie du bief sélectionné. Cliquez sur le bouton \texttt{[Importer]} et sélectionnez le fichier \texttt{Data/Bief\_1.st}. Vous devriez voir :
|
||||
\section{Éditer la géometrie de la rivière}
|
||||
|
||||
Cliquez sur \texttt{[Géometrie] => [Modifier la géometrie]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} pour définir la géométrie du bief sélectionné.
|
||||
Pour Importer une géométrie depuis un fichier, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png}.
|
||||
Sélectionnez le fichier \texttt{Data/Bief\_1.st}.
|
||||
Vous devriez voir :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/Geo.png}
|
||||
\par\end{center}
|
||||
|
||||
Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK).
|
||||
Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière; dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs).
|
||||
Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou sur les sections dans les deux vues du haut.
|
||||
|
||||
Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK). Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière, dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs). Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou à l'aide de l'ascenseur situé entre le tableau et les graphiques.
|
||||
|
||||
Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"img/edit.png"}.
|
||||
Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
|
||||
|
||||
Sélectionnez la section en travers nommée \textit{PontRD101m} et ouvrez la fenêtre d'édition. Vous devriez voir :
|
||||
|
||||
|
|
@ -154,145 +174,218 @@ S
|
|||
\includegraphics[width=15cm]{img/editsect.png}
|
||||
\par\end{center}
|
||||
|
||||
Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale.
|
||||
La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom.
|
||||
Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice).
|
||||
Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.
|
||||
|
||||
Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale. La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom. Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice). Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.
|
||||
Sur le graphique figure une projection de la section en travers.
|
||||
Vous pouvez utiliser \texttt{[clic droit]} pour afficher une ligne d'eau fictive et visualiser des données géométriques utiles.
|
||||
Vous pouvez ensuite enlever cette ligne avec \texttt{[clic molette]}.
|
||||
Vous pouvez maintenant fermer la fenêtre d'édition de la section en travers.
|
||||
|
||||
Sur le graphique figure une projection de la section en travers. Vous pouvez utiliser \texttt{[ctrl + clic]} pour sélectionner un point dans le tracé et \texttt{[maj + clic]} pour sélectionner une ligne d'eau et visualiser des données géométriques utiles. Vous pouvez fermer la fenêtre d'édition de la section en travers et la fenêtre d'édition de la géométrie.
|
||||
Revenons à la fenêtre \textit{Géométrie}.
|
||||
Le jeu de sections importé est inégalement espacé, ce qui peut entrainer des difficultés de calcul.
|
||||
Nous allons utiliser l'outil de maillage pour interpoler des nouvelles sections entre les sections trop espacées.
|
||||
Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/meshing.png"}.
|
||||
Dans la fenêtre \textit{Maillage}, vous avez accès à quelques options basiques.
|
||||
L'option \textit{Limites} vous permet de définir deux sections entre lesquelles le maillage sera effectué.
|
||||
L'option \textit{Lignes directrices pour le calcul des distances} permet de spécifier au mailleur les points sur lesquels calculer les distances entre les sections.
|
||||
La distance sera la moyenne des deux distances entre les points de chaque sections qui portent ces lignes directrices.
|
||||
Pour ne choisir qu'une seule ligne, rentrez simplement deux fois la même valeur.
|
||||
Il existe toujours au moins deux lignes directrices : les deux extrémités des sections, nommés \textit{un} et \textit{np}, même si les points correspondants ne portent pas de nom.
|
||||
Les options \textit{Paramètres} permettent de définit l'interval souhaité entre les nouvelles sections, et la méthode d'interpolation.
|
||||
Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
|
||||
|
||||
\section{Editer les conditions aux limites}
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/maillage.png}
|
||||
\par\end{center}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} :
|
||||
L'option d'interpolation \textit{Spline} modifie les longueurs longitudinales.
|
||||
Les absices en long (Pk) des sections sont donc obsolètes.
|
||||
Pour les recalculer, cliquez sur \texttt{[Mise à jour des PK]} dans la fenêtre \textit{Géométrie}.
|
||||
Vous êtes maintenant dans la fenêtre \textit{Mise à jour des PK}.
|
||||
Vous pouvez choisir la section d'origine pour le calcul des PK, ainsi que la valeur du PK à cette section.
|
||||
Le choix des deux lignes directrices sert à calculer les distances entre sections, comme dans la fenêtre \textit{Maillage}.
|
||||
L'orientation vous permet de choisir dans quelle direction les PK seront croissants.
|
||||
Cette option n'a pas d'impact sur les résultats du calcul hydraulique.
|
||||
Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/mjpk.png}
|
||||
\par\end{center}
|
||||
|
||||
La fenêtre \textit{Géométrie} doit maintenant ressembler à ça :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/Geo2.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
\section{Éditer les conditions aux limites}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
|
||||
Vous arrivez sur la fenêtre \textit{Conditions aux limites} :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/boundary.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Utilisez le bouton \textit{ajouter} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
|
||||
Sur la nouvelle ligne, on peut cliquer pour sélectionner la ligne entière, et double-cliquer pour sélectionner la cellule.
|
||||
Sélectionnez la cellule \textit{Type} pour donner un nom à la condition limite. Ici, nous définirons le débit mesuré lors de la crue de février 2002. Vous pouvez nommer cette condition limite "crue2002".
|
||||
Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi Q(t).
|
||||
Sélectionnez la cellule \textit{Noeud} et attribuez cette condition au noeud amont.
|
||||
Les noms des noeuds sont rappelés dans le réseau du panneau de droite.
|
||||
Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"img/edit.png"}. Vous avez ouvert la fenêtre \textit{Éditer les conditions aux limites}.
|
||||
Dans un éditeur de texte, ouvrez le fichier \texttt{Données/Fevrier\_2002.txt}. Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau gauche de la fenêtre \textit{Éditer les conditions aux limites} avec \textit{ctrl+v}. Vous pouvez maintenant voir la courbe de débit :
|
||||
Utilisez le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
|
||||
Nous pouvons cliquer sur la nouvelle ligne pour sélectionner la ligne en entier, et double-cliquer pour sélectionner une seule cellule.
|
||||
Sélectionnez la cellule \textit{Nom} pour donner un nom à la condition limite.
|
||||
Ici, nous définirons le débit mesuré lors de la crue de février 2002.
|
||||
Vous pouvez nommer cette condition limite "crue2002".
|
||||
Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi \textit{Q(t)} : débit en fonction du temps.
|
||||
Sélectionnez la cellule \textit{Noeud} et attribuez cette condition au noeud amont.
|
||||
Les noms des noeuds sont rappelés dans le panneau de droite, avec une vue du réseau.
|
||||
Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
|
||||
Vous avez ouvert la fenêtre \textit{Modifier les conditions aux limites}.
|
||||
Dans un éditeur de texte, ouvrez le fichier \texttt{data/Fevrier\_2002.txt}.
|
||||
Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau de gauche de la fenêtre \textit{Modifier les conditions aux limites} avec \textit{ctrl+v}.
|
||||
Vous pouvez maintenant voir la courbe de débit :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/fev2002.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Fermer cette fenêtre. Revenir sur la fenêtre \textit{Conditions aux limites}. Ajouter une nouvelle ligne, lui donner un nom, lui donner le type \textit{Z(T)} et l'associer au noeud aval du réseau. Ouvrez la fenêtre \textit{Éditer les conditions aux limites} (\includegraphics[width=0.5cm]{"img/edit.png"}). Ajoutez deux lignes. Dans la première, entrez le temps : 0.00.00 et Z : 15.000.
|
||||
Dans la seconde, saisissez le temps : 1.00.00 et Z : 15.000. Cela crée une côte constante de l'eau en aval. Pour le calcul, Mage extrapolera continuellement l'élévation de l'eau.
|
||||
Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.
|
||||
Fermer cette fenêtre.
|
||||
Revenez sur la fenêtre \textit{Conditions aux limites}.
|
||||
Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Q(Z)} (courbe de tarage) et associez-la au noeud aval du réseau.
|
||||
Cette condition limite se trouve au niveau d'un seuil.
|
||||
A cet endroit, l'écoulement passe d'un régime fluvial à un régime torentiel.
|
||||
Nous allons donc calculer une courbe de tarage qui correspond au régime critique de l'écoulement au niveau du seuil.
|
||||
Sélectionnez la condition limite et ouvrez la fenêtre \textit{Modifier les conditions aux limites} : (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
|
||||
Dans la fenêtre \textit{Modifier les conditions aux limites} cliquez sur \texttt{[Générer régime critique]} pour générer cette courbe.
|
||||
Cliquez enduite sur \texttt{[Rendre croissant]} pour suprimer les points de la courbe qui ne sont pas strictement croissants.
|
||||
Vous pouvez fermer les fenêtres \textit{Modifier les conditions aux limites} et \textit{Conditions aux limites}.
|
||||
|
||||
\section{Créer les conditions initiales}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]}.
|
||||
Si vous ne connaissez pas les conditions initiales de la côte de l'eau et du débit de la rivière, vous pouvez utiliser les boutons \texttt{[Générer une hauteur minimale]} ou \texttt{[Générer un débit constant]} pour laisser Pamhyr2 estimer une condition initiale à l'aide de la formule de Manning-Strickler.
|
||||
Cliquez sur \texttt{[Générer à partir du débit]} et saisissez un débit de $4 m^3$ dans la fenêtre contextuelle pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler et un débit uniforme de $4 m^3$. Vous devriez voir :
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]} ou sur le racourci \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
|
||||
Pour démarer, le code de calcul hydraulique a besoin de connaitre le débit et la cote de la surface libre de la rivière en tout point à l'instant initial.
|
||||
Si vous ne connaissez pas ces conditions initiales, vous pouvez utiliser les boutons \texttt{[Générer une profondeur uniforme]}, \texttt{[Générer un débit uniforme]} ou \texttt{[Générer une cote uniforme]} pour laisser Pamhyr2 estimer une condition initiale à l'aide de la formule de Manning-Strickler.
|
||||
Cliquez sur \texttt{[Générer un débit uniforme]} et saisissez un débit de $4 m^3/s$ dans la fenêtre contextuelle, et cochez \texttt{[Générer une profondeur]} pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler pour le débit donné.
|
||||
Vous devriez voir :
|
||||
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/ic.png}
|
||||
\par\end{center}
|
||||
|
||||
Vous pouvez également utiliser \texttt{[Générer une cote uniforme]} et saisir une cote de $21 m$ à l'amont et à l'aval avec un débit nul.
|
||||
Cela revient à créer une bassine et à laisser le solveur la vider pour trouver un écoulement initial satisfaisant.
|
||||
|
||||
Lors des prochaines simulations, vous pouvez utiliser l'état final de la simulation précédente comme état initial.
|
||||
Pour cela, cliquez sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} et retrouvez le résultat sous forme de fichier \textit{.BIN}.
|
||||
Ce fichier de résultats se trouve normalement dans le sous-dossier \textit{\_PAMHYR\_/Hogneau/default-mage}.
|
||||
|
||||
Fermer la fenêtre \textit{Conditions initiales}
|
||||
|
||||
|
||||
\section{Editer les coefficients de frottement}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Editer les frottements]}.
|
||||
Vous devez d'abord définir des jeux de coefficients de Strickler. Cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour ouvrir la fenêtre \textit{Strickler}. Vous pouvez y créer des couples de coefficients de Strickler, le premier pour le lit mineur, le second pour le lit moyen. Cliquez quatre fois sur \textit{add} pour créer quatre nouveaux couples. Donnez-leur les valeurs suivantes :
|
||||
\section{Éditer les coefficients de frottement}
|
||||
|
||||
Nous allons maintenant définir les coefficients de frottement du fond de la rivière.
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Éditer les frottements]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"}.
|
||||
Dans un premier temps, vous devez définir des jeux de coefficients de Strickler.
|
||||
Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour ouvrir la fenêtre \textit{coefficients de Strickler}.
|
||||
Vous pouvez y créer des couples de coefficients de Strickler, le premier pour le lit mineur, le second pour le lit moyen.
|
||||
Cliquez quatre fois sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre nouveaux couples.
|
||||
Donnez-leur les valeurs suivantes :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/K.png}
|
||||
\par\end{center}
|
||||
|
||||
Vous pouvez utiliser le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} pour trier les couples par ordre alphadétique.
|
||||
Fermez la fenêtre \textit{Strickler}.
|
||||
|
||||
Fermez la fenêtre \textit{Strickler}. Dans la fenêtre \textit{Editer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour créer quatre zones de frottement. Chaque zone est définie par un PK \textit{début} et de \textit{fin} PK et un couple \textit{begin} et \textit{end} couple de Strickler. Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{begin} et \textit{end}. Dans notre cas, nous utiliserons des coefficients constants par zone. Définissez les zones comme suit :
|
||||
|
||||
Dans la fenêtre \textit{Éditer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre zones de frottement.
|
||||
Chaque zone est définie par un PK de \textit{début} et de \textit{fin} associés à un couple de coefficients de Strickler de \textit{début} et de \textit{fin}.
|
||||
Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{début} et \textit{fin}.
|
||||
Dans notre cas, nous utiliserons des coefficients uniformes par zone.
|
||||
Définissez les zones comme suit :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/frictions.png}
|
||||
\includegraphics[width=15cm]{img/frictions2.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
La zone sélectionnée est surlignée en bleu. Fermez la fenêtre \textit{Editer les frottements}.
|
||||
|
||||
La zone sélectionnée est surlignée en bleu.
|
||||
Vous pouvez maintenant fermer la fenêtre \textit{Éditer les frottements}.
|
||||
|
||||
\section{Modélisation des ouvrages hydrauliques}
|
||||
|
||||
Parfois, il peut y avoir des sections en travers dans lesquelles les équations de Saint-Venant ne peuvent pas être utilisées pour modéliser l'écoulement de l'eau. Dans ce cas, nous devons définir une autre loi pour relier la côte de l'eau et le débit. C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée, ce qui entraîne un écoulement en charge. Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrables. Dans notre cas, on doit représenter un seuil et deux ponts comme ouvrages hydrauliques.
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques. Cliquez trois fois sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour créer trois ouvrages hydrauliques. Chaque structure peut avoir un nom et doit avoir une portée et un PK. Définissez-les comme suit :
|
||||
|
||||
Parfois, il peut y avoir des sections en travers dans lesquelles les équations de Saint-Venant ne peuvent pas être utilisées pour modéliser l'écoulement de l'eau.
|
||||
Dans ce cas, nous devons définir une autre loi pour relier la côte de l'eau et le débit.
|
||||
C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée et que l'écoulement passe en charge.
|
||||
Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrisables.
|
||||
Dans notre cas, nous allons devoir modéliser deux ponts par des ouvrages hydrauliques.
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques.
|
||||
Cliquez deux fois sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer deux ouvrages hydrauliques.
|
||||
Chaque structure peut avoir un nom et doit avoir un bief et un PK.
|
||||
Définissez-les comme suit :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/hs.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Sélectionnez le seuil aval et cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour modifier les lois de cette ouvrage. Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires. Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage. Pour ce seuil, nous n'avons besoin que d'un ouvrage hydraulique élémentaire de type déversoir. Cliquez sur \includegraphics[width=0.5cm]{img/gtk_add.png} pour ajouter un nouvel ouvrage hydraulique élémentaire, donnez-lui le type \textit{seuil} et configurez-le comme suit :
|
||||
|
||||
Sélectionnez le pont RD101 et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour éditer les lois de cet ouvrage.
|
||||
Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires.
|
||||
Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage.
|
||||
Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont.
|
||||
Créez deux ouvrages hydrauliques élémentaires à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} et définissez-les comme suit :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/seuil.png}
|
||||
\includegraphics[width=15cm]{img/SeuilRD101.png}
|
||||
|
||||
\includegraphics[width=15cm]{img/OrificeRD101.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Retournez à la fenêtre \textit{Ouvrages hydrauliques}.
|
||||
|
||||
Sélectionnez le pont RS101 et cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour éditer les lois de cet ouvrage. Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont. Créez deux ouvrages hydrauliques élémentaires et définissez-les comme suit :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/seuilRS101.png}
|
||||
|
||||
\includegraphics[width=15cm]{img/orificeRS101.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Revenez à la fenêtre \textit{Ouvrages hydrauliques} et appliquez la même procédure pour le pont de Thivencelle :
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/orificeThivencelle.png}
|
||||
\includegraphics[width=15cm]{img/SeuilThivencelle.png}
|
||||
|
||||
\includegraphics[width=15cm]{img/seuilThivencelle.png}
|
||||
\includegraphics[width=15cm]{img/OrificeThivencelle.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Vous pouvez maintenant fermer les fenêtres \textit{Ouvrages hydrauliques}.
|
||||
Si vous réouvrez la fenêtre \textit{Géométrie} vous pouvez voir apparaitre la position des ouvrages hydrauliques sur la vue longitudinale.
|
||||
|
||||
\section{Paramètres du solveur}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Parameters numériques des solveurs]}.
|
||||
Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \textit{Mage v8}. Réglez les paramètres du solveur comme suit :
|
||||
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/param.png}
|
||||
\par\end{center}
|
||||
|
||||
|
||||
Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \textit{Mage v8}.
|
||||
Gardez les paramètres du solveur par défaut, sauf le pas de temps minimum, que vous mettrez à 0.1.
|
||||
En effet, durant la montée du pic de crue, le solveur a besoin de réduire le pas de temps suffisament pour permettre la convergence des itérations.
|
||||
% Pour accélérer les calculs, nous pouvons également dégrader la précision, à l'aide des facteurs de réduction de la précision.
|
||||
% Les précisions internes du solveur sont de $10{-9}$.
|
||||
% Cette précision est multipliée par le facteur de réduction de la précision : un facteur de 1000 ramènera donc la précision à $10{-5}$.
|
||||
% Pour utiliser ce facteur de réduction de la précision, il faut donner un \textit{nombre d'itérations à précision maximum} inférieur au \textit{nombre maximum d'itérations} : le solveur va d'abord tenter de converger avec un certain nombre d'itératons à la précision maximum avant de basculer sur une précision dégradée pour le reste des itérations.
|
||||
Fermer la fenêtre \textit{Paramètres du solveur}.
|
||||
|
||||
\section{Lancer la simulation}
|
||||
|
||||
Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Lancer le solveur]}.
|
||||
Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Exécuter}.
|
||||
Deux fenêtres s'ouvrent : la fenêtre \textit{check list} et la fenêtre \textit{Log du solveur}.
|
||||
La fenêtre \textit{Check list} donne quelques indications sur la validité de votre modèle, et la fenêtre \textit{Log du solveur} affiche les résultats du solveur.
|
||||
À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.
|
||||
Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Lancer}.
|
||||
La fenêtre \textit{Log du solveur} s'ouvre.
|
||||
Cette fenêtre affiche les sorties texte du solveur.
|
||||
À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul en cliquant sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.
|
||||
|
||||
\section{Visualiser les résultats}
|
||||
|
||||
il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale. Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section en travers dans ce bief. Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}. Vous pouvez utiliser le curseur du bas pour visualiser la côte de l'eau à différents pas de temps.
|
||||
il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale.
|
||||
Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section dans ce bief.
|
||||
Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}.
|
||||
Vous pouvez utiliser le curseur du bas pour visualiser les résultats à différents pas de temps.
|
||||
Les croix rouges dans les deux vues du haut correspondent aux points ou l'eau déborde de la géométrie au moins une fois dans la simulation.
|
||||
En pratique il n'y a pas de perte de volume par débordement en dehors du modèle, car le solveur ajoute un mur virtuel aux extrémités des sections.
|
||||
Pour visualiser le débit, passez à l'onglet \textit{Hydrogramme}.
|
||||
Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} en haut à gauche de la fenêtre. Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \textit{OK}.
|
||||
Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Results}.
|
||||
|
||||
|
||||
Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre.
|
||||
Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \texttt{[OK]}.
|
||||
Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Résultats}.
|
||||
Le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} vous permet d'exporter les résultats au format CSV pour une utilisation en dehors de Pamhyr2.
|
||||
|
||||
\pagebreak{}
|
||||
\end{document}
|
||||
|
|
|
|||
|
|
@ -112,9 +112,28 @@ Use the GNU Linux or the Windows download button depending on your system. On wi
|
|||
\section{Create your first study}
|
||||
|
||||
On the main windows, click on \texttt{[Files] => [New Study]} to create a new study.
|
||||
Give it a name, for example \textit{Hogneau}, and validate.
|
||||
|
||||
Click on \texttt{[River Network] => [Edit River Network]} to create the reaches of your river. In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
|
||||
Press the \includegraphics[width=0.5cm]{img/gtk_add.png} to enter the \textit{add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node. press \includegraphics[width=0.5cm]{img/gtk_add.png} again to exit the \textit{add} mode. You created your first reach, with an upstream node and a downstream node. In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches. As the reach you created is automaticaly selected, all the next steps will apply to this reach. The window should look like that:
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/NEWSTUDY.png}
|
||||
\par\end{center}
|
||||
|
||||
During study, don't forget to save periodicaly your work, using the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} button on the main window.
|
||||
|
||||
\section{Create the structure of the river}
|
||||
|
||||
Click on \texttt{[River Network] => [Edit River Network]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} shortcut to create the structure of your river.
|
||||
In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
|
||||
A default reach exists in a new study.
|
||||
For this tutorial, we will delete it:
|
||||
click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} button to enter the \textit{Delete} mode, then click on the nodes.
|
||||
We can now start with an empty window.
|
||||
Press the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to enter the \textit{Add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node.
|
||||
Press \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} again to exit the \textit{Add} mode.
|
||||
You created your first reach, with an upstream node and a downstream node.
|
||||
In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches.
|
||||
As the reach you created is automaticaly selected, all the next steps will apply to this reach.
|
||||
The window should look like that:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/network.png}
|
||||
|
|
@ -125,15 +144,19 @@ Close the \textit{Edit River Network} window.
|
|||
|
||||
\section{Edit the river geometry}
|
||||
|
||||
Click on \texttt{[Geometry] => [Edit Geometry]} to define the geometry of the selected bief. Click on the \texttt{[Import]} button and select the file \texttt{Data/Bief\_1.st}. You should see:
|
||||
Click on \texttt{[Geometry] => [Edit Geometry]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} shortcut to define the geometry of the selected reach.
|
||||
Click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} button and select the file \texttt{Data/Bief\_1.st}.
|
||||
You should see:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/Geo.png}
|
||||
\par\end{center}
|
||||
|
||||
On the left panel is a list of all the cross sections with their name and longitudinal abscisa. In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black). You can move in the section list using the slider at the very right of the window.
|
||||
On the left panel is a list of all the cross sections with their name and longitudinal abscisa.
|
||||
In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black).
|
||||
You can move in the section list using the right table or by clicking on the sections on one of the two upper plot.
|
||||
|
||||
You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"img/edit.png"} icon.
|
||||
You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} icon.
|
||||
|
||||
select the cross section named \textit{PontRD101m} and open the edition window. You should see:
|
||||
|
||||
|
|
@ -141,58 +164,100 @@ select the cross section named \textit{PontRD101m} and open the edition window.
|
|||
\includegraphics[width=15cm]{img/editsect.png}
|
||||
\par\end{center}
|
||||
|
||||
On the left panel is the list of all the points of the section, with their coordinates, their name and their transversal absisa. The Z coordinate of the highest point is written in blue and the lowest in red. Points can have a name. If a point with the same name exists in every section in a reach, it forms a longitudinal line. For example, here we have \textit{rg} and \textit{rd} which represent the left bank and the right bank of the main chanel.
|
||||
On the left panel is the list of all the points of the section, with their coordinates, their name and their transversal absisa.
|
||||
The Z coordinate of the highest point is written in blue and the lowest in red.
|
||||
Points can have a name.
|
||||
If a point with the same name exists in every section in a reach, it forms a longitudinal line.
|
||||
For example, here we have \textit{rg} and \textit{rd} which represent the left bank and the right bank of the main chanel.
|
||||
|
||||
On the plot is a projection of the cross section. You can use \texttt{[ctrl + click]} to select a point in the plot and \texttt{[shift + click]} to select a water line and visualize usefull geometric data. You can close the cross section edition window and the geometry edition window.
|
||||
On the plot is a projection of the cross section. You can click on a point to select it in the plot and \texttt{[right click]} to draw a water line and visualize usefull geometric data.
|
||||
You can then remove this line with \texttt{[scroll wheel click]}.
|
||||
You can close the cross section edition window and the geometry edition window.
|
||||
|
||||
% TODO mesh
|
||||
|
||||
\section{Edit the boundary conditions}
|
||||
|
||||
From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]}.You should see:
|
||||
From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]} or on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
|
||||
You are now on the \textit{Boundary conditions} window:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/boundary.png}
|
||||
\par\end{center}
|
||||
|
||||
Use the \textit{add} button on the top left of the window to add a liquid boundary condition.
|
||||
Use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window to add a liquid boundary condition.
|
||||
On the new line, click to select the whole line, double click to select the cell.
|
||||
Select the \textit{Type} cell to give a name to the boundary condition. here, we will define the flow discharge mesured during the february 2002 flood. You can name this boundary condition "flood2002".
|
||||
Select the \textit{Type} cell and use the combo box to put a Q(t) law.
|
||||
Select the \textit{Type} cell to give a name to the boundary condition.
|
||||
Here, we will define the flow discharge mesured during the february 2002 flood.
|
||||
You can name this boundary condition "flood2002".
|
||||
Select the \textit{Type} cell and use the combo box to put a \textit{Q(t)} law.
|
||||
Select the \textit{Node} cell and atribute this condition to the upstream node.
|
||||
Names of the nodes are recalled in network in the right panel.
|
||||
Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"img/edit.png"}. You opened the \textit{Edit Boundary Conditions} window.
|
||||
On a text editor, open the \texttt{Data/Fevrier\_2002.txt} file. Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}. You can now see the flow discharge curve:
|
||||
Names of the nodes are recalled in the right panel with the network view.
|
||||
Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
|
||||
You opened the \textit{Edit Boundary Conditions} window.
|
||||
In a text editor, open the \texttt{Data/Fevrier\_2002.txt} file.
|
||||
Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}.
|
||||
You can now see the flow discharge curve:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/fev2002.png}
|
||||
\par\end{center}
|
||||
|
||||
Close this window. Go back on the \textit{Boundary Conditions} window. Add a new line, give it a name, give it the textit{Z(T)} type and associate it to the downstream node of the network. Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"img/edit.png"}). Add two lines. In the first one, enter time: 0.00.00 and Z: 15.000.
|
||||
On the second one, time: 1.00.00 and Z: 15.000. It creates a constant downstream water elevation. For the computaion, Mage will extrapolate continuously the water elevation, that's why we only need to define one hour.
|
||||
Close this window.
|
||||
Go back on the \textit{Boundary Conditions} window.
|
||||
Add a new line, give it a name, give it the textit{Q(Z)} type (rating curve) and associate it to the downstream node of the network.
|
||||
This downstream boundary condition corresponds to a weir.
|
||||
There, the river transition from a fluvial flow to a torrential flow.
|
||||
This allows us to compute a rating curve corresponding to the critical flow located over the weir.
|
||||
Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
|
||||
In the \textit{Edit boundary conditions} window click on \texttt{[Générer régime critique]} to comput the said rating curve.
|
||||
Click on \texttt{[Make increasing]} to remove the points of the curve that are not strictly increasing.
|
||||
You can close the the \textit{Edit Boundary Conditions} and the \textit{Boundary Conditions} window.
|
||||
|
||||
\section{Create initial conditions}
|
||||
|
||||
From the main window, click on \texttt{[Hydraulics] => [Initial conditions]}.
|
||||
If you don't know the initial conditions in water elevation and flow discharge of the river, you can use \texttt{[Generate minimal height]} or \texttt{[Generate from discharge]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
|
||||
Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window to generate an initial water height condition based on the Manning-Strickler formula and a uniform discharge of $4 m^3$. You should see:
|
||||
From the main window, click on \texttt{[Hydraulics] => [Initial conditions]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"} shortcut.
|
||||
To start, the numerical solver needs to know the water elevation and the discharge at every cross-section of the river.
|
||||
If you don't know the initial water elevation and flow discharge conditions of the river, you can use the \texttt{[Generate minimal depth]}, \texttt{[Generate from discharge]} or \texttt{[Generate elevation]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
|
||||
Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window, and check the \texttt{[Generate depth]} to generate an initial water elevation condition based on the Manning-Strickler formula.
|
||||
You should see:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/ic.png}
|
||||
\par\end{center}
|
||||
|
||||
You can alternately use \texttt{[Generate elevation]} to enter a constant elevation of $21 m$ (upstream and downstream) associated with a null discharge.
|
||||
The goal is to create a lake and to let the solver drain it to find a suitable initial state.
|
||||
|
||||
In your next simulations, you can use the final timestep of the previous simulation as an initial condition.
|
||||
To do that, click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} and find the results contained in a \textit{.BIN} file.
|
||||
This file should be in the sub-directory \textit{\_PAMHYR\_/Hogneau/default-mage}.
|
||||
|
||||
Close the \textit{Initial conditions} window.
|
||||
|
||||
|
||||
\section{Edit friction coefficients}
|
||||
|
||||
From the main window, click on \texttt{[Hydraulics] => [Edit friction]}.
|
||||
You fist have to define sets of Strickler coefficients. Click on \includegraphics[width=0.5cm]{"img/edit.png"} to open the \textit{Strickler} window. Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed. Click on \textit{add} four times to create four new couple. Give them the folowing values:
|
||||
We will now define the friction coefficients of the bottom of the river.
|
||||
From the main window, click on \texttt{[Hydraulics] => [Edit friction]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"} shortcut.
|
||||
You have to define sets of Strickler coefficients first.
|
||||
Click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to open the \textit{Strickler} window.
|
||||
Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed.
|
||||
Click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} four times to create four new couples.
|
||||
Give them the folowing values:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/K.png}
|
||||
\par\end{center}
|
||||
|
||||
Close the \textit{Strickler} window. On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{img/gtk_add.png} to create four friction zones. Each zone is defined by a \textit{begin} and \textit{end} KP and a \textit{begin} and \textit{end} Strickler couple. The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples. In our case, we will use constant coefficients per zone. Set the zones as follow:
|
||||
You can use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} button to sort the couples by alphabetical order.
|
||||
Close the \textit{Strickler} window.
|
||||
|
||||
On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to create four friction zones.
|
||||
Each zone is defined by a \textit{begin} and \textit{end} KP associated with a \textit{begin} and \textit{end} Strickler couple.
|
||||
The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples.
|
||||
In our case, we will use uniform coefficients per zone.
|
||||
Set the zones as follow:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/frictions.png}
|
||||
|
|
@ -200,50 +265,53 @@ Close the \textit{Strickler} window. On the \textit{Edit friction} window, add f
|
|||
|
||||
The selected zone is highlighted in blue. Close the \textit{Edit friction} window.
|
||||
|
||||
|
||||
\section{Model hydraulic structures}
|
||||
|
||||
Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow. In that case, we have to define an other law to link the water elevation and the flow discharge. This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge. Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized. In our case, a weir and two bridges have to be represented as hydraulic structures.
|
||||
From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window. Click tree times on the \includegraphics[width=0.5cm]{img/gtk_add.png} button to create three hydraulic structures. Each structure can have a name and must have a reach and a KP. Set them as follow:
|
||||
Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow.
|
||||
In that case, we have to define an other law to link the water elevation and the flow discharge.
|
||||
This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge.
|
||||
Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized.
|
||||
In our case, two bridges have to be represented as hydraulic structures.
|
||||
From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window.
|
||||
Click two times on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button to create two hydraulic structures.
|
||||
Each structure can have a name and must have a reach and a KP.
|
||||
Set them as follow:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/hs.png}
|
||||
\par\end{center}
|
||||
|
||||
Select the downstream weir and click on \includegraphics[width=0.5cm]{"img/edit.png"} to edit the laws of this structure. Hydraulic structures are composed of basic hydraulic structures. You can combine the laws of several basic hydraulic structures to setup your structure. For this weir, we only need a weir basic hydraulic structure. Click on \includegraphics[width=0.5cm]{img/gtk_add.png} to add a new basic hydraulic structure, give it the \textit{weir} type and set it up as folow:
|
||||
Select the RD101 bridge and click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to edit the laws of this structure.
|
||||
Hydraulic structures are composed of basic hydraulic structures.
|
||||
You can combine the laws of several basic hydraulic structures to setup your structure.
|
||||
A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge.
|
||||
Create two basic hydraulic structures with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} and set them as folow:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/seuil.png}
|
||||
\par\end{center}
|
||||
\includegraphics[width=15cm]{img/seuilRD101.png}
|
||||
|
||||
Go back to the \textit{hydraulic structures} window.
|
||||
|
||||
Select the RS101 bridge and click on \includegraphics[width=0.5cm]{"img/edit.png"} to edit the laws of this structure. A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge. Create two basic hydraulic structures and set them as folow:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/seuilRS101.png}
|
||||
|
||||
\includegraphics[width=15cm]{img/orificeRS101.png}
|
||||
\includegraphics[width=15cm]{img/orificeRD101.png}
|
||||
\par\end{center}
|
||||
|
||||
Go back to the \textit{hydraulic structures} window and aply the same procedure for the Thivencelle bridge:
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/orificeThivencelle.png}
|
||||
|
||||
\includegraphics[width=15cm]{img/seuilThivencelle.png}
|
||||
|
||||
\includegraphics[width=15cm]{img/orificeThivencelle.png}
|
||||
\par\end{center}
|
||||
|
||||
You can now close the \textit{hydraulic structures} windows.
|
||||
If you open the \textit{geometry} window you can see the structure position in the longitudinal view.
|
||||
|
||||
\section{Solver parameters}
|
||||
|
||||
From the main window, click on \texttt{[Execute] => [Numerical parameters for solvers]}.
|
||||
In the window \textit{solver parameters} select the \textit{Mage v8} tab. Set the solver parameters as follow:
|
||||
In the window \textit{solver parameters} select the \textit{Mage v8} tab.
|
||||
Set the minimul timestep to 0.1. and keep the default values for the other parameters.
|
||||
We need a smaller minimum timester because the solver needs to reduce the timestep in order to converge during the steep increase of discharge at the begining of the flood.
|
||||
|
||||
\begin{center}
|
||||
\includegraphics[width=15cm]{img/param.png}
|
||||
\par\end{center}
|
||||
% TODO precision
|
||||
|
||||
Close the \textit{solver parameters} window.
|
||||
|
||||
|
|
@ -251,17 +319,23 @@ Close the \textit{solver parameters} window.
|
|||
|
||||
From the main window, click on \texttt{[Execute] => [Run solver]}.
|
||||
Select \textit{Defaut-Mage - (Mage8)} anc click on the \textit{Run} button.
|
||||
It will open two windows: the \textit{Check list} window and the \textit{Solver log} window.
|
||||
The \textit{Check list} window gives som hints about the validity of your model, and the \textit{Solver log} window displays the outputs of the solver.
|
||||
From the \textit{Solver log} window you can re-run the computation, and from the textit{Solver log} window you can click on the \textit{Results} button to open the \textit{Results} window.
|
||||
It will open the \textit{Solver log} window.
|
||||
The \textit{Solver log} window displays the outputs of the solver.
|
||||
From the \textit{Solver log} window you can re-run the computation with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, and you can click on the \textit{Results} button to open the \textit{Results} window.
|
||||
|
||||
\section{Visualize the results}
|
||||
|
||||
If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window. The top lets panel let you select your reach, the bottom left panel lets you select a cross-section in that reach. the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window. You can use the bottom slider to visualize the water elevation at different timesteps.
|
||||
If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window.
|
||||
The top left panel let you select your reach, the bottom left panel lets you select a cross-section in that reach.
|
||||
the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window.
|
||||
You can use the bottom slider to visualize the results at different timesteps.
|
||||
The red crosses in the graphs corresponds to sections where the water level exceeds the limits of the geometry at least one time during the simulation.
|
||||
This does not corresponds to water leaks, as the solver artificialy adds a virtual wall at both ends of the cross-sections geometry.
|
||||
To visualize the flow discharge, switch to the \textit{Hydrograph} tab.
|
||||
To create custom 2D plots, click on the \includegraphics[width=0.5cm]{img/gtk_add.png} button on the top left of the window. Select the values you want on the $X$ and $Y$ axis and click on \textit{OK}.
|
||||
To create custom 2D plots, click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window.
|
||||
Select the values you want on the $X$ and $Y$ axis and click on \texttt{[OK]}.
|
||||
You can now see a new tab with the custom 2D plot in the right panel of the \textit{Results} window.
|
||||
|
||||
The button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} allows you to export your results to a CSV file if you want to post-process them outside Pamhyr2.
|
||||
|
||||
\pagebreak{}
|
||||
\end{document}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -381,8 +381,6 @@ class MeshingWithMageMailleurTT(AMeshingTool):
|
|||
st_file = self.export_reach_to_st(reach, tmp)
|
||||
m_file = st_file.rsplit(".ST", 1)[0] + ".M"
|
||||
|
||||
os.sync()
|
||||
|
||||
proc = QProcess()
|
||||
proc.setWorkingDirectory(tmp)
|
||||
|
||||
|
|
@ -397,12 +395,13 @@ class MeshingWithMageMailleurTT(AMeshingTool):
|
|||
logger.info(
|
||||
f"! {self._exe_path()} " +
|
||||
f"{st_file} {m_file} " +
|
||||
f"update_rk " +
|
||||
f"update_kp " +
|
||||
f"{str(step)} " +
|
||||
f"{limites[0]} {limites[1]} " +
|
||||
f"{directrices[0]} {directrices[1]} " +
|
||||
f"{orientation} {lm} {linear} " +
|
||||
f"{origin} "
|
||||
f"{origin} " +
|
||||
f"{origin_value} "
|
||||
)
|
||||
proc.start(
|
||||
self._exe_path(),
|
||||
|
|
@ -411,7 +410,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
|
|||
str,
|
||||
[
|
||||
st_file, m_file,
|
||||
"update_rk", step,
|
||||
"update_kp", step,
|
||||
limites[0], limites[1],
|
||||
directrices[0], directrices[1],
|
||||
orientation, lm, linear, origin, origin_value
|
||||
|
|
|
|||
|
|
@ -253,6 +253,15 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||
|
||||
return point
|
||||
|
||||
def display_name(self):
|
||||
name = ""
|
||||
if self.name != "":
|
||||
name += f"{self.name} "
|
||||
|
||||
name += f"({self.rk})"
|
||||
|
||||
return name
|
||||
|
||||
def x(self):
|
||||
return [point.x for point in self.points]
|
||||
|
||||
|
|
@ -651,8 +660,8 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||
Returns:
|
||||
Projection of the points of the profile on a plane.
|
||||
"""
|
||||
if self.nb_points < 3:
|
||||
return None
|
||||
if self.nb_points < 2:
|
||||
return [0.0]
|
||||
else:
|
||||
return self._get_station(self.points)
|
||||
|
||||
|
|
|
|||
|
|
@ -632,8 +632,8 @@ class Reach(SQLSubModel):
|
|||
|
||||
try:
|
||||
list_profile, list_header = self.read_file_st(str(file_path_name))
|
||||
profile_header = ["num", "code1",
|
||||
"code2", "nb_point", "rk", "name"]
|
||||
profile_header = ["num", "code1", "code2",
|
||||
"nb_point", "rk", "name"]
|
||||
|
||||
if list_profile and list_header:
|
||||
for ind, profile in enumerate(list_profile):
|
||||
|
|
@ -707,6 +707,15 @@ class Reach(SQLSubModel):
|
|||
line_is_header = True
|
||||
else:
|
||||
list_point_profile.append(line)
|
||||
elif len(line) > 4:
|
||||
x, y, z = line[:3]
|
||||
if stop_code in x and stop_code in y:
|
||||
line_is_header = True
|
||||
list_profile.append(list_point_profile)
|
||||
list_point_profile = []
|
||||
else:
|
||||
line.append("")
|
||||
list_point_profile.append(line[:3])
|
||||
else:
|
||||
pass
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import logging
|
|||
from copy import copy, deepcopy
|
||||
from tools import trace, timer
|
||||
from functools import reduce
|
||||
from numpy import interp
|
||||
|
||||
from Model.Tools.PamhyrDB import SQLSubModel
|
||||
|
||||
|
|
@ -374,8 +375,8 @@ class InitialConditions(SQLSubModel):
|
|||
key=lambda p: p.rk
|
||||
)
|
||||
|
||||
def generate_growing_constante_height(self, height: float,
|
||||
compute_discharge: bool):
|
||||
def generate_growing_constant_depth(self, height: float,
|
||||
compute_discharge: bool):
|
||||
|
||||
profiles = self._reach.reach.profiles.copy()
|
||||
self._sort_by_z_and_rk(profiles)
|
||||
|
|
@ -492,6 +493,39 @@ class InitialConditions(SQLSubModel):
|
|||
|
||||
self._generate_resort_data(profiles)
|
||||
|
||||
def generate_height(self,
|
||||
elevation1: float,
|
||||
elevation2: float,
|
||||
compute_discharge: bool,
|
||||
discharge: float):
|
||||
profiles = self._reach.reach.profiles.copy()
|
||||
upstream_rk = profiles[0].rk
|
||||
downstream_rk = profiles[-1].rk
|
||||
data_discharge = {}
|
||||
if not compute_discharge:
|
||||
if len(self._data) == 0:
|
||||
for profile in profiles:
|
||||
data_discharge[profile.rk] = 0.0
|
||||
else:
|
||||
for data in self._data:
|
||||
data_discharge[data["rk"]] = data["discharge"]
|
||||
|
||||
self._data = []
|
||||
for profile in profiles:
|
||||
|
||||
if not compute_discharge:
|
||||
d = data_discharge[profile.rk]
|
||||
else:
|
||||
d = discharge
|
||||
elevation = interp(profile.rk,
|
||||
[upstream_rk, downstream_rk],
|
||||
[elevation1, elevation2])
|
||||
new = Data(reach=self._reach, status=self._status)
|
||||
new["rk"] = profile.rk
|
||||
new["discharge"] = d
|
||||
new["elevation"] = elevation
|
||||
self._data.append(new)
|
||||
|
||||
def _generate_resort_data(self, profiles):
|
||||
is_reverse = False
|
||||
if profiles[0].rk > profiles[-1].rk:
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@ class Edge(object):
|
|||
elif name == "id":
|
||||
ret = self.id
|
||||
elif name == "node1":
|
||||
ret = self.node1.name
|
||||
ret = self.node1
|
||||
elif name == "node2":
|
||||
ret = self.node2.name
|
||||
ret = self.node2
|
||||
elif name == "enable":
|
||||
ret = self._enable
|
||||
|
||||
|
|
@ -75,10 +75,10 @@ class Edge(object):
|
|||
|
||||
@property
|
||||
def name(self):
|
||||
name = self._name
|
||||
if self._name == "":
|
||||
name = f"{self.node1.name} -> {self.node2.name}"
|
||||
return name
|
||||
return f"R{self.id}"
|
||||
|
||||
return self._name
|
||||
|
||||
def is_enable(self):
|
||||
return self._enable
|
||||
|
|
|
|||
|
|
@ -35,11 +35,7 @@ class Node(object):
|
|||
else:
|
||||
self.id = id
|
||||
|
||||
if name == "":
|
||||
self._name = f"Node {self.id}"
|
||||
else:
|
||||
self._name = name
|
||||
|
||||
self._name = name
|
||||
self.pos = Point(x, y)
|
||||
|
||||
def __getitem__(self, key):
|
||||
|
|
@ -64,6 +60,9 @@ class Node(object):
|
|||
|
||||
@property
|
||||
def name(self):
|
||||
if self._name == "":
|
||||
return f"N{self.id}"
|
||||
|
||||
return self._name
|
||||
|
||||
@property
|
||||
|
|
|
|||
|
|
@ -113,10 +113,7 @@ class Stricklers(SQLSubModel):
|
|||
return True
|
||||
|
||||
def __str__(self):
|
||||
if self._name != "":
|
||||
return f"{self._name} ({self._minor}, {self._medium})"
|
||||
|
||||
return f"({self._minor}, {self._medium})"
|
||||
return f"{self.name} ({self._minor}, {self._medium})"
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class PamhyrModelDict(SQLSubModel):
|
|||
if key in self._dict:
|
||||
v = self._dict[key]
|
||||
|
||||
if type(v) is types.GeneratorType:
|
||||
if isinstance(v, types.GeneratorType):
|
||||
return list(v)
|
||||
|
||||
return v
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@ from Model.Results.River.River import River, Reach, Profile
|
|||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class RubarBE(CommandLineSolver):
|
||||
_type = "rubarbe"
|
||||
class Rubar3(CommandLineSolver):
|
||||
_type = "rubar3"
|
||||
|
||||
def __init__(self, name):
|
||||
super(RubarBE, self).__init__(name)
|
||||
super(Rubar3, self).__init__(name)
|
||||
|
||||
self._type = "rubarbe"
|
||||
self._type = "rubar3"
|
||||
|
||||
self._cmd_input = ""
|
||||
self._cmd_solver = "@path @input -o @output"
|
||||
|
|
@ -44,9 +44,9 @@ class RubarBE(CommandLineSolver):
|
|||
|
||||
@classmethod
|
||||
def default_parameters(cls):
|
||||
lst = super(RubarBE, cls).default_parameters()
|
||||
# lst = super(Rubar3, cls).default_parameters()
|
||||
|
||||
lst += [
|
||||
lst = [
|
||||
("rubarbe_cfl", "0.50000E+00"),
|
||||
("rubarbe_condam", "1"),
|
||||
("rubarbe_condav", "3"),
|
||||
|
|
@ -60,10 +60,10 @@ class RubarBE(CommandLineSolver):
|
|||
("rubarbe_tinit", "000:00:00:00"),
|
||||
("rubarbe_tmax", "999:99:99:00"),
|
||||
("rubarbe_tiopdt", "000:00:00:00"),
|
||||
("rubarbe_dt", "3000.0"),
|
||||
("rubarbe_dt", "5.0"),
|
||||
("rubarbe_ts", "999:99:99:00"),
|
||||
("rubarbe_dtsauv", "999:99:99:00"),
|
||||
("rubarbe_psave", "999:99:99:00"),
|
||||
("rubarbe_dtsauv", "00:00:00:05"),
|
||||
("rubarbe_psave", "00:00:00:05"),
|
||||
("rubarbe_fdeb1", "1"),
|
||||
("rubarbe_fdeb2", "10"),
|
||||
("rubarbe_fdeb3", "100"),
|
||||
|
|
@ -119,21 +119,21 @@ class RubarBE(CommandLineSolver):
|
|||
##########
|
||||
|
||||
def cmd_args(self, study):
|
||||
lst = super(RubarBE, self).cmd_args(study)
|
||||
lst = super(Rubar3, self).cmd_args(study)
|
||||
|
||||
return lst
|
||||
|
||||
def input_param(self):
|
||||
name = self._study.name
|
||||
return f"{name}.REP"
|
||||
return f"{name}"
|
||||
|
||||
def output_param(self):
|
||||
name = self._study.name
|
||||
return f"{name}.BIN"
|
||||
return f"{name}"
|
||||
|
||||
def log_file(self):
|
||||
name = self._study.name
|
||||
return f"{name}.TRA"
|
||||
return f"{name}"
|
||||
|
||||
def export(self, study, repertory, qlog=None):
|
||||
self._study = study
|
||||
|
|
@ -143,8 +143,12 @@ class RubarBE(CommandLineSolver):
|
|||
self._export_ts(study, repertory, qlog, name=name)
|
||||
self._export_geomac_i(study, repertory, qlog, name=name)
|
||||
self._export_mail(study, repertory, qlog, name=name)
|
||||
self._export_tps(study, repertory, qlog, name=name)
|
||||
self._export_condin(study, repertory, qlog, name=name)
|
||||
self._export_stricklers(study, repertory, qlog, name=name)
|
||||
self._export_hydro(study, repertory, qlog, name=name)
|
||||
self._export_condav(study, repertory, qlog, name=name)
|
||||
|
||||
return True
|
||||
|
||||
def _export_donnee(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
|
|
@ -168,6 +172,9 @@ class RubarBE(CommandLineSolver):
|
|||
name = param.name
|
||||
value = param.value
|
||||
|
||||
if "all_" in name:
|
||||
continue
|
||||
|
||||
if value != "":
|
||||
# Value format
|
||||
if value.count(':') == 3:
|
||||
|
|
@ -276,7 +283,9 @@ class RubarBE(CommandLineSolver):
|
|||
if label[0] == "r":
|
||||
label = label[1].upper()
|
||||
else:
|
||||
label = lable[0]
|
||||
label = label[1].upper()
|
||||
else:
|
||||
label = " "
|
||||
|
||||
y = point.y
|
||||
z = point.z
|
||||
|
|
@ -361,13 +370,13 @@ class RubarBE(CommandLineSolver):
|
|||
ind += 1
|
||||
f.write("\n")
|
||||
|
||||
def _export_tps(self, study, repertory, qlog, name="0"):
|
||||
def _export_condin(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
qlog.put("Export TPS file")
|
||||
qlog.put("Export CONDIN file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"tps.{name}"
|
||||
repertory, f"condin.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
for edge in study.river.enable_edges():
|
||||
|
|
@ -376,7 +385,7 @@ class RubarBE(CommandLineSolver):
|
|||
f.write(f"0.0\n")
|
||||
|
||||
ics = study.river.initial_conditions.get(edge)
|
||||
data = self._export_tps_init_data(ics)
|
||||
data = self._export_condin_init_data(ics)
|
||||
|
||||
profiles = reach.profiles
|
||||
first = profiles[0]
|
||||
|
|
@ -388,11 +397,11 @@ class RubarBE(CommandLineSolver):
|
|||
)
|
||||
return
|
||||
|
||||
f_h_s = self._export_tps_profile_height_speed(first, data)
|
||||
l_h_s = self._export_tps_profile_height_speed(last, data)
|
||||
f_h_s = self._export_condin_profile_height_speed(first, data)
|
||||
l_h_s = self._export_condin_profile_height_speed(last, data)
|
||||
|
||||
# First mail
|
||||
f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}")
|
||||
f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}\n")
|
||||
|
||||
ind = 2
|
||||
it = iter(profiles)
|
||||
|
|
@ -404,7 +413,7 @@ class RubarBE(CommandLineSolver):
|
|||
ind += 1
|
||||
continue
|
||||
|
||||
cur_h, cur_s = self._export_tps_profile_height_speed(
|
||||
cur_h, cur_s = self._export_condin_profile_height_speed(
|
||||
profile, data
|
||||
)
|
||||
|
||||
|
|
@ -418,9 +427,9 @@ class RubarBE(CommandLineSolver):
|
|||
ind += 1
|
||||
|
||||
# Last mail
|
||||
f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}")
|
||||
f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}\n")
|
||||
|
||||
def _export_tps_init_data(self, ics):
|
||||
def _export_condin_init_data(self, ics):
|
||||
data = {}
|
||||
|
||||
for d in ics.data:
|
||||
|
|
@ -431,11 +440,70 @@ class RubarBE(CommandLineSolver):
|
|||
|
||||
return data
|
||||
|
||||
def _export_tps_profile_height_speed(self, profile, data):
|
||||
def _export_condin_profile_height_speed(self, profile, data):
|
||||
z = data[profile.rk][0]
|
||||
q = data[profile.rk][1]
|
||||
|
||||
height = z - profile.z_min()
|
||||
# height = z - profile.z_min()
|
||||
speed = profile.speed(q, z)
|
||||
|
||||
return height, speed
|
||||
return z, speed
|
||||
|
||||
def _export_hydro(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
qlog.put("Export HYDRO file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"hydro.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
bcs = []
|
||||
for edge in study.river.enable_edges():
|
||||
for bound in study.river.boundary_condition.get_tab("liquid"):
|
||||
# BC is an hydrogramme
|
||||
if bound.bctype == "TD" or bound.bctype == "PC":
|
||||
# BC is on input node of this reach
|
||||
if bound.node == edge.node1:
|
||||
bcs.append(bound)
|
||||
|
||||
for bc in bcs:
|
||||
f.write(f"{len(bc)}\n")
|
||||
for d0, d1 in bc.data:
|
||||
f.write(f"{d0} {d1}\n")
|
||||
|
||||
def _export_condav(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
qlog.put("Export CONDAV file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"condav.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
bcs = []
|
||||
for edge in study.river.enable_edges():
|
||||
for bound in study.river.boundary_condition.get_tab("liquid"):
|
||||
# BC is an hydrogramme
|
||||
if bound.bctype == "ZD" or bound.bctype == "TZ":
|
||||
# BC is on input node of this reach
|
||||
if bound.node == edge.node2:
|
||||
bcs.append(bound)
|
||||
|
||||
for bc in bcs:
|
||||
f.write(f"{len(bc)}\n")
|
||||
for d0, d1 in bc.data:
|
||||
f.write(f"{d0} {d1}\n")
|
||||
|
||||
|
||||
class RubarBE(Rubar3):
|
||||
_type = "rubarbe"
|
||||
|
||||
def __init__(self, name):
|
||||
super(RubarBE, self).__init__(name)
|
||||
|
||||
self._type = "rubarbe"
|
||||
|
||||
self._cmd_input = ""
|
||||
self._cmd_solver = "@path @input -o @output"
|
||||
self._cmd_output = ""
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ from Solver.GenericSolver import GenericSolver
|
|||
from Solver.Mage import (
|
||||
Mage7, Mage8, MageFake7,
|
||||
)
|
||||
from Solver.RubarBE import RubarBE
|
||||
from Solver.RubarBE import Rubar3, RubarBE
|
||||
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
|
|
@ -32,6 +32,7 @@ solver_long_name = {
|
|||
"mage8": "Mage v8",
|
||||
# "mage_fake7": "Mage fake v7",
|
||||
# "rubarbe": "RubarBE",
|
||||
# "rubar3": "Rubar3",
|
||||
}
|
||||
|
||||
solver_type_list = {
|
||||
|
|
@ -40,4 +41,5 @@ solver_type_list = {
|
|||
"mage8": Mage8,
|
||||
# "mage_fake7": MageFake7,
|
||||
# "rubarbe": RubarBE,
|
||||
# "rubar3": Rubar3,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ class AboutWindow(PamhyrDialog):
|
|||
|
||||
label = self.get_label_text("label_version")
|
||||
label = label.replace("@version", version)
|
||||
label = label.replace("@codename", "(Tahiti)")
|
||||
self.set_label_text("label_version", label)
|
||||
|
||||
# Authors
|
||||
|
|
@ -67,5 +68,5 @@ class AboutWindow(PamhyrDialog):
|
|||
label = f"\n - {author}" + label
|
||||
except StopIteration:
|
||||
label = _translate("About", "Contributors: ") + label
|
||||
label = "Copyright © 2022-2024 INRAE\n" + label
|
||||
# label = "Copyright © 2022-2024 INRAE\n" + label
|
||||
self.set_label_text("label_copyright", label)
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
self.setup_plot()
|
||||
self.setup_data()
|
||||
self.setup_connections()
|
||||
self.setup_dialog()
|
||||
|
||||
def setup_data(self):
|
||||
self._is_solid = self._data.bctype == "SL"
|
||||
|
|
@ -203,12 +204,17 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
self.find(QAction, "action_generate_critical").triggered.connect(
|
||||
self.generate_critical
|
||||
)
|
||||
self.find(QAction, "action_increasing").triggered.connect(
|
||||
self.make_increasing
|
||||
)
|
||||
if self._data.bctype != "ZD" or not self._data.has_node:
|
||||
self.find(QAction, "action_generate_uniform").setVisible(False)
|
||||
self.find(QAction, "action_generate_critical").setVisible(False)
|
||||
self.find(QAction, "action_increasing").setVisible(False)
|
||||
else:
|
||||
self.find(QAction, "action_generate_uniform").setVisible(True)
|
||||
self.find(QAction, "action_generate_critical").setVisible(True)
|
||||
self.find(QAction, "action_increasing").setVisible(True)
|
||||
|
||||
self._table.dataChanged.connect(self.update)
|
||||
self._table.layoutChanged.connect(self.update)
|
||||
|
|
@ -217,6 +223,13 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
self._d50sigma.d50Changed.connect(self.d50_changed)
|
||||
self._d50sigma.sigmaChanged.connect(self.sigma_changed)
|
||||
|
||||
def setup_dialog(self):
|
||||
if len(self._data.reach(self._study.river)) > 0:
|
||||
reach = self._data.reach(self._study.river)[0]
|
||||
self.slope_value = abs(reach.get_incline_median_mean())
|
||||
else:
|
||||
self.slope_value = 0.0
|
||||
|
||||
def d50_changed(self, value):
|
||||
self._undo_stack.push(
|
||||
SetMetaDataCommand(
|
||||
|
|
@ -331,15 +344,16 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
def generate_uniform(self):
|
||||
if self._data.has_node:
|
||||
node = self._data.node
|
||||
if node is None:
|
||||
return
|
||||
reach = self._data.reach(self._study.river)[0]
|
||||
profile = reach.profiles[-1]
|
||||
incline = abs(reach.get_incline_median_mean())
|
||||
dlg = GenerateDialog(incline,
|
||||
dlg = GenerateDialog(self.slope_value,
|
||||
reach,
|
||||
trad=self._trad,
|
||||
parent=self)
|
||||
if dlg.exec():
|
||||
incline = dlg.value
|
||||
self.slope_value = dlg.value
|
||||
frictions = reach._parent.frictions.frictions
|
||||
z_min = profile.z_min()
|
||||
z_max = profile.z_max()
|
||||
|
|
@ -351,8 +365,10 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
strickler = 25.0
|
||||
height = [(i)*(z_max-z_min)/50 for i in range(51)]
|
||||
q = [((profile.wet_width(z_min + h) * 0.8) * strickler
|
||||
* (h ** (5/3)) * (abs(incline) ** (0.5)))
|
||||
* (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
|
||||
for h in height]
|
||||
for i in range(len(height)):
|
||||
height[i] += z_min
|
||||
self._table.replace_data(height, q)
|
||||
|
||||
return
|
||||
|
|
@ -360,6 +376,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
def generate_critical(self):
|
||||
if self._data.has_node:
|
||||
node = self._data.node
|
||||
if node is None:
|
||||
return
|
||||
reach = self._data.reach(self._study.river)[0]
|
||||
profile = reach.profiles[-1]
|
||||
z_min = profile.z_min()
|
||||
|
|
@ -368,5 +386,25 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
q = [sqrt(9.81 * (profile.wet_area(z_min + h) ** 3)
|
||||
/ profile.wet_width(z_min + h))
|
||||
for h in height]
|
||||
for i in range(len(height)):
|
||||
height[i] += z_min
|
||||
self._table.replace_data(height, q)
|
||||
return
|
||||
|
||||
def make_increasing(self):
|
||||
if self._data.has_node:
|
||||
node = self._data.node
|
||||
if node is None:
|
||||
return
|
||||
if len(self._table._data) < 2:
|
||||
return
|
||||
h = [self._data.get_i(0)[0]]
|
||||
q = [self._data.get_i(0)[1]]
|
||||
for i in range(len(self._table._data)):
|
||||
if i == 0:
|
||||
continue
|
||||
row = self._data.get_i(i)
|
||||
if row[1] > q[-1]:
|
||||
h.append(row[0])
|
||||
q.append(row[1])
|
||||
self._table.replace_data(h, q)
|
||||
|
|
|
|||
|
|
@ -74,17 +74,17 @@ class ConfigureSolverWindow(PamhyrDialog):
|
|||
# File button
|
||||
buttons = {
|
||||
"pushButton_input": (lambda: self.file_dialog(
|
||||
select_file=True,
|
||||
select_file="ExistingFile",
|
||||
callback=lambda f: self.set_line_edit_text(
|
||||
"lineEdit_input", f[0])
|
||||
)),
|
||||
"pushButton_solver": (lambda: self.file_dialog(
|
||||
select_file=True,
|
||||
select_file="ExistingFile",
|
||||
callback=lambda f: self.set_line_edit_text(
|
||||
"lineEdit_solver", f[0])
|
||||
)),
|
||||
"pushButton_output": (lambda: self.file_dialog(
|
||||
select_file=True,
|
||||
select_file="ExistingFile",
|
||||
callback=lambda f: self.set_line_edit_text(
|
||||
"lineEdit_output", f[0])
|
||||
)),
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ class ConfigureWindow(PamhyrDialog):
|
|||
"pushButton_stricklers_sort": self.sort_stricklers,
|
||||
# Others
|
||||
# "pushButton_backup_path": lambda: self.file_dialog(
|
||||
# select_file=False,
|
||||
# select_file="Directory",
|
||||
# callback=lambda f: self.set_line_edit_text(
|
||||
# "lineEdit_backup_path", f[0]
|
||||
# )
|
||||
|
|
|
|||
|
|
@ -209,9 +209,7 @@ class FrictionsWindow(PamhyrWindow):
|
|||
self.update_plot(highlight)
|
||||
|
||||
def update_plot(self, highlight=None):
|
||||
if highlight is not None:
|
||||
self.plot.highlight = highlight
|
||||
self.plot.draw()
|
||||
self.plot.draw(highlight)
|
||||
|
||||
if highlight is not None:
|
||||
self.plot_2.highlight = highlight
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ class FrictionsTranslate(MainTranslate):
|
|||
# "edge": self._dict["reach"],
|
||||
"begin_rk": _translate("Frictions", "Start (m)"),
|
||||
"end_rk": _translate("Frictions", "End (m)"),
|
||||
"begin_strickler": _translate("Frictions", "Start coefficient"),
|
||||
"end_strickler": _translate("Frictions", "End coefficient"),
|
||||
"begin_strickler": _translate("Frictions", "Coefficient"),
|
||||
# "end_strickler": _translate("Frictions", "End coefficient"),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ class MeshingDialog(PamhyrDialog):
|
|||
self._init_default_values()
|
||||
|
||||
def _init_default_values(self):
|
||||
gl, _ = self._reach.compute_guidelines()
|
||||
self._gl = list(gl)
|
||||
self._space_step = 50.0
|
||||
self._lplan = False
|
||||
self._lm = "3"
|
||||
|
|
@ -58,6 +60,14 @@ class MeshingDialog(PamhyrDialog):
|
|||
self._end_cs = -1
|
||||
self._begin_dir = "un"
|
||||
self._end_dir = "np"
|
||||
|
||||
lower_gl = list(map(str.lower, self._gl))
|
||||
for i, gl in enumerate(lower_gl):
|
||||
if gl == "rg":
|
||||
self._begin_dir = self._gl[i]
|
||||
elif gl == "rd":
|
||||
self._end_dir = self._gl[i]
|
||||
|
||||
self._origin = self._reach.profile(0)
|
||||
|
||||
self._init_default_values_profiles()
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class PlotAC(PamhyrPlot):
|
|||
self._autoscale_update = True
|
||||
|
||||
self.label_x = self._trad["transverse_abscissa"]
|
||||
self.label_y = self._trad["unit_height"]
|
||||
self.label_y = self._trad["unit_elevation"]
|
||||
|
||||
self.label_previous_plot_selected = self._trad["prev_cs"]
|
||||
self.label_plot_selected = self._trad["cs"]
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ class PlotRKZ(PamhyrPlot):
|
|||
z_min = self.data.get_z_min()
|
||||
z_max = self.data.get_z_max()
|
||||
|
||||
self._colors, self._style = self.color_hightlight()
|
||||
self._colors, self._style = self.color_highlight()
|
||||
|
||||
self.line_rk_zmin_zmax = self.canvas.axes.vlines(
|
||||
x=rk, ymin=z_min, ymax=z_max,
|
||||
|
|
@ -208,7 +208,7 @@ class PlotRKZ(PamhyrPlot):
|
|||
picker=10,
|
||||
)
|
||||
|
||||
def color_hightlight(self):
|
||||
def color_highlight(self):
|
||||
rows = sorted(list(
|
||||
set(
|
||||
(i.row() for i in self.parent.tableView.selectedIndexes())
|
||||
|
|
@ -292,6 +292,8 @@ class PlotRKZ(PamhyrPlot):
|
|||
)
|
||||
|
||||
for hs in lhs:
|
||||
if not hs.enabled:
|
||||
continue
|
||||
x = hs.input_rk
|
||||
if x is not None:
|
||||
z_min = reach.get_z_min()
|
||||
|
|
@ -328,7 +330,7 @@ class PlotRKZ(PamhyrPlot):
|
|||
|
||||
def update_current(self):
|
||||
if self._current_data_update:
|
||||
self._colors, self._style = self.color_hightlight()
|
||||
self._colors, self._style = self.color_highlight()
|
||||
self.line_rk_zmin_zmax.set_colors(self._colors)
|
||||
self.line_rk_zmin_zmax.set_linestyle(self._style)
|
||||
|
||||
|
|
@ -345,7 +347,7 @@ class PlotRKZ(PamhyrPlot):
|
|||
# TODO comprendre à quoi sert ce bout de code
|
||||
# ========>
|
||||
# self.line_rk_zmin_zmax.remove()
|
||||
# self._colors, self._style = self.color_hightlight()
|
||||
# self._colors, self._style = self.color_highlight()
|
||||
# self.line_rk_zmin_zmax = self.canvas.axes.vlines(
|
||||
# x=rk,
|
||||
# ymin=z_min,
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ class Plot(PamhyrPlot):
|
|||
self.line_xy = []
|
||||
self.line_gl = []
|
||||
|
||||
self.label_x = self._trad["unit_rk"]
|
||||
self.label_y = self._trad["unit_height"]
|
||||
self.label_x = self._trad["transverse_abscissa"]
|
||||
self.label_y = self._trad["unit_elevation"]
|
||||
|
||||
self.before_plot_selected = None
|
||||
self.plot_selected = None
|
||||
|
|
@ -313,10 +313,6 @@ class Plot(PamhyrPlot):
|
|||
x_carto = self.data.x()
|
||||
y_carto = self.data.y()
|
||||
|
||||
if (len(x_carto) < 3 or len(y_carto) < 3 or len(x) < 3):
|
||||
# Noting to do in this case
|
||||
return
|
||||
|
||||
self.profile_line2D, = self.canvas.axes.plot(
|
||||
x, y, color=self.color_plot,
|
||||
lw=1.5, markersize=7, marker='+',
|
||||
|
|
|
|||
|
|
@ -204,19 +204,29 @@ class ImportCommand(QUndoCommand):
|
|||
self._row = row
|
||||
self._filename = filename
|
||||
self._profiles = None
|
||||
self._old_profiles = []
|
||||
for row in range(len(self._reach)):
|
||||
self._old_profiles.append((self._reach.profile(row)))
|
||||
self._old_profiles.reverse()
|
||||
|
||||
def undo(self):
|
||||
self._reach.delete_profiles(self._profiles)
|
||||
for profile in self._old_profiles:
|
||||
self._reach.insert_profile(self._row, profile)
|
||||
|
||||
def redo(self):
|
||||
if self._profiles is None:
|
||||
self._reach.delete_profiles(self._old_profiles)
|
||||
try:
|
||||
self._profiles = self._reach.import_geometry(self._filename)
|
||||
self._profiles.reverse()
|
||||
except Exception as e:
|
||||
for profile in self._old_profiles:
|
||||
self._reach.insert_profile(self._row, profile)
|
||||
logger_exception(e)
|
||||
exception_message_box(e)
|
||||
else:
|
||||
self._reach.delete_profiles(self._old_profiles)
|
||||
for profile in self._profiles:
|
||||
self._reach.insert_profile(self._row, profile)
|
||||
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ class UpdateRKDialog(PamhyrDialog):
|
|||
|
||||
lower_gl = list(map(str.lower, self._gl))
|
||||
for i, gl in enumerate(lower_gl):
|
||||
if gl == "rd":
|
||||
if gl == "rg":
|
||||
self._begin_dir = self._gl[i]
|
||||
elif gl == "rg":
|
||||
elif gl == "rd":
|
||||
self._end_dir = self._gl[i]
|
||||
|
||||
self._orientation = 0
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ class GeometryWindow(PamhyrWindow):
|
|||
QSettings.UserScope, 'MyOrg'
|
||||
)
|
||||
|
||||
if self._study.filename != "" or self._study.filename is not None:
|
||||
if self._study.filename != "" and self._study.filename is not None:
|
||||
default_directory = os.path.basename(self._study.filename)
|
||||
current_dir = settings.value(
|
||||
'current_directory',
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class BasicHydraulicStructuresTranslate(MainTranslate):
|
|||
super(BasicHydraulicStructuresTranslate, self).__init__()
|
||||
|
||||
self._dict["Basic Hydraulic Structures"] = _translate(
|
||||
"BasicHydraulicStructures", "Basic Hydraulic Structure"
|
||||
"BasicHydraulicStructures", "Basic Hydraulic Structures"
|
||||
)
|
||||
|
||||
self._dict['msg_type_change_title'] = _translate(
|
||||
|
|
@ -108,7 +108,7 @@ hydraulic structure values?"
|
|||
self._sub_dict["long_types"] = {
|
||||
"ND": self._dict["not_defined"],
|
||||
"S1": _translate(
|
||||
"BasicHydraulicStructures", "Discharge weir"
|
||||
"BasicHydraulicStructures", "Rectangular weir"
|
||||
),
|
||||
"S2": _translate(
|
||||
"BasicHydraulicStructures", "Trapezoidal weir"
|
||||
|
|
|
|||
|
|
@ -118,3 +118,4 @@ class PlotAC(PamhyrPlot):
|
|||
def update_clear(self):
|
||||
if self.line_rk is not None:
|
||||
self.line_rk.set_data([], [])
|
||||
self.update_idle()
|
||||
|
|
|
|||
|
|
@ -69,21 +69,23 @@ class PlotRKC(PamhyrPlot):
|
|||
self.profile = None
|
||||
self.line_rk_zmin_zmax = None
|
||||
self.line_rk_zmin = None
|
||||
self.hs_vlines = None
|
||||
return
|
||||
|
||||
if self._current_reach is None:
|
||||
self.profile = None
|
||||
self.line_rk_zmin_zmax = None
|
||||
self.line_rk_zmin = None
|
||||
self.hs_vlines = None
|
||||
return
|
||||
|
||||
self.draw_data()
|
||||
self.draw_data(highlight)
|
||||
self.draw_current()
|
||||
|
||||
self.idle()
|
||||
self._init = True
|
||||
|
||||
def draw_data(self):
|
||||
def draw_data(self, highlight):
|
||||
reach = self._current_reach
|
||||
|
||||
rk = reach.reach.get_rk()
|
||||
|
|
@ -107,11 +109,68 @@ class PlotRKC(PamhyrPlot):
|
|||
self.line_rk_zmin_zmax = self.canvas.axes.vlines(
|
||||
x=rk,
|
||||
ymin=z_min, ymax=z_max,
|
||||
color=self.color_plot,
|
||||
color=self.color_highlight(highlight),
|
||||
lw=1.,
|
||||
picker=10
|
||||
)
|
||||
|
||||
# Draw HS
|
||||
|
||||
lhs = filter(
|
||||
lambda hs: hs._input_reach is reach,
|
||||
filter(
|
||||
lambda hs: hs._input_reach is not None,
|
||||
self.data.hydraulic_structures.lst
|
||||
)
|
||||
)
|
||||
|
||||
vx = []
|
||||
vymin = []
|
||||
vymax = []
|
||||
self.anotate_lst = []
|
||||
hs_color = []
|
||||
for hs in lhs:
|
||||
if hs.enabled:
|
||||
hs_color.append("black")
|
||||
else:
|
||||
hs_color.append("darkgrey")
|
||||
x = hs.input_rk
|
||||
if x is not None:
|
||||
a = self.canvas.axes.annotate(
|
||||
" > " + hs.name,
|
||||
(x, max(z_max)),
|
||||
horizontalalignment='left',
|
||||
verticalalignment='top',
|
||||
annotation_clip=True,
|
||||
fontsize=9,
|
||||
color=hs_color[-1],
|
||||
)
|
||||
self.anotate_lst.append(a)
|
||||
vx.append(x)
|
||||
vymin.append(min(z_min))
|
||||
vymax.append(max(z_max))
|
||||
|
||||
self.hs_vlines = self.canvas.axes.vlines(
|
||||
x=vx, ymin=vymin, ymax=vymax,
|
||||
linestyle="--",
|
||||
lw=1.,
|
||||
color=hs_color,
|
||||
)
|
||||
|
||||
def color_highlight(self, highlight):
|
||||
|
||||
reach = self._current_reach
|
||||
colors = [self.color_plot] * reach.reach.number_profiles
|
||||
|
||||
if highlight is not None:
|
||||
rk = reach.reach.get_rk()
|
||||
rows = [i for i in range(len(rk))
|
||||
if (rk[i] >= highlight[0] and rk[i] <= highlight[1])]
|
||||
if len(rows) > 0:
|
||||
for row in rows:
|
||||
colors[row] = self.color_plot_current
|
||||
return colors
|
||||
|
||||
def draw_current(self):
|
||||
if self._current_profile is None:
|
||||
self.profile = None
|
||||
|
|
@ -166,11 +225,19 @@ class PlotRKC(PamhyrPlot):
|
|||
if self.line_rk_zmin is not None:
|
||||
self.line_rk_zmin.set_data([], [])
|
||||
|
||||
if self.hs_vlines is not None:
|
||||
self.hs_vlines.remove()
|
||||
self.hs_vlines = None
|
||||
|
||||
for a in self.anotate_lst:
|
||||
a.remove()
|
||||
self.anotate_lst = []
|
||||
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
|
||||
def clear_profile(self):
|
||||
if self.profile is not None:
|
||||
self.profile.set_data([], [])
|
||||
self.profile[0].set_data([], [])
|
||||
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,8 @@ class ComboBoxDelegate(QItemDelegate):
|
|||
if reach is not None:
|
||||
val = list(
|
||||
map(
|
||||
lambda rk: str(rk), reach.reach.get_rk()
|
||||
lambda p: p.display_name(),
|
||||
reach.reach.profiles
|
||||
)
|
||||
)
|
||||
else:
|
||||
|
|
@ -89,7 +90,23 @@ class ComboBoxDelegate(QItemDelegate):
|
|||
|
||||
def setModelData(self, editor, model, index):
|
||||
text = str(editor.currentText())
|
||||
model.setData(index, text)
|
||||
|
||||
if self._mode == "rk":
|
||||
reach = self._data.hydraulic_structures\
|
||||
.get(index.row())\
|
||||
.input_reach
|
||||
profiles = list(
|
||||
filter(
|
||||
lambda p: p.display_name() == text,
|
||||
reach.reach.profiles
|
||||
)
|
||||
)
|
||||
|
||||
value = profiles[0].rk if len(profiles) > 0 else None
|
||||
else:
|
||||
value = text
|
||||
|
||||
model.setData(index, value)
|
||||
editor.close()
|
||||
editor.deleteLater()
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
# DialogDepth.py -- Pamhyr
|
||||
# Copyright (C) 2023-2024 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from View.Tools.PamhyrWindow import PamhyrDialog
|
||||
|
||||
from PyQt5.QtGui import (
|
||||
QKeySequence,
|
||||
)
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QVariant, QAbstractTableModel,
|
||||
)
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QDialogButtonBox, QComboBox, QUndoStack, QShortcut,
|
||||
QDoubleSpinBox, QCheckBox,
|
||||
)
|
||||
|
||||
|
||||
class DepthDialog(PamhyrDialog):
|
||||
_pamhyr_ui = "InitialConditions_Dialog_Generator_Depth"
|
||||
_pamhyr_name = "Depth"
|
||||
|
||||
def __init__(self, value, option, trad=None, parent=None):
|
||||
super(DepthDialog, self).__init__(
|
||||
title=trad[self._pamhyr_name],
|
||||
options=[],
|
||||
trad=trad,
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self.value = value
|
||||
self.option = option
|
||||
self.sb = self.find(QDoubleSpinBox, "doubleSpinBox")
|
||||
self.sb.setValue(self.value)
|
||||
self.cb = self.find(QCheckBox, "checkBox")
|
||||
self.cb.setChecked(self.option)
|
||||
|
||||
def accept(self):
|
||||
self.value = self.sb.value()
|
||||
self.option = self.cb.isChecked()
|
||||
super().accept()
|
||||
|
||||
def reject(self):
|
||||
self.close()
|
||||
|
|
@ -36,7 +36,12 @@ class DischargeDialog(PamhyrDialog):
|
|||
_pamhyr_ui = "InitialConditions_Dialog_Generator_Discharge"
|
||||
_pamhyr_name = "Discharge"
|
||||
|
||||
def __init__(self, title="Discharge", trad=None, parent=None):
|
||||
def __init__(self,
|
||||
value,
|
||||
option,
|
||||
title="Discharge",
|
||||
trad=None,
|
||||
parent=None):
|
||||
super(DischargeDialog, self).__init__(
|
||||
title=trad[self._pamhyr_name],
|
||||
options=[],
|
||||
|
|
@ -44,12 +49,16 @@ class DischargeDialog(PamhyrDialog):
|
|||
parent=parent
|
||||
)
|
||||
|
||||
self.value = None
|
||||
self.option = None
|
||||
self.value = value
|
||||
self.option = option
|
||||
self.sb = self.find(QDoubleSpinBox, "doubleSpinBox")
|
||||
self.sb.setValue(self.value)
|
||||
self.cb = self.find(QCheckBox, "checkBox")
|
||||
self.cb.setChecked(self.option)
|
||||
|
||||
def accept(self):
|
||||
self.value = self.find(QDoubleSpinBox, "doubleSpinBox").value()
|
||||
self.option = self.find(QCheckBox, "checkBox").isChecked()
|
||||
self.value = self.sb.value()
|
||||
self.option = self.cb.isChecked()
|
||||
super().accept()
|
||||
|
||||
def reject(self):
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ from PyQt5.QtCore import (
|
|||
|
||||
from PyQt5.QtWidgets import (
|
||||
QDialogButtonBox, QComboBox, QUndoStack, QShortcut,
|
||||
QDoubleSpinBox, QCheckBox,
|
||||
QDoubleSpinBox, QCheckBox, QLabel
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ class HeightDialog(PamhyrDialog):
|
|||
_pamhyr_ui = "InitialConditions_Dialog_Generator_Height"
|
||||
_pamhyr_name = "Height"
|
||||
|
||||
def __init__(self, trad=None, parent=None):
|
||||
def __init__(self, values, option, trad=None, parent=None):
|
||||
super(HeightDialog, self).__init__(
|
||||
title=trad[self._pamhyr_name],
|
||||
options=[],
|
||||
|
|
@ -44,12 +44,29 @@ class HeightDialog(PamhyrDialog):
|
|||
parent=parent
|
||||
)
|
||||
|
||||
self.value = None
|
||||
self.option = None
|
||||
self.values = values
|
||||
self.option = option
|
||||
self.sb1 = self.find(QDoubleSpinBox, "doubleSpinBox_1")
|
||||
self.sb1.setValue(self.values[0])
|
||||
self.sb2 = self.find(QDoubleSpinBox, "doubleSpinBox_2")
|
||||
self.sb2.setValue(self.values[1])
|
||||
self.sb3 = self.find(QDoubleSpinBox, "doubleSpinBox_3")
|
||||
self.sb3.setValue(self.values[2])
|
||||
self.cb = self.find(QCheckBox, "checkBox")
|
||||
self.cb.setChecked(self.option)
|
||||
self.enable_discharge()
|
||||
self.cb.clicked.connect(self.enable_discharge)
|
||||
|
||||
def enable_discharge(self):
|
||||
label = self.find(QLabel, "label_3")
|
||||
self.sb3.setEnabled(self.cb.isChecked())
|
||||
label.setEnabled(self.cb.isChecked())
|
||||
|
||||
def accept(self):
|
||||
self.value = self.find(QDoubleSpinBox, "doubleSpinBox").value()
|
||||
self.option = self.find(QCheckBox, "checkBox").isChecked()
|
||||
self.values[0] = self.sb1.value()
|
||||
self.values[1] = self.sb2.value()
|
||||
self.values[2] = self.sb3.value()
|
||||
self.option = self.cb.isChecked()
|
||||
super().accept()
|
||||
|
||||
def reject(self):
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ from View.Tools.PamhyrTable import PamhyrTableModel
|
|||
from View.InitialConditions.UndoCommand import (
|
||||
SetCommand, AddCommand, DelCommand,
|
||||
SortCommand, MoveCommand, InsertCommand,
|
||||
DuplicateCommand, GenerateCommand,
|
||||
DuplicateCommand, GenerateCommand, ReplaceDataCommand,
|
||||
)
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
|
@ -267,8 +267,8 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||
)
|
||||
|
||||
self._undo.push(
|
||||
InsertCommand(
|
||||
self._lst, index,
|
||||
ReplaceDataCommand(
|
||||
self._lst,
|
||||
list(
|
||||
map(
|
||||
lambda d: self._lst.new_from_data(*d),
|
||||
|
|
|
|||
|
|
@ -188,8 +188,34 @@ class GenerateCommand(QUndoCommand):
|
|||
|
||||
def redo(self):
|
||||
if self._generator == "growing":
|
||||
self._ics.generate_growing_constante_height(self._param,
|
||||
self._option)
|
||||
self._ics.generate_growing_constant_depth(self._param,
|
||||
self._option)
|
||||
elif self._generator == "discharge":
|
||||
self._ics.generate_discharge(self._param,
|
||||
self._option)
|
||||
elif self._generator == "height":
|
||||
self._ics.generate_height(self._param[0],
|
||||
self._param[1],
|
||||
self._option,
|
||||
self._param[2])
|
||||
|
||||
|
||||
class ReplaceDataCommand(QUndoCommand):
|
||||
def __init__(self, ics, new_data):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ics = ics
|
||||
self._copy = self._ics.data
|
||||
self._new_data = new_data
|
||||
self._rows = list(range(len(ics.data)))
|
||||
self._new_rows = list(range(len(new_data)))
|
||||
|
||||
def undo(self):
|
||||
self._ics.delete_i(self._new_rows)
|
||||
for row, el in enumerate(self._copy):
|
||||
self._ics.insert(row, el)
|
||||
|
||||
def redo(self):
|
||||
self._ics.delete_i(self._rows)
|
||||
for row, el in enumerate(self._new_data):
|
||||
self._ics.insert(row, el)
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
|
|||
from View.InitialConditions.PlotDRK import PlotDRK
|
||||
from View.InitialConditions.PlotDischarge import PlotDischarge
|
||||
from View.InitialConditions.translate import ICTranslate
|
||||
from View.InitialConditions.DialogDepth import DepthDialog
|
||||
from View.InitialConditions.DialogHeight import HeightDialog
|
||||
from View.InitialConditions.DialogDischarge import DischargeDialog
|
||||
from View.Results.ReadingResultsDialog import ReadingResultsDialog
|
||||
|
|
@ -103,6 +104,7 @@ class InitialConditionsWindow(PamhyrWindow):
|
|||
self.setup_table()
|
||||
self.setup_plot()
|
||||
self.setup_connections()
|
||||
self.setub_dialogs()
|
||||
|
||||
self.ui.setWindowTitle(self._title)
|
||||
|
||||
|
|
@ -174,15 +176,27 @@ class InitialConditionsWindow(PamhyrWindow):
|
|||
.connect(self.import_from_file)
|
||||
|
||||
self.find(QPushButton, "pushButton_generate_1").clicked.connect(
|
||||
self.generate_growing_constante_height
|
||||
self.generate_growing_constant_depth
|
||||
)
|
||||
|
||||
self.find(QPushButton, "pushButton_generate_2").clicked.connect(
|
||||
self.generate_discharge
|
||||
)
|
||||
|
||||
self.find(QPushButton, "pushButton_generate_3").clicked.connect(
|
||||
self.generate_height
|
||||
)
|
||||
|
||||
self._table.dataChanged.connect(self._update_plot)
|
||||
|
||||
def setub_dialogs(self):
|
||||
self.height_values = [0.0, 0.0, 0.0]
|
||||
self.height_option = True
|
||||
self.discharge_value = 0.0
|
||||
self.discharge_option = True
|
||||
self.depth_value = 0.0
|
||||
self.depth_option = True
|
||||
|
||||
def index_selected_row(self):
|
||||
table = self.find(QTableView, f"tableView")
|
||||
rows = table.selectionModel()\
|
||||
|
|
@ -249,6 +263,7 @@ class InitialConditionsWindow(PamhyrWindow):
|
|||
workdir = os.path.dirname(self._study.filename)
|
||||
|
||||
return self.file_dialog(
|
||||
select_file="ExistingFile",
|
||||
callback=lambda d: self._import_from_file(d[0]),
|
||||
directory=workdir,
|
||||
default_suffix=".BIN",
|
||||
|
|
@ -261,11 +276,15 @@ class InitialConditionsWindow(PamhyrWindow):
|
|||
.replace(".BIN", "")
|
||||
|
||||
def reading():
|
||||
self._tmp_results = solver.results(
|
||||
self._study,
|
||||
os.path.dirname(file_name),
|
||||
name=name
|
||||
)
|
||||
try:
|
||||
self._tmp_results = solver.results(
|
||||
self._study,
|
||||
os.path.dirname(file_name),
|
||||
name=name
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to open results")
|
||||
logger_exception(e)
|
||||
|
||||
dlg = ReadingResultsDialog(
|
||||
reading_fn=reading,
|
||||
|
|
@ -345,18 +364,41 @@ class InitialConditionsWindow(PamhyrWindow):
|
|||
self._table.redo()
|
||||
self._update()
|
||||
|
||||
def generate_growing_constante_height(self):
|
||||
dlg = HeightDialog(trad=self._trad, parent=self)
|
||||
def generate_growing_constant_depth(self):
|
||||
dlg = DepthDialog(self.depth_value,
|
||||
self.depth_option,
|
||||
trad=self._trad,
|
||||
parent=self)
|
||||
if dlg.exec():
|
||||
value = dlg.value
|
||||
compute_discharge = dlg.option
|
||||
self._table.generate("growing", value, compute_discharge)
|
||||
self.depth_value = dlg.value
|
||||
self.depth_option = dlg.option
|
||||
self._table.generate("growing",
|
||||
self.depth_value,
|
||||
self.depth_option)
|
||||
self._update()
|
||||
|
||||
def generate_discharge(self):
|
||||
dlg = DischargeDialog(trad=self._trad, parent=self)
|
||||
dlg = DischargeDialog(self.discharge_value,
|
||||
self.discharge_option,
|
||||
trad=self._trad,
|
||||
parent=self)
|
||||
if dlg.exec():
|
||||
value = dlg.value
|
||||
compute_height = dlg.option
|
||||
self._table.generate("discharge", value, compute_height)
|
||||
self.discharge_value = dlg.value
|
||||
self.discharge_option = dlg.option
|
||||
self._table.generate("discharge",
|
||||
self.discharge_value,
|
||||
self.discharge_option)
|
||||
self._update()
|
||||
|
||||
def generate_height(self):
|
||||
dlg = HeightDialog(self.height_values,
|
||||
self.height_option,
|
||||
trad=self._trad,
|
||||
parent=self)
|
||||
if dlg.exec():
|
||||
self.height_values = dlg.values
|
||||
self.height_option = dlg.option
|
||||
self._table.generate("height",
|
||||
self.height_values,
|
||||
self.height_option)
|
||||
self._update()
|
||||
|
|
|
|||
|
|
@ -28,11 +28,7 @@ class ICTranslate(MainTranslate):
|
|||
super(ICTranslate, self).__init__()
|
||||
|
||||
self._dict["Initial condition"] = _translate(
|
||||
"InitialCondition", "Initial condition")
|
||||
self._dict["Discharge"] = _translate(
|
||||
"InitialCondition", "Discharge")
|
||||
self._dict["Height"] = _translate(
|
||||
"InitialCondition", "Height")
|
||||
"InitialCondition", "Initial conditions")
|
||||
|
||||
self._dict["elevation"] = self._dict["unit_elevation"]
|
||||
self._dict["discharge"] = self._dict["unit_discharge"]
|
||||
|
|
|
|||
|
|
@ -166,10 +166,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
|||
title = "(dbg) " if self.conf.debug else ""
|
||||
|
||||
if self._study is not None:
|
||||
title += f"Pamhyr2 - {self._study.name}"
|
||||
title += f"Pamhyr2 (Tahiti 🌴) - {self._study.name}"
|
||||
self.setWindowTitle(title)
|
||||
else:
|
||||
title += "Pamhyr2"
|
||||
title += "Pamhyr2 (Tahiti 🌴)"
|
||||
self.setWindowTitle(title)
|
||||
|
||||
def setup_tab(self):
|
||||
|
|
@ -496,6 +496,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
|||
self.update()
|
||||
|
||||
def close_model(self):
|
||||
if not self.dialog_close(cancel=True):
|
||||
return
|
||||
|
||||
self._study = None
|
||||
self.update_enable_action()
|
||||
self.conf.set_close_correctly()
|
||||
|
|
@ -745,15 +748,16 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
|||
##################
|
||||
|
||||
def msg_select_reach(self):
|
||||
self.message_box("Please select a reach",
|
||||
"Geometry edition need a reach selected "
|
||||
"into river network window to work on it")
|
||||
self.message_box(
|
||||
self._trad["mb_select_reach_title"],
|
||||
self._trad["mb_select_reach_msg"]
|
||||
)
|
||||
|
||||
def dialog_reopen_study(self):
|
||||
dlg = QMessageBox(self)
|
||||
|
||||
dlg.setWindowTitle("Last open study")
|
||||
dlg.setText("Do you want to open again the last open study?")
|
||||
dlg.setWindowTitle(self._trad["mb_last_open_title"])
|
||||
dlg.setText(self._trad["mb_last_open_msg"])
|
||||
opt = QMessageBox.Cancel | QMessageBox.Ok # | QMessageBox.Open
|
||||
|
||||
dlg.setStandardButtons(opt)
|
||||
|
|
@ -793,9 +797,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
|||
def dialog_close(self, cancel=True):
|
||||
dlg = QMessageBox(self)
|
||||
|
||||
dlg.setWindowTitle("Close PAMHYR without saving study")
|
||||
dlg.setText("Do you want to save current study before PAMHYR close ?")
|
||||
opt = QMessageBox.Save | QMessageBox.Ignore
|
||||
dlg.setWindowTitle(self._trad["mb_close_title"])
|
||||
dlg.setText(self._trad["mb_close_msg"])
|
||||
opt = QMessageBox.Save | QMessageBox.Close
|
||||
if cancel:
|
||||
opt |= QMessageBox.Cancel
|
||||
|
||||
|
|
@ -807,7 +811,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
|||
if res == QMessageBox.Save:
|
||||
self.save_study()
|
||||
return True
|
||||
elif res == QMessageBox.Ignore:
|
||||
elif res == QMessageBox.Close:
|
||||
return True
|
||||
elif res == QMessageBox.Cancel:
|
||||
return False
|
||||
|
|
@ -1411,15 +1415,3 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
|||
f"sqlitebrowser {file}",
|
||||
shell=True
|
||||
)
|
||||
|
||||
# TODO: Delete me !
|
||||
###############
|
||||
# DUMMY STUFF #
|
||||
###############
|
||||
|
||||
def open_dummy(self, title="Dummy"):
|
||||
self.dummy = DummyWindow(
|
||||
title=title if type(title) is str else "Dummy",
|
||||
parent=self
|
||||
)
|
||||
self.dummy.show()
|
||||
|
|
|
|||
|
|
@ -368,11 +368,18 @@ class EdgeItem(QGraphicsItem):
|
|||
|
||||
|
||||
class NodeText(QGraphicsTextItem):
|
||||
def __init__(self, node_item):
|
||||
def __init__(self, node_item, graph):
|
||||
super(NodeText, self).__init__()
|
||||
|
||||
self.item = node_item
|
||||
self.setPlainText(self.item.node.name)
|
||||
self.graph = graph
|
||||
|
||||
name = self.item.node.name
|
||||
if name == "":
|
||||
name = self.graph._trad.node_name(self.item.node)
|
||||
|
||||
self.setPlainText(name)
|
||||
|
||||
self.setDefaultTextColor(Qt.black)
|
||||
self.set_custom_pos(self.item.pos())
|
||||
self.setZValue(2)
|
||||
|
|
@ -502,7 +509,7 @@ class GraphWidget(QGraphicsView):
|
|||
|
||||
for node in self.graph.nodes():
|
||||
inode = NodeItem(node, self)
|
||||
self.texts[inode] = NodeText(inode)
|
||||
self.texts[inode] = NodeText(inode, self)
|
||||
self.scene().addItem(self.texts[inode])
|
||||
self.scene().addItem(inode)
|
||||
self.node_items.append(inode)
|
||||
|
|
@ -514,14 +521,14 @@ class GraphWidget(QGraphicsView):
|
|||
for edge in self.graph.edges():
|
||||
n1 = next(
|
||||
filter(
|
||||
lambda n: n.node.name == edge.node1.name,
|
||||
lambda n: n.node == edge.node1,
|
||||
self.node_items
|
||||
)
|
||||
)
|
||||
|
||||
n2 = next(
|
||||
filter(
|
||||
lambda n: n.node.name == edge.node2.name,
|
||||
lambda n: n.node == edge.node2,
|
||||
self.node_items
|
||||
)
|
||||
)
|
||||
|
|
@ -578,7 +585,7 @@ class GraphWidget(QGraphicsView):
|
|||
inode = NodeItem(node, self)
|
||||
self.scene().addItem(inode)
|
||||
self.node_items.append(inode)
|
||||
self.texts[inode] = NodeText(inode)
|
||||
self.texts[inode] = NodeText(inode, self)
|
||||
self.scene().addItem(self.texts[inode])
|
||||
|
||||
self.changeNode.emit(self.sender())
|
||||
|
|
|
|||
|
|
@ -94,6 +94,9 @@ class NodeTableModel(PamhyrTableModel):
|
|||
|
||||
return ret
|
||||
|
||||
if self._headers[index.column()] == "name":
|
||||
return self._trad.node_name(self._lst[index.row()])
|
||||
|
||||
return self._lst[index.row()][self._headers[index.column()]]
|
||||
|
||||
@pyqtSlot()
|
||||
|
|
@ -133,6 +136,15 @@ class EdgeTableModel(PamhyrTableModel):
|
|||
if role != Qt.ItemDataRole.DisplayRole:
|
||||
return QVariant()
|
||||
|
||||
if (self._headers[index.column()] == "node1" or
|
||||
self._headers[index.column()] == "node2"):
|
||||
return self._trad.node_name(
|
||||
self._lst[index.row()][self._headers[index.column()]]
|
||||
)
|
||||
|
||||
if self._headers[index.column()] == "name":
|
||||
return self._trad.edge_name(self._lst[index.row()])
|
||||
|
||||
return self._lst[index.row()][self._headers[index.column()]]
|
||||
|
||||
@pyqtSlot()
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ class NetworkWindow(PamhyrWindow):
|
|||
table_view=table,
|
||||
table_headers=self._table_headers_node,
|
||||
editable_headers=["name"],
|
||||
trad=self._trad,
|
||||
data=self._graph,
|
||||
undo=self._undo_stack,
|
||||
)
|
||||
|
|
@ -109,6 +110,7 @@ class NetworkWindow(PamhyrWindow):
|
|||
table_view=table,
|
||||
table_headers=self._table_headers_edge,
|
||||
editable_headers=["name", "node1", "node2"],
|
||||
trad=self._trad,
|
||||
delegates={
|
||||
"node1": self.delegate_combobox,
|
||||
"node2": self.delegate_combobox,
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@ class NetworkTranslate(MainTranslate):
|
|||
"Network", "River network"
|
||||
)
|
||||
|
||||
self._dict["node"] = _translate("Network", "Node")
|
||||
self._dict["edge"] = _translate("Network", "Reach")
|
||||
|
||||
self._dict["menu_add_node"] = _translate("Network", "Add node")
|
||||
self._dict["menu_del_node"] = _translate("Network", "Delete the node")
|
||||
self._dict["menu_edit_res_node"] = _translate(
|
||||
|
|
@ -63,3 +66,15 @@ class NetworkTranslate(MainTranslate):
|
|||
"node2": _translate("Network", "Destination node"),
|
||||
"id": _translate("Network", "Index"),
|
||||
}
|
||||
|
||||
def node_name(self, node):
|
||||
if node.name == "":
|
||||
return f"{self['node']} #{node.id}"
|
||||
|
||||
return node.name
|
||||
|
||||
def edge_name(self, edge):
|
||||
if edge.name == "":
|
||||
return f"{self['edge']} #{edge.id}"
|
||||
|
||||
return edge.name
|
||||
|
|
|
|||
|
|
@ -95,4 +95,5 @@ class CustomPlotValuesSelectionDialog(PamhyrDialog):
|
|||
)
|
||||
|
||||
self.value = x, y
|
||||
|
||||
super().accept()
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ unit = {
|
|||
"water_elevation": "0-meter",
|
||||
"discharge": "1-m3s",
|
||||
"velocity": "2-ms",
|
||||
"depth": "3-meter",
|
||||
"max_depth": "3-meter",
|
||||
"mean_depth": "3-meter",
|
||||
"froude": "4-dimensionless",
|
||||
"wet_area": "5-m2",
|
||||
|
|
@ -157,9 +157,9 @@ class CustomPlot(PamhyrPlot):
|
|||
)
|
||||
lines["velocity"] = line
|
||||
|
||||
if "depth" in self._y:
|
||||
if "max_depth" in self._y:
|
||||
|
||||
ax = self._axes[unit["depth"]]
|
||||
ax = self._axes[unit["max_depth"]]
|
||||
d = list(
|
||||
map(
|
||||
lambda p: p.geometry.max_water_depth(
|
||||
|
|
@ -171,7 +171,7 @@ class CustomPlot(PamhyrPlot):
|
|||
rk, d,
|
||||
color='brown', lw=1.,
|
||||
)
|
||||
lines["depth"] = line
|
||||
lines["max_depth"] = line
|
||||
|
||||
if "mean_depth" in self._y:
|
||||
|
||||
|
|
@ -200,9 +200,9 @@ class CustomPlot(PamhyrPlot):
|
|||
p.get_ts_key(self._timestamp, "Q"),
|
||||
p.get_ts_key(self._timestamp, "Z")) /
|
||||
sqrt(9.81 * (
|
||||
p.geometry.wet_width(
|
||||
p.get_ts_key(self._timestamp, "Z")) /
|
||||
p.geometry.wet_area(
|
||||
p.get_ts_key(self._timestamp, "Z")) /
|
||||
p.geometry.wet_width(
|
||||
p.get_ts_key(self._timestamp, "Z"))
|
||||
)),
|
||||
reach.profiles
|
||||
|
|
@ -361,9 +361,9 @@ class CustomPlot(PamhyrPlot):
|
|||
)
|
||||
lines["velocity"] = line
|
||||
|
||||
if "depth" in self._y:
|
||||
if "max_depth" in self._y:
|
||||
|
||||
ax = self._axes[unit["depth"]]
|
||||
ax = self._axes[unit["max_depth"]]
|
||||
d = list(
|
||||
map(lambda z: profile.geometry.max_water_depth(z), z)
|
||||
)
|
||||
|
|
@ -372,7 +372,7 @@ class CustomPlot(PamhyrPlot):
|
|||
ts, d,
|
||||
color='brown', lw=1.,
|
||||
)
|
||||
lines["depth"] = line
|
||||
lines["max_depth"] = line
|
||||
|
||||
if "mean_depth" in self._y:
|
||||
|
||||
|
|
@ -385,7 +385,7 @@ class CustomPlot(PamhyrPlot):
|
|||
ts, d,
|
||||
color='orange', lw=1.,
|
||||
)
|
||||
lines["depth"] = line
|
||||
lines["mean_depth"] = line
|
||||
|
||||
if "froude" in self._y:
|
||||
|
||||
|
|
@ -394,8 +394,8 @@ class CustomPlot(PamhyrPlot):
|
|||
map(lambda z, q:
|
||||
profile.geometry.speed(q, z) /
|
||||
sqrt(9.81 * (
|
||||
profile.geometry.wet_width(z) /
|
||||
profile.geometry.wet_area(z))
|
||||
profile.geometry.wet_area(z) /
|
||||
profile.geometry.wet_width(z))
|
||||
), z, q)
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -59,20 +59,3 @@ class CustomPlotTranslate(ResultsTranslate):
|
|||
self._dict['3-meter'] = self._dict["unit_height"]
|
||||
self._dict['4-dimensionless'] = self._dict["unit_froude"]
|
||||
self._dict['5-m2'] = self._dict["wet_area"]
|
||||
|
||||
# SubDict
|
||||
|
||||
self._sub_dict["values_x"] = {
|
||||
"rk": self._dict["rk"],
|
||||
"time": self._dict["time"],
|
||||
}
|
||||
self._sub_dict["values_y"] = {
|
||||
"elevation": self._dict["elevation"],
|
||||
"water_elevation": self._dict["water_elevation"],
|
||||
"discharge": self._dict["discharge"],
|
||||
"velocity": self._dict["velocity"],
|
||||
"depth": self._dict["max_depth"],
|
||||
"mean_depth": self._dict["mean_depth"],
|
||||
"froude": self._dict["froude"],
|
||||
"wet_area": self._dict["wet_area"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ class PlotH(PamhyrPlot):
|
|||
self._current_reach_id = reach_id
|
||||
self._current_profile_id = profile_id
|
||||
|
||||
self.label_x = _translate("Results", "Time (s)")
|
||||
self.label_y = _translate("Results", "Discharge (m³/s)")
|
||||
self.label_x = self._trad["unit_time_s"]
|
||||
self.label_y = self._trad["unit_discharge"]
|
||||
|
||||
self.label_discharge = _translate("Results", "Cross-section discharge")
|
||||
self.label_discharge_max = _translate("Results", "Max discharge")
|
||||
|
|
@ -174,12 +174,12 @@ class PlotH(PamhyrPlot):
|
|||
self._line.set_data(x, y)
|
||||
|
||||
self._current.set_data(
|
||||
self._current_timestamp,
|
||||
[self._current_timestamp, self._current_timestamp],
|
||||
self.canvas.axes.get_ylim()
|
||||
)
|
||||
|
||||
def update_current(self):
|
||||
self._current.set_data(
|
||||
self._current_timestamp,
|
||||
[self._current_timestamp, self._current_timestamp],
|
||||
self.canvas.axes.get_ylim()
|
||||
)
|
||||
|
|
|
|||
|
|
@ -121,8 +121,8 @@ class TableModel(PamhyrTableModel):
|
|||
q = self._lst[row].get_ts_key(self._timestamp, "Q")
|
||||
z = self._lst[row].get_ts_key(self._timestamp, "Z")
|
||||
v = self._lst[row].geometry.speed(q, z)
|
||||
b = self._lst[row].geometry.wet_area(z)
|
||||
a = self._lst[row].geometry.wet_width(z)
|
||||
a = self._lst[row].geometry.wet_area(z)
|
||||
b = self._lst[row].geometry.wet_width(z)
|
||||
froude = v / sqrt(9.81 * (a / b))
|
||||
return f"{froude:.4f}"
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ import os
|
|||
import csv
|
||||
import logging
|
||||
|
||||
from numpy import sqrt
|
||||
|
||||
from datetime import datetime
|
||||
from tools import trace, timer, logger_exception
|
||||
|
||||
|
|
@ -132,10 +134,7 @@ class ResultsWindow(PamhyrWindow):
|
|||
self._slider_time.value()]
|
||||
|
||||
def setup_slider(self):
|
||||
self._slider_profile = self.find(QSlider, f"verticalSlider_profile")
|
||||
default_reach = self._results.river.reach(0)
|
||||
self._slider_profile.setMaximum(len(default_reach.profiles) - 1)
|
||||
self._slider_profile.setValue(0)
|
||||
|
||||
self._slider_time = self.find(QSlider, f"horizontalSlider_time")
|
||||
self._slider_time.setMaximum(len(self._timestamps) - 1)
|
||||
|
|
@ -293,9 +292,9 @@ class ResultsWindow(PamhyrWindow):
|
|||
|
||||
pname = profile.name if profile.name != "" else profile.rk
|
||||
|
||||
return (f"Reach: {reach.name} | " +
|
||||
f"Profile: {pname} | " +
|
||||
f"Timestamp : {fts} ({ts} sec)")
|
||||
return (f"{self._trad['reach']}: {reach.name} | " +
|
||||
f"{self._trad['cross_section']}: {pname} | " +
|
||||
f"{self._trad['unit_time_s']} : {fts} ({ts} sec)")
|
||||
|
||||
def setup_statusbar(self):
|
||||
txt = self._compute_status_label()
|
||||
|
|
@ -311,8 +310,8 @@ class ResultsWindow(PamhyrWindow):
|
|||
actions = {
|
||||
"action_reload": self._reload,
|
||||
"action_add": self._add_custom_plot,
|
||||
# "action_export": self.export,
|
||||
"action_export": self.export_current,
|
||||
"action_export": self._export,
|
||||
# "action_export": self.export_current,
|
||||
}
|
||||
|
||||
for action in actions:
|
||||
|
|
@ -336,8 +335,6 @@ class ResultsWindow(PamhyrWindow):
|
|||
|
||||
self._table[t].dataChanged.connect(fun[t])
|
||||
|
||||
self._slider_profile.valueChanged.connect(
|
||||
self._set_current_profile_slider)
|
||||
self._slider_time.valueChanged.connect(self._set_current_timestamp)
|
||||
self._button_play.setChecked(False)
|
||||
self._button_play.clicked.connect(self._pause)
|
||||
|
|
@ -451,7 +448,6 @@ class ResultsWindow(PamhyrWindow):
|
|||
|
||||
ind = indexes[0].row()
|
||||
self.update(profile_id=ind)
|
||||
self._slider_profile.setValue(ind)
|
||||
|
||||
def _set_current_profile_raw_data(self):
|
||||
table = self.find(QTableView, f"tableView_raw_data")
|
||||
|
|
@ -461,11 +457,6 @@ class ResultsWindow(PamhyrWindow):
|
|||
|
||||
ind = indexes[0].row()
|
||||
self.update(profile_id=ind)
|
||||
self._slider_profile.setValue(ind)
|
||||
|
||||
def _set_current_profile_slider(self):
|
||||
pid = self._slider_profile.value()
|
||||
self.update(profile_id=pid)
|
||||
|
||||
def _set_current_timestamp(self):
|
||||
timestamp = self._timestamps[self._slider_time.value()]
|
||||
|
|
@ -545,6 +536,7 @@ class ResultsWindow(PamhyrWindow):
|
|||
grid.addWidget(canvas, 1, 0)
|
||||
widget.setLayout(grid)
|
||||
tab_widget.addTab(widget, name)
|
||||
tab_widget.setCurrentWidget(widget)
|
||||
|
||||
def _copy(self):
|
||||
logger.info("TODO: copy")
|
||||
|
|
@ -593,18 +585,50 @@ class ResultsWindow(PamhyrWindow):
|
|||
self._button_last.setEnabled(True)
|
||||
self._button_play.setIcon(self._icon_start)
|
||||
|
||||
def export(self):
|
||||
def _export(self):
|
||||
|
||||
dlg = CustomPlotValuesSelectionDialog(parent=self)
|
||||
if dlg.exec():
|
||||
x, y = dlg.value
|
||||
else:
|
||||
return
|
||||
|
||||
logger.debug(
|
||||
"Export custom plot for: " +
|
||||
f"{x} -> {','.join(y)}"
|
||||
)
|
||||
self.file_dialog(
|
||||
select_file=False,
|
||||
callback=lambda d: self.export_to(d[0])
|
||||
select_file="AnyFile",
|
||||
callback=lambda f: self.export_to(f[0], x, y),
|
||||
default_suffix=".csv",
|
||||
file_filter=["CSV (*.csv)"],
|
||||
)
|
||||
|
||||
def export_to(self, directory):
|
||||
def export_to(self, filename, x, y):
|
||||
timestamps = sorted(self._results.get("timestamps"))
|
||||
for reach in self._results.river.reachs:
|
||||
self.export_reach(reach, directory, timestamps)
|
||||
if x == "rk":
|
||||
timestamp = self._get_current_timestamp()
|
||||
val_dict = self._export_rk(timestamp, y, filename)
|
||||
elif x == "time":
|
||||
profile = self._get_current_profile()
|
||||
val_dict = self._export_time(profile, y, filename)
|
||||
|
||||
def export_reach(self, reach, directory, timestamps):
|
||||
with open(filename, 'w', newline='') as csvfile:
|
||||
writer = csv.writer(csvfile, delimiter=',',
|
||||
quotechar='|', quoting=csv.QUOTE_MINIMAL)
|
||||
dict_x = self._trad.get_dict("values_x")
|
||||
dict_y = self._trad.get_dict("values_y")
|
||||
header = [dict_x[x]]
|
||||
for text in y:
|
||||
header.append(dict_y[text])
|
||||
writer.writerow(header)
|
||||
for row in range(len(val_dict[x])):
|
||||
line = [val_dict[x][row]]
|
||||
for var in y:
|
||||
line.append(val_dict[var][row])
|
||||
writer.writerow(line)
|
||||
|
||||
def export_all(self, reach, directory, timestamps):
|
||||
name = reach.name
|
||||
name = name.replace(" ", "-")
|
||||
if len(timestamps) == 1:
|
||||
|
|
@ -618,59 +642,144 @@ class ResultsWindow(PamhyrWindow):
|
|||
with open(file_name, 'w', newline='') as csvfile:
|
||||
writer = csv.writer(csvfile, delimiter=',',
|
||||
quotechar='|', quoting=csv.QUOTE_MINIMAL)
|
||||
if len(timestamps) > 1:
|
||||
writer.writerow(["name", "rk", "data-file"])
|
||||
for profile in reach.profiles:
|
||||
p_file_name = os.path.join(
|
||||
directory,
|
||||
f"cs_{profile.geometry.id}.csv"
|
||||
)
|
||||
|
||||
writer.writerow([
|
||||
profile.name,
|
||||
profile.rk,
|
||||
p_file_name
|
||||
])
|
||||
|
||||
self.export_profile(reach,
|
||||
profile,
|
||||
p_file_name,
|
||||
timestamps)
|
||||
else:
|
||||
ts = timestamps[0]
|
||||
writer.writerow(self._table["raw_data"]._headers)
|
||||
for row in range(self._table["raw_data"].rowCount()):
|
||||
line = []
|
||||
for column in range(self._table["raw_data"].columnCount()):
|
||||
index = self._table["raw_data"].index(row, column)
|
||||
line.append(self._table["raw_data"].data(index))
|
||||
writer.writerow(line)
|
||||
|
||||
def export_profile(self, reach, profile, file_name, timestamps):
|
||||
with open(file_name, 'w', newline='') as csvfile:
|
||||
writer = csv.writer(csvfile, delimiter=',',
|
||||
quotechar='|', quoting=csv.QUOTE_MINIMAL)
|
||||
|
||||
writer.writerow(["timestamp", "z", "q"])
|
||||
|
||||
for ts in timestamps:
|
||||
writer.writerow([
|
||||
ts,
|
||||
profile.get_ts_key(ts, "Z"),
|
||||
profile.get_ts_key(ts, "Q"),
|
||||
])
|
||||
ts = timestamps[0]
|
||||
writer.writerow(self._table["raw_data"]._headers)
|
||||
for row in range(self._table["raw_data"].rowCount()):
|
||||
line = []
|
||||
for column in range(self._table["raw_data"].columnCount()):
|
||||
index = self._table["raw_data"].index(row, column)
|
||||
line.append(self._table["raw_data"].data(index))
|
||||
writer.writerow(line)
|
||||
|
||||
def export_current(self):
|
||||
self.file_dialog(
|
||||
select_file=False,
|
||||
select_file="Directory",
|
||||
callback=lambda d: self.export_current_to(d[0])
|
||||
)
|
||||
|
||||
def export_current_to(self, directory):
|
||||
reach = self._results.river.reachs[self._get_current_reach()]
|
||||
self.export_reach(reach, directory, [self._get_current_timestamp()])
|
||||
self.export_all(reach, directory, [self._get_current_timestamp()])
|
||||
|
||||
def delete_tab(self, index):
|
||||
tab_widget = self.find(QTabWidget, f"tabWidget")
|
||||
self._additional_plot.pop(tab_widget.tabText(index))
|
||||
tab_widget.removeTab(index)
|
||||
|
||||
def _export_rk(self, timestamp, y, filename):
|
||||
reach = self._results.river.reachs[self._get_current_reach()]
|
||||
my_dict = {}
|
||||
my_dict["rk"] = reach.geometry.get_rk()
|
||||
if "elevation" in y:
|
||||
my_dict["elevation"] = reach.geometry.get_z_min()
|
||||
if "discharge" in y:
|
||||
my_dict["discharge"] = list(
|
||||
map(
|
||||
lambda p: p.get_ts_key(timestamp, "Q"),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
if "water_elevation" in y:
|
||||
my_dict["water_elevation"] = list(
|
||||
map(
|
||||
lambda p: p.get_ts_key(timestamp, "Z"),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
if "velocity" in y:
|
||||
my_dict["velocity"] = list(
|
||||
map(
|
||||
lambda p: p.geometry.speed(
|
||||
p.get_ts_key(timestamp, "Q"),
|
||||
p.get_ts_key(timestamp, "Z")),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
if "max_depth" in y:
|
||||
my_dict["max_depth"] = list(
|
||||
map(
|
||||
lambda p: p.geometry.max_water_depth(
|
||||
p.get_ts_key(timestamp, "Z")),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
if "mean_depth" in y:
|
||||
my_dict["mean_depth"] = list(
|
||||
map(
|
||||
lambda p: p.geometry.mean_water_depth(
|
||||
p.get_ts_key(timestamp, "Z")),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
if "froude" in y:
|
||||
my_dict["froude"] = list(
|
||||
map(
|
||||
lambda p:
|
||||
p.geometry.speed(
|
||||
p.get_ts_key(timestamp, "Q"),
|
||||
p.get_ts_key(timestamp, "Z")) /
|
||||
sqrt(9.81 * (
|
||||
p.geometry.wet_area(
|
||||
p.get_ts_key(timestamp, "Z")) /
|
||||
p.geometry.wet_width(
|
||||
p.get_ts_key(timestamp, "Z"))
|
||||
)),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
if "wet_area" in y:
|
||||
my_dict["wet_area"] = list(
|
||||
map(
|
||||
lambda p: p.geometry.wet_area(
|
||||
p.get_ts_key(timestamp, "Z")),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
|
||||
return my_dict
|
||||
|
||||
def _export_time(self, profile, y, filename):
|
||||
reach = self._results.river.reachs[self._get_current_reach()]
|
||||
profile = reach.profile(profile)
|
||||
ts = list(self._results.get("timestamps"))
|
||||
ts.sort()
|
||||
my_dict = {}
|
||||
my_dict["time"] = ts
|
||||
z = profile.get_key("Z")
|
||||
q = profile.get_key("Q")
|
||||
if "elevation" in y:
|
||||
my_dict["elevation"] = [profile.geometry.z_min()] * len(ts)
|
||||
if "discharge" in y:
|
||||
my_dict["discharge"] = q
|
||||
if "water_elevation" in y:
|
||||
my_dict["water_elevation"] = z
|
||||
if "velocity" in y:
|
||||
my_dict["velocity"] = list(
|
||||
map(
|
||||
lambda q, z: profile.geometry.speed(q, z),
|
||||
q, z
|
||||
)
|
||||
)
|
||||
if "max_depth" in y:
|
||||
my_dict["max_depth"] = list(
|
||||
map(lambda z: profile.geometry.max_water_depth(z), z)
|
||||
)
|
||||
if "mean_depth" in y:
|
||||
my_dict["mean_depth"] = list(
|
||||
map(lambda z: profile.geometry.mean_water_depth(z), z)
|
||||
)
|
||||
if "froude" in y:
|
||||
my_dict["froude"] = list(
|
||||
map(lambda z, q:
|
||||
profile.geometry.speed(q, z) /
|
||||
sqrt(9.81 * (
|
||||
profile.geometry.wet_area(z) /
|
||||
profile.geometry.wet_width(z))
|
||||
), z, q)
|
||||
)
|
||||
if "wet_area" in y:
|
||||
my_dict["wet_area"] = list(
|
||||
map(lambda z: profile.geometry.wet_area(z), z)
|
||||
)
|
||||
|
||||
return my_dict
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class ResultsTranslate(MainTranslate):
|
|||
|
||||
self._dict['x'] = _translate("Results", "X (m)")
|
||||
|
||||
self._dict['label_bottom'] = _translate("Results", "River bottom")
|
||||
self._dict['label_bottom'] = _translate("Results", "Bottom")
|
||||
self._dict['label_water'] = _translate("Results", "Water elevation")
|
||||
self._dict['label_water_max'] = _translate(
|
||||
"Results",
|
||||
|
|
@ -66,3 +66,19 @@ class ResultsTranslate(MainTranslate):
|
|||
"hydraulic_radius": self._dict["unit_hydraulic_radius"],
|
||||
"froude": self._dict["unit_froude"],
|
||||
}
|
||||
|
||||
self._sub_dict["values_x"] = {
|
||||
"rk": self._dict["unit_rk"],
|
||||
"time": self._dict["unit_time_s"],
|
||||
}
|
||||
|
||||
self._sub_dict["values_y"] = {
|
||||
"elevation": self._dict["unit_elevation"],
|
||||
"water_elevation": self._dict["unit_water_elevation"],
|
||||
"discharge": self._dict["unit_discharge"],
|
||||
"velocity": self._dict["unit_speed"],
|
||||
"max_depth": self._dict["unit_max_height"],
|
||||
"mean_depth": self._dict["unit_mean_height"],
|
||||
"froude": self._dict["unit_froude"],
|
||||
"wet_area": self._dict["unit_wet_area"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class WindowToolKit(object):
|
|||
|
||||
return header, values
|
||||
|
||||
def file_dialog(self, select_file=True,
|
||||
def file_dialog(self, select_file="ExistingFile",
|
||||
callback=lambda x: None,
|
||||
directory=None,
|
||||
default_suffix=None,
|
||||
|
|
@ -107,16 +107,18 @@ class WindowToolKit(object):
|
|||
|
||||
dialog = QFileDialog(self, options=options)
|
||||
|
||||
if select_file:
|
||||
if select_file == "Existing_file":
|
||||
mode = QFileDialog.FileMode.ExistingFile
|
||||
else:
|
||||
elif select_file == "Directory":
|
||||
mode = QFileDialog.FileMode.Directory
|
||||
else:
|
||||
mode = QFileDialog.FileMode.AnyFile
|
||||
|
||||
dialog.setFileMode(mode)
|
||||
if directory is not None:
|
||||
dialog.setDirectory(directory)
|
||||
|
||||
if select_file:
|
||||
if select_file != "Directory":
|
||||
if default_suffix is not None:
|
||||
dialog.setDefaultSuffix(default_suffix)
|
||||
|
||||
|
|
@ -147,6 +149,9 @@ class WindowToolKit(object):
|
|||
msg.setInformativeText(informative_text)
|
||||
msg.setWindowTitle(window_title)
|
||||
|
||||
msg.findChild(QLabel, "qt_msgbox_label")\
|
||||
.setFixedWidth(384)
|
||||
|
||||
msg.exec_()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -63,8 +63,9 @@ class UnitTranslate(CommonWordTranslate):
|
|||
self._dict["unit_water_elevation"] = _translate(
|
||||
"Unit", "Water elevation (m)"
|
||||
)
|
||||
|
||||
self._dict["unit_speed"] = _translate("Unit", "Velocity (m/s)")
|
||||
self._dict["unit_discharge"] = _translate("Unit", "Discharge (m³/s)")
|
||||
self._dict["unit_discharge"] = _translate("Unit", "Discharge (m^3/s)")
|
||||
self._dict["unit_area"] = _translate("Unit", "Area (hectare)")
|
||||
|
||||
self._dict["unit_time_s"] = _translate("Unit", "Time (sec)")
|
||||
|
|
@ -73,7 +74,7 @@ class UnitTranslate(CommonWordTranslate):
|
|||
self._dict["unit_date_s"] = _translate("Unit", "Date (sec)")
|
||||
self._dict["unit_date_iso"] = _translate("Unit", "Date (ISO format)")
|
||||
|
||||
self._dict["unit_wet_area"] = _translate("Unit", "Wet Area (m²)")
|
||||
self._dict["unit_wet_area"] = _translate("Unit", "Wet Area (m^2)")
|
||||
self._dict["unit_wet_perimeter"] = _translate(
|
||||
"Unit", "Wet Perimeter (m)"
|
||||
)
|
||||
|
|
@ -103,3 +104,29 @@ class MainTranslate(UnitTranslate):
|
|||
self._dict["active_window"] = _translate(
|
||||
"MainWindow", "Enable this window"
|
||||
)
|
||||
|
||||
# Message box
|
||||
self._dict["mb_select_reach_title"] = _translate(
|
||||
"MainWindow", "Please select a reach"
|
||||
)
|
||||
self._dict["mb_select_reach_msg"] = _translate(
|
||||
"MainWindow",
|
||||
"This edition window need a reach selected "
|
||||
"into the river network to work on it"
|
||||
)
|
||||
|
||||
self._dict["mb_last_open_title"] = _translate(
|
||||
"MainWindow", "Last open study"
|
||||
)
|
||||
self._dict["mb_last_open_msg"] = _translate(
|
||||
"MainWindow",
|
||||
"Do you want to open again the last open study?"
|
||||
)
|
||||
|
||||
self._dict["mb_close_title"] = _translate(
|
||||
"MainWindow", "Close without saving study"
|
||||
)
|
||||
self._dict["mb_close_msg"] = _translate(
|
||||
"MainWindow",
|
||||
"Do you want to save current study before closing it?"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@
|
|||
</widget>
|
||||
<widget class="QWidget" name="tab_language">
|
||||
<attribute name="title">
|
||||
<string>Langue</string>
|
||||
<string>Language</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_6">
|
||||
<item row="0" column="0">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>414</width>
|
||||
<height>482</height>
|
||||
<height>70</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -57,22 +57,6 @@
|
|||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
|
|
@ -89,5 +73,21 @@
|
|||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@
|
|||
<addaction name="action_sort"/>
|
||||
<addaction name="action_generate_uniform"/>
|
||||
<addaction name="action_generate_critical"/>
|
||||
<addaction name="action_increasing"/>
|
||||
</widget>
|
||||
<action name="action_add">
|
||||
<property name="checkable">
|
||||
|
|
@ -140,6 +141,14 @@
|
|||
<string>Generate rating curve as Q(z) = Sqrt(g*S(z)^3/L(z))</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_increasing">
|
||||
<property name="text">
|
||||
<string>Make increasing</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Remove points to make the curve increasing</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1024</width>
|
||||
<width>849</width>
|
||||
<height>576</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -27,14 +27,21 @@
|
|||
<item>
|
||||
<widget class="QPushButton" name="pushButton_generate_1">
|
||||
<property name="text">
|
||||
<string>Generate height</string>
|
||||
<string>Generate uniform depth</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton_generate_2">
|
||||
<property name="text">
|
||||
<string>Generate discharge</string>
|
||||
<string>Generate uniform discharge</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton_generate_3">
|
||||
<property name="text">
|
||||
<string>Generate uniform elevation</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -65,7 +72,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1024</width>
|
||||
<width>849</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,95 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>284</width>
|
||||
<height>107</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="Europe"/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="2" column="0">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Depth (m)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox">
|
||||
<property name="maximum">
|
||||
<double>1000000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QCheckBox" name="checkBox">
|
||||
<property name="text">
|
||||
<string>Generate discharge</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Discharge (m³/s)</string>
|
||||
<string>Discharge (m^3/s)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>284</width>
|
||||
<height>80</height>
|
||||
<width>396</width>
|
||||
<height>182</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -17,7 +17,79 @@
|
|||
<locale language="English" country="Europe"/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="2" column="0">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Upstream height (m)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_1">
|
||||
<property name="minimum">
|
||||
<double>-1000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>1000000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Discharge</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_3">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>-1000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>1000000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Downstream height (m)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_2">
|
||||
<property name="minimum">
|
||||
<double>-1000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>1000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
|
|
@ -27,34 +99,17 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item row="2" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<widget class="QCheckBox" name="checkBox">
|
||||
<property name="text">
|
||||
<string>Height (m)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox">
|
||||
<property name="maximum">
|
||||
<double>1000000.000000000000000</double>
|
||||
<string>Generate constant discharge</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QCheckBox" name="checkBox">
|
||||
<property name="text">
|
||||
<string>Generate discharge</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>194</width>
|
||||
<width>251</width>
|
||||
<height>114</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<item row="0" column="0">
|
||||
<widget class="QGroupBox" name="groupBox_3">
|
||||
<property name="title">
|
||||
<string>Number of points to keep</string>
|
||||
<string>Maximum number of points to keep</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
|
|
|
|||
|
|
@ -39,19 +39,6 @@
|
|||
<item>
|
||||
<widget class="QTableView" name="tableView_profile"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="verticalSlider_profile">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="invertedAppearance">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="invertedControls">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
|
|
@ -145,14 +132,14 @@
|
|||
<item row="0" column="0">
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="tabsClosable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab_4">
|
||||
<attribute name="title">
|
||||
<string>Raw data</string>
|
||||
<string>Data</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<item row="0" column="1">
|
||||
|
|
@ -275,7 +262,7 @@
|
|||
<string>Export</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Export raw data</string>
|
||||
<string>Export data as CSV</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>Ctrl+E</string>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>640</width>
|
||||
<height>360</height>
|
||||
<height>361</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -17,8 +17,35 @@
|
|||
<locale language="English" country="Europe"/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="1">
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_logo_pamhyr2">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap>ressources/Pamhyr2_logo.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_logo_inrae">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap>ressources/Logo-INRAE.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_title">
|
||||
<property name="font">
|
||||
|
|
@ -33,34 +60,216 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Copyright © 2022-2024 INRAE</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_version">
|
||||
<property name="text">
|
||||
<string>Version: @version @codename</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_license">
|
||||
<property name="text">
|
||||
<string>License: GPLv3+</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_6">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_logo_gpl">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap>ressources/GPLv3_Logo.png</pixmap>
|
||||
</property>
|
||||
<property name="scaledContents">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6"/>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_copyright">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_version">
|
||||
<property name="text">
|
||||
<string>Version: @version</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_license">
|
||||
<property name="text">
|
||||
<string>License: GPLv3+</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -79,16 +288,6 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_logo_pamhyr2">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap>ressources/Pamhyr2_logo.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue