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

Fix bug when adding a junction

Browse Source
This commit is contained in:
Elad Salomons
2018-04-17 21:46:09 +03:00
parent 67de368d1e
commit a46652f47c
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/epanet.c
View File

@@ -4157,13 +4157,12 @@ int DLLEXPORT EN_addnode(EN_Project *p, char *id, EN_NodeType nodeType) {
qu->NodeQual = (double *)realloc(qu->NodeQual, (net->Nnodes + 2) * sizeof(double)); qu->NodeQual = (double *)realloc(qu->NodeQual, (net->Nnodes + 2) * sizeof(double));
hyd->NodeHead = (double *)realloc(hyd->NodeHead, (net->Nnodes + 2) * sizeof(double)); hyd->NodeHead = (double *)realloc(hyd->NodeHead, (net->Nnodes + 2) * sizeof(double));
nIdx = net->Nnodes + 1;
node = &net->Node[nIdx];
coord = &net->Coord[nIdx];
if (nodeType == EN_JUNCTION) { if (nodeType == EN_JUNCTION) {
net->Njuncs++; net->Njuncs++;
nIdx = net->Njuncs;
node = &net->Node[nIdx];
coord = &net->Coord[nIdx];
demand = (struct Sdemand *)malloc(sizeof(struct Sdemand)); demand = (struct Sdemand *)malloc(sizeof(struct Sdemand));
demand->Base = 0.0; demand->Base = 0.0;
demand->Pat = 0; demand->Pat = 0;
@@ -4191,6 +4190,9 @@ int DLLEXPORT EN_addnode(EN_Project *p, char *id, EN_NodeType nodeType) {
} }
} }
} else { } else {
nIdx = net->Nnodes++;
node = &net->Node[nIdx];
coord = &net->Coord[nIdx];
net->Ntanks++; net->Ntanks++;
/* resize tanks array */ /* resize tanks array */
@@ -4231,8 +4233,7 @@ int DLLEXPORT EN_addnode(EN_Project *p, char *id, EN_NodeType nodeType) {
node->C0 = 0; node->C0 = 0;
node->Ke = 0; node->Ke = 0;
node->Rpt = 0; node->Rpt = 0;
coord->HaveCoords = FALSE; coord->HaveCoords = FALSE;
coord->X = 0; coord->X = 0;
coord->Y = 0; coord->Y = 0;

7
win_build/WinSDK/epanet2.def
View File

@@ -87,4 +87,9 @@ EXPORTS
ENgetfalseaction = _ENgetfalseaction@20 ENgetfalseaction = _ENgetfalseaction@20
ENsetfalseaction = _ENsetfalseaction@20 ENsetfalseaction = _ENsetfalseaction@20
ENgetruleID = _ENgetruleID@8 ENgetruleID = _ENgetruleID@8
ENsetflowunits = _ENsetflowunits@4 ENsetflowunits = _ENsetflowunits@4
ENaddnode = _ENaddnode@8
ENaddlink = _ENaddlink@16
ENdeletelink = _ENdeletelink@4
ENdeletenode = _ENdeletenode@4
ENsetlinktype = _ENsetlinktype@8