diff --git a/RBBGCMuso/R/multiSite.R b/RBBGCMuso/R/multiSite.R index 4fd7c9f..f82d8c3 100644 --- a/RBBGCMuso/R/multiSite.R +++ b/RBBGCMuso/R/multiSite.R @@ -176,7 +176,7 @@ multiSiteCalib <- function(measurements, } , error = function(e){ - # browser() + # browser() sink("error.txt") print(e) sink() @@ -294,7 +294,7 @@ multiSiteCalib <- function(measurements, res <- list() res[["calibrationPar"]] <- calibrationPar res[["parameters"]] <- parameters - res[["comparison"]] <- compareCalibratedWithOriginal(key = "grainDM", modOld=origModOut, modNew=aposteriori, mes=measurements, + res[["comparison"]] <- compareCalibratedWithOriginal(key = names(dataVar), modOld=origModOut, modNew=aposteriori, mes=measurements, likelihoods = likelihood, alignIndexes = alignIndexes, musoCodeToIndex = musoCodeToIndex, @@ -541,10 +541,11 @@ calcLikelihoodsForGroups <- function(dataVar, mod, mes, measuredGroups[[domain_id]][alignIndexes[[domain_id]]$meas,] })) measured <- measured[measured$var_id == key,] - res <- c(likelihoods[[key]](modelled, measured), sqrt(mean((modelled-measured$mean)^2)) ) + + print(abs(mean(modelled)-mean(measured$mean))) res }) diff --git a/RBBGCMuso/inst/data/varTable6.json b/RBBGCMuso/inst/data/varTable6.json index 564f479..6ff096c 100644 --- a/RBBGCMuso/inst/data/varTable6.json +++ b/RBBGCMuso/inst/data/varTable6.json @@ -12595,7 +12595,7 @@ }, { "codes": 2585, - "names": "hydr_conductEND[6]", + "names": "rootdepth5", "units": "ms-1", "descriptions": "Hydraulic conductivity at the end of the day of soil layer 7 (120-150 cm)" },