Commit Graph

609 Commits

Author SHA1 Message Date
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
Elad Salomons
e06368eca0 Adtional chnage for #208 2018-08-15 16:45:51 +03:00
Elad Salomons
4e48c31147 Fix PumpType and CurveType enums
Also adds a general \default curve type. Fixes #208.
2018-08-15 07:37:19 +03:00
Michael Tryby
606101af89 Adding support for chem units 2018-08-14 11:10:27 -04:00
Lew Rossman
b3e26b9ac8 Resolved conflict in inpfile.c 2018-08-13 10:11:34 -04:00
Lew Rossman
3bd2d4a800 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-08-13 10:09:44 -04:00
Lew Rossman
a73d9235e7 Fixed max. flow change node ID in Status Report 2018-08-13 10:04:24 -04:00
Elad Salomons
5d6d0ca933 Merge branch 'dev' into contributor-lr 2018-08-13 11:07:10 +03:00
Elad Salomons
d94e1643bf Update Windows build script and VB header file
Also save HeadErrorLimit and FlowChangeLimit only if they are used.
2018-08-13 09:19:05 +03:00
Lew Rossman
b5e3986e6b Pressure Dependent Demands added to address issue 163 2018-08-09 10:42:47 -04:00
Michael Tryby
8ff88f86b8 Reorganizing / refactoring api functions for swig wrap 2018-07-19 11:16:49 -04:00
Michael Tryby
437a7c70e0 Reorganizing / refactoring api functions for swig wrap 2018-07-18 18:33:51 -04:00
Elad Salomons
528e99a791 Update win make file to include genmmd.c 2018-07-17 07:17:33 +03:00
Michael Tryby
04b70c4c5c Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-07-16 17:55:01 -04:00
Michael Tryby
4a0e1a06a9 Merge pull request #200 from LRossman/contributor-lr
Improved Node Re-Ordering Method (Issue #162)
2018-07-16 17:24:28 -04:00
Michael Tryby
e6e7942585 Fixing typo 2018-07-16 17:18:09 -04:00
Michael Tryby
e38d7ece50 Bumping benchmark version 2018-07-16 17:09:02 -04:00
Michael Tryby
711bde01d1 Switching build to VS 2017 and bumping benchmark version 2018-07-16 17:02:35 -04:00
Michael Tryby
10c5608210 Adding command line interface to report_diff 2018-07-16 14:25:53 -04:00
Michael Tryby
4723336726 Adding errormanager to toolkit api 2018-07-13 11:47:47 -04:00
Michael Tryby
db40fa7bbe Improving diff report format 2018-07-12 10:28:25 -04:00
Michael Tryby
86c55a2373 Fixing typo 2018-07-11 17:22:26 -04:00
Michael Tryby
c482f38639 Initial commit for report_diff 2018-07-11 17:19:18 -04:00
Michael Tryby
e3cd4ae41a Bumping version 2018-07-11 10:04:10 -04:00