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

fix mergeconflict

Browse Source
This commit is contained in:
Hollos Roland
2022-05-11 18:23:13 +02:00
parent 539eacefc0
commit d30776ffbf
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RBBGCMuso/R/multiSite.R
+1 -4
View File
@@ -304,12 +304,9 @@ multiSiteCalib <- function(measurements,
res[["calibrationPar"]] <- calibrationPar res[["calibrationPar"]] <- calibrationPar
res[["parameters"]] <- parameters res[["parameters"]] <- parameters
<<<<<<< HEAD
# browser() # browser()
res[["comparison"]] <- compareCalibratedWithOriginal(key = names(dataVar)[1], modOld=origModOut, modNew=aposteriori, mes=measurements, res[["comparison"]] <- compareCalibratedWithOriginal(key = names(dataVar)[1], modOld=origModOut, modNew=aposteriori, mes=measurements,
=======
res[["comparison"]] <- compareCalibratedWithOriginal(key = names(dataVar), modOld=origModOut, modNew=aposteriori, mes=measurements,
>>>>>>> origin/CIRM
likelihoods = likelihood, likelihoods = likelihood,
alignIndexes = alignIndexes, alignIndexes = alignIndexes,
musoCodeToIndex = musoCodeToIndex, musoCodeToIndex = musoCodeToIndex,