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

Changes to GAC model and GAC example flowsheet to solve when MaterialFlowBasis.mass #1295

Merged
merged 14 commits into from
Mar 6, 2024

Conversation

hunterbarber
Copy link
Contributor

@hunterbarber hunterbarber commented Feb 8, 2024

Fixes/Resolves:

Changes to GAC model and GAC example flowsheet to solve when MaterialFlowBasis.mass

Summary/Motivation:

Improve GAC functionality with newer MCAS flow basis options

Changes proposed in this PR:

  • Change core GAC model to handle when MCAS MaterialFlowBasis.mass
  • Change test file to cover changes
  • Add mass basis as an option to the UI and example files

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.

@hunterbarber hunterbarber self-assigned this Feb 8, 2024
@hunterbarber hunterbarber linked an issue Feb 8, 2024 that may be closed by this pull request
Copy link

codecov bot commented Feb 8, 2024

Codecov Report

Attention: Patch coverage is 92.30769% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 94.38%. Comparing base (44468b7) to head (5b634e3).

Files Patch % Lines
watertap/examples/flowsheets/gac/gac_ui.py 75.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1295      +/-   ##
==========================================
- Coverage   94.39%   94.38%   -0.01%     
==========================================
  Files         371      371              
  Lines       37922    37941      +19     
==========================================
+ Hits        35795    35812      +17     
- Misses       2127     2129       +2     

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

@ksbeattie ksbeattie added the Priority:Normal Normal Priority Issue or PR label Feb 8, 2024
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.

One small type in the UI - otherwise LGTM

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 enabled auto-merge (squash) March 6, 2024 18:34
@lbianchi-lbl lbianchi-lbl merged commit e06fa6b into main Mar 6, 2024
24 checks passed
@hunterbarber hunterbarber deleted the gac_mass_basis branch March 6, 2024 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority:Normal Normal Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revise and test GAC for MCAS material_flow_basis="mass"
5 participants