diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html index a1d63d7..8a98f38 100644 --- a/docs/CODE_OF_CONDUCT.html +++ b/docs/CODE_OF_CONDUCT.html @@ -61,7 +61,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 7d98cac..afa07fe 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -61,7 +61,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/authors.html b/docs/authors.html index cee0615..7191152 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -61,7 +61,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/index.html b/docs/index.html index 3ddb209..c5b3c81 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ DynACof - 1.0.1 + 1.0.2 @@ -72,7 +72,7 @@

DynACof: The Dynamic Agroforestry Coffee Crop Model logo

-

Project Status: Active – The project has reached a stable, usable state and is being actively developed. Travis Build Status AppVeyor Build Status Join the chat at https://gitter.im/DynACof/Lobby# License: GPL v3 DOI

+

Project Status: Active – The project has reached a stable, usable state and is being actively developed. Travis Build Status AppVeyor Build Status Join the chat at https://gitter.im/DynACof/Lobby# License: GPL v3 DOI

Overview

@@ -97,14 +97,15 @@

library("DynACof") Sys.setenv(TZ="UTC") DynACof(Period= as.POSIXct(c("1979-01-01", "1980-12-31")))

-

To use your own data, you have to tell DynACof where to find it using Inpath parameter, and what are the file names with the FileName parameter list:

+

To use your own data, you have to tell DynACof where to find it using Inpath parameter, and what are the file names with the FileName parameter list. A separate Github repository is available for input files templates, and some help on how to proceed.

+

Example using custom input parameter files:

rm(list = ls())
 library("DynACof")
 Sys.setenv(TZ="UTC")
-DynACof(WriteIt = T, Period= as.POSIXct(c("1979-01-01", "1980-12-31")),Inpath = "1-Input/Aquiares/",
-                    Simulation_Name = "Test1",
-                    FileName = list(Site = "1-Site.R", Meteo ="2-Meteorology.txt", Soil = "3-Soil.R",
-                                    Coffee = "4-Coffee.R", Tree = NULL))
+DynACof(WriteIt = T, Period = as.POSIXct(c("1979-01-01", "1980-12-31")), + Inpath = "1-Input/Aquiares/", Simulation_Name = "Test1", + FileName = list(Site = "1-Site.R", Meteo ="2-Meteorology.txt", + Soil = "3-Soil.R",Coffee = "4-Coffee.R", Tree = NULL))

Note that the Meteo file can be of any regular format because the model uses the data.table::fread function internally.

diff --git a/docs/news/index.html b/docs/news/index.html index cab8b7d..2bf1afd 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -61,7 +61,7 @@ DynACof - 1.0.1 + 1.0.2
@@ -99,6 +99,35 @@

Changelog

+
+

+DynACof 1.0.2

+ +
+
+

+DynACof 1.0.1

+

Several imrpovements:

+ +

DynACof 0.1.2

@@ -110,6 +139,8 @@

Contents

diff --git a/docs/reference/ALS.html b/docs/reference/ALS.html index af0dc00..af82da4 100644 --- a/docs/reference/ALS.html +++ b/docs/reference/ALS.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2

