From 2cade60c32a498cd3ebb5a3f2b6489b9d5fb208c Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Fri, 17 May 2019 11:31:23 +0200
Subject: [PATCH] Fix #91
---
src/macrorugo/macrorugo_params.ts | 2 +-
src/pab/pab_chute.ts | 2 +-
src/pab/pab_nombre.ts | 10 ++--------
src/pab/pab_puissance.ts | 2 +-
src/param/param-definition.ts | 4 +++-
src/structure/cloisons_params.ts | 2 +-
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/macrorugo/macrorugo_params.ts b/src/macrorugo/macrorugo_params.ts
index 016cee47..beb40eb0 100644
--- a/src/macrorugo/macrorugo_params.ts
+++ b/src/macrorugo/macrorugo_params.ts
@@ -80,7 +80,7 @@ export class MacrorugoParams extends ParamsEquation {
this._C = new ParamDefinition(this, "C", ParamDomainValue.POS, rCB);
this.addParamDefinition(this._C);
- this._PBD = new ParamDefinition(this, "PBD", ParamDomainValue.POS, rPBD, ParamFamily.DIAMETERS);
+ this._PBD = new ParamDefinition(this, "PBD", ParamDomainValue.POS, rPBD);
this.addParamDefinition(this._PBD);
this._PBH = new ParamDefinition(this, "PBH", ParamDomainValue.POS, rPBH, ParamFamily.HEIGHTS);
diff --git a/src/pab/pab_chute.ts b/src/pab/pab_chute.ts
index 0e1eb454..d9c149f6 100644
--- a/src/pab/pab_chute.ts
+++ b/src/pab/pab_chute.ts
@@ -22,7 +22,7 @@ export class PabChuteParams extends ParamsEquation {
super();
this._Z1 = new ParamDefinition(this, "Z1", ParamDomainValue.ANY, rZ1, ParamFamily.ELEVATIONS);
this._Z2 = new ParamDefinition(this, "Z2", ParamDomainValue.ANY, rZ2, ParamFamily.ELEVATIONS);
- this._DH = new ParamDefinition(this, "DH", ParamDomainValue.POS_NULL, rDH, ParamFamily.HEIGHTS);
+ this._DH = new ParamDefinition(this, "DH", ParamDomainValue.POS_NULL, rDH, ParamFamily.TOTALFALLS);
this.addParamDefinition(this._Z1);
this.addParamDefinition(this._Z2);
diff --git a/src/pab/pab_nombre.ts b/src/pab/pab_nombre.ts
index a9c34bc5..7bac2b01 100644
--- a/src/pab/pab_nombre.ts
+++ b/src/pab/pab_nombre.ts
@@ -21,9 +21,9 @@ export class PabNombreParams extends ParamsEquation {
constructor(rDHT: number, rN: number, rDH: number) {
super();
- this._DHT = new ParamDefinition(this, "DHT", ParamDomainValue.POS, rDHT, ParamFamily.HEIGHTS);
+ this._DHT = new ParamDefinition(this, "DHT", ParamDomainValue.POS, rDHT, ParamFamily.TOTALFALLS);
this._N = new ParamDefinition(this, "N", ParamDomainValue.POS, rN);
- this._DH = new ParamDefinition(this, "DH", ParamDomainValue.POS, rDH, ParamFamily.HEIGHTS);
+ this._DH = new ParamDefinition(this, "DH", ParamDomainValue.POS, rDH, ParamFamily.BASINFALLS);
this.addParamDefinition(this._DHT);
this.addParamDefinition(this._N);
@@ -102,10 +102,4 @@ export class PabNombre extends Nub {
this.prms.N.calculability = ParamCalculability.EQUATION;
this.prms.DH.calculability = ParamCalculability.EQUATION;
}
-
- protected setExtraResultsFamilies() {
- this._extraResultsFamilies = {
- DHR: ParamFamily.HEIGHTS
- };
- }
}
diff --git a/src/pab/pab_puissance.ts b/src/pab/pab_puissance.ts
index 460add1f..2d3e008f 100644
--- a/src/pab/pab_puissance.ts
+++ b/src/pab/pab_puissance.ts
@@ -22,7 +22,7 @@ export class PabPuissanceParams extends ParamsEquation {
constructor(rDH: number, rQ: number, rV: number, rPV?: number) {
super();
- this._DH = new ParamDefinition(this, "DH", ParamDomainValue.POS, rDH, ParamFamily.HEIGHTS);
+ this._DH = new ParamDefinition(this, "DH", ParamDomainValue.POS, rDH, ParamFamily.BASINFALLS);
this._Q = new ParamDefinition(this, "Q", ParamDomainValue.POS_NULL, rQ, ParamFamily.FLOWS);
this._V = new ParamDefinition(this, "V", ParamDomainValue.POS, rV, ParamFamily.VOLUMES);
this._PV = new ParamDefinition(this, "PV", ParamDomainValue.POS, rPV);
diff --git a/src/param/param-definition.ts b/src/param/param-definition.ts
index fc9b44f5..0b9da88b 100644
--- a/src/param/param-definition.ts
+++ b/src/param/param-definition.ts
@@ -33,7 +33,9 @@ export enum ParamFamily {
LENGTHS, // longueur
WIDTHS, // largeur
SLOPES, // pente
- HEIGHTS, // profondeur, tirant d'eau, chute
+ HEIGHTS, // profondeur, tirant d'eau
+ BASINFALLS, // chute entre bassins
+ TOTALFALLS, // chute totale
ELEVATIONS, // cote
VOLUMES,
FLOWS, // débit
diff --git a/src/structure/cloisons_params.ts b/src/structure/cloisons_params.ts
index 0d1e4aa6..24a8ffed 100644
--- a/src/structure/cloisons_params.ts
+++ b/src/structure/cloisons_params.ts
@@ -35,7 +35,7 @@ export class CloisonsParams extends ParallelStructureParams {
this.addParamDefinition(this.BB);
this.PB = new ParamDefinition(this, "PB", ParamDomainValue.POS, rPB, ParamFamily.HEIGHTS);
this.addParamDefinition(this.PB);
- this.DH = new ParamDefinition(this, "DH", ParamDomainValue.POS, rDH, ParamFamily.HEIGHTS);
+ this.DH = new ParamDefinition(this, "DH", ParamDomainValue.POS, rDH, ParamFamily.BASINFALLS);
this.addParamDefinition(this.DH);
// hide Z2
this.Z2.visible = false;
--
GitLab