-
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
Improvements to input methods and initial documentation for methane functions #192
Merged
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
Added driver values, units to outputs
- Edited region names in population scenario (had dots instead of spaces) - Added step to `check_regions()` function in "utils_import_inputs.R" to standardize region in user inputs - Moved step to check regions for pop, o3 inputs before calculation of population
Added steps wtih `gc()` to free up memory
Added lines with `gc()` to free up unused memory
- Step where temps, SLR were zero out was causing issues with scenario ID for SV - Added step to keep scenario ID
Fixed issue with columns in step to format input scenarios: - Added helper function to "utils.R" to help zero out temp and SLR scenarios - Tested functions
Deleted default results (too large now)
Updated build YML to update GDP, Population default scenarios
- Deleted references to default results in "data.R" and "run_fredi.R". - Updated examples in "run_fredi.R" and "run_fredi_sv.R" with new scenario data and file names
Added steps to save ozone, methane, and nox default scenarios
- Added comments to some argument definitions - Deleted deprecated comments
Added steps to make columns more robust to FrEDI methane. Can't aggregate on FrEDI methane, however, unless driver scenario is dropped
Added additional steps to standardize the columns and model names in the ozone scenario
Deleted the default scenario from the data description and renamed `gdpScenario` and `popScenario` to `gdpDefault` and `popDefault`, respectively
Reorganized order of inputList item descriptions and corrected typos
Added additional information about regions in `import_inputs`
Initialized function documentation for `run_fredi_methane`
Changed formula for `calc_methane_mortality` in "utils_methane.R" to use the natural log of population, rather than the relative population. The rationale for the change from using relative population to population is that we only have one mortality rate for 2020, so we can’t take into account the fact that there are multiple different 2020 mortality rates in the original RFF data (despite constant population). The new formula uses coefficients for the “poplograw” (i.e., log of population) regression for all years.
Updated methane data with: - New coefficients for a different approach to calculating mortality for methane (new method using a log of population instead of a relative population) - Standardized region and model labels in default ozone scenario with labels for presentation - Updated default methane scenario with new scenario and default ozone scenario values
Updated `calc_methane_mortality` with method to calculate mortality using log of population instead of population relative to RFF population
Added steps to standardize region and model in methane steps. Removed step in "build_fredi.yml" to standardize model name in O3 default (now done in pre-processing)
Fixed line mutating region for drivers...moved to earlier step, for O3 inputs only
Corrected which columns get printed out if columns are missing in checks for `import_input` utilities
@knoiva-indecon are you still waiting to merge this in? i tagged @emcduffie as a code reviewer |
There are some additional edits on this branch so I was adding some additional small edits here before merging. |
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.
Improvements/fixes to methods for inputs:
gc()
statement to free up unused memory between stepsscenario
column that is neither an ID column nor a value column.run_fredi()