jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,176 Commits 1 Branch 0 Tags
e7ccf5281f5329b8715bec1596a92490c7d13623
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Elad Salomons e7ccf5281f Update include files 2020-05-22 21:43:14 +03:00
Elad SalomonsandGitHub 6af72fd6d1 Merge pull request #594 from eladsal/dev 
Fix EN_settankdata for elevation with SI units
 2020-04-19 19:17:14 +03:00
Elad Salomons 37342c70b1 Another option for EN_settankdata fix 2020-04-19 18:05:08 +03:00
Elad Salomons 3f515e7ad4 Fix EN_settankdata for elevation with SI units 
Fix #593
 2020-04-19 09:42:43 +03:00
Elad SalomonsandGitHub b259f87782 Merge pull request #590 from eladsal/update-vb-bas 
Update epanet2.bas
 2020-04-19 08:07:58 +03:00
Elad Salomons 6ddea72ee9 Update epanet2.bas 2020-03-29 10:52:08 +03:00
Elad SalomonsandGitHub d8ba9b11c5 Merge pull request #589 from csweetapple/dev 
Allow start time to be set with EN_settimeparam
 2020-03-25 09:18:36 +02:00
Elad SalomonsandGitHub 62d6fca577 Merge pull request #587 from eladsal/fix-link 
Fix link in README.md
 2020-02-17 08:05:19 +02:00
Elad Salomons c7b32c1acc Fix link in README.md 
Link to community.wateranalytics.org was broken
 2020-02-15 19:33:57 +02:00
Elad SalomonsandGitHub 3abd02f4ae Merge pull request #585 from Mariosmsk/fix_initsetting583 
fix EN_INITSETTING
 2020-02-11 21:14:10 +02:00
Elad SalomonsandGitHub 02173df64c Merge pull request #560 from OpenWaterAnalytics/eldemet-patch-1 
Incorrect character causing a LaTeX compilation problem
 2019-11-16 20:32:26 +02:00
Elad SalomonsandGitHub bbe4fb7a0b Merge pull request #520 from OpenWaterAnalytics/lrossman/doc_updates 
Update BUILDING.md. Thank you @LRossman
 2019-07-27 08:24:49 +03:00
Elad SalomonsandGitHub 844ebde4d9 Merge pull request #514 from OpenWaterAnalytics/dev-PDA_fixes 
PDA fixes
 2019-07-22 22:26:46 +03:00
Elad SalomonsandGitHub 4cc16913df Merge pull request #510 from Mariosmsk/patch-2 
Good to go, thanks.
 2019-07-06 08:57:46 +03:00
Elad Salomons 5fafb4c314 Updating VB include files 2019-06-19 16:28:47 +03:00
Elad SalomonsandGitHub 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
Elad SalomonsandGitHub c8c2808430 Merge pull request #487 from OpenWaterAnalytics/eldemet-patch-3 
Delete epanet2.def
 2019-05-13 07:14:10 +03:00
Elad SalomonsandGitHub 5c04173287 Merge pull request #486 from OpenWaterAnalytics/eldemet-patch-2 
Update Makefile2.bat
 2019-05-13 07:13:54 +03:00
Elad SalomonsandGitHub d0634c9a09 Merge pull request #485 from OpenWaterAnalytics/eldemet-patch-1 
Update Makefile.bat
 2019-05-13 07:13:38 +03:00
Elad SalomonsandGitHub 4c9379d5cd Merge pull request #479 from samhatchett/dev 
code of conduct. Closes #57
 2019-05-13 07:11:57 +03:00
Elad Salomons 178ad5736e Update rules.c 
Fix broken win build script
 2019-05-09 20:01:14 +03:00
Elad SalomonsandGitHub 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
Elad SalomonsandLew Rossman 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 SalomonsandGitHub d56601de43 Merge pull request #476 from Mariosmsk/update_win_build 
Create Makefile2.bat
 2019-05-04 22:03:13 +03:00
Elad SalomonsandGitHub 140c95214e Merge pull request #385 from eladsal/dev-title 
Add new function to get and set title strings
 2019-02-07 22:13:40 +02:00
Elad Salomons ab62d3bb61 Add new function to get and set title strings 2019-02-06 11:45:48 +02:00
Elad SalomonsandGitHub bdbd23edba Merge pull request #377 from Mariosmsk/patch-1 
update example code Hydraulic & Quality analysis steps
 2019-01-30 19:47:32 +02:00
Elad Salomons 23e542a492 Mark VB reserved words in variable names 
I have marked the VB reserved words with an ending "_". Sorry the IDE messed the nice spacing...
 2019-01-10 08:39:49 +02:00
