2e4ad8d3f1
levelBased ramp + engagement: - Ramp foot is now max(startLevel, holdLevel) — was max(startLevel, inflowLevel). inflowLevel is basin geometry, not a control setpoint; the implicit hold zone it created was causing pumps to "start at inflowLevel" instead of startLevel. - New optional `holdLevel` config (defaults to startLevel = no hold band). When raised, pumps engage at startLevel and hold at 0 % = MGC flow.min across [startLevel, holdLevel], then ramp 0..100 % to maxLevel. - Engagement decided in run() (not in `_applyMachineGroupLevelControl`): rising-edge hysteresis arming gates a clean turnOff early-return. Once armed, the helper always forwards setDemand(pct, '%') — 0 % legitimately means "engaged at min flow", no more soft-turnOff at the boundary. - Disengagement paths (minLevel hard-stop, stopLevel falling-edge, pre-arming idle) now all clear the shifted-ramp hysteresis state too. - Threshold validator drops the startLevel ≤ inflowLevel rule; adds startLevel ≤ holdLevel < maxLevel (only checked when holdLevel is explicitly set, so default-null doesn't false-flag). MGC unit math: - Replace direct group.handleInput(percent) with group.setDemand(pct, '%') in _applyMachineGroupLevelControl. The percent → m³/s resolution now lives in MGC.setDemand (committed separately in the MGC submodule). FlowAggregator variant picking: - New _pickFlowSum() helper mirrors selectBestNetFlow's variant precedence (measured first, then predicted) and resolves each side independently. Realistic mixed case — real measured upstream sensor + predicted pump outflow — now feeds the predicted-volume integrator. Was reading only `flow.predicted.*` so a real upstream sensor (which writes `flow.measured.*`) never moved the level. Editor: - New `holdLevel` and `deadZoneKeepAlivePercent` defaults + side-panel input rows in the levelbased mode preview. - Add the missing `ps-mode-line-holdLevel` SVG marker (was declared in the side-panel coupling but the SVG element didn't exist, so the dashed line never rendered). - Relax stopLevel marker gate so it renders for any non-negative typed value — start/stop ordering is the ribbon's job, not the marker's (was hiding the line whenever startLevel was momentarily smaller). - Add holdLevel to the marker loop in mode-preview so changes track. - Add stopLevel + holdLevel + maxLevel to all three bindRedraw lists (basin-diagram, mode-preview, bounds.apply) so the SVG, validation ribbon, and HTML5 min/max attrs update on every edit. - Initialise stopLevel + holdLevel + deadZoneKeepAlivePercent inputs in oneditprepare so reopening the editor shows the saved values. - nodeClass passes holdLevel + deadZoneKeepAlivePercent into the domain config. Tests: - New test/basic/_probe_upstream_emit.test.js: confirms the parent surfaces flow.measured.upstream.* on Port 0 after a measurement child write — pins the previously-invisible measured variant flow. - flowAggregator.basic.test.js: two new regression cases — measured inflow when predicted side is empty, and the measured-in / predicted-out mixed case. - control-levelBased.basic.test.js: new cases for the holdLevel hold band, the [stopLevel, startLevel] keep-alive, the engagement gate, and the "0 % at startLevel = setDemand" contract. - specificClass.test.js: zone tests adjusted to the new ramp foot. Shifted-ramp tests pin holdLevel = 3 explicitly so their legacy arithmetic (ramp foot at inflowLevel) stays self-consistent. - shifted-ramp-end-to-end.test.js: same holdLevel pin for the same reason. Packaging: - Add .gitignore + .npmignore so the published tarball drops the wiki/, simulations/, test/, tools/, .claude/ etc. The pack went from 1.5 MB (72 files) to ~57 KB (30 files). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
82 lines
3.4 KiB
JavaScript
82 lines
3.4 KiB
JavaScript
const { BaseNodeAdapter, configManager } = require('generalFunctions');
|
|
const PumpingStation = require('./specificClass');
|
|
const commands = require('./commands');
|
|
|
|
class nodeClass extends BaseNodeAdapter {
|
|
static DomainClass = PumpingStation;
|
|
static commands = commands;
|
|
// Tick-driven: predicted-volume integrator needs delta-time per second.
|
|
static tickInterval = 1000;
|
|
static statusInterval = 1000;
|
|
|
|
buildDomainConfig(uiConfig) {
|
|
return {
|
|
basin: {
|
|
volume: uiConfig.basinVolume,
|
|
height: uiConfig.basinHeight,
|
|
inflowLevel: uiConfig.inflowLevel,
|
|
outflowLevel: uiConfig.outflowLevel,
|
|
overflowLevel: uiConfig.overflowLevel,
|
|
inletPipeDiameter: uiConfig.inletPipeDiameter,
|
|
outletPipeDiameter: uiConfig.outletPipeDiameter,
|
|
},
|
|
hydraulics: {
|
|
refHeight: uiConfig.refHeight,
|
|
minHeightBasedOn: uiConfig.minHeightBasedOn,
|
|
basinBottomRef: uiConfig.basinBottomRef,
|
|
maxInflowRate: uiConfig.maxInflowRate,
|
|
staticHead: uiConfig.staticHead,
|
|
maxDischargeHead: uiConfig.maxDischargeHead,
|
|
pipelineLength: uiConfig.pipelineLength,
|
|
defaultFluid: uiConfig.defaultFluid,
|
|
temperatureReferenceDegC: uiConfig.temperatureReferenceDegC,
|
|
},
|
|
control: {
|
|
mode: uiConfig.controlMode,
|
|
levelbased: {
|
|
minLevel: uiConfig.minLevel,
|
|
startLevel: uiConfig.startLevel,
|
|
stopLevel: uiConfig.stopLevel,
|
|
holdLevel: uiConfig.holdLevel,
|
|
maxLevel: uiConfig.maxLevel,
|
|
// Editor names the field levelCurveType; runtime uses curveType.
|
|
curveType: uiConfig.levelCurveType || uiConfig.curveType,
|
|
logCurveFactor: uiConfig.logCurveFactor,
|
|
enableShiftedRamp: uiConfig.enableShiftedRamp,
|
|
shiftLevel: uiConfig.shiftLevel,
|
|
shiftArmPercent: uiConfig.shiftArmPercent,
|
|
deadZoneKeepAlivePercent: uiConfig.deadZoneKeepAlivePercent,
|
|
},
|
|
},
|
|
safety: {
|
|
enableDryRunProtection: uiConfig.enableDryRunProtection,
|
|
dryRunThresholdPercent: uiConfig.dryRunThresholdPercent,
|
|
enableHighVolumeSafety: uiConfig.enableHighVolumeSafety ?? uiConfig.enableOverfillProtection,
|
|
highVolumeSafetyThresholdPercent: uiConfig.highVolumeSafetyThresholdPercent ?? uiConfig.overfillThresholdPercent,
|
|
enableOverfillProtection: uiConfig.enableOverfillProtection,
|
|
overfillThresholdPercent: uiConfig.overfillThresholdPercent,
|
|
timeleftToFullOrEmptyThresholdSeconds: uiConfig.timeleftToFullOrEmptyThresholdSeconds,
|
|
},
|
|
output: {
|
|
process: uiConfig.processOutputFormat,
|
|
dbase: uiConfig.dbaseOutputFormat,
|
|
},
|
|
};
|
|
}
|
|
|
|
// Test-only entrypoint mirroring the basin-docs config-mapping surface.
|
|
// Lets `NodeClass.prototype._loadConfig.call({name:'pumpingStation'}, ui, node)`
|
|
// produce the merged config without instantiating a full Node-RED adapter.
|
|
// Production wiring goes through BaseNodeAdapter; this is a thin shim.
|
|
_loadConfig(uiConfig, node) {
|
|
const cfgMgr = new configManager();
|
|
const name = this.name || 'pumpingStation';
|
|
const domain = nodeClass.prototype.buildDomainConfig.call(this, uiConfig);
|
|
this.defaultConfig = cfgMgr.getConfig(name);
|
|
this.config = cfgMgr.buildConfig(name, uiConfig, node && node.id, domain);
|
|
return this.config;
|
|
}
|
|
}
|
|
|
|
module.exports = nodeClass;
|