v488 - UPSTREAM_OF update; minor bug fixes

-made :PopulateSBGroup UPSTREAM_OF inclusive of basin by default (BACKWARD COMPATIBILITY) (ParseHRUFile.cpp)
bug fixes:
-writing StreamTemperatures.nc seg fault (found by Arelia S. @pcic) (ConstituentModel.cpp)
-simulations starting prior to 1900 without snowfall data unable to run (found by Jonathan R-C @uw) (TimeSeries.cpp)

Author: James Craig

src/ConstituentModel.cpp

@@ -1529,7 +1529,7 @@ void CConstituentModel::WriteNetCDFMinorOutput(const optStruct& Options,const ti
 
   CEnthalpyModel *pEnthalpyModel=NULL; //Necessary evil to reduce code duplication rather than having an entirely separate WriteMinorOutput for Enthalpy
   if (_type==ENTHALPY){
-    CEnthalpyModel *pEnthalpyModel=(CEnthalpyModel*)(this);
+    pEnthalpyModel=(CEnthalpyModel*)(this);
   }
 
   if((Options.suppressICs) && (tt.model_time==0.0)) { return; }

src/ControlStructures.cpp

@@ -283,7 +283,7 @@ bool      COutflowRegime::AreConditionsMet(const time_struct& tt) const
 //////////////////////////////////////////////////////////////////
 /// \brief returns outflow from control structure for given stage, with prioritized constraints applied
 /// \param h [in] stage, in [m]
-/// \param Q_start [in] outflow at start of timestep [m3/s]
+/// \param Q_start [in] total outflow at start of timestep [m3/s]
 /// \returns outflow, in [m3/s]
 //
 double          COutflowRegime::GetOutflow(const double &h, const double &h_start, const double &Q_start, const long &target_SBID, const double &drefelev) const
@@ -292,6 +292,7 @@ double          COutflowRegime::GetOutflow(const double &h, const double &h_star
   double rivdepth = _pModel->GetSubBasinByID(target_SBID)->GetRiverDepth();
 
   double Q = _pCurve->GetDischarge(h, h_start, Q_start, rivdepth, drefelev);
+
   double dQdt = (Q-Q_start)/tstep;
 
   //apply constraints here

src/ParseHRUFile.cpp

@@ -826,21 +826,7 @@ bool ParseHRUPropsFile(CModel *&pModel, const optStruct &Options, bool terrain_r
                 }
             }
         }
-        else if(!strcmp(s[4],"UPSTREAM_OF"))
-        {
-          int SBID=s_to_l(s[5]);
-          int iter=0;
-          for(int p=0;p<pModel->GetNumSubBasins();p++)
-          {
-            if(pModel->IsSubBasinUpstream(pModel->GetSubBasin(p)->GetID(),SBID)) {
-              pSBGroup->AddSubbasin(pModel->GetSubBasin(p));
-              advice=advice+to_string(pModel->GetSubBasin(p)->GetID())+" ";
-              iter++;
-              if(iter%40==0) { advice=advice+"\n      "; }
-            }
-          }
-        }
-        else if(!strcmp(s[4],"UPSTREAM_OF_INCLUSIVE"))
+        else if(!strcmp(s[4],"UPSTREAM_OF")) /*inclusive of basin*/
         {
           int SBID=s_to_l(s[5]);
           int iter=0;
@@ -855,7 +841,7 @@ bool ParseHRUPropsFile(CModel *&pModel, const optStruct &Options, bool terrain_r
             }
           }
         }
-        else if(!strcmp(s[4],"DOWNSTREAM_OF"))
+        else if(!strcmp(s[4],"DOWNSTREAM_OF"))/*not inclusive of basin*/
         {
           CSubBasin *pBasin=pModel->GetSubBasinByID(s_to_l(s[5]));
           if(pBasin==NULL) {

src/TimeSeries.cpp

@@ -20,8 +20,8 @@ void GetNetCDFStationArray(const int ncid, const string filename,int &stat_dimid
 CTimeSeries::CTimeSeries(string Name, long loc_ID, double one_value)
   :CTimeSeriesABC(TS_REGULAR,Name,loc_ID,"")
 {
-  _start_day=0.0;
-  _start_year=1900;
+  _start_day =0.0;
+  _start_year=0000;
   _nPulses  =2;
   _interval =ALMOST_INF;
   _aVal     =new double [_nPulses];