Elad SalomonsandGitHub db3f2f1818 Merge pull request #337 from Mariosmsk/update_realeasenotes_2_2 
update api functions/extensions. Thank you @Mariosmsk
 2018-11-10 07:47:20 +02:00
Elad Salomons 36972c2a60 Fix for VB header file 2018-11-08 10:09:35 +02:00
Elad Salomons d10649c0e7 Minor fix to the DEF file 2018-11-08 09:45:10 +02:00
Elad Salomons ca927702fa Small fix for DEF file 2018-11-08 09:36:33 +02:00
Elad SalomonsandGitHub 18fb352527 Merge pull request #327 from eladsal/dev-link-nodes 
Add ENsetlinknodes to DEF file and add a function check
 2018-10-31 18:23:03 +02:00
Elad Salomons 4394c53f9b Add ENsetlinknodes to DEF file and add a function check 2018-10-29 17:20:45 +02:00
Elad SalomonsandGitHub e32046ccc8 Merge pull request #319 from Mariosmsk/Update-ReleaseNotes2_2.md 
Update ReleaseNotes2_2.md
 2018-10-29 06:07:04 +02:00
Elad SalomonsandGitHub 8e258c2db2 Merge branch 'dev' into Update-ReleaseNotes2_2.md 2018-10-29 05:58:55 +02:00
Elad SalomonsandGitHub 4848f692f6 Merge pull request #296 from eladsal/dev-dem-cat 
Add demand names get\set APIs
Close #294
 2018-10-01 10:47:40 +03:00
Elad SalomonsandGitHub 75ad505601 Merge pull request #293 from Mariosmsk/EN_HEADLOSSFORM 
add option EN_HEADLOSSFORM in function ENgetoption

Thank you @Mariosmsk
 2018-09-29 10:09:51 +03:00
Elad Salomons 0932ef7d80 Update ReleaseNotes2_2.md 2018-09-26 12:24:11 +03:00
Elad Salomons 0b5c5a3b7e Test for set\get demand categories 2018-09-26 12:13:49 +03:00
Elad Salomons c1c80da667 Add APIs to get\set demand categories names 2018-09-26 11:15:37 +03:00
Elad SalomonsandGitHub 1e42b7f70d Merge pull request #291 from eladsal/dev-dem-cat 
Read and write the demand categories names
 2018-09-25 16:38:51 +03:00
Elad Salomons fbaf2a6061 Update release notes 
Added placeholders for new API functions, general changes, new definitions and list of contributing authors
 2018-09-22 11:29:56 +03:00
Elad Salomons cc21b55b68 Read and write demand categories names 
Fixes #290
 2018-09-22 11:19:05 +03:00
Elad SalomonsandGitHub 054c48c48a Merge pull request #287 from eladsal/dev-default-pattern 
Add option to get\set default demand pattern
 2018-09-21 17:22:28 +03:00
Elad Salomons dad11cce8d Add option to get\set default demand pattern 
also updates the net builder test
 2018-09-15 14:22:20 +03:00
Elad SalomonsandGitHub 902dac953f Merge pull request #278 from eladsal/net-builder-es 
Test  for the net builder functions
 2018-09-13 23:22:20 +03: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
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 SalomonsandGitHub 756e8be735 Merge pull request #265 from eladsal/dev-control 
Add EN_addcontrol function
 2018-09-05 07:42:02 +03:00
Elad Salomons 0f296db492 Initialize node and link comments in add functions 2018-09-04 21:15:57 +03:00
Elad Salomons fcbb47251e Fix old function calls 2018-09-04 08:26:22 +03: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
Elad SalomonsandGitHub 25db9cfe8f Merge pull request #242 from Mariosmsk/pr86 
add ENsetdemandpattern. Closes #241
 2018-08-31 06:51:39 +03:00
Elad Salomons 74d68a884c Fix typo 2018-08-30 18:05:39 +03:00
Elad SalomonsandGitHub 7d8d780a8b Merge branch 'dev' into pr86 2018-08-30 17:55:35 +03:00
Elad SalomonsandGitHub 7d374338a7 Merge pull request #250 from eladsal/dev-232 
Add legacy ENinit API and set status for new links in EN_addlink
 2018-08-30 12:47:27 +03:00
Elad SalomonsandGitHub cff7ca7433 Merge pull request #248 from OpenWaterAnalytics/dev-231 
Fix EN_addpattern and add test for the function
 2018-08-30 12:46:56 +03:00
Elad Salomons dbdafd6352 Set status for new links in EN_addlink 
Status is OPEN for pumps\pipes\CV and ACTIVE for valves. Closes #173
 2018-08-29 22:31:28 +03:00
Elad Salomons bcd6877935 Add legacy ENinit API 
Closes #232
 2018-08-29 22:26:32 +03:00
