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

Merge pull request #14 from sdteffen/usePUMPINDEX

Browse Source 
Simpler, faster code using PUMPINDEX()
This commit is contained in:
Sam Hatchett
2014-01-27 07:31:49 -08:00
parent 3b5feb75b2 f718c83701
commit f3052ac873
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/epanet.c
View File

@@ -2515,18 +2515,11 @@ int DLLEXPORT ENgetheadcurve(int index, char *id)
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {
int i;
strcpy(id,""); strcpy(id,"");
if (!Openflag) return(102); if (!Openflag) return(102);
for (i=1; i<=Npumps; i++) if (index < 1 || index > Nlinks || PUMP != Link[index].Type) return(204);
{ strcpy(id,Curve[Pump[PUMPINDEX(index)].Hcurve].ID);
if(Pump[i].Link = index)
{
strcpy(id,Curve[Pump[i].Hcurve].ID);
return(0); return(0);
}
}
return(204);
} }
int DLLEXPORT ENgetpumptype(int index, int *type) int DLLEXPORT ENgetpumptype(int index, int *type)
@@ -2539,18 +2532,11 @@ int DLLEXPORT ENgetpumptype(int index, int *type)
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {
int i;
*type=-1; *type=-1;
if (!Openflag) return(102); if (!Openflag) return(102);
for (i=1; i<=Npumps; i++) if (index < 1 || index > Nlinks || PUMP != Link[index].Type) return(204);
{ *type = Pump[PUMPINDEX(index)].Ptype;
if(Pump[i].Link = index)
{
*type = Pump[i].Ptype;
return(0); return(0);
}
}
return(204);
} }
/* /*