jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 780698ccf9 Merge pull request #156 from michaeltryby/dev-decouple Michael Tryby 2018-03-21 15:53:43 -04:00
  • 801bc1bb9c Merge branch 'dev' into dev-decouple Michael Tryby 2018-03-21 15:53:08 -04:00
  • bbe40c5ba4 Feature unittest (#157) Michael Tryby 2018-03-21 14:10:10 -04:00
  • 73463770e5 Fixing typo Michael Tryby 2018-03-16 16:37:29 -04:00
  • daf4b67e08 Updating Appveyor to use epanet-output binary wheel Michael Tryby 2018-03-16 16:34:33 -04:00
  • c9192907a8 Updating Appveyor to use epanet-output binary wheel Michael Tryby 2018-03-16 16:21:21 -04:00
  • 18cec6e7fb Fixing typo Michael Tryby 2018-02-16 17:02:16 -05:00
  • 65aafc06b7 Updating Travis to run unit tests Michael Tryby 2018-02-16 16:47:11 -05:00
  • 60db2a4435 Updating Travis to run unit tests Michael Tryby 2018-02-16 16:42:46 -05:00
  • 100421f509 Adding custom comparison for strings Michael Tryby 2018-02-16 16:29:00 -05:00
  • b1e8694cbf Fixing typo Michael Tryby 2018-02-16 16:01:07 -05:00
  • fe8d81d382 Fixing typo Michael Tryby 2018-02-16 15:58:30 -05:00
  • 2f90f401ef Modifying per element comparison Michael Tryby 2018-02-16 15:54:24 -05:00
  • 6199052744 Modifying per element comparison Michael Tryby 2018-02-16 15:43:50 -05:00
  • 07fa9f4758 Adding flag to compile for c++11 Michael Tryby 2018-02-16 15:25:57 -05:00
  • 7c525318b5 Adding flag to compile for c++11 Michael Tryby 2018-02-16 15:20:42 -05:00
  • 8875722082 Changing cmake to no longer glob output library files. Michael Tryby 2018-02-16 15:13:07 -05:00
  • 89f17d61c3 Adding libboost-test to Travis config. Michael Tryby 2018-02-16 14:41:33 -05:00
  • 9d2d131ce5 Adding libboost-test to Travis config. Michael Tryby 2018-02-16 14:35:53 -05:00
  • 508bfb1cd4 Adding support for unit testing using boost unit test and ctest Michael Tryby 2018-02-16 14:17:12 -05:00
  • ddd08e3d5f Conforming to pointer declaration style. Michael Tryby 2018-02-02 10:52:32 -05:00
  • 38292ad849 Fixed bug that was causing hard crash Michael Tryby 2018-02-02 08:16:17 -05:00
  • 17cd1c60f8 Switching EN_Project to void* for SWIG wrap. Cleaning up build. Michael Tryby 2018-02-01 17:10:36 -05:00
  • 62d6c9fade Converting EN_Project to void* EN_ProjectHandle to facilitate wrapping Toolkit API using SWIG. Michael Tryby 2018-01-30 18:12:27 -05:00
  • 060db17018 Adding epanet-output lib target to CMake Michael Tryby 2018-01-26 13:16:53 -05:00
  • c4332e6f32 Merge remote-tracking branch 'upstream/dev' into dev-swig Michael Tryby 2018-01-26 12:39:44 -05:00
  • 859a2ab9aa Moving epanet-toolkit to epanet-python repo Michael Tryby 2018-01-25 10:59:40 -05:00
  • 63b4438765 Merge pull request #143 from OpenWaterAnalytics/dev-cmake-shared Michael Tryby 2018-01-24 16:17:25 -05:00
  • 5e3ab5428d Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev-swig Michael Tryby 2018-01-24 14:34:49 -05:00
  • dcd1c6dd10 Fix VB header file and win build script Elad Salomons 2018-01-18 13:58:26 +02:00
  • 831583a349 Revert "Fix VB header file and win build script" Elad Salomons 2018-01-18 13:55:48 +02:00
  • 2b60bec5b5 Fix VB header file and win build script Elad Salomons 2018-01-18 13:55:22 +02:00
  • d940904728 Merge pull request #145 from bemcdonnell/dev Michael Tryby 2018-01-17 17:01:43 -05:00
  • 47551d42b9 Updated Readme Appveyor Badge [default dev branch] Bryant E. McDonnell 2018-01-17 14:21:48 -05:00
  • a0ed2cf60c Test 2 - Bryant E. McDonnell 2018-01-17 13:12:01 -05:00
  • a30d92b9c6 Testing Appveyor Bryant E. McDonnell 2018-01-17 13:00:59 -05:00
  • 84abab346c modifies cmake to link shared lib to the CLI Sam Hatchett 2018-01-12 11:38:05 -05:00
  • 47733feb74 Configure appveyor (#142) Michael Tryby 2018-01-12 11:35:43 -05:00
  • 691c65878b Initial commit of toolkit SWIG wrapper work Michael Tryby 2018-01-12 09:46:32 -05:00
  • d2503bc035 allows changing model units on-the-fly Sam Hatchett 2018-01-11 15:22:26 -05:00
  • 3892b65759 re-adds EN_PRICEPATTERN getter Sam Hatchett 2018-01-11 14:17:09 -05:00
  • e1acb5a601 improves file availability from cmake-generated projects Sam Hatchett 2018-01-11 14:16:20 -05:00
  • 70c38b0d85 moves windows build to better-named directory Sam Hatchett 2018-01-11 14:16:00 -05:00
  • f97d837231 Feature wrapper (#136) Sam Hatchett 2018-01-09 16:56:42 -05:00
  • 36381129e6 Merge pull request #113 from OpenWaterAnalytics/add-license-1 Sam Hatchett 2017-06-28 12:13:56 -04:00
  • c90d46c4d1 Create LICENSE Sam Hatchett 2017-06-28 12:13:44 -04:00
  • 5eead5ae40 Fix quality conversion factor error in ENsetqualtype Elad Salomons 2017-06-15 16:21:39 +03:00
  • a00269e39a Added comment for 3c78856 Elad Salomons 2017-05-01 13:28:59 +03:00
  • 3c788567a4 Fix ENsetqualtype to set node initial values Elad Salomons 2017-05-01 13:25:59 +03:00
  • 8ab0f06ccc Added option to retrieve the pumps price pattern Elad Salomons 2017-04-13 12:14:32 +03:00
  • 8d968738ac Added the link to the step-by-step tutorial (#76) Demetrios G. Eliades 2016-11-21 21:38:53 +02:00
  • 09bf10d4a7 Merge pull request #89 from OpenWaterAnalytics/dev-rule-apis Elad Salomons 2016-11-21 21:31:17 +02:00
  • e1da9bc9d7 Fix duplicate w_POWER definition Elad Salomons 2016-11-09 16:37:57 +02:00
  • bca5409952 Merge pull request #87 from AngelaMarchi/ChangingRuleBased_v2 Elad Salomons 2016-11-08 12:00:20 +02:00
  • 83dd6c7b7c ChangingRuleBased_v2 AngelaMarchi 2016-11-08 18:37:54 +10:30
  • ab4622b276 Updated more float types in function APIs Elad Salomons 2016-10-10 11:45:02 +03:00
  • 9942f6761d Updated def file and float types in function APIs Elad Salomons 2016-09-24 12:28:20 +03:00
  • 98b86cd014 Merge pull request #84 from AngelaMarchi/ChangingRuleBased Elad Salomons 2016-09-23 14:00:34 +03:00
  • 4e349cd3c1 ModifyingRuleBaseControls AngelaMarchi 2016-09-23 13:14:15 +09:30
  • 6f8be1be55 ModifyingRuleBaseControls AngelaMarchi 2016-09-23 13:07:06 +09:30
  • 1d071d19ba VSP efficiency + retrieving efficiency directly (#81) AngelaMarchi 2016-09-10 02:27:16 +09:30
  • 8b4a03d349 Merge pull request #75 from Mariosmsk/dev Elad Salomons 2016-08-18 15:04:42 +03:00
  • 7dfa6111be Added reservoirs in EN_TANKCOUNT header comment Marios Kyriakou 2016-08-08 12:26:14 +03:00
  • 1f5327a55e adds the rest of the pattern functions to the module documentation (#74) Sam Hatchett 2016-07-30 09:43:28 -04:00
  • 9da07f827b Added date of V2.1 release (#72) Demetrios G. Eliades 2016-07-28 17:15:32 -07:00
  • e34adc1685 update readme for v2.1 tag Sam Hatchett 2016-07-25 20:18:06 -04:00
  • b75055838e Merge branch 'dev-2.1' Sam Hatchett 2016-07-25 20:14:44 -04:00
  • e2a8e5a614 resolve conflict Sam Hatchett 2016-07-25 20:14:33 -04:00
  • a4d27ad489 mac rpath in cmake Sam Hatchett 2016-07-25 20:12:02 -04:00
  • ea6b3619f7 note about api float type Sam Hatchett 2016-07-21 11:30:08 -04:00
  • 773705e3d2 Consistency change in ENgetcurve function call Elad Salomons 2016-07-21 17:07:50 +03:00
  • 754d24c118 Small fix to VB header file Elad Salomons 2016-07-21 17:04:29 +03:00
  • e42d59e754 Revert "Small VB header fix" Elad Salomons 2016-07-21 17:01:38 +03:00
  • c81d2c6954 Small VB header fix Elad Salomons 2016-07-21 17:00:33 +03:00
  • 997c8839e1 Merge pull request #63 from mauriziocingi/patch-1 Sam Hatchett 2016-07-20 16:29:52 -04:00
  • 98e9a31eb3 Merge pull request #69 from eldemet/dev-2.1-windsdk Elad Salomons 2016-07-15 10:46:28 +03:00
  • 1d83b69427 deleted redundant bat files eldemet 2016-07-15 09:53:26 +03:00
  • c098ca286a Create Makefile.bat eldemet 2016-07-15 09:48:43 +03:00
  • b26e3dce49 Exclude windows sdk compiled folders eldemet 2016-07-15 09:47:38 +03:00
  • 4e3efb1aba disable local file location Sam Hatchett 2016-07-14 15:28:11 -04:00
  • 528d972f54 updates and proper tagging for dox Sam Hatchett 2016-07-14 15:03:14 -04:00
  • 7f958d797d update doxyfile Sam Hatchett 2016-07-14 14:35:45 -04:00
  • 2c60a703b5 Update README.md Sam Hatchett 2016-07-13 13:20:56 -04:00
  • 2d39d1fee4 Update README.md Sam Hatchett 2016-07-13 13:19:18 -04:00
  • 880f57d237 Merge branch 'dev-2.1-doxy-markup' into dev-2.1 Sam Hatchett 2016-07-13 13:16:53 -04:00
  • cdbe7e409a adding release notes, 2.1 Sam Hatchett 2016-07-13 13:14:42 -04:00
  • 31a05e34cc Update epanet.c Maurizio Cingi 2015-12-21 22:21:00 +01:00
  • 1c0690837f Fix for avgqual function Elad Salomons 2015-12-18 13:34:04 +02:00
  • 8d90000f3f Merge pull request #62 from OpenWaterAnalytics/dev-2.1-debug-python-test Sam Hatchett 2015-12-17 13:52:52 -05:00
  • ff6225372a there are two hard problems. sam hatchett 2015-12-17 13:49:23 -05:00
  • 8fe3bbef23 fixes diff script sam hatchett 2015-12-17 13:46:32 -05:00
  • 81fa79745a fixing python printing sam hatchett 2015-12-17 13:36:53 -05:00
  • eb629b8392 better debug output sam hatchett 2015-12-17 13:33:33 -05:00
  • 71fa408f0b removes fake python comparator sam hatchett 2015-12-17 13:29:47 -05:00
  • d2625edab4 removes fake files sam hatchett 2015-12-17 13:24:00 -05:00
  • 1d8d2fb882 combining testing framework with python diff script sam hatchett 2015-12-17 13:22:28 -05:00
  • cb417ce08b Merge pull request #59 from bemcdonnell/dev-2.1 Sam Hatchett 2015-12-17 11:48:32 -05:00
  • 70e1eb5818 Merge pull request #58 from OpenWaterAnalytics/dev-2.1-test-network-script Sam Hatchett 2015-12-17 11:48:11 -05:00
  • b2309e257a Minor updates to ENOutputWrapper.py; Adding OutDiff.py Bryant McDonnell 2015-12-16 22:09:38 -05:00
  • 523dee5412 adds/fixes attribution Sam Hatchett 2015-12-15 16:40:01 -05:00