diff --git a/additional_nodes/recirculation-pump.html b/additional_nodes/recirculation-pump.html
index 52f94a6..39a3753 100644
--- a/additional_nodes/recirculation-pump.html
+++ b/additional_nodes/recirculation-pump.html
@@ -43,7 +43,7 @@
-
+
diff --git a/additional_nodes/recirculation-pump.js b/additional_nodes/recirculation-pump.js
index 489df01..cd9fc21 100644
--- a/additional_nodes/recirculation-pump.js
+++ b/additional_nodes/recirculation-pump.js
@@ -11,12 +11,12 @@ module.exports = function(RED) {
switch (msg.topic) {
case "Fluent":
// conserve volume flow debit
- let F1 = msg.payload.F;
- let F_diff = Math.max(F1 - F2, 0);
- let F2_corr = F1 < F2 ? F1 : F2;
+ let F_in = msg.payload.F;
+ let F1 = Math.max(F_in - F2, 0);
+ let F2_corr = F_in < F2 ? F_in : F2;
let msg_F1 = structuredClone(msg);
- msg_F1.payload.F = F_diff;
+ msg_F1.payload.F = F1;
let msg_F2 = {...msg};
msg_F2.payload.F = F2_corr;
diff --git a/additional_nodes/settling-basin.html b/additional_nodes/settling-basin.html
index da614bc..e8e8e8d 100644
--- a/additional_nodes/settling-basin.html
+++ b/additional_nodes/settling-basin.html
@@ -4,7 +4,7 @@
color: "#e4a363",
defaults: {
name: { value: "" },
- SVI: { value: 0.1, required: true },
+ TS_set: { value: 0.1, required: true },
inlet: { value: 1, required: true }
},
inputs: 1,
@@ -15,7 +15,7 @@
return this.name || "Settling basin";
},
oneditprepare: function() {
- $("#node-input-SVI").typedInput({
+ $("#node-input-TS_set").typedInput({
type:"num",
types:["num"]
});
@@ -25,9 +25,9 @@
});
},
oneditsave: function() {
- let SVI = parseFloat($("#node-input-SVI").typedInput("value"));
- if (isNaN(SVI) || SVI < 0) {
- RED.notify("SVI is not set correctly", {type: "error"});
+ let TS_set = parseFloat($("#node-input-TS_set").typedInput("value"));
+ if (isNaN(TS_set) || TS_set < 0) {
+ RED.notify("TS is not set correctly", {type: "error"});
}
let inlet = parseInt($("#node-input-n_inlets").typedInput("value"));
if (inlet < 1) {
@@ -43,8 +43,8 @@
-
-
+
+
diff --git a/additional_nodes/settling-basin.js b/additional_nodes/settling-basin.js
index f012b81..e19457a 100644
--- a/additional_nodes/settling-basin.js
+++ b/additional_nodes/settling-basin.js
@@ -4,7 +4,7 @@ module.exports = function(RED) {
var node = this;
let name = config.name;
- let SVI = parseFloat(config.SVI);
+ let TS_set = parseFloat(config.TS_set);
const inlet_sludge = parseInt(config.inlet);
node.on('input', function(msg, send, done) {
@@ -13,11 +13,13 @@ module.exports = function(RED) {
// conserve volume flow debit
let F_in = msg.payload.F;
let C_in = msg.payload.C;
- let X_in = (C_in[7] + C_in[8] + C_in[9] + C_in[10] + C_in[11] + C_in[12]);
- let F2 = (F_in * X_in) / (SVI*1000*1000);
+ let F2 = (F_in * C_in[12]) / TS_set;
+
+ let F1 = Math.max(F_in - F2, 0);
+ let F2_corr = F_in < F2 ? F_in : F2;
let msg_F1 = structuredClone(msg);
- msg_F1.payload.F = F_in - F2;
+ msg_F1.payload.F = F1;
msg_F1.payload.C[7] = 0;
msg_F1.payload.C[8] = 0;
msg_F1.payload.C[9] = 0;
@@ -26,8 +28,8 @@ module.exports = function(RED) {
msg_F1.payload.C[12] = 0;
let msg_F2 = {...msg};
- msg_F2.payload.F = F2;
- if (F2 != 0) {
+ msg_F2.payload.F = F2_corr;
+ if (F2_corr > 0) {
msg_F2.payload.C[7] = F_in * C_in[7] / F2;
msg_F2.payload.C[8] = F_in * C_in[8] / F2;
msg_F2.payload.C[9] = F_in * C_in[9] / F2;