JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
401 Commits 1 Branch 0 Tags
64f72abd786e7bc50d6a0949644f09aaa85c13c8
Commit Graph

401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Lew Rossman
a73b2d7508 #defined MAXFNAME as 260 instead of L_tmpnam_s 2018-06-09 12:07:44 -04:00
Michael Tryby
5b75bde91d Merge pull request #192 from michaeltryby/dev 
Adding cmake variable BUILD_TESTS to Appveyor and Travis
 2018-06-08 18:02:05 -04:00
Michael Tryby
21b7a8ab47 Adding cmake variable BUILD_TESTS to Appveyor and Travis 2018-06-08 17:08:37 -04:00
Sam Hatchett
12d3005bd2 Make it more obvious where to ask questions (#191) 2018-06-07 12:03:49 -05:00
Sam Hatchett
9520b6d253 fixes cmake for mac, adds define option for building tests 2018-06-06 18:14:36 -05:00
Lew Rossman
f0c9684871 Changes to pass reg tests 
Revised getTmpName() in EPANET.C
 2018-06-05 10:31:18 -04:00
Lew Rossman
598f080f52 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-05-24 09:38:34 -04:00
Lew Rossman
4d1cd779ca Changed version # in binary output file 
Kept version number at 20012 in binary output file so that the existing EPANET GUI can use this EPANET DLL.
 2018-05-24 09:35:49 -04:00
Michael Tryby
9c586bb3f6 Adding quotes around call to generator var 2018-05-23 10:28:23 -04:00
Michael Tryby
5af1ebfdf7 Simplifying env vars in appveyor matrix 2018-05-23 10:18:33 -04:00
Michael Tryby
03fee3a344 Fixing another typo 2018-05-23 10:06:06 -04:00
Michael Tryby
a10a38853a Fixing another typo 2018-05-23 09:59:51 -04:00
Michael Tryby
bb5fe49f37 Fixing typo 2018-05-23 09:56:22 -04:00
Michael Tryby
6358db92cd Fixing typo 2018-05-23 09:49:25 -04:00
Michael Tryby
52602ed8ac Adding VS 2017 64 bit to Appveyor build matrix 2018-05-23 09:42:27 -04:00
Lew Rossman
24d6b91607 Changes to get Net1.inp to run 2018-05-22 11:12:14 -04:00
Elad Salomons
80a0acc26b Set default pattern for new junctions 
Also fix an `ENgetqualtype` function call to include the project pointer
 2018-04-18 08:29:22 +03:00
Elad Salomons
a46652f47c Fix bug when adding a junction 2018-04-17 21:46:09 +03:00
Michael Tryby
67de368d1e Merge pull request #171 from michaeltryby/dev 
Migrating to benchmark 2012vs10
 2018-04-13 15:58:55 -04:00
Michael Tryby
cfcba154a7 Migrating Travis to 2012vs10 benchmark 2018-04-13 15:52:52 -04:00
Michael Tryby
0b70d87818 Migrating Appveyor to benchmark 2012vs10 2018-04-13 15:40:44 -04:00
Sam Hatchett
3de23845f5 fixes license and attribution issues 2018-04-09 12:10:19 -04:00
Sam Hatchett
612dd380a4 Revert "Revert "Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev"" 
This reverts commit 4415d8c4a1.
 2018-04-09 11:41:50 -04:00
Elad Salomons
4415d8c4a1 Revert "Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev" 
This reverts commit 8fca63294d, reversing
changes made to b85aff9fc9.
 2018-04-09 15:03:03 +03:00
Elad Salomons
8fca63294d Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-04-09 15:02:19 +03:00
Elad Salomons
b85aff9fc9 Change how demand categories linked-list is constructed (appending instead of prepending) 
Fix #150
This wasn't changed but one should note that the default pattern is used and saved if none assigned to a demand
 2018-04-09 15:01:27 +03:00