JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,191 Commits 1 Branch 0 Tags
8cf5a175bdf0a9d14f173ff84b7b5eb0155867bb
Commit Graph

1191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman
560105c700 Merge pull request #516 from Mariosmsk/fix_rule_actions 
Fix EN_getElseaction and EN_setelseaction
 2019-07-24 17:55:55 -04:00
mariosmsk
4e2e6c952a Fix EN_getElseaction and EN_setelseaction 
Co-Authored-By: Andreas Ashikkis <andreasashikkis@users.noreply.github.com>
 2019-07-24 16:13:37 +03:00
Lew Rossman
a184a3a39a Merge pull request #515 from OpenWaterAnalytics/dev-PDA_fixes 
Fixes Overflow and PDA tests not being run
 2019-07-22 17:59:42 -04:00
Lew Rossman
0760648aef Fixes Overflow and PDA tests not being run 2019-07-22 17:42:29 -04:00
Elad Salomons
844ebde4d9 Merge pull request #514 from OpenWaterAnalytics/dev-PDA_fixes 
PDA fixes
 2019-07-22 22:26:46 +03:00
Lew Rossman
051519dca0 Another minor change to force another CI test 2019-07-22 12:22:48 -04:00
Lew Rossman
a22a3cffe0 Minor update to force new CI test 2019-07-22 11:25:12 -04:00
Lew Rossman
a89f339525 PDA fixes 2019-07-22 09:50:41 -04:00
Sam Hatchett
3fe11b98ee rethinking the python wrapper (#511) 
* renames certain function parameter declarations and removes double pointer call from the deleteproject function

* deprecates conditonal compilation, removes python-specific headers and function renaming

* fixes tests and docs

* fixes test
 2019-07-17 15:19:25 -04:00
Elad Salomons
4cc16913df Merge pull request #510 from Mariosmsk/patch-2 
Good to go, thanks.
 2019-07-06 08:57:46 +03:00
Lew Rossman
006db4a0da Merge pull request #508 from OpenWaterAnalytics/win_build_script_fix 
Update Makefile.bat
 2019-06-29 10:08:37 -04:00
Marios S. Kyriakou
f267eeb93a Update Makefile2.bat 
#508
 2019-06-26 20:36:58 +03:00
Lew Rossman
a052e87106 Update Makefile.bat 2019-06-26 11:47:48 -04:00
Lew Rossman
57403b885e Merge pull request #505 from OpenWaterAnalytics/feature-tankoverflow 
Adds tank overflow feature
 2019-06-21 11:44:25 -04:00
Lew Rossman
85e2f2c187 Identifies overflowing tank in Status Report 2019-06-20 15:00:18 -04:00
Lew Rossman
d17a7df956 Update input3.c 2019-06-19 11:00:23 -04:00
Elad Salomons
5fafb4c314 Updating VB include files 2019-06-19 16:28:47 +03:00
Lew Rossman
2bec884e3c Updating docs for tank overflow feature 2019-06-17 09:54:26 -04:00
Lew Rossman
9669742ab3 Adds tank overflow feature 2019-06-17 09:16:04 -04:00
Lew Rossman
fe92a99554 Merge pull request #503 from OpenWaterAnalytics/lrossman-dev-doc 
Numerous updates to project documentation
 2019-05-31 12:54:00 -04:00
Lew Rossman
2bbbf736b0 Numerous updates to project documentation 2019-05-30 13:28:32 -04:00
Lew Rossman
39f66b84a1 Merge pull request #501 from OpenWaterAnalytics/lrossman-dev-doc 
Change  properties for new pipe created with EN_addlink (issue #500)
 2019-05-29 11:19:14 -04:00
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
17b4ffb2bd Merge pull request #499 from OpenWaterAnalytics/lrossman-dev-doc 
Fixes problem with findpattern() function (issue #498)
 2019-05-24 12:25:23 -04:00
Lew Rossman
40c39fd3c6 Fixes problem with findpattern() function (issue #498) 2019-05-24 10:33:36 -04:00
Lew Rossman
f75a946921 Merge pull request #496 from OpenWaterAnalytics/lrossman-dev-doc 
Update BUILDING.md
 2019-05-16 19:04:01 -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