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

nullable uncertainity

Browse Source
This commit is contained in:
Hollos Roland 2020-06-05 14:15:09 +02:00
parent c178f2f974
commit f182f52eef
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RBBGCMuso/R/calibration.R
View File

@ -32,7 +32,7 @@ optiMuso <- function(measuredData, parameters = NULL, startDate = NULL,
preTag = "cal-", settings = setupMuso(), preTag = "cal-", settings = setupMuso(),
outVars = NULL, iterations = 30, outVars = NULL, iterations = 30,
skipSpinup = TRUE, plotName = "calib.jpg", skipSpinup = TRUE, plotName = "calib.jpg",
modifyOriginal=TRUE, likelihood, uncertainity, modifyOriginal=TRUE, likelihood, uncertainity = NULL,
naVal = NULL, postProcString = NULL, w=NULL, lg=FALSE) { naVal = NULL, postProcString = NULL, w=NULL, lg=FALSE) {
# Exanding likelihood # Exanding likelihood
likelihoodFull <- as.list(rep(NA,length(dataVar))) likelihoodFull <- as.list(rep(NA,length(dataVar)))
@ -119,6 +119,8 @@ optiMuso <- function(measuredData, parameters = NULL, startDate = NULL,
alignIndexes <- alignMuso(settings,measuredData) alignIndexes <- alignMuso(settings,measuredData)
if(!is.null(uncertainity)){ if(!is.null(uncertainity)){
uncert <- measuredData[alignIndexes$meas,uncertainity] uncert <- measuredData[alignIndexes$meas,uncertainity]
} else {
uncert <- NULL
} }
# browser() # browser()
origModellOut <- calibMuso(settings=settings, silent=TRUE, skipSpinup = skipSpinup, postProcString=postProcString, modifyOriginal=modifyOriginal) origModellOut <- calibMuso(settings=settings, silent=TRUE, skipSpinup = skipSpinup, postProcString=postProcString, modifyOriginal=modifyOriginal)