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

Commit Graph

  • 78999ea795 Getting runepanet to link on 32bit Michael Tryby 2018-09-04 13:13:56 -04:00
  • 5f2de4ab5d Merging upstream dev Michael Tryby 2018-09-04 11:56:06 -04:00
  • b9a1934879 Making epanet exports opt in Michael Tryby 2018-09-04 11:53:53 -04:00
  • bb65170eb1 Merge pull request #267 from LRossman/lrossman-dev Michael Tryby 2018-09-04 10:35:55 -04:00
  • a056bbf2c8 Fixing build error on Travis Michael Tryby 2018-09-04 10:05:27 -04:00
  • 7188642e39 Installing boost thread library Michael Tryby 2018-09-04 09:50:08 -04:00
  • b7e9988b15 Adding unit test for reentrancy Michael Tryby 2018-09-04 09:38:44 -04:00
  • fcbb47251e Fix old function calls Elad Salomons 2018-09-04 08:26:22 +03:00
  • fdca2bef42 Edits made to 2.2 Release Notes Lew Rossman 2018-09-03 10:34:03 -04:00
  • 6e73b6a4f5 Made mempool.c threadsafe (#234) Lew Rossman 2018-09-03 10:29:41 -04:00
  • 7957864d62 Another fix for unit test Elad Salomons 2018-09-03 14:10:09 +03:00
  • c78aa9df99 Fix for unit test Elad Salomons 2018-09-03 13:52:37 +03:00
  • 1b23f91f72 Unit test for EN_addcontrol Elad Salomons 2018-09-03 13:48:18 +03:00
  • d09548992f Add EN_addcontrol function Elad Salomons 2018-09-03 12:35:39 +03:00
  • 5d241e2fbd Create headers for EN_addcontrol Elad Salomons 2018-09-03 08:18:42 +03:00
  • 0b9dd8d29a Minor fix for VB header file Elad Salomons 2018-09-03 07:44:37 +03:00
  • f7d54810ea Update README.md Michael Tryby 2018-08-31 13:36:03 -04:00
  • c09761d8b8 Merge pull request #258 from michaeltryby/dev Michael Tryby 2018-08-31 13:30:53 -04:00
  • b2aa8de927 Fixing build error on Travis Michael Tryby 2018-08-31 13:15:00 -04:00
  • 7326ca4b26 Fixing merge conflicts Michael Tryby 2018-08-31 13:10:34 -04:00
  • 8f54341ea6 Merge pull request #257 from OpenWaterAnalytics/revert-252-dev Michael Tryby 2018-08-31 12:59:19 -04:00
  • d33167161a Revert "Make memorypool threadsafe " Michael Tryby 2018-08-31 11:14:16 -04:00
  • 84eb306681 Shutting of regression testing. Michael Tryby 2018-08-31 10:54:37 -04:00
  • b6250e27eb Reverting change to Boost_THREADAPI Michael Tryby 2018-08-31 08:41:42 -04:00
  • dcf556ef0d Cleaning up unit test build and test header Michael Tryby 2018-08-31 08:24:23 -04:00
  • 25db9cfe8f Merge pull request #242 from Mariosmsk/pr86 Elad Salomons 2018-08-31 06:51:39 +03:00
  • b537a27965 Merge pull request #252 from michaeltryby/dev Michael Tryby 2018-08-30 19:24:26 -04:00
  • 5a007bc1f6 Adding header michaeltryby 2018-08-30 19:12:27 -04:00
  • 6527819d00 Forgot to add test Michael Tryby 2018-08-30 15:53:01 -04:00
  • 3433b9d5eb Add boost threads lib to Travis config Michael Tryby 2018-08-30 15:47:44 -04:00
  • c4b6756926 Fixing compile error on Travis Michael Tryby 2018-08-30 15:39:06 -04:00
  • 21f40f0daf Making memorypool.c reentrant and adding test Michael Tryby 2018-08-30 15:30:34 -04:00
  • 74d68a884c Fix typo Elad Salomons 2018-08-30 18:05:39 +03:00
  • 7d8d780a8b Merge branch 'dev' into pr86 Elad Salomons 2018-08-30 17:55:35 +03:00
  • 8991d6baf9 add test for the function EN_setdemandpattern Marios Kyriakou 2018-08-30 17:21:02 +03:00
  • d41f362ab5 Fix crash with wrong parameters Marios Kyriakou 2018-08-30 12:52:23 +03:00
  • 7d374338a7 Merge pull request #250 from eladsal/dev-232 Elad Salomons 2018-08-30 12:47:27 +03:00
  • cff7ca7433 Merge pull request #248 from OpenWaterAnalytics/dev-231 Elad Salomons 2018-08-30 12:46:56 +03:00
  • 803f86959d Revert "Fix crash with wrong parameters" Marios Kyriakou 2018-08-30 12:45:21 +03:00
  • c0b91fa9e3 Fix crash with wrong parameters Marios Kyriakou 2018-08-30 12:32:00 +03:00
  • dbdafd6352 Set status for new links in EN_addlink Elad Salomons 2018-08-29 22:31:28 +03:00
  • bcd6877935 Add legacy ENinit API Elad Salomons 2018-08-29 22:26:32 +03:00
  • f3d680dc54 Fix test_addpattern test Elad Salomons 2018-08-29 18:12:25 +03:00
  • 5161ad9972 Fix Appveyor badge Michael Tryby 2018-08-29 10:17:36 -04:00
  • edf4a09ebe Fix EN_addpattern Elad Salomons 2018-08-29 15:14:49 +03:00
  • 045742afe5 Merge pull request #244 from michaeltryby/dev Michael Tryby 2018-08-28 14:26:12 -04:00
  • bb047c972f Fixing build error on Visual Studio 2010 Michael Tryby 2018-08-28 13:58:47 -04:00
  • 0188b8e976 Fixing compiler warning on Travis build Michael Tryby 2018-08-28 12:18:27 -04:00
  • bdfe7ec289 Fixing build for python wrapper Michael Tryby 2018-08-28 11:23:30 -04:00
  • 21ab62cfd4 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev Michael Tryby 2018-08-28 08:50:41 -04:00
  • 476604bf6f add ENsetdemandpattern function in epanet2.def Marios Kyriakou 2018-08-28 12:07:25 +03:00
  • 8ca56d7c9d remove space Marios Kyriakou 2018-08-28 00:25:31 +03:00
  • 70f51d9567 add ENsetdemandpattern Marios Kyriakou 2018-08-28 00:19:56 +03:00
  • b6c9808905 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into issue-173 Sam Hatchett 2018-08-27 16:31:31 -04:00
  • 8f69f2f975 re-index nodes in controls/rules Sam Hatchett 2018-08-27 16:28:27 -04:00
  • da8522b553 Merge pull request #236 from Mariosmsk/issue235 Elad Salomons 2018-08-27 23:18:29 +03:00
  • 05d52c8022 add hydstatus.c in win_build file Marios Kyriakou 2018-08-27 23:04:13 +03:00
  • 6316f6757d re-adds header/dat files to IDE cmake output Sam Hatchett 2018-08-27 16:02:00 -04:00
  • 8f6c56e0cd Merge pull request #230 from michaeltryby/copy-dev-swig Michael Tryby 2018-08-27 13:46:57 -04:00
  • d5aeae893c Updating toolkit function to use errormanager Michael Tryby 2018-08-27 12:16:55 -04:00
  • 1602e5bf66 Resolving merge conflicts Michael Tryby 2018-08-27 09:46:55 -04:00
  • f03e954dc8 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into copy-dev-swig Michael Tryby 2018-08-27 09:40:20 -04:00
  • bdc05058ca Resolving merge conflicts Michael Tryby 2018-08-27 09:38:46 -04:00
  • 13011ae71c Merge pull request #229 from Mariosmsk/dev-issue228 Elad Salomons 2018-08-27 09:32:49 +03:00
  • 6ab76efc5a Merge pull request #226 from Mariosmsk/dev-epanet Elad Salomons 2018-08-27 09:21:47 +03:00
  • f4a57a969e delete comment strings Marios Kyriakou 2018-08-25 13:15:33 +03:00
  • c4b7c90634 Merge pull request #210 from LRossman/contributor-lr Michael Tryby 2018-08-24 17:30:38 -04:00
  • 93061191c5 Trigging CI build Michael Tryby 2018-08-24 17:24:11 -04:00
  • 22d0e036c4 Trigging CI build Michael Tryby 2018-08-24 17:09:31 -04:00
  • f847a3ed6e Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr Michael Tryby 2018-08-24 16:14:54 -04:00
  • 66bb150f99 Forgot to add new tests Michael Tryby 2018-08-24 16:12:47 -04:00
  • f495d2c707 Merge branch 'dev' into contributor-lr Michael Tryby 2018-08-24 16:09:21 -04:00
  • 364e4987d8 Bumping rolling benchmark version Michael Tryby 2018-08-24 16:03:53 -04:00
  • a2fdd86a4d Updating windows build script Elad Salomons 2018-08-23 23:20:16 +03:00
  • 6d99867af6 update Marios Kyriakou 2018-08-23 16:59:02 +03:00
  • 0e6cc51d81 Revert "remove dublicate definition" Marios Kyriakou 2018-08-23 16:47:52 +03:00
  • 4025d197b2 Revert "replace <text.h> to "text.h"" Marios Kyriakou 2018-08-23 16:47:31 +03:00
  • 842b7e64d1 replace <text.h> to "text.h" Marios Kyriakou 2018-08-23 16:26:13 +03:00
  • 40cd25748c Fixing bug EN_getcurvetype Michael Tryby 2018-08-23 08:00:30 -04:00
  • 8808a01641 remove dublicate definition Marios Kyriakou 2018-08-23 14:58:26 +03:00
  • 670440b55c Fixing function definition for EN_getcurve Michael Tryby 2018-08-23 07:56:11 -04:00
  • 219e46a467 Revert "remove dublicate definition" Marios Kyriakou 2018-08-23 14:54:48 +03:00
  • 1f4c3a0819 remove dublicate definition Marios Kyriakou 2018-08-23 14:53:20 +03:00
  • e8acc1b177 Fixing build Michael Tryby 2018-08-23 07:48:01 -04:00
  • 888e447ad9 Adding GEN_X to cmake invocation Michael Tryby 2018-08-22 16:14:21 -04:00
  • 0938f82c32 Adding adding GEN_X macro for cmake export header Michael Tryby 2018-08-22 15:46:24 -04:00
  • 29aa45febb Syntax for the epanet executable Marios Kyriakou 2018-08-22 22:32:30 +03:00
  • c6fe1230d0 Fixing merge conflict Michael Tryby 2018-08-22 15:20:53 -04:00
  • 75e400cf44 Merging changes from upstream dev Michael Tryby 2018-08-22 15:09:33 -04:00
  • fafad2a070 Revert "Reorganizing epanet header" Michael Tryby 2018-08-22 15:05:48 -04:00
  • f66d4c68d9 Revert "Reorganizing / refactoring api functions for swig wrap" Michael Tryby 2018-08-22 14:48:20 -04:00
  • bd4c369f83 Revert "Reorganizing / refactoring api functions for swig wrap" Michael Tryby 2018-08-22 14:46:45 -04:00
  • 114bc4713c fix addnode Marios Kyriakou 2018-08-22 19:37:27 +03:00
  • 11e6ec1557 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev Michael Tryby 2018-08-22 11:38:24 -04:00
  • 26ce95673a Renaming test Michael Tryby 2018-08-22 11:35:44 -04:00
  • 761199b08e Added ENgetcurvetype API Elad Salomons 2018-08-20 21:10:49 +03:00
  • 5ce1ca1529 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev Michael Tryby 2018-08-20 07:45:34 -04:00
  • 634651d4e6 Add option to get pump's constant power and speed Elad Salomons 2018-08-18 21:54:52 +03:00
  • 99e7151172 Add option to get link state Elad Salomons 2018-08-17 15:43:53 +03:00
  • 7afbed8e7e Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev Michael Tryby 2018-08-16 15:17:26 -04:00