Skip to content
Snippets Groups Projects
Commit de8d408e authored by Dorchies David's avatar Dorchies David
Browse files

Merge branch '524-documentation-macrorugo-ajouter-un-schema-rugosite-de-fond' into 'devel'

Resolve "Documentation > MacroRugo: ajouter un schéma rugosité de fond"

Closes #524

See merge request !173
parents f3e255c1 a3af9b26
No related branches found
No related tags found
1 merge request!173Resolve "Documentation > MacroRugo: ajouter un schéma rugosité de fond"
Pipeline #139892 passed
......@@ -25,3 +25,8 @@ It requires the following values to be entered:
- The width of the blocks \(D\) facing the flow (m);
- The useful height of the blocks \(k\) (m);
- The drag coefficient of a single block (1 for round, 2 for square).
<div style="position: relative"><a id="rugosite-de-fond" style="position: absolute; top: -60px;"></a></div>
# Bed roughness
![](schema_rugosite_fond.png)
docs/en/calculators/pam/schema_rugosite_fond.png

190 KiB

......@@ -26,3 +26,6 @@ Il nécessite d'entrer les valeurs suivantes&nbsp;:
- La hauteur utile des blocs \(k\) (m)&nbsp;;
- Le coefficient de trainée d'un bloc (1 pour rond, 2 pour carré).
# Rugosité de fond
![](schema_rugosite_fond.png)
docs/fr/calculators/pam/schema_rugosite_fond.png

682 KiB

......@@ -5,7 +5,10 @@
"fields": [
"ZF1",
"L",
"Ks"
{
"id": "Ks",
"help": "pam/macrorugo.html#rugosite-de-fond"
}
]
},
{
......@@ -41,4 +44,4 @@
"type": "options",
"help": "pam/macrorugo.html"
}
]
\ No newline at end of file
]
......@@ -15,7 +15,10 @@
"id": "If",
"help": "hsl/pente.html"
},
"Ks",
{
"id": "Ks",
"help": "pam/macrorugo.html#rugosite-de-fond"
},
{
"id": "C",
"help": "pam/concentration.html"
......@@ -43,8 +46,14 @@
"type": "select",
"property": "inclinedApron"
},
"ZRR",
"ZRL",
{
"id": "ZRR",
"help": "pam/macrorugo.html#rugosite-de-fond"
},
{
"id": "ZRL",
"help": "pam/macrorugo.html#rugosite-de-fond"
},
"BR"
]
},
......@@ -53,7 +62,10 @@
"type": "fieldset_template",
"calcType": "MacroRugo",
"fields": [
"ZF1",
{
"id": "ZF1",
"help": "pam/macrorugo.html#rugosite-de-fond"
},
"B"
]
},
......@@ -69,4 +81,4 @@
"selectIds": [ "select_passtype" ],
"help": "pam/macrorugo_complexe.html"
}
]
\ No newline at end of file
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment