hollorol/RBBGCMuso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding more filtering options and bugfixing in plotMuso.

Browse Source
This commit is contained in:
hollorol 2018-12-07 08:23:19 +01:00
parent 5ced44441e
commit 1aaa21348e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RBBGCMuso/DESCRIPTION
View File

@ -1,9 +1,9 @@
Package: RBBGCMuso Package: RBBGCMuso
Title: An R package for BiomeBGC-MuSo ecosystem modelling Title: An R package for BiomeBGC-MuSo ecosystem modelling
Version: 0.6.0.0-2 Version: 0.6.0.0-3
Authors@R: person("Roland", "Hollo's", , "hollorol@gmail.com", role = c("aut", "cre")) Authors@R: person("Roland", "Hollo's", , "hollorol@gmail.com", role = c("aut", "cre"))
Description: What the package does (one paragraph). Description: What the package does (one paragraph).
Depends: R (>= 2.10) Depends: R (>= 3.3.2)
License: GPL-2 License: GPL-2
LazyData: true LazyData: true
NeedsCompilation: no NeedsCompilation: no

12
RBBGCMuso/R/plotMuso.R
View File

@ -46,7 +46,8 @@ plotMuso <- function(settings=NULL,
colour="blue", colour="blue",
skipSpinup=TRUE, skipSpinup=TRUE,
fromData=FALSE, fromData=FALSE,
timeFrame="day", timeFrame="day",
selectYear=NULL,
groupFun=mean, groupFun=mean,
dpi=300){ dpi=300){
@ -98,6 +99,10 @@ plotMuso <- function(settings=NULL,
tibble::rownames_to_column("date") %>% tibble::rownames_to_column("date") %>%
mutate(date2=date,date=as.Date(date,"%d.%m.%Y")) %>% mutate(date2=date,date=as.Date(date,"%d.%m.%Y")) %>%
tidyr::separate(date2,c("day","month","year"),sep="\\.") tidyr::separate(date2,c("day","month","year"),sep="\\.")
if(!is.null(selectYear)){
musoData <- musoData %>% dplyr::filter(year == get("selectYear"))
}
if(timeFrame!="day"){ if(timeFrame!="day"){
musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun), musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun),
error=function(e){stop("The timeFrame or the gropFun is not found")}) error=function(e){stop("The timeFrame or the gropFun is not found")})
@ -108,6 +113,11 @@ plotMuso <- function(settings=NULL,
mutate(date2=date,date=as.Date(date,"%d.%m.%Y"), mutate(date2=date,date=as.Date(date,"%d.%m.%Y"),
yearDay=rep(1:365,numberOfYears), cum_yieldC_HRV=cum_yieldC_HRV*22.22) %>% yearDay=rep(1:365,numberOfYears), cum_yieldC_HRV=cum_yieldC_HRV*22.22) %>%
tidyr::separate(date2,c("day","month","year"),sep="\\.") tidyr::separate(date2,c("day","month","year"),sep="\\.")
if(!is.null(selectYear)){
musoData <- musoData %>% dplyr::filter(year == get("selectYear"))
}
if(timeFrame!="day"){ if(timeFrame!="day"){
musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun), musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun),
error=function(e){stop("The timeframe or the gropFun is not found")}) error=function(e){stop("The timeframe or the gropFun is not found")})

4
RBBGCMuso/R/quickeffect.R
View File

@ -10,7 +10,7 @@
#' @return An effect plot #' @return An effect plot
#' @export #' @export
musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, endVal, nSteps = 1, fileTochange="epc", outVar, parName = "parVal"){ musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc", outVar, parName = "parVal"){
if(is.character(outVar)){ if(is.character(outVar)){
varNames <- as.data.frame(musoMappingFind(outVar)) varNames <- as.data.frame(musoMappingFind(outVar))
@ -37,7 +37,7 @@ musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, en
parVals <- seq(startVal, endVal, length = (nSteps + 1)) parVals <- seq(startVal, endVal, length = (nSteps + 1))
a <- do.call(rbind,lapply(parVals, function(parVal){ a <- do.call(rbind,lapply(parVals, function(parVal){
calResult <- tryCatch(calibMuso(settings = settings,calibrationPar = calibrationPar, parameters = parVal, outVars = outVarIndex, silent = TRUE), error = function(e){NA}) calResult <- tryCatch(calibMuso(settings = settings,calibrationPar = calibrationPar, parameters = parVal, outVars = outVarIndex, silent = TRUE,fileToChange = fileToChange), error = function(e){NA})
if(all(is.na(calResult))){ if(all(is.na(calResult))){
b <- cbind(rep(NA,365),parVal) b <- cbind(rep(NA,365),parVal)
rownames(b) <- tail(musoDate(startYear = settings$startYear, numYears = settings$numYears),365) rownames(b) <- tail(musoDate(startYear = settings$startYear, numYears = settings$numYears),365)