-
Notifications
You must be signed in to change notification settings - Fork 7
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
State level initial #128
Merged
Merged
State level initial #128
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
Updated such that the output result comments correctly use output_df$results
Made some changes to names used in interpolate_annual
Replaced some magrittR pipe operators with native pipe operators
State level initial
Updated: sysdata.rda with fixes from FrEDI_Data changes to main and helper functions to get code to work
Updated sysdata.rda to fix: state-level region results, SLR data for years >= 2090
Updated to use correct item from rDataList
Simplified some lines of code in `extend_slr`
Changed some section headers to fix some nesting issues when viewing outline in RStudio Cleaned up some comments
Cleaned up crufty code, fixed issues with aggregating national totals
Updated sysdata.rda with combined region & state-level data Edited fun_formatScalars to determine whether to run a particular scalar as byState or not depending on the level of data provided Edited run_fredi to run for all sectors. Also cleaned up code
Initialized some fixes to the combined data branch These fixes fix some things and break others (national level scalars not processing correctly...not sure if it is on this side or the FrEDI code side)
Changed function "match_scalarValues" in "utils.R": - Changed join columns for national values (removed "byState" column from join columns). The previous join columns were causing national values to go missing. - Removed step converting missing values to one (which was hiding the fact that the national values were missing)
…vel to report figures
Fixed references to deprecated functions
Made changes to run by state. Commented out plots that aren't working yet
Fixed comma in function definition
Replaced deprecated functions (e.g. replaced addListNames with set_names)
Created a manual shape palette since there are now more than 6 models
Small changes to spaces
Extended integer degrees from 7 to 10 degrees Fixed figure code and added it back in
State level initial fix figures kmn
Changed grouping columns for aggregation
Added shape levels to report figures by impact type
State level initial fix figures kmn
State level initial
…SEPA/FrEDI into state_level_initial_fixFigures
State level initial fix 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.
Merging working state_level_initial into state_level. Will continue working off of state_level_initial and merging in updates as needed