Commit Graph

83 Commits

Author SHA1 Message Date
Elad Salomons 5eead5ae40 Fix quality conversion factor error in ENsetqualtype
Reported here:

http://community.wateranalytics.org/t/difference-in-water-age-calculated-in-epanet-and-in-matlab-using-epanet-matlab-toolkit/406/12
2017-06-15 16:21:39 +03:00
Elad Salomons a00269e39a Added comment for 3c78856
Added comment for 3c78856
2017-05-01 13:28:59 +03:00
Elad Salomons 3c788567a4 Fix ENsetqualtype to set node initial values
When changing from CHEM to AGE or TRACE, nodes initial quality values
must be returned to their original ones. Reported by R.T., CSIRO AU -
thanks!
2017-05-01 13:25:59 +03:00
Elad Salomons 8ab0f06ccc Added option to retrieve the pumps price pattern
Added to ENgetlinkvalue function like the speed\status pattern. use the
new EN_PRICEPATTERN constant.
2017-04-13 12:14:32 +03:00
Elad Salomons ab4622b276 Updated more float types in function APIs
Updated APIs calls to support EN_API_FLOAT_TYPE and few updates to the
DEF file
2016-10-10 11:45:02 +03:00
Elad Salomons 9942f6761d Updated def file and float types in function APIs
Added the new funcions to the DEF file.
Updated VB headers from Double to Single
Changed a few APIs calls to support EN_API_FLOAT_TYPE - this needs more
work for the rest of the new functions
2016-09-24 12:28:20 +03:00
Elad Salomons 98b86cd014 Merge pull request #84 from AngelaMarchi/ChangingRuleBased
Changing rule based
2016-09-23 14:00:34 +03:00
AngelaMarchi 6f8be1be55 ModifyingRuleBaseControls
These modifications allow rule based controls to be modified with the
additional functions added in the dll toolkit
2016-09-23 13:07:06 +09:30
AngelaMarchi 1d071d19ba VSP efficiency + retrieving efficiency directly (#81)
* VSP efficiency + retrieving efficiency directly

Changes to the getenergy function (in hydraulic.c) to compute the
correct efficiency of variable speed pumps according to the affinity
laws.
Changes to epanet2.h and epanet.c are for retrieving the efficiency of
pumps throught the ENgetlinkvalue function (code 16 for efficiency)

* Update epanet.c

* VSP efficiency (incl. bas and vb file)

- bas and vb file have been updated with code 16 for efficiency.
- Retrieving efficiency case has been improved.
2016-09-09 09:57:16 -07:00
Elad Salomons 773705e3d2 Consistency change in ENgetcurve function call 2016-07-21 17:07:50 +03:00
Sam Hatchett 997c8839e1 Merge pull request #63 from mauriziocingi/patch-1
Update epanet.c
2016-07-20 16:29:52 -04:00
Sam Hatchett 880f57d237 Merge branch 'dev-2.1-doxy-markup' into dev-2.1
updates comment blocks to oxygen-compatible, and adds release notes
(draft)
2016-07-13 13:16:53 -04:00
Maurizio Cingi 31a05e34cc Update epanet.c 2015-12-21 22:21:00 +01:00
Elad Salomons 99a215b88a Change VERSION to ENGINE_VERSION
Also changed it form 200 to 201 as some changes were made to the engine
in 2.1.

Closes #27
2015-12-07 22:18:05 +02:00
Elad Salomons 3c006d724e Add more checks for ENsetnodevalue tank properties
Work in progress for issue #29
2015-12-06 13:01:20 +02:00
Maurizio Cingi 22f6cbb46d issue #44 memory leak
node coordinates deallocation added in freedata()
2015-12-01 11:57:50 +01:00
sam hatchett 23ac6e5a55 clean up old comment block. 2015-11-28 18:59:49 -05:00
sam hatchett 90c2dfa0c4 complete function description. still needs user manual "application" examples 2015-11-28 18:58:49 -05:00
sam hatchett bcc1dcc806 Merge branch 'dev-2.1' into doxy-trial
# Conflicts fixed:
#	include/epanet2.h
#	src/epanet.c
2015-11-28 13:22:45 -05:00
Elad Salomons 096167af8b Change ENgetheadcurve to ENgetheadcurveindex
Closes #31
2015-11-28 00:21:36 +02:00
Sam Hatchett e28f24af3c migrating from defines to enums, and moving some documentation blocks into doxygen format 2015-11-25 19:26:47 -05:00
mauriziocingi ea08fb9da1 undone Warnflag declaration due to cl.exe incompatibilities , now Warnflag is retuned with errorcode 2015-11-20 13:35:40 +01:00
Sam Hatchett e484486915 moving more comments into dox, enum-wrapping and documenting property keys 2015-09-30 15:15:19 -04:00
Sam Hatchett ebbe8e84e7 documenting some functions 2015-09-29 17:21:23 -04:00
Elad Salomons 322a3cb463 Added pump's type constants to header files 2015-09-23 15:31:29 +03:00
Elad Salomons 472d9dd35b Added curves SET functions
ENsetcurvevalue, ENsetcurve and ENaddcurve
This should close issue #9
2015-09-18 14:54:43 +03:00
Elad Salomons 02a42fe16b Added curve GET functions
ENgetcurveindex, ENgetcurveid, ENgetcurvelen and ENgetcurvevalue. This
is for issue #9
2015-09-18 13:03:53 +03:00
Sam Hatchett cb8dc35cae fixes version numbering 2015-09-15 10:46:18 -04:00
Elad Salomons 2c46a002ba Changed coordinates are saved to INP
Added a flag which controls the loading of coordinates at epanet.c line
213.
When set to TRUE coordinates are loaded and users can use the ENgetcoord
and ENsetcoord functions. Changes are then saved when ENsaveinpfile is
called.
When set to FALSE coordinates are not loaded and can't be retrieved or
changed. When saved, the COORD section is copied from the original INP
file.
2015-09-13 12:56:28 +03:00
Elad Salomons c12f901454 added ENsetcoord function
also minor fix to include files
2015-09-13 09:53:21 +03:00
Elad Salomons 4d6bcef623 rewrite the coordinate getter
currently controlled from input2.c lines 297-298. will need to add a
flag to not load the coordinates.
2015-09-12 16:34:52 +03:00
Elad Salomons 6878e046ed Removed old and unused code
A bit of code cleaning
2015-08-07 12:37:05 +03:00
Elad Salomons cdbd08acca Added error code and description for wrong demand category index 2015-06-30 19:39:06 +03:00
Elad Salomons 91aa538adf minor fix to VB header module 2015-06-25 23:46:28 +03:00
Elad Salomons 82553cc422 Add header documentation for new functions 2015-06-15 21:01:50 +03:00
Elad Salomons 40cbb5f95e Check for open file in ENgetcurve and minor fixes 2015-06-13 00:16:30 +03:00
Elad Salomons 82da5db7ec more c89 conformance
variables should be declared at the beginning of functions
2015-06-13 00:01:30 +03:00
Sam Hatchett 23865315aa removing utility code from library source
main function should only be in standalone app. also removing inline
defs for compile-time directives
2015-06-12 11:22:04 -04:00
Sam Hatchett 2563ae62c6 Merge remote-tracking branch 'origin/owa_next'
# Conflicts:
#	build/Linux/Makefile
#	build/Linux/Makefile_Rev
#	src/epanet.c
#	src/output.c
#	src/toolkit.h
2015-06-09 13:34:13 -04:00
Mariosmsk eae77fc651 Added missing ENgettimeparam EN_RULESTEP 2015-05-13 19:08:13 +03:00
jamesuber 71b017e9ff minor fix to getqualinfo for trace sim type 2014-08-28 15:48:51 -04:00
Sam Hatchett caa794447c updated hash methods. just increasing the size of the hash helps a lot with loading larger networks. perhaps hash could be extended to dynamically size based on network size. 2014-01-31 11:16:07 -05:00
Sam Hatchett f3052ac873 Merge pull request #14 from sdteffen/usePUMPINDEX
Simpler, faster code using PUMPINDEX()
2014-01-27 07:31:49 -08:00
Sam Hatchett 3b5feb75b2 Merge pull request #13 from sdteffen/pumpEN_LINKPATTERN
ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns.
2014-01-27 07:31:39 -08:00
Steffen Macke f718c83701 Simpler, faster code using PUMPINDEX() 2014-01-24 18:29:09 +01:00
Steffen Macke 48f9d3989d ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns. 2014-01-24 18:01:54 +01:00
Sam Hatchett 017e24be1c Merge pull request #12 from sdteffen/pumpEN_MINORLOSS
Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
2014-01-06 10:11:37 -08:00
Steffen Macke 1cd06a2bed Fix ENgetlinkvalue() for EN_MINORLOSS and pumps. 2014-01-04 08:26:55 -08:00
Steffen Macke 5caf7feda3 Added ENgetheadcurve(), ENgetpumptype() and related constants. 2014-01-04 08:13:50 -08:00
Sam Hatchett 93036690a0 new API function -- get qual info
… to retrieve chemName and units
2013-10-04 16:38:29 -04:00