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

Merge pull request #801 from OpenWaterAnalytics/API_fixes

Browse Source 
Fix two legacy API functions
This commit is contained in:
Lew Rossman
2024-06-18 07:46:25 -04:00
committed by GitHub
parent 109a93f7d5 6ac4156fd0
commit d055157558
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/epanet2.c
View File

@@ -357,7 +357,16 @@ int DLLEXPORT ENgetnodevalue(int index, int property, EN_API_FLOAT_TYPE *value)
int DLLEXPORT ENgetnodevalues(int property, EN_API_FLOAT_TYPE *values) int DLLEXPORT ENgetnodevalues(int property, EN_API_FLOAT_TYPE *values)
{ {
return EN_getnodevalues(_defaultProject, property, values); int i, errcode = 0;
EN_API_FLOAT_TYPE value;
for (i = 1; i <= _defaultProject->network.Nnodes; i++)
{
errcode = ENgetnodevalue(i, property, &value);
values[i-1] = value;
if (errcode != 0) return errcode;
}
return 0;
} }
int DLLEXPORT ENsetnodevalue(int index, int property, EN_API_FLOAT_TYPE value) int DLLEXPORT ENsetnodevalue(int index, int property, EN_API_FLOAT_TYPE value)
@@ -530,7 +539,16 @@ int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value)
} }
int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *values) int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *values)
{ {
return EN_getlinkvalues(_defaultProject, property, values); int i, errcode = 0;
EN_API_FLOAT_TYPE value;
for (i = 1; i <= _defaultProject->network.Nlinks; i++)
{
errcode = ENgetlinkvalue(i, property, &value);
values[i-1] = value;
if (errcode != 0) return errcode;
}
return 0;
} }
int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value) int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value)

2
src/report.c
View File

@@ -291,7 +291,7 @@ void writesummary(Project *pr)
if (qual->Qualflag == NONE || time->Dur == 0.0) sprintf(s, FMT29); if (qual->Qualflag == NONE || time->Dur == 0.0) sprintf(s, FMT29);
else if (qual->Qualflag == CHEM) sprintf(s, FMT30, qual->ChemName); else if (qual->Qualflag == CHEM) sprintf(s, FMT30, qual->ChemName);
else if (qual->Qualflag == TRACE) sprintf(s, FMT31, net->Node[qual->TraceNode].ID); else if (qual->Qualflag == TRACE) sprintf(s, FMT31, net->Node[qual->TraceNode].ID);
else if (qual->Qualflag == AGE) printf(s, FMT32); else if (qual->Qualflag == AGE) sprintf(s, FMT32);
writeline(pr, s); writeline(pr, s);
if (qual->Qualflag != NONE && time->Dur > 0) if (qual->Qualflag != NONE && time->Dur > 0)
{ {