From f182f52eef47f9ca0d589fb46bf3dd344f89d314 Mon Sep 17 00:00:00 2001 From: Hollos Roland Date: Fri, 5 Jun 2020 14:15:09 +0200 Subject: [PATCH] nullable uncertainity --- RBBGCMuso/R/calibration.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RBBGCMuso/R/calibration.R b/RBBGCMuso/R/calibration.R index 703eb3c..ce246ef 100644 --- a/RBBGCMuso/R/calibration.R +++ b/RBBGCMuso/R/calibration.R @@ -32,7 +32,7 @@ optiMuso <- function(measuredData, parameters = NULL, startDate = NULL, preTag = "cal-", settings = setupMuso(), outVars = NULL, iterations = 30, skipSpinup = TRUE, plotName = "calib.jpg", - modifyOriginal=TRUE, likelihood, uncertainity, + modifyOriginal=TRUE, likelihood, uncertainity = NULL, naVal = NULL, postProcString = NULL, w=NULL, lg=FALSE) { # Exanding likelihood likelihoodFull <- as.list(rep(NA,length(dataVar))) @@ -119,6 +119,8 @@ optiMuso <- function(measuredData, parameters = NULL, startDate = NULL, alignIndexes <- alignMuso(settings,measuredData) if(!is.null(uncertainity)){ uncert <- measuredData[alignIndexes$meas,uncertainity] + } else { + uncert <- NULL } # browser() origModellOut <- calibMuso(settings=settings, silent=TRUE, skipSpinup = skipSpinup, postProcString=postProcString, modifyOriginal=modifyOriginal)