From 01e88466b9ddc68cb8c3cd622df5d46d27d8b283 Mon Sep 17 00:00:00 2001
From: "p.vanderwilt"
Date: Fri, 19 Sep 2025 13:09:22 +0200
Subject: [PATCH] Update generalFunctions dependency and fix effluent handling
in liquidFlowHandler
---
package-lock.json | 4 ++--
package.json | 2 +-
src/specificClass.js | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 91eb354..fbe5d5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,12 +9,12 @@
"version": "0.0.1",
"license": "SEE LICENSE",
"dependencies": {
- "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/p.vanderwilt/generalFunctions.git#implement-reactor-child"
+ "generalFunctions": "git+http://gitea.centraal.wbd-rd.nl/p.vanderwilt/generalFunctions.git#fix-missing-references"
}
},
"node_modules/generalFunctions": {
"version": "1.0.0",
- "resolved": "git+https://gitea.centraal.wbd-rd.nl/p.vanderwilt/generalFunctions.git#958ec2269c902f3ebb11b13527fbc860ee9381e7",
+ "resolved": "git+http://gitea.centraal.wbd-rd.nl/p.vanderwilt/generalFunctions.git#3876f86530cc9c4c2ec65f305376923e6582eb85",
"license": "SEE LICENSE"
}
}
diff --git a/package.json b/package.json
index dd6f971..3751d73 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,6 @@
}
},
"dependencies": {
- "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/p.vanderwilt/generalFunctions.git#implement-reactor-child"
+ "generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/p.vanderwilt/generalFunctions.git#fix-missing-references"
}
}
diff --git a/src/specificClass.js b/src/specificClass.js
index fb2a441..d855076 100644
--- a/src/specificClass.js
+++ b/src/specificClass.js
@@ -16,11 +16,12 @@ class liquidFlowHandler {
this.getPumpFlow();
let effluent = this.reactors[1].getEffluent;
effluent.payload.F = this.flow;
+ effluent.payload.inlet = 1;
this.reactors[0].setInfluent = effluent;
}
getPumpFlow() {
- this.flow = this.pump.measurements.type("flow").variant("predicted").position("atEquipment").getCurrentValue();
+ this.flow = this.pump.measurements.type("flow").variant("measured").position("atEquipment").getCurrentValue() || 0;
}
getOutput() {