diff --git a/src/macrorugo/macrorugo_params.ts b/src/macrorugo/macrorugo_params.ts index 016cee473a5d0a324c933a6a01db4d7db9b220db..beb40eb0450d751d9163f24d8d7aa5b8770c81f3 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 0e1eb454b4cc1f494410069a48e62283bb556108..d9c149f6fdd4f8aa9319b1ac83aab3a6784d1f6f 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 a9c34bc512bea954d6cfb09297d3c350cc06030d..7bac2b017a030444ead63781f974186a322d1224 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 460add1fd8cb6897f27756116e70e902bec54c5c..2d3e008fce0b905480f90c03e85c07b6d9410aea 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 fc9b44f5ea2c5b780f66f7046d0e5a3c5f90e3a6..0b9da88b47128a28b1fbb9d16af27189894b503d 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 0d1e4aa66eba95a4171c3bfb82952a03e220f0ce..24a8ffedef18339af83a4e62e152d22d695416f3 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;