diff --git a/NEWS.txt b/NEWS.txt
index 690af010e7282daa8470439631a46ea14ac593e3..14bbc2d090b39dde091e81953713f30773e22d79 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,5 +1,11 @@
Latest developments on main
===========================
+Python: Add features to MascaretGeoFile class:
+ - reading topo-bathy information,
+ - reading sediment layers in Courlis geometry files,
+ - new method to generate GIS file formatted for PreCourlis QGIS plugin.
+Modification of Section (class of mascaret_file.py) to store topo-bathy data
+
GAIA: new user subroutines for settling velocities and hindered formulations.
TOMAWAC: Default value of keyword STATIONARY WIND is changed to .FALSE.
diff --git a/notebooks/postel/example_courlis.ipynb b/notebooks/postel/example_courlis.ipynb
index aa06118c96e9087454eb87b4be9315fb0f982eed..ef305bd3545c21725aa35accff47cc931b024eca 100644
--- a/notebooks/postel/example_courlis.ipynb
+++ b/notebooks/postel/example_courlis.ipynb
@@ -54,190 +54,136 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "\r\n",
- "\r\n",
- "Loading Options and Configurations\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- " _ \r\n",
- " (_) \r\n",
- " _ __ ___ __ _ _ _ __ \r\n",
- " | '_ ` _ \\ / _` || || '_ \\ \r\n",
- " | | | | | || (_| || || | | |\r\n",
- " |_| |_| |_| \\__,_||_||_| |_|\r\n",
- " \r\n",
- " \r\n",
- "\r\n",
- "\r\n",
- "Running your CAS file(s) for:\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "S10.gfortran.dyn: \r\n",
- " \r\n",
- "\r\n",
- " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\r\n",
- "\r\n",
- " +> root: /home/d60881/telemac-mascaret\r\n",
- " +> module: ad / api / artemis / bief\r\n",
- " damocles / gaia / gretel / hermes\r\n",
- " identify_liq_bnd / khione / mascaret / nestor\r\n",
- " parallel / partel / postel3d / sisyphe\r\n",
- " special / stbtel / telemac2d / telemac3d\r\n",
- " tomawac / waqtel\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "... processing the steering file\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- "... checking parallelisation\r\n",
- "\r\n",
- "... handling temporary directories\r\n",
- "~+> Creating FichierCas.txt\r\n",
- "[ ] 0% | ---s\r",
- " \r",
- "[ ] 0% | ---s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 25% | 1s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 50% | 1s\r",
- " \r",
- "\r\n",
- "... checking the executable\r\n",
- "\r\n",
- "\r\n",
- "Running your simulation(s) :\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "In /home/d60881/telemac-mascaret/examples/courlis/Soni:\r\n",
- "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\r\n",
- "\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Fichiercas : FichierCas.txt\r\n",
- "\r\n",
- " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\r\n",
- "\r\n",
- " Data File : sarap.xcas\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Clip Evolution = 0.5000E-01\r\n",
- "\r\n",
- " Pente locale : F\r\n",
- "\r\n",
- " Attention, diametres nuls ou non renseignes dans le fichier cas\r\n",
- " Utilisation de formules a partir du d50 pour determiner les diametres ci-dessous :\r\n",
- "\r\n",
- " Parametres utilises seulement pour les formules de transport de Recking et de Lefort\r\n",
- " D84 = 0.6720E-03\r\n",
- " Diametre moyen = 0.3520E-03\r\n",
- "\r\n",
- " Parametre utilise seulement pour la formule de transport de Lefort\r\n",
- " D16 = 0.1600E-03\r\n",
- "\r\n",
- " Bedload option : T\r\n",
- "\r\n",
- " Suspension option : F\r\n",
- "\r\n",
- " sediment slide option : F\r\n",
- "\r\n",
- " planim clipping option : F\r\n",
- "\r\n",
- " absolute clipping = 0.1000E-04\r\n",
- " 1\r\n",
- "\r\n",
- " bedload transport law is Meyer-Peter-Mueller\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Study name : Etude hydraulique1d\r\n",
- "\r\n",
- " Hydraulic statistics (prior solve phase)\r\n",
- " ------ Geometric parameters ------\r\n",
- " Number of reach(es) = 1\r\n",
- " Number of cross-sections = 121\r\n",
- " Number of open boundaries = 2\r\n",
- " Number of junction(s) = 0\r\n",
- " Number of inflow(s) = 0\r\n",
- " Number of lateral weir(s) = 0\r\n",
- " Number of storage area(s) = 0\r\n",
- " Number of link(s) = 0\r\n",
- " Number of dam(s)/weir(s) = 0\r\n",
- " ------ Numerical parameters ------\r\n",
- " Number of 1D nodes (mesh) = 121\r\n",
- " Computation Kernel = 1\r\n",
- " Initial time step = 5.0E-01\r\n",
- " Variable time step? = 0\r\n",
- " Simulation time = 5.4E+03\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " OptionCourlis T\r\n",
- " Start the Simulation...\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Simulation ended successfully in 9.67529964 s\r\n",
- " Simulation ended successfully in 9.67544079 s\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- " CPT_PLANIM = 125731\r\n",
- " TEMPS PASSE 9.68791866\r\n",
- " FIN CORRECTE DU CALCUL\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "... merging separated result files\r\n",
- "\r\n",
- "... handling result files\r\n",
- "\r\n",
- "... deleting working dir\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "My work is done\r\n",
- "\r\n",
- "\r\n"
+ "\n",
+ "\n",
+ "Loading Options and Configurations\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ " _ \n",
+ " (_) \n",
+ " _ __ ___ __ _ _ _ __ \n",
+ " | '_ ` _ \\ / _` || || '_ \\ \n",
+ " | | | | | || (_| || || | | |\n",
+ " |_| |_| |_| \\__,_||_||_| |_|\n",
+ " \n",
+ " \n",
+ "\n",
+ "\n",
+ "Running your CAS file(s) for:\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "S10.gfortran.dyn: \n",
+ " \n",
+ "\n",
+ " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\n",
+ "\n",
+ " +> root: /home/d60881/telemac-mascaret\n",
+ " +> module: ad / api / artemis / bief\n",
+ " damocles / gaia / gretel / hermes\n",
+ " identify_liq_bnd / khione / mascaret / nestor\n",
+ " parallel / partel / postel3d / sisyphe\n",
+ " special / stbtel / telemac2d / telemac3d\n",
+ " tomawac / waqtel\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "... processing the steering file\n",
+ "\n",
+ "... checking parallelisation\n",
+ "\n",
+ "... handling temporary directories\n",
+ "~+> Creating FichierCas.txt\n",
+ " \n",
+ "... checking the executable\n",
+ "\n",
+ "\n",
+ "Running your simulation(s) :\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "In /home/d60881/telemac-mascaret/examples/courlis/Soni:\n",
+ "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\n",
+ "\n",
+ "\n",
+ " Fichiercas : FichierCas.txt\n",
+ "\n",
+ " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\n",
+ "\n",
+ " Data File : sarap.xcas\n",
+ "\n",
+ " Clip Evolution = 0.5000E-01\n",
+ "\n",
+ " Pente locale : F\n",
+ "\n",
+ " Attention, diametres nuls ou non renseignes dans le fichier cas\n",
+ " Utilisation de formules a partir du d50 pour determiner les diametres ci-dessous :\n",
+ "\n",
+ " Parametres utilises seulement pour les formules de transport de Recking et de Lefort\n",
+ " D84 = 0.6720E-03\n",
+ " Diametre moyen = 0.3520E-03\n",
+ "\n",
+ " Parametre utilise seulement pour la formule de transport de Lefort\n",
+ " D16 = 0.1600E-03\n",
+ "\n",
+ " Bedload option : T\n",
+ "\n",
+ " Suspension option : F\n",
+ "\n",
+ " sediment slide option : F\n",
+ "\n",
+ " planim clipping option : F\n",
+ "\n",
+ " absolute clipping = 0.1000E-04\n",
+ " 1\n",
+ "\n",
+ " bedload transport law is Meyer-Peter-Mueller\n",
+ " Study name : Etude hydraulique1d\n",
+ "\n",
+ " Hydraulic statistics (prior solve phase)\n",
+ " ------ Geometric parameters ------\n",
+ " Number of reach(es) = 1\n",
+ " Number of cross-sections = 121\n",
+ " Number of open boundaries = 2\n",
+ " Number of junction(s) = 0\n",
+ " Number of inflow(s) = 0\n",
+ " Number of lateral weir(s) = 0\n",
+ " Number of storage area(s) = 0\n",
+ " Number of link(s) = 0\n",
+ " Number of dam(s)/weir(s) = 0\n",
+ " ------ Numerical parameters ------\n",
+ " Number of 1D nodes (mesh) = 121\n",
+ " Computation Kernel = 1\n",
+ " Initial time step = 5.0E-01\n",
+ " Variable time step? = 0\n",
+ " Simulation time = 5.4E+03\n",
+ "\n",
+ " OptionCourlis T\n",
+ " Start the Simulation...\n",
+ " Simulation ended successfully in 9.67529964 s\n",
+ " Simulation ended successfully in 9.67544079 s\n",
+ "\n",
+ " CPT_PLANIM = 125731\n",
+ " TEMPS PASSE 9.68791866\n",
+ " FIN CORRECTE DU CALCUL\n",
+ "\n",
+ "... merging separated result files\n",
+ "\n",
+ "... handling result files\n",
+ "\n",
+ "... deleting working dir\n",
+ "\n",
+ "\n",
+ "\n",
+ "My work is done\n",
+ "\n",
+ "\n"
]
}
],
@@ -265,183 +211,141 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "\r\n",
- "\r\n",
- "Loading Options and Configurations\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- " _ \r\n",
- " (_) \r\n",
- " _ __ ___ __ _ _ _ __ \r\n",
- " | '_ ` _ \\ / _` || || '_ \\ \r\n",
- " | | | | | || (_| || || | | |\r\n",
- " |_| |_| |_| \\__,_||_||_| |_|\r\n",
- " \r\n",
- " \r\n",
- "\r\n",
- "\r\n",
- "Running your CAS file(s) for:\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "S10.gfortran.dyn: \r\n",
- " \r\n",
- "\r\n",
- " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\r\n",
- "\r\n",
- " +> root: /home/d60881/telemac-mascaret\r\n",
- " +> module: ad / api / artemis / bief\r\n",
- " damocles / gaia / gretel / hermes\r\n",
- " identify_liq_bnd / khione / mascaret / nestor\r\n",
- " parallel / partel / postel3d / sisyphe\r\n",
- " special / stbtel / telemac2d / telemac3d\r\n",
- " tomawac / waqtel\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "... processing the steering file\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- "... checking parallelisation\r\n",
- "\r\n",
- "... handling temporary directories\r\n",
- "~+> Creating FichierCas.txt\r\n",
- "~+> Copying Abaques.txt\r\n",
- "~+> Copying Controle.txt\r\n",
- "~+> Copying dico_Courlis.txt\r\n",
- "[ ] 0% | ---s\r",
- " \r",
- "[ ] 0% | ---s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 25% | 1s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 50% | 1s\r",
- " \r",
- "\r\n",
- "... checking the executable\r\n",
- "\r\n",
- "\r\n",
- "Running your simulation(s) :\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "In /home/d60881/telemac-mascaret/examples/courlis/Garonne:\r\n",
- "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\r\n",
- "\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Fichiercas : FichierCas.txt\r\n",
- "\r\n",
- " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\r\n",
- "\r\n",
- " Data File : hydro_Torr.xcas\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Clip Evolution = 0.5000E-01\r\n",
- "\r\n",
- " Pente locale : F\r\n",
- "\r\n",
- " Attention, diametres nuls ou non renseignes dans le fichier cas\r\n",
- " Utilisation de formules a partir du d50 pour determiner les diametres ci-dessous :\r\n",
- "\r\n",
- " Parametres utilises seulement pour les formules de transport de Recking et de Lefort\r\n",
- " D84 = 0.2100E+01\r\n",
- " Diametre moyen = 0.1100E+01\r\n",
- "\r\n",
- " Parametre utilise seulement pour la formule de transport de Lefort\r\n",
- " D16 = 0.5000E+00\r\n",
- "\r\n",
- " Bedload option : F\r\n",
- "\r\n",
- " Suspension option : T\r\n",
- "\r\n",
- " sediment slide option : F\r\n",
- "\r\n",
- " planim clipping option : F\r\n",
- "\r\n",
- " absolute clipping = 0.1000E-04\r\n",
- " 1\r\n",
- "\r\n",
- " bedload transport law is Meyer-Peter-Mueller\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Study name : Etude hydraulique1d\r\n",
- "\r\n",
- " Hydraulic statistics (prior solve phase)\r\n",
- " ------ Geometric parameters ------\r\n",
- " Number of reach(es) = 1\r\n",
- " Number of cross-sections = 103\r\n",
- " Number of open boundaries = 2\r\n",
- " Number of junction(s) = 0\r\n",
- " Number of inflow(s) = 0\r\n",
- " Number of lateral weir(s) = 0\r\n",
- " Number of storage area(s) = 0\r\n",
- " Number of link(s) = 0\r\n",
- " Number of dam(s)/weir(s) = 0\r\n",
- " ------ Numerical parameters ------\r\n",
- " Number of 1D nodes (mesh) = 103\r\n",
- " Computation Kernel = 3\r\n",
- " Initial time step = 1.0E+00\r\n",
- " Variable time step? = 0\r\n",
- " Implicit Scheme? = 0\r\n",
- " Non Hydrostatic? = 0\r\n",
- " Simulation time = 3.0E+03\r\n",
- "\r\n",
- " OptionCourlis T\r\n",
- " Start the Simulation...\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Simulation ended successfully in 3.20090008 s\r\n",
- " Simulation ended successfully in 3.20156407 s\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- " CPT_PLANIM = 13020\r\n",
- " TEMPS PASSE 3.26590896\r\n",
- " FIN CORRECTE DU CALCUL\r\n",
- "\r\n",
- "... merging separated result files\r\n",
- "\r\n",
- "... handling result files\r\n",
- "\r\n",
- "... deleting working dir\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "My work is done\r\n",
- "\r\n",
- "\r\n"
+ "\n",
+ "\n",
+ "Loading Options and Configurations\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ " _ \n",
+ " (_) \n",
+ " _ __ ___ __ _ _ _ __ \n",
+ " | '_ ` _ \\ / _` || || '_ \\ \n",
+ " | | | | | || (_| || || | | |\n",
+ " |_| |_| |_| \\__,_||_||_| |_|\n",
+ " \n",
+ " \n",
+ "\n",
+ "\n",
+ "Running your CAS file(s) for:\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "S10.gfortran.dyn: \n",
+ " \n",
+ "\n",
+ " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\n",
+ "\n",
+ " +> root: /home/d60881/telemac-mascaret\n",
+ " +> module: ad / api / artemis / bief\n",
+ " damocles / gaia / gretel / hermes\n",
+ " identify_liq_bnd / khione / mascaret / nestor\n",
+ " parallel / partel / postel3d / sisyphe\n",
+ " special / stbtel / telemac2d / telemac3d\n",
+ " tomawac / waqtel\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "... processing the steering file\n",
+ "\n",
+ "... checking parallelisation\n",
+ "\n",
+ "... handling temporary directories\n",
+ "~+> Creating FichierCas.txt\n",
+ "~+> Copying Abaques.txt\n",
+ "~+> Copying Controle.txt\n",
+ "~+> Copying dico_Courlis.txt\n",
+ " \n",
+ "... checking the executable\n",
+ "\n",
+ "\n",
+ "Running your simulation(s) :\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "In /home/d60881/telemac-mascaret/examples/courlis/Garonne:\n",
+ "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\n",
+ "\n",
+ "\n",
+ " Fichiercas : FichierCas.txt\n",
+ "\n",
+ " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\n",
+ "\n",
+ " Data File : hydro_Torr.xcas\n",
+ "\n",
+ " Clip Evolution = 0.5000E-01\n",
+ "\n",
+ " Pente locale : F\n",
+ "\n",
+ " Attention, diametres nuls ou non renseignes dans le fichier cas\n",
+ " Utilisation de formules a partir du d50 pour determiner les diametres ci-dessous :\n",
+ "\n",
+ " Parametres utilises seulement pour les formules de transport de Recking et de Lefort\n",
+ " D84 = 0.2100E+01\n",
+ " Diametre moyen = 0.1100E+01\n",
+ "\n",
+ " Parametre utilise seulement pour la formule de transport de Lefort\n",
+ " D16 = 0.5000E+00\n",
+ "\n",
+ " Bedload option : F\n",
+ "\n",
+ " Suspension option : T\n",
+ "\n",
+ " sediment slide option : F\n",
+ "\n",
+ " planim clipping option : F\n",
+ "\n",
+ " absolute clipping = 0.1000E-04\n",
+ " 1\n",
+ "\n",
+ " bedload transport law is Meyer-Peter-Mueller\n",
+ " Study name : Etude hydraulique1d\n",
+ "\n",
+ " Hydraulic statistics (prior solve phase)\n",
+ " ------ Geometric parameters ------\n",
+ " Number of reach(es) = 1\n",
+ " Number of cross-sections = 103\n",
+ " Number of open boundaries = 2\n",
+ " Number of junction(s) = 0\n",
+ " Number of inflow(s) = 0\n",
+ " Number of lateral weir(s) = 0\n",
+ " Number of storage area(s) = 0\n",
+ " Number of link(s) = 0\n",
+ " Number of dam(s)/weir(s) = 0\n",
+ " ------ Numerical parameters ------\n",
+ " Number of 1D nodes (mesh) = 103\n",
+ " Computation Kernel = 3\n",
+ " Initial time step = 1.0E+00\n",
+ " Variable time step? = 0\n",
+ " Implicit Scheme? = 0\n",
+ " Non Hydrostatic? = 0\n",
+ " Simulation time = 3.0E+03\n",
+ "\n",
+ " OptionCourlis T\n",
+ " Start the Simulation...\n",
+ " Simulation ended successfully in 3.20090008 s\n",
+ " Simulation ended successfully in 3.20156407 s\n",
+ "\n",
+ " CPT_PLANIM = 13020\n",
+ " TEMPS PASSE 3.26590896\n",
+ " FIN CORRECTE DU CALCUL\n",
+ "\n",
+ "... merging separated result files\n",
+ "\n",
+ "... handling result files\n",
+ "\n",
+ "... deleting working dir\n",
+ "\n",
+ "\n",
+ "\n",
+ "My work is done\n",
+ "\n",
+ "\n"
]
}
],
@@ -2020,7 +1924,7 @@
"\n",
" for j in range(nlayers):\n",
" thickness_table = layers_elevation[1][i][j+1] - layers_elevation[1][i][j+2]\n",
- " section.add_layer(thickness_table)\n",
+ " section.add_layer_from_thickness(thickness_table)\n",
"\n",
" reach.add_section(section)\n",
"\n",
@@ -16709,7 +16613,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
diff --git a/notebooks/postel/example_mascaret.ipynb b/notebooks/postel/example_mascaret.ipynb
index 7b285a1497208ce63c92d77440d957c54ae1d942..4063278e123307a780dcf1a1c7eaba9c4dad99ad 100644
--- a/notebooks/postel/example_mascaret.ipynb
+++ b/notebooks/postel/example_mascaret.ipynb
@@ -31,7 +31,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "~> MascaretGeoFile: /home/d60881/telemac-mascaret/examples/mascaret/Test6/geometrie\n",
+ "~> MascaretGeoFile: /home/A54371/TELEMAC/dev/telemac-mascaret/examples/mascaret/Test6/geometrie\n",
" - Reach #1 (Bief_1) with 30 sections\n",
" 1) Section #1 (prof1_1) at pk 0.000000\n",
" 2) Section #2 (prof1_2) at pk 50.000000\n",
@@ -64,7 +64,7 @@
" 29) Section #29 (prof1_29) at pk 1000.000000\n",
" 30) Section #30 (prof1_30) at pk 1500.000000\n",
"\n",
- "~> MascaretGeoFile: /home/d60881/telemac-mascaret/examples/mascaret/Test15/mascaret0.geo\n",
+ "~> MascaretGeoFile: /home/A54371/TELEMAC/dev/telemac-mascaret/examples/mascaret/Test15/mascaret0.geo\n",
" - Reach #1 (Bief_1) with 2 sections\n",
" 1) Section #1 (PK1) at pk 0.000000\n",
" 2) Section #2 (PK1bis) at pk 6.800000\n",
@@ -85,7 +85,7 @@
"# File with a single reach\n",
"mascgeo_file = MascaretGeoFile(os.path.join(os.environ['HOMETEL'],\n",
" 'examples', 'mascaret', 'Test6', 'geometrie'),\n",
- " 'geo')\n",
+ " fformat='geo')\n",
"print(mascgeo_file.summary())\n",
"\n",
"# File with multiples reaches\n",
@@ -125,140 +125,110 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "\r\n",
- "\r\n",
- "Loading Options and Configurations\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- " _ \r\n",
- " (_) \r\n",
- " _ __ ___ __ _ _ _ __ \r\n",
- " | '_ ` _ \\ / _` || || '_ \\ \r\n",
- " | | | | | || (_| || || | | |\r\n",
- " |_| |_| |_| \\__,_||_||_| |_|\r\n",
- " \r\n",
- " \r\n",
- "\r\n",
- "\r\n",
- "Running your CAS file(s) for:\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "S10.gfortran.dyn: \r\n",
- " \r\n",
- "\r\n",
- " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\r\n",
- "\r\n",
- " +> root: /home/d60881/telemac-mascaret\r\n",
- " +> module: ad / api / artemis / bief\r\n",
- " damocles / gaia / gretel / hermes\r\n",
- " identify_liq_bnd / khione / mascaret / nestor\r\n",
- " parallel / partel / postel3d / sisyphe\r\n",
- " special / stbtel / telemac2d / telemac3d\r\n",
- " tomawac / waqtel\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "... processing the steering file\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- "... checking parallelisation\r\n",
- "\r\n",
- "... handling temporary directories\r\n",
- "~+> Creating FichierCas.txt\r\n",
- "~+> Copying Abaques.txt\r\n",
- "~+> Copying Controle.txt\r\n",
- "~+> Copying dico_Courlis.txt\r\n",
- "[ ] 0% | ---s\r",
- " \r",
- "[ ] 0% | ---s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 25% | 1s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 50% | 1s\r",
- " \r",
- "\r\n",
- "... checking the executable\r\n",
- "\r\n",
- "\r\n",
- "Running your simulation(s) :\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "In /home/d60881/telemac-mascaret/examples/mascaret/Test18:\r\n",
- "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\r\n",
- "\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Fichiercas : FichierCas.txt\r\n",
- "\r\n",
- " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\r\n",
- "\r\n",
- " Data File : sarap.xcas\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Study name : deversoir\r\n",
- "\r\n",
- " Hydraulic statistics (prior solve phase)\r\n",
- " ------ Geometric parameters ------\r\n",
- " Number of reach(es) = 1\r\n",
- " Number of cross-sections = 8\r\n",
- " Number of open boundaries = 2\r\n",
- " Number of junction(s) = 0\r\n",
- " Number of inflow(s) = 18\r\n",
- " Number of lateral weir(s) = 0\r\n",
- " Number of storage area(s) = 0\r\n",
- " Number of link(s) = 0\r\n",
- " Number of dam(s)/weir(s) = 0\r\n",
- " ------ Numerical parameters ------\r\n",
- " Number of 1D nodes (mesh) = 144\r\n",
- " Computation Kernel = 1\r\n",
- " Initial time step = 1.0E+00\r\n",
- " Variable time step? = 0\r\n",
- " Number of time steps = 2\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " OptionCourlis F\r\n",
- " Start the Simulation...\r\n",
- " Simulation ended successfully in 1.89149976E-02 s\r\n",
- " TEMPS PASSE 1.89249963E-02\r\n",
- " FIN CORRECTE DU CALCUL\r\n",
- "\r\n",
- "... merging separated result files\r\n",
- "\r\n",
- "... handling result files\r\n",
- "\r\n",
- "... deleting working dir\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "My work is done\r\n",
- "\r\n",
- "\r\n"
+ "\n",
+ "\n",
+ "Loading Options and Configurations\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ " _ \n",
+ " (_) \n",
+ " _ __ ___ __ _ _ _ __ \n",
+ " | '_ ` _ \\ / _` || || '_ \\ \n",
+ " | | | | | || (_| || || | | |\n",
+ " |_| |_| |_| \\__,_||_||_| |_|\n",
+ " \n",
+ " \n",
+ "\n",
+ "\n",
+ "Running your CAS file(s) for:\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "S10.gfortran.dyn: \n",
+ " \n",
+ "\n",
+ " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\n",
+ "\n",
+ " +> root: /home/d60881/telemac-mascaret\n",
+ " +> module: ad / api / artemis / bief\n",
+ " damocles / gaia / gretel / hermes\n",
+ " identify_liq_bnd / khione / mascaret / nestor\n",
+ " parallel / partel / postel3d / sisyphe\n",
+ " special / stbtel / telemac2d / telemac3d\n",
+ " tomawac / waqtel\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "... processing the steering file\n",
+ "\n",
+ "... checking parallelisation\n",
+ "\n",
+ "... handling temporary directories\n",
+ "~+> Creating FichierCas.txt\n",
+ "~+> Copying Abaques.txt\n",
+ "~+> Copying Controle.txt\n",
+ "~+> Copying dico_Courlis.txt\n",
+ " \n",
+ "... checking the executable\n",
+ "\n",
+ "\n",
+ "Running your simulation(s) :\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "In /home/d60881/telemac-mascaret/examples/mascaret/Test18:\n",
+ "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\n",
+ "\n",
+ "\n",
+ " Fichiercas : FichierCas.txt\n",
+ "\n",
+ " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\n",
+ "\n",
+ " Data File : sarap.xcas\n",
+ "\n",
+ " Study name : deversoir\n",
+ "\n",
+ " Hydraulic statistics (prior solve phase)\n",
+ " ------ Geometric parameters ------\n",
+ " Number of reach(es) = 1\n",
+ " Number of cross-sections = 8\n",
+ " Number of open boundaries = 2\n",
+ " Number of junction(s) = 0\n",
+ " Number of inflow(s) = 18\n",
+ " Number of lateral weir(s) = 0\n",
+ " Number of storage area(s) = 0\n",
+ " Number of link(s) = 0\n",
+ " Number of dam(s)/weir(s) = 0\n",
+ " ------ Numerical parameters ------\n",
+ " Number of 1D nodes (mesh) = 144\n",
+ " Computation Kernel = 1\n",
+ " Initial time step = 1.0E+00\n",
+ " Variable time step? = 0\n",
+ " Number of time steps = 2\n",
+ "\n",
+ " OptionCourlis F\n",
+ " Start the Simulation...\n",
+ " Simulation ended successfully in 1.89149976E-02 s\n",
+ " TEMPS PASSE 1.89249963E-02\n",
+ " FIN CORRECTE DU CALCUL\n",
+ "\n",
+ "... merging separated result files\n",
+ "\n",
+ "... handling result files\n",
+ "\n",
+ "... deleting working dir\n",
+ "\n",
+ "\n",
+ "\n",
+ "My work is done\n",
+ "\n",
+ "\n"
]
}
],
@@ -285,141 +255,111 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "\r\n",
- "\r\n",
- "Loading Options and Configurations\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- " _ \r\n",
- " (_) \r\n",
- " _ __ ___ __ _ _ _ __ \r\n",
- " | '_ ` _ \\ / _` || || '_ \\ \r\n",
- " | | | | | || (_| || || | | |\r\n",
- " |_| |_| |_| \\__,_||_||_| |_|\r\n",
- " \r\n",
- " \r\n",
- "\r\n",
- "\r\n",
- "Running your CAS file(s) for:\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "S10.gfortran.dyn: \r\n",
- " \r\n",
- "\r\n",
- " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\r\n",
- "\r\n",
- " +> root: /home/d60881/telemac-mascaret\r\n",
- " +> module: ad / api / artemis / bief\r\n",
- " damocles / gaia / gretel / hermes\r\n",
- " identify_liq_bnd / khione / mascaret / nestor\r\n",
- " parallel / partel / postel3d / sisyphe\r\n",
- " special / stbtel / telemac2d / telemac3d\r\n",
- " tomawac / waqtel\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "... processing the steering file\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- "... checking parallelisation\r\n",
- "\r\n",
- "... handling temporary directories\r\n",
- "~+> Creating FichierCas.txt\r\n",
- "~+> Copying Abaques.txt\r\n",
- "~+> Copying Controle.txt\r\n",
- "~+> Copying dico_Courlis.txt\r\n",
- "[ ] 0% | ---s\r",
- " \r",
- "[ ] 0% | ---s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 25% | 1s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 50% | 1s\r",
- " \r",
- "\r\n",
- "... checking the executable\r\n",
- "\r\n",
- "\r\n",
- "Running your simulation(s) :\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "In /home/d60881/telemac-mascaret/examples/mascaret/Test26:\r\n",
- "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\r\n",
- "\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Fichiercas : FichierCas.txt\r\n",
- "\r\n",
- " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\r\n",
- "\r\n",
- " Data File : rezo.xcas\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Study name : Etude hydraulique1d\r\n",
- "\r\n",
- " Hydraulic statistics (prior solve phase)\r\n",
- " ------ Geometric parameters ------\r\n",
- " Number of reach(es) = 3\r\n",
- " Number of cross-sections = 6\r\n",
- " Number of open boundaries = 3\r\n",
- " Number of junction(s) = 1\r\n",
- " Number of inflow(s) = 0\r\n",
- " Number of lateral weir(s) = 0\r\n",
- " Number of storage area(s) = 3\r\n",
- " Number of link(s) = 5\r\n",
- " Number of dam(s)/weir(s) = 0\r\n",
- " ------ Numerical parameters ------\r\n",
- " Number of 1D nodes (mesh) = 63\r\n",
- " Computation Kernel = 2\r\n",
- " Initial time step = 1.0E+01\r\n",
- " Variable time step? = 0\r\n",
- " Reduced Momentum Equation?= 0\r\n",
- " Number of time steps = 1000\r\n",
- "\r\n",
- " OptionCourlis F\r\n",
- " Start the Simulation...\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Simulation ended successfully in 0.225221008 s\r\n",
- " TEMPS PASSE 0.225605994\r\n",
- " FIN CORRECTE DU CALCUL\r\n",
- "\r\n",
- "... merging separated result files\r\n",
- "\r\n",
- "... handling result files\r\n",
- "\r\n",
- "... deleting working dir\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "My work is done\r\n",
- "\r\n",
- "\r\n"
+ "\n",
+ "\n",
+ "Loading Options and Configurations\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ " _ \n",
+ " (_) \n",
+ " _ __ ___ __ _ _ _ __ \n",
+ " | '_ ` _ \\ / _` || || '_ \\ \n",
+ " | | | | | || (_| || || | | |\n",
+ " |_| |_| |_| \\__,_||_||_| |_|\n",
+ " \n",
+ " \n",
+ "\n",
+ "\n",
+ "Running your CAS file(s) for:\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "S10.gfortran.dyn: \n",
+ " \n",
+ "\n",
+ " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\n",
+ "\n",
+ " +> root: /home/d60881/telemac-mascaret\n",
+ " +> module: ad / api / artemis / bief\n",
+ " damocles / gaia / gretel / hermes\n",
+ " identify_liq_bnd / khione / mascaret / nestor\n",
+ " parallel / partel / postel3d / sisyphe\n",
+ " special / stbtel / telemac2d / telemac3d\n",
+ " tomawac / waqtel\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "... processing the steering file\n",
+ "\n",
+ "... checking parallelisation\n",
+ "\n",
+ "... handling temporary directories\n",
+ "~+> Creating FichierCas.txt\n",
+ "~+> Copying Abaques.txt\n",
+ "~+> Copying Controle.txt\n",
+ "~+> Copying dico_Courlis.txt\n",
+ " \n",
+ "... checking the executable\n",
+ "\n",
+ "\n",
+ "Running your simulation(s) :\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "In /home/d60881/telemac-mascaret/examples/mascaret/Test26:\n",
+ "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\n",
+ "\n",
+ "\n",
+ " Fichiercas : FichierCas.txt\n",
+ "\n",
+ " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\n",
+ "\n",
+ " Data File : rezo.xcas\n",
+ "\n",
+ " Study name : Etude hydraulique1d\n",
+ "\n",
+ " Hydraulic statistics (prior solve phase)\n",
+ " ------ Geometric parameters ------\n",
+ " Number of reach(es) = 3\n",
+ " Number of cross-sections = 6\n",
+ " Number of open boundaries = 3\n",
+ " Number of junction(s) = 1\n",
+ " Number of inflow(s) = 0\n",
+ " Number of lateral weir(s) = 0\n",
+ " Number of storage area(s) = 3\n",
+ " Number of link(s) = 5\n",
+ " Number of dam(s)/weir(s) = 0\n",
+ " ------ Numerical parameters ------\n",
+ " Number of 1D nodes (mesh) = 63\n",
+ " Computation Kernel = 2\n",
+ " Initial time step = 1.0E+01\n",
+ " Variable time step? = 0\n",
+ " Reduced Momentum Equation?= 0\n",
+ " Number of time steps = 1000\n",
+ "\n",
+ " OptionCourlis F\n",
+ " Start the Simulation...\n",
+ " Simulation ended successfully in 0.225221008 s\n",
+ " TEMPS PASSE 0.225605994\n",
+ " FIN CORRECTE DU CALCUL\n",
+ "\n",
+ "... merging separated result files\n",
+ "\n",
+ "... handling result files\n",
+ "\n",
+ "... deleting working dir\n",
+ "\n",
+ "\n",
+ "\n",
+ "My work is done\n",
+ "\n",
+ "\n"
]
}
],
@@ -1315,7 +1255,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
diff --git a/notebooks/workshop/solutions/exo_mascaret.ipynb b/notebooks/workshop/solutions/exo_mascaret.ipynb
index 5e43bd7c325f5b04ec6d61445181f4b3184942d8..01626084c19db39bc7ee402844b1b2572543e340 100644
--- a/notebooks/workshop/solutions/exo_mascaret.ipynb
+++ b/notebooks/workshop/solutions/exo_mascaret.ipynb
@@ -58,7 +58,6 @@
"cell_type": "code",
"execution_count": 2,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:12.620628Z",
"iopub.status.busy": "2022-12-01T11:13:12.620410Z",
@@ -139,7 +138,7 @@
],
"source": [
"# File with a single reach\n",
- "mascgeo_file = MascaretGeoFile(geo_file, 'geo')\n",
+ "mascgeo_file = MascaretGeoFile(geo_file, fformat='geo')\n",
"\n",
"print(mascgeo_file.summary())"
]
@@ -163,7 +162,6 @@
"cell_type": "code",
"execution_count": 3,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:12.629922Z",
"iopub.status.busy": "2022-12-01T11:13:12.629725Z",
@@ -177,149 +175,113 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "\r\n",
- "\r\n",
- "Loading Options and Configurations\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " _ \r\n",
- " (_) \r\n",
- " _ __ ___ __ _ _ _ __ \r\n",
- " | '_ ` _ \\ / _` || || '_ \\ \r\n",
- " | | | | | || (_| || || | | |\r\n",
- " |_| |_| |_| \\__,_||_||_| |_|\r\n",
- " \r\n",
- " \r\n",
- "\r\n",
- "\r\n",
- "Running your CAS file(s) for:\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "S10.gfortran.dyn: \r\n",
- " \r\n",
- "\r\n",
- " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\r\n",
- "\r\n",
- " +> root: /home/d60881/telemac-mascaret\r\n",
- " +> module: ad / api / artemis / bief\r\n",
- " damocles / gaia / gretel / hermes\r\n",
- " identify_liq_bnd / khione / mascaret / nestor\r\n",
- " parallel / partel / postel3d / sisyphe\r\n",
- " special / stbtel / telemac2d / telemac3d\r\n",
- " tomawac / waqtel\r\n",
- "\r\n",
- "\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "... processing the steering file\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "\r\n",
- "... checking parallelisation\r\n",
- "\r\n",
- "... handling temporary directories\r\n",
- "~+> Creating FichierCas.txt\r\n",
- "~+> Copying Abaques.txt\r\n",
- "~+> Copying Controle.txt\r\n",
- "~+> Copying dico_Courlis.txt\r\n",
- "[ ] 0% | ---s\r",
- " \r",
- "[ ] 0% | ---s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 25% | 1s\r",
- "[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ] 50% | 1s\r",
- " \r",
- "\r\n",
- "... checking the executable\r\n",
- "\r\n",
- "\r\n",
- "Running your simulation(s) :\r\n",
- "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "In /home/d60881/telemac-mascaret/examples/mascaret/Test24:\r\n",
- "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\r\n",
- "\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Fichiercas : FichierCas.txt\r\n",
- "\r\n",
- " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\r\n",
- "\r\n",
- " Data File : mascaret_imp.xcas\r\n",
- "\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Study name : Etude hydraulique1d\r\n",
- "\r\n",
- " Hydraulic statistics (prior solve phase)\r\n",
- " ------ Geometric parameters ------\r\n",
- " Number of reach(es) = 1\r\n",
- " Number of cross-sections = 59\r\n",
- " Number of open boundaries = 2\r\n",
- " Number of junction(s) = 0\r\n",
- " Number of inflow(s) = 0\r\n",
- " Number of lateral weir(s) = 0\r\n",
- " Number of storage area(s) = 0\r\n",
- " Number of link(s) = 0\r\n",
- " Number of dam(s)/weir(s) = 0\r\n",
- " ------ Numerical parameters ------\r\n",
- " Number of 1D nodes (mesh) = 774\r\n",
- " Computation Kernel = 3\r\n",
- " Initial time step = 1.0E+00\r\n",
- " Variable time step? = 1\r\n",
- " Courant number = 2.0E+00\r\n",
- " Implicit Scheme? = 1\r\n",
- " Non Hydrostatic? = 0\r\n",
- " Number of time steps = 5000\r\n",
- "\r\n",
- " OptionCourlis F\r\n",
- " Start the Simulation...\r\n"
- ]
- },
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- " Simulation ended successfully in 3.32603216 s\r\n",
- " TEMPS PASSE 3.33626199\r\n",
- " FIN CORRECTE DU CALCUL\r\n",
- "\r\n",
- "... merging separated result files\r\n",
- "\r\n",
- "... handling result files\r\n",
- "\r\n",
- "... deleting working dir\r\n",
- "\r\n",
- "\r\n",
- "\r\n",
- "My work is done\r\n",
- "\r\n",
- "\r\n"
+ "\n",
+ "\n",
+ "Loading Options and Configurations\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ " _ \n",
+ " (_) \n",
+ " _ __ ___ __ _ _ _ __ \n",
+ " | '_ ` _ \\ / _` || || '_ \\ \n",
+ " | | | | | || (_| || || | | |\n",
+ " |_| |_| |_| \\__,_||_||_| |_|\n",
+ " \n",
+ " \n",
+ "\n",
+ "\n",
+ "Running your CAS file(s) for:\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "S10.gfortran.dyn: \n",
+ " \n",
+ "\n",
+ " +> Scibian 10 dynamic build using GFortran 8.3.0 and Open MPI.\n",
+ "\n",
+ " +> root: /home/d60881/telemac-mascaret\n",
+ " +> module: ad / api / artemis / bief\n",
+ " damocles / gaia / gretel / hermes\n",
+ " identify_liq_bnd / khione / mascaret / nestor\n",
+ " parallel / partel / postel3d / sisyphe\n",
+ " special / stbtel / telemac2d / telemac3d\n",
+ " tomawac / waqtel\n",
+ "\n",
+ "\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "... processing the steering file\n",
+ "\n",
+ "... checking parallelisation\n",
+ "\n",
+ "... handling temporary directories\n",
+ "~+> Creating FichierCas.txt\n",
+ "~+> Copying Abaques.txt\n",
+ "~+> Copying Controle.txt\n",
+ "~+> Copying dico_Courlis.txt\n",
+ " \n",
+ "... checking the executable\n",
+ "\n",
+ "\n",
+ "Running your simulation(s) :\n",
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n",
+ "\n",
+ "\n",
+ "\n",
+ "In /home/d60881/telemac-mascaret/examples/mascaret/Test24:\n",
+ "mpirun -np 1 /home/d60881/telemac-mascaret/builds/S10.gfortran.dyn/bin/mascaret\n",
+ "\n",
+ "\n",
+ " Fichiercas : FichierCas.txt\n",
+ "\n",
+ " TELEMAC-MASCARET V8P4R0 == Copyright (C) 2000-2022 EDF-CEREMA ==\n",
+ "\n",
+ " Data File : mascaret_imp.xcas\n",
+ "\n",
+ " Study name : Etude hydraulique1d\n",
+ "\n",
+ " Hydraulic statistics (prior solve phase)\n",
+ " ------ Geometric parameters ------\n",
+ " Number of reach(es) = 1\n",
+ " Number of cross-sections = 59\n",
+ " Number of open boundaries = 2\n",
+ " Number of junction(s) = 0\n",
+ " Number of inflow(s) = 0\n",
+ " Number of lateral weir(s) = 0\n",
+ " Number of storage area(s) = 0\n",
+ " Number of link(s) = 0\n",
+ " Number of dam(s)/weir(s) = 0\n",
+ " ------ Numerical parameters ------\n",
+ " Number of 1D nodes (mesh) = 774\n",
+ " Computation Kernel = 3\n",
+ " Initial time step = 1.0E+00\n",
+ " Variable time step? = 1\n",
+ " Courant number = 2.0E+00\n",
+ " Implicit Scheme? = 1\n",
+ " Non Hydrostatic? = 0\n",
+ " Number of time steps = 5000\n",
+ "\n",
+ " OptionCourlis F\n",
+ " Start the Simulation...\n",
+ " Simulation ended successfully in 3.32603216 s\n",
+ " TEMPS PASSE 3.33626199\n",
+ " FIN CORRECTE DU CALCUL\n",
+ "\n",
+ "... merging separated result files\n",
+ "\n",
+ "... handling result files\n",
+ "\n",
+ "... deleting working dir\n",
+ "\n",
+ "\n",
+ "\n",
+ "My work is done\n",
+ "\n",
+ "\n"
]
}
],
@@ -374,7 +336,6 @@
"cell_type": "code",
"execution_count": 5,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:17.717295Z",
"iopub.status.busy": "2022-12-01T11:13:17.717115Z",
@@ -1257,7 +1218,6 @@
"cell_type": "code",
"execution_count": 6,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:17.893838Z",
"iopub.status.busy": "2022-12-01T11:13:17.893640Z",
@@ -1347,7 +1307,6 @@
"cell_type": "code",
"execution_count": 7,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:18.658632Z",
"iopub.status.busy": "2022-12-01T11:13:18.658399Z",
@@ -1398,7 +1357,6 @@
"cell_type": "code",
"execution_count": 8,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:18.714979Z",
"iopub.status.busy": "2022-12-01T11:13:18.714795Z",
@@ -1495,7 +1453,6 @@
"cell_type": "code",
"execution_count": 10,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:20.190023Z",
"iopub.status.busy": "2022-12-01T11:13:20.189849Z",
@@ -1541,7 +1498,6 @@
"cell_type": "code",
"execution_count": 11,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:20.460725Z",
"iopub.status.busy": "2022-12-01T11:13:20.460447Z",
@@ -2074,7 +2030,6 @@
"cell_type": "code",
"execution_count": 13,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:20.477261Z",
"iopub.status.busy": "2022-12-01T11:13:20.476941Z",
@@ -2128,7 +2083,6 @@
"cell_type": "code",
"execution_count": 14,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:20.653579Z",
"iopub.status.busy": "2022-12-01T11:13:20.653400Z",
@@ -2946,7 +2900,6 @@
"cell_type": "code",
"execution_count": 15,
"metadata": {
- "collapsed": false,
"execution": {
"iopub.execute_input": "2022-12-01T11:13:20.692565Z",
"iopub.status.busy": "2022-12-01T11:13:20.692385Z",
@@ -4524,7 +4477,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
diff --git a/scripts/python3/data_manip/formats/mascaret_file.py b/scripts/python3/data_manip/formats/mascaret_file.py
index b5a631dece6d979a9d3749f01199838675c97382..b82cb93946255c56bc83a6ad10e027087d3db471 100644
--- a/scripts/python3/data_manip/formats/mascaret_file.py
+++ b/scripts/python3/data_manip/formats/mascaret_file.py
@@ -139,7 +139,7 @@ class Section:
@param dist_array (float list) section points abscissa
@param z_array (float list) section points elevations
@param topo_baths (str float) topo-bath section points definition ("T"
- if topographic point, "B" if bathymétric points)
+ if topographic point, "B" if bathymetric points)
"""
if len(dist_array) != len(z_array):
raise MascaretException(
@@ -175,7 +175,7 @@ class Section:
@param y_list (float list) section points Y coordinates
@param z_list (float list) section points elevations
@param topo_baths (str list) topo-bath section points definition ("T"
- if topographic point, "B" if bathymétric points)
+ if topographic point, "B" if bathymetric points)
"""
if not len(x_list) == len(y_list) == len(z_list):