diff --git a/docs/reference/Allometries.html b/docs/reference/Allometries.html index 8c2f90c..8e59a48 100644 --- a/docs/reference/Allometries.html +++ b/docs/reference/Allometries.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Aquiares.html b/docs/reference/Aquiares.html index e835d0b..42540a2 100644 --- a/docs/reference/Aquiares.html +++ b/docs/reference/Aquiares.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Constants.html b/docs/reference/Constants.html index 9d4c82f..f172aa5 100644 --- a/docs/reference/Constants.html +++ b/docs/reference/Constants.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Diffuse_d.html b/docs/reference/Diffuse_d.html index e25b4cb..7eaa10d 100644 --- a/docs/reference/Diffuse_d.html +++ b/docs/reference/Diffuse_d.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/DynACof.html b/docs/reference/DynACof.html index 5355858..130833c 100644 --- a/docs/reference/DynACof.html +++ b/docs/reference/DynACof.html @@ -66,7 +66,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/F_repartition.html b/docs/reference/F_repartition.html index 46f14f7..cebc92a 100644 --- a/docs/reference/F_repartition.html +++ b/docs/reference/F_repartition.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/GBCANMS.html b/docs/reference/GBCANMS.html index c353512..f02583b 100644 --- a/docs/reference/GBCANMS.html +++ b/docs/reference/GBCANMS.html @@ -67,7 +67,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/GDD.html b/docs/reference/GDD.html index 1c4c02b..229d302 100644 --- a/docs/reference/GDD.html +++ b/docs/reference/GDD.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/G_bulk.html b/docs/reference/G_bulk.html index 5db1f7d..53b2678 100644 --- a/docs/reference/G_bulk.html +++ b/docs/reference/G_bulk.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/G_interlay.html b/docs/reference/G_interlay.html index 20d272e..5212ada 100644 --- a/docs/reference/G_interlay.html +++ b/docs/reference/G_interlay.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/G_soilcan.html b/docs/reference/G_soilcan.html index 2428935..83fd19a 100644 --- a/docs/reference/G_soilcan.html +++ b/docs/reference/G_soilcan.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Gb_h.html b/docs/reference/Gb_h.html index c42bd2c..070933d 100644 --- a/docs/reference/Gb_h.html +++ b/docs/reference/Gb_h.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Gb_hForced.html b/docs/reference/Gb_hForced.html index e59ab99..51e518f 100644 --- a/docs/reference/Gb_hForced.html +++ b/docs/reference/Gb_hForced.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/GetWind.html b/docs/reference/GetWind.html index 489c68c..fc2fe34 100644 --- a/docs/reference/GetWind.html +++ b/docs/reference/GetWind.html @@ -68,7 +68,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Import_Parameters.html b/docs/reference/Import_Parameters.html index e52e292..3a501db 100644 --- a/docs/reference/Import_Parameters.html +++ b/docs/reference/Import_Parameters.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Init_Sim.html b/docs/reference/Init_Sim.html index be5c016..c628582 100644 --- a/docs/reference/Init_Sim.html +++ b/docs/reference/Init_Sim.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Light_extinction_K.html b/docs/reference/Light_extinction_K.html index 916b612..abecc38 100644 --- a/docs/reference/Light_extinction_K.html +++ b/docs/reference/Light_extinction_K.html @@ -66,7 +66,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Meteorology.html b/docs/reference/Meteorology.html index c66c0ed..a78280c 100644 --- a/docs/reference/Meteorology.html +++ b/docs/reference/Meteorology.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/PENMON.html b/docs/reference/PENMON.html index d1de2e1..1e2ca70 100644 --- a/docs/reference/PENMON.html +++ b/docs/reference/PENMON.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Paliv_dis.html b/docs/reference/Paliv_dis.html index 97ed157..e582b34 100644 --- a/docs/reference/Paliv_dis.html +++ b/docs/reference/Paliv_dis.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Rad_ext.html b/docs/reference/Rad_ext.html index 8350b4b..0ac3526 100644 --- a/docs/reference/Rad_ext.html +++ b/docs/reference/Rad_ext.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Rad_net.html b/docs/reference/Rad_net.html index fa956d6..0d5bc75 100644 --- a/docs/reference/Rad_net.html +++ b/docs/reference/Rad_net.html @@ -65,7 +65,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Shade.Tree.html b/docs/reference/Shade.Tree.html index e5a4460..60ae712 100644 --- a/docs/reference/Shade.Tree.html +++ b/docs/reference/Shade.Tree.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Simulation-class.html b/docs/reference/Simulation-class.html index 89ed199..e0142bd 100644 --- a/docs/reference/Simulation-class.html +++ b/docs/reference/Simulation-class.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Soilfun.html b/docs/reference/Soilfun.html index 7cb4d48..4935178 100644 --- a/docs/reference/Soilfun.html +++ b/docs/reference/Soilfun.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/Sucrose_cont_perc.html b/docs/reference/Sucrose_cont_perc.html index 0dbe492..9aceadc 100644 --- a/docs/reference/Sucrose_cont_perc.html +++ b/docs/reference/Sucrose_cont_perc.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 @@ -119,11 +119,11 @@

Arg a -

Parameters

+

Parameter

b -

Parameters

+

Parameter

x0 @@ -137,10 +137,7 @@

Arg

Value

- - -
Sucrose content

(In % of fruit total dry mass)

- +

Sucrose content, in % of fruit total dry mass

References

diff --git a/docs/reference/after.html b/docs/reference/after.html index d6e010b..e2fcb62 100644 --- a/docs/reference/after.html +++ b/docs/reference/after.html @@ -64,7 +64,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/cos_deg.html b/docs/reference/cos_deg.html index 71cc546..ff5fc79 100644 --- a/docs/reference/cos_deg.html +++ b/docs/reference/cos_deg.html @@ -67,7 +67,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/index.html b/docs/reference/index.html index cfdf106..f42c79e 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -61,7 +61,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/previous_i.html b/docs/reference/previous_i.html index 2e729d4..a54c038 100644 --- a/docs/reference/previous_i.html +++ b/docs/reference/previous_i.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/site.html b/docs/reference/site.html index f1e5e73..491c4ca 100644 --- a/docs/reference/site.html +++ b/docs/reference/site.html @@ -66,7 +66,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/varnames.html b/docs/reference/varnames.html index 8b03a17..176b3d9 100644 --- a/docs/reference/varnames.html +++ b/docs/reference/varnames.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/warn.var.html b/docs/reference/warn.var.html index 1adb39e..8d5746f 100644 --- a/docs/reference/warn.var.html +++ b/docs/reference/warn.var.html @@ -63,7 +63,7 @@ DynACof - 1.0.1 + 1.0.2 diff --git a/docs/reference/write.results.html b/docs/reference/write.results.html index 1eb4e31..0385c06 100644 --- a/docs/reference/write.results.html +++ b/docs/reference/write.results.html @@ -68,7 +68,7 @@ DynACof - 1.0.1 + 1.0.2