fix several quality source issues #65

WaterDesk · 2023-10-08T00:37:35Z

fix several quality source issues:

the junction and tank's source quality has not been initialized
for MASS Booster quality source type, converting mass flow rate from min. to sec. uses strength *= 60.0, which should be strength /= 60.0
in QualSource::getQuality method, to determine if there is no flow out of node, now it uses "==0.0", which should use ZERO_FLOW as instead
no source contribution if no flow out of node, but for inflow junction, the source contribution should be the source quality
the inflow junction's constituent concentration has not been updated if the junction has Quality Source in LTDSolver::updateNodeQuality method

1. the junction and tank's source quality has not been initialized 2. for MASS Booster quality source type, converting mass flow rate from min. to sec. uses strength *= 60.0, which should be strength /= 60.0 3. in QualSource::getQuality method, to determine if there is no flow out of node, now it uses "==0.0", which should use ZERO_FLOW as instead 4. no source contribution if no flow out of node, but for inflow junction, the source contribution should be the source quality 5. the inflow junction's constituent concentration has not been updated if the junction has Quality Source in LTDSolver::updateNodeQuality method

WaterDesk · 2023-10-08T00:37:59Z

src/Elements/junction.cpp

@@ -82,6 +83,7 @@ void Junction::initialize(Network* nw)
 {
    head = elev + (pFull - pMin) / 2.0;;
    quality = initQual;
+    if (qualSource) qualSource->quality = quality;


initialize the source quality

There is no need to initialize qualSource->quality. This variable is assigned locally in QualSource::getQuality.

WaterDesk · 2023-10-08T00:38:06Z

src/Elements/tank.cpp

@@ -107,6 +108,7 @@ void Tank::initialize(Network* nw)
    outflow = 0.0;
    pastOutflow = 0.0;
    quality = initQual;
+    if (qualSource) qualSource->quality = quality;


initialize the source quality

Again, there is no need to initialize qualSource->quality here.

WaterDesk · 2023-10-08T00:38:25Z

src/Elements/qualsource.cpp

@@ -54,7 +54,7 @@ void QualSource::setStrength(Node* node)
 {
    strength = base;
    if ( pattern ) strength *= pattern->currentFactor();
-    if ( type == MASS ) strength *= 60.0;         // mass/min -> mass/sec
+    if ( type == MASS ) strength /= 60.0;         // mass/min -> mass/sec


converting mass flow rate from min. to sec.

This change is correct - thank you.

WaterDesk · 2023-10-08T00:39:07Z

src/Elements/qualsource.cpp

@@ -64,7 +64,15 @@ double QualSource::getQuality(Node* node)
 {
    // ... no source contribution if no flow out of node
    quality = node->quality;
-    if ( outflow == 0.0 ) return quality;
+    if (abs(outflow) <= ZERO_FLOW)


use ZERO_FLOW to determine the stagnant flow but not 0.0.

There appears to be a major problem with the original code here -- the value of QualSource::outflow is never assigned anywhere. To fix this one has to:

Add the following line to ltdsolver.h:

std::vector<double> qOut; // flow in links leaving each node

Add the following to the top of LTDSolver::solve:

memset(&qOut, 0, nodeCount*sizeof(double)); for (int i = 0; i < linkCount; i++) { Link* link = network->link(i); double q = link->flow; int j = link->fromNode->index; if ( q < 0.0 ) j = link->toNode->index; qOut[j] += abs(q); }

Add the following to LTDSolver::release:

// ... modify node quality c to include any source input if ( node->qualSource && network->qualModel->type == QualModel::CHEM ) { node->qualSource->outflow = qOut[node->index]; //new line here c = node->qualSource->getQuality(node); . . .

WaterDesk · 2023-10-08T00:39:33Z

src/Elements/qualsource.cpp

-    if ( outflow == 0.0 ) return quality;
+    if (abs(outflow) <= ZERO_FLOW)
+    {
+        if (node->type() == Node::JUNCTION && node->outflow < 0.0)


for inflow junction, the source contribution should be the source quality

WaterDesk · 2023-10-08T00:40:23Z

src/Solvers/ltdsolver.cpp

@@ -308,7 +308,7 @@ void LTDSolver::updateNodeQuality()
            if ( node->type() == Node::JUNCTION )
            {
                // ... account for dilution from any external negative demand
-                if (node->outflow < 0.0 && node->qualSource == nullptr )
+                if (node->outflow < 0.0 && node->qualSource != nullptr )


update the concentration if the inflow junction has Quality Source

This change is not correct. The dilution occurs only for external inflows at nodes with no WQ source. For nodes with WQ sources the mixing of the external inflow with the node's current quality is handled in QualSource::getQuality.

LRossman

Please see my individual comments to your changes.

LRossman · 2023-10-13T04:30:08Z

src/Elements/junction.cpp

@@ -82,6 +83,7 @@ void Junction::initialize(Network* nw)
 {
    head = elev + (pFull - pMin) / 2.0;;
    quality = initQual;
+    if (qualSource) qualSource->quality = quality;


There is no need to initialize qualSource->quality. This variable is assigned locally in QualSource::getQuality.

LRossman · 2023-10-13T04:56:49Z

src/Elements/qualsource.cpp

@@ -54,7 +54,7 @@ void QualSource::setStrength(Node* node)
 {
    strength = base;
    if ( pattern ) strength *= pattern->currentFactor();
-    if ( type == MASS ) strength *= 60.0;         // mass/min -> mass/sec
+    if ( type == MASS ) strength /= 60.0;         // mass/min -> mass/sec


This change is correct - thank you.

LRossman · 2023-10-13T04:58:12Z

src/Elements/qualsource.cpp

@@ -64,7 +64,15 @@ double QualSource::getQuality(Node* node)
 {
    // ... no source contribution if no flow out of node
    quality = node->quality;
-    if ( outflow == 0.0 ) return quality;
+    if (abs(outflow) <= ZERO_FLOW)


There appears to be a major problem with the original code here -- the value of QualSource::outflow is never assigned anywhere. To fix this one has to:

Add the following line to ltdsolver.h:

std::vector<double> qOut; // flow in links leaving each node

Add the following to the top of LTDSolver::solve:

memset(&qOut, 0, nodeCount*sizeof(double)); for (int i = 0; i < linkCount; i++) { Link* link = network->link(i); double q = link->flow; int j = link->fromNode->index; if ( q < 0.0 ) j = link->toNode->index; qOut[j] += abs(q); }

Add the following to LTDSolver::release:

// ... modify node quality c to include any source input if ( node->qualSource && network->qualModel->type == QualModel::CHEM ) { node->qualSource->outflow = qOut[node->index]; //new line here c = node->qualSource->getQuality(node); . . .

LRossman · 2023-10-13T04:59:16Z

src/Elements/tank.cpp

@@ -107,6 +108,7 @@ void Tank::initialize(Network* nw)
    outflow = 0.0;
    pastOutflow = 0.0;
    quality = initQual;
+    if (qualSource) qualSource->quality = quality;


Again, there is no need to initialize qualSource->quality here.

LRossman · 2023-10-13T04:59:25Z

src/Solvers/ltdsolver.cpp

@@ -308,7 +308,7 @@ void LTDSolver::updateNodeQuality()
            if ( node->type() == Node::JUNCTION )
            {
                // ... account for dilution from any external negative demand
-                if (node->outflow < 0.0 && node->qualSource == nullptr )
+                if (node->outflow < 0.0 && node->qualSource != nullptr )


This change is not correct. The dilution occurs only for external inflows at nodes with no WQ source. For nodes with WQ sources the mixing of the external inflow with the node's current quality is handled in QualSource::getQuality.

WaterDesk commented Oct 8, 2023

View reviewed changes

LRossman requested changes Oct 13, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix several quality source issues #65

fix several quality source issues #65

WaterDesk commented Oct 8, 2023

WaterDesk Oct 8, 2023

LRossman Oct 13, 2023

WaterDesk Oct 8, 2023

LRossman Oct 13, 2023

WaterDesk Oct 8, 2023

LRossman Oct 13, 2023

WaterDesk Oct 8, 2023

LRossman Oct 13, 2023

WaterDesk Oct 8, 2023

WaterDesk Oct 8, 2023

LRossman Oct 13, 2023

LRossman left a comment

LRossman Oct 13, 2023

LRossman Oct 13, 2023

LRossman Oct 13, 2023

LRossman Oct 13, 2023

LRossman Oct 13, 2023

fix several quality source issues #65

Are you sure you want to change the base?

fix several quality source issues #65

Conversation

WaterDesk commented Oct 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LRossman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment