Separated solar and wind, recalibrated energy #112
Conversation
This file contains 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
Recalibrated energy
|
@BenjaminBlanz - please look this over carefully. we removed your old calibrations b/c they were all refering to different energy sources then their names (this happened when we inserted the new array indicies into the Energy Source array dimension). We were able to make 1 big calibration that worked really well. |
# Conflicts: # FRIDA.isdb # FRIDA.stmx # FRIDA_Modules/Economy.itmx
…moved economy off
Energy supply equal demand, references to wind and solar calibration data
previous values had oil be an order of Mag smaller than the others causing an implausible phaseout.
# Conflicts: # Data/Calibration Data.csv # FRIDA.isdb # FRIDA.stmx # FRIDA_Modules/Economy.itmx
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.
No description provided.