Compare commits

...
804 Commits
Author SHA1 Message Date
Theophile Terraz e123967577 debug custom plots 2024-10-02 14:49:54 +02:00
Pierre-Antoine Rouby 2b31426df3 LC: Use section name in combo box. 2024-10-02 14:41:14 +02:00
Theophile Terraz dc490cef44 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-10-02 14:37:45 +02:00
Theophile Terraz 49d54323f6 pep8 2024-10-02 14:36:49 +02:00
Theophile Terraz a81d65f595 debug Tuto1 colors 2024-10-02 14:34:10 +02:00
Theophile Terraz 82c386806a debug colors 2024-10-02 14:33:07 +02:00
Theophile Terraz 239ee905e7 debug 2024-10-02 11:54:32 +02:00
Pierre-Antoine Rouby ed3b7ba6fd Translate: Minor change. 2024-10-02 11:26:49 +02:00
Theophile Terraz d52946f31f Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-10-02 11:04:25 +02:00
Theophile Terraz 1360e3ad7b work on Tuto1 2024-10-02 10:50:24 +02:00
Pierre-Antoine Rouby ac877ad08e git: Add some case in gitignore. 2024-10-02 09:57:19 +02:00
Pierre-Antoine Rouby 4aad26b0cc Readme: Add logo. 2024-10-02 09:40:37 +02:00
Pierre-Antoine Rouby 10cb2fbda5 Readme: Minor change. 2024-10-02 09:38:44 +02:00
Pierre-Antoine Rouby 2c0a6a6c87 Readme: Update install link. 2024-10-02 09:37:47 +02:00
Pierre-Antoine Rouby 329f52fd21 Readme: Update documentation list. 2024-10-02 09:37:47 +02:00
Pierre-Antoine Rouby 7019699e74 Readme: Update. 2024-10-02 09:37:47 +02:00
Theophile Terraz c2178c7b6f work on tuto 2024-10-01 17:03:27 +02:00
Theophile Terraz 0ed75de06f debug 2024-10-01 16:46:34 +02:00
Theophile Terraz 2607d3a33b translation cleaning 2024-10-01 16:24:06 +02:00
Theophile Terraz 2b886fb452 debug HS and friction plots 2024-10-01 14:38:07 +02:00
Theophile Terraz bed66fbde7 debug import geometry 2024-10-01 09:47:35 +02:00
Theophile Terraz 2b9ee576e9 pep8 2024-09-30 17:58:32 +02:00
Theophile Terraz efafcb2977 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-09-30 17:39:24 +02:00
Theophile Terraz 0569425df1 debug IC import 2024-09-30 17:39:16 +02:00
Theophile Terraz 6c8a2013d9 work on tuto 2024-09-30 17:38:11 +02:00
Pierre-Antoine Rouby 5c7edbef8a HS: Use profiles name instead of RK (select only). 2024-09-30 17:07:41 +02:00
Pierre-Antoine Rouby d417fe96c4 Friction, Stricklers: Update friction table. 2024-09-30 16:52:28 +02:00
Theophile Terraz c4da75fe6a Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-09-27 15:36:48 +02:00
Theophile Terraz 0bf7f6da61 add images 2024-09-27 15:36:40 +02:00
Theophile Terraz 8992772748 update frensh tuto1 2024-09-27 15:34:55 +02:00
Pierre-Antoine Rouby 463cb520d9 doc: wiki: Update images. 2024-09-27 15:07:38 +02:00
Pierre-Antoine Rouby 399f68c03b doc: wiki: BC: Update fr image. 2024-09-27 15:01:41 +02:00
Pierre-Antoine Rouby 15df4beb80 doc: wiki: Update vf meshing image. 2024-09-27 14:41:56 +02:00
Pierre-Antoine Rouby 4b79940122 doc: wiki: Add fr geometry images. 2024-09-27 14:38:49 +02:00
Pierre-Antoine Rouby 51ce85d453 Geometry: Fix ST import. 2024-09-27 14:35:28 +02:00
Pierre-Antoine Rouby 3dfe95558f doc: wiki: Update images. 2024-09-27 14:02:56 +02:00
Theophile Terraz 45e56e53a4 debug IC 2024-09-25 18:02:40 +02:00
Pierre-Antoine Rouby 0e114fa7bb Network: Fix Nodes/Edges name. 2024-09-25 16:11:14 +02:00
Pierre-Antoine Rouby 78721bdf08 Network: Fix node with no name. 2024-09-25 15:27:31 +02:00
Pierre-Antoine Rouby c3f01cc9b6 Pamhyr2: About: Add code name. 2024-09-24 17:10:30 +02:00
Pierre-Antoine Rouby 0c7091e2d9 Pamhyr2: Add Tahiti version code name. 2024-09-24 17:04:03 +02:00
Pierre-Antoine Rouby c4c2449216 trad: Minor fix. 2024-09-23 16:09:15 +02:00
Pierre-Antoine Rouby 9bf125aa15 Pamhyr2: Fix pep8. 2024-09-23 16:06:30 +02:00
Pierre-Antoine Rouby a9df5384a3 trad: Stop using UTF-8 for some translate. 2024-09-23 15:57:15 +02:00
Pierre-Antoine Rouby 6ed71d004e trad: Minor change. 2024-09-23 15:52:37 +02:00
Pierre-Antoine Rouby 92b81f4996 About: Renew window. 2024-09-23 15:48:48 +02:00
Pierre-Antoine Rouby 3b83cd3418 Results: CustomPlot: Fix index name 'max_depth'. 2024-09-23 15:20:59 +02:00
Pierre-Antoine Rouby 0cd60920ca Trad: Minor change. 2024-09-23 15:12:27 +02:00
Pierre-Antoine Rouby 2673ad9ce4 Results: Translate status bar. 2024-09-23 14:55:54 +02:00
Pierre-Antoine Rouby 0c7924aa7c MainWindow: Delete dead code. 2024-09-23 14:45:10 +02:00
Pierre-Antoine Rouby e7c93602a1 trad: Add some message window traduction. 2024-09-23 14:43:31 +02:00
Pierre-Antoine Rouby 6a3bb38dbc Config: Minor change in trad. 2024-09-23 13:42:02 +02:00
Pierre-Antoine Rouby 1a79dc87ba trad: Minor change. 2024-09-23 13:40:07 +02:00
Pierre-Antoine Rouby dd38b3d725 trad: Minor change (uniformisation of Height/Depth/...). 2024-09-23 12:13:36 +02:00
Pierre-Antoine Rouby 35221c8973 trad: Some update. 2024-09-23 12:10:53 +02:00
Pierre-Antoine Rouby bf0cd7685e trad: Update some translate. 2024-09-23 10:37:36 +02:00
Pierre-Antoine Rouby 5f37767207 Network: Translate default node and reach name in ui. 2024-09-23 09:50:57 +02:00
Theophile Terraz a95364db1d replace export raw data by export to CSV 2024-09-20 16:10:09 +02:00
Theophile Terraz 47ac8e8bef keyword for file_dialog mode selection 2024-09-20 15:39:25 +02:00
Theophile Terraz 1bc9b9fc86 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-09-20 15:06:08 +02:00
Theophile Terraz 91510a1755 debug 2024-09-20 15:05:39 +02:00
Theophile Terraz c2d1e228a8 debug 2024-09-20 14:29:09 +02:00
Theophile Terraz bfa0f0fd9b pep8 2024-09-20 14:06:21 +02:00
Theophile Terraz 9d01ab0e16 add custom plot export to CSV 2024-09-20 14:02:12 +02:00
Theophile Terraz f755b7ce74 add make increasing button in boundary condition rating curve 2024-09-19 11:39:06 +02:00
Theophile Terraz 0b78522ca5 keep previons settings in generate BC dialog 2024-09-19 10:44:19 +02:00
Theophile Terraz 3814f9a1c9 keep previons settings in generate IC dialogs 2024-09-19 10:35:24 +02:00
Theophile Terraz fe4ae46784 work on initial conditions 2024-09-19 10:05:25 +02:00
Theophile Terraz 8250efcd62 add generate constant height in IC 2024-09-18 17:22:26 +02:00
Pierre-Antoine Rouby c698f2af2b RubarBE (Rubar3): Add minimal rubar3. 2024-09-18 16:05:40 +02:00
Pierre-Antoine Rouby 7ebb683fac RubarBE: Rename 'tps.*' file to 'condin.*'. 2024-09-18 14:15:41 +02:00
Theophile Terraz 8ce85e5d23 debugs 2024-09-18 09:20:57 +02:00
Theophile Terraz 8e6323ae48 debug print 2024-09-16 11:50:02 +02:00
Theophile Terraz 83c03c998a debug auto BC without node 2024-09-16 11:28:46 +02:00
Theophile Terraz 9a7c264ee6 remove results section slider 2024-09-05 12:06:50 +02:00
Theophile Terraz 5eb030046c debug default path in geometry 2024-09-05 09:27:42 +02:00
Theophile Terraz 06e621399b debug 2024-09-02 11:58:11 +02:00
Theophile Terraz 5204b2cef2 debug Froude 2024-08-27 17:03:56 +02:00
Theophile Terraz 2951f5e093 pep8 2024-08-21 15:51:24 +02:00
Theophile Terraz 898aad3da5 add wet arrea in custom plots + slider mark 2024-08-21 15:47:17 +02:00
Theophile Terraz ec5b9571d3 debug 2024-08-21 14:21:02 +02:00
Theophile Terraz 5d3111df37 debug 2024-08-09 17:27:16 +02:00
Theophile Terraz 79660bfd6e debug 2024-08-09 11:59:50 +02:00
Theophile Terraz 3c9bc6ce73 add froude in results 2024-08-09 11:25:24 +02:00
Theophile Terraz 0ee47e95da add froude in results 2024-08-09 10:03:55 +02:00
Theophile Terraz 16916f44b9 add slope option for BC generation 2024-08-08 15:43:27 +02:00
Theophile Terraz 4d2ba40287 work on get friction values from rk 2024-08-08 12:03:25 +02:00
Theophile Terraz 845bf3c325 pep8 2024-08-07 17:56:12 +02:00
Theophile Terraz 3693c32d4b auto BC generation 2024-08-07 17:49:52 +02:00
Theophile Terraz fb62298bd2 more custom plots 2024-08-07 11:33:41 +02:00
Theophile Terraz d19506f1ad debug table default timestep 2024-08-07 11:32:47 +02:00
Theophile Terraz 271f977cdd kilometer instead of kilometric 2024-08-07 09:34:53 +02:00
Theophile Terraz e823b3ae95 work on custom plots 2024-08-06 16:00:16 +02:00
Theophile Terraz f96f9cc62f work on custom plots 2024-08-05 18:30:22 +02:00
Theophile Terraz 12cca24d8b add shift button in geometry window 2024-08-05 15:50:22 +02:00
Theophile Terraz a698d46144 debug water limits 2024-08-05 11:10:43 +02:00
Theophile Terraz d32baa61a1 text improvement 2024-08-05 09:55:12 +02:00
Theophile Terraz 5e018fc8f0 lighter data export 2024-07-30 16:32:07 +02:00
Theophile Terraz 80a463a91e pep8 2024-07-30 14:19:42 +02:00
Theophile Terraz 61fce32c60 mean water depth 2024-07-30 14:09:29 +02:00
Theophile Terraz 04e5b61732 wet_width 2024-07-17 16:25:03 +02:00
Theophile Terraz f6a2240b1f wet_area and wet_perimeter 2024-07-17 15:41:26 +02:00
Theophile Terraz 2c43e9587d Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-07-17 11:37:01 +02:00
Theophile Terraz 52c311887a more hydraulic values in raw results 2024-07-17 11:36:57 +02:00
Pierre-Antoine Rouby 4c25355be9 Merge remote-tracking branch 'origin/master' 2024-07-17 10:33:04 +02:00
Pierre-Antoine Rouby d95b299217 doc: tools: Add SQL language minted config. 2024-07-17 10:32:06 +02:00
Pierre-Antoine Rouby efa8912742 tools: Translate mail template to en. 2024-07-17 10:31:29 +02:00
Theophile Terraz c33913bd58 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-07-16 16:44:36 +02:00
Theophile Terraz 295ceaa702 debug velocity computation 2024-07-16 16:44:20 +02:00
Pierre-Antoine Rouby 8c64652b33 ui: Minor change. 2024-07-16 10:56:13 +02:00
Pierre-Antoine Rouby 66a9563345 pamhyr: Fix pep8. 2024-07-16 10:43:12 +02:00
Pierre-Antoine Rouby fdf241c6dd Results: Fix reach selection with disable reaches in network. 2024-07-16 10:39:41 +02:00
Pierre-Antoine Rouby 113989dc46 Network: Fix crash where reservoir is defined. 2024-07-16 09:46:56 +02:00
Pierre-Antoine Rouby 430cff8747 IC: Fix name KP to RK. 2024-07-16 09:43:32 +02:00
Pierre-Antoine Rouby aee69fa3c7 Merge remote-tracking branch 'origin/master' 2024-07-16 09:35:11 +02:00
Pierre-Antoine Rouby afb3483fe3 pamhyr: Fix windows timestamp. 2024-07-16 09:34:10 +02:00
Theophile Terraz 90272fa444 turn node shape to square when the node is a reservoir 2024-07-05 15:52:45 +02:00
Pierre-Antoine Rouby 73fd407aff doc: tools: Minor change. 2024-07-05 15:27:18 +02:00
Pierre-Antoine Rouby 46dc527222 Translate: Rename KP to RK (River Kilometric). 2024-07-05 15:27:18 +02:00
Theophile Terraz b83494888b debug right click graph 2024-07-05 14:34:41 +02:00
Theophile Terraz a0f964e89e generate discharge without height 2024-07-05 13:39:54 +02:00
Pierre-Antoine Rouby 30b3b8800e IC: Minor change. 2024-07-05 11:31:41 +02:00
Pierre-Antoine Rouby 366baa737a IC: Fix generate_growing_constante_height method. 2024-07-05 11:30:07 +02:00
Theophile Terraz 453a2084e7 debug 2024-07-05 10:21:04 +02:00
Theophile Terraz fe30a20882 allow to define height or discharge only 2024-07-05 10:09:43 +02:00
Theophile Terraz 70dcb1a6ee remove print 2024-07-02 10:47:28 +02:00
Pierre-Antoine Rouby c4554d38c1 BC, LC: Edit: Disable auto sort. 2024-07-01 15:53:08 +02:00
Pierre-Antoine Rouby 4deed897ff BC, LC: Edit: Auto sort values. 2024-07-01 14:46:18 +02:00
Pierre-Antoine Rouby 460450f524 Pamhyr: Fix save as method and minor change. 2024-07-01 14:04:18 +02:00
Theophile Terraz 60336c25f1 pep8 2024-06-13 18:23:11 +02:00
Theophile Terraz 82093bcf95 remove slider in geometry 2024-06-13 18:21:09 +02:00
Theophile Terraz 7b8191e2f0 interactive selection in results 2024-06-13 18:20:46 +02:00
Theophile Terraz 88dd9cf15a remove slider in geometry window 2024-06-13 11:12:35 +02:00
Theophile Terraz 7d4091eb24 pep8 2024-06-12 11:40:52 +02:00
Theophile Terraz 59fc80a10b debug + interactive selection in lateral contrib 2024-06-11 16:19:52 +02:00
Theophile Terraz ea146cbe87 interactive profile selection in structures + debug 2024-06-11 14:17:38 +02:00
Theophile Terraz c6b28ba3a0 deal with conflicts between onpick and rect select in Profile plot 2024-06-11 11:55:52 +02:00
Theophile Terraz fe57890da4 work on ctrl+click 2024-06-11 10:02:43 +02:00
Theophile Terraz 8cd9ec939b mend 2024-06-10 15:59:32 +02:00
Theophile Terraz 872ff0ef62 PlotKPZ restructuration 2024-06-10 15:59:02 +02:00
Theophile Terraz 052faed48d PlotXY restructuration 2024-06-10 14:58:47 +02:00
Theophile Terraz 31b37a7792 add mouse selection in kpz geometry window 2024-06-07 16:23:09 +02:00
Theophile Terraz dfe12c8bcb work on multiple selection in profil plot 2024-06-07 14:18:56 +02:00
Theophile Terraz 89d5b2d576 work on interactive profil plot 2024-06-06 16:29:26 +02:00
Theophile Terraz 601ef73b5d implement rectangular selection in profile window 2024-06-06 14:30:15 +02:00
Theophile Terraz e4f8bc347d prepare rectangular selection 2024-06-06 14:29:31 +02:00
Pierre-Antoine Rouby 6c4b67d93a pamhyr: Fixing pep8 and use RD and RG by default at update PK (if exists). 2024-05-24 11:53:13 +02:00
Pierre-Antoine Rouby 2ee8420b94 Model: Add status versioning and update study version to 0.0.10. 2024-05-22 17:20:30 +02:00
Pierre-Antoine Rouby bbe127865b Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-05-22 17:08:25 +02:00
Pierre-Antoine Rouby 50686e1b65 Pamhyr: Disable native file dialog. 2024-05-22 15:56:45 +02:00
Theophile Terraz 7b3c3d891d Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-05-22 11:43:47 +02:00
Theophile Terraz 98feca7fca add orientation option for update KP 2024-05-22 11:36:12 +02:00
Pierre-Antoine Rouby e45eb3fd69 ci: build-linux: Fix 'pamhyr-x11' path. 2024-05-21 17:27:27 +02:00
Pierre-Antoine Rouby dd86b8b461 Package: Linux: Add script to force pamhyr running with x11. 2024-05-21 17:19:00 +02:00
Theophile Terraz 57d43cd5d3 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-05-21 17:02:08 +02:00
Theophile Terraz 14b5b5e3df add purge dialog 2024-05-21 17:01:54 +02:00
Pierre-Antoine Rouby a7e43ca6a7 MainWindow: Info: Sync update with all modelling modules. 2024-05-21 11:08:59 +02:00
Pierre-Antoine Rouby 8ca21c413f IC: Fix display update and optimized discharge plot update. 2024-05-21 10:53:20 +02:00
Pierre-Antoine Rouby 61fd54c496 Geometry, Results: Fix HS display whene not associated. 2024-05-17 16:41:05 +02:00
Pierre-Antoine Rouby b017127b3a Windows: Add nsis icon. 2024-05-17 15:44:48 +02:00
Pierre-Antoine Rouby 52f2d15280 Package: Add icon for windows executable file. 2024-05-17 15:20:17 +02:00
Pierre-Antoine Rouby 5c86e46c72 Checker: Bypass study copy to improve performance. 2024-05-17 14:51:30 +02:00
Pierre-Antoine Rouby a5648851f2 Friction: Add strickler unit. 2024-05-17 14:31:34 +02:00
Pierre-Antoine Rouby cb41520a20 pamhyr: Fix Pep8. 2024-05-17 12:29:20 +02:00
Pierre-Antoine Rouby 537612e5e3 Geometry: Minor change. 2024-05-17 12:22:47 +02:00
Pierre-Antoine Rouby 4e0c671f68 Merge remote-tracking branch 'origin/v0.0.8' 2024-05-17 12:01:17 +02:00
Pierre-Antoine Rouby 507cfb9d53 Friction: Fix reach plot. 2024-05-17 11:55:29 +02:00
Pierre-Antoine Rouby 2013009e8a Mage: Update version. 2024-05-17 11:52:07 +02:00
Pierre-Antoine Rouby f1a1d08458 Pamhyr: Minor change. 2024-05-17 11:51:23 +02:00
Pierre-Antoine Rouby 7de6cc4468 Solver: RubarBE: Disable. 2024-05-17 11:50:07 +02:00
Pierre-Antoine Rouby 783d83e4cc Trad: Update french translate. 2024-05-17 11:48:37 +02:00
Theophile Terraz c366a1a4e7 increase precision of input sediment diameter 2024-05-16 18:06:53 +02:00
Theophile Terraz b784cab94b Merge branch 'v0.0.8' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into v0.0.8 2024-05-16 13:01:14 +02:00
Theophile Terraz 78e361d486 debug issue #57 2024-05-16 13:01:03 +02:00
Pierre-Antoine Rouby 3b1f135fdb Geometry: Profile: Change print to logger. 2024-05-15 16:00:58 +02:00
Pierre-Antoine Rouby 2f93d1a83f LC: Use KP delegation. 2024-05-15 15:18:33 +02:00
Pierre-Antoine Rouby 653a26fee1 Geometry: Add hydro. struct. at KPZ plot. 2024-05-15 14:44:42 +02:00
Pierre-Antoine Rouby e33c9cb2f0 Results: Add hydro. struct. on kpc plot. 2024-05-15 14:37:31 +02:00
Pierre-Antoine Rouby 4be43528e3 Pamhyr: Fix Pep8. 2024-05-15 11:29:39 +02:00
Pierre-Antoine Rouby 9d343a42ce IC: Add import action (for BIN file). 2024-05-15 11:09:39 +02:00
Pierre-Antoine Rouby 459722610a IC: Implement copy/paste command. 2024-05-15 09:49:43 +02:00
Theophile Terraz f745dce04e debug 2024-05-14 15:14:29 +02:00
Pierre-Antoine Rouby c1f4aaf957 Merge branch 'arts' into v0.0.8 2024-05-14 14:41:14 +02:00
Pierre-Antoine Rouby f4bf8d3766 Results: Simplify and fix river bottom display. 2024-05-14 14:40:00 +02:00
Pierre-Antoine Rouby 6e94d7a707 Results: PlotH: Add current ts line. 2024-05-14 14:21:33 +02:00
Theophile Terraz 87e8e17e91 forgotten files 2024-05-14 14:13:46 +02:00
Theophile Terraz 9e79178d0f restructure meshing 2024-05-14 11:55:38 +02:00
Theophile Terraz 9d0168a9ee merge 2024-05-13 16:02:36 +02:00
Pierre-Antoine Rouby 9760d41561 Results: Add speed value into row data table. 2024-05-13 15:26:58 +02:00
Pierre-Antoine Rouby 0c039793df IC: Add speed column in table. 2024-05-13 15:24:25 +02:00
Pierre-Antoine Rouby 4cec45131e River: Add a default sediment layers. 2024-05-13 15:00:56 +02:00
Pierre-Antoine Rouby e6c08cb4e4 Geometry: Fix pep8. 2024-05-13 14:45:59 +02:00
Pierre-Antoine Rouby 2d17d8cfe4 Geometry: Add import exception handler. 2024-05-13 14:44:15 +02:00
Pierre-Antoine Rouby ef583fc9bb Geometry: Meshing: Prepare code for next 'mailleurTT' version. 2024-05-13 14:27:24 +02:00
Pierre-Antoine Rouby db87b1e214 Geometry: Add left and right line into XY plot. 2024-05-13 09:56:09 +02:00
Theophile Terraz 5790bdfe82 add purge in profile and geometry 2024-05-07 17:42:43 +02:00
Pierre-Antoine Rouby 731567369e Geometry: Remove old OnPickEvent file. 2024-05-07 17:02:42 +02:00
Pierre-Antoine Rouby 317cbf904d Geometry: Add water level at shift click, end of onpickevent refactoring. 2024-05-07 16:58:29 +02:00
Pierre-Antoine Rouby f4561494f6 Merge branch 'RubarBE' into v0.0.8. 2024-05-07 14:43:58 +02:00
Theophile Terraz 5164891928 add purge 2024-05-07 14:41:09 +02:00
Pierre-Antoine Rouby 5e79e29823 Geometry: Start OnPickEvent refactoring. 2024-05-07 14:12:53 +02:00
Pierre-Antoine Rouby cc3649fcb8 MeshingTools: Fix sync call. 2024-05-03 15:57:38 +02:00
Pierre-Antoine Rouby ab11d15729 Results: Plot: Fix display whene more than 10 sl. 2024-05-03 15:03:43 +02:00
Pierre-Antoine Rouby 0e75d67671 Geometry: Fix display with more than 10 guidelines. 2024-05-03 14:56:11 +02:00
Pierre-Antoine Rouby ba81f923d9 Results: CustomPlot: Use automatic x and y lim. 2024-05-03 14:40:53 +02:00
Theophile Terraz a0cdb182fd debug 2024-05-02 15:05:55 +02:00
Theophile Terraz ca7296ca8c translation 2024-04-30 16:31:53 +02:00
Theophile Terraz fb2d0d3e71 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-04-30 14:24:15 +02:00
Theophile Terraz 2afd641f0f debug param init_internal 2024-04-30 14:22:42 +02:00
Theophile Terraz d871bbfc3b debug enable hydraulic structures 2024-04-30 14:18:12 +02:00
Pierre-Antoine Rouby 5e9ab81363 tools: Add relase mail generator. 2024-04-26 12:10:32 +02:00
Pierre-Antoine Rouby d0acface41 Geometry, doc: Fix pointXYZ foreign key. 2024-04-26 10:04:43 +02:00
Pierre-Antoine Rouby aea7cdb823 doc: dev: Add database scheme images. 2024-04-26 09:40:14 +02:00
Pierre-Antoine Rouby e066c6ab94 Pamhyr2: Fix pep8. 2024-04-24 16:38:25 +02:00
Pierre-Antoine Rouby 8e82772cfc Checker: Add modules impact and add IC and BC study checker. 2024-04-24 16:32:52 +02:00
Pierre-Antoine Rouby 441a064d84 Solver: CommandLine: Try fix Windows encoding crash. 2024-04-24 09:51:58 +02:00
Pierre-Antoine Rouby ee6b2a94eb Results: Add plot toolsbar iso view and back/forward option. 2024-04-24 09:51:28 +02:00
Pierre-Antoine Rouby 07761716e4 Solver: Mage: Check is node is enable before BC export. 2024-04-24 09:33:33 +02:00
Pierre-Antoine Rouby 6dc96b86b4 Merge branch 'shape' into v0.0.8 2024-04-23 14:35:01 +02:00
Pierre-Antoine Rouby 8c2874e04d Geometry: Compute KP at shape file import. 2024-04-23 14:32:21 +02:00
Pierre-Antoine Rouby c7001bf0fa Network: Fix pep8. 2024-04-23 14:10:55 +02:00
Pierre-Antoine Rouby f62b209ffb Merge branch 'multiple-edge-between-nodes' into v0.0.8 2024-04-23 14:07:54 +02:00
Pierre-Antoine Rouby 0fe71b2b92 Pamhyr2: Fix full requirements list. 2024-04-23 14:03:01 +02:00
Pierre-Antoine Rouby e528ba5278 Geometry: Add shapefile import file format. 2024-04-23 11:50:35 +02:00
Pierre-Antoine Rouby fd1b2b1041 doc: dev: Minor change. 2024-04-23 09:09:54 +02:00
Pierre-Antoine Rouby e5422c71f5 View: Network: Minor change. 2024-04-22 16:48:17 +02:00
Pierre-Antoine Rouby efd8960e1e Pamhyr2: Fix pep8. 2024-04-22 16:46:50 +02:00
Pierre-Antoine Rouby 8dcb0a298e Pamhyr2: View: Tools: Add comment. 2024-04-22 16:40:58 +02:00
Pierre-Antoine Rouby acbd3537c0 Pamhyr2: Minor change and method documentation. 2024-04-22 16:29:23 +02:00
Pierre-Antoine Rouby 145c301eed doc: dev: Update documentation. 2024-04-22 16:28:41 +02:00
Pierre-Antoine Rouby ec91a8b63f Solver: Fix SIN export and error handler at export. 2024-04-22 11:33:07 +02:00
Pierre-Antoine Rouby ffdeb28bfd Network: Fix potential crash with maptoscene. 2024-04-22 11:07:42 +02:00
Pierre-Antoine Rouby df1ac5586e IC: Fix incline computation in case of zero marging. 2024-04-19 16:31:12 +02:00
Pierre-Antoine Rouby ab1b7a2605 Save/Backup: Add mutual exclusion on save methode and block backup signal. 2024-04-19 10:39:25 +02:00
Pierre-Antoine Rouby 53456cf7fa IC: Fix generator spinbox max size. 2024-04-17 14:47:49 +02:00
Pierre-Antoine Rouby 1cbdda1ec5 Solver: Log: Fix new line spliting (depend of OS). 2024-04-17 14:46:17 +02:00
Pierre-Antoine Rouby ba2fa25636 Pamhyr2: Fix some fonts size and family. 2024-04-17 14:45:32 +02:00
Pierre-Antoine Rouby 5189cbaa6f Windows: Fix logging file encoding. 2024-04-17 14:27:01 +02:00
Pierre-Antoine Rouby f1ce2e4b10 Windows: Enable console but hide it. 2024-04-17 12:18:28 +02:00
Pierre-Antoine Rouby 50ae49c0ec Windows: Fix UTF-8 en/decode. 2024-04-17 12:17:25 +02:00
Pierre-Antoine Rouby 502c2240f7 Solver: Parameters: Fix Y/N french translate. 2024-04-17 09:42:17 +02:00
Pierre-Antoine Rouby b784f00b92 Solver: Mage: Fix pep8. 2024-04-16 15:39:51 +02:00
Pierre-Antoine Rouby 0c0d7f3481 Network: Fix edge delete whene there are multiple edge between two node. 2024-04-16 15:15:30 +02:00
Pierre-Antoine Rouby 457dac477a Solver: Mage: Minor change. 2024-04-16 14:01:59 +02:00
Pierre-Antoine Rouby dc114f759d Solver: Mage: Enable LC export. 2024-04-16 12:04:19 +02:00
Pierre-Antoine Rouby 672f81f216 MeshingTools: Fix mailleurTT path. 2024-04-16 10:47:07 +02:00
Pierre-Antoine Rouby 3516986ff2 Geometry: Meshing: Fix space step maximum value to 9999.99 (m). 2024-04-16 10:12:15 +02:00
Pierre-Antoine Rouby 7ecd98a5fb Solver: Mage: Add error file by default. 2024-04-16 08:32:19 +02:00
Pierre-Antoine Rouby 1fdeab9685 Geometry: Meshing: Minor change. 2024-04-15 15:42:37 +02:00
Pierre-Antoine Rouby ebd4e64cc3 Pamhyr2: Update Mage version to v8.3.5 2024-04-15 11:39:06 +02:00
Pierre-Antoine Rouby 1452f4129f Config: Fix configuration save whene click cancel. 2024-04-15 11:16:41 +02:00
Pierre-Antoine Rouby 04d43f3f28 Backup: Fix backup. 2024-04-15 11:16:20 +02:00
Pierre-Antoine Rouby b7ebf961ac Geometry: Fix geometry loading. 2024-04-15 10:29:56 +02:00
Pierre-Antoine Rouby 28c7a0177a HS: Basic: Fix plot AC init. 2024-04-15 09:35:10 +02:00
Pierre-Antoine Rouby 9c5ea0bdd9 Network: Reverse order for edges adding in scene to fix mouse selection. 2024-04-10 16:36:14 +02:00
Pierre-Antoine Rouby cd540b0146 Network: Display edge as an arc. 2024-04-10 16:24:12 +02:00
Pierre-Antoine Rouby 62860750f2 Config: Fix useless print. 2024-04-09 09:37:29 +02:00
Pierre-Antoine Rouby 4d8277c5c2 Pamhyr2: Fix pep8. 2024-04-08 16:25:25 +02:00
Pierre-Antoine Rouby b9fddcf78c LC: Add DMY datetime support. 2024-04-08 16:13:23 +02:00
Pierre-Antoine Rouby a834e1905d BC: Add DMY datetime support. 2024-04-08 16:10:39 +02:00
Pierre-Antoine Rouby de1f5c1944 RunSolver: Fix copy methode. 2024-04-08 15:37:00 +02:00
Pierre-Antoine Rouby 6d9b193d25 Solver: RubarBE: Add RubarBE at solvers and fix export. 2024-04-08 15:11:04 +02:00
Pierre-Antoine Rouby 982d346264 Solver: RubarBE: Add tps export. 2024-04-08 13:45:52 +02:00
Pierre-Antoine Rouby 4c927eb7c7 Model: Profile: Add speed computation methode. 2024-04-08 11:40:12 +02:00
Pierre-Antoine Rouby fead93f0b9 Solver: RubarBE: Add ts export. 2024-04-08 11:39:53 +02:00
Pierre-Antoine Rouby ca3ba3adb6 Solver: RubarBE: Add frictions export. 2024-04-05 16:45:13 +02:00
Pierre-Antoine Rouby 9f87a38107 Solver: RubarBE: Add MAIL file. 2024-04-05 16:03:55 +02:00
Pierre-Antoine Rouby 329572d191 Solver: RubarBE: Add rubarbe solver (WIP). 2024-04-05 15:28:05 +02:00
Pierre-Antoine Rouby ae21315593 Network: Fix crash when edge addition click on the void. 2024-04-05 11:15:09 +02:00
Pierre-Antoine Rouby b209547a5b Solver: Disable mage fake 7. 2024-04-03 17:48:09 +02:00
Pierre-Antoine Rouby 8a0f214144 Arts: Fix missing icon. 2024-04-03 16:12:29 +02:00
Pierre-Antoine Rouby 5ff3b9457a HydraulicStructures: Basic: Fix table setup. 2024-04-03 16:01:24 +02:00
Pierre-Antoine Rouby 8ec25cac46 Arts: Delete old and useless icons. 2024-04-03 15:59:58 +02:00
Pierre-Antoine Rouby 39180f8ea3 Arts: Add reload icon. 2024-04-03 15:53:42 +02:00
Pierre-Antoine Rouby 2203b2ca8b Arts: Add zoom icons. 2024-04-03 15:13:39 +02:00
Pierre-Antoine Rouby faab0d78cf tests_cases: Fix and update Saar study. 2024-04-03 14:49:19 +02:00
Pierre-Antoine Rouby c3a5ea1b91 Arts: Add meshing icon. 2024-04-03 11:56:47 +02:00
Pierre-Antoine Rouby 6349c4f752 Arts: Renew up/down/left/right and import/export. 2024-04-03 11:36:36 +02:00
Pierre-Antoine Rouby 8c5fa68f11 Arts: Add open, renew logo and minor change. 2024-04-03 10:42:51 +02:00
Pierre-Antoine Rouby a487cd8e64 AddFile, REPLine: Fix modified status. 2024-04-02 17:07:04 +02:00
Pierre-Antoine Rouby 92eac86c68 AddFiles, REPLine: Add undo commands. 2024-04-02 16:18:21 +02:00
Pierre-Antoine Rouby cd2e29a77d MainWindow: Set menu bar to not bold. 2024-04-02 09:28:11 +02:00
Pierre-Antoine Rouby ce090c6437 Plot: ToolBar: Minor change. 2024-04-02 09:26:11 +02:00
Pierre-Antoine Rouby f80be0f3da Arts: Update SolverLog window. 2024-03-29 17:41:11 +01:00
Pierre-Antoine Rouby fd9a338365 Arts: Minor change. 2024-03-29 17:37:54 +01:00
Pierre-Antoine Rouby 776164310b Arts: Add edit icon and some minor change. 2024-03-29 17:10:33 +01:00
Pierre-Antoine Rouby 52ab9f4ade Arts: MainWindow: Add menu icons. 2024-03-29 16:02:59 +01:00
Pierre-Antoine Rouby 88c75c0d35 Arts: Add save icon and some change. 2024-03-29 16:00:05 +01:00
Pierre-Antoine Rouby cd571b6ec4 Arts: Update geometry and minor change. 2024-03-29 15:05:18 +01:00
Pierre-Antoine Rouby 701f9ab69b arts: Renew friction, add run, sort, up and down icons. 2024-03-29 15:00:59 +01:00
Pierre-Antoine Rouby 6d47664767 arts: Add network, geometry, friction, etc. icons and add toolbar on mainwindow. 2024-03-29 12:02:12 +01:00
Pierre-Antoine Rouby 8cb8c50998 arts: Add new logo as ascii art. 2024-03-27 18:20:24 +01:00
Pierre-Antoine Rouby f14a149748 arts: Update Pamhyr2 logo. 2024-03-27 17:57:08 +01:00
Pierre-Antoine Rouby beb2c2fec0 arts: Renew add and del icons and add import and export logo. 2024-03-27 17:50:45 +01:00
Pierre-Antoine Rouby 48e010f195 Pamhyr2: Add new logo. 2024-03-27 16:14:52 +01:00
Pierre-Antoine Rouby e350b7d8f5 Solver: Mage8: Do not add additional files into REP file. 2024-03-27 10:50:23 +01:00
Pierre-Antoine Rouby e7e1582836 MainWindow: Checker: Minor change and fixes. 2024-03-27 09:57:53 +01:00
Pierre-Antoine Rouby 9d9a8a7ced MainWindow: Info: Simplify study section. 2024-03-27 09:40:14 +01:00
Pierre-Antoine Rouby aef81d088c Meshing: Add trivial MashingWithMAgeMailleurTT unit tests. 2024-03-27 09:36:34 +01:00
Pierre-Antoine Rouby 35b421b4df Pamhyr2: Fix Pep8. 2024-03-27 09:33:43 +01:00
Pierre-Antoine Rouby dbbae7a53f Translate: Rebuild Pamhyr2 french translate. 2024-03-27 09:27:37 +01:00
Pierre-Antoine Rouby b9ace9f58f MainWindow: Remove obsolete actions. 2024-03-26 17:54:32 +01:00
Pierre-Antoine Rouby 48aa5cb1aa Config: Update config with new mage_fake7 solver and new mage path. 2024-03-26 15:29:45 +01:00
Pierre-Antoine Rouby b517c38cb9 Solver: Mage: Add mage fake 7. 2024-03-26 15:18:05 +01:00
Pierre-Antoine Rouby d158c8ad7a Windows: Fix 'pwd' import. 2024-03-26 13:49:56 +01:00
Pierre-Antoine Rouby 8c9eeb6160 Windows: Fix NSI file. 2024-03-26 11:02:02 +01:00
Pierre-Antoine Rouby aedb8c46fc REPLines: Add REP lines into model, view and minor change. 2024-03-26 10:40:57 +01:00
Pierre-Antoine Rouby 1ff895368e pamhyr: Fix save after backup and minor change. 2024-03-26 08:36:45 +01:00
Pierre-Antoine Rouby 48e30125bb AdditionalFiles: Add model, view and solver export. 2024-03-25 17:21:31 +01:00
Pierre-Antoine Rouby db416d25de pamhyr: Fix Pep8. 2024-03-25 14:04:55 +01:00
Pierre-Antoine Rouby da18a8b712 Study: Add default description example. 2024-03-25 13:57:27 +01:00
Pierre-Antoine Rouby 48c98cddba Study: Switch rich text to markdown. 2024-03-22 17:07:13 +01:00
Pierre-Antoine Rouby 16a0e03d1d Study: Add riche text option for study description editing. 2024-03-22 16:12:57 +01:00
Pierre-Antoine Rouby e0f580daf6 windows: Fix widgets path. 2024-03-22 15:13:35 +01:00
Pierre-Antoine Rouby c1c16964eb windows: Disable console. 2024-03-22 15:03:47 +01:00
Pierre-Antoine Rouby d0134d6415 ci: Fix hash path. 2024-03-22 14:54:15 +01:00
Pierre-Antoine Rouby 9f4c759ea3 package: Fix exe and _internal position. 2024-03-22 14:51:10 +01:00
Pierre-Antoine Rouby 661e2071d1 Package: Rename mage to mage8 and reorganise package installation dir. 2024-03-22 14:43:51 +01:00
Pierre-Antoine Rouby 0f25334032 pamhyr: Close study DB if already init. 2024-03-22 14:03:46 +01:00
Pierre-Antoine Rouby 334ada3dcc pamhyr: Add missing dependencies. 2024-03-22 11:32:49 +01:00
Pierre-Antoine Rouby df0b5bb014 MainWindow: Minor change. 2024-03-22 11:24:58 +01:00
Pierre-Antoine Rouby 20686086d8 pamhyr: Add CONFIG modules. 2024-03-22 11:23:25 +01:00
Pierre-Antoine Rouby 1be8f6c434 MainWindow: Add status at save/backup. 2024-03-22 11:17:18 +01:00
Pierre-Antoine Rouby f8c16d8c7c pamhyr: Reopen backup if newer than last save in case of crash. 2024-03-22 10:55:48 +01:00
Pierre-Antoine Rouby 7f3cf46ee1 pamhyr: Add periodic backup. 2024-03-22 09:51:53 +01:00
Pierre-Antoine Rouby 632cd2cd4c Checker: Fix checker table update at study close. 2024-03-22 08:45:37 +01:00
Pierre-Antoine Rouby 0f5243f36a Geometry, checker: Minor change. 2024-03-22 08:29:04 +01:00
Pierre-Antoine Rouby 137368cc27 pamhyr: Fix pep8. 2024-03-20 17:08:11 +01:00
Pierre-Antoine Rouby e343d284d9 MainWindow: Checker: Add lists. 2024-03-20 17:03:37 +01:00
Pierre-Antoine Rouby a23692a29c MainWindow: Checker: Add worker. 2024-03-20 16:08:53 +01:00
Pierre-Antoine Rouby 30170df1b1 Mainwindow: Checker: Add table. 2024-03-20 12:24:13 +01:00
Pierre-Antoine Rouby 3be4e6c112 MainWindow: Fix missing file. 2024-03-20 09:25:59 +01:00
Pierre-Antoine Rouby e5650b5378 MainWindow: Checkers: Add checker tab template. 2024-03-19 17:21:27 +01:00
Pierre-Antoine Rouby 67f534a6f6 Checker: Add related module(s). 2024-03-19 12:00:44 +01:00
Pierre-Antoine Rouby 51031e7359 Pamhyr: Add pamhyr modules flags enum and checker status OR operator. 2024-03-19 09:18:28 +01:00
Pierre-Antoine Rouby e215e0f14a MainWindow: Info: Minor change. 2024-02-28 16:49:10 +01:00
Pierre-Antoine Rouby 1099d5f282 Pamhyr2: Fix Pep8. 2024-02-28 16:28:54 +01:00
Pierre-Antoine Rouby 330761a372 MainWindow: Info: Add some informations. 2024-02-28 16:27:09 +01:00
Pierre-Antoine Rouby 81f38b942c Reservoir: Edit: Fix undo/redo update. 2024-02-28 15:44:58 +01:00
Pierre-Antoine Rouby 07cefceed8 Network: Add reservoir shortcut at network edit. 2024-02-28 15:40:57 +01:00
Pierre-Antoine Rouby ed5e520b35 Network: Refacto graph context menu. 2024-02-28 10:49:38 +01:00
Pierre-Antoine Rouby 36b62260b1 Results: Fix results export. 2024-02-27 15:40:21 +01:00
Pierre-Antoine Rouby 3e085dd7c6 MainWindow: Add minimal info tab. 2024-02-27 15:40:08 +01:00
Pierre-Antoine Rouby a18fd29795 pamhyr: Fix Pep8. 2024-02-26 16:37:09 +01:00
Pierre-Antoine Rouby 76e4f4b80e Results: Add waiting window at results reading. 2024-02-26 16:33:45 +01:00
Pierre-Antoine Rouby 8466531916 MainWindow: Add BC short cut for sediment. 2024-02-26 14:21:49 +01:00
Pierre-Antoine Rouby a4c5d34720 Pamhyr: Centralize ND and NA translate. 2024-02-21 17:19:50 +01:00
Pierre-Antoine Rouby 2e158f4c1b Pamhyr: Factorize some translate. 2024-02-21 15:52:16 +01:00
Pierre-Antoine Rouby b3a7e7f465 HS: Remove useless print. 2024-02-21 10:53:46 +01:00
Pierre-Antoine Rouby 1a66188411 HS: Minor fixes. 2024-02-21 10:49:47 +01:00
Pierre-Antoine Rouby 485b2cad1e ci: Update mage version. 2024-02-20 17:07:12 +01:00
Pierre-Antoine Rouby 3bcd90f7ae Pamhyr: Update translate. 2024-02-20 16:58:54 +01:00
Pierre-Antoine Rouby 586f17dc2a Results, tools: Fix negative timestamp on Windows and some others fixes. 2024-02-20 15:12:51 +01:00
Pierre-Antoine Rouby 9863b05c30 tools: Fix timestamp to pamhyr notation function for Windows. 2024-02-20 14:25:23 +01:00
Pierre-Antoine Rouby a9f92637ca Solver: Mage: Fix ST file name. 2024-02-20 12:07:30 +01:00
Pierre-Antoine Rouby 6b8b1b8e1e Geometry: Fix update. 2024-02-20 11:29:51 +01:00
Pierre-Antoine Rouby c3c5802be2 Solver: Mage: Fix ST file name export. 2024-02-20 11:14:39 +01:00
Pierre-Antoine Rouby ab776f15f4 Friction: Connect to geometry update. 2024-02-20 10:53:22 +01:00
Pierre-Antoine Rouby ebc3e938bf Results: Fix KPC update where no sediment. 2024-02-20 10:36:18 +01:00
Pierre-Antoine Rouby 9cc3bb23c0 IC: Propagate update, update at gemometry change and minor change. 2024-02-20 10:25:04 +01:00
Pierre-Antoine Rouby d2f275c49f Results: Add export function. 2024-02-19 16:44:37 +01:00
Pierre-Antoine Rouby aec31df520 Results: Change default tab. 2024-02-19 15:47:59 +01:00
Pierre-Antoine Rouby 76745dc9d0 Pamhyr: Fix Pep8 and minor change. 2024-02-19 15:44:04 +01:00
Pierre-Antoine Rouby 25dce4d386 Results: Add bedload sediment results to KPC plot. 2024-02-19 15:38:06 +01:00
Pierre-Antoine Rouby 1c736df647 Results: Add overflow to KPC plot. 2024-02-19 14:41:12 +01:00
Pierre-Antoine Rouby aeae8fb710 Results: Update plot XY and add overflow on this plot. 2024-02-19 14:32:10 +01:00
Pierre-Antoine Rouby 6055065e27 Results: Update plot KPC. 2024-02-19 10:57:58 +01:00
Pierre-Antoine Rouby a08b2c77d6 Results: Update AC plot with max water level. 2024-02-19 10:19:46 +01:00
Pierre-Antoine Rouby f9a099a284 Results: Hydrograph: Add legend. 2024-02-19 09:46:43 +01:00
Pierre-Antoine Rouby 62fcafa982 Results: Renew hydrograph. 2024-02-16 16:56:46 +01:00
Pierre-Antoine Rouby 065d94eb4a Results: Add 'raw_data' tab and delete sediment tab. 2024-02-16 15:44:50 +01:00
Pierre-Antoine Rouby 7760181baa Friction: Apply new PamhyrPlot features. 2024-02-16 14:35:37 +01:00
Pierre-Antoine Rouby 9302d1fabc SL: Apply new PamhyrPlot features. 2024-02-16 14:16:58 +01:00
Pierre-Antoine Rouby d1d63c8c29 Reservoir: Apply new PamhyrPlot features. 2024-02-16 11:22:29 +01:00
Pierre-Antoine Rouby bfd166b717 IC: Apply new PamhyrPlot features. 2024-02-16 11:16:18 +01:00
Pierre-Antoine Rouby 4f747f8fa7 HS: Apply new PamhyrPlot features. 2024-02-16 10:58:10 +01:00
Pierre-Antoine Rouby 2111307965 LC: Update plot with PmahyrPlot new features. 2024-02-16 10:18:29 +01:00
Pierre-Antoine Rouby 065e1f063f Pamhyr: Change time edition and plot display (exp BC). 2024-02-16 10:04:22 +01:00
Pierre-Antoine Rouby 5226836211 Pamhyr: Fix Pep8. 2024-02-14 17:03:05 +01:00
Pierre-Antoine Rouby c58dc5785a Plot: Add a default colors set and delete geo:plot_xy dependence on geo:plot_ac. 2024-02-14 16:44:41 +01:00
Pierre-Antoine Rouby 30d76da32f Geometry: Renew Plot AC. 2024-02-14 16:23:48 +01:00
Pierre-Antoine Rouby 876521fdea Geometry: Renew PlotKPC. 2024-02-14 15:49:20 +01:00
Pierre-Antoine Rouby e1e5279366 Plot: Start refactoring with Geometry.PlotXY at exemple. 2024-02-14 15:15:08 +01:00
Pierre-Antoine Rouby 32886c5034 Configure: Remove unused configuration. 2024-02-14 09:37:35 +01:00
Pierre-Antoine Rouby 41e14208e4 SQL: Move SQL class to separate file. 2024-02-14 09:29:34 +01:00
Pierre-Antoine Rouby b79fc28a5f ListedSubWindow: Logging minor change. 2024-02-13 13:33:31 +01:00
Pierre-Antoine Rouby ef72ff6903 doc: Fix Pep8. 2024-02-13 11:51:45 +01:00
Pierre-Antoine Rouby 82e8b510ca Pamhyr: Close sub windows at model close. 2024-02-13 11:46:06 +01:00
Pierre-Antoine Rouby 8109ddf78f Pamhyr: Chose to close all subwindow at window close. 2024-02-13 11:43:24 +01:00
Pierre-Antoine Rouby f0f6ad17e2 Pamhyr: Add recursive window activation. 2024-02-13 11:32:16 +01:00
Pierre-Antoine Rouby 83d53a46fb Pamhyr: Add windows list recursively. 2024-02-13 11:25:53 +01:00
Pierre-Antoine Rouby a8c8e14d6a MainWindow: Add windows menu with list of windows (depth 1). 2024-02-13 11:12:25 +01:00
Pierre-Antoine Rouby e96e291ec4 Pamhyr: Add update propagation mechanism. 2024-02-13 09:23:36 +01:00
Pierre-Antoine Rouby e03ebedfdf tools: licence.el: Minor change. 2024-02-12 17:08:09 +01:00
Pierre-Antoine Rouby deaf114fa3 Pamhyr: Update licence. 2024-02-12 17:06:13 +01:00
Pierre-Antoine Rouby 0071ef22d7 Study: Add window title translate. 2024-02-12 15:43:34 +01:00
Pierre-Antoine Rouby 58924aaf3a Stricklers: Add window title translate. 2024-02-12 15:41:34 +01:00
Pierre-Antoine Rouby d6af6ce486 SP: Add window title translate. 2024-02-12 15:36:30 +01:00
Pierre-Antoine Rouby b1d0e6dc55 SL: Add windows title translate. 2024-02-12 15:34:30 +01:00
Pierre-Antoine Rouby a200adb51a RunSolver: Add windows title translate. 2024-02-12 15:18:01 +01:00
Pierre-Antoine Rouby 6ea00200b0 Results: Add window title translate. 2024-02-12 15:12:34 +01:00
Pierre-Antoine Rouby 5cf03d7ae0 Results: Minor change. 2024-02-12 15:10:47 +01:00
Pierre-Antoine Rouby 3b5fbdabd4 About: Update copyright date. 2024-02-12 15:09:53 +01:00
Pierre-Antoine Rouby 18c5d9b480 Results: Add window title translate. 2024-02-12 15:08:40 +01:00
Pierre-Antoine Rouby fe5c050c61 Reservoir: Add windows title translate. 2024-02-12 14:58:10 +01:00
Pierre-Antoine Rouby a7c56e3920 Network: Add window title translate. 2024-02-12 14:50:12 +01:00
Pierre-Antoine Rouby a519228856 LC: Add windows title translate. 2024-02-12 14:46:09 +01:00
Pierre-Antoine Rouby e1f5628a4f IC: Add windows title translate and minor change. 2024-02-12 14:41:05 +01:00
Pierre-Antoine Rouby e4eee1c29e (B)HS: Add windows title translate. 2024-02-12 14:34:33 +01:00
Pierre-Antoine Rouby 0fc5bd3c10 Geometry: Add windows title translate. 2024-02-12 14:26:40 +01:00
Pierre-Antoine Rouby 77de17d7e3 Friction: Add window title translate. 2024-02-12 14:19:31 +01:00
Pierre-Antoine Rouby 87fcf1c610 Debug, Doc: Add windows title translate. 2024-02-12 14:16:12 +01:00
Pierre-Antoine Rouby 8895d0d565 Config: Add windows title translate. 2024-02-12 14:11:02 +01:00
Pierre-Antoine Rouby 6340d9ea0b CheckList: Add window title translate. 2024-02-12 14:02:55 +01:00
Pierre-Antoine Rouby 62aaa276a7 BC: Translate window title. 2024-02-12 13:58:39 +01:00
Pierre-Antoine Rouby 0391775fed Geometry: Meshing: Add lm parameter translate. 2024-02-12 10:53:00 +01:00
Pierre-Antoine Rouby 400b743feb Geometry: Meshing: Fix pep8. 2024-02-09 17:28:29 +01:00
Pierre-Antoine Rouby 754910f514 Geometry: Meshing: Add lm options (no traduction). 2024-02-09 17:27:09 +01:00
Pierre-Antoine Rouby 614285804d Geometry: Meshing: Add "directrices". 2024-02-09 17:19:13 +01:00
Pierre-Antoine Rouby 1b22ba436b Geometry: Meshing: Add cross sections limites. 2024-02-09 17:08:29 +01:00
Pierre-Antoine Rouby 387d462c2c Geometry: Meshing: Update windows with radiobutton instead of checkbox. 2024-02-09 16:47:51 +01:00
Pierre-Antoine Rouby e6178525d7 Geometry: Add missing file. 2024-02-07 17:19:22 +01:00
Pierre-Antoine Rouby a663dc482c Meshing: Add lplan and linear to meching options. 2024-02-07 17:09:50 +01:00
Pierre-Antoine Rouby b913d76972 Meshing: Mage: Change API of mailleurTT for the next mage version. 2024-02-07 16:56:18 +01:00
Pierre-Antoine Rouby ab276db78c Meshing: Add minimal meshing option dialog. 2024-02-07 16:04:59 +01:00
Pierre-Antoine Rouby 34038d2844 README: Replace installation instruction to link to wiki documentation. 2024-02-07 14:28:04 +01:00
Pierre-Antoine Rouby c27ea5c447 Doc: wiki: Add defender message screenshot. 2024-02-07 12:00:14 +01:00
Pierre-Antoine Rouby a8c71e475e Pep8: Fix. 2024-02-07 11:26:29 +01:00
Pierre-Antoine Rouby 41673145ee Translate: Minor change. 2024-02-07 11:23:15 +01:00
Pierre-Antoine Rouby 4757c7d051 Translate: Update. 2024-02-07 11:22:22 +01:00
Pierre-Antoine Rouby 5619b98468 Solver: Run: Close checklist at solver run, resize solver window and fix empty message. 2024-02-07 10:23:02 +01:00
Pierre-Antoine Rouby 630eb98343 SL: Fix default name. 2024-02-07 10:09:18 +01:00
Pierre-Antoine Rouby 5412cb4d2d HS: Add default name. 2024-02-07 10:06:18 +01:00
Pierre-Antoine Rouby 8f46f128ff SL: Add default name. 2024-02-07 10:00:30 +01:00
Pierre-Antoine Rouby 8807d4d98b Reservoir: Add default name. 2024-02-07 09:59:22 +01:00
Pierre-Antoine Rouby 7719f5270d BC, LC: Add default name. 2024-02-07 09:57:23 +01:00
Pierre-Antoine Rouby afb4c1b61e Friction: Add id to friction and default name to stricklers. 2024-02-07 09:52:43 +01:00
Pierre-Antoine Rouby 28bea42b15 River: Add default reach at study creation. 2024-02-07 09:43:13 +01:00
Pierre-Antoine Rouby 955af412ea MainWindow: Make toolbar run launch the lasest solver used and add sc on F6. 2024-02-06 15:21:51 +01:00
Pierre-Antoine Rouby 49dd3c65e1 ci: Set tag message to release message and minor change. 2024-02-05 13:38:54 +01:00
Pierre-Antoine Rouby b2f41f88c9 ci: Minor change to fix sha256 path. 2024-02-05 13:25:19 +01:00
Pierre-Antoine Rouby f3500c7f24 ci: Add sha256 to release artefact. 2024-02-05 11:52:56 +01:00
Pierre-Antoine Rouby 1cbdc9deff ci: Disable PDF of user documentations. 2024-02-05 11:42:43 +01:00
Pierre-Antoine Rouby 89652cc080 ci: Add packages checksum. 2024-02-05 11:39:56 +01:00
Pierre-Antoine Rouby fe3f151e0b ci: Minor change. 2024-02-05 11:18:33 +01:00
Pierre-Antoine Rouby 16caae9d40 ci: Add build check. 2024-02-05 11:14:14 +01:00
Pierre-Antoine Rouby d541becb1a ci: Add antivirus check with clamav scan. 2024-02-02 11:23:39 +01:00
Pierre-Antoine Rouby 21e97d4e30 Solvers: Disable generic solver. 2024-02-02 10:25:41 +01:00
Pierre-Antoine Rouby 9fd9bd95f4 SolverParameters: Minor change. 2024-02-02 10:17:54 +01:00
Pierre-Antoine Rouby fe9c348ee0 Friction: SQL: Fix type name. 2024-01-31 09:57:58 +01:00
Pierre-Antoine Rouby 0d36ba188e Geometry: Export/Import file extention add lower case. 2024-01-31 09:37:17 +01:00
Pierre-Antoine Rouby 5a6d55c2ca MainWindow: Minor change. 2024-01-31 09:27:21 +01:00
Pierre-Antoine Rouby 36ad9562eb MainWindow: Fix save as function. 2024-01-31 09:23:50 +01:00
Pierre-Antoine Rouby bf06a9fe43 Network: Set unselected edges to black. 2024-01-31 09:12:23 +01:00
Pierre-Antoine Rouby 34c9fbd77a pamhyr: Some hot fixes... 2024-01-30 16:23:00 +01:00
Pierre-Antoine Rouby f4ca2650e5 Some hot fix. 2024-01-30 13:04:53 +01:00
Pierre-Antoine Rouby 1d0aded01d HS: input_pk hot fix. 2024-01-30 10:32:50 +01:00
Pierre-Antoine Rouby 3322bafdca MainWindow: doc: Mage: Switch odt to pdf. 2024-01-29 17:23:45 +01:00
Pierre-Antoine Rouby 6a0f66c244 Geometry: Revert previous plot display fix. 2024-01-29 16:51:49 +01:00
Pierre-Antoine Rouby 40757b949d Results: Fix axes previous line. 2024-01-29 16:37:42 +01:00
Pierre-Antoine Rouby b6c91f63f7 doc: paper: 2023: Simhydro: Add the PDF version of paper preprint. 2024-01-29 16:14:16 +01:00
Pierre-Antoine Rouby e36206b436 ci: Add mage documentation. 2024-01-29 15:55:15 +01:00
Pierre-Antoine Rouby 797a853b36 Solver: Mage: Fix pep8. 2024-01-29 15:46:08 +01:00
Pierre-Antoine Rouby bdc5e35453 HS: Fix input_kp type for export. 2024-01-29 15:43:28 +01:00
Pierre-Antoine Rouby 1bd05ee1c2 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-26 17:02:09 +01:00
Pierre-Antoine Rouby dc406147df Doc: Tuto1: Fix HS images without description. 2024-01-26 17:02:00 +01:00
Theophile Terraz 87fa63d8f9 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-26 16:23:52 +01:00
Theophile Terraz 2355a14a0c debug TD 2024-01-26 16:23:44 +01:00
Pierre-Antoine Rouby 69e94e978c Geometry: Fix plot update at meshing. 2024-01-26 15:40:35 +01:00
Pierre-Antoine Rouby 97fafe9b9b Geometry: Reach: Fix pep8. 2024-01-26 14:35:04 +01:00
Pierre-Antoine Rouby 312abc9501 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-26 14:27:41 +01:00
Pierre-Antoine Rouby ca8c7a23fd MainWindow: Put results menu in model action list. 2024-01-26 14:27:08 +01:00
Pierre-Antoine Rouby 9d69d60ea8 Results: Catch some possible execption where results is empty. 2024-01-26 14:16:46 +01:00
Theophile Terraz 7ab6db184d update tuto 2024-01-26 12:09:56 +01:00
Pierre-Antoine Rouby e72d06bf6f Geometry: Fix some update error. 2024-01-26 11:53:51 +01:00
Pierre-Antoine Rouby fbf342f1ad MainWindow: Use 'default-mage' (if exists) in case of last solver is not found. 2024-01-26 10:03:04 +01:00
Pierre-Antoine Rouby 699e174b3d Merge branch 'master' with fix #32. 2024-01-26 09:34:59 +01:00
Pierre-Antoine Rouby 48f6c09436 Results: Fix profile list update at reach selection. 2024-01-26 09:32:05 +01:00
Lionel Penard bab2c33e38 Corrections to French translation 2024-01-25 08:51:35 +01:00
Pierre-Antoine Rouby c725e15015 Solver: Mage: Fix pep8. 2024-01-24 17:15:08 +01:00
Pierre-Antoine Rouby 3bad91ec37 doc: users: Tuto: Add context pdf and '.pamhyr' files. 2024-01-24 17:12:55 +01:00
Theophile Terraz ceaab3c2fc Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-24 17:06:11 +01:00
Theophile Terraz e183c5d1de mend
work on tuto1
2024-01-24 17:03:32 +01:00
Theophile Terraz dc73213bee work on tuto1 2024-01-24 16:58:54 +01:00
Theophile Terraz 2ed57fbbe0 work on tuto1 2024-01-24 16:58:30 +01:00
Pierre-Antoine Rouby 4de04d1af8 Solver: Mage: Fix comment for ST file header. 2024-01-24 16:46:03 +01:00
Pierre-Antoine Rouby 7ae64d390f Solver: Mage: Fix read bin. 2024-01-24 16:16:13 +01:00
Pierre-Antoine Rouby f56d87f648 Meshing: Mage: Fix profiles purge. 2024-01-24 15:58:05 +01:00
Pierre-Antoine Rouby 6c65d84d5e Checker: Geometry: Set minimal profiles number to 2. 2024-01-24 15:47:27 +01:00
Pierre-Antoine Rouby 490b5466da Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-24 15:27:02 +01:00
Theophile Terraz 3805cc9932 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-24 15:26:35 +01:00
Theophile Terraz b56172328e debug 2024-01-24 15:26:33 +01:00
Pierre-Antoine Rouby e4a012b5a3 Meshing: Mage: Fix mailleurTT. 2024-01-24 15:26:18 +01:00
Pierre-Antoine Rouby 3dfdc308e3 HS: Fix HS KP is missing at display update. 2024-01-24 15:12:39 +01:00
Pierre-Antoine Rouby 14a2abaebd Meshing: Mage: Fix pep8. 2024-01-24 15:05:28 +01:00
Pierre-Antoine Rouby d0afd0ed74 Geometry: Fix division by 0 for incline. 2024-01-24 15:00:31 +01:00
Pierre-Antoine Rouby 473aac4500 Meshing: Define meshing with MailleurTT. 2024-01-24 14:51:19 +01:00
Pierre-Antoine Rouby ad59afc4f5 MainWindow: Fix pep8. 2024-01-24 11:46:30 +01:00
Pierre-Antoine Rouby 3be2973032 ci: Update mage version. 2024-01-24 11:45:07 +01:00
Pierre-Antoine Rouby b5a3ee7568 doc: Delete user documentation and use gitlab wiki instead. 2024-01-24 11:41:30 +01:00
Pierre-Antoine Rouby aad7d75fa6 ci: Minor fix. 2024-01-24 11:22:37 +01:00
Pierre-Antoine Rouby 70f1581a3b Packages: Add TP charriage. 2024-01-24 11:12:31 +01:00
Pierre-Antoine Rouby 641003ded4 Doc: Users: TP: Add TP charriage. 2024-01-24 11:08:40 +01:00
Pierre-Antoine Rouby 28526d8f91 Solver: Mage: Fix pep8. 2024-01-24 10:46:07 +01:00
Pierre-Antoine Rouby 416a807e5d Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-24 10:44:58 +01:00
Lionel Penard e723b56e18 Typos tuto1 and French translation 2024-01-24 10:43:04 +01:00
Pierre-Antoine Rouby 67b76a3113 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-24 10:41:36 +01:00
Pierre-Antoine Rouby 1169f3cc94 Geometry: ui: Minor change. 2024-01-24 10:26:22 +01:00
Pierre-Antoine Rouby 82ab7b5429 HS: Basic: Display set type question only if previous type is not ND. 2024-01-24 10:22:58 +01:00
Lionel Penard 9b3a281e35 Typos tuto1 and French translation 2024-01-24 09:50:58 +01:00
Theophile Terraz 00f0e39eda Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-23 17:39:20 +01:00
Theophile Terraz 1e7e5b0328 debug mesh 2024-01-23 17:39:10 +01:00
Lionel Penard 8afd5023e9 merge french tuto1 2024-01-23 17:07:28 +01:00
Lionel Penard 100003ad90 Update english and create french version of tuto1 2024-01-23 16:57:26 +01:00
Pierre-Antoine Rouby 7fd6e4469b HS: Basic: Add CheckValve hydraulic structure and VAR export. 2024-01-23 16:56:24 +01:00
Pierre-Antoine Rouby 793289dd80 Tuto: Add ci tuto building. 2024-01-23 16:08:35 +01:00
Theophile Terraz ab10970025 add png to tuto1 2024-01-23 15:24:05 +01:00
Pierre-Antoine Rouby 3c9eccdfab Solver: Mage: Fix <list>.node error. 2024-01-23 11:30:34 +01:00
Pierre-Antoine Rouby 6c4636917a README: Update install from source. 2024-01-23 10:31:31 +01:00
Pierre-Antoine Rouby 56b170d767 README: Minor change. 2024-01-23 09:35:03 +01:00
Pierre-Antoine Rouby 318f6e9965 Geometry: Fix pep8. 2024-01-22 16:04:32 +01:00
Pierre-Antoine Rouby 63f7095508 Geometry: Activate export to file. 2024-01-22 15:28:42 +01:00
Pierre-Antoine Rouby 1965782348 Traduction: Update. 2024-01-22 14:44:56 +01:00
Pierre-Antoine Rouby a54bf30c3d Traduction: Update. 2024-01-22 11:58:33 +01:00
Pierre-Antoine Rouby 1e245004c9 Translation: Solver parameters: Add translate for mage solver parameters. 2024-01-22 11:03:49 +01:00
Pierre-Antoine Rouby 03c3c37435 Solver, Meshing: Mage: Add some exit condition. 2024-01-22 10:53:00 +01:00
Pierre-Antoine Rouby 19ad9c4d1a Config: Minor change. 2024-01-19 16:16:26 +01:00
Pierre-Antoine Rouby c183e5016c Pamhyr: Fix tests and pep8. 2024-01-19 15:54:28 +01:00
Pierre-Antoine Rouby 4790b9c071 River: Fix node and edges artefact deletions at data saves. 2024-01-19 15:49:54 +01:00
Pierre-Antoine Rouby 770bb5f96f Config: Fix version updater. 2024-01-19 14:22:38 +01:00
Pierre-Antoine Rouby 6319ac9310 Geometry: Handle exception for meshing tool. 2024-01-19 11:51:48 +01:00
Pierre-Antoine Rouby b6f0c6f49a tests: Add a mage meshingtool test. 2024-01-19 11:20:53 +01:00
Pierre-Antoine Rouby 486ff5c239 Mainwindow: Minor change. 2024-01-19 10:35:36 +01:00
Pierre-Antoine Rouby 73475220e9 Mainwindow: Add action to open results from a file. 2024-01-19 10:08:30 +01:00
Pierre-Antoine Rouby 852a3f58ff Checker: Mage: Add guidelines checker. 2024-01-17 15:26:21 +01:00
Pierre-Antoine Rouby 8b8aff7df1 Frictions: Fix none assiciated stricklers at save/load. 2024-01-17 14:42:20 +01:00
Pierre-Antoine Rouby e86111bd7a Solver: Mage: Fix empty HS error and space in input param. 2024-01-17 11:23:49 +01:00
Pierre-Antoine Rouby 870cba5005 Geometry: Fix width_approximation when rg and rd is missing. 2024-01-17 11:02:44 +01:00
Pierre-Antoine Rouby c5df959210 doc: wiki: Add annotation. 2024-01-16 15:43:15 +01:00
Pierre-Antoine Rouby 631e52b486 doc: wiki: Results add image. 2024-01-16 15:33:52 +01:00
Pierre-Antoine Rouby 5e32082fcf doc: wiki: Running solver images. 2024-01-16 14:57:17 +01:00
Pierre-Antoine Rouby 8834afa4f3 Geometry: Allow to copy point with floating point string format '*,*'. 2024-01-16 14:20:48 +01:00
Pierre-Antoine Rouby 0d88b954d8 pep8: Minor change. 2024-01-16 14:12:30 +01:00
Pierre-Antoine Rouby 46602227af Results: Fix play button image file path. 2024-01-16 14:10:56 +01:00
Pierre-Antoine Rouby 99fe5e8f74 Results: Fix results reading before solver running... (again) 2024-01-16 14:05:29 +01:00
Pierre-Antoine Rouby 9e9f56ee65 HS: Resize window and add screenshot for wiki. 2024-01-16 11:06:57 +01:00
Pierre-Antoine Rouby cf53985fed Geometry: Remove some warning when profile not fully defined. 2024-01-16 09:05:27 +01:00
Pierre-Antoine Rouby 0ace259d2d Meshing: Mage: Fix libbief extention under windows system. 2024-01-15 17:08:46 +01:00
Pierre-Antoine Rouby f73b9b06c0 HS: Basic: Translate minor change. 2024-01-15 16:37:29 +01:00
Pierre-Antoine Rouby 906ed801c7 translate: Update HS and minor change. 2024-01-15 16:35:19 +01:00
Pierre-Antoine Rouby 975f2027ed HS: Basic: Rename all HS to english and add translation. 2024-01-15 15:15:05 +01:00
Pierre-Antoine Rouby 22f3823699 pep8: Minor change. 2024-01-15 14:09:00 +01:00
Pierre-Antoine Rouby c81dfb3ccc windows: Fix posix color on windows terminal. 2024-01-15 14:04:30 +01:00
Pierre-Antoine Rouby 2c8c2699ef Geometry: Fix point paste command. 2024-01-15 13:56:58 +01:00
Pierre-Antoine Rouby 7fd570c5a7 Network: Add tests and minor change. 2024-01-12 15:01:23 +01:00
Pierre-Antoine Rouby 76ab3114f0 doc: wiki: Add numerical params window image. 2024-01-10 15:30:42 +01:00
Pierre-Antoine Rouby 76975a85e0 doc: wiki: Add reservoir images. 2024-01-10 15:09:43 +01:00
Pierre-Antoine Rouby 7b9c725f04 doc: wiki: Add sediment images. 2024-01-10 10:48:33 +01:00
Pierre-Antoine Rouby 6fea7baea2 Geometry: Minor change. 2024-01-10 10:15:30 +01:00
Pierre-Antoine Rouby 9c2b2033ec doc: wiki: Add IC window images. 2024-01-10 09:41:16 +01:00
Pierre-Antoine Rouby f67b7c6f60 doc: wiki: Add BC images. 2024-01-09 16:41:04 +01:00
Pierre-Antoine Rouby fb0f1ad866 doc: wiki: Add frictions windows images. 2024-01-09 16:01:05 +01:00
Pierre-Antoine Rouby 2b1fa93ebe doc: wiki: Add geometry window. 2024-01-09 15:09:15 +01:00
Pierre-Antoine Rouby e3140763ba doc: wiki: Update network image. 2024-01-09 14:50:44 +01:00
Pierre-Antoine Rouby e60b388930 doc: wiki: Add network window image. 2024-01-09 14:20:57 +01:00
Pierre-Antoine Rouby f4914934f2 doc: wiki: Add new study window image. 2024-01-09 14:03:40 +01:00
Pierre-Antoine Rouby 7115632d30 ci: Fix images copy command. 2024-01-09 11:59:14 +01:00
Pierre-Antoine Rouby 52112a5413 doc: wiki: Add images for the wiki documentation. 2024-01-09 11:44:41 +01:00
Pierre-Antoine Rouby 07798bbf46 Config: Disable meshing tools tab and add some self documentation for solver command line. 2024-01-09 10:53:49 +01:00
Pierre-Antoine Rouby 134c66d51c Geometry: Fix pep8. 2024-01-09 10:20:34 +01:00
Pierre-Antoine Rouby 84cf693528 HS: Add HS name on BHS edit window title. 2024-01-09 09:20:08 +01:00
Pierre-Antoine Rouby 7ef2df8535 Geometry: Window update minor change. 2024-01-08 17:27:12 +01:00
Pierre-Antoine Rouby 4d95e42d20 Geometry: Make import button an undo command. 2024-01-08 17:11:10 +01:00
Pierre-Antoine Rouby 30702cb118 Geometry: Fixed #29 with a hacky solution. 2024-01-08 16:30:56 +01:00
Pierre-Antoine Rouby e930bcaa91 Package: Add windows 'libbief.dll'. 2024-01-08 15:46:47 +01:00
Pierre-Antoine Rouby 1e2432e298 Package: Update mage version. 2024-01-08 15:35:58 +01:00
Pierre-Antoine Rouby 1243b2dc88 Meshing: Mage: Fix pep8. 2024-01-08 15:27:23 +01:00
Pierre-Antoine Rouby f2b97b68bd Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2024-01-08 15:20:06 +01:00
Pierre-Antoine Rouby 2149fa0dcb IC: Change generate button text. 2024-01-08 15:15:50 +01:00
Pierre-Antoine Rouby 6293c6206c IC: Generator dialog text and size. 2024-01-08 15:13:24 +01:00
Theophile Terraz f451731877 add point number in profiles table for geometry 2023-12-21 15:57:36 +01:00
Theophile Terraz d74c78eff5 get GL order for meshing 2023-12-21 15:56:59 +01:00
Theophile Terraz af347349e1 add purge after interpolation 2023-12-21 14:56:56 +01:00
Theophile Terraz 2f47b190ac improve interpolation 2023-12-20 17:56:43 +01:00
Pierre-Antoine Rouby 655982e908 Geometry: Make meshing method to undo command. 2023-12-20 14:36:41 +01:00
Theophile Terraz 82eba020ac Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-12-20 14:11:26 +01:00
Pierre-Antoine Rouby eb65ce4c1b Meshing: Mage: Fix so file path for packages. 2023-12-20 12:13:28 +01:00
Pierre-Antoine Rouby 691ec4f3bd pep8: Minor fix. 2023-12-20 12:05:37 +01:00
Pierre-Antoine Rouby c1069adc2f packages: Add libbief. 2023-12-20 11:59:04 +01:00
Pierre-Antoine Rouby 097b5eb7fc Geometry: Add meshing action with mage internal meshing functions. 2023-12-20 11:36:46 +01:00
Pierre-Antoine Rouby e965e2b4c1 Script: Meshing: Minor change. 2023-12-20 10:53:48 +01:00
Theophile Terraz d81f341303 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-12-20 10:43:40 +01:00
Pierre-Antoine Rouby 1ea6fd7c54 Script: Fix missing files and minor change. 2023-12-20 09:45:11 +01:00
Theophile Terraz 3025c995b6 bords ponts Tuto1 2023-12-20 09:38:37 +01:00
Theophile Terraz ecc75c45eb Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-12-20 09:37:34 +01:00
Pierre-Antoine Rouby 09dcf486d8 Script: Add mage meshing tool. 2023-12-19 17:28:34 +01:00
Pierre-Antoine Rouby 592c1e5dbc MainWindow: Minor fix of file name '.pamhyr' detection. 2023-12-19 11:59:21 +01:00
Pierre-Antoine Rouby cd3baf2870 Results, RunSolver: Stop timer at window close. 2023-12-19 09:45:05 +01:00
Pierre-Antoine Rouby 93734ff1b9 SolverRun: Try catch read results. 2023-12-19 09:17:26 +01:00
Pierre-Antoine Rouby dfb7d37cfb Results: Resize window to respect 16:9. 2023-12-19 09:11:28 +01:00
Pierre-Antoine Rouby 83aa6a5791 Results, Plots: Fix icon paths. 2023-12-19 09:11:01 +01:00
Pierre-Antoine Rouby 45f020edaa Solver: Fix install dir path. 2023-12-19 08:52:24 +01:00
Pierre-Antoine Rouby ad1c5c487e mage: Update mage version. 2023-12-18 17:22:55 +01:00
Theophile Terraz 5c323b28e2 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-12-18 16:15:22 +01:00
Theophile Terraz da2250df3a work on tuto 2023-12-18 16:15:19 +01:00
Pierre-Antoine Rouby cb1d6b4db7 pep8: Minor fixes. 2023-12-18 15:44:49 +01:00
Pierre-Antoine Rouby f96cee145c HS: Fix Plot relim at update. 2023-12-18 15:37:22 +01:00
Pierre-Antoine Rouby e4670e4a4d Results: Add current timestamps on hydrograph. 2023-12-18 15:28:22 +01:00
Pierre-Antoine Rouby 5c0f90b43e Results: Fix sl results display. 2023-12-18 15:11:56 +01:00
Pierre-Antoine Rouby e6de528b7f Mage: Update mage gra file reader for mage 83. 2023-12-18 14:56:16 +01:00
Pierre-Antoine Rouby dfff8d2fcb Geometry: Copy disable headers. 2023-12-18 11:26:58 +01:00
Pierre-Antoine Rouby 33a1fd2b52 Geometry: Profile copy/paste minor change. 2023-12-18 11:17:16 +01:00
Pierre-Antoine Rouby f083b7f6ef Geometry: Fix copy/paste command. 2023-12-18 10:44:11 +01:00
Pierre-Antoine Rouby 25de73812b Config: Fix reopen latest study. 2023-12-18 10:25:24 +01:00
Pierre-Antoine Rouby 6b232d2971 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-18 10:14:24 +01:00
Theophile Terraz 9c0ffa8356 add option to let Mage generate initial condition 2023-12-15 15:36:17 +01:00
Pierre-Antoine Rouby ffbd2e2413 Mage: Minor code style refactoring. 2023-12-13 16:44:44 +01:00
Pierre-Antoine Rouby 58300b8c1a Mage: Minor indent fixes. 2023-12-13 16:31:57 +01:00
Pierre-Antoine Rouby cd2fda8224 HS, Mage: Rewrite some code for coding style. 2023-12-13 16:30:18 +01:00
Pierre-Antoine Rouby 73ae571de1 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-13 16:01:23 +01:00
Pierre-Antoine Rouby 7aee4c64a3 Solver: Fix running pipeline. 2023-12-13 15:57:47 +01:00
Pierre-Antoine Rouby c3cae35de4 pep8: Fixes code style. 2023-12-13 14:53:58 +01:00
Pierre-Antoine Rouby 2736d2f399 SolverRun: Keep in configuration the last solver name used. 2023-12-13 14:48:01 +01:00
Pierre-Antoine Rouby 00afc6c06b SolverRun: Fix bin/gra reading before solver running. 2023-12-13 14:30:29 +01:00
Theophile Terraz 4eefa88490 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-13 11:45:01 +01:00
Theophile Terraz 92e54bf11e work on Mage export 2023-12-13 11:44:56 +01:00
Pierre-Antoine Rouby c11350d49a HS: Fix basic HS previous data delete at save. 2023-12-13 11:04:51 +01:00
Pierre-Antoine Rouby 8f5fb4cc3b Geometry: Profile: Some fixes. 2023-12-13 10:36:13 +01:00
Pierre-Antoine Rouby fc7a7bb7fd HS: Fix update relim in PlotAC and PlotKPC. 2023-12-13 10:07:46 +01:00
Pierre-Antoine Rouby 5a1c363e8a IC: Fix reach reference at loading in case of multiple reach. 2023-12-13 09:42:47 +01:00
Theophile Terraz 77a6da3024 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-12 16:35:24 +01:00
Theophile Terraz c4a66281f6 debug output SIN 2023-12-12 16:35:17 +01:00
Pierre-Antoine Rouby 7ffc2482fc HS: Minor fixes. 2023-12-12 16:21:47 +01:00
Pierre-Antoine Rouby f37da68a67 HS: Basic: Minor fixes. 2023-12-12 16:08:04 +01:00
Theophile Terraz f64ed131f9 work on BHS 2023-12-12 16:00:40 +01:00
Theophile Terraz 79b31e8d08 merge 2023-12-12 15:40:54 +01:00
Theophile Terraz d1c8e3e4f5 debug SIN output 2023-12-12 15:39:43 +01:00
Theophile Terraz c253ad832d ajout ouvrages mage 2023-12-12 14:57:23 +01:00
Pierre-Antoine Rouby 6081b09267 pep8: Fixes. 2023-12-12 14:53:00 +01:00
Pierre-Antoine Rouby 592c2c9a72 HS: Minor fix. 2023-12-12 14:44:58 +01:00
Pierre-Antoine Rouby ce45776a63 HS: Basic: Fix load sql request. 2023-12-12 14:30:04 +01:00
Pierre-Antoine Rouby 02bbdf9fda HS: Basic: Add parameters table and fix save/load sql methods. 2023-12-12 14:23:36 +01:00
Pierre-Antoine Rouby 6c9e90ceaf MainWindow: Add progress dialog for save as method. 2023-12-12 13:39:38 +01:00
Pierre-Antoine Rouby b99be5a280 MainWindow: Remove cancel button. 2023-12-12 13:35:13 +01:00
Pierre-Antoine Rouby 1acd582de9 MainWindow: Add progress dialog for save process. 2023-12-12 11:57:19 +01:00
Pierre-Antoine Rouby 8ce5a4d215 Network: Change selected reach color and minor change. 2023-12-12 10:51:25 +01:00
Pierre-Antoine Rouby ccb55ff4e1 HS: Fix pep8 and minor change. 2023-12-12 10:22:52 +01:00
Pierre-Antoine Rouby 3ef4b40558 HS: Basic: Add question for BHS type change. 2023-12-12 10:13:10 +01:00
Pierre-Antoine Rouby c667d94e84 HS: Basic: Fix delete undo command. 2023-12-12 09:43:54 +01:00
Pierre-Antoine Rouby 1b601460e6 HS: Basic: Make enabled undo command. 2023-12-12 09:32:05 +01:00
Theophile Terraz 7db65f127e work on hydraulic structures 2023-12-11 16:53:53 +01:00
Theophile Terraz f302e18d71 dirty work on BHS 2023-12-11 15:44:31 +01:00
Theophile Terraz 352c0beb27 add short dict and getter in HS 2023-12-11 15:29:02 +01:00
Theophile Terraz d6561ab44d merge 2023-12-11 15:27:53 +01:00
Pierre-Antoine Rouby 5d9b6f99c6 HS: Fix case with no profile kp. 2023-12-11 15:20:46 +01:00
Pierre-Antoine Rouby 163a842384 HS: Refacto update function and fix NA value at table data set. 2023-12-11 15:19:24 +01:00
Pierre-Antoine Rouby eea355a784 pep8: Change to respect pep8 code style. 2023-12-11 14:40:54 +01:00
Pierre-Antoine Rouby 1ab1cb37b0 HS: Create a enabled undo command. 2023-12-11 11:55:27 +01:00
Theophile Terraz be19a11387 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-11 11:20:51 +01:00
Theophile Terraz 062743d748 enable edit window 2023-12-11 11:20:47 +01:00
Pierre-Antoine Rouby ac2a2002b7 HS: Fix checkbox state at undo add command. 2023-12-11 11:12:57 +01:00
Pierre-Antoine Rouby 6951b82339 Friction: Delete useless prints. 2023-12-11 11:12:41 +01:00
Pierre-Antoine Rouby e41c23120a HS: Minor fix add method. 2023-12-11 11:00:14 +01:00
Theophile Terraz 4c5281ea30 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-06 16:55:34 +01:00
Theophile Terraz 7b7ba2eb37 add hydraulic structures plots 2023-12-06 16:55:27 +01:00
Pierre-Antoine Rouby 4a43653d7f HydraulicStructure: Fix KP db type. 2023-12-06 14:49:50 +01:00
Pierre-Antoine Rouby 0307927fa9 PamhyrTable: Fix editable column. 2023-12-06 14:15:47 +01:00
Pierre-Antoine Rouby db11c9d968 Geometry: Resize window to respect 16:9 ratio. 2023-12-06 11:44:09 +01:00
Pierre-Antoine Rouby d85e5c4666 PamhyrDialog: Fix window list delete whene dialog is done. 2023-12-06 11:30:09 +01:00
Pierre-Antoine Rouby 45ee8a9662 Friction: Fix load method in case of multiple reaches. 2023-12-06 11:05:55 +01:00
Pierre-Antoine Rouby 5ab06dbe51 HydraulicStructure: Fix db export. 2023-12-06 09:20:18 +01:00
Theophile Terraz d73e901a96 work on hydraulic structures window 2023-12-05 16:46:50 +01:00
Theophile Terraz c17e39e3cf Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-05 15:14:19 +01:00
Pierre-Antoine Rouby af4cce96ef HydraulicStructure: Rename enable to enabled. 2023-12-05 14:02:10 +01:00
Pierre-Antoine Rouby 0a780e5f78 HydraulicStructure: Minor change and fixes. 2023-12-05 11:56:14 +01:00
Pierre-Antoine Rouby fb2b1f680f HydraulicStructures: Add Model files. 2023-12-05 11:13:52 +01:00
Theophile Terraz 6957986632 add hydraulic structures view files 2023-12-05 09:41:15 +01:00
Theophile Terraz 13d23502a9 Merge branch 'master' into hydraulics-structure 2023-12-04 17:41:39 +01:00
Theophile Terraz 5fa888768e add hydraulic structures ui 2023-12-04 17:41:06 +01:00
Theophile Terraz 07451899c4 export mage SIN file 2023-12-04 17:38:25 +01:00
Theophile Terraz 2aa693e4ae modif sections sliders 2023-12-04 09:35:02 +01:00
Theophile Terraz ff480fb593 add first and last button (visu) 2023-12-04 09:14:35 +01:00
Theophile Terraz d6753dc986 upgrade results slider 2023-12-01 18:37:36 +01:00
Theophile Terraz 2d2484d8fa change colors 2023-12-01 15:51:40 +01:00
Theophile Terraz bb97f1977b debug 2023-12-01 15:51:13 +01:00
Theophile Terraz eb26eba131 optim visu 2023-12-01 14:05:00 +01:00
Theophile Terraz 2d3e214514 debug 2023-12-01 14:04:46 +01:00
Theophile Terraz 894a7c8477 speed up View/Results/PlotXY 2023-11-30 15:06:39 +01:00
Theophile Terraz 21197ead23 work on vater limits for top view visualization 2023-11-30 15:06:00 +01:00
Theophile Terraz d79a0cc973 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 17:10:30 +01:00
Theophile Terraz a55669d181 modif INI format 2023-11-29 17:10:27 +01:00
Pierre-Antoine Rouby 2fd44fbfb4 IC: Fix data sorting at the end of generation. 2023-11-29 16:52:01 +01:00
Pierre-Antoine Rouby 962bfa945d Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 16:41:53 +01:00
Pierre-Antoine Rouby 65c1163a55 Reservoir: Allow to select only internal node. 2023-11-29 16:41:05 +01:00
Theophile Terraz 8d67442ca3 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 15:26:22 +01:00
Theophile Terraz f7d2ac8b86 traduction 2023-11-29 15:26:11 +01:00
Pierre-Antoine Rouby 4f91de4c97 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr. 2023-11-29 14:49:02 +01:00
Pierre-Antoine Rouby 37b04961f1 IC: Add Manning/Strickler equation for IC approximation. 2023-11-29 14:47:35 +01:00
Theophile Terraz 0a63f16f62 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 14:34:11 +01:00
Theophile Terraz 92eb729a39 add Reservoirs 2023-11-29 14:34:06 +01:00
Pierre-Antoine Rouby d891c9783d Model: Fix possible data removing durring save. 2023-11-27 16:58:46 +01:00
Pierre-Antoine Rouby 51858597cd Mage: ST export minor change. 2023-11-27 14:49:42 +01:00
Pierre-Antoine Rouby 8b3baf433f Solver run: Used merged channels to get stderr. 2023-11-27 14:31:04 +01:00
Pierre-Antoine Rouby 12e3d779c6 Mage: Fix BC export when node is not associate. 2023-11-27 11:40:59 +01:00
Pierre-Antoine Rouby c6274890a7 BC: Rename some BC types. 2023-11-27 11:29:39 +01:00
Theophile Terraz 907fc0c53a add step-by-step tutorial 2023-11-27 09:44:57 +01:00
Pierre-Antoine Rouby b4ee76416e BC, LC: Disable time delegate (fix #23). 2023-11-27 09:37:23 +01:00
Pierre-Antoine Rouby a88b42a8ef BC: Fix get_assoc_to_node in case of no results. 2023-11-27 09:21:23 +01:00
Pierre-Antoine Rouby 08f01aee69 Network: Fix #22. 2023-11-27 09:12:31 +01:00
Pierre-Antoine Rouby c69cbdb34e BC: Make node association unique (#25). 2023-11-27 08:55:38 +01:00
Pierre-Antoine Rouby 01fd7dbec8 Pamhyr2: Fix some type compare. 2023-11-22 15:47:57 +01:00
Pierre-Antoine Rouby 2af9b0018c SQL: Minor change. 2023-11-22 15:39:21 +01:00
Pierre-Antoine Rouby 7f8e8d5a9f SQL: Minor change and add exception handler. 2023-11-22 14:58:03 +01:00
Pierre-Antoine Rouby c9887a97e7 Friction: Disable name column because the value is not in database. 2023-11-22 10:20:50 +01:00
Pierre-Antoine Rouby 1a708921e3 BC: Fix #13 paste undo command. 2023-11-22 10:02:25 +01:00
Pierre-Antoine Rouby 9fe1b35a59 IC: Fix profile side effect on IC generator. 2023-11-21 16:06:37 +01:00
Pierre-Antoine Rouby edf744eee1 Geometry: Fix profiles list sorting. 2023-11-21 14:24:31 +01:00
Pierre-Antoine Rouby e400980103 Frictions: Fix plot drawing crash. 2023-11-21 11:07:36 +01:00
Pierre-Antoine Rouby b12e935a5d Geometry: Fix some translate. 2023-11-21 10:45:00 +01:00
Pierre-Antoine Rouby 1d4422e9c5 MainWindow: Disable window maximized. 2023-11-21 10:38:35 +01:00
Pierre-Antoine Rouby 1a10da9c89 MainWindow: Fix translate and re organize UI. 2023-11-21 10:36:13 +01:00
Pierre-Antoine Rouby 470eae8b92 pamhyr: Fix #20 study reload whene study is not saved on a file. 2023-11-21 09:26:57 +01:00
Pierre-Antoine Rouby 9b53b4302b BC,IC: Enable to get time int from float string (fix #21). 2023-11-21 09:11:35 +01:00
Pierre-Antoine Rouby 461202219d Window: Fix paste delimiter. 2023-11-20 17:29:37 +01:00
Pierre-Antoine Rouby ddfaa3a73f git: Add pip requirements. 2023-11-20 16:35:32 +01:00
Pierre-Antoine Rouby 3e531130fe Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-20 16:16:24 +01:00
Pierre-Antoine Rouby 595eb29c42 BC: Fix long type translate crash. 2023-11-20 16:15:43 +01:00
Pierre-Antoine Rouby ccbbc83502 IC: Fix sql_save as generator value type. 2023-11-20 16:10:10 +01:00
Pierre-Antoine Rouby fd0a8ddf51 BC: Fix paste command. 2023-11-20 15:55:57 +01:00
Pierre-Antoine Rouby ce5808e3ce Geometry: Fix delete profiles. 2023-11-20 15:38:52 +01:00
Pierre-Antoine Rouby 4dafa345b4 Geometry: Fix delete command crash. 2023-11-20 15:37:07 +01:00
Theophile Terraz 90776f0af9 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-02 16:44:02 +01:00
Theophile Terraz 32777456b9 add scripts to use Mascaret 2023-11-02 16:43:57 +01:00
Pierre-Antoine Rouby dcaa7fafbd tools: Fix PEP8. 2023-10-30 09:30:16 +01:00
Pierre-Antoine Rouby 17eb3e8184 tools: parser: Minor change and tests fixes. 2023-10-27 17:21:09 +02:00
Pierre-Antoine Rouby 7bbca7cf54 unittests: Add parse tests for ' quote. 2023-10-27 15:10:16 +02:00
Pierre-Antoine Rouby 3c738ebcb9 Solver: Mage: Fix profile sediment export. 2023-10-27 14:32:51 +02:00
Pierre-Antoine Rouby 6522cea03f pamhyr: Set axis label color to 'black' instead 'green'. 2023-10-27 14:23:55 +02:00
Pierre-Antoine Rouby ea2dbfba3e pamhyr: Rename '_sql_*' function to '_db_*'. 2023-10-27 14:15:42 +02:00
Pierre-Antoine Rouby 8d92fbbdac pamhyr: Delete useless '__init__.py' file. 2023-10-27 14:13:01 +02:00
Pierre-Antoine Rouby 77f06aaa07 tools: Time the parser function. 2023-10-27 11:53:00 +02:00
Pierre-Antoine Rouby b79c5b30c0 tests: Add tests for flatten function. 2023-10-27 11:50:36 +02:00
Pierre-Antoine Rouby fdac834d48 Tests: Fix pep8. 2023-10-27 11:34:11 +02:00
Pierre-Antoine Rouby 4355be1a9c Solver: Mage: Split ST export function. 2023-10-27 11:31:20 +02:00
Pierre-Antoine Rouby 66f6d3505b Solver: CommandLine: Fix path replace. 2023-10-27 11:15:58 +02:00
Pierre-Antoine Rouby 65c261887c Tools: Command line parser: Add a test. 2023-10-27 11:14:10 +02:00
Pierre-Antoine Rouby 6c794d2eb4 Solver: Refactoring command line parser and add unittest. 2023-10-27 11:05:16 +02:00
Pierre-Antoine Rouby 51c912f3a8 Solver: Code refactoring. 2023-10-27 09:33:32 +02:00
Pierre-Antoine Rouby 76e90f417e Script: Fix pep8. 2023-10-24 15:26:55 +02:00
Pierre-Antoine Rouby e556bcff54 Script: Add script command list solver. 2023-10-24 15:13:35 +02:00
Pierre-Antoine Rouby 4833685e2e Script: Add run/export script. 2023-10-24 15:05:05 +02:00
Pierre-Antoine Rouby 2d7681086d ci: Add configure stage. 2023-10-24 11:11:34 +02:00
Pierre-Antoine Rouby f44ac69d68 ci: Change stages order (tests before build). 2023-10-24 10:58:22 +02:00
Pierre-Antoine Rouby 32684af292 tests: Minor change. 2023-10-24 10:56:23 +02:00
Pierre-Antoine Rouby 862ec88191 tests: Add test script and fix pep8 in unittest. 2023-10-24 10:48:54 +02:00
Pierre-Antoine Rouby d36a9cd340 tests: Fix test env path. 2023-10-24 10:43:33 +02:00
Pierre-Antoine Rouby afafbb0c5e tests: Add unittest for Model and minor change. 2023-10-24 10:38:34 +02:00
Pierre-Antoine Rouby e3f01b575a Solver: Mage: Fix minor in ST file export. 2023-10-23 10:31:59 +02:00
Pierre-Antoine Rouby d6924998d9 Results: CustomPlot: Fix pep8. 2023-10-20 17:25:36 +02:00
Pierre-Antoine Rouby 0ae5c02ea0 Friction: Fix open stricker edit. 2023-10-20 17:20:03 +02:00
Pierre-Antoine Rouby e395f9f575 BC, LC: Fix sub window open. 2023-10-20 17:16:37 +02:00
Pierre-Antoine Rouby f074e1fdf2 Geometry: Fix profile sub window open. 2023-10-20 17:01:28 +02:00
Pierre-Antoine Rouby 4d1eb0fecc View: Fix results window open. 2023-10-20 16:57:32 +02:00
Pierre-Antoine Rouby f5fdde9a5d Merge branch 'results-custom-plot'. 2023-10-20 16:51:26 +02:00
Pierre-Antoine Rouby 32aa5bece5 Results: CustomPlot: Add legend and change axes label fontsize for each plot. 2023-10-20 16:48:21 +02:00
Pierre-Antoine Rouby cdfb867037 Results: CustomPlot: Add custom time axes. 2023-10-20 16:27:07 +02:00
Pierre-Antoine Rouby 021971816a Results: CustomPlot: Implement plot with time on y axes. 2023-10-20 15:09:24 +02:00
Pierre-Antoine Rouby e4386e20a3 Network: Fix item selection. 2023-10-20 11:45:28 +02:00
Pierre-Antoine Rouby 8760cd364d Pamhyr: Implement window duplication deny mechanism with hash (#7). 2023-10-20 10:48:07 +02:00
Pierre-Antoine Rouby 4c40f675b5 IC: Fix #14. 2023-10-20 09:25:19 +02:00
Pierre-Antoine Rouby 325bb9ed02 Solver: Mage: Fix warning. 2023-10-18 16:43:01 +02:00
Pierre-Antoine Rouby 505d1aeb48 Solver: Add @output command line parameters. 2023-10-18 16:40:28 +02:00
Pierre-Antoine Rouby 1dd189cbd4 Results: Implement results reload (for same solver) #16. 2023-10-18 16:00:32 +02:00
Pierre-Antoine Rouby fa7490dee8 pep8: Minor fix. 2023-10-18 14:55:32 +02:00
Pierre-Antoine Rouby 7fda5b6b4a Mage: Fix #17 ST file export format. 2023-10-18 14:45:38 +02:00
Pierre-Antoine Rouby 3ff0883eca RunSolver: Fix #15 and minor change. 2023-10-18 14:24:14 +02:00
Pierre-Antoine Rouby 04c8f1ae5f Results: CustomPlot: Minor change to fix warnings. 2023-10-18 14:02:55 +02:00
Pierre-Antoine Rouby f73000056c Results: CustomPlot: Fix kp / elevation, water_elevation and discharge drawing. 2023-10-18 10:53:57 +02:00
Pierre-Antoine Rouby 4605950b94 Results: CustomPlot: Minor change. 2023-10-17 17:10:58 +02:00
Pierre-Antoine Rouby ae40097b51 Results: Fix pep8 format. 2023-10-17 11:27:00 +02:00
Pierre-Antoine Rouby daaa9b193e Resutls: CustomPlot: Prepare ploting mecanisme. 2023-10-17 11:25:30 +02:00
Pierre-Antoine Rouby 98ee3ee6ec CustomPlot: Add translation. 2023-10-16 17:25:08 +02:00
Pierre-Antoine Rouby b77aed2395 results: Add custom plot dialog scheme. 2023-10-16 15:52:29 +02:00
Pierre-Antoine Rouby 45afdc25f9 packages: Fix motd.txt missing and pip version in linux.sh. 2023-10-16 11:41:59 +02:00
Pierre-Antoine Rouby 2ae681cebc ci: Add a full requirements for doc build. 2023-10-11 16:52:09 +02:00
Pierre-Antoine Rouby cc465a050c ci: Allow doc build failed. 2023-10-11 16:50:14 +02:00
Pierre-Antoine Rouby 1fd840d33f ci: Update pip. 2023-10-11 16:47:52 +02:00
Pierre-Antoine Rouby cc237fffa8 pamhyr: Fix package requirements list. 2023-10-11 16:37:57 +02:00
Pierre-Antoine Rouby bb27d4ec20 ci: Fix env install package. 2023-10-11 16:26:43 +02:00
Pierre-Antoine Rouby 255f7302ea ci: Fix remove option -U from pip install 2023-10-11 16:24:45 +02:00
Pierre-Antoine Rouby 9e0b4fd243 ci: Fix missing package for pdoc, fix requirements and pep8. 2023-10-11 16:22:45 +02:00
Pierre-Antoine Rouby 2e926c9ece debug: Switch from QPlainTextEdit to PamhyrPythonEditor. 2023-10-11 16:17:21 +02:00
Pierre-Antoine Rouby bcc2d2f4d4 ci: Allow pep8 failed. 2023-10-11 15:16:04 +02:00
Pierre-Antoine Rouby e3555b2c51 pep8: Fix all pep8 format error. 2023-10-11 15:08:33 +02:00
Pierre-Antoine Rouby e99037223b pep8: Fix some View code format. 2023-10-11 11:56:48 +02:00
Pierre-Antoine Rouby 9f2b81d385 pep8: Fix code format for model. 2023-10-11 11:47:09 +02:00
Pierre-Antoine Rouby 2c592b25b9 pep8: Fix code format. 2023-10-11 11:23:46 +02:00
Pierre-Antoine Rouby bf05b5ddc1 ci: Add pep8 test job. 2023-10-11 11:12:32 +02:00
Pierre-Antoine Rouby fa2454d079 pep8: Some modifications to respect pep8 standard code. 2023-10-11 11:06:45 +02:00
Pierre-Antoine Rouby 8544dd1144 doc: Disactive documentation display in Pamhyr2 for lighter packages. 2023-10-11 10:40:58 +02:00
Pierre-Antoine Rouby 1f8b0bddb4 ui: Fix geometry cross section window lang. 2023-10-11 08:52:05 +02:00
Pierre-Antoine Rouby 5b2ee80329 geometry, results, configure: Some fixes. 2023-10-11 08:40:54 +02:00
Pierre-Antoine Rouby acfb876da0 doc: Change the Firefox button to an open button. 2023-10-10 15:28:59 +02:00
Pierre-Antoine Rouby ab9ebc6400 pamhyr: Add just-in-time database geometry loading. 2023-10-10 15:17:53 +02:00
535 changed files with 35276 additions and 9017 deletions

No files matched your search

+233
View File
@@ -19,6 +19,8 @@ tmp
*.pdf
*.odt
!doc/**/*.pdf
doc/dev/images/auto_*
doc/dev/documentation.*
!doc/dev/*.org
@@ -268,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
@@ -643,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
+301 -95
View File
@@ -1,5 +1,5 @@
# .gitlab-ci.yml -- Pamhyr gitlab-ci
# Copyright (C) 2023 INRAE
# 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
@@ -16,55 +16,79 @@
stages:
- downloads
- build
- configure
- test
- build
- package
- hash
- antivirus
- release
#############
# DOWNLOADS #
#############
dl-mage-linux:
variables:
MAGE_8_VERSION: "v8.3.6"
dl-mage8-doc:
stage: downloads
tags:
- linux
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script:
- curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test6/downloads/packages/mage_linux.tgz
- mkdir -p mage-linux
- cd mage-linux
- tar xvf ../mage.tgz
- mkdir -p doc
- cd doc
- curl -L -o mage8.pdf https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf
artifacts:
paths:
- mage-linux/mage
- mage-linux/mage_extraire
- mage-linux/mailleurPF
- doc/mage8.pdf
dl-mage-windows:
dl-mage8-linux:
stage: downloads
tags:
- linux
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script:
- curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test6/downloads/packages/mage_windows.tgz
- mkdir -p mage-windows
- cd mage-windows
- tar xvf ../mage.tgz
- curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz
- mkdir -p mage8-linux
- cd mage8-linux
- tar xvf ../mage8.tgz
artifacts:
paths:
- mage-windows/mage.exe
- mage-windows/mage_extraire.exe
- mage-windows/mailleurPF.exe
- mage8-linux/mage
- mage8-linux/mage_as7
- mage8-linux/mage_extraire
- mage8-linux/mailleurTT
- mage8-linux/libbief.so
#########
# BUILD #
#########
dl-mage8-windows:
stage: downloads
tags:
- linux
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script:
- curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz
- mkdir -p mage8-windows
- cd mage8-windows
- tar xvf ../mage8.tgz
artifacts:
paths:
- mage8-windows/mage.exe
- mage8-windows/mage_as7.exe
- mage8-windows/mage_extraire.exe
- mage8-windows/mailleurTT.exe
- mage8-windows/libbief.dll
#############
# CONFIGURE #
#############
set-version:
stage: build
stage: configure
tags:
- linux
script:
@@ -75,7 +99,7 @@ set-version:
- VERSION
build-lang:
stage: build
stage: configure
tags:
- linux
script:
@@ -85,7 +109,67 @@ build-lang:
paths:
- src/lang/*.qm
build-users-doc:
#########
# TESTS #
#########
unittest:
stage: test
tags:
- linux
needs:
- job: set-version
artifacts: true
script:
- python3 -m venv venv
- . venv/bin/activate
- pip3 install -U pip
- pip3 install -r ./full-requirements.txt
- pip3 install -U -r ./full-requirements.txt
- cd src
- python3 -m unittest discover -t .
test-pep8:
stage: test
tags:
- linux
needs:
- job: set-version
artifacts: true
- job: unittest
script:
# Setup virtual env
- python3 -m venv venv
- . venv/bin/activate
- pip3 install -U pip
- pip3 install -r ./requirements.txt
- pip3 install -U -r ./requirements.txt
- pip3 install pycodestyle
- pycodestyle --exclude="*_to_*.py" ./src
allow_failure: true
#########
# BUILD #
#########
# build-users-doc:
# stage: build
# tags:
# - linux
# needs:
# - job: set-version
# artifacts: true
# script:
# - cd ./doc/users/
# - ./build.sh
# artifacts:
# paths:
# - doc/users/documentation.pdf
# - doc/users/documentation.html
# - doc/users/images/
# allow_failure: true
build-td:
stage: build
tags:
- linux
@@ -93,13 +177,14 @@ build-users-doc:
- job: set-version
artifacts: true
script:
- cd ./doc/users/
- cd ./doc/users/Tuto1/
- ./build.sh
artifacts:
paths:
- doc/users/documentation.pdf
- doc/users/documentation.html
- doc/users/images/
- doc/users/Tuto1/step-by-step.pdf
- doc/users/Tuto1/pas-a-pas.pdf
- doc/users/Tuto1/data/
allow_failure: true
build-developers-doc:
stage: build
@@ -113,6 +198,12 @@ build-developers-doc:
- ./build.sh
# Create html documentation
- cd ../../src
- python3 -m venv doc-venv
- . doc-venv/bin/activate
- pip3 install -U pip
- pip3 install -r ../full-requirements.txt
- pip3 install -U -r ../full-requirements.txt
- pip3 install pdoc3
- pdoc --html .
# Create archive
- tar cf html.tar ./html
@@ -124,6 +215,7 @@ build-developers-doc:
- doc/dev/documentation.html
- doc/dev/html.tar
- doc/dev/images/
allow_failure: true
build-linux:
stage: build
@@ -132,7 +224,9 @@ build-linux:
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
needs:
- job: dl-mage-linux
- job: dl-mage8-linux
artifacts: true
- job: dl-mage8-doc
artifacts: true
- job: set-version
artifacts: true
@@ -140,7 +234,9 @@ build-linux:
artifacts: true
- job: build-developers-doc
artifacts: true
- job: build-users-doc
# - job: build-users-doc
# artifacts: true
- job: build-td
artifacts: true
script:
- mkdir -p linux
@@ -148,32 +244,39 @@ build-linux:
# Setup virtual env
- python3 -m venv linux-venv
- . linux-venv/bin/activate
- pip3 install -U pip
- pip3 install -r ../requirements.txt
- pip3 install -U -r ../requirements.txt
# Run Pyinstaller
- pyinstaller -y --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py
# Create directory
- mkdir -p pamhyr
- mkdir -p pamhyr/pamhyr
- mkdir -p pamhyr/pamhyr/_internal
- mkdir -p pamhyr/_internal
# Copy Pamhyr info
- cp -v ../VERSION pamhyr/pamhyr/_internal/
- cp -v ../AUTHORS pamhyr/pamhyr/_internal/
- cp -v ../LICENSE pamhyr/pamhyr/_internal/
- cp -v ../VERSION pamhyr/_internal/
- cp -v ../AUTHORS pamhyr/_internal/
- cp -v ../LICENSE pamhyr/_internal/
- cp -v ../src/motd.txt pamhyr/_internal/
# Copy mage
- mkdir -p pamhyr/mage
- cp -v ../mage-linux/* pamhyr/mage/
- mkdir -p pamhyr/mage8
- cp -v ../mage8-linux/* pamhyr/mage8/
# Copy Pamhyr
- cp -r dist/pamhyr pamhyr/
- cp -r dist/pamhyr/* pamhyr/
# Pamhyr script to force x11
- echo '#!/usr/bin/env bash' > pamhyr/pamhyr-x11
- echo "" >> pamhyr/pamhyr-x11
- echo "GDK_BACKEND=x11 ./pamhyr $@" >> pamhyr/pamhyr-x11
- chmod +x pamhyr/pamhyr-x11
# Copy Pamhyr resources
- mkdir -p pamhyr/pamhyr/_internal/View
- mkdir -p pamhyr/pamhyr/_internal/View/ui
- mkdir -p pamhyr/pamhyr/_internal/View/ui/Widgets
- cp -r ../src/View/ui/*.ui pamhyr/pamhyr/_internal/View/ui/
- cp -r ../src/View/ui/ressources/ pamhyr/pamhyr/_internal/View/ui
- cp -r ../src/View/ui/Widgets/*.ui pamhyr/pamhyr/_internal/View/ui/Widgets
- mkdir -p pamhyr/_internal/View
- mkdir -p pamhyr/_internal/View/ui
- mkdir -p pamhyr/_internal/View/ui/Widgets
- cp -r ../src/View/ui/*.ui pamhyr/_internal/View/ui/
- cp -r ../src/View/ui/ressources/ pamhyr/_internal/View/ui
- cp -r ../src/View/ui/Widgets/*.ui pamhyr/_internal/View/ui/Widgets
# Copy lang
- mkdir -p pamhyr/pamhyr/_internal/lang
- cp -r ../src/lang/*.qm pamhyr/pamhyr/_internal/lang
- mkdir -p pamhyr/_internal/lang
- cp -r ../src/lang/*.qm pamhyr/_internal/lang
# Copy tests cases
- mkdir -p pamhyr/tests_cases/
- mkdir -p pamhyr/tests_cases/Saar
@@ -182,17 +285,25 @@ build-linux:
- mkdir -p pamhyr/doc/
- mkdir -p pamhyr/doc/images/
- mkdir -p pamhyr/doc/html/
- cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
- cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html
# - cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
# - cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html
- cp ../doc/mage8.pdf pamhyr/doc/mage8.pdf
- cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf
- cp ../doc/dev/documentation.html pamhyr/doc/Pamhyr2-dev.html
#- cp ../doc/users/images/* pamhyr/doc/images
- cp ../doc/dev/images/* pamhyr/doc/images
- cp ../doc/images/* pamhyr/doc/images
# Create running script
- echo "#!/bin/sh" > pamhyr/Pamhyr2
- echo "./pamhyr/pamhyr $@" >> pamhyr/Pamhyr2
- chmod u+x pamhyr/Pamhyr2
- cp -r ../doc/dev/images/* pamhyr/doc/images
- cp -r ../doc/images/* pamhyr/doc/images
# Copy Tuto
- mkdir -p pamhyr/doc/Tuto1/
- mkdir -p pamhyr/doc/Tuto1/data
- cp ../doc/users/Tuto1/Hogneau_Engees2022.pdf pamhyr/doc/Tuto1/Hogneau_Engees2022.pdf
- cp ../doc/users/Tuto1/step-by-step.pdf pamhyr/doc/Tuto1/Tuto1-en.pdf
- cp ../doc/users/Tuto1/pas-a-pas.pdf pamhyr/doc/Tuto1/Tuto1-fr.pdf
- cp ../doc/users/Tuto1/*.pamhyr pamhyr/doc/Tuto1/
- cp ../doc/users/Tuto1/data/* pamhyr/doc/Tuto1/data/
# Copy TP charriage
- mkdir -p pamhyr/doc/TP_charriage/
- cp ../doc/users/TP_charriage/* pamhyr/doc/TP_charriage
artifacts:
paths:
- linux/pamhyr
@@ -204,7 +315,9 @@ build-windows:
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
needs:
- job: dl-mage-windows
- job: dl-mage8-windows
artifacts: true
- job: dl-mage8-doc
artifacts: true
- job: set-version
artifacts: true
@@ -212,15 +325,20 @@ build-windows:
artifacts: true
- job: build-developers-doc
artifacts: true
- job: build-users-doc
# - job: build-users-doc
# artifacts: true
- job: build-td
artifacts: true
script:
- mkdir windows
- cd windows
# Setup env
- python -m pip install -U pip
- python -m pip install -r ..\requirements.txt
- python -m pip install -U -r ..\requirements.txt
# Run Pyinstaller
- pyinstaller -y ..\src\pamhyr.py
# - pyinstaller --noconsole -y ..\src\pamhyr.py
- pyinstaller -i ../src/View/ui/ressources/icon.ico --hide-console hide-early -y ..\src\pamhyr.py
# Create directory
- mkdir pamhyr
- dir
@@ -230,36 +348,6 @@ build-windows:
paths:
- windows/pamhyr
#########
# TESTS #
#########
# test-windows:
# stage: test
# tags:
# - wine
# needs:
# - job: set-version
# artifacts: true
# - job: build-windows
# artifacts: true
# script:
# - cd windows\pamhyr
# - pamhyr\pamhyr.exe hello
# test-linux:
# stage: test
# tags:
# - linux
# needs:
# - job: set-version
# artifacts: true
# - job: build-linux
# artifacts: true
# script:
# - cd linux/pamhyr
# - ./Pamhyr2 hello
############
# PACKAGES #
############
@@ -320,6 +408,111 @@ windows-package-exe:
- copy ..\packages\pamhyr.nsi pamhyr.nsi
- .\make-windows-exe.bat
########
# HASH #
########
linux-build-hash:
stage: hash
tags:
- release
- linux
needs:
- job: build-linux
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script:
- cd linux
- sha256sum -b pamhyr/pamhyr > pamhyr/pamhyr.sha256
artifacts:
paths:
- linux/pamhyr/pamhyr.sha256
windows-build-hash:
stage: hash
tags:
- release
- linux
needs:
- job: build-windows
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script:
- cd windows
- sha256sum -b pamhyr/pamhyr.exe > pamhyr/pamhyr.exe.sha256
artifacts:
paths:
- windows/pamhyr/pamhyr.exe.sha256
pkg-hash:
stage: hash
tags:
- release
- linux
needs:
- job: linux-package-tar
artifacts: true
- job: windows-package-zip
artifacts: true
- job: windows-package-exe
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
script:
- cd windows
- sha256sum -b pamhyr-windows.exe > pamhyr-windows.exe.sha256
- sha256sum -b pamhyr-windows.zip > pamhyr-windows.zip.sha256
- cd ..
- cd linux
- sha256sum -b pamhyr-gnulinux.tar.xz > pamhyr-gnulinux.tar.xz.sha256
artifacts:
paths:
- windows/pamhyr-windows.exe.sha256
- windows/pamhyr-windows.zip.sha256
- linux/pamhyr-gnulinux.tar.xz.sha256
#############
# ANTIVIRUS #
#############
build-check-clamav:
stage: antivirus
tags:
- release
- linux
needs:
- job: build-linux
artifacts: true
- job: build-windows
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script:
- cd packages
- ./clamav-scan.sh builds
allow_failure: true
pkg-check-clamav:
stage: antivirus
tags:
- release
- linux
needs:
- job: linux-package-tar
artifacts: true
- job: windows-package-zip
artifacts: true
- job: windows-package-exe
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
script:
- cd packages
- ./clamav-scan.sh packages
allow_failure: true
###########
# RELEASE #
###########
@@ -336,10 +529,12 @@ tag-release:
artifacts: true
- job: windows-package-exe
artifacts: true
- job: build-users-doc
artifacts: true
# - job: build-users-doc
# artifacts: true
- job: build-developers-doc
artifacts: true
- job: pkg-hash
artifacts: true
rules:
- if: $CI_COMMIT_TAG
artifacts:
@@ -347,33 +542,44 @@ tag-release:
- linux/pamhyr-gnulinux.tar.xz
- windows/pamhyr-windows.zip
- windows/pamhyr-windows.exe
- linux/pamhyr-gnulinux.tar.xz.sha256
- windows/pamhyr-windows.zip.sha256
- windows/pamhyr-windows.exe.sha256
- doc/dev/documentation.pdf
- doc/users/documentation.pdf
# - doc/users/documentation.pdf
script:
- cd packages
release:
name: '$CI_COMMIT_TAG'
description: 'Automatic release from tag $CI_COMMIT_TAG'
description: '$CI_COMMIT_TAG_MESSAGE'
tag_name: '$CI_COMMIT_TAG'
ref: '$CI_COMMIT_SHA'
assets:
links:
- name: 'GNU/Linux CHECKSUM SHA256 (tar.xz)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/linux/pamhyr-gnulinux.tar.xz.sha256'
filepath: '/linux/pamhyr-gnulinux.tar.xz.sha256'
link_type: 'package'
- name: 'GNU/Linux (tar.xz)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/linux/pamhyr-gnulinux.tar.xz'
filepath: '/linux/pamhyr-gnulinux.tar.xz'
link_type: 'package'
- name: 'Windows CHECKSUM SHA256 (exe)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.exe.sha256'
filepath: '/windows/pamhyr-windows.exe.sha256'
link_type: 'package'
- name: 'Windows (exe)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.exe'
filepath: '/windows/pamhyr-windows.exe'
link_type: 'package'
- name: 'Windows CHECKSUM SHA256 (zip)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.zip.sha256'
filepath: '/windows/pamhyr-windows.zip.sha256'
link_type: 'package'
- name: 'Windows (zip)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.zip'
filepath: '/windows/pamhyr-windows.zip'
link_type: 'package'
- name: 'User documentations (pdf)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/doc/users/documentation.pdf'
filepath: '/doc/users/documentation.pdf'
link_type: 'other'
- name: 'Dev documentations (pdf)'
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/doc/dev/documentation.pdf'
filepath: '/doc/dev/documentation.pdf'
+2 -2
View File
@@ -1,3 +1,3 @@
Sylvain COULIBALY, INRAE, 2020 - 2022
Théophile TERRAZ, INRAE, 2022 - 2023
Pierre-Antoine ROUBY, INRAE, 2023
Théophile TERRAZ, INRAE, 2022 - 2024
Pierre-Antoine ROUBY, INRAE, 2023 - 2024
+20 -30
View File
@@ -3,48 +3,38 @@
Pamhyr is a free and open source graphical user interface for 1D hydro-sedimentary
modelling of rivers.
![logo](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/raw/master/src/View/ui/ressources/Pamhyr2_logo.png)
## Features
+ Edit a complex river hydraulics network
+ Define a complex river hydraulics network
+ Define the river geometry
+ Define boundary conditions
+ Define lateral contribution
+ Edit river friction
+ 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
Downloads [last
realease](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/releases/permalink/latest)
GNU/Linux binary archive.
```shell
tar xf pamhyr-gnulinux-amd64.tar.xz
cd pamhyr
./pamhyr
```
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
Downloads [last
realease](https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/releases/permalink/latest)
Windows installer.
### From source code
```shell
# Get 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)
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+84 -47
View File
@@ -1,5 +1,5 @@
# documentation.org -- Pamhyr developers documentation
# Copyright (C) 2023 INRAE
# 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
@@ -369,6 +369,7 @@ of Bar (Listing [[sql-bar]] and [[sql-foo]]).
CREATE TABLE bar (
id INTEGER NOT NULL PRIMARY KEY,
x INTEGER NOT NULL,
y INTEGER NOT NULL,
foo_id INTEGER NOT NULL,
FOREIGN KEY(foo_id) REFERENCES foo(id),
)""")
@@ -455,6 +456,15 @@ of Bar (Listing [[sql-bar]] and [[sql-foo]]).
bar._sql_save(execute, data=data)
#+end_src
Let see the results database scheme for Pamhyr2 at version v0.0.7 in
Figure [[sql_schema]].
#+NAME: sql_schema
#+ATTR_LATEX: :width 16cm
#+CAPTION: SQLite database scheme at Pamhyr2 version v0.0.7 (generate with [[https://gitlab.com/Screwtapello/sqlite-schema-diagram]])
[[./images/schema_v0.0.7.png]]
[fn:sqlite] The SQLite web site: https://www.sqlite.org/index.html
(last access 2023-09-20)
@@ -538,44 +548,44 @@ generic value from optional parameters, for examples:
#+NAME: window
#+CAPTION: Example of Pamhyr2 window
#+begin_src python :python python3 :results output :noweb yes
from View.Tools.PamhyrWindow import PamhyrWindow
from View.My.Translate import MyTranslate
from View.My.Table import MyTableModel
from View.Tools.PamhyrWindow import PamhyrWindow
from View.My.Translate import MyTranslate
from View.My.Table import MyTableModel
class MyWindow(PamhyrWindow):
_pamhyr_ui = "MyUI"
_pamhyr_name = "My window"
class MyWindow(PamhyrWindow):
_pamhyr_ui = "MyUI"
_pamhyr_name = "My window"
def __init__(self, my_data=None,
study=None, config=None,
parent=None):
self._my_data = my_data
def __init__(self, study=None, config=None,
my_data=None,
parent=None):
self._my_data = my_data
super(MyWindow, self).__init__(
# Window title
title = self._pamhyr_name + " - " + study.name,
# Window standard data
study = study, config = config,
trad = MyTranslate(),
parent = parent,
# Activate undo/redo and copy/paste shortcut
options = ["undo", "copy"]
)
super(MyWindow, self).__init__(
# Window title
title = self._pamhyr_name + " - " + study.name,
# Window standard data
study = study, config = config,
trad = MyTranslate(),
parent = parent,
# Activate undo/redo and copy/paste shortcut
options = ["undo", "copy"]
)
# Add custom data to hash window computation
self._hash_data.append(self._my_data)
# Add custom data to hash window computation
self._hash_data.append(self._my_data)
# Setup custom window components
self.setup_table()
self.setup_connections()
# Setup custom window components
self.setup_table()
self.setup_connections()
def setup_table(self):
# Init table(s)...
def setup_table(self):
# Init table(s)...
def setup_connections(self):
# Init action connection(s)...
def setup_connections(self):
# Init action connection(s)...
# ...
# ...
#+end_src
Typically we called method =setup_*=, the method to initialize some
@@ -636,7 +646,7 @@ class AddNodeCommand(QUndoCommand):
self._node = node
def undo(self):
self._graph.remove_node(self._node.name)
self._graph.remove_node(self._node)
def redo(self):
self._graph.insert_node(self._node)
@@ -661,11 +671,13 @@ creation, this stack is accessible at =self._undo_stack=.
*** Plot
To define a new plot you can create a class who inherit to APlot. The
creator need threee argument:
To define a new plot you can create a class who inherit to
PamhyrPlot. The creator need at leaste five argument:
- A =canvas= of type =MplCanvas=
- A (optional) =trad= of type =PamhyrTranslate=
- A =data= used in =draw= and =update= to create and update the plot
- A optional =toolbar= of type =PamhyrToolbar=
- A =parent= window
This class must implement two method =draw= and =update=, the first
method to draw the plot from scratch, the second to update the plot if
data has changed.
@@ -673,19 +685,36 @@ data has changed.
#+begin_src python :python python3 :results output :noweb yes
from View.Tools.PamhyrPlot import PamhyrPlot
class MyPlot(APlot):
def __init__(self, canvas=None, data=None, toolbar=None):
class MyPlot(PamhyrPlot):
def __init__(self, canvas=None, trad=None, toolbar=None
data=None, parent=None):
super(MyPlot, self).__init__(
canvas=canvas,
trad=trad,
data=data,
toolbar=toolbar
toolbar=toolbar,
parent=parent
)
self.label_x = self._trad["x"]
self.label_y = self._trad["y"]
# Optional configuration
self._isometric_axis = False
self._auto_relim_update = True
self._autoscale_update = True
def draw(self):
# Draw function code...
def update(self, ind = None):
def update(self):
# Update function code...
def clear(self):
# Clear plot values...
# ...
#+end_src
** Solver
@@ -745,7 +774,7 @@ execute a code on distant computer, for example, over ssh.
style=dashed;
subgraph cluster021 {
label="Solver Classes";
classSolverM7[label="Mage7", fillcolor=6];
//classSolverM7[label="Mage7", fillcolor=6];
classSolverM8[label="Mage8", fillcolor=6];
classSolverR[label="RubarBE", fillcolor=6];
}
@@ -828,7 +857,7 @@ solver and get results:
- (2.1) The solver read the input file(s)
- (2.2) The solver compute results and write it to solver output
file(s)
- (3) Pamhyr2 create a Reuslts
- (3) Pamhyr2 create a =Results= object
- (3.1) The Pamhyr2 solver class read solver output file(s) and
complete Results with readed data
@@ -958,8 +987,16 @@ different methods:
** Unit tests
The unit tests is actually not implemented in Pamhyr2, it is a *work
in progress*.
A very small part of Pamhyr2 has unit test. This part is limited to the Model.
#+begin_src shell
python3 -m venv test
. test test/bin/activate
pip3 install -U -r ./full-requirements.txt
cd src/
python3 -Walways -m unittest discovert -v -t .
#+end_src
** The debug mode
@@ -970,14 +1007,14 @@ line:
./Pamhyr2 debug
#+end_src
This mode add some log and add two action in main window menu:
"About/Debug" open a window with Python Repl in current Python
environement, and "About/Debug SQLite" who open the application
This mode add some log and add two action in main window menu: "About
> Debug" open a window with Python Repl in current Python
environement, and "About > Debug SQLite" who open the application
SQLiteBrowser (if installed) on current Study to explore the study
data base file.
#+NAME: debug-repl
#+ATTR_LATEX: :width 12cm
#+ATTR_LATEX: :width 14cm
#+CAPTION: Pamhyr2 debug Python REPL
[[./images/python-debug-repl.png]]
@@ -1297,7 +1334,7 @@ https://gitlab.irstea.fr/theophile.terraz/pamhyr
You can improve or add translation for the project. To contribute to
Pamhyr2 translate, you need to use Qt Linguist[fn:qt-linguist]. Open
Qt-linguist and edite the translation ({{{file(.ts)}}}) file, finally,
Qt-linguist and edit the translation ({{{file(.ts)}}}) file, finally,
commit the new version of file and make a merge request.
If you want add a new language, edit the script
Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.
+4 -2
View File
@@ -11,7 +11,8 @@
\usepackage[absolute]{textpos}
\usepackage{titlesec}
\usepackage{amssymb}
\usepackage{tcolorbox}
\usepackage[minted,xparse,breakable]{tcolorbox}
\usepackage{pmboxdraw}
\usepackage{enumitem}
\setlist[enumerate]{itemsep=-0.5em}
@@ -133,6 +134,7 @@
\setminted[c]{fontsize=\footnotesize,encoding=utf8,linenos}
\setminted[c++]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
\setminted[python]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
\setminted[sql]{breaklines,fontsize=\footnotesize,encoding=utf8,linenos}
\setminted[shell]{breaklines,fontsize=\footnotesize,encoding=utf8}
\setminted[scheme]{breaklines,fontsize=\footnotesize,encoding=utf8}
\setminted[commun-lisp]{breaklines,fontsize=\footnotesize,encoding=utf8}
@@ -140,7 +142,7 @@
\setminted[llvm]{breaklines,fontsize=\footnotesize,encoding=utf8}
%% Add box arrond of minted
\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
\BeforeBeginEnvironment{minted}{\begin{tcolorbox}[breakable, boxsep=0pt, left=0.1cm, right=0.1cm, arc=0pt, boxrule=0.5pt, colback=white]}%
\AfterEndEnvironment{minted}{\end{tcolorbox}}%
\makeatletter
Binary file not shown.
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
Binary file not shown.
+4
View File
@@ -0,0 +1,4 @@
#! /bin/sh
pdflatex -no-shell-escape step-by-step.tex
pdflatex -no-shell-escape pas-a-pas.tex
+442
View File
@@ -0,0 +1,442 @@
1 0 0 8 31090.0000
31090.0000 0.0000 23.7300
31090.0000 2.5000 20.2800 rg
31090.0000 2.5000 19.2900
31090.0000 4.4000 19.2900
31090.0000 10.7000 19.5900
31090.0000 10.7000 20.5900 rd
31090.0000 14.5000 21.7100
31090.0000 17.6000 23.7300
999.9990 999.9990 999.9990
2 0 0 8 31165.0000
31165.0000 0.0000 22.8400
31165.0000 2.5000 20.1300 rg
31165.0000 2.5000 19.2300
31165.0000 4.4000 19.2300
31165.0000 10.7000 19.5300
31165.0000 10.7000 20.5300 rd
31165.0000 14.5000 21.7500
31165.0000 17.6000 23.5000
999.9990 999.9990 999.9990
3 0 0 10 31425.0000
31425.0000 -1.0000 22.8000
31425.0000 0.0000 21.9000
31425.0000 1.7000 20.3600 rg
31425.0000 2.5000 19.6300
31425.0000 2.5000 19.0300
31425.0000 4.4000 19.0300
31425.0000 10.7000 19.3300
31425.0000 10.7000 20.3300 rd
31425.0000 14.5000 21.9200
31425.0000 17.6000 23.4200
999.9990 999.9990 999.9990
4 0 0 10 31590.0000
31590.0000 -1.0000 22.7500
31590.0000 0.0000 22.0500
31590.0000 1.6700 20.2200 rg
31590.0000 2.5000 19.3100
31590.0000 2.5000 18.9000
31590.0000 4.4000 18.9000
31590.0000 10.7000 19.2000
31590.0000 10.7000 20.2000 rd
31590.0000 14.5000 22.0200
31590.0000 17.6000 23.2500
999.9990 999.9990 999.9990
5 0 0 10 31780.0000
31780.0000 -1.0000 22.7000
31780.0000 0.0000 22.0500
31780.0000 1.6000 20.0500 rg
31780.0000 2.5000 18.9400
31780.0000 2.5000 18.7500
31780.0000 4.4000 18.7500
31780.0000 10.7000 19.0500
31780.0000 10.7000 20.0500 rd
31780.0000 14.5000 22.1400
31780.0000 17.6000 23.0000
999.9990 999.9990 999.9990
6 0 0 9 31874.0000
31874.0000 0.0000 22.9900
31874.0000 0.0000 22.6900
31874.0000 2.5000 19.6900 rg
31874.0000 2.5000 18.6900
31874.0000 4.4000 18.6900
31874.0000 10.7000 18.9900
31874.0000 10.7000 19.9900 rd
31874.0000 14.5000 22.1900
31874.0000 17.6000 22.9900
999.9990 999.9990 999.9990
7 0 0 9 31875.0000 PontRD101m
31875.0000 0.5400 23.0000
31875.0000 0.5400 21.8900
31875.0000 2.5000 19.6900 rg
31875.0000 2.5000 18.6900
31875.0000 4.4000 18.6900
31875.0000 10.7000 18.9900
31875.0000 10.7000 19.9900 rd
31875.0000 13.8900 21.8900
31875.0000 13.8900 23.0000
999.9990 999.9990 999.9990
8 0 0 9 31885.0000 PontRD101v
31885.0000 0.5400 23.0000
31885.0000 0.5400 21.8900
31885.0000 2.5000 19.6900 rg
31885.0000 2.5000 18.6900
31885.0000 4.4000 18.6900
31885.0000 10.7000 18.9900
31885.0000 10.7000 19.9900 rd
31885.0000 13.8900 21.8900
31885.0000 13.8900 23.0000
999.9990 999.9990 999.9990
9 0 0 9 31886.0000
31886.0000 0.0000 22.9900
31886.0000 0.0000 22.6900
31886.0000 2.5000 19.6900 rg
31886.0000 2.5000 18.6900
31886.0000 4.4000 18.6900
31886.0000 10.7000 18.9900
31886.0000 10.7000 19.9900 rd
31886.0000 14.5000 22.1900
31886.0000 17.6000 22.9900
999.9990 999.9990 999.9990
10 0 0 13 32015.0000
32015.0000 0.0000 22.6400
32015.0000 0.2000 22.2200
32015.0000 1.3000 20.9900
32015.0000 2.0000 19.8800 rg
32015.0000 3.0000 18.6600
32015.0000 3.0000 18.5800
32015.0000 5.5000 18.5800
32015.0000 10.0000 18.9100
32015.0000 11.5000 19.2500
32015.0000 11.5000 20.0800 rd
32015.0000 15.1000 22.0600
32015.0000 17.6000 22.5100
32015.0000 18.0000 22.8100
999.9990 999.9990 999.9990
11 0 0 13 32205.0000
32205.0000 0.0000 22.3300
32205.0000 0.2000 22.1800
32205.0000 1.5000 21.0600
32205.0000 2.5000 19.7700 rg
32205.0000 3.6000 18.5100
32205.0000 3.6000 18.4500
32205.0000 6.9000 18.4500
32205.0000 8.8000 19.0500
32205.0000 12.5000 19.5700 rd
32205.0000 12.5000 20.1800
32205.0000 15.8000 21.9000
32205.0000 18.1000 22.4000
32205.0000 18.6000 22.5500
999.9990 999.9990 999.9990
12 0 0 13 32460.0000
32460.0000 0.0000 22.1500
32460.0000 0.3000 22.1300
32460.0000 1.8000 21.1600
32460.0000 3.0000 19.6400 rg
32460.0000 4.4000 18.3100
32460.0000 4.4000 18.2800
32460.0000 8.7000 18.2800
32460.0000 10.4000 19.2400 rd
32460.0000 13.7000 19.9900
32460.0000 13.7000 20.3300
32460.0000 16.8000 21.6800
32460.0000 18.9000 22.2500
32460.0000 19.3000 22.5500
999.9990 999.9990 999.9990
13 0 0 13 32655.0000
32655.0000 0.0000 22.4500
32655.0000 0.3000 22.0900
32655.0000 2.1000 21.2300
32655.0000 3.4000 19.5300 rg
32655.0000 5.0000 18.1600
32655.0000 5.0000 18.1400
32655.0000 10.1000 18.1400
32655.0000 11.6000 19.3900 rd
32655.0000 14.7000 20.3100
32655.0000 14.7000 20.4300
32655.0000 17.5000 21.5200
32655.0000 19.4000 22.1400
32655.0000 19.8000 22.4500
999.9990 999.9990 999.9990
14 0 0 13 32755.0000
32755.0000 0.0000 22.4500
32755.0000 0.3000 22.0900
32755.0000 2.1000 21.2300
32755.0000 3.4000 19.5300 rg
32755.0000 4.0000 18.0500
32755.0000 5.0000 18.0100
32755.0000 10.1000 18.0100
32755.0000 13.0000 19.3900 rd
32755.0000 14.7000 20.3100
32755.0000 14.7000 20.4300
32755.0000 17.5000 21.5200
32755.0000 19.4000 22.1400
32755.0000 19.8000 22.4500
999.9990 999.9990 999.9990
15 0 0 10 32770.0000 PontA2
32770.0000 0.0000 25.0000
32770.0000 1.9000 25.0000
32770.0000 1.9000 21.2700
32770.0000 3.3000 19.4700 rg
32770.0000 5.0000 18.0100
32770.0000 10.5000 18.0100
32770.0000 12.0000 19.4700 rd
32770.0000 19.4000 21.4700
32770.0000 19.4000 25.0000
32770.0000 20.3000 25.0000
999.9990 999.9990 999.9990
16 0 0 10 32800.0000 PontA2
32800.0000 0.0000 25.0000
32800.0000 1.9000 25.0000
32800.0000 1.9000 21.2700
32800.0000 3.3000 19.4700 rg
32800.0000 5.0000 18.0100
32800.0000 10.5000 18.0100
32800.0000 12.0000 19.4700 rd
32800.0000 19.4000 21.4700
32800.0000 19.4000 25.0000
32800.0000 20.3000 25.0000
999.9990 999.9990 999.9990
17 0 0 13 32820.0000
32820.0000 0.0000 22.4500
32820.0000 0.3000 22.0900
32820.0000 2.1000 21.2300
32820.0000 3.4000 19.5300 rg
32820.0000 4.0000 18.0500
32820.0000 5.0000 18.0100
32820.0000 10.1000 18.0100
32820.0000 13.0000 19.3900 rd
32820.0000 14.7000 20.3100
32820.0000 14.7000 20.4300
32820.0000 17.5000 21.5200
32820.0000 19.4000 22.1400
32820.0000 19.8000 22.4500
999.9990 999.9990 999.9990
18 0 0 11 32915.0000
32915.0000 0.0000 22.5500
32915.0000 0.4000 21.9500
32915.0000 1.7000 21.2200
32915.0000 2.4000 20.9700
32915.0000 3.8000 19.4100 rg
32915.0000 3.9000 19.3100
32915.0000 5.8000 18.0100
32915.0000 11.0000 18.0100
32915.0000 12.4000 19.3400 rd
32915.0000 19.4000 21.9900
32915.0000 19.7000 22.5500
999.9990 999.9990 999.9990
19 0 0 10 33140.0000
33140.0000 0.4000 21.7700
33140.0000 1.9000 20.7600
33140.0000 2.7000 20.5100
33140.0000 4.2000 19.1500 rg
33140.0000 4.3000 19.0600
33140.0000 6.4000 17.9200
33140.0000 11.3000 17.9200
33140.0000 12.6000 19.1400 rd
33140.0000 18.9000 21.8700
33140.0000 19.2000 22.1800
999.9990 999.9990 999.9990
20 0 0 10 33425.0000
33425.0000 0.0000 21.6800
33425.0000 0.5000 21.5300
33425.0000 2.2000 20.1600
33425.0000 3.0000 19.9400
33425.0000 4.8000 18.8200 rg
33425.0000 4.9000 18.7500
33425.0000 7.2000 17.8000
33425.0000 11.7000 17.8000
33425.0000 12.8000 18.8800 rd
33425.0000 18.2000 21.6800
999.9990 999.9990 999.9990
21 0 0 10 33685.0000
33685.0000 0.0000 21.5300
33685.0000 0.5000 21.3200
33685.0000 2.4000 19.6200
33685.0000 3.3000 19.4200
33685.0000 5.2000 18.5300 rg
33685.0000 5.4000 18.4700
33685.0000 7.9000 17.7000
33685.0000 12.0000 17.7000
33685.0000 12.9000 18.6500 rd
33685.0000 17.6000 21.5300
999.9990 999.9990 999.9990
22 0 0 9 33920.0000
33920.0000 0.6000 20.9800
33920.0000 2.6000 19.1300
33920.0000 3.6000 18.9400
33920.0000 5.7000 18.2600 rg
33920.0000 5.8000 18.2200
33920.0000 8.5000 17.6000
33920.0000 12.3000 17.6000
33920.0000 13.1000 18.4400 rd
33920.0000 17.0000 21.1300
999.9990 999.9990 999.9990
23 0 0 9 34095.0000
34095.0000 0.6000 20.9500
34095.0000 2.7000 18.7700
34095.0000 3.8000 18.5900
34095.0000 6.0000 18.0600 rg
34095.0000 6.1000 18.0300
34095.0000 9.0000 17.5300
34095.0000 12.5000 17.5300
34095.0000 13.2000 18.2800 rd
34095.0000 16.6000 20.9800
999.9990 999.9990 999.9990
24 0 0 10 34295.0000
34295.0000 0.0000 21.3600
34295.0000 0.6000 20.8300
34295.0000 2.4000 18.3500
34295.0000 3.5000 18.1900
34295.0000 5.8000 17.8300 rg
34295.0000 6.5000 17.3400
34295.0000 9.5000 17.3600
34295.0000 12.8000 17.4100
34295.0000 14.0000 18.1000 rd
34295.0000 16.1000 21.3600
999.9990 999.9990 999.9990
25 0 0 10 34334.0000 amontPontThivencel
34334.0000 0.0000 21.3600
34334.0000 0.6000 20.8300
34334.0000 2.4000 18.3500
34334.0000 3.5000 18.1900
34334.0000 5.8000 17.8300 rg
34334.0000 6.5000 17.3400
34334.0000 9.5000 17.3600
34334.0000 12.8000 17.4100
34334.0000 14.0000 18.1000 rd
34334.0000 16.1000 21.1300
999.9990 999.9990 999.9990
26 0 0 9 34335.0000 PontmThivencelle
34335.0000 2.9000 22.0000
34335.0000 2.9000 20.7400
34335.0000 2.9000 18.2900 rg
34335.0000 6.4000 17.7900
34335.0000 9.6000 17.2600
34335.0000 12.8000 17.2600
34335.0000 12.8000 18.3100 rd
34335.0000 12.8000 20.7400
34335.0000 12.8000 22.0000
999.9990 999.9990 999.9990
27 0 0 9 34343.0000 PontvThivencelle
34343.0000 2.9000 22.0000
34343.0000 2.9000 20.7400
34343.0000 2.9000 18.2900 rg
34343.0000 6.4000 17.7900
34343.0000 9.6000 17.2600
34343.0000 12.8000 17.2600
34343.0000 12.8000 18.2900 rd
34343.0000 12.8000 20.7400
34343.0000 12.8000 22.0000
999.9990 999.9990 999.9990
28 0 0 10 34345.0000 avalPontThivencell
34345.0000 0.0000 21.3600
34345.0000 0.6000 20.8300
34345.0000 2.4000 18.3500
34345.0000 3.5000 18.1900
34345.0000 5.8000 17.8300 rg
34345.0000 6.5000 17.3400
34345.0000 9.5000 17.2600
34345.0000 12.8000 17.4100
34345.0000 14.0000 18.1000 rd
34345.0000 16.1000 21.1300
999.9990 999.9990 999.9990
29 0 0 7 34405.0000
34405.0000 0.0000 21.1400
34405.0000 2.9000 17.8400 rg
34405.0000 6.4000 17.4400
34405.0000 9.6000 17.2000
34405.0000 12.8000 17.2200
34405.0000 13.9000 17.8400 rd
34405.0000 19.0000 21.0000
999.9990 999.9990 999.9990
30 0 0 7 34535.0000
34535.0000 0.0000 20.5900
34535.0000 2.9000 17.7400 rg
34535.0000 6.4000 17.2400
34535.0000 9.6000 17.0300
34535.0000 12.8000 17.0300
34535.0000 13.5000 17.7400 rd
34535.0000 15.8000 20.6000
999.9990 999.9990 999.9990
31 0 0 7 34705.0000
34705.0000 0.0000 20.5000
34705.0000 2.9000 17.6100 rg
34705.0000 6.4000 17.1100
34705.0000 9.6000 16.8500
34705.0000 12.8000 16.8500
34705.0000 14.0000 18.0000 rd
34705.0000 16.2000 20.5300
999.9990 999.9990 999.9990
32 0 0 7 34825.0000
34825.0000 0.0000 20.6200
34825.0000 2.9000 17.5200 rg
34825.0000 6.4000 17.0200
34825.0000 9.6000 16.7100
34825.0000 12.8000 16.7100
34825.0000 13.5000 17.5200 rd
34825.0000 16.2000 20.5000
999.9990 999.9990 999.9990
33 0 0 7 34995.0000
34995.0000 0.0000 20.3900
34995.0000 2.9000 17.3900 rg
34995.0000 6.4000 16.8900
34995.0000 9.6000 16.5300
34995.0000 12.8000 16.5300
34995.0000 13.6000 17.4300 rd
34995.0000 16.2000 20.3200
999.9990 999.9990 999.9990
34 0 0 7 35135.0000
35135.0000 0.0000 20.1600
35135.0000 2.9000 17.2900 rg
35135.0000 6.4000 16.7900
35135.0000 9.6000 16.4300
35135.0000 12.8000 16.4300
35135.0000 13.9000 17.3700 rd
35135.0000 16.2000 20.0600
999.9990 999.9990 999.9990
35 0 0 7 35360.0000
35360.0000 0.0000 19.8600
35360.0000 2.9000 17.1200 rg
35360.0000 6.4000 16.6200
35360.0000 9.6000 16.2600
35360.0000 12.8000 16.2600
35360.0000 13.7000 17.1200 rd
35360.0000 16.2000 19.4600
999.9990 999.9990 999.9990
36 0 0 7 35580.0000
35580.0000 0.0000 20.0000
35580.0000 2.9000 16.9500 rg
35580.0000 3.0000 16.0900
35580.0000 11.5000 16.0500
35580.0000 20.0000 16.0900
35580.0000 21.0000 17.0300 rd
35580.0000 23.0000 19.5000
999.9990 999.9990 999.9990
37 0 0 7 35920.0000
35920.0000 0.0000 20.0000
35920.0000 2.2000 16.0200 rg
35920.0000 3.0000 14.5500
35920.0000 11.5000 14.5000
35920.0000 20.0000 14.5500
35920.0000 20.9000 16.0200 rd
35920.0000 23.0000 19.5000
999.9990 999.9990 999.9990
38 0 0 7 36270.0000 S1
36270.0000 0.0000 20.0000
36270.0000 1.8000 17.0100 rg
36270.0000 3.0000 15.0800
36270.0000 11.5000 15.0500
36270.0000 20.0000 15.0800
36270.0000 21.3000 17.0100 rd
36270.0000 23.0000 19.5000
999.9990 999.9990 999.9990
39 0 0 7 36271.0000 S1bis
36271.0000 0.0000 20.0000
36271.0000 1.8000 17.0100 rg
36271.0000 3.0000 13.0800
36271.0000 11.5000 13.0500
36271.0000 20.0000 13.0800
36271.0000 21.3000 17.0100 rd
36271.0000 23.0000 19.5000
999.9990 999.9990 999.9990
+25
View File
@@ -0,0 +1,25 @@
0:00:00:00 5,53
0:11:37:00 5,72
0:16:17:00 5,82
0:22:57:00 5,92
1:00:00:00 6,6
1:00:57:00 8,04
1:02:29:00 14,3
1:04:38:00 24,4
1:08:48:00 40
1:11:27:00 46,3
1:13:47:00 48,8
1:16:07:00 47,9
1:17:17:00 44,8
1:20:23:00 27,8
1:21:57:00 24,3
2:01:15:00 19,2
2:05:15:00 15,8
2:11:25:00 11,5
2:11:57:00 11,1
2:13:17:00 10,5
2:19:07:00 9,84
2:23:59:00 8,43
3:04:51:00 7,02
3:09:43:00 5,61
3:14:35:00 5,53
+1
View File
@@ -0,0 +1 @@
$Clapet_001 clapet
+9
View File
@@ -0,0 +1,9 @@
0:00:00:00 4
0:01:16:48 4
0:16:00:00 50
1:11:46:28 36,8
2:07:27:22 23,3
5:04:24:58 13,8
10:03:00:06 9,38
20:02:19:58 7,29
30:01:54:37 5,97
+10
View File
@@ -0,0 +1,10 @@
0:00:00:00 4
0:01:49:48 4
0:16:00:00 35
1:11:25:48 25
2:07:30:00 16,4
5:03:55:12 9,66
10:03:00:00 6,56
27:00:54:00 4,91
30:01:48:36 4
31:06:00:00 4
Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 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: 38 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.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

+443
View File
@@ -0,0 +1,443 @@
%% LyX 2.0.2 created this file. For more info, see http://www.lyx.org/.
%% Do not edit unless you really know what you are doing.
\documentclass[12pt,french]{article}
\usepackage[T1]{fontenc}
\usepackage[latin9]{inputenc}
\usepackage{geometry}
\geometry{verbose,tmargin=2cm,bmargin=2cm,lmargin=2cm,rmargin=2cm,headheight=2cm,headsep=2cm,footskip=2cm}
\usepackage{textcomp}
\usepackage{graphicx}
\usepackage{hyperref}
\makeatletter
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
\newcommand{\noun}[1]{\textsc{#1}}
%% Because html converters don't know tabularnewline
\providecommand{\tabularnewline}{\\}
\makeatother
\usepackage{babel}
\addto\extrasfrench{%
\providecommand{\og}{\leavevmode\flqq~}%
\providecommand{\fg}{\ifdim\lastskip>\z@\unskip\fi~\frqq}%
}
\begin{document}
\includegraphics[width=5cm]{img/Logo-INRAE_Transparent.png}
~
~
~
\begin{center}
Tutoriel pour Pamhyr2
Janvier 2024
\par\end{center}
~
~
\begin{center}
\textbf{\LARGE Modélisation 1D de la rivière } \\
\textbf{\LARGE Hogneau (Nord, France) avec Pamhyr2}
\par\end{center}{\LARGE \par}
~
~
\begin{center}
{\large INRAE Lyon-Grenoble Auvergne-Rhône-Alpes}
\par\end{center}{\large \par}
\begin{center}
RiverLy, Hydraulique des rivières
\par\end{center}
~
~
~
~
~
~
\begin{center}
\begin{tabular}{lll}
Auteurs : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
& Théophile TERRAZ & theophile.terraz@inrae.fr\tabularnewline
& Lionel Pénard & lionel.penard@inrae.fr\tabularnewline
\end{tabular}
\par\end{center}
~
\pagebreak{}
\begin{center}
\tableofcontents{}
\par\end{center}
~
\pagebreak{}
% \section{Introduction}
%
% TODO
%
% \pagebreak{}
\section{Installer Pamhyr2}
Pamhyr2 peut être téléchargé ici : \url{https://gitlab.irstea.fr/theophile.terraz/pamhyr}.
Si vous arrivez sur une fenêtre de connexion, cliquez sur "parcourir la liste des dépôts publics" et cherchez l'URL donnée plus haut.
Utilisez le bouton de téléchargement GNU Linux ou Windows en fonction de votre système.
\begin{center}
\includegraphics[width=15cm]{img/dl.png}
\par\end{center}
Décompressez l'archive et lancez Pamhyr2.
\section{Créer une première étude}
Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude.
Choisissez un nom, par exemple \textit{Hogneau}, et validez.
\begin{center}
\includegraphics[width=15cm]{img/NEWSTUDY.png}
\par\end{center}
Pendant que vous travaillez sur votre étude, n'oubliez pas de sauvegarder régulièrement, à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} de la fenêtre principale.
\section{Créer la structure de la rivière}
Cliquez sur \texttt{[Réseau] => [Éditer le réseau]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} pour créer la structure de votre rivière.
Nous voici dans la fenêtre \textit{Réseau}.
Dans cette fenêtre, nous allons définir un graphe orienté qui représente les biefs de notre réseau fluvial : les arêtes sont les biefs, les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
Un bief par défaut existe dans la nouvelle étude.
Pour les besoins de ce tutoriel, nous allons le supprimer :
cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} pour entrer dans le mode \textit{Suppression} puis cliquez sur les n½uds.
Nous voilà repartis sur une fenêtre vierge.
Appuyez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud.
Appuyez à nouveau sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour quitter le mode \textit{Ajout}.
Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval.
Dans la partie inférieure de la fenêtre \textit{Réseau}, vous pouvez renommer les n½uds et les biefs.
Comme le bief que nous avons créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief.
La fenêtre doit se présenter comme suit :
\begin{center}
\includegraphics[width=15cm]{img/network.png}
\par\end{center}
Fermez la fenêtre \textit{Réseau}.
\section{Éditer la géométrie de la rivière}
Cliquez sur \texttt{[Géométrie] => [Éditer la géométrie]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} pour définir la géométrie du bief sélectionné.
Pour Importer une géométrie depuis un fichier, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png}.
Sélectionnez le fichier \texttt{Data/Bief\_1.st}.
Vous devriez voir :
\begin{center}
\includegraphics[width=15cm]{img/Geo.png}
\par\end{center}
Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK).
Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière; dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs).
Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou sur les sections dans les deux vues du haut.
Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
Sélectionnez la section en travers nommée \textit{PontRD101m} et ouvrez la fenêtre d'édition. Vous devriez voir :
\begin{center}
\includegraphics[width=15cm]{img/editsect.png}
\par\end{center}
Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale.
La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom.
Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice).
Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.
Sur le graphique figure une projection de la section en travers.
Vous pouvez utiliser \texttt{[clic droit]} pour afficher une ligne d'eau fictive et visualiser des données géométriques utiles.
Vous pouvez ensuite enlever cette ligne avec \texttt{[clic molette]}.
Vous pouvez maintenant fermer la fenêtre d'édition de la section en travers.
Revenons à la fenêtre \textit{Géométrie}.
Le jeu de sections importé est inégalement espacé, ce qui peut entraîner des difficultés de calcul.
Nous allons utiliser l'outil de maillage pour interpoler des nouvelles sections entre les sections trop espacées.
Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/meshing.png"}.
Dans la fenêtre \textit{Maillage}, vous avez accès à quelques options basiques.
L'option \textit{Limites} vous permet de définir deux sections entre lesquelles le maillage sera effectué.
L'option \textit{Lignes directrices pour le calcul des distances} permet de spécifier au mailleur les points sur lesquels calculer les distances entre les sections.
La distance sera la moyenne des deux distances entre les points de chaque sections qui portent ces lignes directrices.
Pour ne choisir qu'une seule ligne, rentrez simplement deux fois la même valeur.
Il existe toujours au moins deux lignes directrices : les deux extrémités des sections, nommés \textit{un} et \textit{np}, même si les points correspondants ne portent pas de nom.
Les options \textit{Paramètres} permettent de définir l'interval souhaité entre les nouvelles sections, et la méthode d'interpolation.
Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
\begin{center}
\includegraphics[width=15cm]{img/maillage.png}
\par\end{center}
% L'option d'interpolation \textit{Spline} modifie les longueurs longitudinales.
% Les abscices en long (Pk) des sections sont donc obsolètes.
% Pour les recalculer, cliquez sur \texttt{[Mise à jour des PK]} dans la fenêtre \textit{Géométrie}.
% Vous êtes maintenant dans la fenêtre \textit{Mise à jour des PK}.
% Vous pouvez choisir la section d'origine pour le calcul des PK, ainsi que la valeur du PK à cette section.
% Le choix des deux lignes directrices sert à calculer les distances entre sections, comme dans la fenêtre \textit{Maillage}.
% L'orientation vous permet de choisir dans quelle direction les PK seront croissants.
% Cette option n'a pas d'impact sur les résultats du calcul hydraulique.
% Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
%
% \begin{center}
% \includegraphics[width=15cm]{img/mjpk.png}
% \par\end{center}
La fenêtre \textit{Géométrie} doit maintenant ressembler à ça :
\begin{center}
\includegraphics[width=15cm]{img/Geo2.png}
\par\end{center}
\section{Éditer les conditions aux limites}
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
Vous arrivez sur la fenêtre \textit{Conditions aux limites} :
\begin{center}
\includegraphics[width=15cm]{img/boundary.png}
\par\end{center}
Utilisez le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
Nous pouvons cliquer sur la nouvelle ligne pour sélectionner la ligne en entier, et double-cliquer pour sélectionner une seule cellule.
Ici, nous définirons le débit mesuré lors de la crue de février 2002.
Sélectionnez la cellule \textit{Nom} pour donner un nom à la condition limite par exemple "crue2002".
Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi \textit{Q(t)} : débit en fonction du temps (hydrogramme).
Sélectionnez la cellule \textit{N½ud} et attribuez cette condition au n½ud amont.
Les noms des n½uds sont rappelés dans le panneau de droite, avec une vue du réseau.
Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
Vous avez ouvert la fenêtre \textit{Éditer les conditions aux limites}.
Dans un éditeur de texte, ouvrez le fichier \texttt{data/Fevrier\_2002.txt}.
Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau de gauche de la fenêtre \textit{Éditer les conditions aux limites} avec \textit{ctrl+v}.
Vous pouvez maintenant voir la courbe de débit :
\begin{center}
\includegraphics[width=15cm]{img/fev2002.png}
\par\end{center}
Fermez cette fenêtre. Revenez sur la fenêtre \textit{Conditions aux limites}.
Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Z(T)} (limnigramme) et associez là au n½ud aval du réseau.
Ouvrez la fenêtre d'édition des conditions aux limites (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
Ajoutez deux lignes et rentrez les valeurs suivantes :
\begin{center}
\begin{tabular}{|c|c|}
\hline
temps & cote \\ \hline
0.00.00 & 15.000\\ \hline
1.00.00 & 15.000\\ \hline
\end{tabular}\\
\par\end{center}
Cela crée une cote constante de l'eau en aval.
Pour le calcul, le solveur extrapolera continûment l'élévation de l'eau si le temps de la simulation dépasse le dernier point de la courbe.
Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.
% Fermer cette fenêtre.
% Revenez sur la fenêtre \textit{Conditions aux limites}.
% Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Q(Z)} (courbe de tarage) et associez-la au noeud aval du réseau.
% Cette condition limite se trouve au niveau d'un seuil.
% A cet endroit, l'écoulement passe d'un régime fluvial à un régime torentiel.
% Nous allons donc calculer une courbe de tarage qui correspond au régime critique de l'écoulement au niveau du seuil.
% Sélectionnez la condition limite et ouvrez la fenêtre \textit{Éditer les conditions aux limites} : (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
% Dans la fenêtre \textit{Éditer les conditions aux limites} cliquez sur \texttt{[Générer régime critique]} pour générer cette courbe.
% Cliquez ensuite sur \texttt{[Rendre croissant]} pour suprimer les points de la courbe qui ne sont pas strictement croissants.
% Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.
\section{Créer les conditions initiales}
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]} ou sur le raccourci \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
Pour démarrer, le code de calcul hydraulique a besoin de connaître le débit et la cote de la surface libre de la rivière en tout point à l'instant initial.
Si vous ne connaissez pas ces conditions initiales, vous pouvez utiliser les boutons \texttt{[Générer une profondeur uniforme]}, \texttt{[Générer un débit uniforme]} ou \texttt{[Générer une cote uniforme]} pour laisser Pamhyr2 estimer une condition initiale.
Cliquez sur \texttt{[Générer un débit uniforme]} et saisissez un débit de 4 m$^3$/s dans la fenêtre contextuelle, et cochez \texttt{[Générer une profondeur]} pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler pour le débit donné.
Vous devriez voir :
\begin{center}
\includegraphics[width=15cm]{img/ic.png}
\par\end{center}
% Vous pouvez également utiliser \texttt{[Générer une cote uniforme]} et saisir une cote de 21 m à l'amont et à l'aval avec un débit nul.
% Cela revient à créer une bassine et à laisser le solveur la vider pour trouver un écoulement initial satisfaisant.
Lors des prochaines simulations, vous pourrez utiliser l'état final de la simulation précédente comme état initial.
Pour cela, cliquez sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} et retrouvez le résultat sous forme de fichier \textit{.BIN}.
Ce fichier de résultats se trouve normalement dans le sous-dossier \texttt{\_PAMHYR\_/Hogneau/default-mage}.
Fermer la fenêtre \textit{Conditions initiales}.
\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}.
Dans la fenêtre \textit{Éditer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre zones de frottement.
Chaque zone est définie par un PK de \textit{début} et de \textit{fin} associés à un couple de coefficients de Strickler.
% Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{début} et \textit{fin}.
% Dans notre cas, nous utiliserons des coefficients uniformes par zone.
Définissez les zones comme suit :
\begin{center}
\includegraphics[width=15cm]{img/frictions.png}
\par\end{center}
La zone sélectionnée est surlignée en bleu.
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 cote de l'eau et le débit.
C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée et que l'écoulement passe en charge.
Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrables.
Dans notre cas, nous allons devoir modéliser deux ponts et un seuil par des ouvrages hydrauliques.
Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques.
Cliquez trois fois sur le bouton \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour créer trois ouvrages hydrauliques.
% Cliquez deux fois sur le bouton \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour créer deux ouvrages hydrauliques.
Chaque structure peut avoir un nom et doit avoir un bief et un PK.
Définissez-les comme suit :
\begin{center}
\includegraphics[width=15cm]{img/hs.png}
\par\end{center}
Sélectionnez le seuil aval et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour modifier les lois de cet ouvrage. Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires. Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage. Pour ce seuil, nous n'avons besoin que d'un ouvrage hydraulique élémentaire de type déversoir. Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour ajouter un nouvel ouvrage hydraulique élémentaire, donnez-lui le type \textit{Déversoir rectangulaire} et configurez-le comme suit :
\begin{center}
\includegraphics[width=15cm]{img/Seuil.png}
\par\end{center}
Retournez à la fenêtre \textit{Ouvrages hydrauliques}.
Sélectionnez le pont RD101 et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour éditer les lois de cet ouvrage.
% Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires.
% Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage.
Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont.
Créez deux ouvrages hydrauliques élémentaires à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} et définissez-les comme suit :
\begin{center}
\includegraphics[width=15cm]{img/SeuilRD101.png}
\includegraphics[width=15cm]{img/OrificeRD101.png}
\par\end{center}
Revenez à la fenêtre \textit{Ouvrages hydrauliques} et appliquez la même procédure pour le pont de Thivencelle :
% \begin{center}
% \includegraphics[width=15cm]{img/SeuilThivencelle.png}
%
% \includegraphics[width=15cm]{img/OrificeThivencelle.png}
% \par\end{center}
\begin{center}
\begin{tabular}{|c|c|}
\hline
\multicolumn{2}{|c|}{Orifice Thivencelle} \\ \hline
Largeur & 9.07 \\ \hline
cote & 17.28\\ \hline
cote de mise en charge & 20.74\\ \hline
coefficient de débit & 0.4\\ \hline
cote de mise en charge maximale & 9999.999\\ \hline
\end{tabular}
\hspace{1cm}
\begin{tabular}{|c|c|}
\hline
\multicolumn{2}{|c|}{Seuil Thivencelle} \\ \hline
Largeur & 13.0 \\ \hline
cote & 21.74\\ \hline
coefficient de débit & 0.4\\ \hline
\end{tabular}\\
\par\end{center}
Vous pouvez maintenant fermer les fenêtres \textit{Ouvrages hydrauliques}.
Si vous réouvrez la fenêtre \textit{Géométrie} vous pouvez voir apparaitre la position des ouvrages hydrauliques sur la vue longitudinale.
\section{Paramètres du solveur}
Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Parameters numériques des solveurs]}.
Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \texttt{[Mage v8]}.
Ces paramètres pilotent le comportement du solveur numérique.
la valeur 999:99:00:00 du temps final indique au solveur de s'arrêter lorsqu'il a atteint un régime permanent.
Vous pouvez changer la fréquence d'écriture des résultats dans la ligne \textit{Pas de temps d'écriture dans le fichier .BIN}.
Une valeur inférieure à 1 seconde indique que la valeur de la ligne \textit{Pas de temps d'écriture dans le fichier .TRA} s sera prise à la place.
% En effet, durant la montée du pic de crue, le solveur a besoin de réduire le pas de temps suffisament pour permettre la convergence des itérations.
Pour accélérer les calculs et pour aider le solveur à démarer, nous allons l'autoriser à dégrader la précision, à l'aide des facteurs de réduction de la précision.
Les précisions internes du solveur sont de 10$^{-9}$.
Cette précision est multipliée par le facteur de réduction de la précision : un facteur de 1000 ramènera donc la précision à 10$^{-5}$.
Pour utiliser ce facteur de réduction de la précision, il faut donner un \textit{nombre d'itérations à précision maximum} inférieur au \textit{nombre maximum d'itérations} : le solveur va d'abord tenter de converger avec un certain nombre d'itératons à la précision maximum avant de basculer sur une précision dégradée pour le reste des itérations.
Dans notre cas, c'est nécessaire pour lancer le solveur à partir de la condition initiale calculée par Pamhyr2.
rentrez 1000 dans les trois lignes \textit{facteurs de réduction de la précision}, rentrez 99 pour le \textit{Nombre d'itérations} et 5 pour le \textit{nombre d'itérations à la précision maximum}.
Gardez les autres paramètres du solveur par défaut.
Fermer la fenêtre \textit{Paramètres du solveur}.
\section{Lancer la simulation}
Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Lancer le solveur]}.
Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Lancer}.
La fenêtre \textit{Log du solveur} s'ouvre.
Cette fenêtre affiche les sorties texte du solveur.
À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul en cliquant sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.
\section{Visualiser les résultats}
il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale.
Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section dans ce bief.
Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}.
Vous pouvez utiliser le curseur du bas pour visualiser les résultats à différents pas de temps.
Les croix rouges dans les deux vues du haut correspondent aux points ou l'eau déborde de la géométrie au moins une fois dans la simulation.
En pratique il n'y a pas de perte de volume par débordement en dehors du modèle, car le solveur ajoute un mur virtuel aux extrémités des sections.
Pour visualiser le débit, passez à l'onglet \textit{Hydrogramme}.
Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre.
Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \texttt{[OK]}.
Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Résultats}.
Le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} vous permet d'exporter les résultats au format CSV pour une utilisation en dehors de Pamhyr2.
\pagebreak{}
\end{document}
+342
View File
@@ -0,0 +1,342 @@
%% LyX 2.0.2 created this file. For more info, see http://www.lyx.org/.
%% Do not edit unless you really know what you are doing.
\documentclass[12pt,french]{article}
\usepackage[T1]{fontenc}
\usepackage[latin9]{inputenc}
\usepackage{geometry}
\geometry{verbose,tmargin=2cm,bmargin=2cm,lmargin=2cm,rmargin=2cm,headheight=2cm,headsep=2cm,footskip=2cm}
\usepackage{textcomp}
\usepackage{graphicx}
\usepackage{hyperref}
\makeatletter
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
\newcommand{\noun}[1]{\textsc{#1}}
%% Because html converters don't know tabularnewline
\providecommand{\tabularnewline}{\\}
\makeatother
\usepackage{babel}
\addto\extrasfrench{%
\providecommand{\og}{\leavevmode\flqq~}%
\providecommand{\fg}{\ifdim\lastskip>\z@\unskip\fi~\frqq}%
}
\begin{document}
\includegraphics[width=5cm]{img/Logo-INRAE_Transparent.png}
~
~
~
\begin{center}
Tutorial for Pamhyr2
January 2024
\par\end{center}
~
~
\begin{center}
\textbf{\LARGE 1D Modeling of the Hogneau River (Nord, France)}
using Pamhyr2
\par\end{center}{\LARGE \par}
~
~
\begin{center}
{\large INRAE Lyon-Grenoble Auvergne-Rhône-Alpes}
\par\end{center}{\large \par}
\begin{center}
RiverLy, river hydraulics
\par\end{center}
~
~
~
~
~
~
\begin{center}
\begin{tabular}{lll}
Authors : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
& Théophile Terraz & theophile.terraz@inrae.fr\tabularnewline
& Lionel Pénard & lionel.penard@inrae.fr\tabularnewline
\end{tabular}
\par\end{center}
~
\pagebreak{}
\begin{center}
\tableofcontents{}
\par\end{center}
~
\pagebreak{}
% \section{Introduction}
%
% TODO
%
% \pagebreak{}
\section{Install Pamhyr2}
Pamhyr2 can be downloaded from \url{https://gitlab.irstea.fr/theophile.terraz/pamhyr}.
\begin{center}
\includegraphics[width=15cm]{img/dl.png}
\par\end{center}
Use the GNU Linux or the Windows download button depending on your system. On windows, launch the installer. On Linux, unpack the archive and launch Pamhyr2.
\section{Create your first study}
On the main windows, click on \texttt{[Files] => [New Study]} to create a new study.
Give it a name, for example \textit{Hogneau}, and validate.
\begin{center}
\includegraphics[width=15cm]{img/NEWSTUDY.png}
\par\end{center}
During study, don't forget to save periodicaly your work, using the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} button on the main window.
\section{Create the structure of the river}
Click on \texttt{[River Network] => [Edit River Network]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} shortcut to create the structure of your river.
In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
A default reach exists in a new study.
For this tutorial, we will delete it:
click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} button to enter the \textit{Delete} mode, then click on the nodes.
We can now start with an empty window.
Press the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to enter the \textit{Add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node.
Press \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} again to exit the \textit{Add} mode.
You created your first reach, with an upstream node and a downstream node.
In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches.
As the reach you created is automaticaly selected, all the next steps will apply to this reach.
The window should look like that:
\begin{center}
\includegraphics[width=15cm]{img/network.png}
\par\end{center}
Close the \textit{Edit River Network} window.
\section{Edit the river geometry}
Click on \texttt{[Geometry] => [Edit Geometry]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} shortcut to define the geometry of the selected reach.
Click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} button and select the file \texttt{Data/Bief\_1.st}.
You should see:
\begin{center}
\includegraphics[width=15cm]{img/Geo.png}
\par\end{center}
On the left panel is a list of all the cross sections with their name and longitudinal abscisa.
In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black).
You can move in the section list using the right table or by clicking on the sections on one of the two upper plot.
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:
\begin{center}
\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 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]} 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 \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 \textit{Q(t)} law.
Select the \textit{Node} cell and atribute this condition to the upstream node.
Names of the nodes are recalled in the right panel with the network view.
Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
You opened the \textit{Edit Boundary Conditions} window.
In a text editor, open the \texttt{Data/Fevrier\_2002.txt} file.
Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}.
You can now see the flow discharge curve:
\begin{center}
\includegraphics[width=15cm]{img/fev2002.png}
\par\end{center}
Close this window.
Go back on the \textit{Boundary Conditions} window.
Add a new line, give it a name, give it the textit{Q(Z)} type (rating curve) and associate it to the downstream node of the network.
This downstream boundary condition corresponds to a weir.
There, the river transition from a fluvial flow to a torrential flow.
This allows us to compute a rating curve corresponding to the critical flow located over the weir.
Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
In the \textit{Edit boundary conditions} window click on \texttt{[Générer régime critique]} to comput the said rating curve.
Click on \texttt{[Make increasing]} to remove the points of the curve that are not strictly increasing.
You can close the the \textit{Edit Boundary Conditions} and the \textit{Boundary Conditions} window.
\section{Create initial conditions}
From the main window, click on \texttt{[Hydraulics] => [Initial conditions]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"} shortcut.
To start, the numerical solver needs to know the water elevation and the discharge at every cross-section of the river.
If you don't know the initial water elevation and flow discharge conditions of the river, you can use the \texttt{[Generate minimal depth]}, \texttt{[Generate from discharge]} or \texttt{[Generate elevation]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window, and check the \texttt{[Generate depth]} to generate an initial water elevation condition based on the Manning-Strickler formula.
You should see:
\begin{center}
\includegraphics[width=15cm]{img/ic.png}
\par\end{center}
You can alternately use \texttt{[Generate elevation]} to enter a constant elevation of $21 m$ (upstream and downstream) associated with a null discharge.
The goal is to create a lake and to let the solver drain it to find a suitable initial state.
In your next simulations, you can use the final timestep of the previous simulation as an initial condition.
To do that, click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} and find the results contained in a \textit{.BIN} file.
This file should be in the sub-directory \textit{\_PAMHYR\_/Hogneau/default-mage}.
Close the \textit{Initial conditions} window.
\section{Edit friction coefficients}
We will now define the friction coefficients of the bottom of the river.
From the main window, click on \texttt{[Hydraulics] => [Edit friction]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"} shortcut.
You have to define sets of Strickler coefficients first.
Click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to open the \textit{Strickler} window.
Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed.
Click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} four times to create four new couples.
Give them the folowing values:
\begin{center}
\includegraphics[width=15cm]{img/K.png}
\par\end{center}
You can use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} button to sort the couples by alphabetical order.
Close the \textit{Strickler} window.
On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to create four friction zones.
Each zone is defined by a \textit{begin} and \textit{end} KP associated with a \textit{begin} and \textit{end} Strickler couple.
The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples.
In our case, we will use uniform coefficients per zone.
Set the zones as follow:
\begin{center}
\includegraphics[width=15cm]{img/frictions.png}
\par\end{center}
The selected zone is highlighted in blue. Close the \textit{Edit friction} window.
\section{Model hydraulic structures}
Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow.
In that case, we have to define an other law to link the water elevation and the flow discharge.
This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge.
Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized.
In our case, two bridges have to be represented as hydraulic structures.
From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window.
Click two times on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button to create two hydraulic structures.
Each structure can have a name and must have a reach and a KP.
Set them as follow:
\begin{center}
\includegraphics[width=15cm]{img/hs.png}
\par\end{center}
Select the RD101 bridge and click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to edit the laws of this structure.
Hydraulic structures are composed of basic hydraulic structures.
You can combine the laws of several basic hydraulic structures to setup your structure.
A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge.
Create two basic hydraulic structures with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} and set them as folow:
\begin{center}
\includegraphics[width=15cm]{img/seuilRD101.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/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 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.
% TODO precision
Close the \textit{solver parameters} window.
\section{Run the simulation}
From the main window, click on \texttt{[Execute] => [Run solver]}.
Select \textit{Defaut-Mage - (Mage8)} anc click on the \textit{Run} button.
It will open the \textit{Solver log} window.
The \textit{Solver log} window displays the outputs of the solver.
From the \textit{Solver log} window you can re-run the computation with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, and you can click on the \textit{Results} button to open the \textit{Results} window.
\section{Visualize the results}
If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window.
The top left panel let you select your reach, the bottom left panel lets you select a cross-section in that reach.
the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window.
You can use the bottom slider to visualize the results at different timesteps.
The red crosses in the graphs corresponds to sections where the water level exceeds the limits of the geometry at least one time during the simulation.
This does not corresponds to water leaks, as the solver artificialy adds a virtual wall at both ends of the cross-sections geometry.
To visualize the flow discharge, switch to the \textit{Hydrograph} tab.
To create custom 2D plots, click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window.
Select the values you want on the $X$ and $Y$ axis and click on \texttt{[OK]}.
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.
Binary file not shown.
Binary file not shown.
Loaded 100 of 535 files, more files were not shown because too many files have changed in this diff. Show more