-
Notifications
You must be signed in to change notification settings - Fork 12
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
Add new sectors learning loss #223
Open
knoiva-indecon
wants to merge
47
commits into
addNewSectors_issue206
Choose a base branch
from
addNewSectors_learningLoss
base: addNewSectors_issue206
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add new sectors learning loss #223
knoiva-indecon
wants to merge
47
commits into
addNewSectors_issue206
from
addNewSectors_learningLoss
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
Renamed run_fredi_methane to run_fredi_ghg to be consistent with technical documentation.
Added additional detail on GHG inputs
This merge should not be completed until the issue with the econScalarName for Forestry Loss has been resolved |
Fix report figures rename ghg
Fix report figures split tests
Update learning loss branch with edits from main
Edited functions used in calculating scalars
Edited arrange vector
Added fixes to correct issues with new/adapted utilities for dealing with the GDP per capita issue
Deleted deprecated lines
Edited some lines in extend_slrScalars: added a column to drop and removed a line removing an object prematurely
Fixed issue with post-2100 SLR scalars
Edited extend_slrScalars to only extrapolate for SLR sectors in slrScalars...removing Marsh Migration (Primary and Secondary) from `co_slrScalars ` table since the calculation of their scalars doesn't change after 2100
Open
Fix the post-2100 scalars for marsh migration
Add new sectors fix gdp percap
Fix if/then statements in YML (added curly brackets). Also removed
Corrected lines in `get_fig7_slrDataObj`...using outdated method to calculate SLR impacts
Deleted elasticity argument
Fixes to get_fig7_slrImpacts
Added function `fun_extendVals` to utils.R to facilitate extension of values out to 2300
Added argument `df_ratios` to `calc_import_pop` to take a dataframe of ratios as an argument. Initialized default to be the `popRatiosData` in `scenarioData`, with values extended out to 2300.
Added functions `standardize_actionStrings`, `get_action_sectors` to utils_create_report_figures.R. These functions help: 1. Standardize a vector of items, separated by commas, and supplied as a single string via a github action 2. Figure out which sectors to run
To 2c and 2d: * Cleaned up step standardizing sector names using the new `get_action_sectors` function To 2c: * Added additional parameters `figure_type`, `tempScenario`, `agg_lvls`, `out_list` to provide additional options for scenarios * Added additional steps to run FrEDI with default scenarios, scenarios to 2300, or constant temp scenarios To 2c: * Added a step to produce either or both appendix figures and/or sector comparison figures
Added a function `getFilterDf` to utils_create_report_figures.R to facilitate filtering FrEDI results
Initialized script and utilities for creating report figures
Initialized utilities for new report figures
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.
Adds in: