Commit Graph

1067 Commits

Author SHA1 Message Date
Lew Rossman 6a5aa372f8 Change default properties for new pipe created with EN_addlink (issue #500) 2019-05-28 11:17:44 -04:00
Lew Rossman 40c39fd3c6 Fixes problem with findpattern() function (issue #498) 2019-05-24 10:33:36 -04:00
Lew Rossman e4e6d49f52 Update BUILDING.md 2019-05-16 18:50:53 -04:00
Lew Rossman 0e48056da5 Update BUILDING.md 2019-05-16 13:07:33 -04:00
Lew Rossman c37cd1ee52 Update BUILDING.md 2019-05-16 00:55:53 -04:00
Elad Salomons 2708e88331 Merge pull request #492 from Mariosmsk/update_win_build_folder
rm WinSDK folder and update Makefiles
Closes #491  and #480
2019-05-16 01:33:32 +03:00
Elad Salomons 9e80fe67b8 Move BuildAndTest.md to the tools directory 2019-05-16 01:24:46 +03:00
mariosmsk 55c9607bce move win_build.md to root dir and renaiming to BUILDING.md 2019-05-15 16:36:26 +03:00
Lew Rossman 720b5daad5 Merge pull request #493 from OpenWaterAnalytics/lrossman-dev
Lrossman dev
2019-05-15 08:48:55 -04:00
mariosmsk d51b65f004 add help file win_build.md
Co-Authored-By: Elad Salomons <selad@optiwater.com>
2019-05-15 12:55:13 +03:00
Lew Rossman ed1acd7386 Update run\CMakeLists.txt 2019-05-14 13:17:17 -04:00
Sam Hatchett 93db1cab93 updates AUTHORS and generator script 2019-05-14 13:12:20 -04:00
Sam Hatchett fc84e2b5e3 updates authors 2019-05-14 12:26:13 -04:00
Lew Rossman efb189ac39 Fix refactor of types.h 2019-05-14 00:00:03 -04:00
Lew Rossman c9b836973e Removes _DEBUG directives from all source files
This commit removes the #ifdef _DEBUG statements at the top of all source code files per issue #482. It also updates the doc files to stress that the speedup observed for hydraulic analysis with the MMD node re-ordering method only applies to single period runs.
2019-05-13 23:49:19 -04:00
Lew Rossman 46e2297921 Merge pull request #489 from OpenWaterAnalytics/lrossman-dev
Minor format change to status report
2019-05-13 11:30:39 -04:00
Lew Rossman f8cf7e0eb3 Restored CI testing of status reports 2019-05-13 11:05:58 -04:00
mariosmsk 9a0001509d rm WinSDK folder and update Makefiles
Co-Authored-By: Demetrios G. Eliades <eldemet@users.noreply.github.com>
2019-05-13 12:14:27 +03:00
Elad Salomons c8c2808430 Merge pull request #487 from OpenWaterAnalytics/eldemet-patch-3
Delete epanet2.def
2019-05-13 07:14:10 +03:00
Elad Salomons 5c04173287 Merge pull request #486 from OpenWaterAnalytics/eldemet-patch-2
Update Makefile2.bat
2019-05-13 07:13:54 +03:00
Elad Salomons d0634c9a09 Merge pull request #485 from OpenWaterAnalytics/eldemet-patch-1
Update Makefile.bat
2019-05-13 07:13:38 +03:00
Elad Salomons 4c9379d5cd Merge pull request #479 from samhatchett/dev
code of conduct. Closes #57
2019-05-13 07:11:57 +03:00
Lew Rossman dae0fc03d1 Removing status reports from CI testing 2019-05-12 20:02:07 -04:00
Lew Rossman 0930a33321 Minor format change to status report 2019-05-12 19:20:16 -04:00
Demetrios G. Eliades ac21d4aa3a Delete epanet2.def
Deleted the redundant `epanet2.def` file in the WindSDK folder
2019-05-12 10:47:16 +03:00
Demetrios G. Eliades 746da867a1 Update Makefile2.bat
Modified epanet2.exe to runepanet.exe, for consistency.
2019-05-12 10:31:45 +03:00
Demetrios G. Eliades 8c4aa0e1cd Update Makefile.bat
Updates on the Microsoft SDK 7.1 compilation script to generate runepanet.exe and to use the \include\epanet2.def
2019-05-12 10:27:45 +03:00
Lew Rossman d71776d152 Merge pull request #481 from OpenWaterAnalytics/lrossman-dev
Refactors the API's demand editing functions
2019-05-11 08:48:42 -04:00
Lew Rossman 1c9ee7788b Documentation edits 2019-05-09 13:53:57 -04:00
Lew Rossman 21ff7c009e Updates to doc files 2019-05-09 13:08:24 -04:00
Elad Salomons 178ad5736e Update rules.c
Fix broken win build script
2019-05-09 20:01:14 +03:00
Sam Hatchett 55bf038884 Update CODE_OF_CONDUCT.md 2019-05-09 11:43:06 -04:00
Lew Rossman 253d74d907 Update test_demand.cpp 2019-05-09 10:40:58 -04:00
Lew Rossman 365ab00dcb Refactors the API's demand editing functions 2019-05-09 10:26:40 -04:00
Sam Hatchett cf9c2a9141 Merge pull request #3 from samhatchett/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2019-05-08 14:45:34 -04:00
Sam Hatchett 086db3bc02 Create CODE_OF_CONDUCT.md 2019-05-08 14:44:35 -04:00
Sam Hatchett 3f34a1ff2c Merge pull request #2 from OpenWaterAnalytics/dev
updates dev
2019-05-08 14:42:37 -04:00
Elad Salomons 52bda22833 Merge pull request #478 from eladsal/473
For "conditional" do not delete a node connected to a link
2019-05-08 16:56:23 +03:00
Lew Rossman 6ace84384b Merge pull request #472 from makusuko/fix-rules-label
Fix NULL pointer error if rules label is missing
2019-05-08 09:47:37 -04:00
Elad Salomons eefc7f7d05 For "conditional" do delete a node connected to a link
For "conditional" deletion the node is deleted only if all of its links have been explicitly deleted beforehand #473

Co-Authored-By: Lew Rossman <lrossman@outlook.com>
2019-05-06 11:36:41 +03:00
Elad Salomons d56601de43 Merge pull request #476 from Mariosmsk/update_win_build
Create Makefile2.bat
2019-05-04 22:03:13 +03:00
Sam Hatchett 6e621bcf57 Merge pull request #1 from OpenWaterAnalytics/dev
updates from origin
2019-05-03 16:12:20 -04:00
Markus Sunela 1b3141a8c7 Merge branch 'fix-rules-label' of https://github.com/makusuko/EPANET into fix-rules-label 2019-05-03 10:39:06 +03:00
Markus Sunela 1aef998b81 Fixed NULL pointer error, if no label is provided after the rule keyword.
Add NULL guard in freerules function. Use strncat and strncpy to ensure
the buffer lengths are adhered to.
2019-05-03 10:36:59 +03:00
Sam Hatchett d3e989b621 Create LICENSE 2019-05-03 10:21:04 +03:00
mariosmsk d34748e933 Create Makefile2.bat
Co-Authored-By: Demetrios G. Eliades <eldemet@users.noreply.github.com>
Co-Authored-By: Elad Salomons <selad@optiwater.com>
2019-05-02 20:56:38 +03:00
Markus Sunela 5d687d7d2c Fixed NULL pointer error, if no label is provided after the rule keyword. 2019-05-02 16:35:55 +03:00
Michael Tryby 61847dbcbc Merge pull request #466 from OpenWaterAnalytics/lrossman-dev
Fix problems with setting tank parameters (issue #464 )
2019-04-25 10:15:01 -04:00
Lew Rossman 97be7944f4 Fix problems with setting tank parameters (issue #464 ) 2019-04-25 08:22:44 -04:00
Michael Tryby 59bd09cc53 Merge pull request #465 from michaeltryby/dev-list
Dev list
2019-04-24 18:57:46 -04:00