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

DISPATCHES Cleanup #222

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from

Conversation

MarcusHolly
Copy link

@MarcusHolly MarcusHolly commented Dec 21, 2023

Summary/Motivation:

Replacement of #217. Other contributors were unable to push commits into that PR, so we'll continue the effort on this PR.

Description from #217:
This PR adds all work in progress files for the FE case study that addresses the following aspects:

  • Double loop implementation of FE case study: pending work here includes updating the the nlp design model with the latest in integrated nlp model in the main and get updated prescient data

  • CCS: pending work here is to update the underlying design models to the latest in the main. Also, to get latest surrogates from the CCSI2 for heat and cost using PCC flue gas. Finally, the models were working around Oct 2022 so they must be made compatible for both latest pyomo and IDAES

  • Multiperiod GDP: The files must be updated (mainly initialization) for latest multiperiod class (i.e., latest IDAES) and latest Pyomo. needs to improved to obtain reasonable results.

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.md and COPYRIGHT.md 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
Author

MarcusHolly commented Dec 21, 2023

I believe all the double loop files are "working" now, but nlp_multiperiod_usc_static_doubleloop.py is still running into some issues. It exceeds the max number of iterations and the solver enters restoration. Adding scaling didn't resolve the issue (or help at all from what I could tell), so I just removed it. It's still able to generate the plots for whatever that's worth... any advice on this would be appreciated.

As for run_double_loop_usc.py, I just need to double check that it solves with Gurobi, but I haven't had the time to pull that up and run it yet.

Otherwise, I think the double loop files are good-to-go.

@MarcusHolly MarcusHolly marked this pull request as draft December 21, 2023 21:21
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.

@MarcusHolly from what I can make out from current error messages, there are 3 python files missing headers, and I dropped comments on three that I saw from a quick skim (there may be others that slipped through cracks but I am assuming these 3 are the only files of concern)

@MarcusHolly MarcusHolly self-assigned this Dec 22, 2023
Copy link

codecov bot commented Dec 22, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a9e9b7a) 89.83% compared to head (07212b3) 89.83%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #222   +/-   ##
=======================================
  Coverage   89.83%   89.83%           
=======================================
  Files          77       77           
  Lines        9307     9307           
=======================================
  Hits         8361     8361           
  Misses        946      946           

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

@MarcusHolly
Copy link
Author

Some files are duplicated - namely multiperiod_double_loop_usc.py and multiperiod_integrated_storage_usc.py. Both of these files appear inside of and outside of the double_loop folder. I've only updated the files inside the double loop folder, and when I tried to update the files outside of the double loop folder (just copying and pasting the files that I did edit already), the tests fail. Since we don't have the time to fix this now, I'll just make note of it here. I'm also not sure which of the duplicates should stay and which should be deleted because I doubt we actually want these duplicate files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants