#43 Ajout des équations de seuil triangulaire et triangulaire tronqué dans les...

#43 Ajout des équations de seuil triangulaire et triangulaire tronqué dans les structures en parallèle

src/app/calculators/parallel-structures/parallel-structures.config.json

@@ -43,6 +43,14 @@
                     {
                         "id": "select_ouvrage_seuil_rect",
                         "enum": "StructureType.SeuilRectangulaire"
+                    },
+                    {
+                        "id": "select_ouvrage_seuil_triang",
+                        "enum": "StructureType.SeuilTriangulaire"
+                    },
+                    {
+                        "id": "select_ouvrage_seuil_triangtrunc",
+                        "enum": "StructureType.SeuilTriangulaireTrunc"
                     }
                 ]
             },
@@ -110,6 +118,38 @@
                     }
                 ]
             },
+            {
+                "id": "select_loidebit3",
+                "type": "select",
+                "select": [
+                    {
+                        "id": "select_loidebit3_seuiltriang",
+                        "enum": "LoiDebit.TriangularWeirFree"
+                    }
+                ],
+                "dep_exist": [
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triang"
+                    }
+                ]
+            },
+            {
+                "id": "select_loidebit4",
+                "type": "select",
+                "select": [
+                    {
+                        "id": "select_loidebit4_seuiltriangtrunc",
+                        "enum": "LoiDebit.TriangularTruncWeirFree"
+                    }
+                ],
+                "dep_exist": [
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triangtrunc"
+                    }
+                ]
+            },
             {
                 "type": "input",
                 "id": "ZDV",
@@ -125,8 +165,12 @@
                         "refvalue": "select_ouvrage_seuil_rect"
                     },
                     {
-                        "refid": "select_loidebit1",
-                        "refvalue": "select_loidebit1_kivi"
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triang"
+                    },
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triangtrunc"
                     }
                 ]
             },
@@ -203,6 +247,14 @@
                     {
                         "refid": "select_loidebit2",
                         "refvalue": "select_loidebit2_cem88v"
+                    },
+                    {
+                        "refid": "select_loidebit3",
+                        "refvalue": "select_loidebit3_seuiltriang"
+                    },
+                    {
+                        "refid": "select_loidebit3",
+                        "refvalue": "select_loidebit4_seuiltriangtrunc"
                     }
                 ]
             },
@@ -241,6 +293,46 @@
                         "refvalue": "select_loidebit1_kivi"
                     }
                 ]
+            },
+            {
+                "type": "input",
+                "id": "alpha2",
+                "unit": "",
+                "nodeType": "StructureRectangle",
+                "dep_exist": [
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triang"
+                    },
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triangtrunc"
+                    }
+                ]
+            },
+            {
+                "type": "input",
+                "id": "BT",
+                "unit": "",
+                "nodeType": "StructureRectangle",
+                "dep_exist": [
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triangtrunc"
+                    }
+                ]
+            },
+            {
+                "type": "input",
+                "id": "ZT",
+                "unit": "",
+                "nodeType": "StructureRectangle",
+                "dep_exist": [
+                    {
+                        "refid": "select_ouvrage",
+                        "refvalue": "select_ouvrage_seuil_triangtrunc"
+                    }
+                ]
             }
         ]
     },

src/app/calculators/parallel-structures/parallel-structures.fr.json

@@ -8,6 +8,8 @@
     "select_ouvrage_vanne_circ": "Vanne circulaire",
     "select_ouvrage_vanne_rect": "Vanne rectangulaire",
     "select_ouvrage_seuil_rect": "Seuil rectangulaire",
+    "select_ouvrage_seuil_triang": "Seuil triangulaire",
+    "select_ouvrage_seuil_triangtrunc": "Seuil triangulaire tronqué",
     "select_ouvrage_seuil_trap": "Seuil trapézoïdal",
     "select_ouvrage_vanne_trap": "Vanne trapézoïdale",
     "W": "Ouverture de vanne",
@@ -23,12 +25,17 @@
     "select_loidebit2_cunge80": "Cunge 80",
     "select_loidebit2_cem88d": "Déversoir/Orifice Cemagref 88",
     "select_loidebit2_cem88v": "Déversoir/Vanne de fond Cemagref 88",
+    "select_loidebit3_seuiltriang": "Déversoir triangulaire dénoyé",
+    "select_loidebit4_seuiltriangtrunc": "Déversoir triangulaire tronqué dénoyé",
     "ZDV": "Cote de la crête du déversoir ou du radier de la vanne",
-    "L": "Largeur du déversoir",
+    "L": "Largeur du déversoir (m)",
     "Cd": "Coefficient de débit",
     "alpha": "Coefficient alpha",
     "beta": "Coefficient béta",
-    "ZRAM": "Cote du radier amont",
+    "ZRAM": "Cote du radier amont (m)",
+    "alpha2": "Demi-angle au sommet (°)",
+    "BT": "Demi-ouverture du triangle (m)",
+    "ZT": "Cote haute du triangle (m)",
     "struct_container": "Ouvrages",
     "fs_param_calc": "Paramètres de calcul",
     "Pr": "Précision de calcul"