Skip to content

Commit

Permalink
changed default recovery
Browse files Browse the repository at this point in the history
  • Loading branch information
miquelcaceres committed May 29, 2024
1 parent 639a9df commit 6af83a5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: medfate
Type: Package
Title: Mediterranean Forest Simulation
Version: 4.3.1
Date: 2024-05-23
Version: 4.3.2
Date: 2024-05-29
Authors@R: c(
person('Miquel', 'De Cáceres', role=c('aut','cre', 'cph'),
email='miquelcaceres@gmail.com', comment = c(ORCID = "0000-0001-7132-2080")),
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
NEWS for R Package "medfate"
-------------------------------

# Version 4.3.2
- Default control parameters

# Version 4.3.1
- Functions forest2spwbInput/forest2growthInput deprecated. Preferred function names are spwbInput/growthInput.

Expand Down
6 changes: 3 additions & 3 deletions R/defaultControl.R
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#' \item{\code{windMeasurementHeight [= 200]}: Height (in cm) over the canopy corresponding to wind measurements.}
#' \item{\code{segmentedXylemVulnerability [= TRUE/FALSE]}: If \code{FALSE} leaf and root vulnerability curves will be equal to those of stem. By default, \code{segmentedXylemVulnerability = TRUE} for \code{transpirationMode = "Sperry"} and \code{segmentedXylemVulnerability = FALSE} for \code{transpirationMode = "Sureau"}.}
#' \item{\code{leafCavitationEffects, stemCavitationEffects [= FALSE/TRUE]}: A flag indicating whether cavitation effects on conductance of leaves and stem are applied. Only relevant for \code{transpirationMode = "Sperry"}.}
#' \item{\code{leafCavitationRecovery, stemCavitationRecovery [= "rate"]}: A string indicating how recovery of previous cavitation leaf/stem xylem is done (only relevant for functions \code{\link{spwb}} and \code{\link{spwb_day}}):
#' \item{\code{leafCavitationRecovery, stemCavitationRecovery [= "annual"]}: A string indicating how recovery of previous cavitation leaf/stem xylem is done (only relevant for functions \code{\link{spwb}} and \code{\link{spwb_day}}):
#' \itemize{
#' \item{"none" - no recovery.}
#' \item{"annual" - every first day of the year.}
Expand Down Expand Up @@ -216,8 +216,8 @@ defaultControl<-function(transpirationMode = "Granier") {
verticalLayerSize = 100,
windMeasurementHeight = 200,
segmentedXylemVulnerability = TRUE,
stemCavitationRecovery = "rate",
leafCavitationRecovery = "rate",
stemCavitationRecovery = "annual",
leafCavitationRecovery = "annual",

#spwb with granier
hydraulicRedistributionFraction = 0.1,
Expand Down
2 changes: 1 addition & 1 deletion man/defaultControl.Rd

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

0 comments on commit 6af83a5

Please sign in to comment.