From 7019699e74f6094a7db3813f99a9c21222d0ac28 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 2 Oct 2024 09:23:45 +0200 Subject: [PATCH 1/6] Readme: Update. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cc5a3400..6038db0f 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,10 @@ for more details. ```shell # Get mage -mkdir mage -cd mage +mkdir mage8 +cd mage8 -curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/v8.3.2/downloads/packages/mage_linux.tgz +curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/v8.3.6/downloads/packages/mage_linux.tgz tar xf mage.tgz cd .. From 329f52fd21b415c9d0332fa6d16acfbfa436742b Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 2 Oct 2024 09:30:00 +0200 Subject: [PATCH 2/6] Readme: Update documentation list. --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6038db0f..99e2f5b2 100644 --- a/README.md +++ b/README.md @@ -9,16 +9,18 @@ modelling of rivers. + 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 From 2c0a6a6c8723ebcd2674c15dc681432f2af1d5bb Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 2 Oct 2024 09:36:08 +0200 Subject: [PATCH 3/6] Readme: Update install link. --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99e2f5b2..e68dc70d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 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 @@ -27,11 +27,15 @@ for more details. ### GNU/Linux -[See documentation](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux) +See documentation: +- [:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20GNULinux) +- [: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) +See documentation: +- [:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20Windows) +- [:gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows) ### From source code From 10cb2fbda5c0581eb03652dfb56410392d8cbf62 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 2 Oct 2024 09:38:44 +0200 Subject: [PATCH 4/6] Readme: Minor change. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e68dc70d..80992e0a 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,14 @@ for more details. ### GNU/Linux See documentation: -- [:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20GNULinux) -- [:gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20GNULinux) +- [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: -- [:fr:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/fr/Install%20on%20Windows) -- [:gb:](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home/en/Install%20on%20Windows) +- [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) ### From source code From 4aad26b0cc8e12c5b1e1585e963cc1c3ffd62f15 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 2 Oct 2024 09:40:37 +0200 Subject: [PATCH 5/6] Readme: Add logo. --- README.md | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 80992e0a..763109fc 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Pamhyr is a free and open source graphical user interface for 1D hydro-sedimentary modelling of rivers. +![logo](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/raw/master/src/View/ui/ressources/Pamhyr2_logo.png) + ## Features + Define a complex river hydraulics network @@ -36,26 +38,3 @@ See documentation: 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) - -### From source code - -```shell -# Get mage -mkdir mage8 -cd mage8 - -curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/v8.3.6/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 -``` From ac877ad08e18dc31c55f742d650b0cf51a36fd14 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 2 Oct 2024 09:56:37 +0200 Subject: [PATCH 6/6] git: Add some case in gitignore. --- .gitignore | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/.gitignore b/.gitignore index 1f1b00e7..7922bbcd 100644 --- a/.gitignore +++ b/.gitignore @@ -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