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

Function Scoping Fixes #1242

Merged
merged 12 commits into from
Aug 24, 2023
+352 −348
Merged

Function Scoping Fixes #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c524b3
change attribute errors to configuration errors
dallan-keylogic Aug 10, 2023
ca2c217
towards a better behaved model
dallan-keylogic Aug 14, 2023
b01c99f
use partial instead
dallan-keylogic Aug 16, 2023
9a412e4
revert port option change and run Black
dallan-keylogic Aug 16, 2023
eb6fa4f
remove unused variables
dallan-keylogic Aug 16, 2023
dea57ed
change import order for pylint
dallan-keylogic Aug 16, 2023
e9091fc
fix mixer issue
dallan-keylogic Aug 21, 2023
07883c4
Merge branch 'main' into flash-tweaks
dallan-keylogic Aug 21, 2023
deb431d
simplify function trace
dallan-keylogic Aug 21, 2023
d409253
run Black
dallan-keylogic Aug 21, 2023
c7ccd8e
actually commit mixer
dallan-keylogic Aug 21, 2023
dc7934b
Merge branch 'main' into flash-tweaks
dallan-keylogic Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions idaes/models/unit_models/mixer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,11 +1180,11 @@ def calculate_scaling_factors(self):
iscale.constraint_scaling_transform(c, s, overwrite=False)

if hasattr(self, "enthalpy_mixing_equations"):
for t, c in self.enthalpy_mixing_equations.items():

def scale_gen():
for p in self.mixed_state[t].phase_list:
yield self.mixed_state[t].get_enthalpy_flow_terms(p)
def scale_gen(t):
for p in self.mixed_state[t].phase_list:
yield self.mixed_state[t].get_enthalpy_flow_terms(p)

s = iscale.min_scaling_factor(scale_gen(), default=1)
for t, c in self.enthalpy_mixing_equations.items():
s = iscale.min_scaling_factor(scale_gen(t), default=1)
iscale.constraint_scaling_transform(c, s, overwrite=False)
Loading
Loading