Commit Graph

439 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Michael Tryby
f38a637aaf Adding mincdd comparison and better debug information 2018-07-10 18:50:33 -04:00
Michael Tryby
51f5295e8c Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-07-09 11:11:39 -04:00
Michael Tryby
c8803a9f1b Reorganizing epanet header 2018-07-06 17:42:27 -04:00
Michael Tryby
a93465e1cc Adding test for simultaneous stepping through hyd and qual simulation 2018-07-06 09:48:33 -04:00
Michael Tryby
74fbcf7768 Adding test for stepping through quality simulation 2018-07-06 09:31:58 -04:00
Michael Tryby
64f72abd78 Adding test for stepping through hydraulic simulation 2018-07-05 19:36:50 -04:00
Michael Tryby
efcf8735f0 Fixing indent 2018-07-05 18:45:13 -04:00
Michael Tryby
245e2c5060 Adding tests and a fixture 2018-07-05 18:35:41 -04:00
Michael Tryby
594b6b9260 Python package epanet-python builds and runs 2018-07-03 18:47:30 -04:00
Michael Tryby
323e041e6b Fixing typo 2018-07-03 18:16:09 -04:00
Michael Tryby
ff2c851b1c Merging latest from dev, trying to get import lib generated 2018-07-03 17:38:40 -04:00
Lew Rossman
e29a14a672 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-07-02 13:55:54 -04:00
Lew Rossman
86ffbcf614 Improved node re-ordering method (Issue #162) 2018-07-02 13:55:41 -04:00
Michael Tryby
e1456718a4 Merge pull request #195 from LRossman/contributor-lr
Feature Update - more rigorous hydraulic convergence criteria (#161)
2018-06-26 16:51:07 -04:00
Michael Tryby
39dc089b58 Updating benchmark 2018-06-26 16:36:23 -04:00
Lew Rossman
55a7179ca6 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-06-21 12:05:59 -04:00
Lew Rossman
f5a1b9e518 Reverted to legacy Darcy-Weisbach method 2018-06-21 12:05:51 -04:00
Elad Salomons
f86df2291a Saving HeadErrorLimit and FlowChangeLimit only if they are used
To help a bit with backward computability the two new parameters will be saved to the INP file only if values were set for them.
2018-06-21 10:20:16 +03:00
Michael Tryby
aa81bff09e Adding build and testing instructions. 2018-06-19 17:09:18 -04:00
Lew Rossman
92e10a18b0 Added new convergence options to epanet2.h 2018-06-19 10:41:30 -04:00