Commit Graph

613 Commits

Author SHA1 Message Date
Michael Tryby
945280e441 Fixing bug in geterrmsg() 2018-09-14 15:51:51 -04:00
Michael Tryby
5cdb33110e Merge pull request #282 from LRossman/lrossman-dev
Fixes zero flow (#164) and D-W eqn. (#199) issues
2018-09-13 17:03:02 -04:00
Michael Tryby
d164293d8d Triggering appveyor build 2018-09-13 16:48:45 -04:00
Elad Salomons
902dac953f Merge pull request #278 from eladsal/net-builder-es
Test  for the net builder functions
2018-09-13 23:22:20 +03:00
Michael Tryby
2a86252a10 Updating benchmark 2018-09-13 16:20:52 -04:00
Michael Tryby
7e6ceb4366 Resolving merge conflicts 2018-09-13 10:54:11 -04:00
Michael Tryby
bec729a669 Fixing compiler warnings 2018-09-13 10:48:55 -04:00
Elad Salomons
8e96d1e7a3 Fixing casting of chars (take 2) 2018-09-13 17:21:33 +03:00
Elad Salomons
735811dd60 Revert "Fixing char casting in test file"
This reverts commit 8d5d20f542.
2018-09-13 16:17:06 +03:00
Elad Salomons
8d5d20f542 Fixing char casting in test file 2018-09-13 15:33:12 +03:00
Lew Rossman
e45a23c4ef More robust method for handling zero/low flows (#164) 2018-09-12 10:38:01 -04:00
Lew Rossman
dab7be8446 Updates to fix zero flow (#164) and D-W eqn. (#199) issues 2018-09-11 13:15:15 -04:00
Lew Rossman
836d9c3668 Revert "Fixes zero flow issue (#164) and DW eqn. (#199)"
This reverts commit 6b808c03ab.
2018-09-11 11:04:47 -04:00
Lew Rossman
6b808c03ab Fixes zero flow issue (#164) and DW eqn. (#199) 2018-09-11 09:48:01 -04:00
Elad Salomons
7cf8d53356 Explicitly set demant patterns for junctions
This is since there is currently no way to set the default demand pattern. Should be fixed in #280 and then the test can be changed.
2018-09-06 12:07:14 +03:00
Elad Salomons
40a53718cc Fix EN_setnodevalue for EN_MINLEVEL
Vmin was not updated correctly
2018-09-06 12:01:09 +03:00
Elad Salomons
102ac90a98 Adding last test 2018-09-05 13:56:59 +03:00
Elad Salomons
d46dd1a182 Added documentation 2018-09-05 13:56:18 +03:00
Elad Salomons
ad3b26d727 Fail the test... 2018-09-05 09:37:21 +03:00
Elad Salomons
8687af337f Initial net builder test 2018-09-05 09:33:21 +03:00
Elad Salomons
756e8be735 Merge pull request #265 from eladsal/dev-control
Add EN_addcontrol function
2018-09-05 07:42:02 +03:00
Michael Tryby
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 Tryby
f6de130360 Merge pull request #238 from OpenWaterAnalytics/issue-172
Issue 172
2018-09-04 15:12:03 -04:00
Michael Tryby
ec6bb25a11 Merge branch 'dev' into issue-172 2018-09-04 15:00:21 -04:00
Michael Tryby
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
Elad Salomons
0f296db492 Initialize node and link comments in add functions 2018-09-04 21:15:57 +03: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 Tryby
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
Elad Salomons
fcbb47251e Fix old function calls 2018-09-04 08:26:22 +03:00
Lew Rossman
fdca2bef42 Edits made to 2.2 Release Notes 2018-09-03 10:34:03 -04:00
Lew Rossman
6e73b6a4f5 Made mempool.c threadsafe (#234) 2018-09-03 10:29:41 -04:00
Elad Salomons
7957864d62 Another fix for unit test 2018-09-03 14:10:09 +03:00
Elad Salomons
c78aa9df99 Fix for unit test 2018-09-03 13:52:37 +03:00
Elad Salomons
1b23f91f72 Unit test for EN_addcontrol 2018-09-03 13:48:18 +03:00
Elad Salomons
d09548992f Add EN_addcontrol function 2018-09-03 12:35:39 +03:00
Elad Salomons
5d241e2fbd Create headers for EN_addcontrol 2018-09-03 08:18:42 +03:00
Elad Salomons
0b9dd8d29a Minor fix for VB header file
type is a reserved keyword in VB
2018-09-03 07:44:37 +03:00
Michael Tryby
f7d54810ea Update README.md
Fixing Travis badge.
2018-08-31 13:36:03 -04:00
Michael Tryby
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 Tryby
8f54341ea6 Merge pull request #257 from OpenWaterAnalytics/revert-252-dev
Revert "Make memorypool threadsafe "
2018-08-31 12:59:19 -04:00