From 0858c7f194f21d2405c1623898c9429eae90fa39 Mon Sep 17 00:00:00 2001 From: David <david.dorchies@inrae.fr> Date: Wed, 26 Oct 2022 10:44:27 +0200 Subject: [PATCH] fix: error on Ci on POSIXct date comparison This crashes on the CI but not on windows: which(IM_severn[[1]]$DatesR == "2002-10-15") Refs #100 --- man-examples/RunModel.Supervisor.R | 4 ++-- man/CreateController.Rd | 4 ++-- man/CreateSupervisor.Rd | 4 ++-- man/RunModel.Supervisor.Rd | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/man-examples/RunModel.Supervisor.R b/man-examples/RunModel.Supervisor.R index d675c01..9db04cd 100644 --- a/man-examples/RunModel.Supervisor.R +++ b/man-examples/RunModel.Supervisor.R @@ -45,7 +45,7 @@ PotEvap <- ConvertMeteoSD(griwrm, PotEvapTot) Qobs <- data.frame( Dam = BasinsObs$`54095`$discharge_spec * griwrm$area[griwrm$id == "54095"] * 1E3 ) -Qobs[,] <- Qobs[which(DatesR == "2002-10-01"), 1] +Qobs[,] <- Qobs[which(DatesR == as.POSIXct("2002-10-01")), 1] # InputsModel object IM_severn <- CreateInputsModel(griwrm, DatesR, Precip, PotEvap, Qobs) @@ -96,7 +96,7 @@ CreateController(sv, "DamRelease", Y = c("54095", "54057"), U = c("Dam"), FUN = # GRiwrmRunOptions object simulation of the hydrological year 2002-2003 IndPeriod_Run <- seq.int( - which(IM_severn[[1]]$DatesR == "2002-10-15"), + which(IM_severn[[1]]$DatesR == as.POSIXct("2002-10-15")), length.out = 365 ) IndPeriod_WarmUp <- seq.int(IndPeriod_Run[1] - 366, IndPeriod_Run[1] - 1) diff --git a/man/CreateController.Rd b/man/CreateController.Rd index 9a07ac3..fcd57d6 100644 --- a/man/CreateController.Rd +++ b/man/CreateController.Rd @@ -90,7 +90,7 @@ PotEvap <- ConvertMeteoSD(griwrm, PotEvapTot) Qobs <- data.frame( Dam = BasinsObs$`54095`$discharge_spec * griwrm$area[griwrm$id == "54095"] * 1E3 ) -Qobs[,] <- Qobs[which(DatesR == "2002-10-01"), 1] +Qobs[,] <- Qobs[which(DatesR == as.POSIXct("2002-10-01")), 1] # InputsModel object IM_severn <- CreateInputsModel(griwrm, DatesR, Precip, PotEvap, Qobs) @@ -141,7 +141,7 @@ CreateController(sv, "DamRelease", Y = c("54095", "54057"), U = c("Dam"), FUN = # GRiwrmRunOptions object simulation of the hydrological year 2002-2003 IndPeriod_Run <- seq.int( - which(IM_severn[[1]]$DatesR == "2002-10-15"), + which(IM_severn[[1]]$DatesR == as.POSIXct("2002-10-15")), length.out = 365 ) IndPeriod_WarmUp <- seq.int(IndPeriod_Run[1] - 366, IndPeriod_Run[1] - 1) diff --git a/man/CreateSupervisor.Rd b/man/CreateSupervisor.Rd index 49a2eed..6d28f25 100644 --- a/man/CreateSupervisor.Rd +++ b/man/CreateSupervisor.Rd @@ -72,7 +72,7 @@ PotEvap <- ConvertMeteoSD(griwrm, PotEvapTot) Qobs <- data.frame( Dam = BasinsObs$`54095`$discharge_spec * griwrm$area[griwrm$id == "54095"] * 1E3 ) -Qobs[,] <- Qobs[which(DatesR == "2002-10-01"), 1] +Qobs[,] <- Qobs[which(DatesR == as.POSIXct("2002-10-01")), 1] # InputsModel object IM_severn <- CreateInputsModel(griwrm, DatesR, Precip, PotEvap, Qobs) @@ -123,7 +123,7 @@ CreateController(sv, "DamRelease", Y = c("54095", "54057"), U = c("Dam"), FUN = # GRiwrmRunOptions object simulation of the hydrological year 2002-2003 IndPeriod_Run <- seq.int( - which(IM_severn[[1]]$DatesR == "2002-10-15"), + which(IM_severn[[1]]$DatesR == as.POSIXct("2002-10-15")), length.out = 365 ) IndPeriod_WarmUp <- seq.int(IndPeriod_Run[1] - 366, IndPeriod_Run[1] - 1) diff --git a/man/RunModel.Supervisor.Rd b/man/RunModel.Supervisor.Rd index dd53293..9bb72a1 100644 --- a/man/RunModel.Supervisor.Rd +++ b/man/RunModel.Supervisor.Rd @@ -69,7 +69,7 @@ PotEvap <- ConvertMeteoSD(griwrm, PotEvapTot) Qobs <- data.frame( Dam = BasinsObs$`54095`$discharge_spec * griwrm$area[griwrm$id == "54095"] * 1E3 ) -Qobs[,] <- Qobs[which(DatesR == "2002-10-01"), 1] +Qobs[,] <- Qobs[which(DatesR == as.POSIXct("2002-10-01")), 1] # InputsModel object IM_severn <- CreateInputsModel(griwrm, DatesR, Precip, PotEvap, Qobs) @@ -120,7 +120,7 @@ CreateController(sv, "DamRelease", Y = c("54095", "54057"), U = c("Dam"), FUN = # GRiwrmRunOptions object simulation of the hydrological year 2002-2003 IndPeriod_Run <- seq.int( - which(IM_severn[[1]]$DatesR == "2002-10-15"), + which(IM_severn[[1]]$DatesR == as.POSIXct("2002-10-15")), length.out = 365 ) IndPeriod_WarmUp <- seq.int(IndPeriod_Run[1] - 366, IndPeriod_Run[1] - 1) -- GitLab