JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
632 Commits 1 Branch 0 Tags
25a4d93ef514745b2b7d3b54861ead8497764693
Commit Graph

632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marios Kyriakou
70f51d9567 add ENsetdemandpattern 2018-08-28 00:19:56 +03:00
Sam Hatchett
b6c9808905 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into issue-173 2018-08-27 16:31:31 -04:00
Sam Hatchett
8f69f2f975 re-index nodes in controls/rules 
fixes #172 but opens another issue.
 2018-08-27 16:28:27 -04:00
Elad Salomons
da8522b553 Merge pull request #236 from Mariosmsk/issue235 
add hydstatus.c in win_build file to fix #235
 2018-08-27 23:18:29 +03:00
Marios Kyriakou
05d52c8022 add hydstatus.c in win_build file 2018-08-27 23:04:13 +03:00
Sam Hatchett
6316f6757d re-adds header/dat files to IDE cmake output 2018-08-27 16:02:00 -04:00
Michael Tryby
8f6c56e0cd Merge pull request #230 from michaeltryby/copy-dev-swig 
SWIG wrapper development
 2018-08-27 13:46:57 -04:00
Michael Tryby
d5aeae893c Updating toolkit function to use errormanager 2018-08-27 12:16:55 -04:00
Michael Tryby
1602e5bf66 Resolving merge conflicts 2018-08-27 09:46:55 -04:00
Michael Tryby
f03e954dc8 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into copy-dev-swig 2018-08-27 09:40:20 -04:00
Michael Tryby
bdc05058ca Resolving merge conflicts 2018-08-27 09:38:46 -04:00
Elad Salomons
13011ae71c Merge pull request #229 from Mariosmsk/dev-issue228 
Syntax for the epanet executable, thanks @Mariosmsk
 2018-08-27 09:32:49 +03:00
Elad Salomons
6ab76efc5a Merge pull request #226 from Mariosmsk/dev-epanet 
fix addnode, thanks @Mariosmsk
 2018-08-27 09:21:47 +03:00
Marios Kyriakou
f4a57a969e delete comment strings 2018-08-25 13:15:33 +03:00
Michael Tryby
c4b7c90634 Merge pull request #210 from LRossman/contributor-lr 
Pressure Dependent Demands added to address issue 163
 2018-08-24 17:30:38 -04:00
Michael Tryby
93061191c5 Trigging CI build 2018-08-24 17:24:11 -04:00
Michael Tryby
22d0e036c4 Trigging CI build 2018-08-24 17:09:31 -04:00
Michael Tryby
f847a3ed6e Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-08-24 16:14:54 -04:00
Michael Tryby
66bb150f99 Forgot to add new tests 2018-08-24 16:12:47 -04:00
Michael Tryby
f495d2c707 Merge branch 'dev' into contributor-lr 2018-08-24 16:09:21 -04:00
Michael Tryby
364e4987d8 Bumping rolling benchmark version 2018-08-24 16:03:53 -04:00
Elad Salomons
a2fdd86a4d Updating windows build script 2018-08-23 23:20:16 +03:00
Marios Kyriakou
6d99867af6 update 
comment FMT01, FMT03, FMT09, FMT10, FMT11 in text.h
 2018-08-23 16:59:02 +03:00
Marios Kyriakou
0e6cc51d81 Revert "remove dublicate definition" 
This reverts commit 8808a01641.
 2018-08-23 16:47:52 +03:00
Marios Kyriakou
4025d197b2 Revert "replace <text.h> to "text.h"" 
This reverts commit 842b7e64d1.
 2018-08-23 16:47:31 +03:00
Marios Kyriakou
842b7e64d1 replace <text.h> to "text.h" 2018-08-23 16:26:13 +03:00
Michael Tryby
40cd25748c Fixing bug EN_getcurvetype 2018-08-23 08:00:30 -04:00
Marios Kyriakou
8808a01641 remove dublicate definition 
Add include text.h
 2018-08-23 14:58:26 +03:00
Michael Tryby
670440b55c Fixing function definition for EN_getcurve 2018-08-23 07:56:11 -04:00
Marios Kyriakou
219e46a467 Revert "remove dublicate definition" 
This reverts commit 1f4c3a0819.
 2018-08-23 14:54:48 +03:00
Marios Kyriakou
1f4c3a0819 remove dublicate definition 
Add include text.h
 2018-08-23 14:53:20 +03:00
Michael Tryby
e8acc1b177 Fixing build 2018-08-23 07:48:01 -04:00
Michael Tryby
888e447ad9 Adding GEN_X to cmake invocation 2018-08-22 16:14:21 -04:00
Michael Tryby
0938f82c32 Adding adding GEN_X macro for cmake export header 2018-08-22 15:46:24 -04:00
Marios Kyriakou
29aa45febb Syntax for the epanet executable 2018-08-22 22:32:30 +03:00
Michael Tryby
c6fe1230d0 Fixing merge conflict 2018-08-22 15:20:53 -04:00
Michael Tryby
75e400cf44 Merging changes from upstream dev 2018-08-22 15:09:33 -04:00
Michael Tryby
fafad2a070 Revert "Reorganizing epanet header" 
This reverts commit c8803a9f1b.
 2018-08-22 15:05:48 -04:00
Michael Tryby
f66d4c68d9 Revert "Reorganizing / refactoring api functions for swig wrap" 
This reverts commit 437a7c70e0.
 2018-08-22 14:48:20 -04:00
Michael Tryby
bd4c369f83 Revert "Reorganizing / refactoring api functions for swig wrap" 
This reverts commit 8ff88f86b8.
 2018-08-22 14:46:45 -04:00
Marios Kyriakou
114bc4713c fix addnode 2018-08-22 19:37:27 +03:00
Michael Tryby
11e6ec1557 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-22 11:38:24 -04:00
Michael Tryby
26ce95673a Renaming test 2018-08-22 11:35:44 -04:00
Elad Salomons
761199b08e Added ENgetcurvetype API 
Also update curve type on EN_setheadcurveindex.

Co-Authored-By: milad ghiami <milad-ghiami@users.noreply.github.com>
 2018-08-20 21:10:49 +03:00
Michael Tryby
5ce1ca1529 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-20 07:45:34 -04:00
Elad Salomons
634651d4e6 Add option to get pump's constant power and speed 
Details in #215
 2018-08-18 21:54:52 +03:00
Elad Salomons
99e7151172 Add option to get link state 
Add EN_STATE to ENgetlinkvalue. Related to #218
 2018-08-17 15:43:53 +03:00
Michael Tryby
7afbed8e7e Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-16 15:17:26 -04:00
Michael Tryby
b59ae060a0 Merge pull request #217 from michaeltryby/dev-test 
Dev test
 2018-08-16 11:06:05 -04:00
Michael Tryby
efc44215f3 Implementing metadata support 2018-08-16 10:26:32 -04:00