diff --git a/DESCRIPTION b/DESCRIPTION index 81b32ab..662bc6a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ VignetteBuilder: knitr Type: Package Title: Fire weather index calculation from station and model data Version: 1.1.0 -Date: 2018-09-28 +Date: 2018-10-04 Authors@R: as.person(c( "Santander Meteorology Group [aut]", "Joaquin Bedia [ctb, cre]", diff --git a/NEWS b/NEWS index 101416f..d3036b8 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,6 @@ fireDanger changelog For earlier version descriptions, got to the [Releases Tab](https://github.com/SantanderMetGroup/fireDanger/releases) -## v1.1.0 (in devel) +## v1.1.0 (4 Oct 2018) * Included an implementation of the Finish Forest Fire Danger Index System * Other minor changes and documentation updates diff --git a/R/fffdiGrid.R b/R/fffdiGrid.R index f7318e1..07a54cb 100644 --- a/R/fffdiGrid.R +++ b/R/fffdiGrid.R @@ -19,7 +19,7 @@ #' @description Implementation of the FFFDI for climate4R grids #' @param pr A climate4R object containing daily precipitation (in mm) #' @param pet A climate4R object containing daily (potential) evapotranspiration data (in mm). -#' @param Wwol.init Initialization value for volumetric moisture, in the range 0.1-0.5. +#' @param Wvol.init Initialization value for volumetric moisture, in the range 0.1-0.5. #' Default to 0.5 (very wet soil), but see Details. #' @param z reference surface layer thickness (mm). Default to 60. #' @references Vajda, A., Venalainen, A., Suomi, I., Junila, P. and Makela, H., 2014. Assessment of forest diff --git a/man/fffdiGrid.Rd b/man/fffdiGrid.Rd index 4a6e36a..38d9bde 100644 --- a/man/fffdiGrid.Rd +++ b/man/fffdiGrid.Rd @@ -11,10 +11,10 @@ fffdiGrid(pr, pet, Wvol.init = 0.5, z = 60) \item{pet}{A climate4R object containing daily (potential) evapotranspiration data (in mm).} -\item{z}{reference surface layer thickness (mm). Default to 60.} - -\item{Wwol.init}{Initialization value for volumetric moisture, in the range 0.1-0.5. +\item{Wvol.init}{Initialization value for volumetric moisture, in the range 0.1-0.5. Default to 0.5 (very wet soil), but see Details.} + +\item{z}{reference surface layer thickness (mm). Default to 60.} } \value{ A climate4R object containing FFFDI data