Skip to content
GitLab

Resolve "airGR compatibility: debugged version of RunModel_Lag"

Merged Dorchies David requested to merge 33-airgr-compatibility-debugged-version-of-runmodel_lag into dev
Viewing commit b642a2eb
Prev Next
Show latest version
6 files
+ 14
− 9
man/CreateInputsModel.GRiwrm.Rd
+ 2
− 2
@@ -41,7 +41,8 @@ db <- data.frame(id = c("Reservoir", "GaugingDown"),
length = c(LengthHydro, NA),
down = c("GaugingDown", NA),
area = c(NA, BasinInfo$BasinArea),
model = c(NA, "RunModel_GR4J"))
model = c(NA, "RunModel_GR4J"),
stringsAsFactors = FALSE)
# Create GRiwrm object from the data.frame
griwrm <- GRiwrm(db)
@@ -61,7 +62,6 @@ Qobs = matrix(c(Qupstream, BasinObs$Qmm), ncol = 2)
colnames(Qobs) <- griwrm$id
str(Qobs)
# Creation of the GRiwrmInputsModel object (= a named list of InputsModel objects)
InputsModels <- CreateInputsModel(griwrm,
DatesR = BasinObs$DatesR,
Precip = Precip,
man/CreateRunOptions.GRiwrmInputsModel.Rd
+ 3
− 2
@@ -33,7 +33,8 @@ db <- data.frame(id = c("Reservoir", "GaugingDown"),
length = c(LengthHydro, NA),
down = c("GaugingDown", NA),
area = c(NA, BasinInfo$BasinArea),
model = c(NA, "RunModel_GR4J"))
model = c(NA, "RunModel_GR4J"),
stringsAsFactors = FALSE)
# Create GRiwrm object from the data.frame
griwrm <- GRiwrm(db)
@@ -62,7 +63,7 @@ InputsModels <- CreateInputsModel(griwrm,
str(InputsModels)
# Creation of the GriwmRunOptions object
RunOptions2 <- CreateRunOptions(InputsModel2,
RunOptions2 <- CreateRunOptions(InputsModels,
IndPeriod_Run = Ind_Run)
str(RunOptions2)
man/GRiwrm.Rd
+ 2
− 1
@@ -51,7 +51,8 @@ db <- data.frame(id = c("Reservoir", "GaugingDown"),
length = c(LengthHydro, NA),
down = c("GaugingDown", NA),
area = c(NA, BasinInfo$BasinArea),
model = c(NA, "RunModel_GR4J"))
model = c(NA, "RunModel_GR4J"),
stringsAsFactors = FALSE)
# Create GRiwrm object from the data.frame
griwrm <- GRiwrm(db)
man/RunModel.GRiwrmInputsModel.Rd
+ 3
− 2
@@ -37,7 +37,8 @@ db <- data.frame(id = c("Reservoir", "GaugingDown"),
length = c(LengthHydro, NA),
down = c("GaugingDown", NA),
area = c(NA, BasinInfo$BasinArea),
model = c(NA, "RunModel_GR4J"))
model = c(NA, "RunModel_GR4J"),
stringsAsFactors = FALSE)
# Create GRiwrm object from the data.frame
griwrm <- GRiwrm(db)
@@ -66,7 +67,7 @@ InputsModels <- CreateInputsModel(griwrm,
str(InputsModels)
# Creation of the GriwmRunOptions object
RunOptions2 <- CreateRunOptions(InputsModel2,
RunOptions2 <- CreateRunOptions(InputsModels,
IndPeriod_Run = Ind_Run)
str(RunOptions2)
man/plot.GRiwrmOutputsModel.Rd
+ 3
− 2
@@ -37,7 +37,8 @@ db <- data.frame(id = c("Reservoir", "GaugingDown"),
length = c(LengthHydro, NA),
down = c("GaugingDown", NA),
area = c(NA, BasinInfo$BasinArea),
model = c(NA, "RunModel_GR4J"))
model = c(NA, "RunModel_GR4J"),
stringsAsFactors = FALSE)
# Create GRiwrm object from the data.frame
griwrm <- GRiwrm(db)
@@ -66,7 +67,7 @@ InputsModels <- CreateInputsModel(griwrm,
str(InputsModels)
# Creation of the GriwmRunOptions object
RunOptions2 <- CreateRunOptions(InputsModel2,
RunOptions2 <- CreateRunOptions(InputsModels,
IndPeriod_Run = Ind_Run)
str(RunOptions2)
NAMESPACE
+ 1
− 0
@@ -37,3 +37,4 @@ export(getNodeRanking)
import(airGR)
importFrom(grDevices,rainbow)
importFrom(graphics,matplot)
importFrom(graphics,plot)