jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
552 Commits 1 Branch 0 Tags
bec729a669f83d44b3b63475e0fd09f228788b7c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Tryby bec729a669 Fixing compiler warnings 2018-09-13 10:48:55 -04:00
Michael TrybyandGitHub b7dfc9f898 Merge pull request #276 from michaeltryby/dev 
Add ENgetdemandpattern()
 2018-09-04 15:23:31 -04:00
Michael Tryby c64cc8da19 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-09-04 15:18:16 -04:00
Michael Tryby 8059a90192 Add ENsetdemandpattern 2018-09-04 15:16:40 -04:00
Michael TrybyandGitHub f6de130360 Merge pull request #238 from OpenWaterAnalytics/issue-172 
Issue 172
 2018-09-04 15:12:03 -04:00
Michael TrybyandGitHub ec6bb25a11 Merge branch 'dev' into issue-172 2018-09-04 15:00:21 -04:00
Michael TrybyandGitHub 4662296080 Merge pull request #274 from michaeltryby/dev 
Makes GENX opt in
 2018-09-04 14:55:42 -04:00
Michael Tryby 30a694d62e Removing NO_GENX from win_build Makefile.bat 2018-09-04 14:42:24 -04:00
Michael Tryby 78999ea795 Getting runepanet to link on 32bit 2018-09-04 13:13:56 -04:00
Michael Tryby 5f2de4ab5d Merging upstream dev 2018-09-04 11:56:06 -04:00
Michael Tryby b9a1934879 Making epanet exports opt in 2018-09-04 11:53:53 -04:00
Michael TrybyandGitHub bb65170eb1 Merge pull request #267 from LRossman/lrossman-dev 
Made mempool.c threadsafe (#234)
 2018-09-04 10:35:55 -04:00
Michael Tryby a056bbf2c8 Fixing build error on Travis 2018-09-04 10:05:27 -04:00
Michael Tryby 7188642e39 Installing boost thread library 2018-09-04 09:50:08 -04:00
Michael Tryby b7e9988b15 Adding unit test for reentrancy 2018-09-04 09:38:44 -04:00
Michael TrybyandGitHub f7d54810ea Update README.md 
Fixing Travis badge.
 2018-08-31 13:36:03 -04:00
Michael TrybyandGitHub c09761d8b8 Merge pull request #258 from michaeltryby/dev 
Fix Travis build
 2018-08-31 13:30:53 -04:00
Michael Tryby b2aa8de927 Fixing build error on Travis 2018-08-31 13:15:00 -04:00
Michael Tryby 7326ca4b26 Fixing merge conflicts 2018-08-31 13:10:34 -04:00
Michael TrybyandGitHub 8f54341ea6 Merge pull request #257 from OpenWaterAnalytics/revert-252-dev 
Revert "Make memorypool threadsafe "
 2018-08-31 12:59:19 -04:00
Michael TrybyandGitHub d33167161a Revert "Make memorypool threadsafe " 2018-08-31 11:14:16 -04:00
Michael Tryby 84eb306681 Shutting of regression testing. 2018-08-31 10:54:37 -04:00
Michael Tryby b6250e27eb Reverting change to Boost_THREADAPI 2018-08-31 08:41:42 -04:00
Michael Tryby dcf556ef0d Cleaning up unit test build and test header 2018-08-31 08:24:23 -04:00
Michael TrybyandGitHub b537a27965 Merge pull request #252 from michaeltryby/dev 
Make memorypool threadsafe
 2018-08-30 19:24:26 -04:00
michaeltryby 5a007bc1f6 Adding header 2018-08-30 19:12:27 -04:00
Michael Tryby 6527819d00 Forgot to add test 2018-08-30 15:53:01 -04:00
Michael Tryby 3433b9d5eb Add boost threads lib to Travis config 2018-08-30 15:47:44 -04:00
Michael Tryby c4b6756926 Fixing compile error on Travis 2018-08-30 15:39:06 -04:00
Michael Tryby 21f40f0daf Making memorypool.c reentrant and adding test 2018-08-30 15:30:34 -04:00
Michael TrybyandGitHub 5161ad9972 Fix Appveyor badge 
Close #246
 2018-08-29 10:17:36 -04:00
Michael TrybyandGitHub 045742afe5 Merge pull request #244 from michaeltryby/dev 
Fixes python wrapper build
 2018-08-28 14:26:12 -04:00
Michael Tryby bb047c972f Fixing build error on Visual Studio 2010 2018-08-28 13:58:47 -04:00
Michael Tryby 0188b8e976 Fixing compiler warning on Travis build 2018-08-28 12:18:27 -04:00
Michael Tryby bdfe7ec289 Fixing build for python wrapper 2018-08-28 11:23:30 -04:00
Michael Tryby 21ab62cfd4 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-28 08:50:41 -04:00
Michael TrybyandGitHub 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
Michael TrybyandGitHub 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 TrybyandGitHub 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
Michael Tryby 40cd25748c Fixing bug EN_getcurvetype 2018-08-23 08:00:30 -04:00
Michael Tryby 670440b55c Fixing function definition for EN_getcurve 2018-08-23 07:56:11 -04: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
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 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
Michael Tryby 5ce1ca1529 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-20 07:45:34 -04:00
Michael Tryby 7afbed8e7e Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-08-16 15:17:26 -04:00
Michael TrybyandGitHub 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
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
Michael Tryby 04b70c4c5c Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-07-16 17:55:01 -04:00
Michael TrybyandGitHub 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
Michael TrybyandGitHub 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
Michael Tryby aa81bff09e Adding build and testing instructions. 2018-06-19 17:09:18 -04:00
Michael TrybyandGitHub 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 TrybyandGitHub ed777d9d73 Merge branch 'dev' into contributor-lr 2018-06-14 12:34:46 -04:00
Michael TrybyandGitHub 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
Michael Tryby 9c586bb3f6 Adding quotes around call to generator var 2018-05-23 10:28:23 -04:00