Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/275-repeat-last-year-of-forcing'…
Browse files Browse the repository at this point in the history
… into 275-repeat-last-year-of-forcing
  • Loading branch information
marcadella committed Dec 12, 2024
2 parents f6ff9ce + 2ffaf98 commit b7323ae
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: rsofun
Title: The P-Model and BiomeE Modelling Framework
Version: 5.1.0
Version: 5.0.0.9000
Authors@R: c(
person(
family = "Stocker",
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rsofun v5.1.0
# rsofun (development version v5.1.0)

* new BiomeE behavior to recycle last year of forcing if requested simulation time span (`nyeartrend`) is longer than
available forcing data
Expand Down
2 changes: 1 addition & 1 deletion R/runread_pmodel_f.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#' Runs P-model for multiple sites.
#'
#' @param drivers A nested data frame with one row for each site and columns
#' named according to the arguments of function \code{\link{runread_pmodel_f_bysite}}.
#' named according to the arguments of function \code{\link{runread_pmodel_f}}.
#' Namely \code{sitename, params_siml, site_info} and \code{forcing}.
#' @param par A named list of free (calibratable) model parameters.
#' \describe{
Expand Down
2 changes: 1 addition & 1 deletion man/runread_pmodel_f.Rd

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

0 comments on commit b7323ae

Please sign in to comment.