Skip to content

Commit

Permalink
continued correction
Browse files Browse the repository at this point in the history
  • Loading branch information
@mingkaijiang
mingkaijiang committed Nov 15, 2018
1 parent d2b39ec commit ab39e5c
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions QE_Analyses/Run_analytical_solutions.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions QE_Scripts/Analytical_Run20.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions QE_Scripts/Analytical_Run21.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions QE_Scripts/Analytical_Run22.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions QE_Scripts/Analytical_Run23.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions QE_Scripts/Analytical_Run24.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions QE_Scripts/Analytical_Run25.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ab39e5c

Please sign in to comment.