JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
287 Commits 1 Branch 0 Tags
8ab0f06ccc4c28631738b43fd5dbe91ad71c1c28
Commit Graph

63 Commits

Author SHA1 Message Date
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
4e349cd3c1 ModifyingRuleBaseControls 
These modifications allow rule based controls to be modified with the
additional functions added in the dll toolkit
 2016-09-23 13:14:15 +09:30
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
Marios Kyriakou
7dfa6111be Added reservoirs in EN_TANKCOUNT header comment 
EN_TANKCOUNT is for both tanks and reservoirs.
 2016-08-08 12:26:14 +03:00
Elad Salomons
754d24c118 Small fix to VB header file 
and consistency in ENgetcurve function call
 2016-07-21 17:04:29 +03:00
Elad Salomons
e42d59e754 Revert "Small VB header fix" 
This reverts commit c81d2c6954.
 2016-07-21 17:01:38 +03:00
Elad Salomons
c81d2c6954 Small VB header fix 
and consistency in ENgetcurve function call
 2016-07-21 17:00:33 +03: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
Elad Salomons
32fa8feda7 Fix ENgetheadcurveindex VB header 2015-12-12 21:23:07 +02:00
sam hatchett
90c2dfa0c4 complete function description. still needs user manual "application" examples 2015-11-28 18:58:49 -05:00
sam hatchett
5d2a1f82b5 finish moving defines to enums for better documentation 2015-11-28 13:28:32 -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
mauriziocingi
cca1cda37a added Warnflag in exported symbols 2015-11-04 13:55:01 +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
942a3f2860 Fix typo on vb.net header file 2015-09-29 23:23:14 +03:00
Sam Hatchett
09cc193e73 grouping functions into modules and demonstrating fenced code documentation 2015-09-28 09:44:58 -04:00
Elad Salomons
8be1fcffd6 Fix header file 2015-09-24 12:55:29 +03:00
Sam Hatchett
f6d3d08030 trying doxygen markup and config 2015-09-23 16:17:27 -04:00
Elad Salomons
322a3cb463 Added pump's type constants to header files 2015-09-23 15:31:29 +03:00
Elad Salomons
bdcf3d77d5 Fix header typo 2015-09-20 21:57:09 +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
b62f179e96 more build file targets related to float-precision builds, and comments about the use of that define 2015-09-15 11:42:07 -04:00
Sam Hatchett
7336d7a69d resolve git conflict 2015-09-15 10:46:06 -04:00
Sam Hatchett
79d215732c Merge branch 'coordinates-getter' into dev-2.1 
Conflicts resolved in :
	build/Linux/Makefile
	build/Linux/Makefile_Rev
	build/Xcode/epanet.xcodeproj/project.pbxproj
	include/epanet2.h
 2015-09-15 10:29:27 -04:00
Elad Salomons
c12f901454 added ENsetcoord function 
also minor fix to include files
 2015-09-13 09:53:21 +03:00
Will Furnass
0f65c830a3 #define DLL_EXPORT as the empty string by default 2015-07-31 18:49:16 +01:00
Will Furnass
9088eec6ee Add (missing) EN_LINKQUAL #define to epanet2.h 2015-07-31 18:21:04 +01:00
Elad Salomons
a3c7eaae15 Minor addition to vb header files 2015-07-31 14:41:18 +03:00
Elad Salomons
ef2763d155 Fix to VB.Net include file 
By Lew Rossman
 2015-07-22 20:13:19 +03:00
Elad Salomons
fecac0a03f module file for VB.Net 
prepared by Lew Rossman
 2015-07-21 21:07:58 +03:00
Elad Salomons
91aa538adf minor fix to VB header module 2015-06-25 23:46:28 +03:00
Elad Salomons
336c87cc91 fix for include file 2015-06-13 00:52:38 +03:00
Elad Salomons
2c81796f71 One click compilation for Win DLL & EXE 2015-06-13 00:32:26 +03:00
Elad Salomons
dd286afe12 update include files 2015-06-12 23:44:29 +03:00
Sam Hatchett
263e9eb303 fix compilation defs 2015-06-12 10:35:57 -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
Elad Salomons
4a5a58a9a7 support for VB6 and VBA 2015-05-27 16:45:26 -04:00
Sam Hatchett
93036690a0 new API function -- get qual info 
… to retrieve chemName and units
 2013-10-04 16:38:29 -04:00
Sam Hatchett
10a5ae4cf6 updated some variable names to make the code a bit more self-documenting 2013-09-30 16:28:12 -04:00
Sam Hatchett
d1d03bf446 header file declarations illuminated for better IDE code completion 2013-09-30 15:09:36 -04:00
sam hatchett
5b151dd09b added getter for curve id 2013-08-28 18:44:01 -04:00