f97d837231
this quite sizable commit does several things, but is primarily focussed on building a toolkit that can run simultaneous simulations/analyses within a shared memory space. Versions <=2.1 use a long list of global variables that prevent multiple instantiations on linux systems without resorting to compilation tricks (like duplicate binaries or similar via static linkage). This version uses a single "Project" pointer to encapsulate the network and analysis data. There are no changes to existing algo implementations other than to accomodate dereferencing of the passed-in pointers. A more detailed list of major changes below: - mirrors all “ENxxxx” function calls with “EN_xxxx” versions (note the underscore) that take an extra first parameter: a pointer to an EN_Project struct, which contains all network, hydraulic, quality, and associated data. - tweaks some code formatting to make it more readable - removes some deprecated/commented code that was sufficiently old - fixes implicit type-cast warnings * Added ENaddnode and ENaddlink functions * More memory reallocations * Added ENInit, ENsetheadcurveindex * Added ENdeletelink and ENdeletenode * restored default behavior for float types * fixed type * Added docstrings for ENinit * cleanup change * moves global rule variables to vars.h * migrates rule structs to typedefs for better readability * char types to proper enums fixes #93 * Change some variable declarations for compatibility Changes to keep compatibility with C89 compilers: variables must be declared at the top of the functions. Remove the use of EN_LinkType in function call as it is not compatible with ENgetnodetype. * Moved declaration of idstodelete to top of function * Updated ENinit function and headers Updated header files with new functions Updated def file with new functions For ENinit changes names of parameters #98 Added enum for headloss formula * Missed these files in 1a033fc * migrates char types to enums fixes #93, supports unified link/node type enums, rather than public/private redefinitions * removing links in reverse-index order maintains proper indexing fixes #96 * style * clarifies curve getter units issue (dox) closes #95 * fixes link/node confusion in ENsetlinktype partially reverts a3bce95dc330a5a297634a303d438e2e1bc41cc9 * partial compilation fix * fixes dox issue * fixes allocation issues with enums - updates style in various places - introduces FlowDirection enum - use snprintf to prevent overflow * fixes enum type cast * updated mac project settings * Use of _snprintf on Windows and remove DLLEXPORT from mempool.h snprintf it not compatible on Windows so we use _snprintf mempool gave starnge compilation errors while removing DLLEXPORT worked. Not sure why these functions needed to be exposed in the DLL? * Revert "Use of _snprintf on Windows and remove DLLEXPORT from mempool.h" This reverts commit 6238f77d47fa0feaabe5836043c006937de433a2. * use of _snprintf instead of snprintf on Windows and removed DLLEXPORT from mempool.h Had compilation errors on mempool.h. Removed DLLEXPORT so solve it. Not sure why there was a need to expose these functions? * Shift indices for Links in ENaddnode Need to shift indices for Links not just Pipes since a pump could be connected directly to a reservoir. Also set the defult base demand to zero (was 5). * Set defualts for madatory link properties in ENaddlink and small fix for ENsetheadcurveindex Relates to #102 and closes #103 * wraps globals into structs, duplicates api functions with objective versions * parse and serialize Comment field for network elements related to #47 * adds getter for head/efficiency curve in EN_getlinkvalue * adds getter for event node index … to return the index of the junction (tank) that triggered the event. * fixes edge case in parsing … where inp files without demands in [JUNCTIONS] and without any [DEMAND] categories will fail. * adds freeing function for project pointer * removes redundant string literals, fixes overrun issue in error message getter function * check for hydraulics already closed * moving error definitions to data file * deprecates ENR err message getter (unused) * updates location of errors data file also begins to expose blind structs to curves and patterns, anticipating buildout of APIs for those. * updates CLI output to reflect executable name as invoked relates to #109 * Feature nrtest (#131) * Initial commit EPANET testing tools. * Initial commit for epanet-nrtestsuite * SWIG wrapper for EPANET outputapi (#118) * Removed pervious version of outputapi and wrapper * SWIG wrapper for EPANET outputapi * Patching cmake build script fixed target for outputapi * Build failing on deprecated test script * Minor changes. Responding to review comments. * Feature nrtest (#121) * Configured python setup to automatically build nrtest tools. * Working on build / testing automation * Adding EPANET 2.0.12 benchmark * Updated Travis yml to run nrtest * Fixing InsecurePlatformWarning * Fixing InsecurePlatformWarning again * Fixing InsecurePlatformWarning * Fixing InsecurePlatformWarning * Fixing InsecurePlatformWarning * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Working on configuring python environment and building test tools under Travis CI. * Making gen-config.sh and run-nrtest.sh executable * Debugging .travis.yml * Debugging .travis.yml * Debugging .travis.yml again * Debugging .travis.yml again * debugging travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * debugging Travis setup * Fixing bug with __strncpy_chk destlen < len * nrtesting clean up * re-implements fixes from:5eead5ae403c788567a4* removes extraneous build files, moves cmake and updates travis * mirror of 9b37035560f9683f1514b439f7586a5c17bca5bf * Move some variable declarations * More variable declarations * Fix TmpDir * Allocate _defaultModel * Fix EN_addcurve funcrion * Fix for inpfile * Fix writeRuleinInp call * Set MAXMSG to 79 chars * Fix for flow direction * Refactoring testing related python packages and SWIG wrapper bug fix (#139) * Eliminated epanet-reader package. Removed numpy dependency from epanet-output. Fixed reference counting bug in SWIG wrapper. Added error checking to run_nrtest.sh. Added nrtest package to requirements file. * changing buildhome directory * Fixing bug related to preprocessor definition of PI
81 lines
1.1 KiB
Plaintext
81 lines
1.1 KiB
Plaintext
;Measured Fluoride for Net2
|
|
;Node Hour MG/L
|
|
11 2.50 1.02
|
|
11 5.38 0.87
|
|
11 8.30 0.70
|
|
11 11.75 1.01
|
|
11 13.02 0.62
|
|
11 14.48 0.26
|
|
11 17.43 0.17
|
|
11 20.30 0.20
|
|
11 23.35 0.90
|
|
11 27.00 0.13
|
|
11 29.67 0.13
|
|
11 33.70 0.54
|
|
11 35.40 0.90
|
|
11 38.30 0.17
|
|
11 41.62 0.10
|
|
11 44.42 0.12
|
|
11 47.25 0.71
|
|
11 51.00 0.13
|
|
11 53.27 0.58
|
|
19 0.25 1.04
|
|
19 2.75 1.04
|
|
19 5.70 1.08
|
|
19 8.60 1.00
|
|
19 12.00 0.81
|
|
19 13.25 0.95
|
|
19 14.73 1.02
|
|
19 17.77 1.01
|
|
19 20.52 0.87
|
|
19 23.53 0.28
|
|
19 27.17 0.98
|
|
19 29.87 0.85
|
|
19 33.92 0.12
|
|
19 35.67 0.17
|
|
19 38.48 0.64
|
|
19 42.08 0.79
|
|
19 44.68 0.87
|
|
19 47.50 0.16
|
|
19 51.17 0.56
|
|
19 53.45 0.70
|
|
25 0.58 1.04
|
|
3.00 1.00
|
|
5.87 1.03
|
|
8.80 1.00
|
|
12.25 1.02
|
|
13.50 0.88
|
|
14.97 0.36
|
|
18.15 0.91
|
|
20.75 0.92
|
|
23.73 0.94
|
|
27.42 0.19
|
|
30.08 0.12
|
|
34.12 0.83
|
|
35.87 0.82
|
|
38.67 0.72
|
|
42.40 0.76
|
|
44.92 0.78
|
|
47.75 0.87
|
|
51.50 0.42
|
|
53.75 0.48
|
|
34 2.67 1.03
|
|
5.50 1.04
|
|
8.45 0.98
|
|
11.87 1.01
|
|
13.15 1.02
|
|
14.62 1.04
|
|
17.60 1.02
|
|
20.42 1.02
|
|
23.43 1.00
|
|
27.08 1.02
|
|
29.75 0.94
|
|
33.82 0.89
|
|
35.53 0.75
|
|
38.40 0.80
|
|
41.85 0.84
|
|
44.55 0.92
|
|
47.42 0.91
|
|
51.08 0.81
|
|
53.37 0.47
|