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

nastrings

Browse Source
This commit is contained in:
Roland Hollós 2020-05-23 13:31:15 +02:00
parent 59da27d5ef
commit 3c7f47dd19
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RBBGCMuso/R/assistantFunctions.R
View File

@ -164,7 +164,7 @@ readObservedData <- function(inFile,
baseData <- as.data.frame(baseData) baseData <- as.data.frame(baseData)
baseData[baseData[,selVar] == naString,selVar] <- NA baseData[baseData[,selVar] == naString,selVar] <- NA
} else { } else {
baseData <- fread(file = inFile, sep=sep, naString = naString) baseData <- fread(file = inFile, sep=sep, na.strings = naString)
baseData <- as.data.frame(baseData) baseData <- as.data.frame(baseData)
} }

2
RBBGCMuso/R/quickeffect.R
View File

@ -15,7 +15,7 @@
#' @importFrom tidyr separate #' @importFrom tidyr separate
#' @export #' @export
musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc",modifyOriginal=TRUE, outVar, parName = "parVal"){ musoQuickEffect <- function(settings = NULL, calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc",modifyOriginal=TRUE, outVar, parName = "parVal"){
if(is.character(outVar)){ if(is.character(outVar)){
varNames <- as.data.frame(musoMappingFind(outVar)) varNames <- as.data.frame(musoMappingFind(outVar))

7
RBBGCMuso/R/setupMuso.R
View File

@ -108,8 +108,11 @@ setupMuso <- function(executable=NULL,
normals<-grep("n.ini$",list.files(inputLoc),value=TRUE) normals<-grep("n.ini$",list.files(inputLoc),value=TRUE)
if(length(spinups)==1){ if(length(spinups)==1){
iniInput[1]<-file.path(inputLoc,spinups) iniInput[1] <- file.path(inputLoc,spinups)
} else {stop("There are multiple or no spinup ini files, please choose")} } else {
iniInput[1] <- "no spinup"
# stop("There are multiple or no spinup ini files, please choose")
}
if(length(normals)==1){ if(length(normals)==1){