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

Merge branch 'lemontiger-rtx' into next

Browse Source
This commit is contained in:
Sam Hatchett
2013-07-22 16:56:05 -04:00
parent 99119ef992 15d187433f
commit 9413dfe69f
40 changed files with 1637 additions and 2253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/output.c
View File

@@ -162,8 +162,9 @@ int savehyd(long *htime)
/* Force flow in closed links to be zero then save flows */
for (i=1; i<=Nlinks; i++)
{
if (S[i] <= CLOSED) x[i] = 0.0f;
else x[i] = (REAL4)Q[i];
if (S[i] <= CLOSED) x[i] = 0.0f;
else x[i] = (REAL4)Q[i];
}
fwrite(x+1,sizeof(REAL4),Nlinks,HydFile);
@@ -379,7 +380,7 @@ int nodeoutput(int j, REAL4 *x, double ucf)
} /* End of nodeoutput */
int linkoutput(int j, float *x, double ucf)
int linkoutput(int j, REAL4 *x, double ucf)
/*
**----------------------------------------------------------------
** Input: j = type of link variable