fixed memory bug; AnnualPattern INTERPOLATE bug.

memory bug introduced with wetland freezing (PartitionPrecip.cpp)
fixed interpolation bug in AnnualPattern when Dec 31 is included (TimeSeries.cpp)
updated .dat files

Author: James Craig

src/PartitionPrecip.cpp

@@ -32,8 +32,10 @@ void CmvPrecipitation::Initialize()
 
   int N=13;
 
-  if (pModel->StateVarExists(ICE_THICKNESS)){N+=3;}
-
+  if (pModel->StateVarExists(ICE_THICKNESS)){
+    N+=3;
+    if (pModel->StateVarExists(DEPRESSION)){N+=3;}
+  }
   CHydroProcessABC::DynamicSpecifyConnections(N);
 
   iFrom[0]=iAtmos; iTo[0]=pModel->GetStateVarIndex(PONDED_WATER);
@@ -62,9 +64,11 @@ void CmvPrecipitation::Initialize()
     iFrom[13]=pModel->GetStateVarIndex(SNOW);         iTo[13]=pModel->GetLakeStorageIndex();
     iFrom[14]=pModel->GetStateVarIndex(SNOW_LIQ);     iTo[14]=pModel->GetLakeStorageIndex();
     iFrom[15]=pModel->GetStateVarIndex(PONDED_WATER); iTo[15]=pModel->GetLakeStorageIndex();
-    iFrom[16]=pModel->GetStateVarIndex(SNOW);         iTo[16]=pModel->GetStateVarIndex(DEPRESSION);
-    iFrom[17]=pModel->GetStateVarIndex(SNOW_LIQ);     iTo[17]=pModel->GetStateVarIndex(DEPRESSION);
-    iFrom[18]=pModel->GetStateVarIndex(PONDED_WATER); iTo[18]=pModel->GetStateVarIndex(DEPRESSION);
+    if (pModel->StateVarExists(DEPRESSION)){
+      iFrom[16]=pModel->GetStateVarIndex(SNOW);         iTo[16]=pModel->GetStateVarIndex(DEPRESSION);
+      iFrom[17]=pModel->GetStateVarIndex(SNOW_LIQ);     iTo[17]=pModel->GetStateVarIndex(DEPRESSION);
+      iFrom[18]=pModel->GetStateVarIndex(PONDED_WATER); iTo[18]=pModel->GetStateVarIndex(DEPRESSION);
+    }
   }
 }
 //////////////////////////////////////////////////////////////////
@@ -347,14 +351,11 @@ void CmvPrecipitation::GetRatesOfChange(const double             *state_vars,
   }
 }
 //////////////////////////////////////////////////////////////////
-/// \brief Applies constraints to baseflow
-/// \details For all methods, ensures that rate of flow cannot drain "from" compartment over timestep.
-///
 /// \param *state_vars [in] array of state variable values for this HRU (of size CModel::_nStateVars)
 /// \param *pHRU [in] Pointer to HRU object
 /// \param &Options [in] Global model options information
 /// \param &tt [in] Current input time structure
