Skip to content
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

Add documentation for OARO flowsheet #1351

Merged
merged 114 commits into from
May 21, 2024
Merged

Add documentation for OARO flowsheet #1351

merged 114 commits into from
May 21, 2024

Conversation

luohezhiming
Copy link
Contributor

@luohezhiming luohezhiming commented Apr 2, 2024 •
edited
Loading

Fixes/Resolves:

(replace this with the issue #1219 fixed or resolved, if no issue exists then a brief statement of what this PR does)

Summary/Motivation:

OARO flowsheet documentaion

Changes proposed in this PR:

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@luohezhiming
add
7d35890
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
4766c52
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
ef81bae
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
168bbaf
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
a09b4e9
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
44a22e8
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
1c1a135
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
401f997
@luohezhiming
delete redundant files
258f6fe
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
2c994c3
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
5b6baed
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
0afa551
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
479fb6d
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
b393ed0
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
708ad0a
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
5a69761
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
112415a
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
93737c0
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
3162e34
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
637b32d
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
ea4e066
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
84a2900
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
17bc5e3
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
f816483
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
fea68e3
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
c19fba5
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
0754d21
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
9dcece1
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
a5325c9
@luohezhiming
Merge branch 'main' of https://github.com/watertap-org/watertap
c4bc3ef
luohezhiming and others added 2 commits April 11, 2024 11:07
@luohezhiming @zacharybinger
Update docs/technical_reference/flowsheets/oaro.rst
23f9342 
Co-authored-by: zacharybinger <zbinger@nrel.gov>
@luohezhiming @zacharybinger
Update docs/technical_reference/flowsheets/oaro.rst
22a7703 
Co-authored-by: zacharybinger <zbinger@nrel.gov>
@ksbeattie ksbeattie added the Priority:Normal Normal Priority Issue or PR label Apr 11, 2024
@ksbeattie ksbeattie added 1.0 Hard requirement for the 1.0 release Priority:High High Priority Issue or PR and removed Priority:Normal Normal Priority Issue or PR labels Apr 18, 2024
@luohezhiming luohezhiming mentioned this pull request Apr 18, 2024
Closed
21 tasks
MarcusHolly
MarcusHolly reviewed May 7, 2024
View reviewed changes
Copy link
Contributor

@MarcusHolly MarcusHolly left a comment

Choose a reason for hiding this comment

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

A few minor comments. I could approve this, but would rather have one of the other reviewers with more background/insight on OARO give the final approval.

docs/technical_reference/flowsheets/oaro.rst Outdated Show resolved Hide resolved
docs/technical_reference/flowsheets/oaro.rst Outdated Show resolved Hide resolved
@bknueven bknueven enabled auto-merge (squash) May 21, 2024 19:40
@bknueven bknueven merged commit 233320e into watertap-org:main May 21, 2024
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcusHolly MarcusHolly MarcusHolly left review comments

@adam-a-a adam-a-a adam-a-a approved these changes

@zacharybinger zacharybinger zacharybinger approved these changes

@TimBartholomew TimBartholomew Awaiting requested review from TimBartholomew

@ElmiraShamlou ElmiraShamlou Awaiting requested review from ElmiraShamlou

Assignees

@luohezhiming luohezhiming

Labels
1.0 Hard requirement for the 1.0 release Priority:High High Priority Issue or PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@luohezhiming @adam-a-a @zacharybinger @MarcusHolly @ksbeattie @bknueven