JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,287 Commits 1 Branch 0 Tags
30c511ca78e6072d766bc74307ddb9dcbfc936fd
Commit Graph

1287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew Rossman
67f7d8f76b Merge branch 'dev' into dev_2.3 2020-07-10 14:36:46 -04:00
Elad Salomons
bdac8d37a7 Merge pull request #604 from Mariosmsk/dev 
Net1.inp have 0 MinorLoss / GUI accepts values zero for MINORLOSS
 2020-06-28 19:55:03 +03:00
mariosmsk
e0745e9dc5 Update epanet.c 2020-06-25 20:22:12 +03:00
mariosmsk
532f89d14b Net1.inp have 0 MinorLoss / GUI accepts values zero for MINORLOSS. Similar to the parameter Power of pumps 2020-06-25 20:11:27 +03:00
Elad Salomons
9b42b19f56 Merge pull request #598 from OpenWaterAnalytics/dev_feature_in_control 
Dev feature in control
 2020-05-31 16:36:45 +03:00
Elad Salomons
d03327cfa5 Merge pull request #596 from jamesuber/dev 
API access to incontrols() for information about node/link controls p…

No more comments so I'm merging. Thank you @jamesuber
 2020-05-29 22:28:45 +03:00
Elad Salomons
e7ccf5281f Update include files 2020-05-22 21:43:14 +03:00
james uber
949022ed49 API access to incontrols() for information about node/link controls participation 
allowing access to incontrols() for getting information about whether a node or link participates in a simple or rule-based control.
 2020-05-22 11:45:52 -04:00
Elad Salomons
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
Lew Rossman
37a58a467c Update epanet.c 2020-04-19 09:25:36 -04:00
Lew Rossman
99f09f1edb A simpler fix to EN_settankdata 
Changes 1 line instead of 4.
 2020-04-19 09:16:08 -04:00
Elad Salomons
3f515e7ad4 Fix EN_settankdata for elevation with SI units 
Fix #593
 2020-04-19 09:42:43 +03:00
Elad Salomons
b259f87782 Merge pull request #590 from eladsal/update-vb-bas 
Update epanet2.bas
 2020-04-19 08:07:58 +03:00
Lew Rossman
241ebe930d Merge pull request #591 from mcneish1/valgrind-issues-dev 
Fix use-after-free in Smatrix, test_pda
 2020-04-14 13:06:47 -04:00
Lew Rossman
b64e070354 Update project.c 2020-04-13 09:39:58 -04:00
Corey McNeish
ee5e910454 Alloc, free persistent parts of Hydraul in allocdata, rather than in allocmatrix 2020-04-11 11:33:37 -07:00
Corey McNeish
f358e39728 Make node degree list local to factorize 2020-04-11 11:33:28 -07:00
Elad Salomons
6ddea72ee9 Update epanet2.bas 2020-03-29 10:52:08 +03:00
Elad Salomons
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
chrisgs
364ad08bcc Limit EN_STARTTIME parameter value to SECperDAY 
Limit `EN_STARTTIME` parameter value to a maximum of `SECperDAY`, and
return an error code if this is exceeded.
 2020-03-23 22:14:02 +00:00
chrisgs
21e1e4c019 Allow start time to be set with EN_settimeparam 
Add additional case for `EN_STARTTIME` to the `EN_settimeparam`
function.
 2020-03-21 17:13:40 +00:00
Elad Salomons
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 Salomons
3abd02f4ae Merge pull request #585 from Mariosmsk/fix_initsetting583 
fix EN_INITSETTING
 2020-02-11 21:14:10 +02:00
Lew Rossman
a9ab376aa7 Revert "Replaced status checking for pumps & FCVs" 
This reverts commit 3ee30ce019.
 2020-02-09 17:25:33 -05:00
Lew Rossman
a3537b767a Revert "Changed benchmark results for EN_getstatistic test" 
This reverts commit 7e3d5e1fe0.
 2020-02-09 16:58:37 -05:00
mariosmsk
25f9a6f6d1 fix EN_INITSETTING 
Co-Authored-By: Lew Rossman <lrossman@outlook.com>
Co-Authored-By: Elad Salomons <selad@optiwater.com>

#583
 2020-02-09 22:05:40 +02:00
