diff --git a/QE_Analyses/Run_analytical_solutions.R b/QE_Analyses/Run_analytical_solutions.R index 7aa4a5a..4133630 100644 --- a/QE_Analyses/Run_analytical_solutions.R +++ b/QE_Analyses/Run_analytical_solutions.R @@ -87,12 +87,12 @@ r10 <- Perform_Analytical_Run101(f.flag = 2) #r11 <- Perform_Analytical_Run11(f.flag = 2) #r12 <- Perform_Analytical_Run12(f.flag = 2) -#r20 <- Perform_Analytical_Run20(f.flag = 2) -#r21 <- Perform_Analytical_Run21(f.flag = 2) -#r22 <- Perform_Analytical_Run22(f.flag = 2) -#r23 <- Perform_Analytical_Run23(f.flag = 2) -#r24 <- Perform_Analytical_Run24(f.flag = 2) -#r25 <- Perform_Analytical_Run25(f.flag = 2) +r20 <- Perform_Analytical_Run20(f.flag = 2) +r21 <- Perform_Analytical_Run21(f.flag = 2) +r22 <- Perform_Analytical_Run22(f.flag = 2) +r23 <- Perform_Analytical_Run23(f.flag = 2) +r24 <- Perform_Analytical_Run24(f.flag = 2) +r25 <- Perform_Analytical_Run25(f.flag = 2) #### Allocation coupling as Medlyn and Dewar 1996 r26 <- Perform_Analytical_Run26(f.flag = 2) diff --git a/QE_Scripts/Analytical_Run20.R b/QE_Scripts/Analytical_Run20.R index 2877e0c..4574e82 100644 --- a/QE_Scripts/Analytical_Run20.R +++ b/QE_Scripts/Analytical_Run20.R @@ -40,8 +40,8 @@ Perform_Analytical_Run20 <- function(f.flag = 1) { ### calculate soil parameters, e.g. reburial coef. s_coef <- soil_coef(df=VL_eq$nf, a=a_eq) - omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass - omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass + a_eq$aw*s_coef$omega_aw_pass + omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + a_eq$aw*s_coef$omega_aw_slow ### Get C from very-long term nutrient cycling solution ### return in g C m-2 diff --git a/QE_Scripts/Analytical_Run21.R b/QE_Scripts/Analytical_Run21.R index 17b914a..4de36e6 100644 --- a/QE_Scripts/Analytical_Run21.R +++ b/QE_Scripts/Analytical_Run21.R @@ -40,8 +40,8 @@ Perform_Analytical_Run21 <- function(f.flag = 1) { ### calculate soil parameters, e.g. reburial coef. s_coef <- soil_coef(df=VL_eq$nf, a=a_eq) - omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass - omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass + a_eq$aw*s_coef$omega_aw_pass + omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + a_eq$aw*s_coef$omega_aw_slow ### Get C from very-long term nutrient cycling solution ### return in g C m-2 diff --git a/QE_Scripts/Analytical_Run22.R b/QE_Scripts/Analytical_Run22.R index 64f6fbc..1a30a14 100644 --- a/QE_Scripts/Analytical_Run22.R +++ b/QE_Scripts/Analytical_Run22.R @@ -40,8 +40,8 @@ Perform_Analytical_Run22 <- function(f.flag = 1) { ### calculate soil parameters, e.g. reburial coef. s_coef <- soil_coef(df=VL_eq$nf, a=a_eq) - omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass - omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass+ a_eq$aw*s_coef$omega_aw_pass + omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow+ a_eq$aw*s_coef$omega_aw_slow ### Get C from very-long term nutrient cycling solution ### return in g C m-2 diff --git a/QE_Scripts/Analytical_Run23.R b/QE_Scripts/Analytical_Run23.R index b80b2c8..482ef56 100644 --- a/QE_Scripts/Analytical_Run23.R +++ b/QE_Scripts/Analytical_Run23.R @@ -40,8 +40,8 @@ Perform_Analytical_Run23 <- function(f.flag = 1) { ### calculate soil parameters, e.g. reburial coef. s_coef <- soil_coef(df=VL_eq$nf, a=a_eq) - omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass - omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass+ a_eq$aw*s_coef$omega_aw_pass + omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow+ a_eq$aw*s_coef$omega_aw_slow ### Get C from very-long term nutrient cycling solution ### return in g C m-2 diff --git a/QE_Scripts/Analytical_Run24.R b/QE_Scripts/Analytical_Run24.R index 48a3742..e6f297d 100644 --- a/QE_Scripts/Analytical_Run24.R +++ b/QE_Scripts/Analytical_Run24.R @@ -40,8 +40,8 @@ Perform_Analytical_Run24 <- function(f.flag = 1) { ### calculate soil parameters, e.g. reburial coef. s_coef <- soil_coef(df=VL_eq$nf, a=a_eq) - omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass - omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass+ a_eq$aw*s_coef$omega_aw_pass + omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow+ a_eq$aw*s_coef$omega_aw_slow ### Get C from very-long term nutrient cycling solution ### return in g C m-2 diff --git a/QE_Scripts/Analytical_Run25.R b/QE_Scripts/Analytical_Run25.R index 4a1cf8f..dc52cd6 100644 --- a/QE_Scripts/Analytical_Run25.R +++ b/QE_Scripts/Analytical_Run25.R @@ -40,8 +40,8 @@ Perform_Analytical_Run25 <- function(f.flag = 1) { ### calculate soil parameters, e.g. reburial coef. s_coef <- soil_coef(df=VL_eq$nf, a=a_eq) - omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass - omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow + omega_ap <- a_eq$af*s_coef$omega_af_pass + a_eq$ar*s_coef$omega_ar_pass+ a_eq$aw*s_coef$omega_aw_pass + omega_as <- a_eq$af*s_coef$omega_af_slow + a_eq$ar*s_coef$omega_ar_slow+ a_eq$aw*s_coef$omega_aw_slow ### Get C from very-long term nutrient cycling solution ### return in g C m-2