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.

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

Flowsheet documentation for RO w/ ERD #1446

Merged
merged 18 commits into from
Jun 28, 2024

Conversation

kurbansitterley
Copy link
Contributor

Fixes/Resolves:

RO w/ ERD flowsheet documentation for #1219

Summary/Motivation:

Add flowsheet documentation for RO_with_energy_recovery.py

Changes proposed in this PR:

  • add doc .rst file
  • add figures for each ERD configuration

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.

@kurbansitterley kurbansitterley self-assigned this Jun 20, 2024
@kurbansitterley kurbansitterley added the 1.0 Hard requirement for the 1.0 release label Jun 20, 2024
Copy link

codecov bot commented Jun 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.94%. Comparing base (eef84c0) to head (e8c5b96).
Report is 5 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1446   +/-   ##
=======================================
  Coverage   93.94%   93.94%           
=======================================
  Files         310      310           
  Lines       33206    33206           
=======================================
  Hits        31194    31194           
  Misses       2012     2012           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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.

2 minor things to address, but otherwise LGTM

kurbansitterley and others added 3 commits June 24, 2024 14:32
Co-authored-by: MarcusHolly <96305519+MarcusHolly@users.noreply.github.com>
Copy link
Contributor

@savannahsakhai savannahsakhai left a comment

Choose a reason for hiding this comment

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

LGTM

@lbianchi-lbl lbianchi-lbl added the Priority:High High Priority Issue or PR label Jun 27, 2024
@lbianchi-lbl
Copy link
Contributor

@kurbansitterley @adam-a-a FYI here's how I solved the merge conflict in the index page, let me know if something doesn't look right:

2024-06-28_08-33
2024-06-28_08-33_1

@lbianchi-lbl lbianchi-lbl merged commit a5103f3 into watertap-org:main Jun 28, 2024
3 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.0 Hard requirement for the 1.0 release Priority:High High Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants