Skip to content

Commit

Permalink
documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
miquelcaceres committed Apr 8, 2024
1 parent 8fe5bad commit 931757a
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 11 deletions.
24 changes: 20 additions & 4 deletions R/RcppExports.R
Original file line number Diff line number Diff line change
Expand Up @@ -1747,6 +1747,12 @@ hydrology_soilWaterInputs <- function(soil, soilFunctions, interceptionMode, pre
#'
#' @seealso \code{\link{spwb}}, \code{\link{hydrology_soilWaterInputs}}, \code{\link{hydrology_infiltration}}
#'
#' @details
#' The single-domain model simulates water flows by solving Richards's equation using the predictor-corrector method, as described in
#' Bonan et al. (2019).
#'
#' The dual-permeability model is an implementation of the model MACRO 2.0 (Jarvis et al. 1991; Larsbo et al. 2005).
#'
#' @author
#' Miquel De \enc{Cáceres}{Caceres} Ainsa, CREAF
#'
Expand All @@ -1759,24 +1765,34 @@ hydrology_soilWaterInputs <- function(soil, soilFunctions, interceptionMode, pre
#' \item{\code{Snowmelt}: Snowmelt input (mm).}
#' \item{\code{Source/sinks}: Sum of source/sink input across layers (mm).}
#' \item{\code{Infiltration}: Water infiltrated into the soil (mm).}
#' \item{\code{SaturationExcess}: Excess saturation in the topmost layer (mm) leading to an increase in runoff.}
#' \item{\code{Runoff}: Surface runoff generated (mm).}
#' \item{\code{DeepDrainage}: Water draining from the bottom layer (mm). This quantity is corrected to close the water balance.}
#' \item{\code{DrainageCorrection}: Amount of water (mm) added to deep drainage to correct the water balance.}
#' \item{\code{VolumeChange}: Change in soil water volume (mm).}
#' \item{\code{UncorrectedWaterBalance}: Uncorrected balance of inputs/outputs (mm).}
#' \item{\code{Substep}: Time step of the moisture solving (seconds).}
#' }
#' If \code{soilDomains == "dual"} the named vector contains the following additional elements:
#' \itemize{
#' \item{\code{Lateral flows}: Sum of water circulating between micropores and macropores, positive when filling micropores (mm).}
#' \item{\code{InfiltrationMicropores}: Water infiltrated into the soil matrix (mm).}
#' \item{\code{InfiltrationMacropores}: Water infiltrated into the soil macropore domain (mm).}
#' \item{\code{SaturationExcessMicropores/SaturationExcessMacropores}: Excess saturation in the topmost layer (mm) leading to an increase in runoff.}
#' \item{\code{DrainageMicropores}: Water draining from the bottom layer of the micropore domain (mm). This quantity is corrected to close water balance in the micropore domain.}
#' \item{\code{DrainageMacropores}: Water draining from the bottom layer of the macropore domain (mm). This quantity is corrected to close the water balance in the macropore domain.}
#' \item{\code{DrainageMicroporeCorrection}: Amount of water (mm) added to deep drainage of micropores to correct the water balance.}
#' \item{\code{DrainageMacroporeCorrection}: Amount of water (mm) added to deep drainage of macropores to correct the water balance.}
#' \item{\code{MicroporeVolumeChange}: Change in soil water volume in the micropore domain (mm).}
#' \item{\code{UncorrectedMicroporeBalance}: Uncorrected balance of inputs/outputs in the micropore domain (mm).}
#' \item{\code{MacroporeVolumeChange}: Change in soil water volume in the macropore domain (mm).}
#' \item{\code{UncorrectedMacroporeBalance}: Uncorrected balance of inputs/outputs in the macropore domain (mm).}
#' }
#'
#'
#' @references
#' Bonan, G. (2019). Climate change and terrestrial ecosystem modeling. Cambridge University Press, Cambridge, UK.
#'
#' Jarvis, N.J., Jansson, P‐E., Dik, P.E. & Messing, I. (1991). Modelling water and solute transport in macroporous soil. I. Model description and sensitivity analysis. Journal of Soil Science, 42, 59–70.
#'
#' Larsbo, M., Roulier, S., Stenemo, F., Kasteel, R. & Jarvis, N. (2005). An Improved Dual‐Permeability Model of Water Flow and Solute Transport in the Vadose Zone. Vadose Zone Journal, 4, 398–406.
#'
#' @examples
#' # Initialize soil example
#' examplesoil <- soil(defaultSoilParams(4))
Expand Down
22 changes: 19 additions & 3 deletions man/hydrology_soilWaterBalance.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 20 additions & 4 deletions src/hydrology.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,12 @@ double rootFindingMacropores(double S_t, double K_up, double Ksat_ms, double Ksa
//'
//' @seealso \code{\link{spwb}}, \code{\link{hydrology_soilWaterInputs}}, \code{\link{hydrology_infiltration}}
//'
//' @details
//' The single-domain model simulates water flows by solving Richards's equation using the predictor-corrector method, as described in
//' Bonan et al. (2019).
//'
//' The dual-permeability model is an implementation of the model MACRO 2.0 (Jarvis et al. 1991; Larsbo et al. 2005).
//'
//' @author
//' Miquel De \enc{Cáceres}{Caceres} Ainsa, CREAF
//'
Expand All @@ -600,24 +606,34 @@ double rootFindingMacropores(double S_t, double K_up, double Ksat_ms, double Ksa
//' \item{\code{Snowmelt}: Snowmelt input (mm).}
//' \item{\code{Source/sinks}: Sum of source/sink input across layers (mm).}
//' \item{\code{Infiltration}: Water infiltrated into the soil (mm).}
//' \item{\code{SaturationExcess}: Excess saturation in the topmost layer (mm) leading to an increase in runoff.}
//' \item{\code{Runoff}: Surface runoff generated (mm).}
//' \item{\code{DeepDrainage}: Water draining from the bottom layer (mm). This quantity is corrected to close the water balance.}
//' \item{\code{DrainageCorrection}: Amount of water (mm) added to deep drainage to correct the water balance.}
//' \item{\code{VolumeChange}: Change in soil water volume (mm).}
//' \item{\code{UncorrectedWaterBalance}: Uncorrected balance of inputs/outputs (mm).}
//' \item{\code{Substep}: Time step of the moisture solving (seconds).}
//' }
//' If \code{soilDomains == "dual"} the named vector contains the following additional elements:
//' \itemize{
//' \item{\code{Lateral flows}: Sum of water circulating between micropores and macropores, positive when filling micropores (mm).}
//' \item{\code{InfiltrationMicropores}: Water infiltrated into the soil matrix (mm).}
//' \item{\code{InfiltrationMacropores}: Water infiltrated into the soil macropore domain (mm).}
//' \item{\code{SaturationExcessMicropores/SaturationExcessMacropores}: Excess saturation in the topmost layer (mm) leading to an increase in runoff.}
//' \item{\code{DrainageMicropores}: Water draining from the bottom layer of the micropore domain (mm). This quantity is corrected to close water balance in the micropore domain.}
//' \item{\code{DrainageMacropores}: Water draining from the bottom layer of the macropore domain (mm). This quantity is corrected to close the water balance in the macropore domain.}
//' \item{\code{DrainageMicroporeCorrection}: Amount of water (mm) added to deep drainage of micropores to correct the water balance.}
//' \item{\code{DrainageMacroporeCorrection}: Amount of water (mm) added to deep drainage of macropores to correct the water balance.}
//' \item{\code{MicroporeVolumeChange}: Change in soil water volume in the micropore domain (mm).}
//' \item{\code{UncorrectedMicroporeBalance}: Uncorrected balance of inputs/outputs in the micropore domain (mm).}
//' \item{\code{MacroporeVolumeChange}: Change in soil water volume in the macropore domain (mm).}
//' \item{\code{UncorrectedMacroporeBalance}: Uncorrected balance of inputs/outputs in the macropore domain (mm).}
//' }
//'
//'
//' @references
//' Bonan, G. (2019). Climate change and terrestrial ecosystem modeling. Cambridge University Press, Cambridge, UK.
//'
//' Jarvis, N.J., Jansson, P‐E., Dik, P.E. & Messing, I. (1991). Modelling water and solute transport in macroporous soil. I. Model description and sensitivity analysis. Journal of Soil Science, 42, 59–70.
//'
//' Larsbo, M., Roulier, S., Stenemo, F., Kasteel, R. & Jarvis, N. (2005). An Improved Dual‐Permeability Model of Water Flow and Solute Transport in the Vadose Zone. Vadose Zone Journal, 4, 398–406.
//'
//' @examples
//' # Initialize soil example
//' examplesoil <- soil(defaultSoilParams(4))
Expand Down

0 comments on commit 931757a

Please sign in to comment.