JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #829 from OpenWaterAnalytics/dev-trace_node_fix

Browse Source 
Fix Trace Node bug when new junction added
This commit is contained in:
Lew Rossman
2025-02-18 08:55:38 -05:00
committed by GitHub
parent 03cbb89e05 054ebf36b5
commit c8db9c1655
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/epanet.c
View File

@@ -1790,6 +1790,7 @@ int DLLEXPORT EN_setqualtype(EN_Project p, int qualType, const char *chemName,
qual->Ctol *= Ucf[QUALITY]; qual->Ctol *= Ucf[QUALITY];
if (qual->Qualflag == CHEM) // Chemical analysis if (qual->Qualflag == CHEM) // Chemical analysis
{ {
qual->TraceNode = 0;
strncpy(qual->ChemName, chemName, MAXID); strncpy(qual->ChemName, chemName, MAXID);
strncpy(qual->ChemUnits, chemUnits, MAXID); strncpy(qual->ChemUnits, chemUnits, MAXID);
strncpy(rpt->Field[QUALITY].Units, qual->ChemUnits, MAXID); strncpy(rpt->Field[QUALITY].Units, qual->ChemUnits, MAXID);
@@ -1807,10 +1808,16 @@ int DLLEXPORT EN_setqualtype(EN_Project p, int qualType, const char *chemName,
} }
if (qual->Qualflag == AGE) // Water age analysis if (qual->Qualflag == AGE) // Water age analysis
{ {
qual->TraceNode = 0;
strncpy(qual->ChemName, w_AGE, MAXID); strncpy(qual->ChemName, w_AGE, MAXID);
strncpy(qual->ChemUnits, u_HOURS, MAXID); strncpy(qual->ChemUnits, u_HOURS, MAXID);
strcpy(rpt->Field[QUALITY].Units, u_HOURS); strcpy(rpt->Field[QUALITY].Units, u_HOURS);
} }
if (qual->Qualflag == NONE)
{
qual->TraceNode = 0;
strcpy(qual->ChemName, "");
}
// When changing from CHEM to AGE or TRACE, nodes initial quality // When changing from CHEM to AGE or TRACE, nodes initial quality
// values must be returned to their original ones // values must be returned to their original ones
@@ -1916,6 +1923,8 @@ int DLLEXPORT EN_addnode(EN_Project p, const char *id, int nodeType, int *index)
} }
// adjust indices of tanks/reservoirs in Rule premises (see RULES.C) // adjust indices of tanks/reservoirs in Rule premises (see RULES.C)
adjusttankrules(p, 1); adjusttankrules(p, 1);
// adjust index of trace node
if (qual->TraceNode > net->Njuncs - 1) qual->TraceNode += 1;
} }
// Actions taken when a new Tank/Reservoir is added // Actions taken when a new Tank/Reservoir is added
@@ -1987,6 +1996,7 @@ int DLLEXPORT EN_deletenode(EN_Project p, int index, int actionCode)
*/ */
{ {
Network *net = &p->network; Network *net = &p->network;
Quality *qual = &p->quality;
int i, nodeType, tankindex; int i, nodeType, tankindex;
Snode *node; Snode *node;
@@ -2033,6 +2043,9 @@ int DLLEXPORT EN_deletenode(EN_Project p, int index, int actionCode)
hashtable_update(net->NodeHashTable, net->Node[i].ID, i); hashtable_update(net->NodeHashTable, net->Node[i].ID, i);
} }
// Adjust index of water quality trace node
if (qual->TraceNode > index) qual->TraceNode -= 1;
// If deleted node is a tank, remove it from the Tank array // If deleted node is a tank, remove it from the Tank array
if (nodeType != EN_JUNCTION) if (nodeType != EN_JUNCTION)
{ {