Renommage des fonctions avec le suffixe HBAN

R/Calibration.R

@@ -3,7 +3,7 @@
 #*************************************************************************************************
 #' @title  Calibration algorithm which minimises an error criterion on the model outputs using the provided functions
 #' @author Laurent Coron (June 2014)
-#' @seealso \code{\link{Calibration_HBAN}}, \code{\link{Calibration_optim}},
+#' @seealso \code{\link{Calibration_Michel}}, \code{\link{Calibration_optim}},
 #'          \code{\link{RunModel}}, \code{\link{ErrorCrit}}, \code{\link{TransfoParam}},
 #'          \code{\link{CreateInputsModel}}, \code{\link{CreateRunOptions}}, 
 #'          \code{\link{CreateInputsCrit}}, \code{\link{CreateCalibOptions}}.
@@ -17,13 +17,13 @@
 #' @param  CalibOptions        [object of class \emph{CalibOptions}] see \code{\link{CreateCalibOptions}} for details
 #' @param  FUN_MOD             [function] hydrological model function (e.g. RunModel_GR4J, RunModel_CemaNeigeGR4J)
 #' @param  FUN_CRIT            [function] error criterion function (e.g. ErrorCrit_RMSE, ErrorCrit_NSE)
-#' @param  FUN_CALIB           (optional) [function] calibration algorithm function (e.g. Calibration_HBAN, Calibration_optim), default=Calibration_HBAN
+#' @param  FUN_CALIB           (optional) [function] calibration algorithm function (e.g. Calibration_Michel, Calibration_optim), default=Calibration_Michel
 #' @param  FUN_TRANSFO         (optional) [function] model parameters transformation function, if the FUN_MOD used is native in the package FUN_TRANSFO is automatically defined
 #' @param  quiet               (optional) [boolean] boolean indicating if the function is run in quiet mode or not, default=FALSE
 #_FunctionOutputs_________________________________________________________________________________
-#' @return  [list] see \code{\link{Calibration_HBAN}} or \code{\link{Calibration_optim}} 
+#' @return  [list] see \code{\link{Calibration_Michel}} or \code{\link{Calibration_optim}} 
 #**************************************************************************************************
