Skip to content
GitLab

Resolve "Optimisation of OutputsModel creation in RunModel*"

Merged Dorchies David requested to merge 129-optimisation-of-outputsmodel-creation-in-runmodel into dev
Viewing commit 08129fd4
Prev Next
Show latest version
9 files
+ 34
− 34
R/RunModel_CemaNeigeGR4H.R
+ 4
− 4
@@ -164,8 +164,8 @@ RunModel_CemaNeigeGR4H <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
}
R/RunModel_CemaNeigeGR4J.R
+ 4
− 4
@@ -163,8 +163,8 @@ RunModel_CemaNeigeGR4J <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
}
R/RunModel_CemaNeigeGR5H.R
+ 4
− 4
@@ -174,8 +174,8 @@ RunModel_CemaNeigeGR5H <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
}
R/RunModel_CemaNeigeGR5J.R
+ 6
− 6
@@ -89,7 +89,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel, RunOptions, Param) {
IndPliqAndMelt <- which(names(CemaNeigeLayers[[iLayer]]) == "PliqAndMelt")
if (iLayer == 1) {
CatchMeltAndPliq <- RESULTS$Outputs[, IndPliqAndMelt] / NLayers
}
}
if (iLayer > 1) {
CatchMeltAndPliq <- CatchMeltAndPliq + RESULTS$Outputs[, IndPliqAndMelt] / NLayers
}
@@ -105,7 +105,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel, RunOptions, Param) {
CemaNeigeStateEnd <- NULL
NameCemaNeigeLayers <- NULL
CatchMeltAndPliq <- InputsModel$Precip[IndPeriod1]
}
}
@@ -161,8 +161,8 @@ RunModel_CemaNeigeGR5J <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
}
R/RunModel_CemaNeigeGR6J.R
+ 4
− 4
@@ -166,9 +166,9 @@ RunModel_CemaNeigeGR6J <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
RunOptions,
RESULTS,
LInputSeries,
CemaNeigeLayers)
}
R/RunModel_GR1A.R
+ 3
− 3
@@ -45,7 +45,7 @@ RunModel_GR1A <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries)
RunOptions,
RESULTS,
LInputSeries)
}
R/RunModel_GR2M.R
+ 3
− 3
@@ -67,7 +67,7 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
## Output data preparation
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries)
RunOptions,
RESULTS,
LInputSeries)
}
R/RunModel_GR4H.R
+ 3
− 3
@@ -72,7 +72,7 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries)
RunOptions,
RESULTS,
LInputSeries)
}
R/RunModel_GR4J.R
+ 3
− 3
@@ -67,7 +67,7 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
## OutputsModel generation
.GetOutputsModelGR(InputsModel,
RunOptions,
RESULTS,
LInputSeries)
RunOptions,
RESULTS,
LInputSeries)
}