diff --git a/R/eval_sofun.R b/R/eval_sofun.R index f656afba..a0befcf8 100644 --- a/R/eval_sofun.R +++ b/R/eval_sofun.R @@ -102,7 +102,7 @@ eval_sofun <- function( mod, settings_eval, settings_sims, obs_eval = NA, overwr right_join( ddf, by = c("sitename", "date")) ## metrics for daily and x-daily values, all sites pooled - metrics$gpp$fluxnet2015$daily_pooled <- with( ddf, get_stats( gpp_mod, gpp_obs ) ) + metrics$gpp$fluxnet2015$daily_pooled <- with( ddf, get_stats( gpp_mod, gpp_obs ) ) metrics$gpp$fluxnet2015$xdaily_pooled <- with( xdf, get_stats( gpp_mod, gpp_obs ) ) ##------------------------------------------------------------ diff --git a/R/getrow_statstable.R b/R/getrow_statstable.R index f05a7bff..021c2b8f 100644 --- a/R/getrow_statstable.R +++ b/R/getrow_statstable.R @@ -14,7 +14,7 @@ getrow_statstable <- function( out_eval, stat ){ addrow <- tibble( spatial = out_eval$metrics$gpp$fluxnet2015$spatial[[ stat ]], annual = out_eval$metrics$gpp$fluxnet2015$annual_pooled[[ stat ]], monthly = out_eval$metrics$gpp$fluxnet2015$monthly_pooled[[ stat ]], - # xdaily = out_eval$metrics$gpp$fluxnet2015$xdaily_pooled[[ stat ]], + xdaily = out_eval$metrics$gpp$fluxnet2015$xdaily_pooled[[ stat ]], daily = out_eval$metrics$gpp$fluxnet2015$daily_pooled[[ stat ]], seasonal = out_eval$metrics$gpp$fluxnet2015$meandoy[[ stat ]], # seasonal_xdaily = out_eval$metrics$gpp$fluxnet2015$meanxoy[[ stat ]], diff --git a/R/rpmodel.R b/R/rpmodel.R index 460f43d2..8cd8e89f 100644 --- a/R/rpmodel.R +++ b/R/rpmodel.R @@ -96,7 +96,7 @@ rpmodel <- function( tc, vpd, co2, elv, kphio, fapar = NA, ppfd = NA, method="fu ## 'do_ftemp_kphio' is not actually a stress function, but is the temperature-dependency of ## the quantum yield efficiency after Bernacchi et al., 2003 PCE if (do_ftemp_kphio){ - ftemp_kphio <- calc_ftemp_kphio( dtemp ) + ftemp_kphio <- calc_ftemp_kphio( tc ) } else { ftemp_kphio <- 1.0 } @@ -698,13 +698,13 @@ calc_viscosity_h2o_vogel <- function( tc ) { return( visc ) } -calc_ftemp_kphio <- function( dtemp ){ +calc_ftemp_kphio <- function( tc ){ #//////////////////////////////////////////////////////////////// # Calculates the instantaneous temperature response of the quantum # yield efficiency based on Bernacchi et al., 2003 PCE (Equation # and parameter values taken from Appendix B) #---------------------------------------------------------------- - ftemp <- 0.352 + 0.022 * dtemp - 3.4e-4 * dtemp^2 + ftemp <- 0.352 + 0.022 * tc - 3.4e-4 * tc^2 return(ftemp) }