Merge pull request 'Minor bug fixes, code perfomance and clarity improvements' (#5) from dev-Pieter into main
Reviewed-on: #5
This commit is contained in:
@@ -1,57 +0,0 @@
|
||||
<script type="text/javascript">
|
||||
RED.nodes.registerType("recirculation-pump", {
|
||||
category: "WWTP",
|
||||
color: "#e4a363",
|
||||
defaults: {
|
||||
name: { value: "" },
|
||||
F2: { value: 0, required: true },
|
||||
inlet: { value: 1, required: true }
|
||||
},
|
||||
inputs: 1,
|
||||
outputs: 2,
|
||||
outputLabels: ["Main effluent", "Recirculation effluent"],
|
||||
icon: "font-awesome/fa-random",
|
||||
label: function() {
|
||||
return this.name || "Recirculation pump";
|
||||
},
|
||||
oneditprepare: function() {
|
||||
$("#node-input-F2").typedInput({
|
||||
type:"num",
|
||||
types:["num"]
|
||||
});
|
||||
$("#node-input-inlet").typedInput({
|
||||
type:"num",
|
||||
types:["num"]
|
||||
});
|
||||
},
|
||||
oneditsave: function() {
|
||||
let debit = parseFloat($("#node-input-F2").typedInput("value"));
|
||||
if (isNaN(debit) || debit < 0) {
|
||||
RED.notify("Debit is not set correctly", {type: "error"});
|
||||
}
|
||||
let inlet = parseInt($("#node-input-n_inlets").typedInput("value"));
|
||||
if (inlet < 1) {
|
||||
RED.notify("Number of inlets not set correctly", {type: "error"});
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-template-name="recirculation-pump">
|
||||
<div class="form-row">
|
||||
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
|
||||
<input type="text" id="node-input-name" placeholder="Name">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-F2"><i class="fa fa-tag"></i> Recirculation debit [m3 d-1]</label>
|
||||
<input type="text" id="node-input-F2" placeholder="m3 s-1">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-inlet"><i class="fa fa-tag"></i> Assigned inlet recirculation</label>
|
||||
<input type="text" id="node-input-inlet" placeholder="#">
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-help-name="recirculation-pump">
|
||||
<p>Recirculation-pump for splitting streams</p>
|
||||
</script>
|
||||
@@ -1,40 +0,0 @@
|
||||
module.exports = function(RED) {
|
||||
function recirculation(config) {
|
||||
RED.nodes.createNode(this, config);
|
||||
var node = this;
|
||||
|
||||
let name = config.name;
|
||||
let F2 = parseFloat(config.F2);
|
||||
const inlet_F2 = parseInt(config.inlet);
|
||||
|
||||
node.on('input', function(msg, send, done) {
|
||||
switch (msg.topic) {
|
||||
case "Fluent":
|
||||
// conserve volume flow debit
|
||||
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 = F1;
|
||||
|
||||
let msg_F2 = {...msg};
|
||||
msg_F2.payload.F = F2_corr;
|
||||
msg_F2.payload.inlet = inlet_F2;
|
||||
|
||||
send([msg_F1, msg_F2]);
|
||||
break;
|
||||
case "clock":
|
||||
break;
|
||||
default:
|
||||
console.log("Unknown topic: " + msg.topic);
|
||||
}
|
||||
|
||||
if (done) {
|
||||
done();
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
RED.nodes.registerType("recirculation-pump", recirculation);
|
||||
};
|
||||
@@ -1,57 +0,0 @@
|
||||
<script type="text/javascript">
|
||||
RED.nodes.registerType("settling-basin", {
|
||||
category: "WWTP",
|
||||
color: "#e4a363",
|
||||
defaults: {
|
||||
name: { value: "" },
|
||||
TS_set: { value: 0.1, required: true },
|
||||
inlet: { value: 1, required: true }
|
||||
},
|
||||
inputs: 1,
|
||||
outputs: 2,
|
||||
outputLabels: ["Main effluent", "Sludge effluent"],
|
||||
icon: "font-awesome/fa-random",
|
||||
label: function() {
|
||||
return this.name || "Settling basin";
|
||||
},
|
||||
oneditprepare: function() {
|
||||
$("#node-input-TS_set").typedInput({
|
||||
type:"num",
|
||||
types:["num"]
|
||||
});
|
||||
$("#node-input-inlet").typedInput({
|
||||
type:"num",
|
||||
types:["num"]
|
||||
});
|
||||
},
|
||||
oneditsave: function() {
|
||||
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) {
|
||||
RED.notify("Number of inlets not set correctly", {type: "error"});
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-template-name="settling-basin">
|
||||
<div class="form-row">
|
||||
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
|
||||
<input type="text" id="node-input-name" placeholder="Name">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-TS_set"><i class="fa fa-tag"></i> Total Solids set point [g m-3]</label>
|
||||
<input type="text" id="node-input-TS_set" placeholder="">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-inlet"><i class="fa fa-tag"></i> Assigned inlet return line</label>
|
||||
<input type="text" id="node-input-inlet" placeholder="#">
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-help-name="settling-basin">
|
||||
<p>Settling tank</p>
|
||||
</script>
|
||||
@@ -1,57 +0,0 @@
|
||||
module.exports = function(RED) {
|
||||
function settler(config) {
|
||||
RED.nodes.createNode(this, config);
|
||||
var node = this;
|
||||
|
||||
let name = config.name;
|
||||
let TS_set = parseFloat(config.TS_set);
|
||||
const inlet_sludge = parseInt(config.inlet);
|
||||
|
||||
node.on('input', function(msg, send, done) {
|
||||
switch (msg.topic) {
|
||||
case "Fluent":
|
||||
// conserve volume flow debit
|
||||
let F_in = msg.payload.F;
|
||||
let C_in = msg.payload.C;
|
||||
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 = F1;
|
||||
msg_F1.payload.C[7] = 0;
|
||||
msg_F1.payload.C[8] = 0;
|
||||
msg_F1.payload.C[9] = 0;
|
||||
msg_F1.payload.C[10] = 0;
|
||||
msg_F1.payload.C[11] = 0;
|
||||
msg_F1.payload.C[12] = 0;
|
||||
|
||||
let msg_F2 = {...msg};
|
||||
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;
|
||||
msg_F2.payload.C[10] = F_in * C_in[10] / F2;
|
||||
msg_F2.payload.C[11] = F_in * C_in[11] / F2;
|
||||
msg_F2.payload.C[12] = F_in * C_in[12] / F2;
|
||||
}
|
||||
msg_F2.payload.inlet = inlet_sludge;
|
||||
|
||||
send([msg_F1, msg_F2]);
|
||||
break;
|
||||
case "clock":
|
||||
break;
|
||||
default:
|
||||
console.log("Unknown topic: " + msg.topic);
|
||||
}
|
||||
|
||||
if (done) {
|
||||
done();
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
RED.nodes.registerType("settling-basin", settler);
|
||||
};
|
||||
File diff suppressed because it is too large
Load Diff
119
package-lock.json
generated
119
package-lock.json
generated
@@ -1,119 +0,0 @@
|
||||
{
|
||||
"name": "reactor",
|
||||
"version": "0.0.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "reactor",
|
||||
"version": "0.0.1",
|
||||
"license": "SEE LICENSE",
|
||||
"dependencies": {
|
||||
"generalFunctions": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git",
|
||||
"mathjs": "^14.5.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/runtime": {
|
||||
"version": "7.28.4",
|
||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
|
||||
"integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/complex.js": {
|
||||
"version": "2.4.2",
|
||||
"resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.4.2.tgz",
|
||||
"integrity": "sha512-qtx7HRhPGSCBtGiST4/WGHuW+zeaND/6Ld+db6PbrulIB1i2Ev/2UPiqcmpQNPSyfBKraC0EOvOKCB5dGZKt3g==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "*"
|
||||
},
|
||||
"funding": {
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/rawify"
|
||||
}
|
||||
},
|
||||
"node_modules/decimal.js": {
|
||||
"version": "10.6.0",
|
||||
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
|
||||
"integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/escape-latex": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
|
||||
"integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fraction.js": {
|
||||
"version": "5.3.4",
|
||||
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
|
||||
"integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "*"
|
||||
},
|
||||
"funding": {
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/rawify"
|
||||
}
|
||||
},
|
||||
"node_modules/generalFunctions": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "git+https://gitea.centraal.wbd-rd.nl/RnD/generalFunctions.git#efc97d6cd17399391b011298e47e8c1b1599592d",
|
||||
"license": "SEE LICENSE"
|
||||
},
|
||||
"node_modules/javascript-natural-sort": {
|
||||
"version": "0.7.1",
|
||||
"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
|
||||
"integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/mathjs": {
|
||||
"version": "14.8.0",
|
||||
"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-14.8.0.tgz",
|
||||
"integrity": "sha512-DN4wmAjNzFVJ9vHqpAJ3vX0UF306u/1DgGKh7iVPuAFH19JDRd9NAaQS764MsKbSwDB6uBSkQEmgVmKdgYaCoQ==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.26.10",
|
||||
"complex.js": "^2.2.5",
|
||||
"decimal.js": "^10.4.3",
|
||||
"escape-latex": "^1.2.0",
|
||||
"fraction.js": "^5.2.1",
|
||||
"javascript-natural-sort": "^0.7.1",
|
||||
"seedrandom": "^3.0.5",
|
||||
"tiny-emitter": "^2.1.0",
|
||||
"typed-function": "^4.2.1"
|
||||
},
|
||||
"bin": {
|
||||
"mathjs": "bin/cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 18"
|
||||
}
|
||||
},
|
||||
"node_modules/seedrandom": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
|
||||
"integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/tiny-emitter": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
|
||||
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/typed-function": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.2.1.tgz",
|
||||
"integrity": "sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 18"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
"activated sludge",
|
||||
"wastewater",
|
||||
"biological model",
|
||||
"EVOLV",
|
||||
"node-red"
|
||||
],
|
||||
"license": "SEE LICENSE",
|
||||
@@ -21,9 +22,7 @@
|
||||
},
|
||||
"node-red": {
|
||||
"nodes": {
|
||||
"reactor": "reactor.js",
|
||||
"recirculation-pump": "additional_nodes/recirculation-pump.js",
|
||||
"settling-basin": "additional_nodes/settling-basin.js"
|
||||
"reactor": "reactor.js"
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
17
reactor.html
17
reactor.html
@@ -2,7 +2,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
RED.nodes.registerType("reactor", {
|
||||
category: "WWTP",
|
||||
category: "EVOLV",
|
||||
color: "#c4cce0",
|
||||
defaults: {
|
||||
name: { value: "" },
|
||||
@@ -10,7 +10,6 @@
|
||||
volume: { value: 0., required: true },
|
||||
length: { value: 0.},
|
||||
resolution_L: { value: 0.},
|
||||
alpha: {value: 0},
|
||||
kla: { value: null },
|
||||
|
||||
S_O_init: { value: 0., required: true },
|
||||
@@ -32,7 +31,7 @@
|
||||
enableLog: { value: false },
|
||||
logLevel: { value: "error" },
|
||||
|
||||
positionVsParent: { value: "" },
|
||||
positionVsParent: { value: "" }
|
||||
},
|
||||
inputs: 1,
|
||||
outputs: 3,
|
||||
@@ -92,10 +91,6 @@
|
||||
$(".PFR").show();
|
||||
}
|
||||
});
|
||||
$("#node-input-alpha").typedInput({
|
||||
type:"num",
|
||||
types:["num"]
|
||||
})
|
||||
$("#node-input-timeStep").typedInput({
|
||||
type:"num",
|
||||
types:["num"]
|
||||
@@ -149,13 +144,6 @@
|
||||
<label for="node-input-resolution_L"><i class="fa fa-tag"></i> Resolution</label>
|
||||
<input type="text" id="node-input-resolution_L" placeholder="#">
|
||||
</div>
|
||||
<div class="PFR">
|
||||
<p> Inlet boundary condition parameter α (α = 0: Danckwerts BC / α = 1: Dirichlet BC) </p>
|
||||
<div class="form-row">
|
||||
<label for="node-input-alpha"><i class="fa fa-tag"></i>Adjustable parameter BC</label>
|
||||
<input type="text" id="node-input-alpha">
|
||||
</div>
|
||||
</div>
|
||||
<h3> Internal mass transfer calculation (optional) </h3>
|
||||
<div class="form-row">
|
||||
<label for="node-input-kla"><i class="fa fa-tag"></i> kLa [d-1]</label>
|
||||
@@ -227,7 +215,6 @@
|
||||
<!-- Position fields will be injected here -->
|
||||
<div id="position-fields-placeholder"></div>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<script type="text/html" data-help-name="reactor">
|
||||
|
||||
@@ -87,7 +87,6 @@ class nodeClass {
|
||||
volume: parseFloat(uiConfig.volume),
|
||||
length: parseFloat(uiConfig.length),
|
||||
resolution_L: parseInt(uiConfig.resolution_L),
|
||||
alpha: parseFloat(uiConfig.alpha),
|
||||
kla: parseFloat(uiConfig.kla),
|
||||
initialState: [
|
||||
parseFloat(uiConfig.S_O_init),
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
const math = require('mathjs')
|
||||
const math = require('mathjs');
|
||||
|
||||
const ASM_CONSTANTS = {
|
||||
S_O_INDEX: 0,
|
||||
S_NH_INDEX: 3,
|
||||
S_NO_INDEX: 5,
|
||||
NUM_SPECIES: 13
|
||||
};
|
||||
|
||||
/**
|
||||
* ASM3 class for the Activated Sludge Model No. 3 (ASM3). Using Koch et al. 2000 parameters.
|
||||
@@ -208,4 +215,4 @@ class ASM3 {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ASM3;
|
||||
module.exports = { ASM3, ASM_CONSTANTS };
|
||||
@@ -1,4 +1,11 @@
|
||||
const math = require('mathjs')
|
||||
const math = require('mathjs');
|
||||
|
||||
const ASM_CONSTANTS = {
|
||||
S_O_INDEX: 0,
|
||||
S_NH_INDEX: 3,
|
||||
S_NO_INDEX: 5,
|
||||
NUM_SPECIES: 13
|
||||
};
|
||||
|
||||
/**
|
||||
* ASM3 class for the Activated Sludge Model No. 3 (ASM3).
|
||||
@@ -208,4 +215,4 @@ class ASM3 {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ASM3;
|
||||
module.exports = { ASM3, ASM_CONSTANTS };
|
||||
@@ -1,5 +1,5 @@
|
||||
const ASM3 = require('./reaction_modules/asm3_class.js');
|
||||
const { create, all, isArray, i } = require('mathjs');
|
||||
const { ASM3, ASM_CONSTANTS } = require('./reaction_modules/asm3_class.js');
|
||||
const { create, all, isArray } = require('mathjs');
|
||||
const { assertNoNaN } = require('./utils.js');
|
||||
const { childRegistrationUtils, logger, MeasurementContainer } = require('generalFunctions');
|
||||
const EventEmitter = require('events');
|
||||
@@ -10,8 +10,6 @@ const mathConfig = {
|
||||
|
||||
const math = create(all, mathConfig);
|
||||
|
||||
const S_O_INDEX = 0;
|
||||
const NUM_SPECIES = 13;
|
||||
const BC_PADDING = 2;
|
||||
const DEBUG = false;
|
||||
const DAY2MS = 1000 * 60 * 60 * 24;
|
||||
@@ -27,7 +25,6 @@ class Reactor {
|
||||
this.logger = new logger(this.config.general.logging.enabled, this.config.general.logging.logLevel, config.general.name);
|
||||
this.emitter = new EventEmitter();
|
||||
this.measurements = new MeasurementContainer();
|
||||
this.upstreamReactor = null;
|
||||
this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
|
||||
|
||||
this.upstreamReactor = null;
|
||||
@@ -39,7 +36,7 @@ class Reactor {
|
||||
this.volume = config.volume; // fluid volume reactor [m3]
|
||||
|
||||
this.Fs = [0]; // fluid debits per inlet [m3 d-1]
|
||||
this.Cs_in = [Array(NUM_SPECIES).fill(0)]; // composition influents
|
||||
this.Cs_in = [Array(ASM_CONSTANTS.NUM_SPECIES).fill(0)]; // composition influents
|
||||
this.OTR = 0.0; // oxygen transfer rate [g O2 d-1 m-3]
|
||||
this.temperature = 20; // temperature [C]
|
||||
|
||||
@@ -59,7 +56,7 @@ class Reactor {
|
||||
if (this.Fs.length <= i_in) {
|
||||
this.logger.debug(`Adding new inlet index ${i_in}.`);
|
||||
this.Fs.push(0);
|
||||
this.Cs_in.push(Array(NUM_SPECIES).fill(0));
|
||||
this.Cs_in.push(Array(ASM_CONSTANTS.NUM_SPECIES).fill(0));
|
||||
this.setInfluent = input;
|
||||
}
|
||||
this.Fs[i_in] = input.payload.F;
|
||||
@@ -76,9 +73,9 @@ class Reactor {
|
||||
|
||||
/**
|
||||
* Getter for effluent data.
|
||||
* @returns {object} Effluent data object (msg), defaults to inlet 0.
|
||||
* @returns {object} Effluent data object (msg).
|
||||
*/
|
||||
get getEffluent() { // getter for Effluent, defaults to inlet 0
|
||||
get getEffluent() {
|
||||
const Cs = isArray(this.state.at(-1)) ? this.state.at(-1) : this.state;
|
||||
const effluent = [{ topic: "Fluent", payload: { inlet: 0, F: math.sum(this.Fs), C: Cs }, timestamp: this.currentTime }];
|
||||
if (this.returnPump) {
|
||||
@@ -99,7 +96,7 @@ class Reactor {
|
||||
* @returns {number} - Calculated OTR [g O2 d-1 m-3].
|
||||
*/
|
||||
_calcOTR(S_O, T = 20.0) { // caculate the OTR using basic correlation, default to temperature: 20 C
|
||||
let S_O_sat = 14.652 - 4.1022e-1 * T + 7.9910e-3 * T*T + 7.7774e-5 * T*T*T;
|
||||
const S_O_sat = 14.652 - 4.1022e-1 * T + 7.9910e-3 * T*T + 7.7774e-5 * T*T*T;
|
||||
return this.kla * (S_O_sat - S_O);
|
||||
}
|
||||
|
||||
@@ -206,12 +203,12 @@ class Reactor {
|
||||
* Update the reactor state based on the new time.
|
||||
* @param {number} newTime - New time to update reactor state to, in milliseconds since epoch.
|
||||
*/
|
||||
updateState(newTime = Date.now()) { // expect update with timestamp
|
||||
updateState(newTime) { // expect update with timestamp
|
||||
if (this.upstreamReactor) {
|
||||
this.setInfluent = this.upstreamReactor.getEffluent[0]; // grab main effluent upstream reactor
|
||||
}
|
||||
|
||||
let n_iter = Math.floor(this.speedUpFactor * (newTime-this.currentTime) / (this.timeStep*DAY2MS));
|
||||
const n_iter = Math.floor(this.speedUpFactor * (newTime-this.currentTime) / (this.timeStep*DAY2MS));
|
||||
if (n_iter) {
|
||||
let n = 0;
|
||||
while (n < n_iter) {
|
||||
@@ -243,8 +240,8 @@ class Reactor_CSTR extends Reactor {
|
||||
const inflow = math.multiply(math.divide([this.Fs], this.volume), this.Cs_in)[0];
|
||||
const outflow = math.multiply(-1 * math.sum(this.Fs) / this.volume, this.state);
|
||||
const reaction = this.asm.compute_dC(this.state, this.temperature);
|
||||
const transfer = Array(NUM_SPECIES).fill(0.0);
|
||||
transfer[S_O_INDEX] = isNaN(this.kla) ? this.OTR : this._calcOTR(this.state[S_O_INDEX], this.temperature); // calculate OTR if kla is not NaN, otherwise use externaly calculated OTR
|
||||
const transfer = Array(ASM_CONSTANTS.NUM_SPECIES).fill(0.0);
|
||||
transfer[ASM_CONSTANTS.S_O_INDEX] = isNaN(this.kla) ? this.OTR : this._calcOTR(this.state[S_O_INDEX], this.temperature); // calculate OTR if kla is not NaN, otherwise use externaly calculated OTR
|
||||
|
||||
const dC_total = math.multiply(math.add(inflow, outflow, reaction, transfer), time_step)
|
||||
this.state = this._arrayClip2Zero(math.add(this.state, dC_total)); // clip value element-wise to avoid negative concentrations
|
||||
@@ -270,10 +267,8 @@ class Reactor_PFR extends Reactor {
|
||||
this.d_x = this.length / this.n_x;
|
||||
this.A = this.volume / this.length; // crosssectional area [m2]
|
||||
|
||||
this.alpha = config.alpha;
|
||||
|
||||
this.state = Array.from(Array(this.n_x), () => config.initialState.slice());
|
||||
this.extendedState = Array.from(Array(this.n_x + 2*BC_PADDING), () => new Array(NUM_SPECIES).fill(0));
|
||||
this.extendedState = Array.from(Array(this.n_x + 2*BC_PADDING), () => new Array(ASM_CONSTANTS.NUM_SPECIES).fill(0));
|
||||
|
||||
// initialise extended state
|
||||
this.state.forEach((row, i) => this.extendedState[i+BC_PADDING] = row);
|
||||
@@ -299,7 +294,7 @@ class Reactor_PFR extends Reactor {
|
||||
super.updateState(newTime);
|
||||
// let Pe_local = this.d_x*math.sum(this.Fs)/(this.D*this.A)
|
||||
this.D = this._constrainDispersion(this.D);
|
||||
let Co_D = this.D*this.timeStep/(this.d_x*this.d_x);
|
||||
const Co_D = this.D*this.timeStep/(this.d_x*this.d_x);
|
||||
|
||||
// (Pe_local >= 2) && this.logger.warn(`Local Péclet number (${Pe_local}) is too high! Increase reactor resolution.`);
|
||||
(Co_D >= 0.5) && this.logger.warn(`Courant number (${Co_D}) is too high! Reduce time step size.`);
|
||||
@@ -324,15 +319,15 @@ class Reactor_PFR extends Reactor {
|
||||
const dispersion = math.multiply(this.D / (this.d_x*this.d_x), this.D2_op, this.extendedState);
|
||||
const advection = math.multiply(-1 * math.sum(this.Fs) / (this.A*this.d_x), this.D_op, this.extendedState);
|
||||
const reaction = this.extendedState.map((state_slice) => this.asm.compute_dC(state_slice, this.temperature));
|
||||
const transfer = Array.from(Array(this.n_x+2*BC_PADDING), () => new Array(NUM_SPECIES).fill(0));
|
||||
const transfer = Array.from(Array(this.n_x+2*BC_PADDING), () => new Array(ASM_CONSTANTS.NUM_SPECIES).fill(0));
|
||||
|
||||
if (isNaN(this.kla)) { // calculate OTR if kla is not NaN, otherwise use externally calculated OTR
|
||||
for (let i = BC_PADDING+1; i < BC_PADDING+this.n_x - 1; i++) {
|
||||
transfer[i][S_O_INDEX] = this.OTR * this.n_x/(this.n_x-2);
|
||||
transfer[i][ASM_CONSTANTS.S_O_INDEX] = this.OTR * this.n_x/(this.n_x-2);
|
||||
}
|
||||
} else {
|
||||
for (let i = BC_PADDING+1; i < BC_PADDING+this.n_x - 1; i++) {
|
||||
transfer[i][S_O_INDEX] = this._calcOTR(this.extendedState[i][S_O_INDEX], this.temperature) * this.n_x/(this.n_x-2);
|
||||
for (let i = BC_PADDING+1; i < BC_PADDING+this.n_x - 1; i++) {
|
||||
transfer[i][ASM_CONSTANTS.S_O_INDEX] = this._calcOTR(this.extendedState[i][ASM_CONSTANTS.S_O_INDEX], this.temperature);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -354,10 +349,19 @@ class Reactor_PFR extends Reactor {
|
||||
}
|
||||
|
||||
_updateMeasurement(measurementType, value, position, context) {
|
||||
const grid_pos = Math.round(context.distance / this.config.length * this.n_x);
|
||||
|
||||
// naive approach for reconciling measurements and simulation
|
||||
// could benefit from Kalman filter?
|
||||
switch(measurementType) {
|
||||
case "quantity (oxygen)":
|
||||
let grid_pos = Math.round(context.distance / this.config.length * this.n_x);
|
||||
this.state[grid_pos][S_O_INDEX] = value; // naive approach for reconciling measurements and simulation
|
||||
this.state[grid_pos][ASM_CONSTANTS.S_O_INDEX] = value;
|
||||
break;
|
||||
case "quantity (ammonium)":
|
||||
this.state[grid_pos][ASM_CONSTANTS.S_NH_INDEX] = value;
|
||||
break;
|
||||
case "quantity (nox)":
|
||||
this.state[grid_pos][ASM_CONSTANTS.S_NO_INDEX] = value;
|
||||
break;
|
||||
default:
|
||||
super._updateMeasurement(measurementType, value, position, context);
|
||||
@@ -370,32 +374,31 @@ class Reactor_PFR extends Reactor {
|
||||
* for outlet, apply regular Danckwerts BC (Neumann BC with no flux)
|
||||
*/
|
||||
_applyBoundaryConditions() {
|
||||
// Upstream BC
|
||||
if (this.upstreamReactor) {
|
||||
for (let i = 0; i < BC_PADDING; i++) {
|
||||
this.extendedState[i] = this.upstreamReactor.state.at(i-BC_PADDING);
|
||||
}
|
||||
// Open boundary
|
||||
this.extendedState.splice(0, BC_PADDING, ...this.upstreamReactor.state.slice(-BC_PADDING));
|
||||
} else {
|
||||
if (math.sum(this.Fs) > 0) { // Danckwerts BC
|
||||
if (math.sum(this.Fs) > 0) {
|
||||
// Danckwerts BC
|
||||
const BC_C_in = math.multiply(1 / math.sum(this.Fs), [this.Fs], this.Cs_in)[0];
|
||||
const BC_dispersion_term = (1-this.alpha)*this.D*this.A/(math.sum(this.Fs)*this.d_x);
|
||||
const BC_dispersion_term = this.D*this.A/(math.sum(this.Fs)*this.d_x);
|
||||
this.extendedState[BC_PADDING] = math.multiply(1/(1+BC_dispersion_term), math.add(BC_C_in, math.multiply(BC_dispersion_term, this.extendedState[BC_PADDING+1])));
|
||||
// Numerical boundary condition
|
||||
this.extendedState[BC_PADDING-1] = math.add(math.multiply(2, this.extendedState[BC_PADDING]), math.multiply(-2, this.extendedState[BC_PADDING+2]), this.extendedState[BC_PADDING+3]);
|
||||
} else {
|
||||
for (let i = 0; i < BC_PADDING; i++) {
|
||||
this.extendedState[i] = this.extendedState[BC_PADDING];
|
||||
}
|
||||
// Neumann BC (no flux)
|
||||
this.extendedState.fill(this.extendedState[BC_PADDING], 0, BC_PADDING);
|
||||
}
|
||||
}
|
||||
|
||||
// Downstream BC
|
||||
if (this.downstreamReactor) {
|
||||
for (let i = 0; i < BC_PADDING; i++) {
|
||||
this.extendedState[this.n_x+BC_PADDING+i] = this.downstreamReactor.state[i];
|
||||
}
|
||||
// Open boundary
|
||||
this.extendedState.splice(this.n_x+BC_PADDING, BC_PADDING, ...this.downstreamReactor.state.slice(0, BC_PADDING));
|
||||
} else {
|
||||
// Neumann BC (no flux)
|
||||
for (let i = 0; i < BC_PADDING; i++) {
|
||||
this.extendedState[BC_PADDING+this.n_x+i] = this.extendedState.at(-1-BC_PADDING);
|
||||
}
|
||||
this.extendedState.fill(this.extendedState.at(-1-BC_PADDING), BC_PADDING+this.n_x);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -440,17 +443,4 @@ class Reactor_PFR extends Reactor {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { Reactor_CSTR, Reactor_PFR };
|
||||
|
||||
// DEBUG
|
||||
// state: S_O, S_I, S_S, S_NH, S_N2, S_NO, S_HCO, X_I, X_S, X_H, X_STO, X_A, X_TS
|
||||
// let initial_state = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1];
|
||||
// const Reactor = new Reactor_PFR(200, 10, 10, 1, 100, initial_state);
|
||||
// Reactor.Cs_in[0] = [0.0, 30., 100., 16., 0., 0., 5., 25., 75., 30., 0., 0., 125.];
|
||||
// Reactor.Fs[0] = 10;
|
||||
// Reactor.D = 0.01;
|
||||
// let N = 0;
|
||||
// while (N < 5000) {
|
||||
// console.log(Reactor.tick(0.001));
|
||||
// N += 1;
|
||||
// }
|
||||
module.exports = { Reactor_CSTR, Reactor_PFR };
|
||||
Reference in New Issue
Block a user