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

fix duplicate symbols

Browse Source
This commit is contained in:
Sam Hatchett
2015-06-12 10:35:02 -04:00
parent 38bb3a57e0
commit 16edcea410
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/vars.h
View File

@@ -17,15 +17,15 @@ AUTHOR: L. Rossman
#include <stdio.h> #include <stdio.h>
#include "hash.h" #include "hash.h"
FILE *InFile, /* Input file pointer */ EXTERN FILE *InFile, /* Input file pointer */
*OutFile, /* Output file pointer */ *OutFile, /* Output file pointer */
*RptFile, /* Report file pointer */ *RptFile, /* Report file pointer */
*HydFile, /* Hydraulics file pointer */ *HydFile, /* Hydraulics file pointer */
*TmpOutFile; /* Temporary file handle */ *TmpOutFile; /* Temporary file handle */
long HydOffset, /* Hydraulics file byte offset */ EXTERN long HydOffset, /* Hydraulics file byte offset */
OutOffset1, /* 1st output file byte offset */ OutOffset1, /* 1st output file byte offset */
OutOffset2; /* 2nd output file byte offset */ OutOffset2; /* 2nd output file byte offset */
char Msg[MAXMSG+1], /* Text of output message */ EXTERN char Msg[MAXMSG+1], /* Text of output message */
InpFname[MAXFNAME+1], /* Input file name */ InpFname[MAXFNAME+1], /* Input file name */
Rpt1Fname[MAXFNAME+1], /* Primary report file name */ Rpt1Fname[MAXFNAME+1], /* Primary report file name */
Rpt2Fname[MAXFNAME+1], /* Secondary report file name */ Rpt2Fname[MAXFNAME+1], /* Secondary report file name */
@@ -65,7 +65,7 @@ AUTHOR: L. Rossman
OpenQflag, /* Quality system opened flag */ OpenQflag, /* Quality system opened flag */
SaveQflag, /* Quality results saved flag */ SaveQflag, /* Quality results saved flag */
Saveflag; /* General purpose save flag */ Saveflag; /* General purpose save flag */
int MaxNodes, /* Node count from input file */ EXTERN int MaxNodes, /* Node count from input file */
MaxLinks, /* Link count from input file */ MaxLinks, /* Link count from input file */
MaxJuncs, /* Junction count */ MaxJuncs, /* Junction count */
MaxPipes, /* Pipe count */ MaxPipes, /* Pipe count */
@@ -99,7 +99,7 @@ AUTHOR: L. Rossman
PageSize, /* Lines/page in output report */ PageSize, /* Lines/page in output report */
CheckFreq, /* Hydraulics solver parameter */ CheckFreq, /* Hydraulics solver parameter */
MaxCheck; /* Hydraulics solver parameter */ MaxCheck; /* Hydraulics solver parameter */
double Ucf[MAXVAR], /* Unit conversion factors */ EXTERN double Ucf[MAXVAR], /* Unit conversion factors */
Ctol, /* Water quality tolerance */ Ctol, /* Water quality tolerance */
Htol, /* Hydraulic head tolerance */ Htol, /* Hydraulic head tolerance */
Qtol, /* Flow rate tolerance */ Qtol, /* Flow rate tolerance */
@@ -128,7 +128,7 @@ AUTHOR: L. Rossman
Wwall, /* Avg. wall reaction rate */ Wwall, /* Avg. wall reaction rate */
Wtank, /* Avg. tank reaction rate */ Wtank, /* Avg. tank reaction rate */
Wsource; /* Avg. mass inflow */ Wsource; /* Avg. mass inflow */
long Tstart, /* Starting time of day (sec) */ EXTERN long Tstart, /* Starting time of day (sec) */
Hstep, /* Nominal hyd. time step (sec) */ Hstep, /* Nominal hyd. time step (sec) */
Qstep, /* Quality time step (sec) */ Qstep, /* Quality time step (sec) */
Pstep, /* Time pattern time step (sec) */ Pstep, /* Time pattern time step (sec) */
@@ -141,12 +141,12 @@ AUTHOR: L. Rossman
Hydstep, /* Actual hydraulic time step */ Hydstep, /* Actual hydraulic time step */
Rulestep, /* Rule evaluation time step */ Rulestep, /* Rule evaluation time step */
Dur; /* Duration of simulation (sec) */ Dur; /* Duration of simulation (sec) */
SField Field[MAXVAR]; /* Output reporting fields */ EXTERN SField Field[MAXVAR]; /* Output reporting fields */
/* Array pointers not allocated and freed in same routine */ /* Array pointers not allocated and freed in same routine */
char *LinkStatus, /* Link status */ EXTERN char *LinkStatus, /* Link status */
*OldStat; /* Previous link/tank status */ *OldStat; /* Previous link/tank status */
double *NodeDemand, /* Node actual demand */ EXTERN double *NodeDemand, /* Node actual demand */
*NodeQual, /* Node actual quality */ *NodeQual, /* Node actual quality */
*E, /* Emitter flows */ *E, /* Emitter flows */
*LinkSetting, /* Link settings */ *LinkSetting, /* Link settings */
@@ -194,19 +194,19 @@ EXTERN int _iterations; /* Info about hydraulic solution */
** The following arrays are used to efficiently manage this sparsity: ** The following arrays are used to efficiently manage this sparsity:
*/ */
double *Aii, /* Diagonal coeffs. of A */ EXTERN double *Aii, /* Diagonal coeffs. of A */
*Aij, /* Non-zero, off-diagonal coeffs. of A */ *Aij, /* Non-zero, off-diagonal coeffs. of A */
*F; /* Right hand side coeffs. */ *F; /* Right hand side coeffs. */
double *P, /* Inverse headloss derivatives */ EXTERN double *P, /* Inverse headloss derivatives */
*Y; /* Flow correction factors */ *Y; /* Flow correction factors */
int *Order, /* Node-to-row of A */ EXTERN int *Order, /* Node-to-row of A */
*Row, /* Row-to-node of A */ *Row, /* Row-to-node of A */
*Ndx; /* Index of link's coeff. in Aij */ *Ndx; /* Index of link's coeff. in Aij */
/* /*
** The following arrays store the positions of the non-zero coeffs. ** The following arrays store the positions of the non-zero coeffs.
** of the lower triangular portion of A whose values are stored in Aij: ** of the lower triangular portion of A whose values are stored in Aij:
*/ */
int *XLNZ, /* Start position of each column in NZSUB */ EXTERN int *XLNZ, /* Start position of each column in NZSUB */
*NZSUB, /* Row index of each coeff. in each column */ *NZSUB, /* Row index of each coeff. in each column */
*LNZ; /* Position of each coeff. in Aij array */ *LNZ; /* Position of each coeff. in Aij array */