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

refactor: historical clean energy is additional, not reference #184

Merged
merged 1 commit into from
May 20, 2020

Conversation

danielolsen
Copy link
Contributor

Purpose

Based on conversations with @danlivengood, we want to modify how external clean energy references are incorporated in calculations. The biggest example of this is California: they calculate a 'clean energy total' vastly in excess of our calculated numbers, since they count things like small hydro, rooftop PV, etc. that are not counted by our framework.

Previously, we had been inputting a constant value as the 'historical clean energy reference' (e.g. from California's reported total in 2016). This change instead uses a 'historical additional clean energy' value (which we will calculate once outside of this framework). This has the benefit of allowing accurate calculation of shortfall in scaled-up 2030 scenarios, where previously the over-generation was clipped at this historical reference value, even for future scenarios.

What is the code doing

In clean_capacity_scaling.py: we rename 'external_ce_historical_amount' to 'external_ce_addl_historical_amount'. This offset is added to prev_ce_generation (generated energy from 'qualifying' resources in our framework) when calculating total shortfall or overgeneration for each target area.

In test_resource_target_manager.py: we modify the test input values to reflect that the final argument to TargetManager is an offset, not a reference.

In test_strategies.py: we modify the test input values to reflect that the final argument to TargetManager is an offset, not a reference.

In test_target_manager_input.py: we modify the column naming.

Time to review

Half an hour. This change is necessary to begin our revised Western 2030 runs, which are a blocker for our USA 2030 runs.

@danielolsen danielolsen force-pushed the capacity_scaling_hist_energy branch from 7cd2c1f to 3f4f482 Compare May 20, 2020 19:16
@danielolsen danielolsen merged commit 47d8da8 into develop May 20, 2020
@danielolsen danielolsen deleted the capacity_scaling_hist_energy branch May 20, 2020 19:17
@ahurli ahurli mentioned this pull request Mar 11, 2021
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.

3 participants