Repository navigation
Audit core, macro and units (audit results) - #2541
Open
simonkrogmann wants to merge 1 commit into
Open
simonkrogmann wants to merge 1 commit into
simonkrogmann wants to merge 1 commit into
Conversation
This file contains hidden or 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
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.
Purpose of this PR
Six small, independent fixes. Item 1 changes which equations are generated; items 2 and 3
touch currently inactive code; the rest is documentation.
Changes
core/equations.gms: operator precedence inq_limitCapFeH2BI.The condition was
build OR indst AND t.val ge max(2015, cm_startyear). GAMS binds ANDtighter than OR, so the start-year filter applied to industry only and the buildings
equation was generated for all years, including fixed years before
cm_startyear.Parentheses added so the filter applies to both sectors, as in
q_capH2BIabove it.modules/01_macro/*/equations.gms: offset index inq01_limtRatioPpfen.The denominator factor for
in2usedpm_cesdata(t,regi,in,"offset_quantity"); it shoulduse
in2, as inq01_limitShPpfen. Fixed in both realizations. Currently inactive, sincep01_ppfen_ratiosis always 0.core/preloop.gms: level initialisation ofvm_prodFewas a no-op.vm_prodFe.l(ttot,regi,entyFe2,entyFe2,te) = 0addressed only diagonal elements(SE equal to FE), which do not exist. Now
(entySe,entyFe), matching the otherinitialisations in the block.
modules/33_carbonRemoval/portfolio/declarations.gms:s33_OAE_efficiencydescription.It is ocean CO2 uptake per unit CaO [GtC / Gt CaO], as computed and used in datainput;
the description said the inverse (Gt rock per GtC).
modules/39_carbonUtilization/on/declarations.gms:p39_co2_demis in GtC/TWa.It is derived from
pm_emifac(GtC/TWa) and compared withvm_co2CCUshort(GtC/a);the description said tC/TWa.
Comments.
core/bounds.gms: early retirement is allowed between 2010 and 2110 ascoded, not 2015 to 2100.
modules/80_optimization/nash/declarations.gms: the goodssurplus tolerance is in trillion US$2017/yr (the code uses 100/1000 T$), not million.
Type of change
Indicate the items relevant for your PR by replacing ◻️ with ☑️.
Do not delete any lines. This makes it easier to understand which areas are affected by your changes and which are not.
Parts concerned
Impact
Checklist
Do not delete any line. Leave unfinished elements unchecked so others know how far along you are.
In the end all checkboxes must be ticked before you can merge.
Note: This is not required for documentation PRs that only touch
tutorials/or*.md/*.Rmdfiles.make test) after my final commit and all tests pass (FAIL 0)remind2if and where it was neededforbiddenColumnNamesin readCheckScenarioConfig.R in case the PR leads to deprecated switchesCHANGELOG.mdcorrectly (added, changed, fixed, removed, input data/calibration)Further information (optional)