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

Implmenting Toolkit API versioning

Browse Source
This commit is contained in:
Michael Tryby
2018-11-29 11:57:51 -05:00
parent 9ff0056b7c
commit be2ca0a9f6
9 changed files with 2191 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -75,18 +75,18 @@ source_group("Library" FILES ${EPANET_LIB_ALL})
# the shared library # the shared library
add_library(epanet SHARED ${EPANET_LIB_ALL}) add_library(epanet2 SHARED ${EPANET_LIB_ALL})
target_include_directories(epanet PUBLIC ${PROJECT_SOURCE_DIR}/include) target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include)
# create export lib so we can link against dll using Visual Studio # create export lib so we can link against dll using Visual Studio
add_definitions(-DWITH_GENX) add_definitions(-DWITH_GENX)
include(GenerateExportHeader) include(GenerateExportHeader)
GENERATE_EXPORT_HEADER(epanet GENERATE_EXPORT_HEADER(epanet2
BASE_NAME epanet BASE_NAME epanet2
EXPORT_MACRO_NAME DLLEXPORT EXPORT_MACRO_NAME DLLEXPORT
EXPORT_FILE_NAME epanet_export.h EXPORT_FILE_NAME epanet2_export.h
STATIC_DEFINE SHARED_EXPORTS_BUILT_AS_STATIC) STATIC_DEFINE SHARED_EXPORTS_BUILT_AS_STATIC)
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/epanet_export.h file(COPY ${CMAKE_CURRENT_BINARY_DIR}/epanet2_export.h
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include) DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include)

1394
include/epanet2.h
View File

File diff suppressed because it is too large Load Diff

1170
include/epanet2_1.h Normal file
View File

File diff suppressed because it is too large Load Diff

305
include/epanet2_enums.h Normal file
View File

@@ -0,0 +1,305 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Module: epanet2_enums.h
Description: enums shared between API versions
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 11/29/2018
******************************************************************************
*/
#ifndef EPANET2_ENUMS_H
#define EPANET2_ENUMS_H
// --- Define the EPANET toolkit constants
#define EN_MAXID 31 //!< Max. # characters in ID name
#define EN_MAXMSG 255 //!< Max. # characters in message text
/// Node property codes
typedef enum {
EN_ELEVATION = 0, //!< Elevation
EN_BASEDEMAND = 1, //!< Junction baseline demand, from last demand category
EN_PATTERN = 2, //!< Junction baseline demand pattern
EN_EMITTER = 3, //!< Junction emitter coefficient
EN_INITQUAL = 4, //!< Initial quality
EN_SOURCEQUAL = 5, //!< Quality source strength
EN_SOURCEPAT = 6, //!< Quality source pattern
EN_SOURCETYPE = 7, //!< Qualiy source type
EN_TANKLEVEL = 8, //!< Tank water level
EN_DEMAND = 9, //!< Current simulated demand
EN_HEAD = 10, //!< Current hydraulic head
EN_PRESSURE = 11, //!< Current pressure
EN_QUALITY = 12, //!< Current quality
EN_SOURCEMASS = 13, //!< Current source mass inflow
EN_INITVOLUME = 14, //!< Tank initial volume
EN_MIXMODEL = 15, //!< Tank mixing model
EN_MIXZONEVOL = 16, //!< Tank mixing zone volume
EN_TANKDIAM = 17, //!< Tank diameter
EN_MINVOLUME = 18, //!< Tank minimum volume
EN_VOLCURVE = 19, //!< Tank volume curve
EN_MINLEVEL = 20, //!< Tank minimum level
EN_MAXLEVEL = 21, //!< Tank maximum level
EN_MIXFRACTION = 22, //!< Tank mixing fraction
EN_TANK_KBULK = 23, //!< Tank bulk decay coefficient
EN_TANKVOLUME = 24, //!< Tank current volume
EN_MAXVOLUME = 25 //!< Tank maximum volume
} EN_NodeProperty;
/// Link property codes
typedef enum {
EN_DIAMETER = 0, //!< Pipe/valve diameter
EN_LENGTH = 1, //!> Pipe length
EN_ROUGHNESS = 2, //!> Pipe roughness coefficient
EN_MINORLOSS = 3, //!> Pipe/valve minor loss coefficient
EN_INITSTATUS = 4, //!> Initial status (e.g., OPEN/CLOSED)
EN_INITSETTING = 5, //!> Initial pump speed or valve setting
EN_KBULK = 6, //!> Bulk chemical reaction coefficient
EN_KWALL = 7, //!> Pipe wall chemical reaction coefficient
EN_FLOW = 8, //!> Current link flow rate
EN_VELOCITY = 9, //!> Current link flow velocity
EN_HEADLOSS = 10, //!> Current head loss across link
EN_STATUS = 11, //!> Current link status
EN_SETTING = 12, //!> Current link setting
EN_ENERGY = 13, //!> Current pump energy usage
EN_LINKQUAL = 14, //!> Current link quality
EN_LINKPATTERN = 15, //!> Pump speed time pattern
EN_EFFICIENCY = 16, //!> Current pump efficiency
EN_HEADCURVE = 17, //!> Pump head v. flow curve
EN_EFFICIENCYCURVE = 18, //!> Pump efficiency v. flow curve
EN_PRICEPATTERN = 19, //!> Pump energy price time pattern
EN_STATE = 20, //!> Current pump status
EN_CONST_POWER = 21, //!> Horsepower of constant horsepower pump
EN_SPEED = 22 //!> Current pump speed setting
} EN_LinkProperty;
/// Time parameter codes
typedef enum {
EN_DURATION = 0, //!> Total simulation duration
EN_HYDSTEP = 1, //!> Hydraulic time step
EN_QUALSTEP = 2, //!> Water quality time step
EN_PATTERNSTEP = 3, //!> Time pattern period
EN_PATTERNSTART = 4, //!> Time when time patterns begin
EN_REPORTSTEP = 5, //!> Reporting time step
EN_REPORTSTART = 6, //!> Time when reporting starts
EN_RULESTEP = 7, //!> Rule evaluation time step
EN_STATISTIC = 8, //!> Reporting statistic code
EN_PERIODS = 9, //!> Number of reporting time periods
EN_STARTTIME = 10, //!> Simulation starting time of day
EN_HTIME = 11, //!> Elapsed time of current hydraulic solution
EN_QTIME = 12, //!> Elapsed time of current quality solution
EN_HALTFLAG = 13, //!> Flag indicating if simulation halted
EN_NEXTEVENT = 14, //!> Next time until a tank becomes empty or full
EN_NEXTEVENTIDX = 15 //!> Index of next tank that becomes empty or full
} EN_TimeProperty;
/// Analysis statistic codes
typedef enum {
EN_ITERATIONS = 0, //!< Number of hydraulic iterations
EN_RELATIVEERROR = 1, //!< Sum of all flow changes / total flow
EN_MAXHEADERROR = 2, //!< Largest head loss error for links
EN_MAXFLOWCHANGE = 3, //!< Largest flow change in links
EN_MASSBALANCE = 4 //!< Water quality mass balance ratio
} EN_AnalysisStatistic;
/// Object count codes
typedef enum {
EN_NODECOUNT = 0, //!< Number of nodes (Juntions + Tanks + Reservoirs)
EN_TANKCOUNT = 1, //!< Number of tanks and Reservoirs
EN_LINKCOUNT = 2, //!< Number of links (Pipes + Pumps + Valves)
EN_PATCOUNT = 3, //!< Number of time patterns
EN_CURVECOUNT = 4, //!< Number of curves
EN_CONTROLCOUNT = 5, //!< Number of simple controls
EN_RULECOUNT = 6 //!< Number of rule-based controls
} EN_CountType;
/// Node type codes
typedef enum {
EN_JUNCTION = 0, //!< Junction node
EN_RESERVOIR = 1, //!< Reservoir node
EN_TANK = 2 //!< Storage tank node
} EN_NodeType;
/// Link type codes
typedef enum {
EN_CVPIPE = 0, //!< Pipe with check valve
EN_PIPE = 1, //!< Pipe
EN_PUMP = 2, //!< Pump
EN_PRV = 3, //!< Pressure reducing valve
EN_PSV = 4, //!< Pressure sustaining valve
EN_PBV = 5, //!< Pressure breaker valve
EN_FCV = 6, //!< Flow control valve
EN_TCV = 7, //!< Throttle control valve
EN_GPV = 8 //!< General purpose valve
} EN_LinkType;
/// Water quality analysis types
typedef enum {
EN_NONE = 0, //!< No quality analysis
EN_CHEM = 1, //!< Chemical fate and transport
EN_AGE = 2, //!< Water age analysis
EN_TRACE = 3 //!< Source tracing analysis
} EN_QualityType;
/// Water quality source types
typedef enum {
EN_CONCEN = 0, //!< Concentration inflow source
EN_MASS = 1, //!< Mass inflow source
EN_SETPOINT = 2, //!< Concentration setpoint source
EN_FLOWPACED = 3 //!< Concentration flow paced source
} EN_SourceType;
/// Head loss formulas
typedef enum {
EN_HW = 0, //!< Hazen-Williams
EN_DW = 1, //!< Darcy-Weisbach
EN_CM = 2 //!< Chezy-Manning
} EN_HeadLossType;
/// Flow units types
typedef enum {
EN_CFS = 0,
EN_GPM = 1,
EN_MGD = 2,
EN_IMGD = 3,
EN_AFD = 4,
EN_LPS = 5,
EN_LPM = 6,
EN_MLD = 7,
EN_CMH = 8,
EN_CMD = 9
} EN_FlowUnits;
/// Demand model types
typedef enum {
EN_DDA = 0, //!< Demand driven analysis
EN_PDA = 1 //!< Pressure driven analysis
} EN_DemandModel;
/// Simulation Option codes
typedef enum {
EN_TRIALS = 0, //!> Maximum hydraulic trials allowed
EN_ACCURACY = 1, //!> Hydraulic convergence accuracy
EN_TOLERANCE = 2, //!> Water quality tolerance
EN_EMITEXPON = 3, //!> Exponent for emitter head loss formula
EN_DEMANDMULT = 4, //!> Global demand multiplier
EN_HEADERROR = 5, //!> Maximum allowable head loss error
EN_FLOWCHANGE = 6, //!> Maximum allowable flow change
EN_DEMANDDEFPAT = 7, //!> Default demand time pattern
EN_HEADLOSSFORM = 8 //!> Head loss formula code
} EN_Option;
/// Simple control types
typedef enum {
EN_LOWLEVEL = 0,
EN_HILEVEL = 1,
EN_TIMER = 2,
EN_TIMEOFDAY = 3
} EN_ControlType;
/// Reporting statistic types
typedef enum {
EN_AVERAGE = 1, //!> Report average value over simulation period
EN_MINIMUM = 2, //!> Report minimum value over simulation period
EN_MAXIMUM = 3, //!> Report maximum value over simulation period
EN_RANGE = 4 //!> Report maximum - minimum over simulation period
} EN_StatisticType;
/// Tank mixing models
typedef enum {
EN_MIX1 = 0, //!< Complete mix model
EN_MIX2 = 1, //!< 2-compartment model
EN_FIFO = 2, //!< First in, first out model
EN_LIFO = 3 //!< Last in, first out model
} EN_MixingModel;
/// Hydraulic initialization options
typedef enum {
EN_NOSAVE = 0, //!> Don't save hydraulics; don't re-initialize flows
EN_SAVE = 1, //!> Save hydraulics to file, don't re-initialize flows
EN_INITFLOW = 10, //!> Don't save hydraulics; re-initialize flows
EN_SAVE_AND_INIT = 11 //!> Save hydraulics; re-initialize flows
} EN_SaveOption;
/// Pump curve types
typedef enum {
EN_CONST_HP = 0, //!< Constant horsepower
EN_POWER_FUNC = 1, //!< Power function
EN_CUSTOM = 2, //!< User-defined custom curve
EN_NOCURVE = 3 //!< No curve
} EN_PumpType;
/// Data curve types
typedef enum {
EN_V_CURVE = 0, //!< Tank volume curve
EN_P_CURVE = 1, //!< Pump characteristic curve
EN_E_CURVE = 2, //!< Pump efficiency curve
EN_H_CURVE = 3, //!< Valve head loss curve
EN_G_CURVE = 4 //!< General\default curve
} EN_CurveType;
/// Deletion action types
typedef enum {
EN_UNCONDITIONAL = 0, //!> Delete all controls that contain object
EN_CONDITIONAL = 1 //!> Cancel object deletion if contained in controls
} EN_ActionCodeType;
/// Rule object codes
typedef enum {
EN_R_NODE = 6,
EN_R_LINK = 7,
EN_R_SYSTEM = 8
} EN_RuleObject;
/// Rule variable codes
typedef enum {
EN_R_DEMAND = 0,
EN_R_HEAD = 1,
EN_R_GRADE = 2,
EN_R_LEVEL = 3,
EN_R_PRESSURE = 4,
EN_R_FLOW = 5,
EN_R_STATUS = 6,
EN_R_SETTING = 7,
EN_R_POWER = 8,
EN_R_TIME = 9,
EN_R_CLOCKTIME = 10,
EN_R_FILLTIME = 11,
EN_R_DRAINTIME = 12
} EN_RuleVariable;
/// Rule operator types
typedef enum {
EN_R_EQ = 0,
EN_R_NE = 1,
EN_R_LE = 2,
EN_R_GE = 3,
EN_R_LT = 4,
EN_R_GT = 5,
EN_R_IS = 6,
EN_R_NOT = 7,
EN_R_BELOW = 8,
EN_R_ABOVE = 9
} EN_RuleOperator;
/// Rule status types
typedef enum {
EN_R_IS_OPEN = 1,
EN_R_IS_CLOSED = 2,
EN_R_IS_ACTIVE = 3
} EN_RuleStatus;
/// Status report types
typedef enum {
EN_NO_REPORT = 0,
EN_NORMAL_REPORT = 1,
EN_FULL_REPORT = 2
} EN_StatusReport;
#endif //EPANET2_ENUMS_H

