Changes to pass reg tests
Revised getTmpName() in EPANET.C
This commit is contained in:
Lew Rossman
36
src/epanet.c
36
src/epanet.c
@@ -129,7 +129,6 @@ execute function x and set the error code equal to its return value.
|
||||
#include "text.h"
|
||||
#include "types.h"
|
||||
#define EXTERN
|
||||
#include "epanet2.h"
|
||||
#include "vars.h"
|
||||
|
||||
/****************************************************************
|
||||
@@ -3420,7 +3419,7 @@ int openhydfile(EN_Project *p)
|
||||
out->HydFile = NULL;
|
||||
switch (out->Hydflag) {
|
||||
case SCRATCH:
|
||||
getTmpName(p, out->HydFname);
|
||||
getTmpName(out->HydFname);
|
||||
out->HydFile = fopen(out->HydFname, "w+b");
|
||||
break;
|
||||
case SAVE:
|
||||
@@ -3513,7 +3512,7 @@ int openoutfile(EN_Project *p)
|
||||
// else if ( (OutFile = tmpfile()) == NULL)
|
||||
else
|
||||
{
|
||||
getTmpName(p, out->OutFname);
|
||||
getTmpName(out->OutFname);
|
||||
if ((out->OutFile = fopen(out->OutFname, "w+b")) == NULL)
|
||||
{
|
||||
writecon(FMT08);
|
||||
@@ -3531,7 +3530,7 @@ int openoutfile(EN_Project *p)
|
||||
if (!errcode) {
|
||||
if (rep->Tstatflag != SERIES) {
|
||||
// if ( (TmpOutFile = tmpfile()) == NULL) errcode = 304;
|
||||
getTmpName(p, out->TmpFname);
|
||||
getTmpName(out->TmpFname);
|
||||
out->TmpOutFile = fopen(out->TmpFname, "w+b");
|
||||
if (out->TmpOutFile == NULL)
|
||||
errcode = 304;
|
||||
@@ -3838,30 +3837,35 @@ void freedata(EN_Project *p)
|
||||
----------------------------------------------------------------
|
||||
*/
|
||||
|
||||
/*** New function for 2.00.12 ***/ // DEPRECATED
|
||||
char *getTmpName(EN_Project *p, char *fname)
|
||||
char *getTmpName(char *fname)
|
||||
//
|
||||
// Input: fname = file name string
|
||||
// Output: returns pointer to file name
|
||||
// Purpose: creates a temporary file name with path prepended to it.
|
||||
//
|
||||
{
|
||||
out_file_t *out = &p->out_files;
|
||||
|
||||
#ifdef _WIN32
|
||||
TCHAR tmpFileName[MAXFNAME];
|
||||
TCHAR tmpPathName[MAXFNAME];
|
||||
int rtnValue = GetTempPath(MAXFNAME, tmpPathName);
|
||||
if (rtnValue == 0 || rtnValue > MAXFNAME) return 0;
|
||||
rtnValue = GetTempFileName(tmpPathName, TEXT("EN"), 0, tmpFileName);
|
||||
if (rtnValue > 0) strncpy(fname, tmpFileName, MAXFNAME);
|
||||
|
||||
char* name = NULL;
|
||||
|
||||
// --- use Windows _tempnam function to get a pointer to an
|
||||
// unused file name that begins with "en"
|
||||
name = _tempnam(NULL, "en");
|
||||
if (name == NULL) return NULL;
|
||||
|
||||
// --- copy the file name to fname
|
||||
if (strlen(name) < MAXFNAME) strncpy(fname, name, MAXFNAME);
|
||||
else fname = NULL;
|
||||
|
||||
// --- free the pointer returned by _tempnam
|
||||
if (name) free(name);
|
||||
|
||||
/////////////////// DEPRECATED /////////////////////////////////////
|
||||
// There is an OS limit on the number of times tmpnam will return a
|
||||
// unique file name and it is not thread safe.
|
||||
/*
|
||||
/////////////////// DEPRECATED /////////////////////////////////////
|
||||
// --- for Windows systems:
|
||||
#ifdef WINDOWS
|
||||
out_file_t *out = &p->out_files;
|
||||
// --- use system function tmpnam() to create a temporary file name
|
||||
char name[MAXFNAME + 1];
|
||||
int n;
|
||||
|
||||
266
src/funcs.h
266
src/funcs.h
@@ -31,32 +31,32 @@ AUTHOR: L. Rossman
|
||||
|
||||
#include "types.h"
|
||||
|
||||
void initpointers(EN_Project *p); /* Initializes pointers */
|
||||
int allocdata(EN_Project *p); /* Allocates memory */
|
||||
void freeTmplist(STmplist *); /* Frees items in linked list */
|
||||
void freeFloatlist(SFloatlist *); /* Frees list of floats */
|
||||
void freedata(EN_Project *p); /* Frees allocated memory */
|
||||
void initpointers(EN_Project *p); /* Initializes pointers */
|
||||
int allocdata(EN_Project *p); /* Allocates memory */
|
||||
void freeTmplist(STmplist *); /* Frees items in linked list */
|
||||
void freeFloatlist(SFloatlist *); /* Frees list of floats */
|
||||
void freedata(EN_Project *p); /* Frees allocated memory */
|
||||
int openfiles(EN_Project *p, char *,char *,char *); /* Opens input & report files */
|
||||
int openhydfile(EN_Project *p); /* Opens hydraulics file */
|
||||
int openoutfile(EN_Project *p); /* Opens binary output file */
|
||||
int strcomp(char *, char *); /* Compares two strings */
|
||||
char* getTmpName(EN_Project *p, char* fname); /* Gets temporary file name */
|
||||
double interp(int, double *,double *, double); /* Interpolates a data curve */
|
||||
int openhydfile(EN_Project *p); /* Opens hydraulics file */
|
||||
int openoutfile(EN_Project *p); /* Opens binary output file */
|
||||
int strcomp(char *, char *); /* Compares two strings */
|
||||
char* getTmpName(char* fname); /* Gets temporary file name */
|
||||
double interp(int, double *,double *, double); /* Interpolates a data curve */
|
||||
|
||||
int findnode(EN_Network *n, char *); /* Finds node's index from ID */
|
||||
int findlink(EN_Network *n, char *); /* Finds link's index from ID */
|
||||
int findtank(EN_Network *n, int); /* Find tank index from node index */ // (AH)
|
||||
int findvalve(EN_Network *n, int); /* Find valve index from node index */ // (AH)
|
||||
int findpump(EN_Network *n, int); /* Find pump index from node index */ // (AH)
|
||||
char *geterrmsg(int errcode, char *msg); /* Gets text of error message */
|
||||
void errmsg(EN_Project *p, int); /* Reports program error */
|
||||
void writecon(char *); /* Writes text to console */
|
||||
int findnode(EN_Network *n, char *); /* Finds node's index from ID */
|
||||
int findlink(EN_Network *n, char *); /* Finds link's index from ID */
|
||||
int findtank(EN_Network *n, int); /* Find tank index from node index */ // (AH)
|
||||
int findvalve(EN_Network *n, int); /* Find valve index from node index */ // (AH)
|
||||
int findpump(EN_Network *n, int); /* Find pump index from node index */ // (AH)
|
||||
char *geterrmsg(int errcode, char *msg); /* Gets text of error message */
|
||||
void errmsg(EN_Project *p, int); /* Reports program error */
|
||||
void writecon(char *); /* Writes text to console */
|
||||
void writewin(void (*vp)(char *), char *); /* Passes text to calling app */
|
||||
|
||||
/* ------- INPUT1.C --------------------*/
|
||||
int getdata(EN_Project *pr); /* Gets network data */
|
||||
void setdefaults(EN_Project *pr); /* Sets default values */
|
||||
void initreport(report_options_t *r); /* Initializes report options */
|
||||
void initreport(report_options_t *r); /* Initializes report options */
|
||||
void adjustdata(EN_Project *pr); /* Adjusts input data */
|
||||
int inittanks(EN_Project *pr); /* Initializes tank levels */
|
||||
void initunits(EN_Project *pr); /* Determines reporting units */
|
||||
@@ -65,23 +65,23 @@ void convertunits(EN_Project *pr); /* Converts data to std. uni
|
||||
/* -------- INPUT2.C -------------------*/
|
||||
int netsize(EN_Project *pr); /* Determines network size */
|
||||
int readdata(EN_Project *pr); /* Reads in network data */
|
||||
int newline(EN_Project *pr, int, char *); /* Processes new line of data */
|
||||
int addnodeID(EN_Network *n, int, char *); /* Adds node ID to data base */
|
||||
int addlinkID(EN_Network *n, int, char *); /* Adds link ID to data base */
|
||||
int addpattern(parser_data_t *par, char *); /* Adds pattern to data base */
|
||||
int addcurve(parser_data_t *par, char *); /* Adds curve to data base */
|
||||
STmplist *findID(char *, STmplist *); /* Locates ID on linked list */
|
||||
int newline(EN_Project *pr, int, char *); /* Processes new line of data */
|
||||
int addnodeID(EN_Network *n, int, char *); /* Adds node ID to data base */
|
||||
int addlinkID(EN_Network *n, int, char *); /* Adds link ID to data base */
|
||||
int addpattern(parser_data_t *par, char *); /* Adds pattern to data base */
|
||||
int addcurve(parser_data_t *par, char *); /* Adds curve to data base */
|
||||
STmplist *findID(char *, STmplist *); /* Locates ID on linked list */
|
||||
int unlinked(EN_Project *pr); /* Checks for unlinked nodes */
|
||||
int getpumpparams(EN_Project *pr); /* Computes pump curve coeffs.*/
|
||||
int getpatterns(EN_Project *pr); /* Gets pattern data from list*/
|
||||
int getcurves(EN_Project *pr); /* Gets curve data from list */
|
||||
int findmatch(char *, char *[]); /* Finds keyword in line */
|
||||
int match(const char *, const char *); /* Checks for word match */
|
||||
int findmatch(char *, char *[]); /* Finds keyword in line */
|
||||
int match(const char *, const char *); /* Checks for word match */
|
||||
int gettokens(char *s, char** Tok, int maxToks, char *comment); /* Tokenizes input line */
|
||||
int getfloat(char *, double *); /* Converts string to double */
|
||||
double hour(char *, char *); /* Converts time to hours */
|
||||
int setreport(EN_Project *pr, char *); /* Processes reporting command*/
|
||||
void inperrmsg(EN_Project *pr, int,int,char *); /* Input error message */
|
||||
int getfloat(char *, double *); /* Converts string to double */
|
||||
double hour(char *, char *); /* Converts time to hours */
|
||||
int setreport(EN_Project *pr, char *); /* Processes reporting command*/
|
||||
void inperrmsg(EN_Project *pr, int,int,char *); /* Input error message */
|
||||
|
||||
/* ---------- INPUT3.C -----------------*/
|
||||
int juncdata(EN_Project *pr); /* Processes junction data */
|
||||
@@ -104,13 +104,13 @@ int statusdata(EN_Project *pr); /* Processes link status dat
|
||||
int reportdata(EN_Project *pr); /* Processes report options */
|
||||
int timedata(EN_Project *pr); /* Processes time options */
|
||||
int optiondata(EN_Project *pr); /* Processes analysis options */
|
||||
int optionchoice(EN_Project *pr, int); /* Processes option choices */
|
||||
int optionvalue(EN_Project *pr, int); /* Processes option values */
|
||||
int getpumpcurve(EN_Project *pr, int); /* Constructs a pump curve */
|
||||
int powercurve(double, double, double,/* Coeffs. of power pump curve*/
|
||||
int optionchoice(EN_Project *pr, int); /* Processes option choices */
|
||||
int optionvalue(EN_Project *pr, int); /* Processes option values */
|
||||
int getpumpcurve(EN_Project *pr, int); /* Constructs a pump curve */
|
||||
int powercurve(double, double, double, /* Coeffs. of power pump curve*/
|
||||
double, double, double *,
|
||||
double *, double *);
|
||||
int valvecheck(EN_Project *pr, int, int, int); /* Checks valve placement */
|
||||
int valvecheck(EN_Project *pr, int, int, int); /* Checks valve placement */
|
||||
void changestatus(EN_Network *net, int, StatType, double); /* Changes status of a link */
|
||||
|
||||
/* -------------- RULES.C --------------*/
|
||||
@@ -127,167 +127,183 @@ int writeRuleinInp(EN_Project *pr, FILE *f, /* Writes rule to an INP fil
|
||||
int writereport(EN_Project *pr); /* Writes formatted report */
|
||||
void writelogo(EN_Project *pr); /* Writes program logo */
|
||||
void writesummary(EN_Project *pr); /* Writes network summary */
|
||||
void writehydstat(EN_Project *pr, int,double); /* Writes hydraulic status */
|
||||
void writehydstat(EN_Project *pr, int,double); /* Writes hydraulic status */
|
||||
void writeenergy(EN_Project *pr); /* Writes energy usage */
|
||||
int writeresults(EN_Project *pr); /* Writes node/link results */
|
||||
void writeheader(EN_Project *pr, int,int); /* Writes heading on report */
|
||||
void writeline(EN_Project *pr, char *); /* Writes line to report file */
|
||||
void writerelerr(EN_Project *pr, int, double); /* Writes convergence error */
|
||||
void writeheader(EN_Project *pr, int,int); /* Writes heading on report */
|
||||
void writeline(EN_Project *pr, char *); /* Writes line to report file */
|
||||
void writerelerr(EN_Project *pr, int, double); /* Writes convergence error */
|
||||
void writestatchange(EN_Project *pr, int,char,char); /* Writes link status change */
|
||||
void writecontrolaction(EN_Project *pr, int, int); /* Writes control action taken*/
|
||||
void writeruleaction(EN_Project *pr, int, char *); /* Writes rule action taken */
|
||||
int writehydwarn(EN_Project *pr, int,double); /* Writes hydraulic warnings */
|
||||
void writehyderr(EN_Project *pr, int); /* Writes hydraulic error msg.*/
|
||||
int disconnected(EN_Project *pr); /* Checks for disconnections */
|
||||
int disconnected(EN_Project *pr); /* Checks for disconnections */
|
||||
void marknodes(EN_Project *pr, int, int *, char *); /* Identifies connected nodes */
|
||||
void getclosedlink(EN_Project *pr, int, char *); /* Finds a disconnecting link */
|
||||
void writelimits(EN_Project *pr, int,int); /* Writes reporting limits */
|
||||
int checklimits(report_options_t *rep, double *,int,int); /* Checks variable limits */
|
||||
void writetime(EN_Project *pr, char *); /* Writes current clock time */
|
||||
char *clocktime(char *, long); /* Converts time to hrs:min */
|
||||
char *fillstr(char *, char, int); /* Fills string with character*/
|
||||
int getnodetype(EN_Network *net, int); /* Determines node type */
|
||||
char *clocktime(char *, long); /* Converts time to hrs:min */
|
||||
char *fillstr(char *, char, int); /* Fills string with character*/
|
||||
int getnodetype(EN_Network *net, int); /* Determines node type */
|
||||
|
||||
/* --------- HYDRAUL.C -----------------*/
|
||||
int openhyd(EN_Project *pr); /* Opens hydraulics solver */
|
||||
|
||||
/*** Updated 3/1/01 ***/
|
||||
void inithyd(EN_Project *pr, int initFlags); /* Re-sets initial conditions */
|
||||
void inithyd(EN_Project *pr, int initFlags); /* Re-sets initial conditions */
|
||||
|
||||
int runhyd(EN_Project *pr, long *); /* Solves 1-period hydraulics */
|
||||
int nexthyd(EN_Project *pr, long *); /* Moves to next time period */
|
||||
int runhyd(EN_Project *pr, long *); /* Solves 1-period hydraulics */
|
||||
int nexthyd(EN_Project *pr, long *); /* Moves to next time period */
|
||||
void closehyd(EN_Project *pr); /* Closes hydraulics solver */
|
||||
int allocmatrix(EN_Project *pr); /* Allocates matrix coeffs. */
|
||||
void freematrix(EN_Project *pr); /* Frees matrix coeffs. */
|
||||
void initlinkflow(EN_Project *pr, int, char, double); /* Initializes link flow */
|
||||
void setlinkflow(EN_Project *pr, int, double); /* Sets link flow via headloss*/
|
||||
void setlinkstatus(EN_Project *pr, int, char, StatType *, double *); /* Sets link status */
|
||||
void initlinkflow(EN_Project *pr, int, char,
|
||||
double); /* Initializes link flow */
|
||||
void setlinkflow(EN_Project *pr, int, double); /* Sets link flow via headloss*/
|
||||
void setlinkstatus(EN_Project *pr, int, char,
|
||||
StatType *, double *); /* Sets link status */
|
||||
|
||||
void setlinksetting(EN_Project *pr, int, double, StatType *, double *); /* Sets pump/valve setting */
|
||||
void setlinksetting(EN_Project *pr, int, double,
|
||||
StatType *, double *); /* Sets pump/valve setting */
|
||||
|
||||
void resistance(EN_Project *pr, int); /* Computes resistance coeff. */
|
||||
void resistance(EN_Project *pr, int); /* Computes resistance coeff. */
|
||||
void demands(EN_Project *pr); /* Computes current demands */
|
||||
int controls(EN_Project *pr); /* Controls link settings */
|
||||
long timestep(EN_Project *pr); /* Computes new time step */
|
||||
int tanktimestep(EN_Project *pr, long *); /* Time till tanks fill/drain */
|
||||
void controltimestep(EN_Project *pr, long *); /* Time till control action */
|
||||
void ruletimestep(EN_Project *pr, long *); /* Time till rule action */
|
||||
void addenergy(EN_Project *pr, long); /* Accumulates energy usage */
|
||||
void getenergy(EN_Project *pr, int, double *, double *); /* Computes link energy use */
|
||||
void tanklevels(EN_Project *pr, long); /* Computes new tank levels */
|
||||
double tankvolume(EN_Project *pr, int,double); /* Finds tank vol. from grade */
|
||||
double tankgrade(EN_Project *pr, int,double); /* Finds tank grade from vol. */
|
||||
int netsolve(EN_Project *pr, int *,double *); /* Solves network equations */
|
||||
int badvalve(EN_Project *pr, int); /* Checks for bad valve */
|
||||
int tanktimestep(EN_Project *pr, long *); /* Time till tanks fill/drain */
|
||||
void controltimestep(EN_Project *pr, long *); /* Time till control action */
|
||||
void ruletimestep(EN_Project *pr, long *); /* Time till rule action */
|
||||
void addenergy(EN_Project *pr, long); /* Accumulates energy usage */
|
||||
void getenergy(EN_Project *pr, int, double *,
|
||||
double *); /* Computes link energy use */
|
||||
void tanklevels(EN_Project *pr, long); /* Computes new tank levels */
|
||||
double tankvolume(EN_Project *pr, int,double); /* Finds tank vol. from grade */
|
||||
double tankgrade(EN_Project *pr, int,double); /* Finds tank grade from vol. */
|
||||
int netsolve(EN_Project *pr, int *,double *); /* Solves network equations */
|
||||
int badvalve(EN_Project *pr, int); /* Checks for bad valve */
|
||||
int valvestatus(EN_Project *pr); /* Updates valve status */
|
||||
int linkstatus(EN_Project *pr); /* Updates link status */
|
||||
StatType cvstatus(EN_Project *pr, StatType,double,double); /* Updates CV status */
|
||||
StatType pumpstatus(EN_Project *pr, int,double); /* Updates pump status */
|
||||
StatType prvstatus(EN_Project *pr, int,StatType,double,double,double); /* Updates PRV status */
|
||||
StatType cvstatus(EN_Project *pr, StatType,
|
||||
double,double); /* Updates CV status */
|
||||
StatType pumpstatus(EN_Project *pr, int,double); /* Updates pump status */
|
||||
StatType prvstatus(EN_Project *pr, int,StatType,
|
||||
double,double,double); /* Updates PRV status */
|
||||
|
||||
StatType psvstatus(EN_Project *pr, int,StatType,double,double,double); /* Updates PSV status */
|
||||
StatType psvstatus(EN_Project *pr, int,StatType,
|
||||
double,double,double); /* Updates PSV status */
|
||||
|
||||
StatType fcvstatus(EN_Project *pr, int,StatType,double,double); /* Updates FCV status */
|
||||
StatType fcvstatus(EN_Project *pr, int,StatType,
|
||||
double,double); /* Updates FCV status */
|
||||
|
||||
void tankstatus(EN_Project *pr, int,int,int); /* Checks if tank full/empty */
|
||||
void tankstatus(EN_Project *pr, int,int,int); /* Checks if tank full/empty */
|
||||
int pswitch(EN_Project *pr); /* Pressure switch controls */
|
||||
double newflows(EN_Project *pr); /* Updates link flows */
|
||||
void newcoeffs(EN_Project *pr); /* Computes matrix coeffs. */
|
||||
void linkcoeffs(EN_Project *pr); /* Computes link coeffs. */
|
||||
void nodecoeffs(EN_Project *pr); /* Computes node coeffs. */
|
||||
void valvecoeffs(EN_Project *pr); /* Computes valve coeffs. */
|
||||
void pipecoeff(EN_Project *pr, int); /* Computes pipe coeff. */
|
||||
double DWcoeff(EN_Project *pr, int, double *); /* Computes D-W coeff. */
|
||||
void pumpcoeff(EN_Project *pr, int); /* Computes pump coeff. */
|
||||
void pipecoeff(EN_Project *pr, int); /* Computes pipe coeff. */
|
||||
double DWcoeff(EN_Project *pr, int, double *); /* Computes D-W coeff. */
|
||||
void pumpcoeff(EN_Project *pr, int); /* Computes pump coeff. */
|
||||
|
||||
/*** Updated 10/25/00 ***/
|
||||
/*** Updated 12/29/00 ***/
|
||||
void curvecoeff(EN_Project *pr, int,double,double *,double *); /* Computes curve coeffs. */
|
||||
void curvecoeff(EN_Project *pr, int,double,
|
||||
double *,double *); /* Computes curve coeffs. */
|
||||
|
||||
|
||||
void gpvcoeff(EN_Project *pr, int iLink); /* Computes GPV coeff. */
|
||||
void pbvcoeff(EN_Project *pr, int iLink); /* Computes PBV coeff. */
|
||||
void tcvcoeff(EN_Project *pr, int iLink); /* Computes TCV coeff. */
|
||||
void prvcoeff(EN_Project *pr, int iLink, int n1, int n2); /* Computes PRV coeff. */
|
||||
void psvcoeff(EN_Project *pr, int iLink, int n1, int n2); /* Computes PSV coeff. */
|
||||
void fcvcoeff(EN_Project *pr, int iLink, int n1, int n2); /* Computes FCV coeff. */
|
||||
void gpvcoeff(EN_Project *pr, int iLink); /* Computes GPV coeff. */
|
||||
void pbvcoeff(EN_Project *pr, int iLink); /* Computes PBV coeff. */
|
||||
void tcvcoeff(EN_Project *pr, int iLink); /* Computes TCV coeff. */
|
||||
void prvcoeff(EN_Project *pr, int iLink, int n1, int n2); /* Computes PRV coeff. */
|
||||
void psvcoeff(EN_Project *pr, int iLink, int n1, int n2); /* Computes PSV coeff. */
|
||||
void fcvcoeff(EN_Project *pr, int iLink, int n1, int n2); /* Computes FCV coeff. */
|
||||
void emittercoeffs(EN_Project *pr); /* Computes emitter coeffs. */
|
||||
double emitflowchange(EN_Project *pr, int); /* Computes new emitter flow */
|
||||
double emitflowchange(EN_Project *pr, int); /* Computes new emitter flow */
|
||||
|
||||
/* ----------- SMATRIX.C ---------------*/
|
||||
int createsparse(EN_Project *pr); /* Creates sparse matrix */
|
||||
int allocsparse(EN_Project *pr); /* Allocates matrix memory */
|
||||
void freesparse(EN_Project *pr); /* Frees matrix memory */
|
||||
int buildlists(EN_Project *pr, int); /* Builds adjacency lists */
|
||||
int paralink(EN_Project *pr, int, int, int); /* Checks for parallel links */
|
||||
int buildlists(EN_Project *pr, int); /* Builds adjacency lists */
|
||||
int paralink(EN_Project *pr, int, int, int); /* Checks for parallel links */
|
||||
void xparalinks(EN_Project *pr); /* Removes parallel links */
|
||||
void freelists(EN_Project *pr); /* Frees adjacency lists */
|
||||
void countdegree(EN_Project *pr); /* Counts links at each node */
|
||||
int reordernodes(EN_Project *pr); /* Finds a node re-ordering */
|
||||
int mindegree(solver_t *s, int, int); /* Finds min. degree node */
|
||||
int growlist(EN_Project *pr, int); /* Augments adjacency list */
|
||||
int newlink(EN_Project *pr, Padjlist); /* Adds fill-ins for a node */
|
||||
int linked(EN_Network *net, int, int); /* Checks if 2 nodes linked */
|
||||
int addlink(EN_Network *net, int, int, int); /* Creates new fill-in */
|
||||
int storesparse(EN_Project *pr, int); /* Stores sparse matrix */
|
||||
int ordersparse(hydraulics_t *h, int); /* Orders matrix storage */
|
||||
void transpose(int,int *,int *, /* Transposes sparse matrix */
|
||||
int mindegree(solver_t *s, int, int); /* Finds min. degree node */
|
||||
int growlist(EN_Project *pr, int); /* Augments adjacency list */
|
||||
int newlink(EN_Project *pr, Padjlist); /* Adds fill-ins for a node */
|
||||
int linked(EN_Network *net, int, int); /* Checks if 2 nodes linked */
|
||||
int addlink(EN_Network *net, int, int, int); /* Creates new fill-in */
|
||||
int storesparse(EN_Project *pr, int); /* Stores sparse matrix */
|
||||
int ordersparse(hydraulics_t *h, int); /* Orders matrix storage */
|
||||
void transpose(int,int *,int *, /* Transposes sparse matrix */
|
||||
int *,int *,int *,int *,int *);
|
||||
int linsolve(solver_t *s, int); /* via Cholesky factorization */
|
||||
int linsolve(solver_t *s, int); /* Solves set of linear eqns. */
|
||||
|
||||
/* ----------- QUALITY.C ---------------*/
|
||||
int openqual(EN_Project *pr); /* Opens WQ solver system */
|
||||
void initqual(EN_Project *pr); /* Initializes WQ solver */
|
||||
int runqual(EN_Project *pr, long *); /* Gets current WQ results */
|
||||
int nextqual(EN_Project *pr, long *); /* Updates WQ by hyd.timestep */
|
||||
int stepqual(EN_Project *pr, long *); /* Updates WQ by WQ time step */
|
||||
int runqual(EN_Project *pr, long *); /* Gets current WQ results */
|
||||
int nextqual(EN_Project *pr, long *); /* Updates WQ by hyd.timestep */
|
||||
int stepqual(EN_Project *pr, long *); /* Updates WQ by WQ time step */
|
||||
int closequal(EN_Project *pr); /* Closes WQ solver system */
|
||||
int gethyd(EN_Project *pr, long *, long *); /* Gets next hyd. results */
|
||||
int gethyd(EN_Project *pr, long *, long *); /* Gets next hyd. results */
|
||||
char setReactflag(EN_Project *pr); /* Checks for reactive chem. */
|
||||
void transport(EN_Project *pr, long); /* Transports mass in network */
|
||||
void transport(EN_Project *pr, long); /* Transports mass in network */
|
||||
void initsegs(EN_Project *pr); /* Initializes WQ segments */
|
||||
void reorientsegs(EN_Project *pr); /* Re-orients WQ segments */
|
||||
void updatesegs(EN_Project *pr, long); /* Updates quality in segments*/
|
||||
void removesegs(EN_Project *pr, int); /* Removes a WQ segment */
|
||||
void addseg(EN_Project *pr, int,double,double); /* Adds a WQ segment to pipe */
|
||||
void accumulate(EN_Project *pr, long); /* Sums mass flow into node */
|
||||
void updatenodes(EN_Project *pr, long); /* Updates WQ at nodes */
|
||||
void sourceinput(EN_Project *pr, long); /* Computes source inputs */
|
||||
void release(EN_Project *pr, long); /* Releases mass from nodes */
|
||||
void updatetanks(EN_Project *pr, long); /* Updates WQ in tanks */
|
||||
void updatesourcenodes(EN_Project *pr, long); /* Updates WQ at source nodes */
|
||||
void tankmix1(EN_Project *pr, int, long); /* Complete mix tank model */
|
||||
void tankmix2(EN_Project *pr, int, long); /* 2-compartment tank model */
|
||||
void tankmix3(EN_Project *pr, int, long); /* FIFO tank model */
|
||||
void tankmix4(EN_Project *pr, int, long); /* LIFO tank model */
|
||||
double sourcequal(EN_Project *pr, Psource); /* Finds WQ input from source */
|
||||
double avgqual(EN_Project *pr, int); /* Finds avg. quality in pipe */
|
||||
void updatesegs(EN_Project *pr, long); /* Updates quality in segments*/
|
||||
void removesegs(EN_Project *pr, int); /* Removes a WQ segment */
|
||||
void addseg(EN_Project *pr, int,double,double); /* Adds a WQ segment to pipe */
|
||||
void accumulate(EN_Project *pr, long); /* Sums mass flow into node */
|
||||
void updatenodes(EN_Project *pr, long); /* Updates WQ at nodes */
|
||||
void sourceinput(EN_Project *pr, long); /* Computes source inputs */
|
||||
void release(EN_Project *pr, long); /* Releases mass from nodes */
|
||||
void updatetanks(EN_Project *pr, long); /* Updates WQ in tanks */
|
||||
void updatesourcenodes(EN_Project *pr, long); /* Updates WQ at source nodes */
|
||||
void tankmix1(EN_Project *pr, int, long); /* Complete mix tank model */
|
||||
void tankmix2(EN_Project *pr, int, long); /* 2-compartment tank model */
|
||||
void tankmix3(EN_Project *pr, int, long); /* FIFO tank model */
|
||||
void tankmix4(EN_Project *pr, int, long); /* LIFO tank model */
|
||||
double sourcequal(EN_Project *pr, Psource); /* Finds WQ input from source */
|
||||
double avgqual(EN_Project *pr, int); /* Finds avg. quality in pipe */
|
||||
void ratecoeffs(EN_Project *pr); /* Finds wall react. coeffs. */
|
||||
double piperate(EN_Project *pr, int); /* Finds wall react. coeff. */
|
||||
double pipereact(EN_Project *pr, int,double,double,long);/* Reacts water in a pipe */
|
||||
double tankreact(EN_Project *pr, double,double,double,long); /* Reacts water in a tank */
|
||||
double bulkrate(EN_Project *pr, double,double,double); /* Finds bulk reaction rate */
|
||||
double wallrate(EN_Project *pr, double,double,double,double);/* Finds wall reaction rate */
|
||||
double piperate(EN_Project *pr, int); /* Finds wall react. coeff. */
|
||||
double pipereact(EN_Project *pr, int,double,
|
||||
double,long); /* Reacts water in a pipe */
|
||||
double tankreact(EN_Project *pr, double,double,
|
||||
double,long); /* Reacts water in a tank */
|
||||
double bulkrate(EN_Project *pr, double,double,
|
||||
double); /* Finds bulk reaction rate */
|
||||
double wallrate(EN_Project *pr, double,double,
|
||||
double,double); /* Finds wall reaction rate */
|
||||
|
||||
|
||||
/* ------------ OUTPUT.C ---------------*/
|
||||
int savenetdata(EN_Project *pr); /* Saves basic data to file */
|
||||
int savehyd(EN_Project *pr, long *); /* Saves hydraulic solution */
|
||||
int savehydstep(EN_Project *pr, long *); /* Saves hydraulic timestep */
|
||||
int savehyd(EN_Project *pr, long *); /* Saves hydraulic solution */
|
||||
int savehydstep(EN_Project *pr, long *); /* Saves hydraulic timestep */
|
||||
int saveenergy(EN_Project *pr); /* Saves energy usage */
|
||||
int readhyd(EN_Project *pr, long *); /* Reads hydraulics from file */
|
||||
int readhydstep(FILE *hydFile, long *); /* Reads time step from file */
|
||||
int readhyd(EN_Project *pr, long *); /* Reads hydraulics from file */
|
||||
int readhydstep(FILE *hydFile, long *); /* Reads time step from file */
|
||||
int saveoutput(EN_Project *pr); /* Saves results to file */
|
||||
int nodeoutput(EN_Project *pr, int, REAL4 *, double); /* Saves node results to file */
|
||||
int linkoutput(EN_Project *pr, int, REAL4 *, double); /* Saves link results to file */
|
||||
int nodeoutput(EN_Project *pr, int, REAL4 *,
|
||||
double); /* Saves node results to file */
|
||||
int linkoutput(EN_Project *pr, int, REAL4 *,
|
||||
double); /* Saves link results to file */
|
||||
int savefinaloutput(EN_Project *pr); /* Finishes saving output */
|
||||
int savetimestat(EN_Project *pr, REAL4 *, HdrType); /* Saves time stats to file */
|
||||
int savenetreacts(EN_Project *pr, double, double,double, double);
|
||||
/* Saves react. rates to file */
|
||||
int savetimestat(EN_Project *pr, REAL4 *,
|
||||
HdrType); /* Saves time stats to file */
|
||||
int savenetreacts(EN_Project *pr, double,
|
||||
double,double, double); /* Saves react. rates to file */
|
||||
int saveepilog(EN_Project *pr); /* Saves output file epilog */
|
||||
|
||||
|
||||
/* ------------ INPFILE.C --------------*/
|
||||
int saveinpfile(EN_Project *pr, char *); /* Saves network to text file */
|
||||
int saveinpfile(EN_Project *pr, char *); /* Saves network to text file */
|
||||
|
||||
#endif
|
||||
|
||||
@@ -40,8 +40,7 @@ AUTHOR: L. Rossman
|
||||
--------------------- Module Global Variables ----------------------
|
||||
*/
|
||||
|
||||
#define MAXITER \
|
||||
200 /* Default max. # hydraulic iterations */
|
||||
#define MAXITER 200 /* Default max. # hydraulic iterations */
|
||||
#define HACC 0.001 /* Default hydraulics convergence ratio */
|
||||
#define HTOL 0.0005 /* Default hydraulic head tolerance (ft) */
|
||||
|
||||
@@ -62,8 +61,7 @@ AUTHOR: L. Rossman
|
||||
#define RQTOL 1E-7 /* Default low flow resistance tolerance */
|
||||
#define CHECKFREQ 2 /* Default status check frequency */
|
||||
#define MAXCHECK 10 /* Default # iterations for status checks */
|
||||
#define DAMPLIMIT \
|
||||
0 /* Default damping threshold */
|
||||
#define DAMPLIMIT 0 /* Default damping threshold */
|
||||
|
||||
extern char *Fldname[]; /* Defined in enumstxt.h in EPANET.C */
|
||||
extern char *RptFlowUnitsTxt[];
|
||||
|
||||
@@ -23,6 +23,7 @@ AUTHOR: L. Rossman
|
||||
#include "epanet2.h"
|
||||
#include "hash.h"
|
||||
#include "mempool.h"
|
||||
#include <stdio.h>
|
||||
|
||||
/*********************************************************/
|
||||
/* All floats have been re-declared as doubles (7/3/07). */
|
||||
@@ -49,7 +50,7 @@ typedef int INT4;
|
||||
#define MAXID 31 /* Max. # characters in ID name */
|
||||
#define MAXMSG 79 /* Max. # characters in message text */
|
||||
#define MAXLINE 255 /* Max. # characters read from input line */
|
||||
#define MAXFNAME 259 /* Max. # characters in file name */
|
||||
#define MAXFNAME L_tmpnam_s /* Max. # characters in file name */
|
||||
#define MAXTOKS 40 /* Max. items per line of input */
|
||||
#define TZERO 1.E-4 /* Zero time tolerance */
|
||||
#define TRUE 1
|
||||
|
||||
Reference in New Issue
Block a user