v493 - minor subtle bug fixes [BENCHMARKED]

fix bug in ParseInput if first line in file is blank (ParseInput.cpp)
fix bug in hydrographs.csv if time interval of observations <> time step (TimeSeries.cpp) (found by B. Tolson)
benchmarking mode for Raven Version output (RavenMain.cpp)

Author: James Craig

src/DemandOptimization.cpp

@@ -597,6 +597,7 @@ void  CDemandOptimizer::IdentifyUpstreamDemands()
 //////////////////////////////////////////////////////////////////
 /// \brief Initializes Demand decision variables
 /// \notes to be called during .rvm file read, PRIOR to declaring any user-specified DVs, goals, or constraints
+/// WHY? because of the expected ordering of decision variables in the GetDVColumnInd() routine
 /// \params pModel [in] - pointer to model
 /// \params Options  [in] - model options structure
 //

src/ParseInput.cpp

@@ -491,6 +491,7 @@ bool ParseMainInputFile (CModel     *&pModel,
     else if  (!strcmp(s[0],":rvg_Filename"              )){code=512;}//GWMIGRATE -TO REMOVE
 
 	  if       (in_ifmode_statement)                        {code=-6; }
+    else if  (Len==0)                                     {code=-1; }
     else if  (!strcmp(s[0],":rvh_Filename"              )){code=160;}
     else if  (!strcmp(s[0],":rvp_Filename"              )){code=161;}
     else if  (!strcmp(s[0],":rvt_Filename"              )){code=162;}
@@ -525,6 +526,7 @@ bool ParseMainInputFile (CModel     *&pModel,
 
     //--------------------HYDROLOGICAL PROCESSES ---------------
     if       (in_ifmode_statement)                        {code=-6; }
+    else if  (Len==0)                                     {code=-1; }
     else if  (!strcmp(s[0],":HydrologicProcesses"       )){code=200;}//REQUIRED
     else if  (!strcmp(s[0],":HydrologicalProcesses"     )){code=200;}//REQUIRED
     else if  (!strcmp(s[0],":Baseflow"                  )){code=201;}
@@ -580,6 +582,7 @@ bool ParseMainInputFile (CModel     *&pModel,
     //...
     //--------------------TRANSPORT PROCESSES ---------------
     if       (in_ifmode_statement)                        {code=-6; }
+    else if  (Len==0)                                     {code=-1; }
     else if  (!strcmp(s[0],":Transport"                 )){code=300;}
     else if  (!strcmp(s[0],":FixedConcentration"        )){code=301; is_temp=false;}//After corresponding DefineHRUGroup(s) command, if used
     else if  (!strcmp(s[0],":FixedTemperature"          )){code=301; is_temp=true;}//After corresponding DefineHRUGroup(s) command, if used

src/RavenMain.cpp

@@ -71,8 +71,10 @@ int main(int argc, char* argv[])
   if (WARNINGS.fail()){
     ExitGracefully("Main::Unable to open Raven_errors.txt. Bad output directory specified?",RAVEN_OPEN_ERR);
   }
+  if (Options.benchmarking){
   WARNINGS<<" Raven v"+Options.version+" Build date: "<<RavenBuildDate<<endl;
   WARNINGS<<"----------------------------------------------------------"<<endl;
+  }
   WARNINGS.close();
 
   t0=clock();

src/TimeSeries.cpp

@@ -969,7 +969,6 @@ CTimeSeries *CTimeSeries::Parse(CParser *p, bool is_pulse, string name, long lon
     else{
       tstep =FixTimestep(s_to_d(s[2]));
     }
-
     nMeasurements=s_to_i(s[3]);
     //units =s[4]
   }
@@ -981,9 +980,9 @@ CTimeSeries *CTimeSeries::Parse(CParser *p, bool is_pulse, string name, long lon
     tstep        =FixTimestep(s_to_d(s[3]));
     //units =s[4]
   }
-  if (shift_to_per_ending)
+  if (shift_to_per_ending) //Just shifting by time step, not data interval (messy and used for HYDROGRAPHS only)
   {
-    start_day+=tstep;
+    start_day+=Options.timestep;
     int leap=0;
     if (IsLeapYear(start_yr,Options.calendar)){ leap = 1; }
     if (start_day>=365+leap){start_day-=365+leap; start_yr++;}