From 7bdb274402a083f9c0f54b53733257a3a9508b5d Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 26 Feb 2020 09:51:37 +0100
Subject: [PATCH] [WIP] add new example sessions
---
.../calculator-list.component.ts | 8 +
src/app/examples/pab-ech-triang.json | 1 +
src/app/examples/perr.json | 199 ++++++++++++++++++
src/locale/messages.en.json | 2 +
src/locale/messages.fr.json | 2 +
5 files changed, 212 insertions(+)
create mode 100644 src/app/examples/pab-ech-triang.json
create mode 100644 src/app/examples/perr.json
diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts
index f64758d72..86ea2e299 100644
--- a/src/app/components/calculator-list/calculator-list.component.ts
+++ b/src/app/components/calculator-list/calculator-list.component.ts
@@ -177,6 +177,14 @@ export class CalculatorListComponent implements OnInit {
path: "solveur-channel-flow.json"
// débit d'un chenal avec ouvrages
// channel flow with hydraulic structures
+ },
+ {
+ label: this.intlService.localizeText("INFO_EXAMPLE_LABEL_PAB_ECH_TRIANG"),
+ path: "pab-ech-triang.json"
+ },
+ {
+ label: this.intlService.localizeText("INFO_EXAMPLE_LABEL_PERR"),
+ path: "perr.json"
}
];
}
diff --git a/src/app/examples/pab-ech-triang.json b/src/app/examples/pab-ech-triang.json
new file mode 100644
index 000000000..0bfeece2b
--- /dev/null
+++ b/src/app/examples/pab-ech-triang.json
@@ -0,0 +1 @@
+{"header":{"source":"jalhyd","format_version":"1.3","created":"2020-02-24T11:49:20.297Z"},"settings":{"precision":1e-7,"maxIterations":100,"displayPrecision":3},"documentation":"","session":[{"uid":"ajdvcW","props":{"calcType":"PabChute"},"meta":{"title":"PABÂ : chute"},"children":[],"parameters":[{"symbol":"Z1","mode":"SINGLE","value":208.72},{"symbol":"Z2","mode":"SINGLE","value":206.34},{"symbol":"DH","mode":"CALCUL"}]},{"uid":"YjJkcW","props":{"calcType":"PabNombre"},"meta":{"title":"PABÂ : nombre"},"children":[],"parameters":[{"symbol":"DHT","mode":"LINK","targetNub":"ajdvcW","targetParam":"DH"},{"symbol":"N","mode":"CALCUL"},{"symbol":"DH","mode":"SINGLE","value":0.22}]},{"uid":"cm9xMG","props":{"calcType":"PabPuissance"},"meta":{"title":"PABÂ : puissance"},"children":[],"parameters":[{"symbol":"DH","mode":"SINGLE","value":0.2},{"symbol":"Q","mode":"SINGLE","value":1.1},{"symbol":"V","mode":"CALCUL"},{"symbol":"PV","mode":"SINGLE","value":140}]},{"uid":"aHNxY3","props":{"calcType":"PabDimensions"},"meta":{"title":"PABÂ : dimensions"},"children":[],"parameters":[{"symbol":"L","mode":"CALCUL"},{"symbol":"W","mode":"SINGLE","value":3.3},{"symbol":"Y","mode":"SINGLE","value":1.2},{"symbol":"V","mode":"LINK","targetNub":"cm9xMG","targetParam":"V"}]},{"uid":"YzR6bW","props":{"calcType":"ParallelStructure"},"meta":{"title":"Ouvrages"},"children":[{"uid":"ODU5MG","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"CALCUL","value":204.984},{"symbol":"L","mode":"SINGLE","value":1.1},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]}],"parameters":[{"symbol":"Q","mode":"SINGLE","value":1.3},{"symbol":"Z1","mode":"SINGLE","value":206.556},{"symbol":"Z2","mode":"SINGLE","value":206.34}]},{"uid":"dXpvN2","props":{"calcType":"Pab"},"meta":{"title":"PAB-2-Fentes-vertciales"},"children":[{"uid":"bHIxeH","props":{"calcType":"Cloisons"},"children":[{"uid":"MWU3ZH","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.12},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":207.007},{"symbol":"ZRAM","mode":"SINGLE","value":207.114},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"MjJ5OG","props":{"calcType":"Cloisons"},"children":[{"uid":"Nm8yeG","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.907},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":206.794},{"symbol":"ZRAM","mode":"SINGLE","value":206.901},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"MmRtMW","props":{"calcType":"Cloisons"},"children":[{"uid":"dXNweW","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.694},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":206.581},{"symbol":"ZRAM","mode":"SINGLE","value":206.688},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"NWN0ZD","props":{"calcType":"Cloisons"},"children":[{"uid":"bncxNH","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.481},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":206.368},{"symbol":"ZRAM","mode":"SINGLE","value":206.475},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"MHFqZW","props":{"calcType":"Cloisons"},"children":[{"uid":"bmdsc3","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.268},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":206.155},{"symbol":"ZRAM","mode":"SINGLE","value":206.262},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"bXJxMT","props":{"calcType":"Cloisons"},"children":[{"uid":"eTB6Z2","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.055},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":205.942},{"symbol":"ZRAM","mode":"SINGLE","value":206.049},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"YzV3c3","props":{"calcType":"Cloisons"},"children":[{"uid":"YXJmOH","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.842},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":205.729},{"symbol":"ZRAM","mode":"SINGLE","value":205.836},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"aGJjNW","props":{"calcType":"Cloisons"},"children":[{"uid":"OG9leG","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.629},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":205.516},{"symbol":"ZRAM","mode":"SINGLE","value":205.623},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"M2JzdX","props":{"calcType":"Cloisons"},"children":[{"uid":"c25pOW","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.416},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":205.303},{"symbol":"ZRAM","mode":"SINGLE","value":205.41},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"cWMzdm","props":{"calcType":"Cloisons"},"children":[{"uid":"bjVhcm","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.203},{"symbol":"L","mode":"SINGLE","value":1},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":4.5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"ZRMB","mode":"SINGLE","value":205.09},{"symbol":"ZRAM","mode":"SINGLE","value":205.197},{"symbol":"QA","mode":"SINGLE","value":0}]}],"parameters":[{"symbol":"Q","mode":"CALCUL","value":2.453},{"symbol":"Z1","mode":"LISTE","values":[208.72,208.9,209.01,209.25,209.3],"extensionStrategy":0},{"symbol":"Z2","mode":"LISTE","values":[206.34,207.01,207.24,207.71,207.82],"extensionStrategy":0}],"downWall":{"uid":"eTNuc3","props":{"calcType":"CloisonAval"},"children":[{"uid":"ZGZzbH","props":{"calcType":"Structure","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.178},{"symbol":"L","mode":"SINGLE","value":1.4},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]}],"parameters":[{"symbol":"ZRAM","mode":"SINGLE","value":204.984}]}},{"uid":"Nzg3Ym","props":{"calcType":"Pab"},"meta":{"title":"PAB-Ech-triangulaires"},"children":[{"uid":"cDV1en","props":{"calcType":"Cloisons"},"children":[{"uid":"czE4MG","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.12},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"b3Jpc2","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":208.37},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":209.3},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":207.004},{"symbol":"ZRAM","mode":"SINGLE","value":207.112},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"ejRkcj","props":{"calcType":"Cloisons"},"children":[{"uid":"dTNtdn","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.904},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"Ynh5eT","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":208.154},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":209.084},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":206.788},{"symbol":"ZRAM","mode":"SINGLE","value":206.896},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"Z3loYz","props":{"calcType":"Cloisons"},"children":[{"uid":"aXQzOD","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.688},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"MjJ6eX","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.938},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":208.868},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":206.572},{"symbol":"ZRAM","mode":"SINGLE","value":206.68},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"cm5vZG","props":{"calcType":"Cloisons"},"children":[{"uid":"cWVlY3","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.472},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"NHQzYW","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.722},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":208.652},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":206.356},{"symbol":"ZRAM","mode":"SINGLE","value":206.464},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"NGY1YW","props":{"calcType":"Cloisons"},"children":[{"uid":"cXR6dX","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.256},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"aDZ5MD","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.506},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":208.436},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":206.14},{"symbol":"ZRAM","mode":"SINGLE","value":206.248},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"MDhkY3","props":{"calcType":"Cloisons"},"children":[{"uid":"dDhveX","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.04},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"MGo3MG","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.29},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":208.22},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":205.924},{"symbol":"ZRAM","mode":"SINGLE","value":206.032},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"ZDE0Zj","props":{"calcType":"Cloisons"},"children":[{"uid":"Nm16eX","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.824},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"Mnl6cW","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":207.074},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":208.004},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":205.708},{"symbol":"ZRAM","mode":"SINGLE","value":205.816},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"NTl1cW","props":{"calcType":"Cloisons"},"children":[{"uid":"dHN4cW","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.608},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"c2ZnMX","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.858},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":207.788},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":205.492},{"symbol":"ZRAM","mode":"SINGLE","value":205.6},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"bmJyZT","props":{"calcType":"Cloisons"},"children":[{"uid":"ODY5Mm","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.392},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"djdjcz","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.642},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":207.572},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":205.276},{"symbol":"ZRAM","mode":"SINGLE","value":205.384},{"symbol":"QA","mode":"SINGLE","value":0}]},{"uid":"emRxeX","props":{"calcType":"Cloisons"},"children":[{"uid":"empleH","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.176},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"NzNxOW","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":206.426},{"symbol":"BT","mode":"SINGLE","value":2.65},{"symbol":"ZT","mode":"SINGLE","value":207.356},{"symbol":"CdT","mode":"SINGLE","value":1.36}]}],"parameters":[{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5.8},{"symbol":"ZRMB","mode":"SINGLE","value":205.06},{"symbol":"ZRAM","mode":"SINGLE","value":205.168},{"symbol":"QA","mode":"SINGLE","value":0}]}],"parameters":[{"symbol":"Q","mode":"CALCUL","value":1.341},{"symbol":"Z1","mode":"LISTE","values":[208.72,208.9,209.01,209.25,209.3],"extensionStrategy":0},{"symbol":"Z2","mode":"LISTE","values":[206.34,207.01,207.24,207.71,207.82],"extensionStrategy":0}],"downWall":{"uid":"cnZkYT","props":{"calcType":"CloisonAval"},"children":[{"uid":"Z2ttNT","props":{"calcType":"Structure","loiDebit":"WeirVillemonte"},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":205.481},{"symbol":"L","mode":"SINGLE","value":1.1},{"symbol":"CdWR","mode":"SINGLE","value":0.4}]}],"parameters":[{"symbol":"ZRAM","mode":"SINGLE","value":204.952}]}},{"uid":"bHc3cn","props":{"calcType":"Cloisons"},"meta":{"title":"PAB-Ech-triangulaires"},"children":[{"uid":"MjVnMX","props":{"calcType":"Structure","structureType":"SeuilRectangulaire","loiDebit":"WeirSubmergedLarinier"},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":1.6},{"symbol":"L","mode":"SINGLE","value":0.5},{"symbol":"CdWSL","mode":"SINGLE","value":0.65}]},{"uid":"ZXJmN3","props":{"calcType":"Structure","structureType":"SeuilTriangulaireTrunc","loiDebit":"TriangularTruncWeirFree"},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":0.35},{"symbol":"BT","mode":"SINGLE","value":4.5},{"symbol":"ZT","mode":"SINGLE","value":209.3},{"symbol":"CdT","mode":"SINGLE","value":0.68}]}],"parameters":[{"symbol":"Q","mode":"CALCUL"},{"symbol":"Z1","mode":"SINGLE","value":208.72},{"symbol":"LB","mode":"SINGLE","value":5},{"symbol":"BB","mode":"SINGLE","value":5},{"symbol":"PB","mode":"SINGLE","value":1.5},{"symbol":"DH","mode":"SINGLE","value":0.216}]}]}
\ No newline at end of file
diff --git a/src/app/examples/perr.json b/src/app/examples/perr.json
new file mode 100644
index 000000000..1b13edd3c
--- /dev/null
+++ b/src/app/examples/perr.json
@@ -0,0 +1,199 @@
+{
+ "header": {
+ "source": "jalhyd",
+ "format_version": "1.3",
+ "created": "2020-02-24T11:57:47.983Z"
+ },
+ "settings": {
+ "precision": 1e-7,
+ "maxIterations": 100,
+ "displayPrecision": 3
+ },
+ "documentation": "",
+ "session": [
+ {
+ "uid": "bm5pd2",
+ "props": {
+ "inclinedApron": "INCLINED",
+ "calcType": "MacroRugoCompound"
+ },
+ "meta": {
+ "title": "M-Rugo complexe"
+ },
+ "children": [
+ {
+ "uid": "bnR4eW",
+ "props": {
+ "calcType": "MacroRugo"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "ZF1",
+ "mode": "SINGLE",
+ "value": 69.685
+ },
+ {
+ "symbol": "B",
+ "mode": "SINGLE",
+ "value": 1
+ }
+ ]
+ },
+ {
+ "uid": "dHZkcm",
+ "props": {
+ "calcType": "MacroRugo"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "ZF1",
+ "mode": "SINGLE",
+ "value": 69.735
+ },
+ {
+ "symbol": "B",
+ "mode": "SINGLE",
+ "value": 1
+ }
+ ]
+ },
+ {
+ "uid": "Zjg5cn",
+ "props": {
+ "calcType": "MacroRugo"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "ZF1",
+ "mode": "SINGLE",
+ "value": 69.785
+ },
+ {
+ "symbol": "B",
+ "mode": "SINGLE",
+ "value": 1
+ }
+ ]
+ },
+ {
+ "uid": "cTBuMD",
+ "props": {
+ "calcType": "MacroRugo"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "ZF1",
+ "mode": "SINGLE",
+ "value": 69.835
+ },
+ {
+ "symbol": "B",
+ "mode": "SINGLE",
+ "value": 1
+ }
+ ]
+ }
+ ],
+ "parameters": [
+ {
+ "symbol": "L",
+ "mode": "SINGLE",
+ "value": 1
+ },
+ {
+ "symbol": "If",
+ "mode": "SINGLE",
+ "value": 0.05
+ },
+ {
+ "symbol": "Ks",
+ "mode": "SINGLE",
+ "value": 0.15
+ },
+ {
+ "symbol": "C",
+ "mode": "SINGLE",
+ "value": 0.16
+ },
+ {
+ "symbol": "PBD",
+ "mode": "SINGLE",
+ "value": 0.4
+ },
+ {
+ "symbol": "PBH",
+ "mode": "SINGLE",
+ "value": 0.5
+ },
+ {
+ "symbol": "Cd0",
+ "mode": "SINGLE",
+ "value": 1.5
+ },
+ {
+ "symbol": "Z1",
+ "mode": "MINMAX",
+ "min": 70.16,
+ "max": 70.3,
+ "step": 0.05,
+ "extensionStrategy": 0
+ },
+ {
+ "symbol": "ZRL",
+ "mode": "SINGLE",
+ "value": 69.86
+ },
+ {
+ "symbol": "ZRR",
+ "mode": "SINGLE",
+ "value": 69.66
+ },
+ {
+ "symbol": "BR",
+ "mode": "SINGLE",
+ "value": 4
+ },
+ {
+ "symbol": "DH",
+ "mode": "SINGLE",
+ "value": 1.7
+ }
+ ]
+ },
+ {
+ "uid": "YWE3NX",
+ "props": {
+ "calcType": "ConcentrationBlocs"
+ },
+ "meta": {
+ "title": "Conc. blocs"
+ },
+ "children": [],
+ "parameters": [
+ {
+ "symbol": "C",
+ "mode": "SINGLE",
+ "value": 0.13
+ },
+ {
+ "symbol": "N",
+ "mode": "CALCUL"
+ },
+ {
+ "symbol": "L",
+ "mode": "SINGLE",
+ "value": 4
+ },
+ {
+ "symbol": "D",
+ "mode": "SINGLE",
+ "value": 0.4
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index ee553e52a..e8203692f 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -480,6 +480,8 @@
"INFO_WELCOME_SUBTITLE": "Hydraulic calculators",
"INFO_EXAMPLE_LABEL_CHANNEL_FLOW": "Channel flow with hydraulic structures",
"INFO_EXAMPLE_LABEL_PAB_COMPLETE": "Standard fish ladder",
+ "INFO_EXAMPLE_LABEL_PAB_ECH_TRIANG": "PAB Ech Triang",
+ "INFO_EXAMPLE_LABEL_PERR": "PERR",
"INFO_EXAMPLES_TITLE": "Examples",
"INFO_EXAMPLES_SUBTITLE": "Load standard examples",
"INFO_YAXB_TITRE": "Linear function",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 30c7ef5aa..03d384064 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -479,6 +479,8 @@
"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_EXAMPLE_LABEL_PAB_ECH_TRIANG": "PAB Ech Triang",
+ "INFO_EXAMPLE_LABEL_PERR": "PERR",
"INFO_EXAMPLES_TITLE": "Exemples",
"INFO_EXAMPLES_SUBTITLE": "Charger des exemples types",
"INFO_YAXB_TITRE": "Fonction affine",
--
GitLab