parity with OWA root 2.00.12
This commit is contained in:
sam hatchett
@@ -1,57 +0,0 @@
|
||||
-----------------------
|
||||
Build 2.00.12 (2/25/08)
|
||||
-----------------------
|
||||
|
||||
Computational Engine Changes (epanet2.dll and epanet2d.exe):
|
||||
===============================================================================
|
||||
CODE MODULES CHANGES
|
||||
===============================================================================
|
||||
EPANET.C Temporary files are now written to the users's current working
|
||||
INPUT1.C directory or to the designated Temporary Directory when running
|
||||
VARS.H the Windows GUI, thus avoiding file access problems for users
|
||||
FUNCS.H who do not have administrative privileges on their machine.
|
||||
-------------------------------------------------------------------------------
|
||||
EPANET.C The following tank parameters were made available for retrieval
|
||||
TOOLKIT.H using the Toolkit's ENgetnodevalue function: tank diameter,
|
||||
EPANET2.H minimum volume, index of the tank's volume curve, the initial,
|
||||
minimum, and maximum water levels, the fraction of a 2-compart-
|
||||
ment tank devoted to the mixing zone, and the tank's bulk
|
||||
reaction rate coefficient. These same parameters (with the
|
||||
exception of the volume curve) were made modifiable using the
|
||||
ENsetnodevalue function, as was the choice of mixing model.
|
||||
See the Toolkit Help file for details.
|
||||
-------------------------------------------------------------------------------
|
||||
EPANET.C A new Toolkit function, ENaddpattern, was added that allows
|
||||
TOOLKIT.C programmers to add a new time pattern to the network in any
|
||||
EPANET2.H custom code that they write.
|
||||
-------------------------------------------------------------------------------
|
||||
HYDRAUL.C A DAMPLIMIT parameter was added to control at what point during
|
||||
INPUT1.C the hydraulic solution iterations status checks on PRVs and PSVs
|
||||
INPUT3.C begin and subsequent flow changes are dampened.
|
||||
REPORT.C
|
||||
VARS.H
|
||||
TEXT.H
|
||||
-------------------------------------------------------------------------------
|
||||
HYDRAUL.C Demands for tanks (net inflows/outflows) were not always being
|
||||
set to zero when the tank was full or empty which was causing
|
||||
problems in the water quality routing solutions.
|
||||
-------------------------------------------------------------------------------
|
||||
QUALITY.C The water quality functions for all of the tank mixing models
|
||||
were modified so as to produce more robust results for cases
|
||||
where there is a significant amount of volume exchange over a
|
||||
water quality time step.
|
||||
-------------------------------------------------------------------------------
|
||||
EPANET.C A problem with the system not recognizing that water quality
|
||||
QUALITY.C reactions could begin after some initial period of time when
|
||||
VARS.H the Toolkit was used to modify reaction rate coefficients was
|
||||
fixed.
|
||||
-------------------------------------------------------------------------------
|
||||
INPFILE.C A problem with extraneous lines being written to the [REPORT]
|
||||
section of an EPANET input file created with the ENsaveinpfile
|
||||
function was fixed. Also the number of decimal places for some
|
||||
items written to the saved file, such as nodal demands, was
|
||||
increased.
|
||||
-------------------------------------------------------------------------------
|
||||
TYPES.H The code version was changed to 20012 and INT4 was explicitly
|
||||
defined as an "int" data type.
|
||||
===============================================================================
|
||||
@@ -1,54 +0,0 @@
|
||||
Contents of EPANET2.ZIP
|
||||
=======================
|
||||
This archive contains the source code for the EPANET 2
|
||||
network hydraulic and water quality solver. The solver
|
||||
provides functions for simulating the extended period
|
||||
hydraulic and water quality behavior of water distribution
|
||||
system pipe networks. It is written in ANSI-compatible C
|
||||
and can be compiled into either a Windows Dynamic Link
|
||||
Library of functions or into a command-line executable.
|
||||
|
||||
The archived code is set up for compilation as a DLL.
|
||||
To compile it as a command line (or console) application
|
||||
simply comment out the "#define DLL" macro statement at
|
||||
the top of EPANET.C and un-comment the "#define CLE" macro.
|
||||
|
||||
The DLL version of the solver (epanet2.dll) is used with
|
||||
the EPANET 2 user interface executable (epanet2w.exe) to
|
||||
form a complete Windows modeling package. It also serves
|
||||
as the function library for the EPANET Programmer's Toolkit,
|
||||
allowing developers to construct their own customized pipe
|
||||
network analysis applications.
|
||||
|
||||
The following C-code files are included in this archive:
|
||||
EPANET.C -- main module providing supervisory control
|
||||
INPUT1.C -- controls processing of input data
|
||||
INPUT2.C -- reads data from input file
|
||||
INPUT3.C -- parses individual lines of input data
|
||||
INPFILE.C -- saves modified input data to a text file
|
||||
RULES.C -- implements rule-based control of piping system
|
||||
HYDRAUL.C -- computes extended period hydraulic behavior
|
||||
QUALITY.C -- tracks transport & fate of water quality
|
||||
OUTPUT.C -- handles transfer of data to and from binary files
|
||||
REPORT.C -- handles reporting of results to text file
|
||||
SMATRIX.C -- sparse matrix linear equation solver routines
|
||||
MEMPOOL.C -- memory pool management routines
|
||||
HASH.C -- hash table routines
|
||||
|
||||
Also included are the following header files:
|
||||
TOOLKIT.H -- function prototypes of exported DLL functions
|
||||
FUNCS.H -- prototypes of all other functions
|
||||
TYPES.H -- declaration of global constants and data structures
|
||||
VARS.H -- declaration of global variables
|
||||
HASH.H -- header file for hash table routines
|
||||
MEMPOOL.H -- header file for memory pool routines
|
||||
ENUMSTXT.H -- string constants for enumerated types
|
||||
TEXT.H -- declaration of all other string constants
|
||||
|
||||
The comments at the top of each file lists the date when the latest
|
||||
update was made, and these updates can be located in the code by
|
||||
searching for comments with the phrase "/*** Updated" or with the
|
||||
release number (e.g., 2.00.12) in them.
|
||||
|
||||
Other useful documentation that can be consulted includes the EPANET
|
||||
Programmers Toolkit Help file and the EPANET Version 2 Users Manual.
|
||||
@@ -1,58 +0,0 @@
|
||||
LIBRARY EPANET2.DLL
|
||||
|
||||
EXPORTS
|
||||
ENaddpattern = _ENaddpattern@4
|
||||
ENclose = _ENclose@0
|
||||
ENcloseH = _ENcloseH@0
|
||||
ENcloseQ = _ENcloseQ@0
|
||||
ENepanet = _ENepanet@16
|
||||
ENgetcontrol = _ENgetcontrol@24
|
||||
ENgetcount = _ENgetcount@8
|
||||
ENgeterror = _ENgeterror@12
|
||||
ENgetflowunits = _ENgetflowunits@4
|
||||
ENgetlinkid = _ENgetlinkid@8
|
||||
ENgetlinkindex = _ENgetlinkindex@8
|
||||
ENgetlinknodes = _ENgetlinknodes@12
|
||||
ENgetlinktype = _ENgetlinktype@8
|
||||
ENgetlinkvalue = _ENgetlinkvalue@12
|
||||
ENgetnodeid = _ENgetnodeid@8
|
||||
ENgetnodeindex = _ENgetnodeindex@8
|
||||
ENgetnodetype = _ENgetnodetype@8
|
||||
ENgetnodevalue = _ENgetnodevalue@12
|
||||
ENgetoption = _ENgetoption@8
|
||||
ENgetpatternid = _ENgetpatternid@8
|
||||
ENgetpatternindex = _ENgetpatternindex@8
|
||||
ENgetpatternlen = _ENgetpatternlen@8
|
||||
ENgetpatternvalue = _ENgetpatternvalue@12
|
||||
ENgetqualtype = _ENgetqualtype@8
|
||||
ENgettimeparam = _ENgettimeparam@8
|
||||
ENgetversion = _ENgetversion@4
|
||||
ENinitH = _ENinitH@4
|
||||
ENinitQ = _ENinitQ@4
|
||||
ENnextH = _ENnextH@4
|
||||
ENnextQ = _ENnextQ@4
|
||||
ENopen = _ENopen@12
|
||||
ENopenH = _ENopenH@0
|
||||
ENopenQ = _ENopenQ@0
|
||||
ENreport = _ENreport@0
|
||||
ENresetreport = _ENresetreport@0
|
||||
ENrunH = _ENrunH@4
|
||||
ENrunQ = _ENrunQ@4
|
||||
ENsaveH = _ENsaveH@0
|
||||
ENsavehydfile = _ENsavehydfile@4
|
||||
ENsaveinpfile = _ENsaveinpfile@4
|
||||
ENsetcontrol = _ENsetcontrol@24
|
||||
ENsetlinkvalue = _ENsetlinkvalue@12
|
||||
ENsetnodevalue = _ENsetnodevalue@12
|
||||
ENsetoption = _ENsetoption@8
|
||||
ENsetpattern = _ENsetpattern@12
|
||||
ENsetpatternvalue = _ENsetpatternvalue@12
|
||||
ENsetqualtype = _ENsetqualtype@16
|
||||
ENsetreport = _ENsetreport@4
|
||||
ENsetstatusreport = _ENsetstatusreport@4
|
||||
ENsettimeparam = _ENsettimeparam@8
|
||||
ENsolveH = _ENsolveH@0
|
||||
ENsolveQ = _ENsolveQ@0
|
||||
ENstepQ = _ENstepQ@4
|
||||
ENusehydfile = _ENusehydfile@4
|
||||
ENwriteline = _ENwriteline@4
|
||||
229
src/epanet2.h
229
src/epanet2.h
@@ -1,229 +0,0 @@
|
||||
/*
|
||||
** EPANET2.H
|
||||
**
|
||||
** C/C++ header file for EPANET Programmers Toolkit
|
||||
**
|
||||
** Last updated on 2/14/08 (2.00.12)
|
||||
*/
|
||||
|
||||
#ifndef EPANET2_H
|
||||
#define EPANET2_H
|
||||
|
||||
// --- Define the EPANET toolkit constants
|
||||
|
||||
#define EN_ELEVATION 0 /* Node parameters */
|
||||
#define EN_BASEDEMAND 1
|
||||
#define EN_PATTERN 2
|
||||
#define EN_EMITTER 3
|
||||
#define EN_INITQUAL 4
|
||||
#define EN_SOURCEQUAL 5
|
||||
#define EN_SOURCEPAT 6
|
||||
#define EN_SOURCETYPE 7
|
||||
#define EN_TANKLEVEL 8
|
||||
#define EN_DEMAND 9
|
||||
#define EN_HEAD 10
|
||||
#define EN_PRESSURE 11
|
||||
#define EN_QUALITY 12
|
||||
#define EN_SOURCEMASS 13
|
||||
#define EN_INITVOLUME 14
|
||||
#define EN_MIXMODEL 15
|
||||
#define EN_MIXZONEVOL 16
|
||||
|
||||
#define EN_TANKDIAM 17
|
||||
#define EN_MINVOLUME 18
|
||||
#define EN_VOLCURVE 19
|
||||
#define EN_MINLEVEL 20
|
||||
#define EN_MAXLEVEL 21
|
||||
#define EN_MIXFRACTION 22
|
||||
#define EN_TANK_KBULK 23
|
||||
|
||||
#define EN_DIAMETER 0 /* Link parameters */
|
||||
#define EN_LENGTH 1
|
||||
#define EN_ROUGHNESS 2
|
||||
#define EN_MINORLOSS 3
|
||||
#define EN_INITSTATUS 4
|
||||
#define EN_INITSETTING 5
|
||||
#define EN_KBULK 6
|
||||
#define EN_KWALL 7
|
||||
#define EN_FLOW 8
|
||||
#define EN_VELOCITY 9
|
||||
#define EN_HEADLOSS 10
|
||||
#define EN_STATUS 11
|
||||
#define EN_SETTING 12
|
||||
#define EN_ENERGY 13
|
||||
|
||||
#define EN_DURATION 0 /* Time parameters */
|
||||
#define EN_HYDSTEP 1
|
||||
#define EN_QUALSTEP 2
|
||||
#define EN_PATTERNSTEP 3
|
||||
#define EN_PATTERNSTART 4
|
||||
#define EN_REPORTSTEP 5
|
||||
#define EN_REPORTSTART 6
|
||||
#define EN_RULESTEP 7
|
||||
#define EN_STATISTIC 8
|
||||
#define EN_PERIODS 9
|
||||
|
||||
#define EN_NODECOUNT 0 /* Component counts */
|
||||
#define EN_TANKCOUNT 1
|
||||
#define EN_LINKCOUNT 2
|
||||
#define EN_PATCOUNT 3
|
||||
#define EN_CURVECOUNT 4
|
||||
#define EN_CONTROLCOUNT 5
|
||||
|
||||
#define EN_JUNCTION 0 /* Node types */
|
||||
#define EN_RESERVOIR 1
|
||||
#define EN_TANK 2
|
||||
|
||||
#define EN_CVPIPE 0 /* Link types */
|
||||
#define EN_PIPE 1
|
||||
#define EN_PUMP 2
|
||||
#define EN_PRV 3
|
||||
#define EN_PSV 4
|
||||
#define EN_PBV 5
|
||||
#define EN_FCV 6
|
||||
#define EN_TCV 7
|
||||
#define EN_GPV 8
|
||||
|
||||
#define EN_NONE 0 /* Quality analysis types */
|
||||
#define EN_CHEM 1
|
||||
#define EN_AGE 2
|
||||
#define EN_TRACE 3
|
||||
|
||||
#define EN_CONCEN 0 /* Source quality types */
|
||||
#define EN_MASS 1
|
||||
#define EN_SETPOINT 2
|
||||
#define EN_FLOWPACED 3
|
||||
|
||||
#define EN_CFS 0 /* Flow units types */
|
||||
#define EN_GPM 1
|
||||
#define EN_MGD 2
|
||||
#define EN_IMGD 3
|
||||
#define EN_AFD 4
|
||||
#define EN_LPS 5
|
||||
#define EN_LPM 6
|
||||
#define EN_MLD 7
|
||||
#define EN_CMH 8
|
||||
#define EN_CMD 9
|
||||
|
||||
#define EN_TRIALS 0 /* Misc. options */
|
||||
#define EN_ACCURACY 1
|
||||
#define EN_TOLERANCE 2
|
||||
#define EN_EMITEXPON 3
|
||||
#define EN_DEMANDMULT 4
|
||||
|
||||
#define EN_LOWLEVEL 0 /* Control types */
|
||||
#define EN_HILEVEL 1
|
||||
#define EN_TIMER 2
|
||||
#define EN_TIMEOFDAY 3
|
||||
|
||||
#define EN_AVERAGE 1 /* Time statistic types. */
|
||||
#define EN_MINIMUM 2
|
||||
#define EN_MAXIMUM 3
|
||||
#define EN_RANGE 4
|
||||
|
||||
#define EN_MIX1 0 /* Tank mixing models */
|
||||
#define EN_MIX2 1
|
||||
#define EN_FIFO 2
|
||||
#define EN_LIFO 3
|
||||
|
||||
#define EN_NOSAVE 0 /* Save-results-to-file flag */
|
||||
#define EN_SAVE 1
|
||||
#define EN_INITFLOW 10 /* Re-initialize flow flag */
|
||||
|
||||
|
||||
|
||||
// --- define WINDOWS
|
||||
|
||||
#undef WINDOWS
|
||||
#ifdef _WIN32
|
||||
#define WINDOWS
|
||||
#endif
|
||||
#ifdef __WIN32__
|
||||
#define WINDOWS
|
||||
#endif
|
||||
|
||||
// --- define DLLEXPORT
|
||||
|
||||
#ifdef WINDOWS
|
||||
#ifdef __cplusplus
|
||||
#define DLLEXPORT extern "C" __declspec(dllexport) __stdcall
|
||||
#else
|
||||
#define DLLEXPORT __declspec(dllexport) __stdcall
|
||||
#endif
|
||||
#else
|
||||
#ifdef __cplusplus
|
||||
#define DLLEXPORT extern "C"
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
// --- declare the EPANET toolkit functions
|
||||
|
||||
int DLLEXPORT ENepanet(char *, char *, char *, void (*) (char *));
|
||||
int DLLEXPORT ENopen(char *, char *, char *);
|
||||
int DLLEXPORT ENsaveinpfile(char *);
|
||||
int DLLEXPORT ENclose(void);
|
||||
|
||||
int DLLEXPORT ENsolveH(void);
|
||||
int DLLEXPORT ENsaveH(void);
|
||||
int DLLEXPORT ENopenH(void);
|
||||
int DLLEXPORT ENinitH(int);
|
||||
int DLLEXPORT ENrunH(long *);
|
||||
int DLLEXPORT ENnextH(long *);
|
||||
int DLLEXPORT ENcloseH(void);
|
||||
int DLLEXPORT ENsavehydfile(char *);
|
||||
int DLLEXPORT ENusehydfile(char *);
|
||||
|
||||
int DLLEXPORT ENsolveQ(void);
|
||||
int DLLEXPORT ENopenQ(void);
|
||||
int DLLEXPORT ENinitQ(int);
|
||||
int DLLEXPORT ENrunQ(long *);
|
||||
int DLLEXPORT ENnextQ(long *);
|
||||
int DLLEXPORT ENstepQ(long *);
|
||||
int DLLEXPORT ENcloseQ(void);
|
||||
|
||||
int DLLEXPORT ENwriteline(char *);
|
||||
int DLLEXPORT ENreport(void);
|
||||
int DLLEXPORT ENresetreport(void);
|
||||
int DLLEXPORT ENsetreport(char *);
|
||||
|
||||
int DLLEXPORT ENgetcontrol(int, int *, int *, float *,
|
||||
int *, float *);
|
||||
int DLLEXPORT ENgetcount(int, int *);
|
||||
int DLLEXPORT ENgetoption(int, float *);
|
||||
int DLLEXPORT ENgettimeparam(int, long *);
|
||||
int DLLEXPORT ENgetflowunits(int *);
|
||||
int DLLEXPORT ENgetpatternindex(char *, int *);
|
||||
int DLLEXPORT ENgetpatternid(int, char *);
|
||||
int DLLEXPORT ENgetpatternlen(int, int *);
|
||||
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, 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, float *);
|
||||
|
||||
int DLLEXPORT ENgetversion(int *);
|
||||
|
||||
int DLLEXPORT ENsetcontrol(int, int, int, float, int, float);
|
||||
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, float);
|
||||
int DLLEXPORT ENsetstatusreport(int);
|
||||
int DLLEXPORT ENsetqualtype(int, char *, char *, char *);
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user