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

varname changes

Browse Source
This commit is contained in:
Hollos Roland 2022-01-13 08:28:55 +01:00
parent f96b6667cc
commit 7017705f43
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RBBGCMuso/R/multiSite.R
View File

@ -294,7 +294,7 @@ multiSiteCalib <- function(measurements,
res <- list() res <- list()
res[["calibrationPar"]] <- calibrationPar res[["calibrationPar"]] <- calibrationPar
res[["parameters"]] <- parameters 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, likelihoods = likelihood,
alignIndexes = alignIndexes, alignIndexes = alignIndexes,
musoCodeToIndex = musoCodeToIndex, musoCodeToIndex = musoCodeToIndex,
@ -541,10 +541,11 @@ calcLikelihoodsForGroups <- function(dataVar, mod, mes,
measuredGroups[[domain_id]][alignIndexes[[domain_id]]$meas,] measuredGroups[[domain_id]][alignIndexes[[domain_id]]$meas,]
})) }))
measured <- measured[measured$var_id == key,] measured <- measured[measured$var_id == key,]
res <- c(likelihoods[[key]](modelled, measured), res <- c(likelihoods[[key]](modelled, measured),
sqrt(mean((modelled-measured$mean)^2)) sqrt(mean((modelled-measured$mean)^2))
) )
print(abs(mean(modelled)-mean(measured$mean))) print(abs(mean(modelled)-mean(measured$mean)))
res res
}) })

2
RBBGCMuso/inst/data/varTable6.json
View File

@ -12595,7 +12595,7 @@
}, },
{ {
"codes": 2585, "codes": 2585,
"names": "hydr_conductEND[6]", "names": "rootdepth5",
"units": "ms-1", "units": "ms-1",
"descriptions": "Hydraulic conductivity at the end of the day of soil layer 7 (120-150 cm)" "descriptions": "Hydraulic conductivity at the end of the day of soil layer 7 (120-150 cm)"
}, },