Commit8f84cd8

David

committed

fix(Ungauged): fixed parameters inside ungauged node cluster

Refs #168

1 parent363b4e9 commit8f84cd8Copy full SHA for 8f84cd8

File tree

+19

-10

lines changed

+19

-10

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ Calibration.GRiwrmInputsModel <- function(InputsModel,`
`53`	`53`	`IM<-l$InputsModel`
`54`	`54`	`message("Calibration.GRiwrmInputsModel: Processing sub-basins '",`
`55`	`55`	`paste(names(IM),collapse="', '"),"' with '",id,"' as gauged donor...")`
`56`		`-IM$FUN_MOD<-"RunModel_Ungauged"`
`57`	`56`	`attr(RunOptions[[id]],"GRiwrmRunOptions")<-l$RunOptions`
`58`	`57`	`}else {`
`59`	`58`	`message("Calibration.GRiwrmInputsModel: Processing sub-basin '",id,"'...")`
`@@ -92,11 +91,10 @@ Calibration.GRiwrmInputsModel <- function(InputsModel,`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`if (hasUngauged) {`
`95`		`-# Select nodes with model in the sub-network`
`96`		`-g<- attr(IM,"GRiwrm")`
`97`		`-Ids<-g$id[!is.na(g$donor)&g$donor==id&g$id!=id]`
	`94`	`+Ids<- names(IM)`
	`95`	`+Ids<-Ids[Ids!=id]`
`98`	`96`	`for (uIdinIds) {`
`99`		`-if (!IM[[uId]]$isReservoir) {`
	`97`	`+if (IM[[uId]]$gaugedId==id) {`
`100`	`98`	`# Add OutputsCalib for ungauged nodes`
`101`	`99`	`OutputsCalib[[uId]]<-list(`
`102`	`100`	`ParamFinalR= transferGRparams(InputsModel,`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`#' function using the provided functions.`
`5`	`5`	`#'`
`6`	`6`	`#' This function can be used either for a catchment (with an \emph{InputsModel}`
`7`		`-#' object) or for a network (with a \emph{GRiwrmInputsModel} object)`
	`7`	`+#' object), for a network (with a \emph{GRiwrmInputsModel} object), or for an`
	`8`	`+#' ungauged node cluster (with a \emph{Ungauged} object).`
`8`	`9`	`#'`
`9`	`10`	`#' @param InputsModel \[object of class \emph{InputsModel} or \emph{GRiwrmInputsModel}\] see [CreateInputsModel]`
`10`	`11`	`#' @param RunOptions \[object of class \emph{RunOptions} or \emph{GRiwrmRunOptions}\] see [CreateRunOptions]`
`@@ -35,3 +36,10 @@`
`35`	`36`	`Calibration<-function(InputsModel,...) {`
`36`	`37`	`UseMethod("Calibration",InputsModel)`
`37`	`38`	`}`
	`39`	`+`
	`40`	`+#' @rdname Calibration`
	`41`	`+#' @export`
	`42`	`+Calibration.Ungauged<-function(InputsModel,...) {`
	`43`	`+InputsModel$FUN_MOD<-"RunModel_Ungauged"`
	`44`	`+ NextMethod()`
	`45`	`+}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,9 @@ updateParameters4Ungauged <- function(GaugedId,`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`-# Add class InputsModel for airGR::Calibration checks`
`119`		`- class(InputsModel)<- c("InputsModel", class(InputsModel))`
	`118`	`+# Add class RunModel_Ungauged and InputsModel for preprocessind`
	`119`	`+# and processing airGR::Calibration`
	`120`	`+ class(InputsModel)<- c("Ungauged","InputsModel", class(InputsModel))`
`120`	`121`
`121`	`122`	`### Modify RunOptions for the reduced network ###`
`122`	`123`	`RunOptions<- reduceGRiwrmObj4Ungauged(g,RunOptions)`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,8 @@ test_that("Gauged node inside ungauged cluster must only work if parameters are`
`366`	`366`	`for (xin ls(e)) assign(x, get(x,e))`
`367`	`367`	`rm(e)`
`368`	`368`	`expect_error(Calibration(InputsModel,RunOptions,InputsCrit,CalibOptions),`
`369`		`-regexp="")`
`370`		`-`
	`369`	`+regexp="Node '54032' .* must have its parameters fixed")`
	`370`	`+CalibOptions[["54032"]]$FixedParam<-ParamMichel[["54032"]]`
	`371`	`+OC<- Calibration(InputsModel,RunOptions,InputsCrit,CalibOptions)`
	`372`	`+ expect_equal(OC[["54032"]]$ParamFinalR,ParamMichel[["54032"]])`
`371`	`373`	`})`

Comments

(0)