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

Add GUI for RO flowsheet #1159

Merged
merged 67 commits into from
Oct 26, 2023
Merged

Add GUI for RO flowsheet #1159

merged 67 commits into from
Oct 26, 2023

Conversation

luohezhiming
Copy link
Contributor

Fixes/Resolves:

Summary/Motivation:

Add GUI for the RO_with_energy_recovery.py flowsheet

Changes proposed in this PR:

  • add GUI
  • add figure

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.

@MarcusHolly
Copy link
Contributor

Screenshots of GUI

Input Tab:
image

Output Tab:
image

@MarcusHolly
Copy link
Contributor

MarcusHolly commented Oct 3, 2023

I'll let other people comment on whether or not more things should be included in the input and output tabs, but I think every variable in the input tab should start off as "fixed". There are some that have been changed to "free", which I assume you just did to make sure the sweep was working correctly.

My new PR (#1160) is also running into pylint errors... @lbianchi-lbl is it ok if we bypass this test or should we really aim to resolve it? These are my remaining pylint warnings, and I don't think resolving any of these would be trivial (with the exception of the import warnings potentially). I'm also not convinced that these pylint errors are related to the GUI files we're modifying.
image

@adam-a-a
Copy link
Contributor

adam-a-a commented Oct 3, 2023

I'll let other people comment on whether or not more things should be included in the input and output tabs, but I think every variable in the input tab should start off as "fixed". There are some that have been changed to "free", which I assume you just did to make sure the sweep was working correctly.

My new PR (#1160) is also running into pylint errors... @lbianchi-lbl is it ok if we bypass this test or should we really aim to resolve it? These are my remaining pylint warnings, and I don't think resolving any of these would be trivial (with the exception of the import warnings potentially). I'm also not convinced that these pylint errors are related to the GUI files we're modifying. image

This pylint issue popped up in at least PR #1145, which @bknueven temporarily resolved by limiting the version of pylint in PR #1145. That one will be merged very soon.

@luohezhiming
Copy link
Contributor Author

luohezhiming commented Oct 3, 2023

Screenshots of GUI

Input Tab: image

Output Tab: image

Thanks, Marcus. This is pretty good point, one of the problem is the feed flowrate and concentration are calculated by calculate_state and not directly specified. That's why it is shown as free variables in the GUI. I've already modified the inputs of feed as flowrate of water and NaCl. Right now, they are all fixed variables that we can make sweep analysis

@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9f143c0) 94.91% compared to head (34ea1af) 94.92%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1159      +/-   ##
==========================================
+ Coverage   94.91%   94.92%   +0.01%     
==========================================
  Files         341      342       +1     
  Lines       34603    34652      +49     
==========================================
+ Hits        32842    32892      +50     
+ Misses       1761     1760       -1     
Files Coverage Δ
...with_energy_recovery/RO_with_energy_recovery_ui.py 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

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

@MarcusHolly MarcusHolly mentioned this pull request Oct 5, 2023
8 tasks
@ksbeattie ksbeattie added the Priority:Normal Normal Priority Issue or PR label Oct 5, 2023
@adam-a-a
Copy link
Contributor

@luohezhiming I think this should be good to merge once you update the flowsheet image to represent the configuration (i.e., include pumps and ERD)

@luohezhiming
Copy link
Contributor Author

@luohezhiming I think this should be good to merge once you update the flowsheet image to represent the configuration (i.e., include pumps and ERD)

@adam-a-a I updated the figure and I think it is ready for merge, we can upgrade it with different types once the UI option is available.

@adam-a-a
Copy link
Contributor

@MichaelPesce @dangunter btw- just a reminder that this is one of the examples that we think would serve well for testing config options (e.g., switch between one flowsheet build and another)

Copy link
Contributor

@adam-a-a adam-a-a left a comment

Choose a reason for hiding this comment

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

LGTM

@adam-a-a adam-a-a enabled auto-merge (squash) October 26, 2023 20:31
@adam-a-a adam-a-a merged commit 5d5daba into watertap-org:main Oct 26, 2023
24 checks passed
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.

4 participants