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

saveAllMusoPlot bug fixed

Browse Source
This commit is contained in:
Roland Hollós 2020-10-12 10:59:40 +02:00
parent 3b3fe7ea1c
commit fdb5bf8e43
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RBBGCMuso/R/plotMuso.R
View File

@ -353,25 +353,30 @@ compareMuso <- function(settings=NULL,parameters, variable=1, calibrationPar=NUL
saveAllMusoPlots <- function(settings=NULL, plotName = ".png", saveAllMusoPlots <- function(settings=NULL, plotName = ".png",
silent = TRUE, type = "line", outFile = "annual.csv", silent = TRUE, type = "line", outFile = "annual.csv",
colour = NULL, skipSpinup = FALSE){ colour = "blue", skipSpinup = FALSE){
if(is.null(settings)){ if(is.null(settings)){
settings <- setupMuso() settings <- setupMuso()
} }
dailyVarCodes <- settings$dailyVarCodes dailyVarCodes <- settings$dailyVarCodes
annualVarCodes <-settings$annualVarCodes annualVarCodes <-settings$annualVarCodes
outputVars <- unlist(settings$outputVars[[1]]) outputVars <- unlist(settings$outputVars[[1]])
musoData <- calibMuso(settings = settings, prettyOut = TRUE, silent = silent, skipSpinup = skipSpinup) musoData <- calibMuso(settings = settings, prettyOut = TRUE, silent = silent, skipSpinup = skipSpinup)
musoData$date<- as.Date(musoData$date,"%d.%m.%Y")
for(i in seq_along(dailyVarCodes)){ for(i in seq_along(dailyVarCodes)){
bases <- ggplot(data = musoData, mapping = aes_string(x = "date", y = outputVars[i])) bases <- ggplot(data = musoData, mapping = aes_string(x = "date", y = outputVars[i]))
object <-ifelse(type == "line",paste0("geom_line(colour = '",colour,"')"), object <-ifelse(type == "line",paste0("geom_line(colour = '",colour,"')"),
ifelse(type == "point",paste0("geom_line(colour = ",colour,")"), ifelse(type == "point",paste0("geom_line(colour = ",colour,")"),
stop("The"))) stop("The")))
outPlot <- bases + eval(parse(text = object)) + theme_classic() + theme(axis.title.x=element_blank()) outPlot <- bases + eval(parse(text = object)) + theme_classic() + theme(axis.title.x=element_blank())
ggsave(paste0("daily-",dailyVarCodes[i],plotName),outPlot) imName <- paste0("daily-",dailyVarCodes[i],plotName)
cat(sprintf("Saving daily output image of %s as %s\n",outputVars[i],imName))
suppressMessages(ggsave(imName, outPlot))
}
if(settings$normOutputFlags["annual"]!=2){
return("Annual output graphs was not saved (no annual output from the model)")
} }
musoYData <- getyearlyout(settings) musoYData <- getyearlyout(settings)
write.csv(musoYData,paste0(settings$outputNames[[2]],outFile)) write.csv(musoYData,paste0(settings$outputNames[[2]],outFile))
for(i in seq_along(annualVarCodes)){ for(i in seq_along(annualVarCodes)){

11
RBBGCMuso/R/setupMuso.R
View File

@ -268,6 +268,14 @@ setupMuso <- function(executable=NULL,
as.numeric(unlist(strsplit(inFile[grep(key,inFile,perl=TRUE)+n],split = "\\s+", useBytes = TRUE))[1]) as.numeric(unlist(strsplit(inFile[grep(key,inFile,perl=TRUE)+n],split = "\\s+", useBytes = TRUE))[1])
} }
} }
normOutputFlags <- c(
daily=searchBellow(iniFiles[[2]], "OUTPUT_CONTROL",stringP=FALSE,n=2),
annual=searchBellow(iniFiles[[2]], "OUTPUT_CONTROL",stringP=FALSE,n=5))
if(normOutputFlags[1]!=1){
warning("You should set your daily output flag to 1 (binary) RBBRMuso work only with binary output...")
}
searchBellow(iniFiles[[2]], "OUTPUT_CONTROL",stringP=FALSE,n=5)
soilFile <- NULL soilFile <- NULL
if(version >=6){ if(version >=6){
soilFiles <- tryCatch(sapply(iniFiles,function(x){(searchBellow(x,"SOIL_FILE"))}),error = function(e){""}) soilFiles <- tryCatch(sapply(iniFiles,function(x){(searchBellow(x,"SOIL_FILE"))}),error = function(e){""})
@ -305,7 +313,8 @@ setupMuso <- function(executable=NULL,
dailyVarCodes= gsub("\\s.*","",dailyVarCodes), dailyVarCodes= gsub("\\s.*","",dailyVarCodes),
annualVarCodes = gsub("\\s.*","",annualVarCodes), annualVarCodes = gsub("\\s.*","",annualVarCodes),
dailyOutputTable=dailyOutputTable, dailyOutputTable=dailyOutputTable,
annualOutputTable=annualOutputTable annualOutputTable=annualOutputTable,
normOutputFlags=normOutputFlags
) )
# if(getOption("RMuso_version")==6){ # if(getOption("RMuso_version")==6){