namespace and variable name bugfixes in plotMuso function
This commit is contained in:
parent
28dc638b83
commit
2a84c8ddbd
@ -23,7 +23,7 @@ Imports:
|
||||
tidyr
|
||||
LinkingTo: Rcpp
|
||||
Maintainer: Roland Hollo's <hollorol@gmail.com>
|
||||
RoxygenNote: 6.0.1
|
||||
RoxygenNote: 6.1.0
|
||||
Suggests: knitr,
|
||||
rmarkdown,
|
||||
VignetteBuilder: knitr
|
||||
|
||||
@ -26,6 +26,7 @@ import(grDevices)
|
||||
import(graphics)
|
||||
import(magrittr)
|
||||
import(stats)
|
||||
import(tidyr)
|
||||
import(utils)
|
||||
importFrom(Rcpp,evalCpp)
|
||||
useDynLib(RBBGCMuso)
|
||||
|
||||
@ -21,7 +21,9 @@
|
||||
#' debugging=FALSE, keepEpc=FALSE,
|
||||
#' logfilename=NULL, aggressive=FALSE,
|
||||
#' leapYear=FALSE, export=FALSE)
|
||||
#' @import ggplot2, dplyr
|
||||
#' @import ggplot2
|
||||
#' @import dplyr
|
||||
#' @import tidyr
|
||||
#' @export
|
||||
|
||||
plotMuso <- function(settings=NULL,
|
||||
@ -96,7 +98,7 @@ plotMuso <- function(settings=NULL,
|
||||
}
|
||||
p
|
||||
} else {
|
||||
p <- baseData %>%
|
||||
p <- musoData %>%
|
||||
select(c("date", variableName))%>%
|
||||
gather(., key= outputs, value = bla, variableName) %>%
|
||||
# head %>%
|
||||
@ -119,7 +121,7 @@ plotMuso <- function(settings=NULL,
|
||||
}
|
||||
p
|
||||
} else{
|
||||
p <- baseData %>%
|
||||
p <- musoData %>%
|
||||
select(c("date",variableName))%>%
|
||||
gather(., key= outputs, value = bla,variableName) %>%
|
||||
# head %>%
|
||||
|
||||
@ -33,6 +33,8 @@ keepEpc=FALSE, export=FALSE, silent=FALSE, aggressive=FALSE, leapYear=FALSE)
|
||||
\item{binaryPlace}{The place of the binary output files.}
|
||||
|
||||
\item{fileToChange}{You can change any line of the epc or the ini file, you just have to specify with this variable which file you van a change. Two options possible: "epc", "ini"}
|
||||
|
||||
\item{skipSpinup}{If TRUE, calibMuso wont do spinup simulation}
|
||||
}
|
||||
\value{
|
||||
No return, outputs are written to file
|
||||
|
||||
@ -29,6 +29,10 @@ leapYear=FALSE, export=FALSE)
|
||||
|
||||
\item{leapYear}{Should the function do a leapyear correction on the outputdata? If TRUE, then the 31.12 day will be doubled.}
|
||||
|
||||
\item{plotType}{There are two options now: continious time series("cts") or disctrete time series("dts")}
|
||||
|
||||
\item{skipSpinup}{If TRUE, calibMuso wont do spinup simulation}
|
||||
|
||||
\item{export}{if it is yes or you give a filename here, it converts the output to the specific extension. For example, if you set export to "example.csv", it converts the output to "csv", if you set it to "example.xls" it converts to example.xls with the xlsx package. If it is not installed it gives back a warning message and converts it to csv.}
|
||||
}
|
||||
\value{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user