diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts
index 90412ecd16a6443c7db7a5001600d903fc31144e..94552a7d5f97a6680ad543569b18048308af6d1f 100644
--- a/src/app/components/calculator-list/calculator-list.component.ts
+++ b/src/app/components/calculator-list/calculator-list.component.ts
@@ -154,6 +154,12 @@ export class CalculatorListComponent implements OnInit {
{
label: this.intlService.localizeText("INFO_EXAMPLE_LABEL_PAB_COMPLETE"),
path: "pab-complete-chain.json"
+ },
+ {
+ label: this.intlService.localizeText("INFO_EXAMPLE_LABEL_CHANNEL_FLOW"),
+ path: "solveur-channel-flow.json"
+ // débit d'un chenal avec ouvrages
+ // channel flow with hydraulic structures
}
];
}
diff --git a/src/app/examples/solveur-channel-flow.json b/src/app/examples/solveur-channel-flow.json
new file mode 100644
index 0000000000000000000000000000000000000000..2ae6f619f0bc5b33dd3aadeaf00ff138b5682501
--- /dev/null
+++ b/src/app/examples/solveur-channel-flow.json
@@ -0,0 +1,228 @@
+{
+ "header": {
+ "source": "jalhyd",
+ "format_version": "1.3",
+ "created": "2019-10-25T12:31:39.494Z"
+ },
+ "settings": {
+ "precision": 1e-7,
+ "maxIterations": 100,
+ "displayPrecision": 3
+ },
+ "documentation": "",
+ "session": [
+ {
+ "uid": "MHQxN3",
+ "props": {
+ "calcType": "ParallelStructure"
+ },
+ "meta": {
+ "title": "Ouvrages"
+ },
+ "children": [
+ {
+ "uid": "cW1pZD",
+ "props": {
+ "calcType": "Structure",
+ "structureType": "SeuilRectangulaire",
+ "loiDebit": "WeirFree"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "ZDV",
+ "mode": "SINGLE",
+ "value": 393.99
+ },
+ {
+ "symbol": "L",
+ "mode": "SINGLE",
+ "value": 1.84
+ },
+ {
+ "symbol": "CdWR",
+ "mode": "SINGLE",
+ "value": 0.4
+ }
+ ]
+ }
+ ],
+ "parameters": [
+ {
+ "symbol": "Q",
+ "mode": "SINGLE",
+ "value": 1.143420537740305
+ },
+ {
+ "symbol": "Z1",
+ "mode": "CALCUL"
+ },
+ {
+ "symbol": "Z2",
+ "mode": "SINGLE",
+ "value": 393.99
+ }
+ ]
+ },
+ {
+ "uid": "Mnk0Mj",
+ "props": {
+ "regime": "Fluvial",
+ "calcType": "Bief"
+ },
+ "meta": {
+ "title": "Bief"
+ },
+ "children": [
+ {
+ "uid": "ZWFod3",
+ "props": {
+ "regime": "Fluvial",
+ "calcType": "Section",
+ "nodeType": "SectionRectangle"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "Ks",
+ "mode": "SINGLE",
+ "value": 40
+ },
+ {
+ "symbol": "Q",
+ "mode": "LINK",
+ "targetNub": "MHQxN3",
+ "targetParam": "Q"
+ },
+ {
+ "symbol": "YB",
+ "mode": "SINGLE",
+ "value": 1
+ },
+ {
+ "symbol": "Y",
+ "mode": "SINGLE",
+ "value": 0.8
+ },
+ {
+ "symbol": "LargeurBerge",
+ "mode": "SINGLE",
+ "value": 2.3
+ }
+ ]
+ }
+ ],
+ "parameters": [
+ {
+ "symbol": "Long",
+ "mode": "SINGLE",
+ "value": 30
+ },
+ {
+ "symbol": "Dx",
+ "mode": "SINGLE",
+ "value": 1
+ },
+ {
+ "symbol": "Z1",
+ "mode": "CALCUL"
+ },
+ {
+ "symbol": "Z2",
+ "mode": "LINK",
+ "targetNub": "MHQxN3",
+ "targetParam": "Z1"
+ },
+ {
+ "symbol": "ZF1",
+ "mode": "SINGLE",
+ "value": 393.99
+ },
+ {
+ "symbol": "ZF2",
+ "mode": "SINGLE",
+ "value": 394.1
+ }
+ ]
+ },
+ {
+ "uid": "bmlreT",
+ "props": {
+ "calcType": "ParallelStructure"
+ },
+ "meta": {
+ "title": "Ouvrages 1"
+ },
+ "children": [
+ {
+ "uid": "cnN3Y2",
+ "props": {
+ "calcType": "Structure",
+ "structureType": "SeuilRectangulaire",
+ "loiDebit": "WeirVillemonte"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "ZDV",
+ "mode": "SINGLE",
+ "value": 393.99
+ },
+ {
+ "symbol": "L",
+ "mode": "SINGLE",
+ "value": 2.8
+ },
+ {
+ "symbol": "CdWR",
+ "mode": "SINGLE",
+ "value": 0.4
+ }
+ ]
+ }
+ ],
+ "parameters": [
+ {
+ "symbol": "Q",
+ "mode": "LINK",
+ "targetNub": "MHQxN3",
+ "targetParam": "Q"
+ },
+ {
+ "symbol": "Z1",
+ "mode": "CALCUL"
+ },
+ {
+ "symbol": "Z2",
+ "mode": "LINK",
+ "targetNub": "Mnk0Mj",
+ "targetParam": "Z1"
+ }
+ ]
+ },
+ {
+ "uid": "ZDM5OT",
+ "props": {
+ "calcType": "Solveur",
+ "nubToCalculate": "bmlreT",
+ "searchedParameter": "MHQxN3/Q"
+ },
+ "meta": {
+ "title": "Solveur"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "Xinit",
+ "mode": "SINGLE",
+ "value": 0.5
+ },
+ {
+ "symbol": "Ytarget",
+ "mode": "SINGLE",
+ "value": 394.66
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 44ccd65e3eea197e95c810cdfc442485855bddec..31ee34a9105250c46df8eced4fd22f0d00e418c6 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -457,6 +457,7 @@
"INFO_TITREJOURNAL_GLOBAL": "Calculation log synthesis",
"INFO_WELCOME_CONTENT": "<p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>The Cassiopée software was developed by the ecohydraulic R&D pole gathering <a href=\"https://www.afbiodiversite.fr\" target=\"_blank\">AFB</a> (French Agency for Biodiversity) and <a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Fluids Mechanics Institute of Toulouse) and by <a href=\"http://g-eau.fr/index.php/en/\" target=\"_blank\">UMR G-EAU</a> (Joint Research Unit \"Water Management, Actors, Territories\").</p><p>It includes tools for designing fish crossing devices for upstream and downstream migrations, and hydraulic calculation tools useful for environmental and agricultural engineering.</p><p>For more information, consult <a href=\"assets/docs-fr/mentions_legales.html\" target=\"_blank\">legal notice</a> and <a href=\"assets/docs-fr/index.html\" target=\"_blank\">documentation</a>.</p>",
"INFO_WELCOME_SUBTITLE": "Hydraulic calculators",
+ "INFO_EXAMPLE_LABEL_CHANNEL_FLOW": "Channel flow with hydraulic structures",
"INFO_EXAMPLE_LABEL_PAB_COMPLETE": "Standard fish ladder",
"INFO_EXAMPLES_TITLE": "Examples",
"INFO_EXAMPLES_SUBTITLE": "Load standard examples",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index d20566b46f44d78dc4ffa8c20dd659a0039d37f2..afa23d2bf557b3c9e4f11599604426eb645b3175 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -456,6 +456,7 @@
"INFO_TITREJOURNAL_GLOBAL": "Synthèse du journal de calcul",
"INFO_WELCOME_CONTENT": "<p>Le logiciel Cassiopée a été développé par le pôle R&D écohydraulique regroupant l'<a href=\"https://www.afbiodiversite.fr\" target=\"_blank\">AFB</a> (Agence Française pour la Biodiversité) et l’<a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Institut de mécanique des fluides de Toulouse) et par l'<a href=\"http://g-eau.fr\" target=\"_blank\">UMR G-EAU</a> (UMR Gestion de l'Eau, Acteurs, Usages).</p><p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>Pour plus d'informations, consulter les <a href=\"assets/docs-fr/mentions_legales.html\" target=\"_blank\">mentions légales</a> et la <a href=\"assets/docs-fr/index.html\" target=\"_blank\">documentation</a>.</p>",
"INFO_WELCOME_SUBTITLE": "Modules de calcul d'hydraulique",
+ "INFO_EXAMPLE_LABEL_CHANNEL_FLOW": "Débit d'un chenal avec ouvrages",
"INFO_EXAMPLE_LABEL_PAB_COMPLETE": "Passe à bassins type",
"INFO_EXAMPLES_TITLE": "Exemples",
"INFO_EXAMPLES_SUBTITLE": "Charger des exemples types",