From 1f439898826e02b61c7d5248efc3435431755fe4 Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Mon, 29 Jun 2020 15:20:39 +0200
Subject: [PATCH] Updated PreBarrage example

---
 src/app/calculators/prebarrage/config.json |  90 +++++++--
 src/app/examples/prebarrage.json           | 206 ++-------------------
 2 files changed, 85 insertions(+), 211 deletions(-)

diff --git a/src/app/calculators/prebarrage/config.json b/src/app/calculators/prebarrage/config.json
index 1e6b68147..e68895e29 100644
--- a/src/app/calculators/prebarrage/config.json
+++ b/src/app/calculators/prebarrage/config.json
@@ -81,24 +81,78 @@
                             "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"
                         }
                     },
-                    "S",
-                    "ZDV",
-                    "L",
-                    "W",
-                    "CdWS",
-                    "CdWSL",
-                    "CdWR",
-                    "CdGR",
-                    "CdCunge",
-                    "CdT",
-                    "CdO",
-                    "alpha",
-                    "beta",
-                    "ZRAM",
-                    "alpha2",
-                    "BT",
-                    "ZT",
-                    "Zco"
+                    {
+                        "id": "S",
+                        "calculable": false
+                    },
+                    {
+                        "id": "ZDV",
+                        "calculable": false
+                    },
+                    {
+                        "id": "L",
+                        "calculable": false
+                    },
+                    {
+                        "id": "W",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdWS",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdWSL",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdWR",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdGR",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdCunge",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdT",
+                        "calculable": false
+                    },
+                    {
+                        "id": "CdO",
+                        "calculable": false
+                    },
+                    {
+                        "id": "alpha",
+                        "calculable": false
+                    },
+                    {
+                        "id": "beta",
+                        "calculable": false
+                    },
+                    {
+                        "id": "ZRAM",
+                        "calculable": false
+                    },
+                    {
+                        "id": "alpha2",
+                        "calculable": false
+                    },
+                    {
+                        "id": "BT",
+                        "calculable": false
+                    },
+                    {
+                        "id": "ZT",
+                        "calculable": false
+                    },
+                    {
+                        "id": "Zco",
+                        "calculable": false
+                    }
                 ]
             },
             {
diff --git a/src/app/examples/prebarrage.json b/src/app/examples/prebarrage.json
index 273cd986d..339101438 100644
--- a/src/app/examples/prebarrage.json
+++ b/src/app/examples/prebarrage.json
@@ -2,7 +2,7 @@
     "header": {
         "source": "jalhyd",
         "format_version": "1.3",
-        "created": "2020-06-29T08:37:22.109Z"
+        "created": "2020-06-29T13:15:21.029Z"
     },
     "settings": {
         "precision": 1e-7,
@@ -195,22 +195,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "c3Zpb2",
@@ -273,22 +258,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "MG4wNG",
@@ -325,22 +295,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "YjJra2",
@@ -377,22 +332,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "enE4cn",
@@ -455,22 +395,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "NXNoNG",
@@ -507,22 +432,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "bGhodG",
@@ -559,22 +469,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "MDZ3aH",
@@ -637,22 +532,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "emZ2bX",
@@ -715,22 +595,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "bG1ucj",
@@ -793,22 +658,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "dGNnZz",
@@ -871,22 +721,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 },
                 {
                     "uid": "amprcm",
@@ -949,22 +784,7 @@
                             ]
                         }
                     ],
-                    "parameters": [
-                        {
-                            "symbol": "Q",
-                            "mode": "CALCUL"
-                        },
-                        {
-                            "symbol": "Z1",
-                            "mode": "SINGLE",
-                            "value": 0
-                        },
-                        {
-                            "symbol": "Z2",
-                            "mode": "SINGLE",
-                            "value": 0
-                        }
-                    ]
+                    "parameters": []
                 }
             ],
             "parameters": [
-- 
GitLab