Commit f9e76c62 authored by Dorchies David's avatar Dorchies David
Browse files

feat(verificateur): submerged macrorugo are not crossable

Fix #290
parent ea71f0c8
......@@ -942,7 +942,8 @@ describe("vérificateur de franchissement −", () => {
// contexte
Session.getInstance().clear();
const mrc = createMRC();
mrc.prms.If.singleValue = 0.01;
mrc.prms.If.singleValue = 0.04;
mrc.prms.Z1.singleValue = 12.9;
// vérificateur
const v = new Verificateur();
v.nubToVerify = mrc;
......
......@@ -10,7 +10,7 @@ import { StructureJetType, StructureFlowMode } from "../structure/structure";
import { Message, MessageCode } from "../util/message";
import { ParSimulation } from "../par/par_simulation";
import { ParType } from "../par/par";
import { MacroRugo } from "../macrorugo/macrorugo";
import { MacroRugo, MacroRugoFlowType } from "../macrorugo/macrorugo";
import { ResultElement } from "../util/resultelement";
import { MacrorugoCompound } from "../macrorugo/macrorugo_compound";
import { Pab } from "../pab/pab";
......@@ -1051,7 +1051,7 @@ export class Espece extends Nub implements Observer {
}
// 2. speed
if (this.prms.VeMax.singleValue !== undefined && isGreaterThan(passResult.values.Vmax, this.prms.VeMax.singleValue, 1e-3)) {
if (passResult.values.ENUM_MacroRugoFlowType === MacroRugoFlowType.SUBMERGED || this.prms.VeMax.singleValue !== undefined && isGreaterThan(passResult.values.Vmax, this.prms.VeMax.singleValue, 1e-3)) {
val = 0;
let m: Message;
if (apronNumber !== undefined) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment