refactor reporting functions - #2084
Merged
Merged
Conversation
fbenke-pik
marked this pull request as ready for review
April 25, 2025 10:12
2 tasks
LaviniaBaumstark
approved these changes
Apr 25, 2025
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
Previously, data generated by madrat was added as data to the library for some enhanced reporting in
reportEmiandreportCrossVariables. This PR introduces a new approach where the data is generated as part of inputdata generation and moved to the output folder when starting a run. The reporting functionconvGDX2MIFgets the path to that folder passed via the newextraDataargument to access the additional reporting data.The new approach ensures compatibility of the extra data with mrremind and avoids putting madrat generated data under version control in remind2.
Corresponding remind2 PR: pik-piam/remind2#723
reportDIETER(no longer used) andreportExtraEmissions(moved to remind2)Reported variables depending on extra data can vary slightly, because the calculations now use the latest inputdata instead of the data previously stored in the remind2 library. Examples:
Emi|CO2|Cumulated|Energy|Demand|Buildings,Cap|Electricity|Coal|Other Fossil Adjusted.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.
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)