Function Scoping Fixes

[dallan-keylogic]

Fixes

-- Fixes function closure issues outlined in #1240 and #1241 for the Separator and SOC.

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.

[codecov]

Codecov Report

Patch coverage: 74.86% and no project coverage change.

Comparison is base (721f1f9) 76.84% compared to head (dc7934b) 76.84%.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1242   +/-   ##
=======================================
  Coverage   76.84%   76.84%           
=======================================
  Files         390      390           
  Lines       61963    61981   +18     
  Branches    11398    11393    -5     
=======================================
+ Hits        47616    47630   +14     
- Misses      11878    11884    +6     
+ Partials     2469     2467    -2     

Files Changed	Coverage Δ
idaes/models/unit_models/separator.py	72.92% <74.01%> (+0.38%)	⬆️
idaes/models/unit_models/mixer.py	86.86% <100.00%> (ø)
..._models/soc_submodels/solid_oxide_module_simple.py	94.81% <100.00%> (+0.78%)	⬆️

... and 1 file with indirect coverage changes

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

[andrewlee94]

@jsiirola Would you have time to take a quick look at this to double check that there aren't any other unexpected issues related to this (either ones that were already there or something added by this change)?

[andrewlee94]

This looks good to me, pending the tests passing.

[dallan-keylogic]

The only remaining issue that I could see is mutation of the "list" (I think it's actually a dictionary) s_vars, however I don't think that occurs in the code as written. Maybe better to clean that up completely, though?

[dallan-keylogic]

@andrewlee94 , I renamed some variables, which seems to have triggered CodeCov. Is there a way to just force the rest of the checks to run anyway?

[andrewlee94]

@dallan-keylogic It looks like the CodeCov failure is due to coverage creep in the repo - our threshold for coverage is slowly creeping up as we force better coverage in the codebase which means that older sections can fall below the new threshold. In this case I am happy to bypass that check.

[bpaul4]

This looks good to me. Interesting idea placing repeated exceptions in callable methods, too.

[dallan-keylogic]

This looks good to me. Interesting idea placing repeated exceptions in callable methods, too.

If I have to copy and paste once I cringe, if I have to do it twice it becomes a method. That way if you want to change something, you only need to change it one place rather than ten different places scattered throughout the code.