v1.2.3.4 CLEAN: minor typo revisions in RunModel_CemaNeigeGR4J

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.3.3
+Version: 1.2.3.4
 Date: 2019-02-19
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.rmd

@@ -13,7 +13,7 @@ output:
 
 
 
-### 1.2.3.32 Release Notes (2019-02-19) 
+### 1.2.3.4 Release Notes (2019-02-19) 
 
 
 

R/RunModel_CemaNeigeGR4J.R

@@ -46,7 +46,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param, IsHyst = FALSE)
       LInputSeries   <- as.integer(length(IndPeriod1))
       IndPeriod2     <- (length(RunOptions$IndPeriod_WarmUp)+1):LInputSeries;
       ParamCemaNeige <- Param[(length(Param)-1-2*as.integer(IsHyst)):length(Param)];
-      NParamMod      <- as.integer(length(Param)-(2+2*as.integer(IsHyst)));################################ to check!!!!!
+      NParamMod      <- as.integer(length(Param)-(2+2*as.integer(IsHyst)));
       ParamMod       <- Param[1:NParamMod];
       NLayers        <- length(InputsModel$LayerPrecip);
       NStatesMod     <- as.integer(length(RunOptions$IniStates)-NStates*NLayers);
@@ -60,7 +60,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param, IsHyst = FALSE)
       } else { IndOutputsCemaNeige <- which(FortranOutputsCemaNeige %in% RunOptions$Outputs_Sim);  }
       CemaNeigeLayers <- list(); CemaNeigeStateEnd <- NULL; NameCemaNeigeLayers <- "CemaNeigeLayers";
 
-      print(ParamCemaNeige)
+
     ##Call_DLL_CemaNeige_________________________
       for(iLayer in 1:NLayers){
         StateStartCemaNeige <- RunOptions$IniStates[(7+20+40) + c(iLayer, iLayer+NLayers)]
@@ -85,7 +85,6 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param, IsHyst = FALSE)
         RESULTS$Outputs[ round(RESULTS$Outputs ,3)==(-999.999)] <- NA;
         RESULTS$StateEnd[round(RESULTS$StateEnd,3)==(-999.999)] <- NA;
 
-        
         ##Data_storage
         CemaNeigeLayers[[iLayer]] <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]);
         names(CemaNeigeLayers[[iLayer]]) <- FortranOutputsCemaNeige[IndOutputsCemaNeige];
@@ -95,7 +94,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param, IsHyst = FALSE)
         if(ExportStateEnd){ CemaNeigeStateEnd <- c(CemaNeigeStateEnd,RESULTS$StateEnd); }
         rm(RESULTS); 
       } ###ENDFOR_iLayer
-      names(CemaNeigeLayers) <-  sprintf("Layer%02i", seq_len(NLayers))
+      names(CemaNeigeLayers) <- sprintf("Layer%02i", seq_len(NLayers))
     } ###ENDIF_RunSnowModule
     if(inherits(RunOptions,"CemaNeige")==FALSE){
       CemaNeigeLayers <- list(); CemaNeigeStateEnd <- NULL; NameCemaNeigeLayers <- NULL;
@@ -141,7 +140,6 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param, IsHyst = FALSE)
                                             GthrCemaNeigeLayers    = CemaNeigeStateEnd[seq_len(NStates*NLayers)[idNStates == 1]], 
                                             GlocmaxCemaNeigeLayers = CemaNeigeStateEnd[seq_len(NStates*NLayers)[idNStates == 0]],
                                             verbose = FALSE)
-        print(CemaNeigeStateEnd)
       }
       
       if(inherits(RunOptions,"CemaNeige")==TRUE & "Precip" %in% RunOptions$Outputs_Sim){ RESULTS$Outputs[,which(FortranOutputsMod[IndOutputsMod]=="Precip")] <- InputsModel$Precip[IndPeriod1]; }