-/// \param *rates [out] Rates of change of state variables (of size MAX_CONNECTIONS)
+/// \param *rates [out] Rates of change of state variables
 //
 void   CmvPrecipitation::ApplyConstraints(const double     *state_vars,
                                           const CHydroUnit *pHRU,

src/RavenParameters.dat

@@ -98,7 +98,6 @@ SNOWFALL_ALBTHRESH GLOBAL [mm/d] False 10 5 20
 AVG_ANNUAL_SNOW GLOBAL [mm] False -9999 0.0 10000
 AVG_ANNUAL_RUNOFF GLOBAL [mm] False -9999 0.0 10000
 MAX_REACH_SEGLENGTH GLOBAL [km] False 100 0.0 1000000
-MAX_SWE_SURFACE GLOBAL [mm] False 300 1.0 100000
 UBC_S_CORR GLOBAL [0..1][12] True 1.0 0.25 2.0
 UBC_N_CORR GLOBAL [0..1][12] True 1.0 0.25 2.0
 UBC_GW_SPLIT GLOBAL [0..1] True 0.6 0.0 1.0

src/RavenProcessConnections.dat

@@ -143,7 +143,7 @@ SNOBAL_TWO_LAYER SnowBalance CUM_SNOWMELT CUM_SNOWMELT
 SNOBAL_CEMA_NEIGE SnowBalance SNOW_COVER PONDED_WATER
 SNOBAL_CEMA_NEIGE SnowBalance SNOW_COVER SNOW_COVER
 SNOBAL_GAWSER SnowBalance SNOW SNOW_LIQ
-SNOBAL_GAWSER SnowBalance POMDED_WATER SNOW_LIQ
+SNOBAL_GAWSER SnowBalance PONDED_WATER SNOW_LIQ
 SNOBAL_GAWSER SnowBalance SNOW_LIQ SNOW
 SNOBAL_GAWSER SnowBalance SNOW_DEPTH SNOW_DEPTH
 SNOBAL_GAWSER SnowBalance SNOW ATMOSPHERE
@@ -218,4 +218,4 @@ DFLOW_THRESHPOW DepressionOverflow DEPRESSION SURFACE_WATER
 DFLOW_LINEAR DepressionOverflow DEPRESSION SURFACE_WATER
 DFLOW_WEIR DepressionOverflow DEPRESSION SURFACE_WATER
 SEEP_LINEAR Seepage DEPRESSION SOIL
-LAKEREL_LINEAR LakeRelease LAKE SURFACE_WATER
+LAKEREL_LINEAR LakeRelease LAKE SURFACE_WATER

src/TimeSeries.cpp

@@ -882,8 +882,8 @@ CTimeSeries *CTimeSeries::Parse(CParser *p, bool is_pulse, string name, long loc
       if(!strcmp(s[1],"STEP"       )){step=true;}
     }
 
-    int    *days=new int    [(int)(DAYS_PER_YEAR)+1]; //sized for max # of events
-    double *vals=new double [(int)(DAYS_PER_YEAR)+1];
+    int    *days=new int    [366]; //sized for max # of events
+    double *vals=new double [366];
     int nEvents=0;
 
     p->Tokenize(s,Len);
@@ -896,7 +896,7 @@ CTimeSeries *CTimeSeries::Parse(CParser *p, bool is_pulse, string name, long loc
         days[nEvents]=GetJulianDayFromMonthYear(date_str,Options.calendar);
         vals[nEvents]=s_to_d(s[1]);
         nEvents++;
-        ExitGracefullyIf(nEvents>(int)(DAYS_PER_YEAR),"CTimeSeries::Parse: exceeded maximum number of items in :AnnualPattern command",BAD_DATA);
+        ExitGracefullyIf(nEvents>365,"CTimeSeries::Parse: exceeded maximum number of items in :AnnualPattern command",BAD_DATA);
       }
       else            { p->ImproperFormat(s); break; }
       bool eof=p->Tokenize(s,Len);
@@ -919,7 +919,7 @@ CTimeSeries *CTimeSeries::Parse(CParser *p, bool is_pulse, string name, long loc
         }
       }
       else { //interpolate with wraparound
-        double lastday=days[nEvents-1]-(int)(DAYS_PER_YEAR);
+        double lastday=days[nEvents-1]-365;
         double nextday=days[0];
         double lastval=vals[nEvents-1];
         double nextval=vals[0];
@@ -929,13 +929,12 @@ CTimeSeries *CTimeSeries::Parse(CParser *p, bool is_pulse, string name, long loc
             nextval=vals[i+1];nextday=days[i+1];
           }
         }
-        if (tt.julian_day > days[nEvents - 1]) {
+        if (tt.julian_day >= days[nEvents - 1]) {
           lastval=vals[nEvents - 1];  lastday=days[nEvents - 1];
-          nextval=vals[0];            nextday=days[0]+(int)(DAYS_PER_YEAR);
+          nextval=vals[0];            nextday=days[0]+365;
         }
         if ((nextday-lastday)==0){aVal[n]=lastval; }
         else{
-
           aVal[n]=(tt.julian_day-lastday)/(nextday-lastday)*(nextval-lastval)+lastval;
         }
       }