Merge remote-tracking branch 'origin/development' into suz-dep

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: suz-estella

DESCRIPTION

@@ -5,7 +5,7 @@ Description: Implementation of several components of the Carbon Budget Model of
     Canadian Forest Service (v3).
 URL:
     https://github.com/PredictiveEcology/CBMutils
-Version: 2.5.4.9001
+Version: 2.5.4.9002
 Authors@R: c(
     person("Céline",    "Boisvenue", email = "celine.boisvenue@nrcan-rncan.gc.ca", role = c("aut", "cre")),
     person("Alex M",    "Chubaty",   email = "achubaty@for-cast.ca",               role = c("aut"), comment = c(ORCID = "0000-0001-7146-8135")),

R/CBM-tools_calcRootC.R

@@ -15,6 +15,7 @@ utils::globalVariables(c(
 #' @param b_hw "b" value for hardwood root biomass
 #' @param a_frp "a" value for fine root proportion
 #' @param b_frp "b" value for fine root proportion
+#' @param c_frp "c" value for fine root proportion
 #' @param biomassToCarbonRate Conversion factor of biomass to carbon
 #'
 #' @references
@@ -29,7 +30,7 @@ utils::globalVariables(c(
 calcRootC <- function(aboveGroundC, sw_hw,
                       a_sw = 0.222, b_sw = 1,
                       a_hw = 1.576, b_hw = 0.615,
-                      a_frp = 0.072, b_frp = 0.354,
+                      a_frp = 0.072, b_frp = 0.354, c_frp = -0.060212,
                       biomassToCarbonRate = 0.5){
 
   aboveGroundColumns <- c("Merch", "Foliage", "Other")
@@ -43,7 +44,7 @@ calcRootC <- function(aboveGroundC, sw_hw,
   totAGC <- rowSums(aboveGroundC[, ..aboveGroundColumns])
 
   # Convert Mg/ha of Carbon to Mg/ha of biomass
-  totAGB <- totAGC * 2
+  totAGB <- totAGC / biomassToCarbonRate
 
   # Calculate root total biomass
   if(!all(sw_hw %in% c(1,0))) {
@@ -55,7 +56,7 @@ calcRootC <- function(aboveGroundC, sw_hw,
                         a_hw * totAGB^b_hw)
 
   # Calculate the proportion of fine roots
-  fineRootProp <- a_frp + b_frp * exp(-0.060212 * rootTotBiom)
+  fineRootProp <- a_frp + b_frp * exp(c_frp * rootTotBiom)
 
 
   # Calculate the proportion of fine roots