From efb673df00b560894e37c1551667e6a9870128d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Tue, 15 Mar 2022 15:47:55 +0100
Subject: [PATCH 1/2] ci: fix Nightly build: clean folder before installation
Closes #495
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 496309b0b..76965e220 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ deploy:
- build
script:
# Copie de la branche / du tag
- - rsync -a "dist/" "$DEPLOY_HOST_LOGIN:$DEPLOY_URL/$CI_COMMIT_REF_NAME"
+ - rsync --delete -a "dist/" "$DEPLOY_HOST_LOGIN:$DEPLOY_URL/$CI_COMMIT_REF_NAME"
deploy-stable:
stage: deploy-stable
@@ -114,7 +114,7 @@ deploy-stable:
- build
script:
# Copie de la branche production
- - rsync -a "dist/" "$DEPLOY_HOST_LOGIN:$DEPLOY_STABLE_URL/"
+ - rsync --delete -a "dist/" "$DEPLOY_HOST_LOGIN:$DEPLOY_STABLE_URL/"
# Modification du dossier base href
- ssh $DEPLOY_HOST_LOGIN "sed -i 's:/cassiopee/stable/:/:g' $DEPLOY_STABLE_URL/index.html"
--
GitLab
From 3321f57bba1105ebe698b35212a91a9b78a37495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 16 Mar 2022 12:25:09 +0100
Subject: [PATCH 2/2] docs: fix typos
Closes #498
---
docs/en/calculators/hsl/section_parametree.md | 18 +++++++++---------
docs/fr/calculators/hsl/section_parametree.md | 4 ++--
.../hyd_en_charge/lechapt-calmon.md | 4 ++--
src/app/calculators/courberemous/config.json | 4 ++--
src/app/calculators/pabdimensions/en.json | 2 +-
src/app/calculators/regimeuniforme/en.json | 2 +-
.../calculators/sectionparametree/config.json | 2 +-
src/app/calculators/sectionparametree/en.json | 2 +-
src/app/results/remous-results.ts | 2 +-
src/locale/messages.en.json | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/docs/en/calculators/hsl/section_parametree.md b/docs/en/calculators/hsl/section_parametree.md
index e3e8ad8f0..7d74e2bd9 100644
--- a/docs/en/calculators/hsl/section_parametree.md
+++ b/docs/en/calculators/hsl/section_parametree.md
@@ -3,7 +3,7 @@
This module calculates the hydraulic quantities associated to:
- a section with a defined geometrical shape ([See section types managed by Cassiopée](types_sections.md))
-- a draft \(y\) in m
+- a water depth \(y\) in m
- a flow \(Q\) in m<sup>3</sup>/s
- a bottom slope \(I_f\) in m/m
- a roughness expressed with the Strickler's coefficient \(K\) in m<sup>1/3</sup>/s
@@ -23,7 +23,7 @@ The calculated hydraulic quantities are:
- Critical depth (m)
- Critical head (m)
- Corresponding depth (m)
-- Impulsion (kgâ‹…mâ‹…s<sup>-1</sup>)
+- Impulsion (N)
- Conjugate depth
- Tractive force (Pa)
@@ -122,15 +122,15 @@ We use Newton's method by posing \(y_{k+1} = y_k - \frac{f(y_k)}{f'(y_k)}\) with
<div style="position: relative"><div style="position: relative"><a id="la-charge-critique-m" style="position: absolute; top: -100px;" style="position: absolute; top: -60px;"></a></div></div>
## Critical head (m)
-This is the head calculated for a draft equal to the critical depth. \(H_c = H(y_c)\).
+This is the head calculated for a water depth equal to the critical depth. \(H_c = H(y_c)\).
<div style="position: relative"><a id="le-tirant-deau-correspondant-m" style="position: absolute; top: -60px;"></a></div>
-## Corresponing depth (m)
+## Corresponding depth (m)
-For a fluvial (respectively torrential draft) \(y\), corresponding depth is the torrential (respectively fluvial) draft for the which \(H(y) = H(y_{cor})\).
+For a fluvial (respectively torrential water depth) \(y\), corresponding depth is the torrential (respectively fluvial) water depth for which \(H(y) = H(y_{cor})\).
-<div style="position: relative"><a id="limpulsion-hydraulique-kgms-1" style="position: absolute; top: -60px;"></a></div>
-## Hydraulic impulsion (kgâ‹…mâ‹…s<sup>-1</sup>)
+<div style="position: relative"><a id="limpulsion-hydraulique-N" style="position: absolute; top: -60px;"></a></div>
+## Hydraulic impulsion (N)
The impulsion \(I\) is the sum of the amount of movement and the resultant of the pressure force in a section:
@@ -145,7 +145,7 @@ The distance from the centre of gravity of the section to the free surface \(y_g
$$S.y_g = \int_{0}^{y} (y-z)B(z)dz$$
-With \(y\) the depth and \(B(z)\) the width at mirror for a draft \(z\)
+With \(y\) the depth and \(B(z)\) the width at mirror for a water depth \(z\)
Formulas of \(S.y_g\) for the different section shapes are :
@@ -157,7 +157,7 @@ Formulas of \(S.y_g\) for the different section shapes are :
<div style="position: relative"><a id="le-tirant-deau-conjugue-m" style="position: absolute; top: -60px;"></a></div>
## Conjugate depth (m)
-For a fluvial (respectively torrential draft) \(y\), conjugate depth is the torrential (respectively fluvial) draft for the which \(I(y) = I(y_{con})\).
+For a fluvial (respectively torrential water depth) \(y\), conjugate depth is the torrential (respectively fluvial) water depth for which \(I(y) = I(y_{con})\).
<div style="position: relative"><a id="la-force-tractrice-pa" style="position: absolute; top: -60px;"></a></div>
## Tractive force (Pa)
diff --git a/docs/fr/calculators/hsl/section_parametree.md b/docs/fr/calculators/hsl/section_parametree.md
index eef566ac7..18c4bfa59 100644
--- a/docs/fr/calculators/hsl/section_parametree.md
+++ b/docs/fr/calculators/hsl/section_parametree.md
@@ -23,7 +23,7 @@ Les grandeurs hydrauliques calculées sont :
- Le tirant d'eau critique (m)
- La charge critique (m)
- Le tirant d'eau correspondant (m)
-- L'impulsion (kgâ‹…mâ‹…s<sup>-1</sup>)
+- L'impulsion (N)
- Le tirant d'eau conjugué
- La force tractrice (Pa)
@@ -117,7 +117,7 @@ C'est la charge calculée pour un tirant d'eau égal au tirant d'eau critique \(
Pour un tirant d'eau fluvial (respectivement torrentiel) \(y\), le tirant correspondant est le tirant d'eau torrentiel (respectivement fluvial) pour lequel \(H(y) = H(y_{cor})\).
-## L'impulsion hydraulique (kgâ‹…mâ‹…s<sup>-1</sup>)
+## L'impulsion hydraulique (N)
L'impulsion \(I\) est la somme de la quantité de mouvement et de la résultante de la force de pression dans une section :
diff --git a/docs/fr/calculators/hyd_en_charge/lechapt-calmon.md b/docs/fr/calculators/hyd_en_charge/lechapt-calmon.md
index c423136c1..6001e5572 100644
--- a/docs/fr/calculators/hyd_en_charge/lechapt-calmon.md
+++ b/docs/fr/calculators/hyd_en_charge/lechapt-calmon.md
@@ -49,7 +49,7 @@ Table: Matériaux et coefficients utilisés dans la formule de Lechapt et Calmon
$$ J_S = K_S \frac{V^2}{2g}$$
-Avec :
+Avec :
- \(K_S\) : le coefficient de perte de charge singulière
- \(V\) : la vitesse de l'eau dans la conduite (\(V = 4 Q / \pi / D^2\))
@@ -60,4 +60,4 @@ $$ K_L = \frac{2g J_L}{V^2} $$
## Coefficient de perte de charge de Darcy
-$$ f_D = \frac{2g J D}{l_T V^2}
+$$ f_D = \frac{2g J D}{l_T V^2} $$
diff --git a/src/app/calculators/courberemous/config.json b/src/app/calculators/courberemous/config.json
index 455e9d73b..272de8687 100644
--- a/src/app/calculators/courberemous/config.json
+++ b/src/app/calculators/courberemous/config.json
@@ -89,7 +89,7 @@
"Hsc": "hsl/section_parametree.html#la-charge-critique-m",
"J": "hsl/section_parametree.html#la-perte-de-charge-mm",
"I-J": "hsl/section_parametree.html#la-variation-lineaire-de-lenergie-specifique-mm",
- "Imp": "hsl/section_parametree.html#limpulsion-hydraulique-kgms-1",
+ "Imp": "hsl/section_parametree.html#limpulsion-hydraulique-N",
"Tau0": "hsl/section_parametree.html#la-force-tractrice-pa"
}
}
@@ -115,7 +115,7 @@
"Hsc": "hsl/section_parametree.html#la-charge-critique-m",
"J": "hsl/section_parametree.html#la-perte-de-charge-mm",
"I-J": "hsl/section_parametree.html#la-variation-lineaire-de-lenergie-specifique-mm",
- "Imp": "hsl/section_parametree.html#limpulsion-hydraulique-kgms-1",
+ "Imp": "hsl/section_parametree.html#limpulsion-hydraulique-N",
"Tau0": "hsl/section_parametree.html#la-force-tractrice-pa"
}
}
diff --git a/src/app/calculators/pabdimensions/en.json b/src/app/calculators/pabdimensions/en.json
index df5b11b45..88df27b9d 100644
--- a/src/app/calculators/pabdimensions/en.json
+++ b/src/app/calculators/pabdimensions/en.json
@@ -2,6 +2,6 @@
"fs_dimensions": "Basin dimensions",
"L": "Length",
"W": "Width",
- "Y": "Draft",
+ "Y": "Water depth",
"V": "Volume"
}
\ No newline at end of file
diff --git a/src/app/calculators/regimeuniforme/en.json b/src/app/calculators/regimeuniforme/en.json
index 4a5a3327a..f1ea50fcc 100644
--- a/src/app/calculators/regimeuniforme/en.json
+++ b/src/app/calculators/regimeuniforme/en.json
@@ -17,5 +17,5 @@
"If": "Bottom slope",
"YB": "Embankment elevation",
"fs_hydraulique": "Hydraulic features",
- "Y": "Draft"
+ "Y": "Water depth"
}
\ No newline at end of file
diff --git a/src/app/calculators/sectionparametree/config.json b/src/app/calculators/sectionparametree/config.json
index 63235d9a5..f24b88ca8 100644
--- a/src/app/calculators/sectionparametree/config.json
+++ b/src/app/calculators/sectionparametree/config.json
@@ -67,7 +67,7 @@
"Hsc": "hsl/section_parametree.html#la-charge-critique-m",
"J": "hsl/section_parametree.html#la-perte-de-charge-mm",
"I-J": "hsl/section_parametree.html#la-variation-lineaire-de-lenergie-specifique-mm",
- "Imp": "hsl/section_parametree.html#limpulsion-hydraulique-kgms-1",
+ "Imp": "hsl/section_parametree.html#limpulsion-hydraulique-N",
"Tau0": "hsl/section_parametree.html#la-force-tractrice-pa"
}
}
diff --git a/src/app/calculators/sectionparametree/en.json b/src/app/calculators/sectionparametree/en.json
index 92a0479a8..b13efd538 100644
--- a/src/app/calculators/sectionparametree/en.json
+++ b/src/app/calculators/sectionparametree/en.json
@@ -17,7 +17,7 @@
"If": "Bottom slope",
"YB": "Embankment elevation",
"fs_hydraulique": "Hydraulic features",
- "Y": "Draft",
+ "Y": "Water depth",
"fs_param_calc": "Calculation parameters",
"Hs": "Specific head",
"Hsc": "Critical head",
diff --git a/src/app/results/remous-results.ts b/src/app/results/remous-results.ts
index dedfd9a6f..abb20aa69 100644
--- a/src/app/results/remous-results.ts
+++ b/src/app/results/remous-results.ts
@@ -90,7 +90,7 @@ export class RemousResults extends CalculatorResults {
// série de valeurs de X
this._xValues = new ParamDefinition(
p,
- ServiceFactory.i18nService.localizeText("INFO_REMOUSRESULTS_ABSCISSE"),
+ "ABSCISSE",
ParamDomainValue.POS_NULL
);
}
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 94d4434ca..022f3ee46 100755
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -567,7 +567,7 @@
"INFO_REMOUSRESULTS_ABSCISSE": "Abscissa",
"INFO_REMOUSRESULTS_BERGE": "Embankment",
"INFO_REMOUSRESULTS_FOND": "Bottom",
- "INFO_REMOUSRESULTS_TIRANT": "Draft (m)",
+ "INFO_REMOUSRESULTS_TIRANT": "Water depth (m)",
"INFO_REMOUSRESULTS_TIRANTCRITIQUE": "Critical water level",
"INFO_REMOUSRESULTS_TIRANTNORMAL": "Normal water level",
"INFO_REPORT_BUG_BODY": "This is an issue report.\n\nPlease describe quickly the issue you encoutered, and the steps you followed:\n\n\n\n\n--- Current session state - do not modify text below ---\n------------------------------------------------------------------------\n\n",
--
GitLab