JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
404 Commits 1 Branch 0 Tags
22d0e036c42212086772e82d786e115906d51e7a
Commit Graph

404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Lew Rossman
3a6cd60b96 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-06-19 10:34:51 -04:00
Lew Rossman
e9303de078 Fixes to implement issue #161 2018-06-19 10:30:02 -04:00
Elad Salomons
c41e140b6a Update VB header files 2018-06-19 11:16:32 +03:00
Elad Salomons
42f70f579f Remove strange string from types.h and fix win_build make file 2018-06-17 07:48:25 +03:00
Lew Rossman
d5194ffb81 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-06-16 11:12:59 -04:00
Lew Rossman
9afb6f0b28 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-06-16 11:10:07 -04:00
Lew Rossman
b3ab8ea2c7 Addresses issue #161 
Adds new options HEADERROR and FLOWCHANGE to provide more rigorous criteria for hydraulic convergence. Also breaks HYDRAUL.C into 3 separate files to improve code readability.
 2018-06-16 11:02:18 -04:00
Michael Tryby
7e73de860a Merge pull request #177 from LRossman/contributor-lr 
Changes to get Net1.inp to run
 2018-06-15 11:53:20 -04:00
Michael Tryby
f11308fc72 Switching Visual Studio 2017 build to 32 bit 2018-06-15 10:50:37 -04:00
Michael Tryby
d374e7bf1a Changing MAXFNAME from 260 back to 259 2018-06-15 10:41:52 -04:00
Michael Tryby
9ad5c2ce9b Fixing bug in appyeyor config 2018-06-15 10:27:52 -04:00
Michael Tryby
ed777d9d73 Merge branch 'dev' into contributor-lr 2018-06-14 12:34:46 -04:00