RnD/pumpingStation
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev-Rene #1

Merged
renederen merged 21 commits from dev-Rene into main 2025-12-08 10:00:07 +00:00
Conversation 0 Commits 21 Files Changed 3 +10 -6
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d44cbc978b - Show all commits

8
src/nodeClass.js
View File

@@ -114,12 +114,12 @@ class nodeClass {
const vol = pickVariant('volume', ['measured', 'predicted'], 'atEquipment', 'm3'); const vol = pickVariant('volume', ['measured', 'predicted'], 'atEquipment', 'm3');
const volPercent = pickVariant('volumePercent', ['measured','predicted'], 'atEquipment'); // already unitless const volPercent = pickVariant('volumePercent', ['measured','predicted'], 'atEquipment'); // already unitless
const level = pickVariant('level', ['measured', 'predicted'], 'atEquipment', 'm'); const level = pickVariant('level', ['measured', 'predicted'], 'atEquipment', 'm');
const netFlow = pickVariant('netFlowRate', ['measured', 'predicted'], 'atEquipment', 'm3/s'); const netFlow = pickVariant('netFlowRate', ['measured', 'predicted'], 'atEquipment', 'm3/h');
const maxVolBeforeOverflow = ps.basin?.maxVolOverflow ?? ps.basin?.maxVol ?? 0; const maxVolBeforeOverflow = ps.basin?.maxVolOverflow ?? ps.basin?.maxVol ?? 0;
const currentVolume = vol.value ?? 0; const currentVolume = vol.value ?? 0;
const currentvolPercent = volPercent.value ?? 0; const currentvolPercent = volPercent.value ?? 0;
const netFlowM3h = (netFlow.value ?? 0) * 3600; const netFlowM3h = netFlow.value ?? 0;
const direction = ps.state?.direction ?? 'unknown'; const direction = ps.state?.direction ?? 'unknown';
const secondsRemaining = ps.state?.seconds ?? null; const secondsRemaining = ps.state?.seconds ?? null;
@@ -128,9 +128,9 @@ class nodeClass {
const badgePieces = []; const badgePieces = [];
badgePieces.push(`${currentvolPercent.toFixed(1)}% `); badgePieces.push(`${currentvolPercent.toFixed(1)}% `);
badgePieces.push( badgePieces.push(
`V=${currentVolume.toFixed(2)} / ${maxVolBeforeOverflow.toFixed(2)} m³ (${'n/a'})` `V=${currentVolume.toFixed(2)} / ${maxVolBeforeOverflow.toFixed(2)} m³`
); );
badgePieces.push(`net=${netFlowM3h.toFixed(1)} m³/h (${'n/a'})`); badgePieces.push(`net: ${netFlowM3h.toFixed(0)} m³/h`);
if (timeRemainingMinutes != null) { if (timeRemainingMinutes != null) {
badgePieces.push(`t≈${timeRemainingMinutes} min)`); badgePieces.push(`t≈${timeRemainingMinutes} min)`);
} }

8
src/specificClass.js
View File

@@ -12,12 +12,12 @@ class PumpingStation {
this.measurements = new MeasurementContainer({ autoConvert: true }); this.measurements = new MeasurementContainer({ autoConvert: true });
this.measurements.setPreferredUnit('flow', 'm3/s'); this.measurements.setPreferredUnit('flow', 'm3/s');
this.measurements.setPreferredUnit('netFlowRate', 'm3/s');
this.measurements.setPreferredUnit('level', 'm'); this.measurements.setPreferredUnit('level', 'm');
this.measurements.setPreferredUnit('volume', 'm3'); this.measurements.setPreferredUnit('volume', 'm3');
this.childRegistrationUtils = new childRegistrationUtils(this); this.childRegistrationUtils = new childRegistrationUtils(this);
this.machines = {}; this.machines = {};
this.stations = {}; this.stations = {};
//variants in determining what gets priority //variants in determining what gets priority
@@ -64,7 +64,7 @@ class PumpingStation {
const netFlow = this._selectBestNetFlow(snapshot); const netFlow = this._selectBestNetFlow(snapshot);
//write netflow in measurment container //write netflow in measurment container
//this.measurements()
const remaining = this._computeRemainingTime(snapshot, netFlow); const remaining = this._computeRemainingTime(snapshot, netFlow);
this.state = { this.state = {
@@ -301,12 +301,16 @@ class PumpingStation {
_selectBestNetFlow(snapshot) { _selectBestNetFlow(snapshot) {
for (const variant of this.flowVariants) { for (const variant of this.flowVariants) {
const flow = snapshot.flows[variant]; const flow = snapshot.flows[variant];
if (!flow.inflow.exists && !flow.outflow.exists) continue; if (!flow.inflow.exists && !flow.outflow.exists) continue;
const inflow = flow.inflow.current?.value ?? 0; const inflow = flow.inflow.current?.value ?? 0;
const outflow = flow.outflow.current?.value ?? 0; const outflow = flow.outflow.current?.value ?? 0;
const net = inflow - outflow; // positive => filling const net = inflow - outflow; // positive => filling
this.measurements.type('netFlowRate').variant(variant).position('atequipment').value(net).unit('m3/s');
this.logger.debug(`inflow : ${inflow} - outflow : ${outflow}`);
return { value: net,source: variant,direction: this._deriveDirection(net) }; return { value: net,source: variant,direction: this._deriveDirection(net) };
} }