v1.6.8.37 refactor: rename Outputs argument into x in .GetAggregConvertFun

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.8.36
+Version: 1.6.8.37
 Date: 2021-01-05
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.md

@@ -2,7 +2,7 @@
 
 
 
-### 1.6.8.36 Release Notes (2021-01-05)
+### 1.6.8.37 Release Notes (2021-01-05)
 
 #### New features
 

R/UtilsSeriesAggreg.R

@@ -36,21 +36,21 @@
          Y = "yearly")
 }
 
-.GetAggregConvertFun <- function(Outputs) {
+.GetAggregConvertFun <- function(x) {
   AggregConvertFunTable <- rbind(
     data.frame(ConvertFun = "mean",
-              Outputs = c("Prod","Rout","Exp","SnowPack","ThermalState",
-                          "Gratio","Temp","Gthreshold","Glocalmax","LayerTempMean", "T"),
-              stringsAsFactors = FALSE), # R < 4.0 compatibility: avoids mixing numeric and factor into numeric
+               x = c("Prod", "Rout", "Exp", "SnowPack", "ThermalState",
+                     "Gratio", "Temp", "Gthreshold", "Glocalmax", "LayerTempMean", "T"),
+               stringsAsFactors = FALSE), # R < 4.0 compatibility: avoids mixing numeric and factor into numeric
     data.frame(ConvertFun = "sum",
-              Outputs = c("PotEvap","Precip","Pn","Ps","AE","Perc","PR","Q9",
-                          "Q1","Exch","AExch1","AExch2","AExch","QR","QRExp",
-                          "QD","Qsim","Pliq","Psol","PotMelt","Melt","PliqAndMelt",
-                          "LayerPrecip","LayerFracSolidPrecip", "Qmm", "Qls", "E", "P", "Qupstream"),
-              stringsAsFactors = FALSE) # R < 4.0 compatibility: avoids mixing numeric and factor into numeric
+               x = c("PotEvap", "Precip", "Pn", "Ps", "AE", "Perc", "PR", "Q9",
+                     "Q1", "Exch", "AExch1", "AExch2", "AExch", "QR", "QRExp",
+                     "QD", "Qsim", "Pliq", "Psol", "PotMelt", "Melt", "PliqAndMelt",
+                     "LayerPrecip", "LayerFracSolidPrecip", "Qmm", "Qls", "E", "P", "Qupstream"),
+               stringsAsFactors = FALSE) # R < 4.0 compatibility: avoids mixing numeric and factor into numeric
   )
-  res <- sapply(Outputs, function(iOutputs) {
-    iRes <- AggregConvertFunTable$ConvertFun[AggregConvertFunTable$Outputs == iOutputs]
+  res <- sapply(x, function(iX) {
+    iRes <- AggregConvertFunTable$ConvertFun[AggregConvertFunTable$x == iX]
     iRes <- ifelse(test = any(is.na(iRes)), yes = NA, no = iRes) # R < 4.0 compatibility
   })
   return(res)