Skip to content
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
bb09c4b
Added SoilGrid IC Utilities
divine7022 Apr 10, 2025
7a7c091
refactor(soilgrids): improve soil carbon IC generation and uncertaint…
divine7022 Jun 5, 2025
c646fd1
simplified general function for site information extraction and valid…
divine7022 Jun 5, 2025
2f389ba
updated .Rd and test for get.site.info
divine7022 Jun 5, 2025
f90b881
add the support of soilgrid source to ic_process
divine7022 Jun 5, 2025
6863bd7
Merge remote-tracking branch 'origin/develop' into ic-generation
divine7022 Aug 8, 2025
c904b92
update CHANGELOG.md
divine7022 Aug 12, 2025
286f007
remove get.site.info from NAMESPACE
divine7022 Aug 12, 2025
62676f6
remove get.site.info() entry from NEWS.md
divine7022 Aug 12, 2025
333c1f7
remove get.site.info(), since soilgrid_ic_process() now uses direct s…
divine7022 Aug 12, 2025
5160a7f
remove unused get.site.info.Rd
divine7022 Aug 12, 2025
5b2e439
delete test.get.site.info.R
divine7022 Aug 12, 2025
6f268f2
update NEWS.md
divine7022 Aug 12, 2025
f7cb111
remove get.site.info function and now uses direct site extraction fro…
divine7022 Aug 12, 2025
74b5eda
update soilgrids source in ic_process
divine7022 Aug 12, 2025
71fe15d
update roxy of soilgrids_ic_process
divine7022 Aug 12, 2025
a4d3ae8
remove dot notation to resolve CI global variable binding error
divine7022 Aug 12, 2025
5f337e5
resolve package dependency and namespace issues
divine7022 Aug 12, 2025
d3a8e9a
reduce import count by moving MASS to suggests to fix ci dependency l…
divine7022 Aug 12, 2025
6f90246
add MASS to docker dependency
divine7022 Aug 12, 2025
1304eb3
Merge remote-tracking branch 'origin/develop' into ic-generation
divine7022 Aug 12, 2025
c4340f6
Revert "Enhance robustness and error handling in soilgrids_soilC_extr…
divine7022 Aug 12, 2025
5c1aaee
add R >= 4.1.0 dependency for base pipe support
divine7022 Aug 15, 2025
a07b35a
refactor and remove drop deterministic fill
divine7022 Aug 15, 2025
ce87e2f
update .Rd
divine7022 Aug 15, 2025
9c2b936
update preprocess_soilgrids_data.Rd
divine7022 Aug 15, 2025
01556b0
udpdate soilgrids_ic_process.Rd
divine7022 Aug 15, 2025
a703645
Merge remote-tracking branch 'origin/develop' into ic-generation
divine7022 Aug 15, 2025
4f4d621
remove all clamping logic and added pre-allocate where needed
divine7022 Aug 15, 2025
37b368e
move update to unreleased section
divine7022 Aug 16, 2025
94a8fee
remove unintended changes to exclude from pr
divine7022 Aug 22, 2025
279944a
remove ic_process changes to handle in dedicated PR
divine7022 Aug 22, 2025
9ad1921
Merge branch 'develop' into ic-generation
dlebauer Aug 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ section for the next release.
- The ERA5 NC extraction function can now handle multi-site instead of one.
- Added function for merging images from the same tiling system (MODIS, GLANCE, ICESat-2, HLS, etc.).
- Added function for converting images towards the GDAL-supported formats (H5, NetCDF, HDF4, GeoTIFF, etc .).
- New utility script `IC_SOILGRID_Utilities.R` for processing SoilGrids data to generate soil carbon initial condition (IC) files. This includes (#3508):
- **`soilgrids_ic_process`**: A function to extract, process, and generate ensemble members from SoilGrids250m data.
- **`preprocess_soilgrids_data`**: A helper function to handle missing values and ensure data integrity during preprocessing.
- **`generate_soilgrids_ensemble`**: A function to create ensemble members for a site based on processed soil carbon data.

### Fixed
- api to correctly use x_var from request in plotResults #3528
Expand Down
1 change: 1 addition & 0 deletions docker/depends/pecan_package_dependencies.csv
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
"MASS","*","base/utils","Suggests",FALSE
"MASS","*","modules/assim.batch","Imports",FALSE
"MASS","*","modules/data.atmosphere","Imports",FALSE
"MASS","*","modules/data.land","Suggests",FALSE
"MASS","*","modules/meta.analysis","Imports",FALSE
"MASS","*","modules/priors","Imports",FALSE
"MASS","*","modules/rtm","Imports",FALSE
Expand Down
5 changes: 3 additions & 2 deletions modules/data.land/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Imports:
tidyr,
tidyselect,
traits,
XML (>= 3.98-1.4)
XML (>= 3.98-1.4)
Suggests:
dataone,
datapack,
Expand All @@ -68,7 +68,8 @@ Suggests:
raster,
reticulate,
testthat (>= 1.0.2),
withr
withr,
MASS
Remotes:
github::ropensci/traits
License: BSD_3_clause + file LICENSE
Expand Down
3 changes: 3 additions & 0 deletions modules/data.land/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export(format_identifier)
export(from.Tag)
export(from.TreeCode)
export(gSSURGO.Query)
export(generate_soilgrids_ensemble)
export(get.attributes)
export(get.soil)
export(get_resource_map)
Expand All @@ -47,6 +48,7 @@ export(plot2AGB)
export(pool_ic_list2netcdf)
export(pool_ic_netcdf2list)
export(prepare_pools)
export(preprocess_soilgrids_data)
export(put_veg_module)
export(sample_ic)
export(sclass)
Expand All @@ -56,6 +58,7 @@ export(soil2netcdf)
export(soil_params)
export(soil_params_ensemble_soilgrids)
export(soil_process)
export(soilgrids_ic_process)
export(soilgrids_soilC_extract)
export(soilgrids_texture_extraction)
export(subset_layer)
Expand Down
6 changes: 5 additions & 1 deletion modules/data.land/NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
* Included all relevant carbon pools (`ROOT_BIOMASS`, `AG_BIOMASS`, `SOIL_STOCK`, `LIT_BIOMASS`) in BADM-based IC extraction; excluded non-pool variables like `SOIL_CHEM`.
* Added explicit support for `LIT_BIOMASS` to fully utilize **BADM** biomass capabilities.
* Added `test-IC_BADM_Utilities.R` to validate BADM initial condition extraction and processing

* New utility script `IC_SOILGRID_Utilities.R` for processing SoilGrids data to generate soil carbon initial condition (IC) files. This includes (#3508):
- **`soilgrids_ic_process`**: A function to extract, process, and generate ensemble members from SoilGrids250m data.
- **`preprocess_soilgrids_data`**: A helper function to handle missing values and ensure data integrity during preprocessing.
- **`generate_soilgrids_ensemble`**: A function to create ensemble members for a site based on processed soil carbon data.

## Fixed

* `gSSURGO.Query()` now always returns all the columns requested, even ones that are all NA. It also now always requires `mukeys` to be specified.
Expand Down
Loading
Loading