JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
332 Commits 1 Branch 0 Tags
612dd380a480229df1ed7df264d68dbf5420b16a
Commit Graph

332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AngelaMarchi
83dd6c7b7c ChangingRuleBased_v2 
The code has the following modifications:
- RULE section is written just after controls
- SYST is now written SYSTEM (also PRESSURE, DEMAND, POWER, SETTING,
FILLTIME and DRAINTIME have been changed)
- some description to the function writeRuleinInp has been added
- Actions are now written in the correct order
 2016-11-08 18:37:54 +10:30
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
Elad Salomons
8b4a03d349 Merge pull request #75 from Mariosmsk/dev 
Added reservoirs in EN_TANKCOUNT header comment
 2016-08-18 15:04:42 +03: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
Sam Hatchett
1f5327a55e adds the rest of the pattern functions to the module documentation (#74) 2016-07-30 09:43:28 -04:00
Demetrios G. Eliades
9da07f827b Added date of V2.1 release (#72) 2016-07-28 20:15:32 -04:00
Sam Hatchett
e34adc1685 update readme for v2.1 tag 2016-07-25 20:18:06 -04:00
Sam Hatchett
b75055838e Merge branch 'dev-2.1' 2016-07-25 20:14:44 -04:00
Sam Hatchett
e2a8e5a614 resolve conflict 2016-07-25 20:14:33 -04:00
Sam Hatchett
a4d27ad489 mac rpath in cmake 2016-07-25 20:12:02 -04:00
Sam Hatchett
ea6b3619f7 note about api float type 2016-07-21 11:39:16 -04:00
Elad Salomons
773705e3d2 Consistency change in ENgetcurve function call 2016-07-21 17:07:50 +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
997c8839e1 Merge pull request #63 from mauriziocingi/patch-1 
Update epanet.c
 2016-07-20 16:29:52 -04:00
Elad Salomons
98e9a31eb3 Merge pull request #69 from eldemet/dev-2.1-windsdk 
Windows compilation using SDK
 2016-07-15 10:46:28 +03:00
eldemet
1d83b69427 deleted redundant bat files 2016-07-15 09:53:26 +03:00
eldemet
c098ca286a Create Makefile.bat 2016-07-15 09:48:43 +03:00
eldemet
b26e3dce49 Exclude windows sdk compiled folders 2016-07-15 09:47:38 +03:00
Sam Hatchett
4e3efb1aba disable local file location 2016-07-14 15:28:11 -04:00
Sam Hatchett
528d972f54 updates and proper tagging for dox 2016-07-14 15:03:14 -04:00
Sam Hatchett
7f958d797d update doxyfile 2016-07-14 14:35:45 -04:00
Sam Hatchett
2c60a703b5 Update README.md 2016-07-13 13:20:56 -04:00
Sam Hatchett
2d39d1fee4 Update README.md 2016-07-13 13:19:18 -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
Sam Hatchett
cdbe7e409a adding release notes, 2.1 2016-07-13 13:14:42 -04:00
Maurizio Cingi
31a05e34cc Update epanet.c 2015-12-21 22:21:00 +01:00
Elad Salomons
1c0690837f Fix for avgqual function 
Due to changes in the order initsegs was called the links average
quality value, for the initial time step, was wrong. This was found in
issue #16
 2015-12-18 13:34:04 +02:00
Sam Hatchett
8d90000f3f Merge pull request #62 from OpenWaterAnalytics/dev-2.1-debug-python-test 
Dev 2.1 debug python test
 2015-12-17 13:52:52 -05:00
sam hatchett
ff6225372a there are two hard problems. 
naming things and counting things
 2015-12-17 13:49:23 -05:00
sam hatchett
8fe3bbef23 fixes diff script 2015-12-17 13:46:32 -05:00
sam hatchett
81fa79745a fixing python printing 2015-12-17 13:36:53 -05:00
sam hatchett
eb629b8392 better debug output 2015-12-17 13:33:33 -05:00
sam hatchett
71fa408f0b removes fake python comparator 2015-12-17 13:29:47 -05:00
sam hatchett
d2625edab4 removes fake files 2015-12-17 13:24:00 -05:00
sam hatchett
1d8d2fb882 combining testing framework with python diff script 2015-12-17 13:22:28 -05:00
Sam Hatchett
cb417ce08b Merge pull request #59 from bemcdonnell/dev-2.1 
Minor updates to ENOutputWrapper.py; Adding OutDiff.py
 2015-12-17 11:48:32 -05:00
Sam Hatchett
70e1eb5818 Merge pull request #58 from OpenWaterAnalytics/dev-2.1-test-network-script 
Dev 2.1 test network script
 2015-12-17 11:48:11 -05:00
Bryant McDonnell
b2309e257a Minor updates to ENOutputWrapper.py; Adding OutDiff.py 2015-12-16 22:09:38 -05:00
Sam Hatchett
523dee5412 adds/fixes attribution 2015-12-16 16:28:40 -05:00
Sam Hatchett
de211562f2 adds cmake build for ENBOF 2015-12-16 16:28:40 -05:00
Sam Hatchett
96cf6ece16 Revert "adds/fixes attribution" 
This reverts commit 2f344d4884.
 2015-12-15 20:41:54 -05:00
Sam Hatchett
6579a83ba3 fake files for test iteration 2015-12-15 20:39:03 -05:00
Sam Hatchett
92ea5a84a7 testing scripts and travis invocation 2015-12-15 20:38:53 -05:00