Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
266c2d7
Add CIMIS-ET workflow for California irrigation management
ashiklom Feb 27, 2026
161451d
increase default water balance WHC value
ashiklom Feb 27, 2026
acbf01b
add crop WHC data
ashiklom Feb 27, 2026
7547021
more consistent variable names with units
ashiklom Feb 27, 2026
988d400
rewrite water balance logic. add some tests.
ashiklom Feb 27, 2026
21dd057
update crop_whc.rda
ashiklom Mar 1, 2026
13f6cd3
export CHIRPS-precip-remote function
ashiklom Mar 1, 2026
b5a5875
fix length mismatch from variable WHC
ashiklom Mar 1, 2026
2b1b94f
add more customizability to `calc_water_balance`
ashiklom Mar 1, 2026
bc3633f
clarify WHC vs. field capacity in water_balance
ashiklom Mar 1, 2026
bd2339d
draft SSURGO get mukey function
ashiklom Mar 5, 2026
35d7e40
ssurgo mukey function for big bboxes
ashiklom Mar 5, 2026
42eadab
separate ssurgo mukey functions for different APIs
ashiklom Mar 5, 2026
6c718c2
add ssurgo mukey function docs
ashiklom Mar 5, 2026
3dc2fec
Add example SSURGO script
ashiklom Mar 5, 2026
cdaacd4
update crop_whc table to use FAO-56 Table 22 vals
ashiklom Mar 5, 2026
bbf555b
simplify ssurgo function documentation
ashiklom Mar 5, 2026
b7e8410
allow time-varying WHC
ashiklom Mar 5, 2026
3fb1127
Replace CIMIS ET vignette with a script
ashiklom Mar 5, 2026
f58e7eb
add horizon depths to SSURGO test script
ashiklom Mar 5, 2026
c392654
add OpenET download function and comparison script
ashiklom Mar 5, 2026
422166a
manually propagate duckspatial to dependencies
ashiklom Mar 5, 2026
8f222c4
whitespace-only documentation change
ashiklom Mar 5, 2026
166a420
update crop_whc values and docs
ashiklom Mar 5, 2026
9c93527
replace duckspatial with terra + sf
ashiklom Mar 5, 2026
79a53f8
fix R CMD check issues
ashiklom Mar 5, 2026
6b97e3d
fix non-unicode chars in data.land
ashiklom Mar 5, 2026
fabd6c9
Update PEcAn dependencies
ashiklom Mar 6, 2026
4e63fae
minor cleanup of ssurgo mukey code
ashiklom Mar 6, 2026
763acb3
remove duckdb and duckspatial (again)
ashiklom Mar 10, 2026
3294409
update pecan_package_dependencies
ashiklom Apr 3, 2026
3199406
skip CHIRPS tests on CI
ashiklom Apr 4, 2026
4f059c4
documentation bugfix
ashiklom Apr 4, 2026
e31027a
add crop WHC data
ashiklom Feb 27, 2026
be6ab35
remove landiq class/subclass fixes
ashiklom Mar 13, 2026
b1ca4a4
working version of irrigation workflow in targets
ashiklom Mar 13, 2026
b2f633a
Add mslsp_to_canopycover
ashiklom Mar 13, 2026
87c4dda
WIP targets pipeline for more sites
ashiklom Mar 13, 2026
5dcdaa7
add basic flooded rice irrigation implementation
ashiklom Mar 20, 2026
7773eac
Complete working statewide irrigation pipeline
ashiklom Mar 20, 2026
347989e
Add information message to targets pipeline
ashiklom Mar 20, 2026
0915595
replace stop with pecan.logger
ashiklom Mar 21, 2026
581b926
propagate rice args through apply_water_balance
ashiklom Mar 21, 2026
ed79224
fix tidyselect call in tidyr::fill
ashiklom Mar 21, 2026
29f60c7
targets project shortcuts
ashiklom Mar 21, 2026
a6c9543
add crude uncertainty propagation
ashiklom Mar 21, 2026
82eeefb
make full crop time series, filling missing data
ashiklom Mar 22, 2026
f76ad12
irrigation: add config for all parcels
ashiklom Mar 23, 2026
ef4318e
fix SGE workers crashing on init
ashiklom Mar 23, 2026
6ebc344
update crop_whc citation
ashiklom Mar 26, 2026
25466ac
calc_awc needs to also aggregate components
ashiklom Mar 26, 2026
30ba395
write final outputs to parquet
ashiklom Apr 9, 2026
ed673d1
write irrigation output directly to named parquet
ashiklom Apr 9, 2026
c6fcc46
use config for workflow configuration
ashiklom Apr 21, 2026
f54974d
add irrigation maximum parameter
ashiklom Apr 21, 2026
70481bc
move irrigation workflow to workflows/
ashiklom Apr 21, 2026
007d6c7
Update README
ashiklom Apr 21, 2026
fa5aab2
fix README paths. clean up some unnecessary files.
ashiklom Apr 21, 2026
f90b158
resolve some r cmd check notes
ashiklom Apr 21, 2026
97f6cea
remove some old scripts
ashiklom Apr 21, 2026
f74c8af
remove unused code
ashiklom Apr 21, 2026
367950d
add preprocessing scripts
ashiklom Apr 21, 2026
d0001ee
update generate dependencies
ashiklom Apr 21, 2026
db592f3
update water balance docs
ashiklom Apr 21, 2026
e022632
data.land: increase rcheck ref log package number
ashiklom Apr 22, 2026
f5379dd
Merge branch 'develop' of https://github.com/PecanProject/pecan into …
ashiklom Apr 22, 2026
45410ee
Merge branch 'develop' into cimis-et
dlebauer Apr 22, 2026
68170ee
versioned httr2 dependency
ashiklom Apr 24, 2026
7594127
typo in config.yml
ashiklom Apr 24, 2026
472f914
Merge branch 'develop' of https://github.com/PecanProject/pecan into …
ashiklom Apr 24, 2026
507fc55
Merge branch 'develop' of https://github.com/PecanProject/pecan into …
ashiklom Apr 24, 2026
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
3 changes: 3 additions & 0 deletions docker/depends/pecan_package_dependencies.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"abind",">= 1.4.5","modules/data.atmosphere","Imports",FALSE
"amerifluxr","*","modules/data.atmosphere","Imports",FALSE
"arrow","*","modules/data.atmosphere","Imports",FALSE
"arrow","*","modules/data.land","Imports",FALSE
"assertthat","*","models/ed","Imports",FALSE
"assertthat","*","modules/data.atmosphere","Imports",FALSE
"BayesianTools","*","modules/assim.batch","Imports",FALSE
Expand Down Expand Up @@ -133,6 +134,7 @@
"httr","*","modules/data.atmosphere","Imports",FALSE
"httr","*","modules/data.land","Suggests",FALSE
"httr","*","modules/data.remote","Suggests",FALSE
"httr2",">= 1.1.0","modules/data.land","Imports",FALSE
"IDPmisc","*","modules/assim.batch","Imports",FALSE
"imager","*","models/peprmt","Suggests",FALSE
"itertools","*","modules/assim.sequential","Suggests",FALSE
Expand Down Expand Up @@ -668,6 +670,7 @@
"tibble","*","models/fates","Imports",FALSE
"tibble","*","models/lpjguess","Imports",FALSE
"tibble","*","modules/data.atmosphere","Imports",FALSE
"tibble","*","modules/data.land","Imports",FALSE
"tibble","*","modules/data.remote","Suggests",FALSE
"tibble","*","modules/meta.analysis","Suggests",FALSE
"tictoc","*","modules/assim.sequential","Suggests",FALSE
Expand Down
3 changes: 3 additions & 0 deletions modules/data.land/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ URL: https://pecanproject.github.io
BugReports: https://github.com/PecanProject/pecan/issues
Depends: R (>= 4.1.0)
Imports:
arrow,
coda,
curl,
dplyr,
foreach,
fs,
future,
furrr,
httr2 (>= 1.1.0),
lubridate,
magrittr,
ncdf4 (>= 1.15),
Expand All @@ -44,6 +46,7 @@ Imports:
sf,
stringr,
terra,
tibble,
tidyr,
tidyselect,
XML (>= 3.98-1.4)
Expand Down
9 changes: 9 additions & 0 deletions modules/data.land/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ export(InventoryGrowthFusionDiagnostics)
export(Read.IC.info.BADM)
export(Read_Tucson)
export(Soilgrids_SoilC_prep)
export(apply_water_balance)
export(buildJAGSdata_InventoryRings)
export(calc_water_balance)
export(calc_water_balance_rice)
export(clip_and_save_raster_file)
export(cohort2pool)
export(create_event_file)
export(dataone_download)
export(download.SM_CDS)
export(download_package_rm)
Expand All @@ -23,6 +27,7 @@ export(extract.stringCode)
export(extract_FIA)
export(extract_NEON_veg)
export(extract_SM_CDS)
export(extract_openet_daily)
export(extract_soil_gssurgo)
export(extract_soil_nc)
export(extract_veg)
Expand All @@ -46,6 +51,7 @@ export(matchInventoryRings)
export(match_pft)
export(match_species_id)
export(mpot2smoist)
export(mslsp_to_canopycover)
export(ndti_to_sipnet_tillage)
export(netcdf.writer.BADM)
export(om2soc)
Expand All @@ -69,6 +75,9 @@ export(soil_process)
export(soilgrids_ic_process)
export(soilgrids_soilC_extract)
export(soilgrids_texture_extraction)
export(ssurgo_mukeys_bbox)
export(ssurgo_mukeys_bigbbox)
export(ssurgo_mukeys_point)
export(subset_layer)
export(to.Tag)
export(to.TreeCode)
Expand Down
40 changes: 34 additions & 6 deletions modules/data.land/R/data.R
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
"soil_class"

