Skip to content

Commit

Permalink
update version + remake logistic_deriv as before
Browse files Browse the repository at this point in the history
  • Loading branch information
VEZY committed Aug 11, 2019
1 parent 4c0c385 commit 5578bbe
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: DynACof
Type: Package
Title: Dynamic Crop Model to Simulate Coffee Crop Ecophysiology for Monospecific Stands or Agroforestry
Version: 1.1.2
Version: 1.2.0
Date: 2019-03-14
Authors@R: c(person("Remi", "Vezy",, "[email protected]", c("aut", "cre", "cph"),comment = c(ORCID = "0000-0002-0808-1461")),
person("Olivier", "Roupsard",, "[email protected]", c("aut", "cph")),
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# DynACof 1.2.0

* Reformat the code so the shade tree, coffee, soil and energy balance are made by separate functions sequentially
* Add dynacof_i to be able to change a simulation from one (or several) time step to another
* Add DynACof.jl compatibility: now the user can use the Julia version of DynACof directly from the R using the R version of the package. This functionnality require Julia (v > 1.1) to be installed on the computer and available in the path.

# DynACof 1.1.2

* Externalize coffee metamodels to parameter file + remove Tcan_MAESPA_Coffee as it is computed by the model now
Expand Down
3 changes: 2 additions & 1 deletion R/0-Functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,8 @@ logistic= function(xi,u_log,s_log){1/(1+exp(-((xi-u_log)/s_log)))}
#' @rdname logistic
#' @export
logistic_deriv= function(xi,u_log,s_log){
logistic(xi,u_log,s_log) * (1.0 - logistic(xi,u_log,s_log))
res= c(0,diff(xi))
(exp(-((xi-u_log)/s_log))/(s_log*(1+exp(-((xi-u_log)/s_log)))^2))*res
}

#' Fruit sucrose accumulation
Expand Down

0 comments on commit 5578bbe

Please sign in to comment.