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

roll back to known version. i messed this up unintentionally with a previous commit

Browse Source 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@377 c320cabd-cc23-0410-96d8-e60fbf53ed7f
This commit is contained in:
Sam Hatchett
2011-01-12 18:24:05 +00:00
parent 3f3b6efb93
commit 80b484df16
20 changed files with 2615 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/epanet.c
View File

@@ -1074,8 +1074,6 @@ int DLLEXPORT ENgetoption(int code, float *value)
break;
case EN_DEMANDMULT: v = Dmult;
break;
case EN_HALTFLAG: v = checkHaltFlag(); /* sh - 4.2010 */
break; /* sh - 4.2010 */
default: return(251);
}
*value = (float)v;
@@ -1188,7 +1186,7 @@ int DLLEXPORT ENgetpatternlen(int index, int *len)
}
int DLLEXPORT ENgetpatternvalue(int index, int period, double *value)
int DLLEXPORT ENgetpatternvalue(int index, int period, float *value)
/*----------------------------------------------------------------
** Input: index = index of time pattern
** period = pattern time period
@@ -1202,7 +1200,7 @@ int DLLEXPORT ENgetpatternvalue(int index, int period, double *value)
if (!Openflag) return(102);
if (index < 1 || index > Npats) return(205);
if (period < 1 || period > Pattern[index].Length) return(251);
*value = Pattern[index].F[period-1];
*value = (float)Pattern[index].F[period-1];
return(0);
}
@@ -1316,7 +1314,7 @@ int DLLEXPORT ENgetnodetype(int index, int *code)
}
int DLLEXPORT ENgetnodevalue(int index, int code, double *value)
int DLLEXPORT ENgetnodevalue(int index, int code, float *value)
/*----------------------------------------------------------------
** Input: index = node index
** code = node parameter code (see TOOLKIT.H)
@@ -1332,15 +1330,6 @@ int DLLEXPORT ENgetnodevalue(int index, int code, double *value)
/* Check for valid arguments */
*value = 0.0f;
// added ability to get system-wide demand // SH added 4.2010
if (index == 0) {
v = Dsystem;
v *= Ucf[FLOW];
*value = v;
return(0);
}
if (!Openflag) return(102);
if (index <= 0 || index > Nnodes) return(203);
@@ -1486,17 +1475,9 @@ int DLLEXPORT ENgetnodevalue(int index, int code, double *value)
/*** New parameter additions ends here. ***/ //(2.00.12 - LR)
/*** SH addition: retreive tank volume ***/
case EN_TANKVOLUME:
if (index <= Njuncs) return(251);
v = Tank[index-Njuncs].V0;
break;
default: return(251);
}
*value = v;
*value = (float)v;
return(0);
}
@@ -1581,7 +1562,7 @@ int DLLEXPORT ENgetlinknodes(int index, int *node1, int *node2)
}
int DLLEXPORT ENgetlinkvalue(int index, int code, double *value)
int DLLEXPORT ENgetlinkvalue(int index, int code, float *value)
/*------------------------------------------------------------------
** Input: index = link index
** code = link parameter code (see TOOLKIT.H)
@@ -1715,7 +1696,7 @@ int DLLEXPORT ENgetlinkvalue(int index, int code, double *value)
default: return(251);
}
*value = v;
*value = (float)v;
return(0);
}
@@ -1816,7 +1797,7 @@ int DLLEXPORT ENsetcontrol(int cindex, int ctype, int lindex,
}
int DLLEXPORT ENsetnodevalue(int index, int code, double v)
int DLLEXPORT ENsetnodevalue(int index, int code, float v)
/*----------------------------------------------------------------
** Input: index = node index
** code = node parameter code (see TOOLKIT.H)
@@ -1866,22 +1847,11 @@ int DLLEXPORT ENsetnodevalue(int index, int code, double v)
j = ROUND(value);
if (j < 0 || j > Npats) return(205);
if (index <= Njuncs)
{
if (j == 0) { // SH 3.2010
// we are re-setting the pattern assignment if we set pattern index to 0. // SH 3.2010
demand = Node[index].D; // SH 3.2010
demand->next = NULL; // SH 3.2010
demand->Pat = 0; // SH 3.2010
} // SH 3.2010
else { // SH 3.2010
for (demand = Node[index].D; demand != NULL; demand = demand ->next)
{
if (demand->next == NULL) demand->Pat = j;
}
} // SH 3.2010
{
for (demand = Node[index].D; demand != NULL; demand = demand ->next)
{
if (demand->next == NULL) demand->Pat = j;
}
}
else Tank[index-Njuncs].Pat = j;
break;
@@ -2036,7 +2006,7 @@ int DLLEXPORT ENsetnodevalue(int index, int code, double v)
}
int DLLEXPORT ENsetlinkvalue(int index, int code, double v)
int DLLEXPORT ENsetlinkvalue(int index, int code, float v)
/*----------------------------------------------------------------
** Input: index = link index
** code = link parameter code (see TOOLKIT.H)
@@ -2282,7 +2252,7 @@ int DLLEXPORT ENsettimeparam(int code, long value)
*/
{
if (!Openflag) return(102);
//if (OpenHflag || OpenQflag) return(109);
if (OpenHflag || OpenQflag) return(109);
if (value < 0) return(202);
switch(code)
{
@@ -2319,15 +2289,13 @@ int DLLEXPORT ENsettimeparam(int code, long value)
case EN_STATISTIC: if (value > RANGE) return(202);
Tstatflag = (char)value;
break;
case EN_HTIME: Htime = value;
break;
default: return(251);
}
return(0);
}
int DLLEXPORT ENsetoption(int code, double v)
int DLLEXPORT ENsetoption(int code, float v)
/*----------------------------------------------------------------
** Input: code = option code (see TOOLKIT.H)
** v = option value
@@ -2364,9 +2332,6 @@ int DLLEXPORT ENsetoption(int code, double v)
break;
case EN_DEMANDMULT: if (value <= 0.0) return(202);
Dmult = value;
break;
case EN_HALTFLAG: if (value < 0.0) return(202);
setHaltFlag((int)value);
break;
default: return(251);
}

10
src/hydraul.c
View File

@@ -82,13 +82,6 @@ double RelaxFactor; /
/* Function to find flow coeffs. through open/closed valves */ //(2.00.11 - LR)
void valvecoeff(int k); //(2.00.11 - LR)
int checkHaltFlag() {
return Haltflag;
}
int setHaltFlag(int value) {
Haltflag = value;
return 0;
}
int openhyd()
/*
@@ -793,8 +786,7 @@ void controltimestep(long *tstep)
long t,t1,t2;
for (i=1; i<=Ncontrols; i++)
{
if (Control[i].Link == 0) continue;
{
t = 0;
if ( (n = Control[i].Node) > 0) /* Node control: */
{

16
src/toolkit.h
View File

@@ -59,8 +59,6 @@ AUTHOR: L. Rossman
#define EN_MIXFRACTION 22
#define EN_TANK_KBULK 23
#define EN_TANKVOLUME 24 /* SH added 4.2010 */
#define EN_DIAMETER 0 /* Link parameters */
#define EN_LENGTH 1
#define EN_ROUGHNESS 2
@@ -86,8 +84,6 @@ AUTHOR: L. Rossman
#define EN_RULESTEP 7
#define EN_STATISTIC 8
#define EN_PERIODS 9
#define EN_HTIME 10
#define EN_HALTFLAG 11 /* sh 4.2010 */
#define EN_NODECOUNT 0 /* Component counts */
#define EN_TANKCOUNT 1
@@ -198,31 +194,31 @@ AUTHOR: L. Rossman
int DLLEXPORT ENgetpatternindex(char *, int *);
int DLLEXPORT ENgetpatternid(int, char *);
int DLLEXPORT ENgetpatternlen(int, int *);
int DLLEXPORT ENgetpatternvalue(int, int, double *);
int DLLEXPORT ENgetpatternvalue(int, int, float *);
int DLLEXPORT ENgetqualtype(int *, int *);
int DLLEXPORT ENgeterror(int, char *, int);
int DLLEXPORT ENgetnodeindex(char *, int *);
int DLLEXPORT ENgetnodeid(int, char *);
int DLLEXPORT ENgetnodetype(int, int *);
int DLLEXPORT ENgetnodevalue(int, int, double *);
int DLLEXPORT ENgetnodevalue(int, int, float *);
int DLLEXPORT ENgetlinkindex(char *, int *);
int DLLEXPORT ENgetlinkid(int, char *);
int DLLEXPORT ENgetlinktype(int, int *);
int DLLEXPORT ENgetlinknodes(int, int *, int *);
int DLLEXPORT ENgetlinkvalue(int, int, double *);
int DLLEXPORT ENgetlinkvalue(int, int, float *);
int DLLEXPORT ENgetversion(int *);
int DLLEXPORT ENsetcontrol(int, int, int, float, int, float);
int DLLEXPORT ENsetnodevalue(int, int, double);
int DLLEXPORT ENsetlinkvalue(int, int, double);
int DLLEXPORT ENsetnodevalue(int, int, float);
int DLLEXPORT ENsetlinkvalue(int, int, float);
int DLLEXPORT ENaddpattern(char *);
int DLLEXPORT ENsetpattern(int, float *, int);
int DLLEXPORT ENsetpatternvalue(int, int, float);
int DLLEXPORT ENsettimeparam(int, long);
int DLLEXPORT ENsetoption(int, double);
int DLLEXPORT ENsetoption(int, float);
int DLLEXPORT ENsetstatusreport(int);
int DLLEXPORT ENsetqualtype(int, char *, char *, char *);