Skip to content
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 99 commits into from
Dec 19, 2023
Merged

State level initial #128

merged 99 commits into from
Dec 19, 2023

Conversation

knoiva-indecon
Copy link
Collaborator

Merging working state_level_initial into state_level. Will continue working off of state_level_initial and merging in updates as needed

heaston-indecon and others added 30 commits October 13, 2023 11:47
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
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)
tonygard-indecon and others added 29 commits December 18, 2023 13:15
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
Changed grouping columns for aggregation
Added shape levels to report figures by impact type
@knoiva-indecon knoiva-indecon merged commit 3a15d20 into state_level Dec 19, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants