From 86a03a4c8e6c47bc0b9ac96d857790cebadde32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Fri, 7 Apr 2023 11:17:39 +0200
Subject: [PATCH] fix: block concentration, macro rugo: concentration,diameter
parameters are not linkable
refs #345
---
src/macrorugo/concentration_blocs_params.ts | 4 ++--
src/macrorugo/macrorugo_params.ts | 4 ++--
src/param/param-definition.ts | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/macrorugo/concentration_blocs_params.ts b/src/macrorugo/concentration_blocs_params.ts
index 8c35f597..0003e567 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 859dbc19..d36b2f99 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 b476c28e..42e706c9 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
}
/**
--
GitLab