From 05ea25e3ae177cba8821791fb19c38d32a685bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 22 Nov 2023 13:47:41 +0000
Subject: [PATCH] fix: remove ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF message
when ZDV < ZF Refs #353
---
spec/pre_barrage/pre-barrage.spec.ts | 12 ------------
src/prebarrage/pre_barrage.ts | 15 ---------------
src/util/message.ts | 2 --
3 files changed, 29 deletions(-)
diff --git a/spec/pre_barrage/pre-barrage.spec.ts b/spec/pre_barrage/pre-barrage.spec.ts
index 054c2a10..c98cb555 100644
--- a/spec/pre_barrage/pre-barrage.spec.ts
+++ b/spec/pre_barrage/pre-barrage.spec.ts
@@ -674,18 +674,6 @@ describe("Class PreBarrage:", () => {
expect(res.resultElement.log.messages[0].extraVar.n).toBe("1");
});
- it("device ZDV < ZF of upstream basin", () => {
- const pb = createPreBarrageTest();
- pb.bassins[0].cloisonsAval[0].structures[0].prms.ZDV.singleValue = pb.bassins[0].prms.ZF.singleValue - 1;
- const res = pb.CalcSerie();
- expect(res.ok).toBe(false);
- expect(res.resultElement.log.messages.length).toBe(1);
- expect(res.resultElement.log.messages[0].code).toBe(MessageCode.ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF);
- expect(res.resultElement.log.messages[0].extraVar.cub).toBe("B1", "wall upstream basin");
- expect(res.resultElement.log.messages[0].extraVar.cdb).toBe("MSG_INFO_LIB_AVAL", "wall downstream basin");
- expect(res.resultElement.log.messages[0].extraVar.ns).toBe("1", "structure number in wall");
- });
-
it("PreBarrage must have at least one path from upstream to downstream", () => {
const pb = createPreBarrageTest();
pb.bassins[0].cloisonsAval[0].bassinAval = pb.bassins[0]; // nonsense wall having the same basin at upstream and downstream
diff --git a/src/prebarrage/pre_barrage.ts b/src/prebarrage/pre_barrage.ts
index 0edb2929..c16fa58f 100644
--- a/src/prebarrage/pre_barrage.ts
+++ b/src/prebarrage/pre_barrage.ts
@@ -502,21 +502,6 @@ export class PreBarrage extends Nub {
res.resultElement.log.add(m);
}
}
- // for each device of each wall: is ZDV < ZF of upstream basin ?
- for (const b of this.bassins) {
- for (const c of b.cloisonsAval) {
- for (const s of c.structures) {
- if (s.prms.ZDV.v < b.prms.ZF.v) {
- const m = new Message(MessageCode.ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF);
- m.extraVar.ns = String(s.findPositionInParent() + 1);
- const desc = c.description;
- m.extraVar.cub = desc.extraVar.ub;
- m.extraVar.cdb = desc.extraVar.db;
- res.resultElement.log.add(m);
- }
- }
- }
- }
return res;
}
diff --git a/src/util/message.ts b/src/util/message.ts
index 61563701..f8957dd2 100644
--- a/src/util/message.ts
+++ b/src/util/message.ts
@@ -694,8 +694,6 @@ export enum MessageCode {
/** Pré-barrage : cote de fond du bassin %n% supérieure à la cote de l'eau amont */
WARNING_PREBARRAGE_BASSIN_ZF_SUP_Z1,
- /** Pré-barrage : cote de radier de l'ouvrage %ns% inférieure à la cote de fond du bassin amont de la cloison %cub%-%cdb% */
- ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF
}
/**
--
GitLab