v0.1.8.10 bug fixed in ShinyGR when imputs are defined in vectors (not in a data.frame)

DESCRIPTION

 Package: airGRteaching
 Type: Package
 Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
-Version: 0.1.8.9
+Version: 0.1.8.10
 Date: 2017-11-28
 Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
 Depends: airGR (>= 1.0.9.43)

R/ShinyGR.R

 ShinyGR <- function(ObsBV = NULL, DatesR = NULL, Precip = NULL, PotEvap = NULL, Qobs = NULL, TempMean = NULL, 
                     ZInputs = NULL, HypsoData = NULL, NLayers = 5, SimPer = NULL,
                     theme = "RStudio") {
+  
+  if (is.null(ObsBV)) {
+    ObsBV <- "Unnamed watershed"
+  }
 
   .GlobalEnv$.ShinyGR.hist <- list(list())#list(Param = list(), TypeModel = lsit(), Crit = list(), Qsim = list())
   .GlobalEnv$.ShinyGR.args <- list(ObsBV = as.list(ObsBV),

inst/ShinyGR/server.R

@@ -25,13 +25,20 @@ shinyServer(function(input, output, session) {
     if (input$SnowModel == "CemaNeige") {
       PARAM <- c(PARAM, input$C1, input$C2)
     }
-    
-    OBS <- ObsGR(ObsBV = get(input$Dataset), HydroModel = input$HydroModel,
-                 CemaNeige = input$SnowModel == "CemaNeige",
-                 Precip = .ShinyGR.args$Precip, PotEvap = .ShinyGR.args$PotEvap,
-                 Qobs = get(input$Dataset), TempMean = .ShinyGR.args$TempMean, 
-                 ZInputs = .ShinyGR.args$ZInputs, HypsoData = .ShinyGR.args$HypsoData,
-                 NLayers = .ShinyGR.args$NLayers)
+    # if (input$Dataset == "Unnamed watershed") {
+    if (input$Dataset == "Unnamed watershed") {
+      ObsBV <- NULL
+    } else {
+      ObsBV <- get(input$Dataset)
+    }
+      OBS <- ObsGR(ObsBV = ObsBV,
+                   DatesR = .ShinyGR.args$DatesR,
+                   Precip = .ShinyGR.args$Precip, PotEvap = .ShinyGR.args$PotEvap,
+                   Qobs = .ShinyGR.args$Qobs, TempMean = .ShinyGR.args$TempMean, 
+                   ZInputs = .ShinyGR.args$ZInputs, HypsoData = .ShinyGR.args$HypsoData,
+                   NLayers = .ShinyGR.args$NLayers,
+                   HydroModel = input$HydroModel,
+                   CemaNeige = input$SnowModel == "CemaNeige")
     
     WUPPER <- c(OBS$InputsModel$DatesR[1L], input$Period[1]-.TypeModelGR(OBS)$TimeLag)
     if (WUPPER[2] < WUPPER[1]) {
@@ -190,12 +197,18 @@ shinyServer(function(input, output, session) {
         OBSold <- getPrep()$OBS
         OBSold$TypeModel <- .GlobalEnv$.ShinyGR.hist[[1]]$TypeModel
         if (.TypeModelGR(OBSold)$CemaNeige & !.TypeModelGR(getPrep()$OBS)$CemaNeige) { # present: No CemaNeige ; old: CemaNeige
-          OBSold <- ObsGR(ObsBV = get(input$Dataset), HydroModel = .TypeModelGR(OBSold)$NameModel,
-                          CemaNeige = .TypeModelGR(OBSold)$CemaNeige,
+          if (input$Dataset == "Unnamed watershed") {
+            ObsBV <- NULL
+          } else {
+            ObsBV <- get(input$Dataset)
+          }
+          OBSold <- ObsGR(ObsBV = ObsBV,
                           Precip = .ShinyGR.args$Precip, PotEvap = .ShinyGR.args$PotEvap,
-                          Qobs = get(input$Dataset), TempMean = .ShinyGR.args$TempMean, 
+                          Qobs = .ShinyGR.args$Qobs, TempMean = .ShinyGR.args$TempMean, 
                           ZInputs = .ShinyGR.args$ZInputs, HypsoData = .ShinyGR.args$HypsoData,
-                          NLayers = .ShinyGR.args$NLayers)
+                          NLayers = .ShinyGR.args$NLayers,
+                          HydroModel = input$HydroModel,
+                          CemaNeige = input$SnowModel == "CemaNeige")
         }
         SIMold <- SimGR(ObsGR = OBSold,
                         Param = .GlobalEnv$.ShinyGR.hist[[1]]$Param,