Lew Rossman
7e3d5e1fe0 Changed benchmark results for EN_getstatistic test 2020-02-07 13:49:54 -05:00
Lew Rossman
3ee30ce019 Replaced status checking for pumps & FCVs 
See ReleaseNotes2_3.md.
 2020-02-07 10:44:52 -05:00
Lew Rossman
80f9acfe4d Network building enhancements 2020-02-04 10:01:23 -05:00
Abel Heinsbroek
77243b1607 Add author to release notes (#571) 2019-12-11 14:13:01 -05:00
Sam Hatchett
6639ce9b3e adding contributor to notes 2019-12-09 09:56:50 -05:00
Sam Hatchett
c0fe89ceb5 possessive vs contraction 2019-12-07 21:16:58 -05:00
Sam Hatchett
0ca1a0b7a7 cleanup of readme links and unused files 2019-12-07 20:49:21 -05:00
Sam Hatchett
b5eb1e9882 updates CI badges 2019-12-06 10:16:34 -05:00
Sam Hatchett
865a16cec8 Update README.md (#539) 
* Update README.md

* Update README.md

Some section titles were re-named to conform to GitHub guidelines and the OWA info was moved to a CREDITS section.

* Update README.md

Added link to the Community Forum page.

* Replaced OWA copyright with "(see AUTHORS)".

* Update AUTHORS

Copied format used by the OWA-SWMM project.

* Update README.md

The Disclaimer section was edited to reflect that there actually is a "collaborative" connection between USEPA and OWA.
 2019-12-06 10:05:44 -05:00
Lew Rossman
8d9f85737e Merge pull request #568 from OpenWaterAnalytics/lrossman-Pump_Bug_Fix 
Fixes problem with re-opening const. HP pumps
 2019-12-05 16:03:31 -05:00
Lew Rossman
d05ea20c9a Fixes problem with re-opening const. HP pumps 
See latest comments in issue #528. Also, the setlinkflow() function was deleted as it was never called anywhere.
 2019-12-05 10:16:12 -05:00
Lew Rossman
b3a306f69b Merge pull request #567 from OpenWaterAnalytics/lrossman-ReleaseNotesUpdate 
Update ReleaseNotes2_2.md
 2019-12-05 10:03:32 -05:00
Lew Rossman
21defae4c7 Update ReleaseNotes2_2.md 
I added the v2.2 contributing authors to the notes. I checked PR's from 2017 and beyond and these were the only names I could find. Please append any one I might have missed.
 2019-12-04 10:56:01 -05:00
Lew Rossman
5288bc88bf Merge pull request #566 from OpenWaterAnalytics/lrossman-doc_correction 
Correction made to doc files
 2019-12-04 09:23:27 -05:00
Lew Rossman
e11740ce56 Correction made to doc files 
The output-format.dox file was deprecated and not included in the doxyfile so it was deleted. The description of the format of of the Energy Usage section of the binary output in toolkit-files.dox was corrected.
 2019-12-02 11:26:50 -05:00
Lew Rossman
f18152482c Merge pull request #565 from OpenWaterAnalytics/lrossman-input3_bug_fix 
Fixes a "copy over" bug in input3.c
 2019-12-02 11:17:13 -05:00
Lew Rossman
3935247e2b Fixes a "copy over" bug in input3.c 
The copying of one input line token over another was causing a compilation error under Clang. With v2.2 this copying is no longer needed so the line of code in question was simply deleted.

This commit also deletes the HTML and Latex output generated by running Doxygen that got added from the previous update to dev since they don't really belong in a source code repo.
 2019-11-29 15:56:33 -05:00
Demetrios G. Eliades
c16c861789 HTML Users Guide 2019-11-21 16:58:18 +02:00
Demetrios G. Eliades
3259a8c1e1 PDF Guide 
PDF users' guide for EPANET, and some minor corrections to readme.md to fix some formatting issues.
 2019-11-21 16:55:49 +02:00
Lew Rossman
f87865a849 Merge pull request #562 from OpenWaterAnalytics/lrossman-valvecheck_fix 
Bug fix for valvecheck function
 2019-11-19 09:40:11 -05:00
Elad Salomons
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
Lew Rossman
2033ddfc22 Fixed editing errors made to project.c 2019-11-15 12:55:29 -05:00