-
Notifications
You must be signed in to change notification settings - Fork 2
Terra conversion #48
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
Merged
Merged
Terra conversion #48
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
f75e222
Modifying the reverse rotate portion of daily_aggregation (from -180_…
0caf40f
Renaming clim_raster to clim_stack
d5b0c8c
Replaced user level rasters and raster stacks with spatRasters. Compl…
32422e4
More information on how world wide datasets were generated
e59ffa1
Resaved era5_grid cause it wasn't working
ded3796
Reverted data files back to raster package because usethis::use_data(…
a15fcc2
Finished staggregate raster to terra conversion
1261aab
Ran use_this::use_pkgdown() and added .githhub to the .Rbuildignore
tliddell4 070d55b
Finalized terra conversion and removed nj_counties from data to reduc…
tliddell4 b255f29
Updated R and RStudio which assigned a ProjectId
tliddell4 e152db5
Implemented user defined tolerance for joining overlay_weights and cl…
tliddell4 09a4ca0
Fully integrated weights_join_tolerance argument into the package and…
tliddell4 7ea8a0e
Fixed reference issue wherin we were overwriting user's overlay_weigh…
tliddell4 cf7e219
modify so that the coordinate syste for the final table matches that …
traceybit 0a06b9c
Merge pull request #45 from tcarleton/weights_fns_optimization
traceybit 44586cb
Merge pull request #44 from tcarleton/37-weird_cell_widths
tliddell4 70ab8e9
Removed rotate from staggregate
tliddell4 3e1e7e9
Being consistent about how we're evaluating climate vs standard coord…
tliddell4 16dd094
Updating data to all be -180 to 180
tliddell4 329dc94
Throw an error if rotating a spatrast that shouldn't be rotated.
tliddell4 248df0b
Correction to weird cell width check
tliddell4 7f2329e
Merge pull request #46 from tcarleton/remove_rotate_from_staggregate
tliddell4 701ebee
Made sure the climate data covers the polygons regardless of whether …
tliddell4 a4b4cfe
Added na_rm argument
tliddell4 6d06902
Merge pull request #47 from tcarleton/42-remove_na_option
tliddell4 67be65e
updated to make sure climate raster is read in as spatraster; adjuste…
traceybit 73f8627
Changed is to inherits
tliddell4 fe3fb94
Merge branch 'terra_conversion' of https://github.com/tcarleton/stagg…
tliddell4 3c930a6
added check for peculiar cell widths in 0-360 coordiant format for bo…
traceybit a5bfe7c
adjusted to read cliamte data in as spat raster; adjusted resolutions…
traceybit 1741c95
Merge branch 'terra_conversion' of https://github.com/tcarleton/stagg…
tliddell4 d60c00f
ERA5 data update
tliddell4 3d3f06e
incorporate updates based on cullen's suggestions for code review
traceybit 153c6de
change position in code
traceybit afcc2c9
format spacing
traceybit 82c3171
flipped back
traceybit 98389b7
update proj id
traceybit ab61213
Updated documentation
tliddell4 c78730b
Further implementation of Cullen's suggestions
tliddell4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,7 @@ | |
| ^data-raw$ | ||
| ^doc$ | ||
| ^Meta$ | ||
| ^_pkgdown\.yml$ | ||
| ^docs$ | ||
| ^pkgdown$ | ||
| ^\.github$ | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ | |
| inst/doc | ||
| /doc/ | ||
| /Meta/ | ||
| docs | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,11 @@ | ||
| #' Global cropland weights | ||
| #' | ||
| #' A data.table with ERA5 resolution returned by running secondary_weights() with cropland data from | ||
| #' 2015 | ||
| #' 2015 from https://glad.umd.edu/dataset/croplands | ||
| #' | ||
| #' Dataset Reference: P. Potapov, S. Turubanova, M.C. Hansen, A. Tyukavina, V. | ||
| # Zalles, A. Khan, X.-P. Song, A. Pickens, Q. Shen, J. Cortez. (2021) Global | ||
| # maps of cropland extent and change show accelerated cropland expansion in the | ||
| # twenty-first century. Nature Food. https://doi.org/10.1038/s43016-021-00429-z | ||
| #' | ||
| "cropland_world_2015_era5" |
This file was deleted.
Oops, something went wrong.
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
tliddell4 marked this conversation as resolved.
Show resolved
Hide resolved
|
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
tliddell4 marked this conversation as resolved.
Show resolved
Hide resolved
|
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.