From 33f3c2ef618cf0f10a7af67521fd8fe2df76065c Mon Sep 17 00:00:00 2001 From: znetsixe <73483679+znetsixe@users.noreply.github.com> Date: Mon, 23 Feb 2026 13:17:18 +0100 Subject: [PATCH] update --- src/nodeClass.js | 4 +--- src/specificClass.js | 12 ++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/nodeClass.js b/src/nodeClass.js index 9fe55dd..998dddb 100644 --- a/src/nodeClass.js +++ b/src/nodeClass.js @@ -77,8 +77,6 @@ class nodeClass { _setupSpecificClass(uiConfig) { const machineConfig = this.config; - console.log(`----------------> Loaded movementMode in nodeClass: ${uiConfig.movementMode}`); - // need extra state for this const stateConfig = { general: { @@ -358,7 +356,7 @@ class nodeClass { this.node.on('close', (done) => { clearInterval(this._tickInterval); clearInterval(this._statusInterval); - done(); + if (typeof done === 'function') done(); }); } } diff --git a/src/specificClass.js b/src/specificClass.js index eea9415..711d8e8 100644 --- a/src/specificClass.js +++ b/src/specificClass.js @@ -1,6 +1,11 @@ const EventEmitter = require('events'); const {loadCurve,gravity,logger,configUtils,configManager,state, nrmse, MeasurementContainer, predict, interpolation , childRegistrationUtils,coolprop} = require('generalFunctions'); +/** + * Rotating machine domain model. + * Combines machine curves, state transitions and measurement reconciliation + * to produce flow/power/efficiency behavior for pumps and similar assets. + */ class Machine { /*------------------- Construct and set vars -------------------*/ @@ -853,12 +858,15 @@ _callMeasurementHandler(measurementType, value, position, context) { calcEfficiency(power,flow,variant) { - const pressureDiff = this.measurements.type('pressure').variant('measured').difference('Pa'); + // Request a pressure differential explicitly in Pascal for hydraulic efficiency. + const pressureDiff = this.measurements + .type('pressure') + .variant('measured') + .difference({ unit: 'Pa' }); const g = gravity.getStandardGravity(); const temp = this.measurements.type('temperature').variant('measured').position('atEquipment').getCurrentValue('K'); const atmPressure = this.measurements.type('atmPressure').variant('measured').position('atEquipment').getCurrentValue('Pa'); - console.log(`--------------------calc efficiency : Pressure diff:${pressureDiff},${temp}, ${g} `); let rho = null; try { rho = coolprop.PropsSI('D', 'T', temp, 'P', atmPressure, 'WasteWater');