diff --git a/src/macrorugo/concentration_blocs_params.ts b/src/macrorugo/concentration_blocs_params.ts index 8c35f597c5402d85778be79ddce215eafe86b4b5..0003e56779bb90c2bb34a07a450cb87a704b3e2f 100644 --- a/src/macrorugo/concentration_blocs_params.ts +++ b/src/macrorugo/concentration_blocs_params.ts @@ -18,10 +18,10 @@ export class ConcentrationBlocsParams extends ParamsEquation { constructor(rC: number, rN: number, rL: number, rD: number, nullParams: boolean = false) { super(); - this._C = new ParamDefinition(this, "C", new ParamDomain(ParamDomainValue.INTERVAL, 0, 1), undefined, rC, undefined, undefined, nullParams); + this._C = new ParamDefinition(this, "C", new ParamDomain(ParamDomainValue.INTERVAL, 0, 1), undefined, rC, ParamFamily.BLOCKCONCENTRATION, undefined, nullParams); this._N = new ParamDefinition(this, "N", ParamDomainValue.POS, undefined, rN, undefined, undefined, nullParams); this._L = new ParamDefinition(this, "L", ParamDomainValue.POS, "m", rL, ParamFamily.WIDTHS, undefined, nullParams); - this._D = new ParamDefinition(this, "D", new ParamDomain(ParamDomainValue.INTERVAL, 0, 2), "m", rD, undefined, undefined, nullParams); + this._D = new ParamDefinition(this, "D", new ParamDomain(ParamDomainValue.INTERVAL, 0, 2), "m", rD, ParamFamily.DIAMETERS, undefined, nullParams); this.addParamDefinition(this._C); this.addParamDefinition(this._N); diff --git a/src/macrorugo/macrorugo_params.ts b/src/macrorugo/macrorugo_params.ts index 859dbc19248258979510ca0451cf1646dde09edd..d36b2f9915d5671c0a9d3e36f4f683a1771818a8 100644 --- a/src/macrorugo/macrorugo_params.ts +++ b/src/macrorugo/macrorugo_params.ts @@ -77,10 +77,10 @@ export class MacrorugoParams extends ParamsEquation { this._Ks = new ParamDefinition(this, "Ks", new ParamDomain(ParamDomainValue.INTERVAL, 0, 1), "m", rRF, ParamFamily.STRICKLERS, undefined, nullParams); this.addParamDefinition(this._Ks); - this._C = new ParamDefinition(this, "C", new ParamDomain(ParamDomainValue.INTERVAL, 0, 1), "", rCB, undefined, undefined, nullParams); + this._C = new ParamDefinition(this, "C", new ParamDomain(ParamDomainValue.INTERVAL, 0, 1), "", rCB, ParamFamily.BLOCKCONCENTRATION, undefined, nullParams); this.addParamDefinition(this._C); - this._PBD = new ParamDefinition(this, "PBD", new ParamDomain(ParamDomainValue.INTERVAL, 0, 2), "m", rPBD, undefined, undefined, nullParams); + this._PBD = new ParamDefinition(this, "PBD", new ParamDomain(ParamDomainValue.INTERVAL, 0, 2), "m", rPBD, ParamFamily.DIAMETERS, undefined, nullParams); this.addParamDefinition(this._PBD); this._PBH = new ParamDefinition(this, "PBH", ParamDomainValue.POS, "m", rPBH, ParamFamily.HEIGHTS, undefined, nullParams); diff --git a/src/param/param-definition.ts b/src/param/param-definition.ts index b476c28e9fd31a57095e91d4689c0320e5ac8c84..42e706c9de50cb3f57487038a2add8b15cdf9feb 100644 --- a/src/param/param-definition.ts +++ b/src/param/param-definition.ts @@ -42,7 +42,8 @@ export enum ParamFamily { FLOWS, // débit DIAMETERS, SPEEDS, // vitesses, seulement des résultats - STRICKLERS + STRICKLERS, + BLOCKCONCENTRATION // concentrations de blocs } /**