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

Merge pull request #649 from jamesuber/dev

Browse Source 
Bugfix for En_getaveragepatternvalue() and Return MISSING initial setting from EN_getlinkvalue()
This commit is contained in:
Elad Salomons
2021-09-27 10:50:46 +03:00
committed by GitHub
parent 7baf992d69 3be813facb
commit 4b2d686c5d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/epanet.c
View File

@@ -3635,8 +3635,7 @@ int DLLEXPORT EN_getlinkvalue(EN_Project p, int index, int property, double *val
{ {
return EN_getlinkvalue(p, index, EN_ROUGHNESS, value); return EN_getlinkvalue(p, index, EN_ROUGHNESS, value);
} }
if (Link[index].Kc == MISSING) v = 0.0; v = Link[index].Kc;
else v = Link[index].Kc;
switch (Link[index].Type) switch (Link[index].Type)
{ {
case PRV: case PRV:
@@ -3649,6 +3648,9 @@ int DLLEXPORT EN_getlinkvalue(EN_Project p, int index, int property, double *val
default: default:
break; break;
} }
if (Link[index].Kc == MISSING) {
v = MISSING;
}
break; break;
case EN_KBULK: case EN_KBULK:
@@ -4525,7 +4527,7 @@ int DLLEXPORT EN_getaveragepatternvalue(EN_Project p, int index, double *value)
*value = 0.0; *value = 0.0;
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (index < 1 || index > net->Npats) return 205; if (index < 0 || index > net->Npats) return 205;
for (i = 0; i < Pattern[index].Length; i++) for (i = 0; i < Pattern[index].Length; i++)
{ {
*value += (double)Pattern[index].F[i]; *value += (double)Pattern[index].F[i];