Elad SalomonsandMarios S. Kyriakou f3d680dc54 Fix test_addpattern test 
Thanks @mariosmsk

Co-Authored-By: Marios S. Kyriakou <mariosmsk@gmail.com>
 2018-08-29 18:12:25 +03:00
Elad Salomons edf4a09ebe Fix EN_addpattern 
Closes #231. Also adds unit test for the function.
 2018-08-29 15:14:49 +03:00
Elad SalomonsandGitHub da8522b553 Merge pull request #236 from Mariosmsk/issue235 
add hydstatus.c in win_build file to fix #235
 2018-08-27 23:18:29 +03:00
Elad SalomonsandGitHub 13011ae71c Merge pull request #229 from Mariosmsk/dev-issue228 
Syntax for the epanet executable, thanks @Mariosmsk
 2018-08-27 09:32:49 +03:00
Elad SalomonsandGitHub 6ab76efc5a Merge pull request #226 from Mariosmsk/dev-epanet 
fix addnode, thanks @Mariosmsk
 2018-08-27 09:21:47 +03:00
Elad Salomons a2fdd86a4d Updating windows build script 2018-08-23 23:20:16 +03:00
Elad Salomonsandmilad ghiami 761199b08e Added ENgetcurvetype API 
Also update curve type on EN_setheadcurveindex.

Co-Authored-By: milad ghiami <milad-ghiami@users.noreply.github.com>
 2018-08-20 21:10:49 +03:00
Elad Salomons 634651d4e6 Add option to get pump's constant power and speed 
Details in #215
 2018-08-18 21:54:52 +03:00
Elad Salomons 99e7151172 Add option to get link state 
Add EN_STATE to ENgetlinkvalue. Related to #218
 2018-08-17 15:43:53 +03:00
Elad Salomons e06368eca0 Adtional chnage for #208 2018-08-15 16:45:51 +03:00
Elad Salomons 4e48c31147 Fix PumpType and CurveType enums 
Also adds a general \default curve type. Fixes #208.
 2018-08-15 07:37:19 +03:00
Elad SalomonsandGitHub 5d6d0ca933 Merge branch 'dev' into contributor-lr 2018-08-13 11:07:10 +03:00
Elad Salomons d94e1643bf Update Windows build script and VB header file 
Also save HeadErrorLimit and FlowChangeLimit only if they are used.
 2018-08-13 09:19:05 +03:00
Elad Salomons 528e99a791 Update win make file to include genmmd.c 2018-07-17 07:17:33 +03:00
Elad Salomons f86df2291a Saving HeadErrorLimit and FlowChangeLimit only if they are used 
To help a bit with backward computability the two new parameters will be saved to the INP file only if values were set for them.
 2018-06-21 10:20:16 +03:00
Elad Salomons c41e140b6a Update VB header files 2018-06-19 11:16:32 +03:00
Elad Salomons 42f70f579f Remove strange string from types.h and fix win_build make file 2018-06-17 07:48:25 +03:00
Elad Salomons 80a0acc26b Set default pattern for new junctions 
Also fix an `ENgetqualtype` function call to include the project pointer
 2018-04-18 08:29:22 +03:00
Elad Salomons a46652f47c Fix bug when adding a junction 2018-04-17 21:46:09 +03:00
Elad Salomons 4415d8c4a1 Revert "Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev" 
This reverts commit 8fca63294d, reversing
changes made to b85aff9fc9.
 2018-04-09 15:03:03 +03:00
Elad Salomons 8fca63294d Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-04-09 15:02:19 +03:00
Elad Salomons b85aff9fc9 Change how demand categories linked-list is constructed (appending instead of prepending) 
Fix #150
This wasn't changed but one should note that the default pattern is used and saved if none assigned to a demand
 2018-04-09 15:01:27 +03:00
Elad Salomons dcd1c6dd10 Fix VB header file and win build script 2018-01-18 13:58:26 +02:00
Elad Salomons 831583a349 Revert "Fix VB header file and win build script" 
This reverts commit 2b60bec5b5.
 2018-01-18 13:55:48 +02:00
Elad Salomons 2b60bec5b5 Fix VB header file and win build script 2018-01-18 13:55:22 +02:00
Elad Salomons 5eead5ae40 Fix quality conversion factor error in ENsetqualtype 
Reported here:

http://community.wateranalytics.org/t/difference-in-water-age-calculated-in-epanet-and-in-matlab-using-epanet-matlab-toolkit/406/12
 2017-06-15 16:21:39 +03:00
Elad Salomons a00269e39a Added comment for 3c78856 
Added comment for 3c78856
 2017-05-01 13:28:59 +03:00