#' Fertilizer Nutrient Composition Table
#'
#' A dataset of fertilizer and organic matter addition types
#'
#' A dataset of fertilizer and organic matter addition types
#' and their nitrogen and carbon composition, based on the SWAT model's
#' `fertilizer.frt` table and DayCent model defaults for organic matter
#' C:N ratio parameters.
Expand All @@ -101,9 +101,9 @@
#' }
#'
#' @details
#' This table is based on SWAT model's \code{fertilizer.frt} file, and uses
#' This table is based on SWAT model's \code{fertilizer.frt} file, and uses
#' C:N ratios (\code{cn_ratio}) from DayCent model default parameter files.
#' \code{fraction_nh3_n} and \code{fraction_no3_n} represent the fraction of
#' \code{fraction_nh3_n} and \code{fraction_no3_n} represent the fraction of
#' fertilizer by mass that is ammonium-N and nitrate-N, respectively. This is different from
#' the SWAT model's definition of \code{fraction_nh3_n} as a fraction of the total mineral N.
#'
Expand All @@ -123,7 +123,7 @@
#' \item{SUBCLASS}{LandIQ subclass code.}
#' \item{subclass_name}{LandIQ subclass name.}
#' }
#' @source California Department of Water Resources. (2023). Statewide Crop Mapping—California
#' @source California Department of Water Resources. (2023). Statewide Crop Mapping—California
#' Natural Resources Agency Open Data. Metadata retrieved from https://data.cnra.ca.gov/dataset/statewide-crop-mapping and manually extracted into `data-raw/landiq_crop_mapping_codes.tsv`.
"landiq_crop_mapping_codes"

