-
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
Enhancement#305 gridded global datav5 #323
Open
nip5
wants to merge
76
commits into
master
Choose a base branch
from
Enhancement#305_GriddedGlobalDatav5
base: master
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
Changes from 75 commits
Commits
Show all changes
76 commits
Select commit
Hold shift + click to select a range
23b6834
Started integrating new soil data (100m)
nip5 33a4e93
extracts sand/clay/bd successfully
nip5 8943c9b
Integrated gravel data from 250m
nip5 cdd2294
Refactored code to run without as much user guidance
nip5 f49e3e4
Improved some soil calculations, added some environment changes
nip5 680ddfe
Moved the assignment in certain fields out of new function to be more…
nip5 8497ff5
starting integrating 250m depth
nip5 20341ed
made adjustments for rSFSW2 tests
nip5 246d291
some performance enhancements
nip5 bcdebb4
started merge with decadel aggregations
nip5 6063ecf
Merged with feature_DecadelAggregations, implemented cell soil extrac…
nip5 0eca671
Removed database comparisions in TestPrj4 to allow passing of all uni…
nip5 c1e8dc9
Added unit test file for testing soil extraction related functions
nip5 c14507c
Added unit tests for get_datasource_masterfield and get_datasource_in…
nip5 5a1cee0
Added test for prepare_ExtractData_Soils
nip5 41630f9
Some print statements only used during development
nip5 b1df9f5
Added Roxygen documentation to do_ExtractSoilDataFrom100m
nip5 6af2dc7
Remove extra comment weight
nip5 9229243
Fix issue with unit tests getting hung up after conversion from = to <-
nip5 4c0bf91
Fix extracted gravel data being unusually low
nip5 e7d332e
Add depth tif integration
nip5 1a75875
Add unit test for update_soils_input
nip5 91d1f53
Add unit test for new extraction function
nip5 575e35b
Fix testPrj4 now works again
nip5 bea0f35
Add resume functionality to function
nip5 71b714b
Remove print statements and debug comments
nip5 7ae6713
Change back models flag for CI tests
nip5 367b6aa
Remove 250m extaction unit test for CI
nip5 d73f71b
Delete .RData
nip5 0775cb0
Delete rSFSW2.Rproj
nip5 4b76ef7
Remove unecessary files
nip5 e3e37a4
Merge branch 'Enhancement#305_GriddedGlobalDatav5' of https://github.…
nip5 5f9f3b3
comment out extract soil unit tests for CI debugging
nip5 dbe6fb0
Remove extract soil data unit test
nip5 77dcc0f
Lots of code cleanup
nip5 684481b
Modify verbose messages to only show once each
nip5 0cbec09
Add layers done info when in verbose mode
nip5 afc2c78
Add test file back in but skip on CIs
nip5 364edc9
Change NRCS to Isric source
nip5 bc1c92a
Merge branch 'master' into Enhancement#305_GriddedGlobalDatav5
nip5 4b87610
Modify to improve code coverage
nip5 ccd634d
Several spacing changes, add files back in from master
nip5 49bb5a2
modify to address review
nip5 d4caa3a
modify spacnig to be standardized with master
nip5 f6e42ef
fix to address review
nip5 9e35388
add man/rSFSW2.Rd
nip5 383f251
fix program crashing if run when soils data was already available
nip5 7bf10da
more elegant fix to previous commit
nip5 0b4d749
performance enhancements
nip5 1ae4703
modify for review and staying <= 80 chars per line
nip5 304e609
fix spelling and format test failing
nip5 29981ff
fix soil extract test failing
nip5 3bbfdda
remove test_ExtractData_Soils.R, this branch is ready for review
nip5 b21e3e3
fixes to address code review
nip5 b28734c
Update package-level linter settings
dschlaep 1b1a3fd
add performance enhancements
nip5 79c758b
Merge branch 'Enhancement#305_GriddedGlobalDatav5' of https://github.…
nip5 87101ff
fix for crashing and lintr failing
nip5 f5b3473
merge with master
nip5 9e87219
lintr compliance fixes
nip5 2b163e3
moved verbose message out of main loop
nip5 f1bb913
modify extract_soilISRIC250m function description
nip5 be96b2c
modify MMC usage in ISRIC extraction function
nip5 2be512b
add extract soil test with on/off flag
nip5 3731d90
Merge branch 'master' into Enhancement#305_GriddedGlobalDatav5
nip5 1e62d13
add catch if file to extract is found but has bad content
nip5 6c772c7
Merge branch 'master' into Enhancement#305_GriddedGlobalDatav5
nip5 ca1f319
Merge branch 'Enhancement#305_GriddedGlobalDatav5' of https://github.…
nip5 4e9a4cb
lintr compliance
nip5 349a4e8
remove semicolons in extract soils unit test
nip5 2d978b8
add spaces between ) and { in some instances
nip5 b5daa1d
fix odd indenting
nip5 df084f4
pulled out percent_div to set it as a default value
nip5 1696fda
remove SSURGO soils data flag as it is not implemented
nip5 9226360
change CI fix format
nip5 5f2c10d
add check for file configurations in unit test
nip5 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 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 |
---|---|---|
|
@@ -13,4 +13,3 @@ | |
# CRAN stuff | ||
^cran-comments\.md$ | ||
^NEWS\.md$ | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,3 +34,4 @@ testthat_results.rds | |
src/*.o | ||
src/*.so | ||
src/*.dll | ||
.Rproj.user | ||
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
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
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
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
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
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove this line of code. I think it is best just not to ever put a Rproj in Git folder. All of that development (integration tests, etc.) should take place in a non-git location.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the idea of having this in the
.gitignore
and would vote to keep it. It doesn't bother here and prevents any potential issues with people creating a Rstudio project inside their git clone of rSWSF2 and attempting to push it up to remote.