diff --git a/src/compute-node.ts b/src/compute-node.ts index 448bfc417fe6449c9134212171e469a95c9d5b30..732c33005e1530097fa87bd088ab5fabbbf1e9ed 100644 --- a/src/compute-node.ts +++ b/src/compute-node.ts @@ -64,12 +64,8 @@ export abstract class ComputeNode extends JalhydObject implements IDebug { // important for Param uid this._prms.parent = this; - if (!this._prms.calculabilityDefined) { - this._prms.resetParametersCalculability(); - } this._prms.Pr.calculability = ParamCalculability.FREE; // so that it can be set through Pr.v this.setParametersCalculability(); - this._prms.DefineCalculability(); this.setExtraResultsFamilies(); } diff --git a/src/pab/cloisons.ts b/src/pab/cloisons.ts index 3227cbb6ce082331a9ddba030d1baaca7a2c1201..cedb09ffa4679972faaed8ff823b14e98bf5e4af 100644 --- a/src/pab/cloisons.ts +++ b/src/pab/cloisons.ts @@ -108,6 +108,9 @@ export class Cloisons extends ParallelStructure { this.prms.PB.calculability = ParamCalculability.FREE; this.prms.DH.calculability = ParamCalculability.DICHO; this.prms.Z1.calculability = ParamCalculability.FREE; + this.prms.ZRMB.calculability = ParamCalculability.FREE; + this.prms.ZRAM.calculability = ParamCalculability.FREE; + this.prms.QA.calculability = ParamCalculability.FREE; } private updatePrms() { diff --git a/src/param/params-equation.ts b/src/param/params-equation.ts index 5705243b1e65f860b2c205f8ed5b9bd6f509699a..6c9667236eca81514e882c326ee196db5b4e5a49 100644 --- a/src/param/params-equation.ts +++ b/src/param/params-equation.ts @@ -99,11 +99,8 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> { /** Précision de calcul */ private _Pr: ParamDefinition; - private _calculabilityDefined: boolean; - public constructor(parent?: ComputeNode) { this.parent = parent; - this._calculabilityDefined = false; this._Pr = new ParamDefinition( this, "Pr", ParamDomainValue.POS, ParamsEquation.DEFAULT_COMPUTE_PREC, undefined, false ); @@ -121,14 +118,6 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> { return this.parent.uid; } - get calculabilityDefined(): boolean { - return this._calculabilityDefined; - } - - public DefineCalculability() { - this._calculabilityDefined = true; - } - public hasParameter(name: string): boolean { for (const p of this) { if (p.symbol === name) { @@ -142,12 +131,6 @@ export abstract class ParamsEquation implements Iterable<ParamDefinition> { return this._paramMap; } - public resetParametersCalculability() { - for (const p of this) { - p.calculability = undefined; - } - } - public checkParametersCalculability() { const res = []; diff --git a/src/remous.ts b/src/remous.ts index d06721cbc960768c062c5ade36ed3506809f30aa..b54b3a336235123b27117e9b64c543b29612e740 100644 --- a/src/remous.ts +++ b/src/remous.ts @@ -58,7 +58,6 @@ export class CourbeRemousParams extends ParamsEquation { this.addParamDefinition(this._Long); this.addParamDefinition(this._Dx); - this.DefineCalculability(); // Pour ne pas remettre en undefined les prms de _section this.Pr.visible = true; // exception }