Expand All @@ -132,7 +132,7 @@
#' Crop and growth stage specific coefficients (Kc) from the Basic Irrigation Scheduling
#' (BIS) Excel workbook (Snyder et. al., 2014).
#' The dataset is an export of the BISm.xlsx workbook's `CropRef` worksheet, with columns renamed
#' and columns added that map to LandIQ CADWR land use dataset
#' and columns added that map to LandIQ CADWR land use dataset
#' (\code{\link{landiq_crop_mapping_codes}}; California Department of Water Resources, 2023).
#' This dataset provides the information needed to reconstruct a stage-based daily Kc curve when
#' combined with grass-reference evapotranspiration (ETo), such as that provided
Expand Down Expand Up @@ -287,3 +287,31 @@
#' \code{\link{look_up_fertilizer_components}} for fertilizer nutrient
#' composition (N/C fractions) from the SWAT/DayCent database.
"ca_compost_amendment"

#' Crop-specific rooting depths and water-depletion thresholds
#'
#' Maximum effective rooting depth and minimum soil water content thresholds
#' for various crops. The `whc_min_frac` column represents the fraction of
#' total available water (TAW) that should remain in the root zone to avoid
#' moisture stress (equivalent to 1 - p, where p is the depletion fraction
#' from FAO-56).
#'
#' @format A tibble with one row per crop and the following columns:
#' \describe{
#' \item{crop_number}{BIS crop number (character). Blank for crops not in BIS.}
#' \item{crop_name}{Crop name.}
#' \item{Category}{Crop category (e.g., Woody Perennial, Annual (Hardy)).}
#' \item{rooting_depth_m}{Maximum effective rooting depth in meters.}
#' \item{whc_min_frac}{Minimum soil water as fraction of available water-holding capacity (0-1).}
#' \item{whc_notes}{Rationale or source for the minimum WHC value.}
#' \item{rooting_depth_notes}{Rationale or source for the rooting depth value.}
#' }
#' @source Allen, R. G., Pereira, L. S., Raes, D., & Smith, M.
#' \emph{FAO Irrigation and Drainage Paper No. 56: Crop evapotranspiration}. Chapter 8. Table 22.
#' https://www.fao.org/4/x0490e/x0490e0e.htm#chapter%208%20%20%20etc%20under%20soil%20water%20stress%20conditions
#' @examples
#' data(crop_whc)
#' head(crop_whc)
#'
#' @keywords datasets
"crop_whc"
Loading
Loading