-Calibration <- function(InputsModel,RunOptions,InputsCrit,CalibOptions,FUN_MOD,FUN_CRIT,FUN_CALIB=Calibration_HBAN,FUN_TRANSFO=NULL,quiet=FALSE){
+Calibration <- function(InputsModel,RunOptions,InputsCrit,CalibOptions,FUN_MOD,FUN_CRIT,FUN_CALIB=Calibration_Michel,FUN_TRANSFO=NULL,quiet=FALSE){
     return( FUN_CALIB(InputsModel,RunOptions,InputsCrit,CalibOptions,FUN_MOD,FUN_CRIT,FUN_TRANSFO,quiet=quiet) )
 }
 

R/Calibration_optim.R

@@ -10,7 +10,7 @@
 #' @title  Calibration algorithm which minimises the error criterion using the stats::optim function
 #' @author Laurent Coron (August 2013)
 #' @example tests/example_Calibration_optim.R
-#' @seealso \code{\link{Calibration}}, \code{\link{Calibration_HBAN}},
+#' @seealso \code{\link{Calibration}}, \code{\link{Calibration_Michel}},
 #'          \code{\link{RunModel_GR4J}}, \code{\link{TransfoParam_GR4J}}, \code{\link{ErrorCrit_RMSE}},
 #'          \code{\link{CreateInputsModel}}, \code{\link{CreateRunOptions}}, 
 #'          \code{\link{CreateInputsCrit}}, \code{\link{CreateCalibOptions}}.

R/CreateCalibOptions.R

@@ -12,7 +12,7 @@
 #' @export
 #_FunctionInputs__________________________________________________________________________________
 #' @param  FUN_MOD             [function] hydrological model function (e.g. RunModel_GR4J, RunModel_CemaNeigeGR4J)
-#' @param  FUN_CALIB           (optional) [function] calibration algorithm function (e.g. Calibration_HBAN, Calibration_optim), default=Calibration_HBAN
+#' @param  FUN_CALIB           (optional) [function] calibration algorithm function (e.g. Calibration_Michel, Calibration_optim), default=Calibration_Michel
 #' @param  FUN_TRANSFO         (optional) [function] model parameters transformation function, if the FUN_MOD used is native in the package FUN_TRANSFO is automatically defined
 #' @param  OptimParam          (optional) [boolean] vector of booleans indicating which parameters must be optimised (NParam columns, 1 line) 
 #' @param  FixedParam          (optional) [numeric] vector giving the values to allocate to non-optimised parameter values (NParam columns, 1 line)
@@ -22,12 +22,12 @@
 #'                                  [1,]     \tab    0   \tab   -1   \tab    0   \tab  ...    \tab  0.0 \cr
 #'                                  [2,]     \tab 3000   \tab   +1   \tab  100   \tab  ...    \tab  3.0 \cr
 #'                             }
-#' @param  StartParam          (optional) [numeric] vector of parameter values used to start global search calibration procedure (this argument is used by Calibration_optim but not by Calibration_HBAN)
+#' @param  StartParam          (optional) [numeric] vector of parameter values used to start global search calibration procedure (this argument is used by Calibration_optim but not by Calibration_Michel)
 #'                             \tabular{llllll}{
 #'                                           \tab [X1]   \tab [X2]   \tab [X3]   \tab [...]   \tab [Xi] \cr
 #'                                           \tab 1000   \tab -0.5   \tab   22   \tab  ...    \tab  1.1 \cr
 #'                             }
-#' @param  StartParamList      (optional) [numeric] matrix of parameter sets used for grid-screening calibration procedure (values in columns, sets in line) (this argument is used by Calibration_HBAN but not by Calibration_optim)
+#' @param  StartParamList      (optional) [numeric] matrix of parameter sets used for grid-screening calibration procedure (values in columns, sets in line) (this argument is used by Calibration_Michel but not by Calibration_optim)
 #'                             \tabular{llllll}{
 #'                                           \tab [X1]   \tab [X2]   \tab [X3]   \tab [...]   \tab [Xi] \cr
 #'                                  [set1]   \tab  800   \tab -0.7   \tab   25   \tab  ...    \tab  1.0 \cr
@@ -53,7 +53,7 @@
 #'          \emph{$StartParamDistrib}  \tab   [numeric] matrix of parameter values used for grid-screening calibration procedure \cr
 #'          }
 #**************************************************************************************************
-CreateCalibOptions <- function(FUN_MOD,FUN_CALIB=Calibration_HBAN,FUN_TRANSFO=NULL,OptimParam=NULL,FixedParam=NULL,SearchRanges=NULL,
+CreateCalibOptions <- function(FUN_MOD,FUN_CALIB=Calibration_Michel,FUN_TRANSFO=NULL,OptimParam=NULL,FixedParam=NULL,SearchRanges=NULL,
                                StartParam=NULL,StartParamList=NULL,StartParamDistrib=NULL){
 
 
@@ -75,7 +75,7 @@ CreateCalibOptions <- function(FUN_MOD,FUN_CALIB=Calibration_HBAN,FUN_TRANSFO=NU
 
   ##check_FUN_CALIB
     BOOL <- FALSE;
-    if(identical(FUN_CALIB,Calibration_HBAN  )){ ObjectClass <- c(ObjectClass,"HBAN"  ); BOOL <- TRUE; }
+    if(identical(FUN_CALIB,Calibration_Michel  )){ ObjectClass <- c(ObjectClass,"HBAN"  ); BOOL <- TRUE; }
     if(identical(FUN_CALIB,Calibration_optim )){ ObjectClass <- c(ObjectClass,"optim" ); BOOL <- TRUE; }
     if(!BOOL){ stop("incorrect FUN_CALIB for use in CreateCalibOptions \n"); return(NULL); } 
 
@@ -177,9 +177,9 @@ CreateCalibOptions <- function(FUN_MOD,FUN_CALIB=Calibration_HBAN,FUN_TRANSFO=NU
                              +3.90, -0.50, +4.10, -8.70, +0.10, +4.00,
                              +4.50, +0.50, +5.00, -8.10, +1.10, +5.00),ncol=NParam,byrow=TRUE); }
       if("GR2M"%in% ObjectClass){ 
-        ParamT <- matrix( c( +3.60, -5.00,
-                             +3.90, +0.00,
-                             +4.50, +5.00),ncol=NParam,byrow=TRUE); }
+        ParamT <- matrix( c( +3.60, -7.20,
+                             +3.90, -6.00,
+                             +4.50, -4.80),ncol=NParam,byrow=TRUE); }
       if("GR1A"%in% ObjectClass){ 
         ParamT <- matrix( c( -5.00,
                              +0.00,

R/CreateInputsModel.R

@@ -6,7 +6,7 @@
 #*************************************************************************************************
 #' @title  Creation of the InputsModel object required to the RunModel functions
 #' @author Laurent Coron (June 2014)
-#' @seealso \code{\link{RunModel}}, \code{\link{CreateRunOptions}}, \code{\link{CreateInputsCrit}}, \code{\link{CreateCalibOptions}}, \code{\link{DataAltiExtrapolation_HBAN}}
+#' @seealso \code{\link{RunModel}}, \code{\link{CreateRunOptions}}, \code{\link{CreateInputsCrit}}, \code{\link{CreateCalibOptions}}, \code{\link{DataAltiExtrapolation_Valery}}
 #' @example tests/example_RunModel.R
 #' @encoding UTF-8
 #' @export
@@ -148,9 +148,9 @@ CreateInputsModel <- function(FUN_MOD,DatesR,Precip,PotEvap=NULL,TempMean=NULL,T
     }
 
 
-  ##DataAltiExtrapolation_HBAN
+  ##DataAltiExtrapolation_Valery
     if("CemaNeige" %in% ObjectClass){
-      RESULT <- DataAltiExtrapolation_HBAN(DatesR=DatesR,Precip=Precip,TempMean=TempMean,TempMin=TempMin,TempMax=TempMax,ZInputs=ZInputs,HypsoData=HypsoData,NLayers=NLayers,quiet=quiet);
+      RESULT <- DataAltiExtrapolation_Valery(DatesR=DatesR,Precip=Precip,TempMean=TempMean,TempMin=TempMin,TempMax=TempMax,ZInputs=ZInputs,HypsoData=HypsoData,NLayers=NLayers,quiet=quiet);
       if(!quiet){ if(NLayers==1){ cat(paste("\t Input series were successfully created on 1 elevation layer for use by CemaNeige \n",sep=""));
                          } else { cat(paste("\t Input series were successfully created on ",NLayers," elevation layers for use by CemaNeige \n",sep="")); } }
     }