8000 v2.2 RC by samhatchett · Pull Request #570 · OpenWaterAnalytics/EPANET · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

v2.2 RC #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 882 commits into from
Dec 10, 2019
Merged

v2.2 RC #570

merged 882 commits into from
Dec 10, 2019

Conversation

samhatchett
Copy link
Member

This PR represents a huge amount of effort, from a wide variety of contributors. I'm at a loss to adequately summarize the enhancements and new features, but the commit log will do nicely for this purpose.

michaeltryby and others added 30 commits April 3, 2019 10:58
@michaeltryby
Merge pull request #444 from michaeltryby/dev
0f7c075 
Cleaning up build on gcc
@michaeltryby
removing reference to strncpy
568f89f
@michaeltryby
Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET in…
f99d417 
…to dev-unittesting
@michaeltryby
Fixing memory problems with test_toolkit
efd86c3 
Fixes memory leaks and some minor refactoring.
@michaeltryby
Update test_toolkit.hpp
b578380 
removing crtdbg.h from header
@michaeltryby
Update CMakeLists.txt
be2b0a3 
Restoring test_net_builder to test_toolkit.exe
@michaeltryby
Cleaning up include statements adding crtdbg.h
84bf6f9
@michaeltryby
Fixing index error in test
502e5f1
@michaeltryby
Merge pull request #443 from OpenWaterAnalytics/lrossman-dev17
9f867b1 
Removed the EN_DEFDEMANDPAT option
@michaeltryby
merging upstream dev
927cf97
@michaeltryby
Merge pull request #445 from michaeltryby/dev-unittesting
f63df92 
Fix leaky test code
Add more analysis options to the API (issue #425)
3e733f5
Fixed epanet2_enums.h
1632508
@LRossman
Merge pull request #447 from OpenWaterAnalytics/lrossman-dev
b87c102 
Add more analysis options to the API (issue #425)
Eliminates use of temporary linked lists to process Patterns & Curves…
edcd4b6 
… (issue #449)
Update input2.c
b2a8b55
@LRossman
Merge pull request #450 from OpenWaterAnalytics/lrossman-dev
1f67c8c 
Eliminates use of temporary linked lists to process Patterns & Curves…
Bug fix for 2Comp and LIFO tank mixing models (issue #448)
b844323
@michaeltryby
Triggering build to update benchmarks
d436b23
@michaeltryby
Added new reg tests
04a6ece 
Updating reference build id
@michaeltryby
Merge branch 'fix_bug_getdemandname' of https://github.com/Mariosmsk/…
14af368 
…EPANET into Mariosmsk-fix_bug_getdemandname
@michaeltryby
Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET in…
cf1fc43 
…to Mariosmsk-fix_bug_getdemandname
@michaeltryby
Merge pull request #451 from OpenWaterAnalytics/lrossman-dev
a72e2dc 
Bug fix for 2Comp and LIFO tank mixing models (issue #448)
@michaeltryby
Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET in…
a6e0337 
…to Mariosmsk-fix_bug_getdemandname
@Mariosmsk
Merge pull request #1 from michaeltryby/Mariosmsk-fix_bug_getdemandname
700110c 
Mariosmsk fix bug getdemandname
@michaeltryby
Merge pull request #431 from Mariosmsk/fix_bug_getdemandname
8b4727e 
try to fix bug in EN_getdemandname
@michaeltryby
Initial commit list
30f0def 
generic linked list
@michaeltryby
Update test_list.cpp
6f236f0 
Tests are passing
@michaeltryby
Update list.h
dcfa51f 
Adding documentation
@michaeltryby
Fix typo
1fdee6a
LRossman and others added 16 commits November 15, 2019 12:50
@LRossman
Restored prior update to project.c that got overwritten
94b6cb2
@LRossman
Fixed editing errors made to project.c
2033ddf
@eladsal
Merge pull request #560 from OpenWaterAnalytics/eldemet-patch-1
02173df 
Incorrect character causing a LaTeX compilation problem
@LRossman
Merge pull request #562 from OpenWaterAnalytics/lrossman-valvecheck_fix
f87865a 
Bug fix for valvecheck function
@eldemet
PDF Guide
3259a8c 
PDF users' guide for EPANET, and some minor corrections to readme.md to fix some formatting issues.
@eldemet
HTML Users Guide
c16c861
Fixes a "copy over" bug in input3.c
3935247 
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.
@LRossman
Merge pull request #565 from OpenWaterAnalytics/lrossman-input3_bug_fix
f181524 
Fixes a "copy over" bug in input3.c
Correction made to doc files
e11740c 
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.
@LRossman
Merge pull request #566 from OpenWaterAnalytics/lrossman-doc_correction
5288bc8 
Correction made to doc files
Update ReleaseNotes2_2.md
21defae 
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.
@LRossman
Merge pull request #567 from OpenWaterAnalytics/lrossman-ReleaseNotes…
b3a306f 
…Update

Update ReleaseNotes2_2.md
Fixes problem with re-opening const. HP pumps
d05ea20 
See latest comments in issue #528. Also, the setlinkflow() function was deleted as it was never called anywhere.
@LRossman
Merge pull request #568 from OpenWaterAnalytics/lrossman-Pump_Bug_Fix
8d9f857 
Fixes problem with re-opening const. HP pumps
@samhatchett
Update README.md (#539)
865a16c 
* 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.
updates CI badges
b5eb1e9
@rjanke20
Copy link
Contributor
rjanke20 commented Dec 6, 2019 via email
F438

eladsal
eladsal reviewed Dec 7, 2019
View reviewed changes
Copy link
Member
@eladsal eladsal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @samhatchett , all seems fine. Code compiles and run on my tests.

LRossman
LRossman reviewed Dec 7, 2019
View reviewed changes
Copy link
Collaborator
@LRossman LRossman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a quick check of the compiled Toolkit using my LEPANET GUI and found no issues.
I checked portions of the gh-pages and they look fine.
I checked the markdown files on the repo's main page and found the following two items in README.MD that might need attention:

  1. The Codecov badge says "unknown". Does this get updated automatically when the merge is made?
  2. The link to BUILDING.MD references the dev branch when it should now be the master branch.

I also found that the list.h and list.c files in the src/util folder are never used anywhere in the project.

@samhatchett
Copy link
Member Author

Thanks for the deep dive @LRossman !

  1. The Codecov badge says "unknown". Does this get updated automatically when the merge is made?

Right - I think that Codecov was set up after the most recent merge to master - so it's never been run on that branch. That should resolve once this PR merges.

  1. The link to BUILDING.MD references the dev branch when it should now be the master branch.

good catch - will fix.

I also found that the list.h and list.c files in the src/util folder are never used anywhere in the project.

Awesome - will remove.

@eladsal
Copy link
Member
eladsal commented Dec 8, 2019

The list of authors in ReleaseNotes2_2.md can be updated with @makusuko.

@samhatchett
Copy link
Member Author

ok, with that contributor added to the 2.2 notes, are there any final blockers to this merge? I'll give this 24h, given the different time zones involved. Nice work everyone!

@LRossman
Copy link
Collaborator

@samhatchett I suggest that after the merge and the Releases page update that you announce the v2.2 release to the Community Forum mentioning the following major new features:

  • a full set of functions to set and retrieve values for all parameters contained in a network model
  • allowing networks to be built completely from function calls instead of from an input file
  • allowing multiple projects to be analyzed in parallel in a thread-safe manner
  • the ability to use pressure dependent demands in hydraulic analyses
  • more robust results with regard to hydraulic convergence, low/zero flow conditions, and water quality mass balance
  • faster run times for single period hydraulic analyses.

You might also mention that the v2.2 engine DLL will work with the legacy GUI but without access to pressure dependent demands or the newly added convergence criteria at this time.

@samhatchett samhatchett merged commit 4d8d82d into master Dec 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eladsal eladsal eladsal left review comments

@LRossman LRossman LRossman left review comments

@eldemet eldemet Awaiting requested review from eldemet

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@samhatchett @rjanke20 @eladsal @LRossman @michaeltryby @Mariosmsk @makusuko @eldemet
0