From 253565323d9b6158d1444e4c56445dbe7bdfe902 Mon Sep 17 00:00:00 2001 From: Dorchies David <david.dorchies@inrae.fr> Date: Tue, 21 Jul 2020 14:35:40 +0200 Subject: [PATCH] doc: update documentation after renaming stage-discharge laws Refs #419 --- docs/en/calculators/structures/liste.md | 30 ++++++++++++------------- docs/fr/calculators/structures/liste.md | 26 ++++++++++----------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/en/calculators/structures/liste.md b/docs/en/calculators/structures/liste.md index d52496ab7..23a7ac236 100644 --- a/docs/en/calculators/structures/liste.md +++ b/docs/en/calculators/structures/liste.md @@ -2,21 +2,21 @@ | Equation | Default discharge coefficient | Available in | |---------------------------|----------------:|-------------------------------| -| [Weir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Parallel Structures | -| [Weir / undershot gate Cemagref 88](./cem_88_v.md) | 0.6 | Parallel Structures | -| [Cunge (1980)](./cunge_80.md) | 0.6 | Parallel Structures, Cross walls, Downwall | -| [Free flow gate](./vanne_denoyee.md) | 0.6 | Parallel Structures | -| [Submerged gate](./vanne_noyee.md) | 0.6 | Parallel Structures | -| [Free flow weir](./seuil_denoye.md) | 0.4 | Parallel Structures, Free flow weir stage-discharge laws | -| [Submerged weir](./seuil_noye.md) | 0.9 | Parallel Structures | -| [Submerged slot (Larinier 1992)](./fente_noyee.md) | 0.75 | Parallel Structures, Cross walls, Downwall | -| [Kindsvater-Carter and Villemonte](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Parallel Structures | -| [Triangular weir (Villemonte)](./dever_triang.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall | +| [Broad-crested weir / Orifice (Cemagref-D)](./cem_88_d.md) | 0.4 | Parallel Structures | +| [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 | +| [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 | +| [Sharp-crested weir (Kindsvater-Carter + Villemonte)](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Parallel Structures | +| [Triangular weir sharp-crested (Villemonte) and broad-crested (Bos)](./dever_triang.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall | | [Truncated triangular weir (Villemonte)](./dever_triang_tronque.md) | 1.36 | Parallel Structures, Free flow weir stage-discharge laws, Cross walls, Downwall | -| [Submerged orifice](./orifice_noye.md) | 0.7 | Parallel Structures, Cross walls, Downwall | -| [Free orifice](./orifice_denoye.md) | 0.7 | Parallel Structures | -| [Villemonte 1947](./villemonte_1947.md) | 0.4 | Parallel Structures, Cross walls, Downwall | -| [Regulated notch (Villemonte 1957)](../pab/pab.md#the-downstream-partition) | 0.4 | Downwall | -| [Regulated submerged slot (Larinier 1992)](../pab/pab.md#the-downstream-partition) | 0.75 | Downwall | +| [Submerged orifice (Bernoulli)](./orifice_noye.md) | 0.7 | Parallel Structures, Cross walls, Downwall | +| [Free flow orifice (Bernoulli)](./orifice_denoye.md) | 0.7 | Parallel Structures | +| [Sharp-crested weir (Villemonte)](./villemonte_1947.md) | 0.4 | Parallel Structures, Cross walls, Downwall | +| [Regulated notch (Villemonte)](../pab/pab.md#the-downstream-partition) | 0.4 | Downwall | +| [Regulated submerged slot (Larinier)](../pab/pab.md#the-downstream-partition) | 0.75 | Downwall | Table: Stage-discharge equations list diff --git a/docs/fr/calculators/structures/liste.md b/docs/fr/calculators/structures/liste.md index b818193a9..cb79ed159 100644 --- a/docs/fr/calculators/structures/liste.md +++ b/docs/fr/calculators/structures/liste.md @@ -2,21 +2,21 @@ | Équation | Coefficient de débit par défaut | Disponible dans | |---------------------------|----------------:|-------------------------------| -| [Déversoir / orifice Cemagref 88](./cem_88_d.md) | 0.4 | Lois d'ouvrages | -| [Déversoir / vanne de fond Cemagref 88](./cem_88_v.md) | 0.6 | Lois d'ouvrages | -| [Cunge (1980)](./cunge_80.md) | 1 | Lois d'ouvrages, Cloisons, Cloison aval | +| [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 | -| [Seuil dénoyé](./seuil_denoye.md) | 0.4 | Lois d'ouvrages, Lois de déversoirs dénoyés | -| [Seuil noyé](./seuil_noye.md) | 0.9 | Lois d'ouvrages | -| [Fente noyée (Larinier 1992)](./fente_noyee.md) | 0.75 | Lois d'ouvrages, Cloisons, Cloison aval | +| [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 | | [Kindsvater-Carter et Villemonte](./kivi.md) | \(\alpha\)=0.4, \(\beta\)=0.001 | Lois d'ouvrages | -| [Déversoir triangulaire (Villemonte)](./dever_triang.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval | -| [Déversoir triangulaire tronqué (Villemonte)](./dever_triang_tronque.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval | -| [Orifice noyé](./orifice_noye.md) | 0.7 | Lois d'ouvrages, Cloisons, Cloison aval | -| [Orifice dénoyé](./orifice_denoye.md) | 0.7 | Lois d'ouvrages | -| [Villemonte 1947](./villemonte_1947.md) | 0.4 | Lois d'ouvrages, Cloisons, Cloison aval | -| [Échancrure régulée (Villemonte 1957)](../pab/pab.md#la-cloison-aval) | 0.4 | Cloison aval | -| [Fente noyée régulée (Larinier 1992)](../pab/pab.md#la-cloison-aval) | 0.75 | Cloison aval | +| [Seuil triangulaire mince (Villemonte) et épais (Bos)](./dever_triang.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval | +| [Seuil triangulaire tronqué (Villemonte)](./dever_triang_tronque.md) | 1.36 | Lois d'ouvrages, Lois de déversoirs dénoyés, Cloisons, Cloison aval | +| [Orifice noyé (Bernoulli)](./orifice_noye.md) | 0.7 | Lois d'ouvrages, Cloisons, Cloison aval | +| [Orifice dénoyé (Bernoulli)](./orifice_denoye.md) | 0.7 | Lois d'ouvrages | +| [Seuil mince (Villemonte)](./villemonte_1947.md) | 0.4 | Lois d'ouvrages, Cloisons, Cloison aval | +| [Échancrure régulée (Villemonte)](../pab/pab.md#la-cloison-aval) | 0.4 | Cloison aval | +| [Fente noyée régulée (Larinier)](../pab/pab.md#la-cloison-aval) | 0.75 | Cloison aval | Table: Liste des équations d'ouvrages -- GitLab