8
run/CMakeLists.txt
View File

@@ -2,12 +2,12 @@
cmake_minimum_required (VERSION 3.0.2) cmake_minimum_required (VERSION 3.0.2)
# Sets for output directory for executables and libraries. # Sets for output directory for executables and libraries.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
# Sets the position independent code property for all targets. # Sets the position independent code property for all targets.
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -22,7 +22,7 @@ add_definitions(-DWITH_GENX)
# Creates the EPANET command line executable # Creates the EPANET command line executable
add_executable(runepanet ${EPANET_CLI_SOURCES}) add_executable(runepanet ${EPANET_CLI_SOURCES})
if(NOT WIN32) if(NOT WIN32)
target_link_libraries(runepanet LINK_PUBLIC epanet m) target_link_libraries(runepanet LINK_PUBLIC epanet2 m)
else(NOT WIN32) else(NOT WIN32)
target_link_libraries(runepanet LINK_PUBLIC epanet) target_link_libraries(runepanet LINK_PUBLIC epanet2)
endif(NOT WIN32) endif(NOT WIN32)

22
run/main.c
View File

@@ -1,9 +1,25 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Module: main.c
Description: implementation of the CLI for EPANET
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 11/27/2018
******************************************************************************
*/
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "epanet2.h"
#include "epanet2_1.h"
#define MAXMSG 255 /* Max. # characters in message text */ #define MAXMSG 255 /* Max. # characters in message text */
#define MAXWARNCODE 99 #define MAXWARNCODE 99
/* text copied here, no more need of include "text.h" */ /* text copied here, no more need of include "text.h" */
#define FMT01 "\nEPANET Version %d.%d.%d\n" #define FMT01 "\nEPANET Version %d.%d.%d\n"
#define FMT03 "\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n" #define FMT03 "\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n"
@@ -54,7 +70,7 @@ int main(int argc, char *argv[])
minor= (version%10000)/100; minor= (version%10000)/100;
patch= version%100; patch= version%100;
printf(FMT01, major, minor, patch); printf(FMT01, major, minor, patch);
/* Check for proper number of command line arguments */ /* Check for proper number of command line arguments */
if (argc < 2) { if (argc < 2) {
printf(FMT03, argv[0]); printf(FMT03, argv[0]);

671
src/epanet.c
View File

@@ -17,7 +17,7 @@
#ifndef __APPLE__ #ifndef __APPLE__
#include <malloc.h> #include <malloc.h>
#endif #endif
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include "epanet2.h" #include "epanet2.h"
@@ -26,638 +26,7 @@
#include "text.h" #include "text.h"
#include "enumstxt.h" #include "enumstxt.h"
// This single global variable is used only when the library is called
// in "legacy mode" with the 2.1-style API.
Project __defaultProject;
Project *_defaultProject = &__defaultProject;
// Functions for creating and removing default temporary files
void createtmpfiles()
{
getTmpName(_defaultProject->TmpHydFname);
getTmpName(_defaultProject->TmpOutFname);
getTmpName(_defaultProject->TmpStatFname);
}
void removetmpfiles()
{
remove(_defaultProject->TmpHydFname);
remove(_defaultProject->TmpOutFname);
remove(_defaultProject->TmpStatFname);
}
/********************************************************************
System Functions
********************************************************************/
int DLLEXPORT ENepanet(const char *f1, const char *f2, const char *f3,
void (*pviewprog)(char *))
{
/*------------------------------------------------------------------------
** Input: f1 = name of EPANET formatted input file
** f2 = name of report file
** f3 = name of binary output file
** pviewprog = see note below
** Output: none
** Returns: error code
** Purpose: runs a complete EPANET simulation
**
** The pviewprog() argument is a pointer to a callback function
** that takes a character string (char *) as its only parameter.
** The function would reside in and be used by the calling
** program to display the progress messages that EPANET generates
** as it carries out its computations. If this feature is not
** needed then the argument should be NULL.
**-------------------------------------------------------------------------
*/
int errcode = 0;
int warncode = 0;
// Run the project and record any warning
createtmpfiles();
errcode = EN_runproject(_defaultProject, f1, f2, f3, pviewprog);
if (errcode < 100) warncode = errcode;
removetmpfiles();
// Return the warning code if the run had no errors
if (warncode) errcode = MAX(errcode, warncode);
return errcode;
}
int DLLEXPORT ENinit(const char *f2, const char *f3, int UnitsType,
int HeadlossFormula)
{
int errcode = 0;
createtmpfiles();
errcode = EN_init(_defaultProject, f2, f3, UnitsType, HeadlossFormula);
return errcode;
}
int DLLEXPORT ENopen(const char *f1, const char *f2, const char *f3)
{
int errcode = 0;
createtmpfiles();
errcode = EN_open(_defaultProject, f1, f2, f3);
return errcode;
}
int DLLEXPORT ENsaveinpfile(const char *filename)
{
return EN_saveinpfile(_defaultProject, filename);
}
int DLLEXPORT ENclose()
{
EN_close(_defaultProject);
removetmpfiles();
return 0;
}
/********************************************************************
Hydraulic Analysis Functions
********************************************************************/
int DLLEXPORT ENsolveH() { return EN_solveH(_defaultProject); }
int DLLEXPORT ENsaveH() { return EN_saveH(_defaultProject); }
int DLLEXPORT ENopenH() { return EN_openH(_defaultProject); }
int DLLEXPORT ENinitH(int flag) { return EN_initH(_defaultProject, flag); }
int DLLEXPORT ENrunH(long *t) { return EN_runH(_defaultProject, t); }
int DLLEXPORT ENnextH(long *tstep) { return EN_nextH(_defaultProject, tstep); }
int DLLEXPORT ENcloseH() { return EN_closeH(_defaultProject); }
int DLLEXPORT ENsavehydfile(char *filename)
{
return EN_savehydfile(_defaultProject, filename);
}
int DLLEXPORT ENusehydfile(char *filename)
{
return EN_usehydfile(_defaultProject, filename);
}
/********************************************************************
Water Quality Analysis Functions
********************************************************************/
int DLLEXPORT ENsolveQ() { return EN_solveQ(_defaultProject); }
int DLLEXPORT ENopenQ() { return EN_openQ(_defaultProject); }
int DLLEXPORT ENinitQ(int saveflag) { return EN_initQ(_defaultProject, saveflag); }
int DLLEXPORT ENrunQ(long *t) { return EN_runQ(_defaultProject, t); }
int DLLEXPORT ENnextQ(long *tstep) { return EN_nextQ(_defaultProject, tstep); }
int DLLEXPORT ENstepQ(long *tleft) { return EN_stepQ(_defaultProject, tleft); }
int DLLEXPORT ENcloseQ() { return EN_closeQ(_defaultProject); }
/********************************************************************
Reporting Functions
********************************************************************/
int DLLEXPORT ENwriteline(char *line) { return EN_writeline(_defaultProject, line); }
int DLLEXPORT ENreport() { return EN_report(_defaultProject); }
int DLLEXPORT ENresetreport() { return EN_resetreport(_defaultProject); }
int DLLEXPORT ENsetreport(char *s) { return EN_setreport(_defaultProject, s); }
int DLLEXPORT ENsetstatusreport(int code)
{
return EN_setstatusreport(_defaultProject, code);
}
int DLLEXPORT ENgetversion(int *v) { return EN_getversion(v); }
int DLLEXPORT ENgetcount(int code, int *count)
{
return EN_getcount(_defaultProject, (EN_CountType)code, count);
}
int DLLEXPORT ENgeterror(int errcode, char *errmsg, int n)
{
return EN_geterror(errcode, errmsg, n);
}
int DLLEXPORT ENgetstatistic(int code, EN_API_FLOAT_TYPE *value)
{
return EN_getstatistic(_defaultProject, code, value);
}
/********************************************************************
Analysis Options Functions
********************************************************************/
int DLLEXPORT ENgetoption(int code, EN_API_FLOAT_TYPE *value)
{
return EN_getoption(_defaultProject, (EN_Option)code, value);
}
int DLLEXPORT ENsetoption(int code, EN_API_FLOAT_TYPE v)
{
return EN_setoption(_defaultProject, code, v);
}
int DLLEXPORT ENgetflowunits(int *code) { return EN_getflowunits(_defaultProject, code); }
int DLLEXPORT ENsetflowunits(int code) { return EN_setflowunits(_defaultProject, code); }
int DLLEXPORT ENgettimeparam(int code, long *value)
{
return EN_gettimeparam(_defaultProject, code, value);
}
int DLLEXPORT ENsettimeparam(int code, long value)
{
return EN_settimeparam(_defaultProject, code, value);
}
int DLLEXPORT ENgetqualinfo(int *qualcode, char *chemname, char *chemunits,
int *tracenode)
{
return EN_getqualinfo(_defaultProject, qualcode, chemname, chemunits, tracenode);
}
int DLLEXPORT ENgetqualtype(int *qualcode, int *tracenode)
{
return EN_getqualtype(_defaultProject, qualcode, tracenode);
}
int DLLEXPORT ENsetqualtype(int qualcode, char *chemname, char *chemunits,
char *tracenode)
{
return EN_setqualtype(_defaultProject, qualcode, chemname, chemunits, tracenode);
}
/********************************************************************
Node Functions
********************************************************************/
int DLLEXPORT ENaddnode(char *id, EN_NodeType nodeType)
{
return EN_addnode(_defaultProject, id, nodeType);
}
int DLLEXPORT ENdeletenode(int index, int actionCode)
{
return EN_deletenode(_defaultProject, index, actionCode);
}
int DLLEXPORT ENgetnodeindex(char *id, int *index)
{
return EN_getnodeindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetnodeid(int index, char *id)
{
return EN_getnodeid(_defaultProject, index, id);
}
int DLLEXPORT ENsetnodeid(int index, char *newid)
{
return EN_setnodeid(_defaultProject, index, newid);
}
int DLLEXPORT ENgetnodetype(int index, int *code)
{
return EN_getnodetype(_defaultProject, index, code);
}
int DLLEXPORT ENgetnodevalue(int index, int code, EN_API_FLOAT_TYPE *value)
{
return EN_getnodevalue(_defaultProject, index, code, value);
}
int DLLEXPORT ENsetnodevalue(int index, int code, EN_API_FLOAT_TYPE v)
{
return EN_setnodevalue(_defaultProject, index, code, v);
}
int DLLEXPORT ENgetcoord(int index, EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y)
{
return EN_getcoord(_defaultProject, index, x, y);
}
int DLLEXPORT ENsetcoord(int index, EN_API_FLOAT_TYPE x, EN_API_FLOAT_TYPE y)
{
return EN_setcoord(_defaultProject, index, x, y);
}
/********************************************************************
Nodal Demand Functions
********************************************************************/
int DLLEXPORT ENgetdemandmodel(int *type, EN_API_FLOAT_TYPE *pmin,
EN_API_FLOAT_TYPE *preq, EN_API_FLOAT_TYPE *pexp)
{
return EN_getdemandmodel(_defaultProject, type, pmin, preq, pexp);
}
int DLLEXPORT ENsetdemandmodel(int type, EN_API_FLOAT_TYPE pmin,
EN_API_FLOAT_TYPE preq, EN_API_FLOAT_TYPE pexp)
{
return EN_setdemandmodel(_defaultProject, type, pmin, preq, pexp);
}
int DLLEXPORT ENgetnumdemands(int nodeIndex, int *numDemands)
{
return EN_getnumdemands(_defaultProject, nodeIndex, numDemands);
}
int DLLEXPORT ENgetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE *baseDemand)
{
return EN_getbasedemand(_defaultProject, nodeIndex, demandIdx, baseDemand);
}
int DLLEXPORT ENsetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE baseDemand)
{
return EN_setbasedemand(_defaultProject, nodeIndex, demandIdx, baseDemand);
}
int DLLEXPORT ENsetdemandpattern(int nodeIndex, int demandIdx, int patIndex)
{
return EN_setdemandpattern(_defaultProject, nodeIndex, demandIdx, patIndex);
}
int DLLEXPORT ENgetdemandpattern(int nodeIndex, int demandIdx, int *pattIdx)
{
return EN_getdemandpattern(_defaultProject, nodeIndex, demandIdx, pattIdx);
}
int DLLEXPORT ENgetdemandname(int nodeIndex, int demandIdx, char *demandName)
{
return EN_getdemandname(_defaultProject, nodeIndex, demandIdx, demandName);
}
int DLLEXPORT ENsetdemandname(int nodeIndex, int demandIdx, char *demandName)
{
return EN_setdemandname(_defaultProject, nodeIndex, demandIdx, demandName);
}
/********************************************************************
Link Functions
********************************************************************/
int DLLEXPORT ENaddlink(char *id, EN_LinkType linkType, char *fromNode, char *toNode)
{
return EN_addlink(_defaultProject, id, linkType, fromNode, toNode);
}
int DLLEXPORT ENdeletelink(int index, int actionCode)
{
return EN_deletelink(_defaultProject, index, actionCode);
}
int DLLEXPORT ENgetlinkindex(char *id, int *index)
{
return EN_getlinkindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetlinkid(int index, char *id)
{
return EN_getlinkid(_defaultProject, index, id);
}
int DLLEXPORT ENsetlinkid(int index, char *newid)
{
return EN_setlinkid(_defaultProject, index, newid);
}
int DLLEXPORT ENgetlinktype(int index, EN_LinkType *code)
{
return EN_getlinktype(_defaultProject, index, code);
}
int DLLEXPORT ENsetlinktype(int *index, EN_LinkType type, int actionCode)
{
return EN_setlinktype(_defaultProject, index, type, actionCode);
}
int DLLEXPORT ENgetlinknodes(int index, int *node1, int *node2)
{
return EN_getlinknodes(_defaultProject, index, node1, node2);
}
int DLLEXPORT ENsetlinknodes(int index, int node1, int node2)
{
return EN_setlinknodes(_defaultProject, index, node1, node2);
}
int DLLEXPORT ENgetlinkvalue(int index, int code, EN_API_FLOAT_TYPE *value)
{
return EN_getlinkvalue(_defaultProject, index, (EN_LinkProperty)code, value);
}
int DLLEXPORT ENsetlinkvalue(int index, int code, EN_API_FLOAT_TYPE v)
{
return EN_setlinkvalue(_defaultProject, index, code, v);
}
/********************************************************************
Pump Functions
********************************************************************/
int DLLEXPORT ENgetpumptype(int index, int *type)
{
return EN_getpumptype(_defaultProject, index, type);
}
int DLLEXPORT ENgetheadcurveindex(int index, int *curveindex)
{
return EN_getheadcurveindex(_defaultProject, index, curveindex);
}
int DLLEXPORT ENsetheadcurveindex(int index, int curveindex)
{
return EN_setheadcurveindex(_defaultProject, index, curveindex);
}
/********************************************************************
Time Pattern Functions
********************************************************************/
int DLLEXPORT ENaddpattern(char *id)
{
return EN_addpattern(_defaultProject, id);
}
int DLLEXPORT ENgetpatternindex(char *id, int *index)
{
return EN_getpatternindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetpatternid(int index, char *id)
{
return EN_getpatternid(_defaultProject, index, id);
}
int DLLEXPORT ENgetpatternlen(int index, int *len)
{
return EN_getpatternlen(_defaultProject, index, len);
}
int DLLEXPORT ENgetpatternvalue(int index, int period, EN_API_FLOAT_TYPE *value)
{
return EN_getpatternvalue(_defaultProject, index, period, value);
}
int DLLEXPORT ENsetpatternvalue(int index, int period, EN_API_FLOAT_TYPE value)
{
return EN_setpatternvalue(_defaultProject, index, period, value);
}
int DLLEXPORT ENgetaveragepatternvalue(int index, EN_API_FLOAT_TYPE *value)
{
return EN_getaveragepatternvalue(_defaultProject, index, value);
}
int DLLEXPORT ENsetpattern(int index, EN_API_FLOAT_TYPE *f, int n)
{
return EN_setpattern(_defaultProject, index, f, n);
}
/********************************************************************
Data Curve Functions
********************************************************************/
int DLLEXPORT ENaddcurve(char *id)
{
return EN_addcurve(_defaultProject, id);
}
int DLLEXPORT ENgetcurveindex(char *id, int *index)
{
return EN_getcurveindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetcurveid(int index, char *id)
{
return EN_getcurveid(_defaultProject, index, id);
}
int DLLEXPORT ENgetcurvelen(int index, int *len)
{
return EN_getcurvelen(_defaultProject, index, len);
}
int DLLEXPORT ENgetcurvetype(int curveindex, int *type)
{
return EN_getcurvetype(_defaultProject, curveindex, type);
}
int DLLEXPORT ENgetcurvevalue(int index, int pnt, EN_API_FLOAT_TYPE *x,
EN_API_FLOAT_TYPE *y)
{
return EN_getcurvevalue(_defaultProject, index, pnt, x, y);
}
int DLLEXPORT ENsetcurvevalue(int index, int pnt, EN_API_FLOAT_TYPE x,
EN_API_FLOAT_TYPE y)
{
return EN_setcurvevalue(_defaultProject, index, pnt, x, y);
}
int DLLEXPORT ENgetcurve(int curveIndex, char *id, int *nValues,
EN_API_FLOAT_TYPE **xValues, EN_API_FLOAT_TYPE **yValues)
{
return EN_getcurve(_defaultProject, curveIndex, id, nValues, xValues, yValues);
}
int DLLEXPORT ENsetcurve(int index, EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y, int n)
{
return EN_setcurve(_defaultProject, index, x, y, n);
}
/********************************************************************
Simple Controls Functions
********************************************************************/
int DLLEXPORT ENaddcontrol(int *cindex, int ctype, int lindex, EN_API_FLOAT_TYPE setting,
int nindex, EN_API_FLOAT_TYPE level)
{
return EN_addcontrol(_defaultProject, cindex, ctype, lindex, setting, nindex, level);
}
int DLLEXPORT ENdeletecontrol(int cindex)
{
return EN_deletecontrol(_defaultProject, cindex);
}
int DLLEXPORT ENgetcontrol(int cindex, int *ctype, int *lindex, EN_API_FLOAT_TYPE *setting,
int *nindex, EN_API_FLOAT_TYPE *level)
{
return EN_getcontrol(_defaultProject, cindex, ctype, lindex, setting, nindex, level);
}
int DLLEXPORT ENsetcontrol(int cindex, int ctype, int lindex, EN_API_FLOAT_TYPE setting,
int nindex, EN_API_FLOAT_TYPE level)
{
return EN_setcontrol(_defaultProject, cindex, ctype, lindex, setting, nindex, level);
}
/********************************************************************
Rule-Based Controls Functions
********************************************************************/
int DLLEXPORT ENaddrule(char *rule)
{
return EN_addrule(_defaultProject, rule);
}
int DLLEXPORT ENdeleterule(int index)
{
return EN_deleterule(_defaultProject, index);
}
int DLLEXPORT ENgetrule(int index, int *nPremises, int *nThenActions, int *nElseActions,
EN_API_FLOAT_TYPE *priority)
{
return EN_getrule(_defaultProject, index, nPremises, nThenActions, nElseActions, priority);
}
int DLLEXPORT ENgetruleID(int index, char* id)
{
return EN_getruleID(_defaultProject, index, id);
}
int DLLEXPORT ENgetpremise(int ruleIndex, int premiseIndex, int *logop,
int *object, int *objIndex, int *variable,
int *relop, int *status, EN_API_FLOAT_TYPE *value)
{
return EN_getpremise(_defaultProject, ruleIndex, premiseIndex, logop, object,
objIndex, variable, relop, status, value);
}
int DLLEXPORT ENsetpremise(int ruleIndex, int premiseIndex, int logop,
int object, int objIndex, int variable, int relop,
int status, EN_API_FLOAT_TYPE value)
{
return EN_setpremise(_defaultProject, ruleIndex, premiseIndex, logop, object,
objIndex, variable, relop, status, value);
}
int DLLEXPORT ENsetpremiseindex(int ruleIndex, int premiseIndex, int objIndex)
{
return EN_setpremiseindex(_defaultProject, ruleIndex, premiseIndex, objIndex);
}
int DLLEXPORT ENsetpremisestatus(int ruleIndex, int premiseIndex, int status)
{
return EN_setpremisestatus(_defaultProject, ruleIndex, premiseIndex, status);
}
int DLLEXPORT ENsetpremisevalue(int ruleIndex, int premiseIndex, EN_API_FLOAT_TYPE value)
{
return EN_setpremisevalue(_defaultProject, ruleIndex, premiseIndex, value);
}
int DLLEXPORT ENgetthenaction(int ruleIndex, int actionIndex, int *linkIndex,
int *status, EN_API_FLOAT_TYPE *setting)
{
return EN_getthenaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENsetthenaction(int ruleIndex, int actionIndex, int linkIndex,
int status, EN_API_FLOAT_TYPE setting)
{
return EN_setthenaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENgetelseaction(int ruleIndex, int actionIndex, int *linkIndex,
int *status, EN_API_FLOAT_TYPE *setting)
{
return EN_getelseaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENsetelseaction(int ruleIndex, int actionIndex, int linkIndex,
int status, EN_API_FLOAT_TYPE setting)
{
return EN_setelseaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENsetrulepriority(int index, EN_API_FLOAT_TYPE priority)
{
return EN_setrulepriority(_defaultProject, index, priority);
}
/******************************************************************** /********************************************************************
@@ -702,7 +71,7 @@ int DLLEXPORT EN_deleteproject(EN_Project *p)
return 0; return 0;
} }
int DLLEXPORT EN_runproject(EN_Project p, const char *f1, const char *f2, int DLLEXPORT EN_runproject(EN_Project p, const char *f1, const char *f2,
const char *f3, void (*pviewprog)(char *)) const char *f3, void (*pviewprog)(char *))
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
** Input: f1 = name of EPANET formatted input file ** Input: f1 = name of EPANET formatted input file
@@ -774,7 +143,7 @@ int DLLEXPORT EN_init(EN_Project p, const char *f2, const char *f3,
// Open files // Open files
errcode = openfiles(p, "", f2, f3); errcode = openfiles(p, "", f2, f3);
// Initialize memory used for project's data objects // Initialize memory used for project's data objects
initpointers(p); initpointers(p);
ERRCODE(netsize(p)); ERRCODE(netsize(p));
@@ -887,7 +256,7 @@ int DLLEXPORT EN_close(EN_Project p)
// Free all project data // Free all project data
if (p->Openflag) writetime(p, FMT105); if (p->Openflag) writetime(p, FMT105);
freedata(p); freedata(p);
// Close output file // Close output file
out = &p->outfile; out = &p->outfile;
if (out->TmpOutFile != out->OutFile) if (out->TmpOutFile != out->OutFile)
@@ -965,7 +334,7 @@ int DLLEXPORT EN_solveH(EN_Project p)
sprintf(p->Msg, FMT101, p->report.Atime); sprintf(p->Msg, FMT101, p->report.Atime);
writewin(p->viewprog, p->Msg); writewin(p->viewprog, p->Msg);
// Solve for hydraulics & advance to next time period // Solve for hydraulics & advance to next time period
tstep = 0; tstep = 0;
ERRCODE(EN_runH(p, &t)); ERRCODE(EN_runH(p, &t));
ERRCODE(EN_nextH(p, &tstep)); ERRCODE(EN_nextH(p, &tstep));
@@ -1146,11 +515,11 @@ int DLLEXPORT EN_savehydfile(EN_Project p, char *filename)
FILE *f; FILE *f;
FILE *HydFile; FILE *HydFile;
int c; int c;
// Check that hydraulics results exist // Check that hydraulics results exist
if (p->outfile.HydFile == NULL || !p->outfile.SaveHflag) return 104; if (p->outfile.HydFile == NULL || !p->outfile.SaveHflag) return 104;
// Open the permanent hydraulics file // Open the permanent hydraulics file
if ((f = fopen(filename, "w+b")) == NULL) return 305; if ((f = fopen(filename, "w+b")) == NULL) return 305;
// Copy from the scratch file to f // Copy from the scratch file to f
@@ -1880,7 +1249,7 @@ int DLLEXPORT EN_gettimeparam(EN_Project p, int code, long *value)
Times *time = &p->times; Times *time = &p->times;
int i; int i;
*value = 0; *value = 0;
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (code < EN_DURATION || code > EN_NEXTEVENTIDX) return 251; if (code < EN_DURATION || code > EN_NEXTEVENTIDX) return 251;
@@ -3089,7 +2458,7 @@ int DLLEXPORT EN_getdemandname(EN_Project p, int nodeIndex, int demandIdx, char
strcpy(demandName, ""); strcpy(demandName, "");
// Check for valid arguments // Check for valid arguments
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs) return 203; if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs) return 203;
@@ -4276,7 +3645,7 @@ int DLLEXPORT EN_setpattern(EN_Project p, int index, EN_API_FLOAT_TYPE *f, int n
int j; int j;
Spattern *Pattern = net->Pattern; Spattern *Pattern = net->Pattern;
// Check for valid arguments // Check for valid arguments
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (index <= 0 || index > net->Npats) return 205; if (index <= 0 || index > net->Npats) return 205;
@@ -4312,14 +3681,14 @@ int DLLEXPORT EN_addcurve(EN_Project p, char *id)
int i, n, err = 0; int i, n, err = 0;
Scurve *curve; Scurve *curve;
// Check if a curve with same id already exists // Check if a curve with same id already exists
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (EN_getcurveindex(p, id, &i) == 0) return 215; if (EN_getcurveindex(p, id, &i) == 0) return 215;
// Check that id name is not too long // Check that id name is not too long
if (strlen(id) > MAXID) return 250; if (strlen(id) > MAXID) return 250;
// Expand the array of curves // Expand the array of curves
n = net->Ncurves + 1; n = net->Ncurves + 1;
net->Curve = (Scurve *) realloc(net->Curve, (n + 1) * sizeof(Scurve)); net->Curve = (Scurve *) realloc(net->Curve, (n + 1) * sizeof(Scurve));
@@ -4338,7 +3707,7 @@ int DLLEXPORT EN_addcurve(EN_Project p, char *id)
curve->Y[0] = 1.0; curve->Y[0] = 1.0;
} }
// Abort if memory allocation error // Abort if memory allocation error
if (err) if (err)
{ {
free(curve->X); free(curve->X);
@@ -4888,12 +4257,12 @@ int DLLEXPORT EN_addrule(EN_Project p, char *rule)
// Find where current line ends and next one begins // Find where current line ends and next one begins
nextline = strchr(line, '\n'); nextline = strchr(line, '\n');
if (nextline) *nextline = '\0'; if (nextline) *nextline = '\0';
// Copy and tokenize the current line // Copy and tokenize the current line
strcpy(line2, line); strcpy(line2, line);
strcat(line2, "\n"); // Tokenizer won't work without this strcat(line2, "\n"); // Tokenizer won't work without this
parser->Ntokens = gettokens(line2, parser->Tok, MAXTOKS, parser->Comment); parser->Ntokens = gettokens(line2, parser->Tok, MAXTOKS, parser->Comment);
// Process the line to build up the rule's contents // Process the line to build up the rule's contents
if (parser->Ntokens > 0 && *parser->Tok[0] != ';') if (parser->Ntokens > 0 && *parser->Tok[0] != ';')
{ {
@@ -4950,7 +4319,7 @@ int DLLEXPORT EN_getrule(EN_Project p, int index, int *nPremises,
if (index < 1 || index > net->Nrules) return 257; if (index < 1 || index > net->Nrules) return 257;
*priority = (EN_API_FLOAT_TYPE)p->network.Rule[index].priority; *priority = (EN_API_FLOAT_TYPE)p->network.Rule[index].priority;
count = 1; count = 1;
premise = net->Rule[index].Premises; premise = net->Rule[index].Premises;
while (premise->next != NULL) while (premise->next != NULL)
@@ -4959,7 +4328,7 @@ int DLLEXPORT EN_getrule(EN_Project p, int index, int *nPremises,
premise = premise->next; premise = premise->next;
} }
*nPremises = count; *nPremises = count;
count = 1; count = 1;
action = net->Rule[index].ThenActions; action = net->Rule[index].ThenActions;
while (action->next != NULL) while (action->next != NULL)
@@ -5020,7 +4389,7 @@ int DLLEXPORT EN_getpremise(EN_Project p, int ruleIndex, int premiseIndex,
{ {
Spremise *premises; Spremise *premises;
Spremise *premise; Spremise *premise;
if (ruleIndex < 1 || ruleIndex > p->network.Nrules) return 257; if (ruleIndex < 1 || ruleIndex > p->network.Nrules) return 257;
premises = p->network.Rule[ruleIndex].Premises; premises = p->network.Rule[ruleIndex].Premises;
@@ -5059,7 +4428,7 @@ int DLLEXPORT EN_setpremise(EN_Project p, int ruleIndex, int premiseIndex,
{ {
Spremise *premises; Spremise *premises;
Spremise *premise; Spremise *premise;
if (ruleIndex < 1 || ruleIndex > p->network.Nrules) return 257; if (ruleIndex < 1 || ruleIndex > p->network.Nrules) return 257;
premises = p->network.Rule[ruleIndex].Premises; premises = p->network.Rule[ruleIndex].Premises;
@@ -5173,7 +4542,7 @@ int DLLEXPORT EN_getthenaction(EN_Project p, int ruleIndex, int actionIndex,
actions = p->network.Rule[ruleIndex].ThenActions; actions = p->network.Rule[ruleIndex].ThenActions;
action = getaction(actions, actionIndex); action = getaction(actions, actionIndex);
if (action == NULL) return 258; if (action == NULL) return 258;
*linkIndex = action->link; *linkIndex = action->link;
*status = action->status; *status = action->status;
*setting = (EN_API_FLOAT_TYPE)action->setting; *setting = (EN_API_FLOAT_TYPE)action->setting;

654
src/epanet2_1.c Normal file
View File

@@ -0,0 +1,654 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Module: epanet.c
Description: implementation of the EPANET 2.1 API functions
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 11/29/2018
******************************************************************************
*/
#include "types.h"
#include "funcs.h"
#include "epanet2_1.h"
#include "epanet2.h"
// This single global variable is used only when the library is called
// in "legacy mode" with the 2.1-style API.
Project __defaultProject;
Project *_defaultProject = &__defaultProject;
// Functions for creating and removing default temporary files
void createtmpfiles()
{
getTmpName(_defaultProject->TmpHydFname);
getTmpName(_defaultProject->TmpOutFname);
getTmpName(_defaultProject->TmpStatFname);
}
void removetmpfiles()
{
remove(_defaultProject->TmpHydFname);
remove(_defaultProject->TmpOutFname);
remove(_defaultProject->TmpStatFname);
}
/********************************************************************
System Functions
********************************************************************/
int DLLEXPORT ENepanet(const char *f1, const char *f2, const char *f3,
void (*pviewprog)(char *))
{
/*------------------------------------------------------------------------
** Input: f1 = name of EPANET formatted input file
** f2 = name of report file
** f3 = name of binary output file
** pviewprog = see note below
** Output: none
** Returns: error code
** Purpose: runs a complete EPANET simulation
**
** The pviewprog() argument is a pointer to a callback function
** that takes a character string (char *) as its only parameter.
** The function would reside in and be used by the calling
** program to display the progress messages that EPANET generates
** as it carries out its computations. If this feature is not
** needed then the argument should be NULL.
**-------------------------------------------------------------------------
*/
int errcode = 0;
int warncode = 0;
// Run the project and record any warning
createtmpfiles();
errcode = EN_runproject(_defaultProject, f1, f2, f3, pviewprog);
if (errcode < 100) warncode = errcode;
removetmpfiles();
// Return the warning code if the run had no errors
if (warncode) errcode = MAX(errcode, warncode);
return errcode;
}
int DLLEXPORT ENinit(const char *f2, const char *f3, int UnitsType,
int HeadlossFormula)
{
int errcode = 0;
createtmpfiles();
errcode = EN_init(_defaultProject, f2, f3, UnitsType, HeadlossFormula);
return errcode;
}
int DLLEXPORT ENopen(const char *f1, const char *f2, const char *f3)
{
int errcode = 0;
createtmpfiles();
errcode = EN_open(_defaultProject, f1, f2, f3);
return errcode;
}
int DLLEXPORT ENsaveinpfile(const char *filename)
{
return EN_saveinpfile(_defaultProject, filename);
}
int DLLEXPORT ENclose()
{
EN_close(_defaultProject);
removetmpfiles();
return 0;
}
/********************************************************************
Hydraulic Analysis Functions
********************************************************************/
int DLLEXPORT ENsolveH() { return EN_solveH(_defaultProject); }
int DLLEXPORT ENsaveH() { return EN_saveH(_defaultProject); }
int DLLEXPORT ENopenH() { return EN_openH(_defaultProject); }
int DLLEXPORT ENinitH(int flag) { return EN_initH(_defaultProject, flag); }
int DLLEXPORT ENrunH(long *t) { return EN_runH(_defaultProject, t); }
int DLLEXPORT ENnextH(long *tstep) { return EN_nextH(_defaultProject, tstep); }
int DLLEXPORT ENcloseH() { return EN_closeH(_defaultProject); }
int DLLEXPORT ENsavehydfile(char *filename)
{
return EN_savehydfile(_defaultProject, filename);
}
int DLLEXPORT ENusehydfile(char *filename)
{
return EN_usehydfile(_defaultProject, filename);
}
/********************************************************************
Water Quality Analysis Functions
********************************************************************/
int DLLEXPORT ENsolveQ() { return EN_solveQ(_defaultProject); }
int DLLEXPORT ENopenQ() { return EN_openQ(_defaultProject); }
int DLLEXPORT ENinitQ(int saveflag) { return EN_initQ(_defaultProject, saveflag); }
int DLLEXPORT ENrunQ(long *t) { return EN_runQ(_defaultProject, t); }
int DLLEXPORT ENnextQ(long *tstep) { return EN_nextQ(_defaultProject, tstep); }
int DLLEXPORT ENstepQ(long *tleft) { return EN_stepQ(_defaultProject, tleft); }
int DLLEXPORT ENcloseQ() { return EN_closeQ(_defaultProject); }
/********************************************************************
Reporting Functions
********************************************************************/
int DLLEXPORT ENwriteline(char *line) { return EN_writeline(_defaultProject, line); }
int DLLEXPORT ENreport() { return EN_report(_defaultProject); }
int DLLEXPORT ENresetreport() { return EN_resetreport(_defaultProject); }
int DLLEXPORT ENsetreport(char *s) { return EN_setreport(_defaultProject, s); }
int DLLEXPORT ENsetstatusreport(int code)
{
return EN_setstatusreport(_defaultProject, code);
}
int DLLEXPORT ENgetversion(int *v) { return EN_getversion(v); }
int DLLEXPORT ENgetcount(int code, int *count)
{
return EN_getcount(_defaultProject, (EN_CountType)code, count);
}
int DLLEXPORT ENgeterror(int errcode, char *errmsg, int n)
{
return EN_geterror(errcode, errmsg, n);
}
int DLLEXPORT ENgetstatistic(int code, EN_API_FLOAT_TYPE *value)
{
return EN_getstatistic(_defaultProject, code, value);
}
/********************************************************************
Analysis Options Functions
********************************************************************/
int DLLEXPORT ENgetoption(int code, EN_API_FLOAT_TYPE *value)
{
return EN_getoption(_defaultProject, (EN_Option)code, value);
}
int DLLEXPORT ENsetoption(int code, EN_API_FLOAT_TYPE v)
{
return EN_setoption(_defaultProject, code, v);
}
int DLLEXPORT ENgetflowunits(int *code) { return EN_getflowunits(_defaultProject, code); }
int DLLEXPORT ENsetflowunits(int code) { return EN_setflowunits(_defaultProject, code); }
int DLLEXPORT ENgettimeparam(int code, long *value)
{
return EN_gettimeparam(_defaultProject, code, value);
}
int DLLEXPORT ENsettimeparam(int code, long value)
{
return EN_settimeparam(_defaultProject, code, value);
}
int DLLEXPORT ENgetqualinfo(int *qualcode, char *chemname, char *chemunits,
int *tracenode)
{
return EN_getqualinfo(_defaultProject, qualcode, chemname, chemunits, tracenode);
}
int DLLEXPORT ENgetqualtype(int *qualcode, int *tracenode)
{
return EN_getqualtype(_defaultProject, qualcode, tracenode);
}
int DLLEXPORT ENsetqualtype(int qualcode, char *chemname, char *chemunits,
char *tracenode)
{
return EN_setqualtype(_defaultProject, qualcode, chemname, chemunits, tracenode);
}
/********************************************************************
Node Functions
********************************************************************/
int DLLEXPORT ENaddnode(char *id, EN_NodeType nodeType)
{
return EN_addnode(_defaultProject, id, nodeType);
}
int DLLEXPORT ENdeletenode(int index, int actionCode)
{
return EN_deletenode(_defaultProject, index, actionCode);
}
int DLLEXPORT ENgetnodeindex(char *id, int *index)
{
return EN_getnodeindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetnodeid(int index, char *id)
{
return EN_getnodeid(_defaultProject, index, id);
}
int DLLEXPORT ENsetnodeid(int index, char *newid)
{
return EN_setnodeid(_defaultProject, index, newid);
}
int DLLEXPORT ENgetnodetype(int index, int *code)
{
return EN_getnodetype(_defaultProject, index, code);
}
int DLLEXPORT ENgetnodevalue(int index, int code, EN_API_FLOAT_TYPE *value)
{
return EN_getnodevalue(_defaultProject, index, code, value);
}
int DLLEXPORT ENsetnodevalue(int index, int code, EN_API_FLOAT_TYPE v)
{
return EN_setnodevalue(_defaultProject, index, code, v);
}
int DLLEXPORT ENgetcoord(int index, EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y)
{
return EN_getcoord(_defaultProject, index, x, y);
}
int DLLEXPORT ENsetcoord(int index, EN_API_FLOAT_TYPE x, EN_API_FLOAT_TYPE y)
{
return EN_setcoord(_defaultProject, index, x, y);
}
/********************************************************************
Nodal Demand Functions
********************************************************************/
int DLLEXPORT ENgetdemandmodel(int *type, EN_API_FLOAT_TYPE *pmin,
EN_API_FLOAT_TYPE *preq, EN_API_FLOAT_TYPE *pexp)
{
return EN_getdemandmodel(_defaultProject, type, pmin, preq, pexp);
}
int DLLEXPORT ENsetdemandmodel(int type, EN_API_FLOAT_TYPE pmin,
EN_API_FLOAT_TYPE preq, EN_API_FLOAT_TYPE pexp)
{
return EN_setdemandmodel(_defaultProject, type, pmin, preq, pexp);
}
int DLLEXPORT ENgetnumdemands(int nodeIndex, int *numDemands)
{
return EN_getnumdemands(_defaultProject, nodeIndex, numDemands);
}
int DLLEXPORT ENgetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE *baseDemand)
{
return EN_getbasedemand(_defaultProject, nodeIndex, demandIdx, baseDemand);
}
int DLLEXPORT ENsetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE baseDemand)
{
return EN_setbasedemand(_defaultProject, nodeIndex, demandIdx, baseDemand);
}
int DLLEXPORT ENsetdemandpattern(int nodeIndex, int demandIdx, int patIndex)
{
return EN_setdemandpattern(_defaultProject, nodeIndex, demandIdx, patIndex);
}
int DLLEXPORT ENgetdemandpattern(int nodeIndex, int demandIdx, int *pattIdx)
{
return EN_getdemandpattern(_defaultProject, nodeIndex, demandIdx, pattIdx);
}
int DLLEXPORT ENgetdemandname(int nodeIndex, int demandIdx, char *demandName)
{
return EN_getdemandname(_defaultProject, nodeIndex, demandIdx, demandName);
}
int DLLEXPORT ENsetdemandname(int nodeIndex, int demandIdx, char *demandName)
{
return EN_setdemandname(_defaultProject, nodeIndex, demandIdx, demandName);
}
/********************************************************************
Link Functions
********************************************************************/
int DLLEXPORT ENaddlink(char *id, EN_LinkType linkType, char *fromNode, char *toNode)
{
return EN_addlink(_defaultProject, id, linkType, fromNode, toNode);
}
int DLLEXPORT ENdeletelink(int index, int actionCode)
{
return EN_deletelink(_defaultProject, index, actionCode);
}
int DLLEXPORT ENgetlinkindex(char *id, int *index)
{
return EN_getlinkindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetlinkid(int index, char *id)
{
return EN_getlinkid(_defaultProject, index, id);
}
int DLLEXPORT ENsetlinkid(int index, char *newid)
{
return EN_setlinkid(_defaultProject, index, newid);
}
int DLLEXPORT ENgetlinktype(int index, EN_LinkType *code)
{
return EN_getlinktype(_defaultProject, index, code);
}
int DLLEXPORT ENsetlinktype(int *index, EN_LinkType type, int actionCode)
{
return EN_setlinktype(_defaultProject, index, type, actionCode);
}
int DLLEXPORT ENgetlinknodes(int index, int *node1, int *node2)
{
return EN_getlinknodes(_defaultProject, index, node1, node2);
}
int DLLEXPORT ENsetlinknodes(int index, int node1, int node2)
{
return EN_setlinknodes(_defaultProject, index, node1, node2);
}
int DLLEXPORT ENgetlinkvalue(int index, int code, EN_API_FLOAT_TYPE *value)
{
return EN_getlinkvalue(_defaultProject, index, (EN_LinkProperty)code, value);
}
int DLLEXPORT ENsetlinkvalue(int index, int code, EN_API_FLOAT_TYPE v)
{
return EN_setlinkvalue(_defaultProject, index, code, v);
}
/********************************************************************
Pump Functions
********************************************************************/
int DLLEXPORT ENgetpumptype(int index, int *type)
{
return EN_getpumptype(_defaultProject, index, type);
}
int DLLEXPORT ENgetheadcurveindex(int index, int *curveindex)
{
return EN_getheadcurveindex(_defaultProject, index, curveindex);
}
int DLLEXPORT ENsetheadcurveindex(int index, int curveindex)
{
return EN_setheadcurveindex(_defaultProject, index, curveindex);
}
/********************************************************************
Time Pattern Functions
********************************************************************/
int DLLEXPORT ENaddpattern(char *id)
{
return EN_addpattern(_defaultProject, id);
}
int DLLEXPORT ENgetpatternindex(char *id, int *index)
{
return EN_getpatternindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetpatternid(int index, char *id)
{
return EN_getpatternid(_defaultProject, index, id);
}
int DLLEXPORT ENgetpatternlen(int index, int *len)
{
return EN_getpatternlen(_defaultProject, index, len);
}
int DLLEXPORT ENgetpatternvalue(int index, int period, EN_API_FLOAT_TYPE *value)
{
return EN_getpatternvalue(_defaultProject, index, period, value);
}
int DLLEXPORT ENsetpatternvalue(int index, int period, EN_API_FLOAT_TYPE value)
{
return EN_setpatternvalue(_defaultProject, index, period, value);
}
int DLLEXPORT ENgetaveragepatternvalue(int index, EN_API_FLOAT_TYPE *value)
{
return EN_getaveragepatternvalue(_defaultProject, index, value);
}
int DLLEXPORT ENsetpattern(int index, EN_API_FLOAT_TYPE *f, int n)
{
return EN_setpattern(_defaultProject, index, f, n);
}
/********************************************************************
Data Curve Functions
********************************************************************/
int DLLEXPORT ENaddcurve(char *id)
{
return EN_addcurve(_defaultProject, id);
}
int DLLEXPORT ENgetcurveindex(char *id, int *index)
{
return EN_getcurveindex(_defaultProject, id, index);
}
int DLLEXPORT ENgetcurveid(int index, char *id)
{
return EN_getcurveid(_defaultProject, index, id);
}
int DLLEXPORT ENgetcurvelen(int index, int *len)
{
return EN_getcurvelen(_defaultProject, index, len);
}
int DLLEXPORT ENgetcurvetype(int curveindex, int *type)
{
return EN_getcurvetype(_defaultProject, curveindex, type);
}
int DLLEXPORT ENgetcurvevalue(int index, int pnt, EN_API_FLOAT_TYPE *x,
EN_API_FLOAT_TYPE *y)
{
return EN_getcurvevalue(_defaultProject, index, pnt, x, y);
}
int DLLEXPORT ENsetcurvevalue(int index, int pnt, EN_API_FLOAT_TYPE x,
EN_API_FLOAT_TYPE y)
{
return EN_setcurvevalue(_defaultProject, index, pnt, x, y);
}
int DLLEXPORT ENgetcurve(int curveIndex, char *id, int *nValues,
EN_API_FLOAT_TYPE **xValues, EN_API_FLOAT_TYPE **yValues)
{
return EN_getcurve(_defaultProject, curveIndex, id, nValues, xValues, yValues);
}
int DLLEXPORT ENsetcurve(int index, EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y, int n)
{
return EN_setcurve(_defaultProject, index, x, y, n);
}
/********************************************************************
Simple Controls Functions
********************************************************************/
int DLLEXPORT ENaddcontrol(int *cindex, int ctype, int lindex, EN_API_FLOAT_TYPE setting,
int nindex, EN_API_FLOAT_TYPE level)
{
return EN_addcontrol(_defaultProject, cindex, ctype, lindex, setting, nindex, level);
}
int DLLEXPORT ENdeletecontrol(int cindex)
{
return EN_deletecontrol(_defaultProject, cindex);
}
int DLLEXPORT ENgetcontrol(int cindex, int *ctype, int *lindex, EN_API_FLOAT_TYPE *setting,
int *nindex, EN_API_FLOAT_TYPE *level)
{
return EN_getcontrol(_defaultProject, cindex, ctype, lindex, setting, nindex, level);
}
int DLLEXPORT ENsetcontrol(int cindex, int ctype, int lindex, EN_API_FLOAT_TYPE setting,
int nindex, EN_API_FLOAT_TYPE level)
{
return EN_setcontrol(_defaultProject, cindex, ctype, lindex, setting, nindex, level);
}
/********************************************************************
Rule-Based Controls Functions
********************************************************************/
int DLLEXPORT ENaddrule(char *rule)
{
return EN_addrule(_defaultProject, rule);
}
int DLLEXPORT ENdeleterule(int index)
{
return EN_deleterule(_defaultProject, index);
}
int DLLEXPORT ENgetrule(int index, int *nPremises, int *nThenActions, int *nElseActions,
EN_API_FLOAT_TYPE *priority)
{
return EN_getrule(_defaultProject, index, nPremises, nThenActions, nElseActions, priority);
}
int DLLEXPORT ENgetruleID(int index, char* id)
{
return EN_getruleID(_defaultProject, index, id);
}
int DLLEXPORT ENgetpremise(int ruleIndex, int premiseIndex, int *logop,
int *object, int *objIndex, int *variable,
int *relop, int *status, EN_API_FLOAT_TYPE *value)
{
return EN_getpremise(_defaultProject, ruleIndex, premiseIndex, logop, object,
objIndex, variable, relop, status, value);
}
int DLLEXPORT ENsetpremise(int ruleIndex, int premiseIndex, int logop,
int object, int objIndex, int variable, int relop,
int status, EN_API_FLOAT_TYPE value)
{
return EN_setpremise(_defaultProject, ruleIndex, premiseIndex, logop, object,
objIndex, variable, relop, status, value);
}
int DLLEXPORT ENsetpremiseindex(int ruleIndex, int premiseIndex, int objIndex)
{
return EN_setpremiseindex(_defaultProject, ruleIndex, premiseIndex, objIndex);
}
int DLLEXPORT ENsetpremisestatus(int ruleIndex, int premiseIndex, int status)
{
return EN_setpremisestatus(_defaultProject, ruleIndex, premiseIndex, status);
}
int DLLEXPORT ENsetpremisevalue(int ruleIndex, int premiseIndex, EN_API_FLOAT_TYPE value)
{
return EN_setpremisevalue(_defaultProject, ruleIndex, premiseIndex, value);
}
int DLLEXPORT ENgetthenaction(int ruleIndex, int actionIndex, int *linkIndex,
int *status, EN_API_FLOAT_TYPE *setting)
{
return EN_getthenaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENsetthenaction(int ruleIndex, int actionIndex, int linkIndex,
int status, EN_API_FLOAT_TYPE setting)
{
return EN_setthenaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENgetelseaction(int ruleIndex, int actionIndex, int *linkIndex,
int *status, EN_API_FLOAT_TYPE *setting)
{
return EN_getelseaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENsetelseaction(int ruleIndex, int actionIndex, int linkIndex,
int status, EN_API_FLOAT_TYPE setting)
{
return EN_setelseaction(_defaultProject, ruleIndex, actionIndex, linkIndex,
status, setting);
}
int DLLEXPORT ENsetrulepriority(int index, EN_API_FLOAT_TYPE priority)
{
return EN_setrulepriority(_defaultProject, index, priority);
}

10
tests/CMakeLists.txt
View File

@@ -7,13 +7,13 @@
# #
# Modified by: Michael E. Tryby # Modified by: Michael E. Tryby
# US EPA ORD/NRMRL # US EPA ORD/NRMRL
# #
#Setup CMake to run tests #Setup CMake to run tests
enable_testing() enable_testing()
# Sets for output directory for executables and libraries. # Sets for output directory for executables and libraries.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(UNIX) if(UNIX)
@@ -26,7 +26,7 @@ if(MSVC)
set(Boost_DETAILED_FAILURE_MSG OFF) set(Boost_DETAILED_FAILURE_MSG OFF)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
endif(MSVC) endif(MSVC)
set(Boost_THREAD_FOUND OFF) set(Boost_THREAD_FOUND OFF)
find_package(Boost COMPONENTS thread) find_package(Boost COMPONENTS thread)
include_directories (${Boost_INCLUDE_DIRS}) include_directories (${Boost_INCLUDE_DIRS})
@@ -44,11 +44,11 @@ foreach(testSrc ${TEST_SRCS})
add_executable(${testName} ${testSrc}) add_executable(${testName} ${testSrc})
#link to Boost libraries AND your targets and dependencies #link to Boost libraries AND your targets and dependencies
target_link_libraries(${testName} ${Boost_LIBRARIES} epanet epanet-output) target_link_libraries(${testName} ${Boost_LIBRARIES} epanet2 epanet-output)
#Finally add it to test execution #Finally add it to test execution
#Notice the WORKING_DIRECTORY and COMMAND #Notice the WORKING_DIRECTORY and COMMAND
add_test(NAME ${testName} add_test(NAME ${testName}
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
endforeach(testSrc) endforeach(testSrc)