-
Notifications
You must be signed in to change notification settings - Fork 84
Scaling, fix minor MCAS issue, and set up Seawater properties for dynamics #1717
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
Draft
dallan-keylogic
wants to merge
33
commits into
watertap-org:main
Choose a base branch
from
dallan-keylogic:additional_scaling
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Scaling, fix minor MCAS issue, and set up Seawater properties for dynamics #1717
dallan-keylogic
wants to merge
33
commits into
watertap-org:main
from
dallan-keylogic:additional_scaling
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary/Motivation:
As part of working on dynamics in WaterTap, I added material and energy density terms to the Seawater property package and made some improvements to unit model scaling.
Additionally, I found and fixed an issue when the MCAS property package was used 1) in a
Feedblock (and probably alsoProductblock) when 2) using a time set with more than one element. The issue seems to have been caused because the state variables (eitherflow_mol_phase_comporflow_mass_phase_compdepending on the configuration) were being created through the on-demand property framework, instead of creating them when initializing the state block. The fact that those state variables were not entirely initialized when theFeedblock tried to createReferencesto them at the unit-model level (moving the time index set from living on the state block to living on the state variable) caused an obscure Pyomo error.Legal Acknowledgement
By contributing to this software project, I agree to the following terms and conditions for my contribution: