diff --git a/docs/en/calculators/structures/liste.md b/docs/en/calculators/structures/liste.md index 23a7ac23681a035b2365588b52b4732911125c05..be8dc7441722862f7dd924aa1830dba48941692a 100644 --- a/docs/en/calculators/structures/liste.md +++ b/docs/en/calculators/structures/liste.md @@ -6,7 +6,7 @@ | [Broad-crested weir / sluice gate (Cemagref-V)](./cem_88_v.md) | 0.6 | Parallel Structures | | [Broad-crested weir / orifice (Cunge)](./cunge_80.md) | 0.6 | Parallel Structures, Cross walls, Downwall | | [Free flow sluice gate](./vanne_denoyee.md) | 0.6 | Parallel Structures | -| [Submerged sluice gate](./vanne_noyee.md) | 0.6 | Parallel Structures | +| [Submerged sluice gate](./vanne_noyee.md) | 0.8 | Parallel Structures | | [Free flow sharp-crested weir (Poleni)](./seuil_denoye.md) | 0.4 | Parallel Structures, Free flow weir stage-discharge laws | | [Deeply submerged sharp-crested weir (Rajaratnam)](./seuil_noye.md) | 0.9 | Parallel Structures | | [Submerged slot (Larinier)](./fente_noyee.md) | 0.75 | Parallel Structures, Cross walls, Downwall | diff --git a/docs/fr/calculators/structures/liste.md b/docs/fr/calculators/structures/liste.md index cb79ed15970f5be677bb9c7e59ff81a9e0bea823..07a0ef921d4c0968e4e3770d54f994127876b6ad 100644 --- a/docs/fr/calculators/structures/liste.md +++ b/docs/fr/calculators/structures/liste.md @@ -5,8 +5,8 @@ | [Seuil épais / orifice (Cemagref-D)](./cem_88_d.md) | 0.4 | Lois d'ouvrages | | [Seuil épais / vanne de fond (Cemagref-V)](./cem_88_v.md) | 0.6 | Lois d'ouvrages | | [Seuil épais / orifice (Cunge)](./cunge_80.md) | 1 | Lois d'ouvrages, Cloisons, Cloison aval | -| [Vanne dénoyée](./vanne_denoyee.md) | 0.6 | Lois d'ouvrages | -| [Vanne noyée](./vanne_noyee.md) | 0.6 | Lois d'ouvrages | +| [Vanne de fond dénoyée](./vanne_denoyee.md) | 0.6 | Lois d'ouvrages | +| [Vanne de fond noyée](./vanne_noyee.md) | 0.8 | Lois d'ouvrages | | [Seuil mince dénoyé (Poleni)](./seuil_denoye.md) | 0.4 | Lois d'ouvrages, Lois de déversoirs dénoyés | | [Seuil mince noyé (Rajaratnam)](./seuil_noye.md) | 0.9 | Lois d'ouvrages | | [Fente noyée (Larinier)](./fente_noyee.md) | 0.75 | Lois d'ouvrages, Cloisons, Cloison aval | diff --git a/src/app/calculators/cloisons/config.json b/src/app/calculators/cloisons/config.json index e9b9a8c9bb0cdc3948f101da6e12d919de0aa693..dfdb8e24e266650ecc89db37ddf6828bbe9f2aab 100644 --- a/src/app/calculators/cloisons/config.json +++ b/src/app/calculators/cloisons/config.json @@ -47,6 +47,7 @@ "CdWSL", "CdWR", "CdGR", + "CdGRS", "CdCunge", "CdT", "S", diff --git a/src/app/calculators/dever/config.json b/src/app/calculators/dever/config.json index 375ca3bfeb62e5d3e1d293e97791d0149738f57d..db3abf963e692f745ce6c57873094458752700d9 100644 --- a/src/app/calculators/dever/config.json +++ b/src/app/calculators/dever/config.json @@ -39,6 +39,7 @@ "CdWSL", "CdWR", "CdGR", + "CdGRS", "CdT", "alpha2", "BT", diff --git a/src/app/calculators/parallelstructure/config.json b/src/app/calculators/parallelstructure/config.json index 9f3553940b5930db91ba79c00aab52cfcc2e2520..5e9528854582a8fc02b28f4ee59139fd65664d71 100644 --- a/src/app/calculators/parallelstructure/config.json +++ b/src/app/calculators/parallelstructure/config.json @@ -54,6 +54,7 @@ "CdWSL", "CdWR", "CdGR", + "CdGRS", "CdCunge", "CdT", "CdO", diff --git a/src/app/formulaire/elements/formulaire-node.ts b/src/app/formulaire/elements/formulaire-node.ts index dfb19188ad3d47dd5f2278c316898ff1b5e1d67a..9a2e5e3c4624b45ceb1294cb9b07ff36da0bcff0 100644 --- a/src/app/formulaire/elements/formulaire-node.ts +++ b/src/app/formulaire/elements/formulaire-node.ts @@ -143,7 +143,7 @@ export abstract class FormulaireNode implements IObservable { /** * Set value of all single parameters to undefined, except for the given parameter ids */ - public emptyFields(except: string[] = [ "Cd0", "CdWS", "CdGR", "CdCunge", "CdWR", "CdO", "CdT", "CdWSL" ]) { + public emptyFields(except: string[] = [ "Cd0", "CdWS", "CdGR", "CdGRS", "CdCunge", "CdWR", "CdO", "CdT", "CdWSL" ]) { for (const p of this.allFormElements ) { if (p instanceof NgParameter) { if ( diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 70bfe0153c1d537a7e1c08b19481cf01c5311700..74b9989f64b3ba751f52bd4ea47340b049a31f1c 100644 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -221,6 +221,7 @@ "INFO_LIB_BETA": "Beta coefficient", "INFO_LIB_BT": "Half opening of the triangle", "INFO_LIB_CDGR": "Discharge coefficient gate", + "INFO_LIB_CDGRS": "Discharge coefficient gate submerged", "INFO_LIB_CDCUNGE": "Discharge coefficient", "INFO_LIB_CDWR": "Discharge coefficient weir", "INFO_LIB_CDWSL": "Discharge coefficient slot", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index ab01c11e0bde04f7ea27a7811ee31140edcba6c4..18b9ffed918e582785e9d26678fe1a0cc897823e 100644 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -222,6 +222,7 @@ "INFO_LIB_BT": "Demi-ouverture du triangle", "INFO_LIB_CD": "Coefficient de débit", "INFO_LIB_CDGR": "Coefficient de débit vanne", + "INFO_LIB_CDGRS": "Coefficient de débit vanne noyée", "INFO_LIB_CDCUNGE": "Coefficient de débit", "INFO_LIB_CDWR": "Coefficient de débit seuil", "INFO_LIB_CDWSL": "Coefficient de débit fente",