diff --git a/spec/pab/cloison_aval.spec.ts b/spec/pab/cloison_aval.spec.ts
index 156d0efbbb5958fcb406ee133a2be07f72597bd3..3b8059f38c3e8f4fddb40590e9c7404c85a29143 100644
--- a/spec/pab/cloison_aval.spec.ts
+++ b/spec/pab/cloison_aval.spec.ts
@@ -36,7 +36,7 @@ describe("class CloisonAval", () => {
const r = ca.CalcSerie();
expect(r.vCalc).toBeCloseTo(75.059, 3);
expect(r.values.ZDV).toBeCloseTo(73.9, 2);
- expect(r.log.messages[0].code).toBe(MessageCode.WARNING_NOTCH_SUBMERSION_GREATER_THAN_07);
+ expect(r.log.messages[0].code).toBe(MessageCode.WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07);
expect(r.log.messages[1].code).toBe(MessageCode.WARNING_VANLEV_ZDV_SUP_MAX);
});
it("ZDV max bound Calc(Z1) should return 75.096 and extraResults.ZDV should be 74", () => {
@@ -44,7 +44,7 @@ describe("class CloisonAval", () => {
const r = ca.CalcSerie();
expect(r.vCalc).toBeCloseTo(75.096, 3);
expect(r.values.ZDV).toBeCloseTo(74, 2);
- expect(r.log.messages[0].code).toBe(MessageCode.WARNING_NOTCH_SUBMERSION_GREATER_THAN_07);
+ expect(r.log.messages[0].code).toBe(MessageCode.WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07);
expect(r.log.messages[1].code).toBe(MessageCode.WARNING_VANLEV_ZDV_INF_MIN);
});
});
diff --git a/spec/pab/cloisons.spec.ts b/spec/pab/cloisons.spec.ts
index ecaa1d8c565da4ef6e6007dd4b66996b2fc6ba6f..549b1d0a58630595536e1a6b8e110c79dfc56927 100755
--- a/spec/pab/cloisons.spec.ts
+++ b/spec/pab/cloisons.spec.ts
@@ -132,7 +132,7 @@ describe("Class Cloisons: ", () => {
expect(cloisons.structures[0].result.values.P).toBeCloseTo(-0.65, 3);
expect(cloisons.structures[0].result.log.messages.length).toBe(2);
expect(cloisons.structures[0].result.log.messages[0].code).toBe(
- MessageCode.WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09
+ MessageCode.WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09
);
expect(cloisons.structures[0].result.log.messages[1].code).toBe(MessageCode.WARNING_NEGATIVE_SILL);
});
diff --git a/spec/pab/pab.spec.ts b/spec/pab/pab.spec.ts
index d238f8a3feaf8375e002fdc97ab2cf4d853274bb..e91dd0365d0e807cfc7e640015e493d54be3d406 100644
--- a/spec/pab/pab.spec.ts
+++ b/spec/pab/pab.spec.ts
@@ -278,7 +278,7 @@ describe("Class Pab: ", () => {
const pab2 = Session.getInstance().findNubByUid("M29hc3") as Pab;
pab2.CalcSerie();
expect(pab2.children[0].result.log.messages.length).toBe(2);
- expect(pab2.children[0].result.log.messages[0].code).toBe(MessageCode.WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09);
+ expect(pab2.children[0].result.log.messages[0].code).toBe(MessageCode.WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09);
expect(pab2.children[0].result.log.messages[1].code).toBe(MessageCode.WARNING_NEGATIVE_SILL);
});
});
diff --git a/spec/solveur/solveur.spec.ts b/spec/solveur/solveur.spec.ts
index 418f314c50dfcba169bd7043b47833a3e4bd846e..6f37d0aa22b029a692a9caeb2ae6848f590bdb01 100644
--- a/spec/solveur/solveur.spec.ts
+++ b/spec/solveur/solveur.spec.ts
@@ -369,7 +369,7 @@ describe("solveur multi-modules", () => {
expect(res.vCalc).toBeDefined();
expect(res.log.messages.length).toBeGreaterThan(0);
// Vanne à l'entrée du canal (Parallel structures)
- expect(res.log.messages[0].code).toBe(MessageCode.WARNING_NOTCH_SUBMERSION_GREATER_THAN_07);
+ expect(res.log.messages[0].code).toBe(MessageCode.WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07);
if (res.vCalc === undefined) {
expect(res.log.messages.length).toBe(3);
// Canal d'amenée (Cotes d'un bief)
diff --git a/spec/structure/structure_weir_submerged.spec.ts b/spec/structure/structure_weir_submerged.spec.ts
index 192dfb69602b46b4f8cdf3dbd789f8d8efb6d92a..e86a30e73d2a23d25783c790c4191fb3428713b2 100644
--- a/spec/structure/structure_weir_submerged.spec.ts
+++ b/spec/structure/structure_weir_submerged.spec.ts
@@ -38,7 +38,7 @@ describe("Class StructureWeirSubmerged: ", () => {
expect(res.log.messages.length).toBe(1);
expect(
res.log.messages[0].code
- ).toBe(MessageCode.WARNING_WEIR_SUBMERSION_LOWER_THAN_08);
+ ).toBe(MessageCode.WARNING_WEIR_SUBMERGENCE_LOWER_THAN_08);
});
});
});
diff --git a/spec/structure/structure_weir_submerged_larinier.spec.ts b/spec/structure/structure_weir_submerged_larinier.spec.ts
index 2648e8b0e0df965c9ff53e48c89e028f5e518a1c..40c0e16849c710c377d8362211f64e421694fe13 100644
--- a/spec/structure/structure_weir_submerged_larinier.spec.ts
+++ b/spec/structure/structure_weir_submerged_larinier.spec.ts
@@ -38,7 +38,7 @@ describe("Class StructureWeirSubmergedLarinier: ", () => {
expect(res.log.messages.length).toBe(1);
expect(
res.log.messages[0].code
- ).toBe(MessageCode.WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09);
+ ).toBe(MessageCode.WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09);
});
});
describe("Calcul avec h2/h1 < 0.7 (=0.5) : ", () => {
@@ -51,7 +51,7 @@ describe("Class StructureWeirSubmergedLarinier: ", () => {
expect(res.log.messages.length).toBe(1);
expect(
res.log.messages[0].code
- ).toBe(MessageCode.WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09);
+ ).toBe(MessageCode.WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09);
});
});
});
diff --git a/spec/structure/structure_weir_villemonte.spec.ts b/spec/structure/structure_weir_villemonte.spec.ts
index a9d6146eec9f2ddc569f252a5678d2e8fb856139..4b5b0d841723e7174d1e7f487fef0510f56194bd 100644
--- a/spec/structure/structure_weir_villemonte.spec.ts
+++ b/spec/structure/structure_weir_villemonte.spec.ts
@@ -17,7 +17,7 @@ describe("Class StructureWeirVillemonte: ", () => {
expect(res.log.messages.length).toBe(1);
expect(
res.log.messages[0].code
- ).toBe(MessageCode.WARNING_NOTCH_SUBMERSION_GREATER_THAN_07);
+ ).toBe(MessageCode.WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07);
});
});
});
diff --git a/src/structure/structure.ts b/src/structure/structure.ts
index 13e4ad2fe24de294daa107a2ef03b50dcd5946a1..3c070c552b75343465a276cd744c4a929edc0ba7 100644
--- a/src/structure/structure.ts
+++ b/src/structure/structure.ts
@@ -60,7 +60,7 @@ export abstract class Structure extends ChildNub {
/**
* calcul du pourcentage d'ennoiement arrondi à l'unité
*/
- public computeSubmersionPercentage(H2?: number): number {
+ public computeSubmergencePercentage(H2?: number): number {
const h1 = this._prms.get("h1").v;
const h2 = H2 === undefined ? this._prms.get("h2").v : H2;
if (h1 !== 0) {
diff --git a/src/structure/structure_orifice_free.ts b/src/structure/structure_orifice_free.ts
index 15bf44adac308706da177b4bcd7e31d4356c26aa..4d0c9ffbcda9d0dc32bc9ae1f8519518eeb896fe 100644
--- a/src/structure/structure_orifice_free.ts
+++ b/src/structure/structure_orifice_free.ts
@@ -31,7 +31,7 @@ export class StructureOrificeFree extends Structure {
{
Z2: this.prms.Z2.v,
Zco: this.prms.Zco.v,
- submersionPerc: this.computeSubmersionPercentage(this.prms.Z2.v - this.prms.Zco.v).toString()
+ submergencePerc: this.computeSubmergencePercentage(this.prms.Z2.v - this.prms.Zco.v).toString()
}
));
}
diff --git a/src/structure/structure_rectangular_orifice_free.ts b/src/structure/structure_rectangular_orifice_free.ts
index d88ac3eddea223ac762708236204eed027b730d9..d2a081deb98703cd28f3b95aad83db630af14a07 100644
--- a/src/structure/structure_rectangular_orifice_free.ts
+++ b/src/structure/structure_rectangular_orifice_free.ts
@@ -26,7 +26,7 @@ export class StructureRectangularOrificeFree extends RectangularStructure {
MessageCode.WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION,
{
h2: this.prms.h2.v,
- submersionPerc: this.computeSubmersionPercentage().toString()
+ submergencePerc: this.computeSubmergencePercentage().toString()
}
));
}
diff --git a/src/structure/structure_weir_free.ts b/src/structure/structure_weir_free.ts
index fb08545cd97614013e3ee6c6e8feea5b69733d6a..69e4c3575f42aa0bdde41fef5857cbee03af33ce 100644
--- a/src/structure/structure_weir_free.ts
+++ b/src/structure/structure_weir_free.ts
@@ -24,7 +24,7 @@ export class StructureWeirFree extends RectangularStructure {
MessageCode.WARNING_DOWNSTREAM_ELEVATION_POSSIBLE_SUBMERSION,
{
h2: this.prms.h2.v,
- submersionPerc: this.computeSubmersionPercentage().toString()
+ submergencePerc: this.computeSubmergencePercentage().toString()
}
));
}
diff --git a/src/structure/structure_weir_submerged.ts b/src/structure/structure_weir_submerged.ts
index 55377240cf16d7ff397ed4ffd4f6487a0a308994..13b6858fbe2429c5ecf2836d4fc7be5fb387ebf2 100644
--- a/src/structure/structure_weir_submerged.ts
+++ b/src/structure/structure_weir_submerged.ts
@@ -24,11 +24,11 @@ export class StructureWeirSubmerged extends RectangularStructure {
const h2h1ratio = this.prms.h2.v / this.prms.h1.v;
if (h2h1ratio < 0.8) {
this._result.resultElement.addMessage(new Message(
- MessageCode.WARNING_WEIR_SUBMERSION_LOWER_THAN_08,
+ MessageCode.WARNING_WEIR_SUBMERGENCE_LOWER_THAN_08,
{
h1: this.prms.h1.v,
h2: this.prms.h2.v,
- submersionPerc: this.computeSubmersionPercentage().toString()
+ submergencePerc: this.computeSubmergencePercentage().toString()
}
));
}
diff --git a/src/structure/structure_weir_submerged_larinier.ts b/src/structure/structure_weir_submerged_larinier.ts
index 31cd2940470d28cc0b6280189b1f722ea349d8bc..1fffd4ad963b27fcb334086883205c8fe8308c52 100644
--- a/src/structure/structure_weir_submerged_larinier.ts
+++ b/src/structure/structure_weir_submerged_larinier.ts
@@ -30,11 +30,11 @@ export class StructureWeirSubmergedLarinier extends RectangularStructure {
const h2h1ratio = this.prms.h2.v / this.prms.h1.v;
if (h2h1ratio < 0.7 || h2h1ratio > 0.9) {
this._result.resultElement.addMessage(new Message(
- MessageCode.WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09,
+ MessageCode.WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09,
{
h1: this.prms.h1.v,
h2: this.prms.h2.v,
- submersionPerc: this.computeSubmersionPercentage().toString()
+ submergencePerc: this.computeSubmergencePercentage().toString()
}
));
}
diff --git a/src/structure/structure_weir_villemonte.ts b/src/structure/structure_weir_villemonte.ts
index f8353e337b98b00da9d2423bac85dd19fdcc88ea..28af27117c2cd6e2a27cadaee34ece49933452a7 100644
--- a/src/structure/structure_weir_villemonte.ts
+++ b/src/structure/structure_weir_villemonte.ts
@@ -17,11 +17,11 @@ export class StructureWeirVillemonte extends StructureWeirFree {
this.currentResult = super.Calc(sVarCalc, rInit);
if ((this.prms.h2.v / this.prms.h1.v) > 0.7) {
this._result.resultElement.addMessage(new Message(
- MessageCode.WARNING_NOTCH_SUBMERSION_GREATER_THAN_07,
+ MessageCode.WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07,
{
h1: this.prms.h1.v,
h2: this.prms.h2.v,
- submersionPerc: this.computeSubmersionPercentage().toString()
+ submergencePerc: this.computeSubmergencePercentage().toString()
}
));
}
diff --git a/src/util/message.ts b/src/util/message.ts
index 7300f01e35e5e7d1a12add3227ff4dc862c7d7a9..ae3e98ec3d18ba8969c6616909fbe4664e9fefbe 100644
--- a/src/util/message.ts
+++ b/src/util/message.ts
@@ -603,12 +603,12 @@ export enum MessageCode {
/**
* La formule de l'échancrure n'est pas conseillée pour un ennoiement supérieur à 0.7
*/
- WARNING_NOTCH_SUBMERSION_GREATER_THAN_07,
+ WARNING_NOTCH_SUBMERGENCE_GREATER_THAN_07,
/**
* La formule de la fente n'est pas conseillée pour un ennoiement inférieur à 0.7 et supérieur à 0.9
*/
- WARNING_SLOT_SUBMERSION_NOT_BETWEEN_07_AND_09,
+ WARNING_SLOT_SUBMERGENCE_NOT_BETWEEN_07_AND_09,
/** PAR : la largeur est plus grande que la valeur d'alerte %max% */
WARNING_PAR_L,
@@ -646,7 +646,7 @@ export enum MessageCode {
/**
* La formule du seuil noyé n'est pas conseillé pour un ennoiement inférieur à 0.8
*/
- WARNING_WEIR_SUBMERSION_LOWER_THAN_08,
+ WARNING_WEIR_SUBMERGENCE_LOWER_THAN_08,
/**
* Vanne levante : ZDV > ZDV max