diff --git a/SW_Carbon.c b/SW_Carbon.c
index 47524542a..bb604d1bf 100644
--- a/SW_Carbon.c
+++ b/SW_Carbon.c
@@ -1,155 +1,178 @@
-/**
- * @file   SW_Carbon.c
- * @author Zachary Kramer
- * @brief  Contains functions, constants, and variables that deal with the
- *         effect of CO2 on transpiration and biomass.
- *
- * @date   7 February 2017
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "generic.h"
-#include "filefuncs.h"
-#include "SW_Defines.h"
-#include "SW_Times.h"
-#include "SW_Files.h"
-#include "SW_Carbon.h"
-#include "SW_Site.h"
-#include "SW_VegProd.h"
-
-/* =================================================== */
-/*                  Global Variables                   */
-/* --------------------------------------------------- */
-
-
-/* =================================================== */
-/*                Module-Level Variables               */
-/* --------------------------------------------------- */
-
-static char *MyFileName;
-SW_CARBON SW_Carbon;    // Declared here, externed elsewhere
-SW_VEGPROD SW_VegProd;  // Declared here, externed elsewhere
-
-
-/* =================================================== */
-/* =================================================== */
-/*             Private Function Definitions            */
-/* --------------------------------------------------- */
-
-/* =================================================== */
-/* =================================================== */
-/*             Public Function Definitions             */
-/* --------------------------------------------------- */
-
-/**
- * Initializes the multiplier values in the SW_CARBON structure
- * @note The spin-up year has been known to have the multipliers equal
- *       to 0 without this constructor
- */
-void SW_CBN_construct(void)
-{
-  memset(&SW_Carbon, 0, sizeof(SW_Carbon));
-
-  SW_CARBON *c = &SW_Carbon;
-  int year;
-  
-  for (year = 0; year < MAX_CO2_YEAR; year++)
-  {
-    c->co2_multipliers[BIO_INDEX][year] = 1.0;
-    c->co2_multipliers[WUE_INDEX][year] = 1.0;
-  }
-  
-  c->co2_bio_mult = 1.0;
-  c->co2_wue_mult = 1.0;
-}
-
-/* A description on how these 'onGet' and 'onSet' functions work...
- * Summary: onGet instantiates the 'swCarbon' class and returns the object, and is only used once
- *          onSet extracts the value of the given object, and is used on both calls to SOILWAT2
- * 1) An S4 class is described and generated in rSOILWAT2/R
- * 2) This class needs to be instantiatied, which is done here
- * 3) The object that gets returned here eventually gets inserted into swRunScenariosData[[1]]
- * 4) Data of the object is then modified with class functions in R (e.g. rSOILWAT2::swCarbon_Scenario(swRUnScenariosData[[1]]) <- "RCP85")
- * 5) The 'onSet' function is used to extract the latest data of the object (e.g. when SOILWAT2 begins modeling the real years)
- */
-#ifdef RSOILWAT
-SEXP onGet_SW_CARBON(void) {
-  // Create access variables
-  SEXP class, object;
-
-  // Grab our S4 carbon class as an object
-  PROTECT(class  = MAKE_CLASS("swCarbon"));
-  PROTECT(object = NEW_OBJECT(class));
-
-  // Extract the values to our global structure
-  onSet_swCarbon(object);
-
-  UNPROTECT(2);
-  
-  return object;
-}
-
-void onSet_swCarbon(SEXP object) {
-  SW_CARBON *c = &SW_Carbon;
-
-  // Extract the slots from our object into our structure
-  c->use_bio_mult = INTEGER(GET_SLOT(object, install("CarbonUseBio")))[0];
-  c->use_wue_mult = INTEGER(GET_SLOT(object, install("CarbonUseWUE")))[0];
-  c->addtl_yr = INTEGER(GET_SLOT(object, install("DeltaYear")))[0];
-  strcpy(c->scenario, CHAR(STRING_ELT(GET_SLOT(object, install("Scenario")), 0)));  // e.g. c->scenario = "RCP85"
-}
-#endif
-    
-/**
- * Calculates the multipliers for biomass and Water-use efficiency. 
- * If a multiplier is disabled, its value is set to 1. All the years
- * in carbon.in are calculated. rSOILWAT2 will pass in the settings directly.
- * SOILWAT2 will read siteparam.in for settings.
- */
-void calculate_CO2_multipliers(void) {
-  FILE *f;
-  char scenario[64];
-  double ppm;
-  int year;
-
-  SW_CARBON  *c  = &SW_Carbon;
-  SW_VEGPROD *v  = &SW_VegProd;
-  MyFileName     = SW_F_name(eCarbon);
-  f              = OpenFile(MyFileName, "r");
-  
-  /* Calculate multipliers by reading carbon.in */
-  while (GetALine(f, inbuf)) {
-    // Read the year standalone because if it's 0 it marks a change in the scenario,
-    // in which case we'll need to read in a string instead of an int
-    sscanf(inbuf, "%d", &year);
-    
-    // Find scenario
-    if (year == 0)
-    {
-      sscanf(inbuf, "%d %63s", &year, scenario);
-      continue;  // Skip to the PPM values
-    }
-    if (strcmp(scenario, c->scenario) != 0)
-      continue;  // Keep searching for the right scenario
-    
-    sscanf(inbuf, "%d %lf", &year, &ppm);
-    if (c->use_bio_mult) c->co2_multipliers[BIO_INDEX][year] = v->co2_bio_coeff1  * pow(ppm, v->co2_bio_coeff2);
-    if (c->use_wue_mult) c->co2_multipliers[WUE_INDEX][year] = v->co2_wue_coeff1 * pow(ppm, v->co2_wue_coeff2);
-  }
-}
-
-/**
- * Applies CO2 effects to supplied biomass data. Two parameters are needed so that
- * we do not have a compound effect on the biomass.
- * @param new_biomass  the resulting biomass after CO2 effects calculated
- * @param biomass      the biomass to be modified
- */
-void apply_CO2(double new_biomass[], double biomass[]) {
-  int i;
-  SW_CARBON  *c  = &SW_Carbon;
-
-  for (i = 0; i < 12; i++) new_biomass[i] = (biomass[i] * c->co2_bio_mult);
-}
+/**
+ * @file   SW_Carbon.c
+ * @author Zachary Kramer
+ * @brief  Contains functions, constants, and variables that deal with the
+ *         effect of CO2 on transpiration and biomass.
+ *
+ * @date   7 February 2017
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+#include "generic.h"
+#include "filefuncs.h"
+#include "SW_Defines.h"
+#include "SW_Times.h"
+#include "SW_Files.h"
+#include "SW_Carbon.h"
+#include "SW_Site.h"
+#include "SW_VegProd.h"
+
+/* =================================================== */
+/*                  Global Variables                   */
+/* --------------------------------------------------- */
+
+
+/* =================================================== */
+/*                Module-Level Variables               */
+/* --------------------------------------------------- */
+
+static char *MyFileName;
+SW_CARBON SW_Carbon;    // Declared here, externed elsewhere
+SW_VEGPROD SW_VegProd;  // Declared here, externed elsewhere
+
+
+/* =================================================== */
+/* =================================================== */
+/*             Private Function Definitions            */
+/* --------------------------------------------------- */
+
+/* =================================================== */
+/* =================================================== */
+/*             Public Function Definitions             */
+/* --------------------------------------------------- */
+
+/**
+ * Initializes the multiplier values in the SW_CARBON structure
+ * @note The spin-up year has been known to have the multipliers equal
+ *       to 0 without this constructor
+ */
+void SW_CBN_construct(void)
+{
+  memset(&SW_Carbon, 0, sizeof(SW_Carbon));
+
+  SW_CARBON *c = &SW_Carbon;
+  int year;
+
+  PFTs default_values;
+  default_values.grass = default_values.shrub = default_values.tree = default_values.forb = 1.0;
+
+  for (year = 0; year < MAX_CO2_YEAR; year++)
+  {
+    c->co2_multipliers[BIO_INDEX][year] = default_values;
+    c->co2_multipliers[WUE_INDEX][year] = default_values;
+  }
+
+  c->co2_bio_mult = default_values;
+  c->co2_wue_mult = default_values;
+}
+
+/* A description on how these 'onGet' and 'onSet' functions work...
+ * Summary: onGet instantiates the 'swCarbon' class and returns the object, and is only used once
+ *          onSet extracts the value of the given object, and is used on both calls to SOILWAT2
+ * 1) An S4 class is described and generated in rSOILWAT2/R
+ * 2) This class needs to be instantiatied, which is done here
+ * 3) The object that gets returned here eventually gets inserted into swRunScenariosData[[1]]
+ * 4) Data of the object is then modified with class functions in R (e.g. rSOILWAT2::swCarbon_Scenario(swRUnScenariosData[[1]]) <- "RCP85")
+ * 5) The 'onSet' function is used to extract the latest data of the object (e.g. when SOILWAT2 begins modeling the real years)
+ */
+#ifdef RSOILWAT
+SEXP onGet_SW_CARBON(void) {
+  // Create access variables
+  SEXP class, object;
+
+  // Grab our S4 carbon class as an object
+  PROTECT(class  = MAKE_CLASS("swCarbon"));
+  PROTECT(object = NEW_OBJECT(class));
+
+  // Extract the values to our global structure
+  onSet_swCarbon(object);
+
+  UNPROTECT(2);
+
+  return object;
+}
+
+void onSet_swCarbon(SEXP object) {
+  SW_CARBON *c = &SW_Carbon;
+
+  // Extract the slots from our object into our structure
+  c->use_bio_mult = INTEGER(GET_SLOT(object, install("CarbonUseBio")))[0];
+  c->use_wue_mult = INTEGER(GET_SLOT(object, install("CarbonUseWUE")))[0];
+  c->addtl_yr = INTEGER(GET_SLOT(object, install("DeltaYear")))[0];
+  strcpy(c->scenario, CHAR(STRING_ELT(GET_SLOT(object, install("Scenario")), 0)));  // e.g. c->scenario = "RCP85"
+}
+#endif
+
+/**
+ * Calculates the multipliers for biomass and Water-use efficiency.
+ * If a multiplier is disabled, its value is set to 1. All the years
+ * in carbon.in are calculated. rSOILWAT2 will pass in the settings directly.
+ * SOILWAT2 will read siteparam.in for settings.
+ */
+void calculate_CO2_multipliers(void) {
+  FILE *f;
+  char scenario[64];
+  double ppm;
+  int year;
+
+  SW_CARBON  *c  = &SW_Carbon;
+  SW_VEGPROD *v  = &SW_VegProd;
+  MyFileName     = SW_F_name(eCarbon);
+  f              = OpenFile(MyFileName, "r");
+
+  // For efficiency, don't read carbon.in if neither multiplier is being used
+  // We can do this because SW_CBN_CONSTRUCT already populated the multipliers with default values
+  if (!c->use_bio_mult && !c->use_wue_mult)
+  {
+    return;
+  }
+
+  /* Calculate multipliers by reading carbon.in */
+  while (GetALine(f, inbuf)) {
+    // Read the year standalone because if it's 0 it marks a change in the scenario,
+    // in which case we'll need to read in a string instead of an int
+    sscanf(inbuf, "%d", &year);
+
+    // Find scenario
+    if (year == 0)
+    {
+      sscanf(inbuf, "%d %63s", &year, scenario);
+      continue;  // Skip to the PPM values
+    }
+    if (strcmp(scenario, c->scenario) != 0)
+      continue;  // Keep searching for the right scenario
+
+    sscanf(inbuf, "%d %lf", &year, &ppm);
+
+    // Per PFT
+    if (c->use_bio_mult)
+    {
+      c->co2_multipliers[BIO_INDEX][year].grass = v->co2_bio_coeff1.grass * pow(ppm, v->co2_bio_coeff2.grass);
+      c->co2_multipliers[BIO_INDEX][year].shrub = v->co2_bio_coeff1.shrub * pow(ppm, v->co2_bio_coeff2.shrub);
+      c->co2_multipliers[BIO_INDEX][year].tree = v->co2_bio_coeff1.tree * pow(ppm, v->co2_bio_coeff2.tree);
+      c->co2_multipliers[BIO_INDEX][year].forb = v->co2_bio_coeff1.forb * pow(ppm, v->co2_bio_coeff2.forb);
+    }
+    if (c->use_wue_mult)
+    {
+      c->co2_multipliers[WUE_INDEX][year].grass = v->co2_wue_coeff1.grass * pow(ppm, v->co2_wue_coeff2.grass);
+      c->co2_multipliers[WUE_INDEX][year].shrub = v->co2_wue_coeff1.shrub * pow(ppm, v->co2_wue_coeff2.shrub);
+      c->co2_multipliers[WUE_INDEX][year].tree = v->co2_wue_coeff1.tree * pow(ppm, v->co2_wue_coeff2.tree);
+      c->co2_multipliers[WUE_INDEX][year].forb = v->co2_wue_coeff1.forb * pow(ppm, v->co2_wue_coeff2.forb);
+    }
+  }
+}
+
+/**
+ * Applies CO2 effects to supplied biomass data. Two parameters are needed so that
+ * we do not have a compound effect on the biomass.
+ * @param new_biomass  the resulting biomass after CO2 effects calculated
+ * @param biomass      the biomass to be modified
+ * @param multiplier   the biomass multiplier for this PFT
+ */
+void apply_CO2(double new_biomass[], double biomass[], double multiplier) {
+  int i;
+  for (i = 0; i < 12; i++) new_biomass[i] = (biomass[i] * multiplier);
+}
diff --git a/SW_Carbon.h b/SW_Carbon.h
index a2ee0c5d5..c1cab6c2e 100644
--- a/SW_Carbon.h
+++ b/SW_Carbon.h
@@ -1,41 +1,51 @@
-/**
- * @file   SW_Carbon.h
- * @author Zachary Kramer, Charles Duso
- * @brief  Contains functions, constants, and variables that deal with the
- *         effect of CO2 on transpiration and biomass.
- *
- * @date   23 January 2017
- */
-#ifndef CARBON
-  #define CARBON
-  #define MAX_CO2_YEAR 3000            // Include all years that our PPM sources might provide data for
-  #define BIO_INDEX 0                  // Use these indices to access the respective values
-  #define WUE_INDEX 1
-  
-  /* Main structure */
-  typedef struct {  
-    int
-    addtl_yr,                          // Added to SW_Model.year to get the future year we're simulating
-    use_wue_mult,                      // Determine which multipliers we will be calculating...
-    use_bio_mult;
-
-    double
-    carbon[2],                         // Holds misc. data
-    co2_multipliers[2][MAX_CO2_YEAR],  // Holds the above multipliers for every year, accessed directly (e.g. biomass multiplier for 1982 is co2_multipliers[1][1982])
-    co2_bio_mult,                      // The biomass multiplier (yearly), which for tree is instead applied to the percent live
-    co2_wue_mult;                      // The Water-use efficiency multiplier (yearly)
-  
-    char
-    scenario[64];                      // The scenario we are extracting PPM from
-  } SW_CARBON;
-
-  /* Function Declarations */
-  #ifdef RSOILWAT
-    SEXP onGet_SW_CARBON(void);
-    void onSet_swCarbon(SEXP object);
-  #endif
-  
-  void SW_CBN_construct(void);
-  void apply_CO2(double* new_biomass, double *biomass);
-  void calculate_CO2_multipliers(void);
-#endif
+/**
+ * @file   SW_Carbon.h
+ * @author Zachary Kramer, Charles Duso
+ * @brief  Contains functions, constants, and variables that deal with the
+ *         effect of CO2 on transpiration and biomass.
+ *
+ * @date   23 January 2017
+ */
+#ifndef CARBON
+  #define CARBON
+  #define MAX_CO2_YEAR 3000            // Include all years that our PPM sources might provide data for
+  #define BIO_INDEX 0                  // Use these indices to access the respective values
+  #define WUE_INDEX 1
+  
+  /* Helper structures */
+  // Holds a double for each plant functional type, which reduces the number of needed variables
+  typedef struct {
+    double
+      grass,
+      shrub,
+      tree,
+      forb;
+  } PFTs;
+
+  /* Main structure */
+  typedef struct {  
+    int
+      addtl_yr,                          // Added to SW_Model.year to get the future year we're simulating
+      use_wue_mult,                      // Determine which multipliers we will be calculating...
+      use_bio_mult;
+  
+    char
+      scenario[64];                      // The scenario we are extracting PPM from
+
+	PFTs
+      co2_bio_mult,                      // The biomass multiplier (yearly), which for tree is instead applied to the percent live
+      co2_wue_mult,                      // The Water-use efficiency multiplier (yearly)
+      co2_multipliers[2][MAX_CO2_YEAR];  // Holds 2 multipliers for each PFT per year
+
+  } SW_CARBON;
+
+  /* Function Declarations */
+  #ifdef RSOILWAT
+    SEXP onGet_SW_CARBON(void);
+    void onSet_swCarbon(SEXP object);
+  #endif
+  
+  void SW_CBN_construct(void);
+  void apply_CO2(double* new_biomass, double *biomass, double multiplier);
+  void calculate_CO2_multipliers(void);
+#endif
diff --git a/SW_Flow.c b/SW_Flow.c
index 64a3dc122..4c5a6631c 100644
--- a/SW_Flow.c
+++ b/SW_Flow.c
@@ -128,7 +128,8 @@ extern SW_SITE SW_Site;
 extern SW_SOILWAT SW_Soilwat;
 extern SW_WEATHER SW_Weather;
 extern SW_VEGPROD SW_VegProd;
-extern SW_SKY SW_Sky; //
+extern SW_SKY SW_Sky;
+SW_CARBON SW_Carbon;  // Externed elsewhere
 
 extern unsigned int soil_temp_error;  // simply keeps track of whether or not an error has been reported in the soil_temperature function.  0 for no, 1 for yes.
 extern unsigned int soil_temp_init; // simply keeps track of whether or not the values for the soil_temperature function have been initialized.  0 for no, 1 for yes.
@@ -235,6 +236,7 @@ void SW_FLW_construct(void) {
 /*            The Water Flow                           */
 /* --------------------------------------------------- */
 void SW_Water_Flow(void) {
+	SW_CARBON  *c = &SW_Carbon;
 
 	RealD swpot_avg_forb, swpot_avg_tree, swpot_avg_shrub, swpot_avg_grass, soil_evap_forb, soil_evap_tree, soil_evap_shrub, soil_evap_grass, soil_evap_rate_forb = 1.,
 			soil_evap_rate_tree = 1., soil_evap_rate_shrub = 1., soil_evap_rate_grass = 1., soil_evap_rate_bs = 1., transp_forb, transp_tree, transp_shrub, transp_grass,
@@ -418,7 +420,7 @@ void SW_Water_Flow(void) {
 		pot_transp(&transp_rate_tree, swpot_avg_tree, SW_VegProd.tree.biolive_daily[doy], SW_VegProd.tree.biodead_daily[doy], transp_tree, SW_Soilwat.pet,
 				SW_Site.transp.xinflec, SW_Site.transp.slope, SW_Site.transp.yinflec, SW_Site.transp.range, SW_VegProd.tree.shade_scale, SW_VegProd.tree.shade_deadmax,
 				SW_VegProd.tree.tr_shade_effects.xinflec, SW_VegProd.tree.tr_shade_effects.slope, SW_VegProd.tree.tr_shade_effects.yinflec,
-				SW_VegProd.tree.tr_shade_effects.range);
+				SW_VegProd.tree.tr_shade_effects.range, c->co2_wue_mult.tree);
 		transp_rate_tree *= snowdepth_scale_tree * SW_VegProd.fractionTree;
 	} else {
 		soil_evap_rate_tree = 0.;
@@ -442,7 +444,7 @@ void SW_Water_Flow(void) {
 		pot_transp(&transp_rate_shrub, swpot_avg_shrub, SW_VegProd.shrub.biolive_daily[doy], SW_VegProd.shrub.biodead_daily[doy], transp_shrub, SW_Soilwat.pet,
 				SW_Site.transp.xinflec, SW_Site.transp.slope, SW_Site.transp.yinflec, SW_Site.transp.range, SW_VegProd.shrub.shade_scale, SW_VegProd.shrub.shade_deadmax,
 				SW_VegProd.shrub.tr_shade_effects.xinflec, SW_VegProd.shrub.tr_shade_effects.slope, SW_VegProd.shrub.tr_shade_effects.yinflec,
-				SW_VegProd.shrub.tr_shade_effects.range);
+				SW_VegProd.shrub.tr_shade_effects.range, c->co2_wue_mult.shrub);
 		transp_rate_shrub *= snowdepth_scale_shrub * SW_VegProd.fractionShrub;
 
 	} else {
@@ -467,7 +469,7 @@ void SW_Water_Flow(void) {
 		pot_transp(&transp_rate_forb, swpot_avg_forb, SW_VegProd.forb.biolive_daily[doy], SW_VegProd.forb.biodead_daily[doy], transp_forb, SW_Soilwat.pet,
 				SW_Site.transp.xinflec, SW_Site.transp.slope, SW_Site.transp.yinflec, SW_Site.transp.range, SW_VegProd.forb.shade_scale, SW_VegProd.forb.shade_deadmax,
 				SW_VegProd.forb.tr_shade_effects.xinflec, SW_VegProd.forb.tr_shade_effects.slope, SW_VegProd.forb.tr_shade_effects.yinflec,
-				SW_VegProd.forb.tr_shade_effects.range);
+				SW_VegProd.forb.tr_shade_effects.range, c->co2_wue_mult.forb);
 		transp_rate_forb *= snowdepth_scale_forb * SW_VegProd.fractionForb;
 
 	} else {
@@ -492,7 +494,7 @@ void SW_Water_Flow(void) {
 		pot_transp(&transp_rate_grass, swpot_avg_grass, SW_VegProd.grass.biolive_daily[doy], SW_VegProd.grass.biodead_daily[doy], transp_grass, SW_Soilwat.pet,
 				SW_Site.transp.xinflec, SW_Site.transp.slope, SW_Site.transp.yinflec, SW_Site.transp.range, SW_VegProd.grass.shade_scale, SW_VegProd.grass.shade_deadmax,
 				SW_VegProd.grass.tr_shade_effects.xinflec, SW_VegProd.grass.tr_shade_effects.slope, SW_VegProd.grass.tr_shade_effects.yinflec,
-				SW_VegProd.grass.tr_shade_effects.range);
+				SW_VegProd.grass.tr_shade_effects.range, c->co2_wue_mult.grass);
 		transp_rate_grass *= snowdepth_scale_grass * SW_VegProd.fractionGrass;
 	} else {
 		soil_evap_rate_grass = 0.;
diff --git a/SW_Flow_lib.c b/SW_Flow_lib.c
index 0394ace43..910b5d039 100644
--- a/SW_Flow_lib.c
+++ b/SW_Flow_lib.c
@@ -798,7 +798,7 @@ void pot_soil_evap_bs(double *bserate, unsigned int nelyrs, double ecoeff[], dou
 }
 
 void pot_transp(double *bstrate, double swpavg, double biolive, double biodead, double fbst, double petday, double swp_shift, double swp_shape, double swp_inflec,
-		double swp_range, double shade_scale, double shade_deadmax, double shade_xinflex, double shade_slope, double shade_yinflex, double shade_range) {
+		double swp_range, double shade_scale, double shade_deadmax, double shade_xinflex, double shade_slope, double shade_yinflex, double shade_range, double co2_wue_multiplier) {
 	/**********************************************************************
 	 PURPOSE: Calculate potential transpiration rate.
 	 See 2.11 in ELM doc.
@@ -822,6 +822,7 @@ void pot_transp(double *bstrate, double swpavg, double biolive, double biodead,
 	 biodead   - biomass of dead
 	 fbst      - fraction of water loss from transpiration
 	 petday       - potential evapotranspiration
+	 co2_wue_multiplier - water-usage efficiency multiplier calculated from CO2 ppm
 
 	 LOCAL VARIABLES:
 	 shadeaf - shade affect on transpiration rate
@@ -838,7 +839,6 @@ void pot_transp(double *bstrate, double swpavg, double biolive, double biodead,
 	 **********************************************************************/
 
 	double par1, par2, shadeaf;
-	SW_CARBON *c = &SW_Carbon;
 
 	if (LE(biolive, 0.)) {
 		*bstrate = 0.;
@@ -854,7 +854,7 @@ void pot_transp(double *bstrate, double swpavg, double biolive, double biodead,
 		}
 
 		*bstrate = watrate(swpavg, petday, swp_shift, swp_shape,
-							   swp_inflec, swp_range) * shadeaf * petday * fbst * c->co2_wue_mult;
+							   swp_inflec, swp_range) * shadeaf * petday * fbst * co2_wue_multiplier;
 	}
 }
 
diff --git a/SW_Flow_lib.h b/SW_Flow_lib.h
index 179665415..f18621c5a 100644
--- a/SW_Flow_lib.h
+++ b/SW_Flow_lib.h
@@ -112,7 +112,7 @@ void pot_soil_evap_bs(double *bserate, unsigned int nelyrs, double ecoeff[], dou
 		double swc[]);
 
 void pot_transp(double *bstrate, double swpavg, double biolive, double biodead, double fbst, double petday, double swp_shift, double swp_shape, double swp_inflec,
-		double swp_range, double shade_scale, double shade_deadmax, double shade_xinflex, double shade_slope, double shade_yinflex, double shade_range);
+		double swp_range, double shade_scale, double shade_deadmax, double shade_xinflex, double shade_slope, double shade_yinflex, double shade_range, double co2_wue_multiplier);
 
 double watrate(double swp, double petday, double shift, double shape, double inflec, double range);
 
diff --git a/SW_Output.c b/SW_Output.c
index 1ebdc317e..e452d414a 100644
--- a/SW_Output.c
+++ b/SW_Output.c
@@ -1,4676 +1,4820 @@
-/********************************************************/
-/********************************************************/
-/*	Source file: Output.c
- Type: module
- Application: SOILWAT - soilwater dynamics simulator
- Purpose: Read / write and otherwise manage the
- user-specified output flags.
-
- COMMENTS: The algorithm for the summary bookkeeping
- is much more complicated than I'd like, but I don't
- see a cleaner way to address the need to keep
- running tabs without storing daily arrays for each
- output variable.  That might make somewhat
- simpler code, and perhaps slightly more efficient,
- but at a high cost of memory, and the original goal
- was to make this object oriented, so memory should
- be used sparingly.  Plus, much of the code is quite
- general, and the main loops are very simple indeed.
-
- Generally, adding a new output key is fairly simple,
- and much of the code need not be considered.
- Refer to the comment block at the very end of this
- file for details.
-
- Comment (06/23/2015, drs): In summary, the output of SOILWAT works as follows
- SW_OUT_flush() calls at end of year and SW_Control.c/_collect_values() calls daily
- 1) SW_OUT_sum_today() that
- 1.1) if end of an output period, call average_for(): converts the (previously summed values (by sumof_wth) of) SW_WEATHER_OUTPUTS portion of SW_Weather from the ‘Xsum' to the ‘Xavg'
- 1.2) on each day calls collect_sums() that calls sumof_wth(): SW_Weather (simulation slot ’now') values are summed up during each output period and stored in the SW_WEATHER_OUTPUTS (output) slots 'Xsum' of SW_Weather
-
- 2) SW_OUT_write_today() that
- 2.1) calls the get_temp() etc functions via SW_Output.pfunc: the values stored in ‘Xavg’ by average_for are converted to text string 'outstr’
- 2.2) outputs the text string 'outstr’ with the fresh values to a text file via SW_Output.fp_X
-
-
-
- History:
- 9/11/01 cwb -- INITIAL CODING
- 10-May-02 cwb -- Added conditionals for interfacing
- with STEPPE.  See SW_OUT_read(), SW_OUT_close_files(),
- SW_OUT_write_today(), get_temp() and get_transp().
- The changes prevent the model from opening, closing,
- and writing to files because SXW only requires periodic
- (eg, weekly) transpiration and yearly temperature
- from get_transp() and get_temp(), resp.
- --The output config file must be prepared by the SXW
- interface code such that only yearly temp and daily,
- weekly, or monthly transpiration are requested for
- periods (1,end).
-
- 12/02 - IMPORTANT CHANGE - cwb
- refer to comments in Times.h regarding base0
-
- 27-Aug-03 (cwb) Just a comment that this code doesn't
- handle missing values in the summaries, especially
- the averages.  This really needs to be addressed
- sometime, but for now it's the user's responsibility
- to make sure there are no missing values.  The
- model doesn't generate any on its own, but it
- still needs to be fixed, although that will take
- a bit of work to keep track of the number of
- missing days, etc.
- 20090826 (drs) stricmp -> strcmp -> Str_CompareI; in SW_OUT_sum_today () added break; after default:
- 20090827 (drs) changed output-strings str[12] to #define OUTSTRLEN 18; str[OUTSTRLEN]; because of sprintf(str, ...) overflow and memory corruption into for-index i
- 20090909 (drs) strcmp -> Str_CompareI (not case-sensitive)
- 20090915 (drs) wetdays output was not working: changed in get_wetdays() the output from sprintf(fmt, "%c%%3.0f", _Sep); to sprintf(str, "%c%i", _Sep, val);
- 20091013 (drs) output period of static void get_swcBulk(void) was erroneously set to eSW_SWP instead of eSW_SWCBulk
- 20091015 (drs) ppt is divided into rain and snow and all three values plust snowmelt are output into precip
- 20100202 (drs) changed SW_CANOPY to SW_CANOPYEV and SW_LITTER to SW_LITTEREV;
- and eSW_Canopy to eSW_CanopyEv and eSW_Litter to eSW_LitterEv;
- added SWC_CANOPYINT, SW_LITTERINT, SW_SOILINF, SW_LYRDRAIN;
- added eSW_CanopyInt, eSW_LitterInt, eSW_SoilInf, eSW_LyrDrain;
- updated key2str, key2obj;
- added private functions get_canint(), get_litint(), get_soilinf(), get_lyrdrain();
- updated SW_OUT_construct(), sumof_swc() and average_for() with new functions and keys
- for layer drain use only for(i=0; i < SW_Site.n_layers-1; i++)
- 04/16/2010 (drs) added SWC_SWA, eSW_SWABulk; updated key2str, key2obj; added private functions get_swaBulk();
- updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
- 10/20/2010 (drs) added SW_HYDRED, eSW_HydRed; updated key2str, key2obj; added private functions get_hydred();
- updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
- 11/16/2010 (drs) added forest intercepted water to canopy interception
- updated get_canint(), SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for()
- 01/03/2011	(drs) changed parameter type of str2period(), str2key(), and str2type() from 'const char *' to 'char *' to avoid 'discard qualifiers from pointer target type' in Str_ComparI()
- 01/05/2011	(drs) made typecast explicit: changed in SW_OUT_write_today(): SW_Output[k].pfunc() to ((void (*)(void))SW_Output[k].pfunc)(); -> doesn't solve problem under darwin10
- -> 'abort trap' was due to str[OUTSTRLEN] being too short (OUTSTRLEN 18), changed to OUTSTRLEN 100
- 01/06/2011	(drs) changed all floating-point output from %7.4f to %7.6f to avoid rounding errors in post-run output calculations
- 03/06/2011	(drs) in average_for() changed loop to average hydred from "for(i=0; i < SW_Site.n_layers-1; i++)" to "ForEachSoilLayer(i)" because deepest layer was not averaged
- 07/22/2011 (drs) added SW_SURFACEW and SW_EVAPSURFACE, eSW_SurfaceWater and eSW_EvapSurface; updated key2str, key2obj; added private functions get_surfaceWater() and get_evapSurface();
- updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
- 09/12/2011	(drs)	renamed SW_EVAP to SW_EVAPSOIL, and eSW_Evap to eSW_EvapSoil;
- deleted SW_CANOPYEV, eSW_CanopyEv, SW_LITTEREV, eSW_LitterEv, SW_CANOPYINT, eSW_CanopyInt, SW_LITTERINT, and eSW_LitterInt;
- added SW_INTERCEPTION and eSW_Interception
- 09/12/2011	(drs)	renamed get_evap() to get_evapSoil(); renamed get_EvapsurfaceWater() to get_evapSurface()
- deleted get_canevap(), get_litevap(), get_canint(), and get_litint()
- added get_interception()
- 09/12/2011	(drs)	increased #define OUTSTRLEN from 100 to 400 (since transpiration and hydraulic redistribution will be 4x as long)
- increased static char outstr[0xff] from 0xff=255 to OUTSTRLEN
- 09/12/2011	(drs)	updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
- 09/12/2011	(drs)	added snowdepth as output to snowpack, i.e., updated updated get_snowpack(), sumof_swc()[->make calculation here] and average_for()
- 09/30/2011	(drs)	in SW_OUT_read(): opening of output files: SW_Output[k].outfile is extended by SW_Files.in:SW_OutputPrefix()
- 01/09/2012	(drs)	'abort trap' in get_transp due to outstr[OUTSTRLEN] being too short (OUTSTRLEN 400), changed to OUTSTRLEN 1000
- 05/25/2012  (DLM) added SW_SOILTEMP to keytostr, updated keytoobj;  wrote get_soiltemp(void) function, added code in the _construct() function to link to get_soiltemp() correctly;  added code to sumof and average_for() to handle the new key
- 05/25/2012  (DLM) added a few lines of nonsense to sumof_ves() function in order to get rid of the annoying compiler warnings
- 06/12/2012  (DLM) changed OUTSTRLEN from 1000 to 2000
- 07/02/2012  (DLM) updated # of chars in keyname & upkey arrays in SW_OUT_READ() function to account for longer keynames... for some reason it would still read them in correctly on OS X without an error, but wouldn't on JANUS.
- 11/30/2012	(clk)	changed get_surfaceWater() to ouput amound of surface water, surface runoff, and snowmelt runoff, respectively.
- 12/13/2012	(clk, drs)	changed get_surfaceWater() to output amount of surface water
- added get_runoff() to output surface runoff, and snowmelt runoff, respectively, in a separate file -> new version of outsetupin;
- updated key2str and OutKey
- 12/14/2012 (drs)	changed OUTSTRLEN from 2000 to 3000 to prevent 'Abort trap: 6' at runtime
- 01/10/2013	(clk)	in function SW_OUT_read, when creating the output files, needed to loop through this four times
- for each OutKey, giving us the output files for day, week, month, and year. Also, added
- a switch statement to acqurie the dy, wk, mo, or yr suffix based on the iteration of the for loop.
- When reading in lines from outsetup, removed PERIOD from the read in because it is unneeded in since
- we are doing all time steps.
- Removed the line SW_Output[k].period = str2period(Str_ToUpper(period, ext)), since we are no longer
- reading in a period.
- in function SW_OUT_close_files need to loop through and close all four time step files for each
- OutKey, determined which file to close based on the iteration of the for loop.
- in function SW_OUT_write_today needed to loop through the code four times for each OutKey, changing
- the period of the output for each iteration. With the for loop, I am also able to pick the
- proper FILE pointer to choose when outputting the data.
- in function average_for needed to loop through the code four times for each OutKey, changing
- the period of the output for each iteration.
- the function str2period is no longer used in the code, but will leave it in the code for now.
- 01/17/2013	(clk)	in function SW_OUT_read, created an additional condition that if the keyname was TIMESTEP,
- the code would rescan the line looking for up to 5 strings. The first one would be saved
- back into keyname, while the other four would be stored in a matrix. These values would be
- the desired timesteps to output. Then you would convert these strings to periods, and store
- them in an array of integers and keep track of how many timesteps were actually read in.
- The other changes are modifications of the changes made on 01/10/2013. For all the for loops, instead of
- looping through 4 times, we now loop through for as many times as periods that we read in from the
- TIMESTEP line. Also, in all the switch cases where we increased that value which changed the period
- to the next period, we now use the array of integers that stored the period and move through that with
- each iteration.
- 02/05/2013	(clk) in the function get_soiltemp(), when determing the period, the code was using SW_Output[eSW_SWCBulk].period,
- which needed to be SW_Output[eSW_SoilTemp].period, since we are looking at soil temp, not SWCM.
- 04/16/2013	(clk)	Added two new ouputs: vwcMatric and swaMatric.
- in the get functions, the calculation is
- (the matric value) = (the bulk value)/(1-fractionVolBulk_gravel)
- Also changed the names of swp -> swpMatric, swc -> swcBulk, swcm -> vwcBulk, and swa -> swaBulk
- 06/27/2013	(drs)	closed open files if LogError() with LOGFATAL is called in SW_OUT_read()
-
- 07/01/2013	(clk)	Changed the outsetup file so that the TIMESTEP line could be used or not used, depending on the need
- If the TIMESTEP line is not used, need to have an additional column for the period again
- Within the code, changed the timesteps array to be two dimensional, and keep track of the periods to be used
- for each of the outputs. Then, at every for loop that was implemented for the TIMESTEP code, put in
- place a conditional that will determine which of the four possible periods are to be used for each output.
- 07/09/2013	(clk)	Added forb to the outputs: transpiration, surface evaporation, interception, and hydraulic redistribution
- 08/21/2013	(clk)	Modified the establisment output to actually output for each species and not just the last one in the group.
- 06/23/2015 (akt)	Added output for surface temperature to get_temp()
- */
-/********************************************************/
-/********************************************************/
-
-/* =================================================== */
-/*                INCLUDES / DEFINES                   */
-/* --------------------------------------------------- */
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "generic.h"
-#include "filefuncs.h"
-#include "myMemory.h"
-#include "Times.h"
-
-#include "SW_Carbon.h"
-#include "SW_Defines.h"
-#include "SW_Files.h"
-#include "SW_Model.h"
-#include "SW_Site.h"
-#include "SW_SoilWater.h"
-#include "SW_Times.h"
-#include "SW_Output.h"
-#include "SW_Weather.h"
-#include "SW_VegEstab.h"
-#include "SW_VegProd.h"
-
-#ifdef RSOILWAT
-#include "R.h"
-#include "Rdefines.h"
-#include "Rconfig.h"
-#include "Rinternals.h"
-#endif
-
-/* =================================================== */
-/*                  Global Variables                   */
-/* --------------------------------------------------- */
-extern SW_SITE SW_Site;
-extern SW_SOILWAT SW_Soilwat;
-extern SW_MODEL SW_Model;
-extern SW_WEATHER SW_Weather;
-extern SW_VEGPROD SW_VegProd;
-extern SW_VEGESTAB SW_VegEstab;
-extern Bool EchoInits;
-extern SW_CARBON SW_Carbon;
-#define OUTSTRLEN 3000 /* max output string length: in get_transp: 4*every soil layer with 14 chars */
-
-SW_OUTPUT SW_Output[SW_OUTNKEYS]; /* declared here, externed elsewhere */
-
-#ifdef RSOILWAT
-extern RealD *p_Raet_yr, *p_Rdeep_drain_yr, *p_Restabs_yr, *p_Revap_soil_yr, *p_Revap_surface_yr, *p_Rhydred_yr, *p_Rinfiltration_yr, *p_Rinterception_yr, *p_Rpercolation_yr,
-*p_Rpet_yr, *p_Rprecip_yr, *p_Rrunoff_yr, *p_Rsnowpack_yr, *p_Rsoil_temp_yr, *p_Rsurface_water_yr, *p_RvwcBulk_yr, *p_RvwcMatric_yr, *p_RswcBulk_yr, *p_RswpMatric_yr,
-*p_RswaBulk_yr, *p_RswaMatric_yr, *p_Rtemp_yr, *p_Rtransp_yr, *p_Rwetdays_yr, *p_Rco2effects_yr;
-extern RealD *p_Raet_mo, *p_Rdeep_drain_mo, *p_Restabs_mo, *p_Revap_soil_mo, *p_Revap_surface_mo, *p_Rhydred_mo, *p_Rinfiltration_mo, *p_Rinterception_mo, *p_Rpercolation_mo,
-*p_Rpet_mo, *p_Rprecip_mo, *p_Rrunoff_mo, *p_Rsnowpack_mo, *p_Rsoil_temp_mo, *p_Rsurface_water_mo, *p_RvwcBulk_mo, *p_RvwcMatric_mo, *p_RswcBulk_mo, *p_RswpMatric_mo,
-*p_RswaBulk_mo, *p_RswaMatric_mo, *p_Rtemp_mo, *p_Rtransp_mo, *p_Rwetdays_mo, *p_Rco2effects_mo;
-extern RealD *p_Raet_wk, *p_Rdeep_drain_wk, *p_Restabs_wk, *p_Revap_soil_wk, *p_Revap_surface_wk, *p_Rhydred_wk, *p_Rinfiltration_wk, *p_Rinterception_wk, *p_Rpercolation_wk,
-*p_Rpet_wk, *p_Rprecip_wk, *p_Rrunoff_wk, *p_Rsnowpack_wk, *p_Rsoil_temp_wk, *p_Rsurface_water_wk, *p_RvwcBulk_wk, *p_RvwcMatric_wk, *p_RswcBulk_wk, *p_RswpMatric_wk,
-*p_RswaBulk_wk, *p_RswaMatric_wk, *p_Rtemp_wk, *p_Rtransp_wk, *p_Rwetdays_wk;
-extern RealD *p_Raet_dy, *p_Rdeep_drain_dy, *p_Restabs_dy, *p_Revap_soil_dy, *p_Revap_surface_dy, *p_Rhydred_dy, *p_Rinfiltration_dy, *p_Rinterception_dy, *p_Rpercolation_dy,
-*p_Rpet_dy, *p_Rprecip_dy, *p_Rrunoff_dy, *p_Rsnowpack_dy, *p_Rsoil_temp_dy, *p_Rsurface_water_dy, *p_RvwcBulk_dy, *p_RvwcMatric_dy, *p_RswcBulk_dy, *p_RswpMatric_dy,
-*p_RswaBulk_dy, *p_RswaMatric_dy, *p_Rtemp_dy, *p_Rtransp_dy, *p_Rwetdays_dy, *p_Rsoil_temp_dy;
-extern unsigned int yr_nrow, mo_nrow, wk_nrow, dy_nrow;
-#endif
-
-#ifdef STEPWAT
-#include "../sxw.h"
-extern SXW_t SXW;
-#endif
-
-Bool isPartialSoilwatOutput =FALSE;
-
-/* =================================================== */
-/*                Module-Level Variables               */
-/* --------------------------------------------------- */
-static char *MyFileName;
-static char outstr[OUTSTRLEN];
-static char _Sep; /* output delimiter */
-
-static int numPeriod;// variable to keep track of the number of periods that are listed in the line TIMESTEP
-static int numPeriods = 4;// the total number of periods that can be used in the code
-static int timeSteps[SW_OUTNKEYS][4];// array to keep track of the periods that will be used for each output
-
-static Bool bFlush; /* process partial period ? */
-static TimeInt tOffset; /* 1 or 0 means we're writing previous or current period */
-
-/* These MUST be in the same order as enum OutKey in
- * SW_Output.h */
-static char *key2str[] =
-{ SW_WETHR, SW_TEMP, SW_PRECIP, SW_SOILINF, SW_RUNOFF, SW_ALLH2O, SW_VWCBULK,
-		SW_VWCMATRIC, SW_SWCBULK, SW_SWABULK, SW_SWAMATRIC, SW_SWPMATRIC,
-		SW_SURFACEW, SW_TRANSP, SW_EVAPSOIL, SW_EVAPSURFACE, SW_INTERCEPTION,
-		SW_LYRDRAIN, SW_HYDRED, SW_ET, SW_AET, SW_PET, SW_WETDAY, SW_SNOWPACK,
-		SW_DEEPSWC, SW_SOILTEMP,
-		SW_ALLVEG, SW_ESTAB, SW_CO2EFFECTS };
-/* converts an enum output key (OutKey type) to a module  */
-/* or object type. see SW_Output.h for OutKey order.         */
-/* MUST be SW_OUTNKEYS of these */
-static ObjType key2obj[] =
-{ eWTH, eWTH, eWTH, eWTH, eWTH, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC,
-		eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC,
-		eSWC, eVES, eVES, eVES };
-
-static char *pd2str[] =
-{ SW_DAY, SW_WEEK, SW_MONTH, SW_YEAR };
-static char *styp2str[] =
-{ SW_SUM_OFF, SW_SUM_SUM, SW_SUM_AVG, SW_SUM_FNL };
-
-/* =================================================== */
-/* =================================================== */
-/*             Private Function Definitions            */
-/* --------------------------------------------------- */
-static void _echo_outputs(void);
-static void average_for(ObjType otyp, OutPeriod pd);
-#ifndef RSOILWAT
-static void get_outstrleader(TimeInt pd);
-#endif
-static void get_temp(void);
-static void get_precip(void);
-static void get_vwcBulk(void);
-static void get_vwcMatric(void);
-static void get_swcBulk(void);
-static void get_swpMatric(void);
-static void get_swaBulk(void);
-static void get_swaMatric(void);
-static void get_surfaceWater(void);
-static void get_runoff(void);
-static void get_transp(void);
-static void get_evapSoil(void);
-static void get_evapSurface(void);
-static void get_interception(void);
-static void get_soilinf(void);
-static void get_lyrdrain(void);
-static void get_hydred(void);
-static void get_aet(void);
-static void get_pet(void);
-static void get_wetdays(void);
-static void get_snowpack(void);
-static void get_deepswc(void);
-static void get_estab(void);
-static void get_soiltemp(void);
-void get_co2effects(void); // Uses Carbon.h
-static void get_none(void); /* default until defined */
-
-static void collect_sums(ObjType otyp, OutPeriod op);
-static void sumof_wth(SW_WEATHER *v, SW_WEATHER_OUTPUTS *s, OutKey k);
-static void sumof_swc(SW_SOILWAT *v, SW_SOILWAT_OUTPUTS *s, OutKey k);
-static void sumof_ves(SW_VEGESTAB *v, SW_VEGESTAB_OUTPUTS *s, OutKey k);
-
-static OutPeriod str2period(char *s)
-{
-	/* --------------------------------------------------- */
-	IntUS pd;
-	for (pd = 0; Str_CompareI(s, pd2str[pd]) && pd < SW_OUTNPERIODS; pd++) ;
-
-	return pd;
-}
-
-static OutKey str2key(char *s)
-{
-	/* --------------------------------------------------- */
-	IntUS key;
-
-	for (key = 0; key < SW_OUTNKEYS && Str_CompareI(s, key2str[key]); key++) ;
-	if (key == SW_OUTNKEYS)
-	{
-		LogError(logfp, LOGFATAL, "%s : Invalid key (%s) in %s", SW_F_name(eOutput), s);
-	}
-	return key;
-}
-
-static OutSum str2stype(char *s)
-{
-	/* --------------------------------------------------- */
-	OutSum styp;
-
-	for (styp = eSW_Off; styp < SW_NSUMTYPES && Str_CompareI(s, styp2str[styp]); styp++) ;
-	if (styp == SW_NSUMTYPES)
-	{
-		LogError(logfp, LOGFATAL, "%s : Invalid summary type (%s)\n", SW_F_name(eOutput), s);
-	}
-	return styp;
-}
-
-/* =================================================== */
-/* =================================================== */
-/*             Public Function Definitions             */
-/* --------------------------------------------------- */
-void SW_OUT_construct(void)
-{
-	/* =================================================== */
-	OutKey k;
-  
-	/* note that an initializer that is called during
-	 * execution (better called clean() or something)
-	 * will need to free all allocated memory first
-	 * before clearing structure.
-	 */
-	ForEachOutKey(k)
-	{
-		if (!isnull(SW_Output[k].outfile))
-		{	//Clear memory before setting it
-			Mem_Free(SW_Output[k].outfile);
-			SW_Output[k].outfile = NULL;
-		}
-	}
-	memset(&SW_Output, 0, sizeof(SW_Output));
-
-	/* attach the printing functions for each output
-	 * quantity to the appropriate element in the
-	 * output structure.  Using a loop makes it convenient
-	 * to simply add a line as new quantities are
-	 * implemented and leave the default case for every
-	 * thing else.
-	 */ForEachOutKey(k)
-	{
-#ifdef RSOILWAT
-		SW_Output[k].yr_row = 0;
-		SW_Output[k].mo_row = 0;
-		SW_Output[k].wk_row = 0;
-		SW_Output[k].dy_row = 0;
-#endif
-		switch (k)
-		{
-		case eSW_Temp:
-			SW_Output[k].pfunc = (void (*)(void)) get_temp;
-			break;
-		case eSW_Precip:
-			SW_Output[k].pfunc = (void (*)(void)) get_precip;
-			break;
-		case eSW_VWCBulk:
-			SW_Output[k].pfunc = (void (*)(void)) get_vwcBulk;
-			break;
-		case eSW_VWCMatric:
-			SW_Output[k].pfunc = (void (*)(void)) get_vwcMatric;
-			break;
-		case eSW_SWCBulk:
-			SW_Output[k].pfunc = (void (*)(void)) get_swcBulk;
-			break;
-		case eSW_SWPMatric:
-			SW_Output[k].pfunc = (void (*)(void)) get_swpMatric;
-			break;
-		case eSW_SWABulk:
-			SW_Output[k].pfunc = (void (*)(void)) get_swaBulk;
-			break;
-		case eSW_SWAMatric:
-			SW_Output[k].pfunc = (void (*)(void)) get_swaMatric;
-			break;
-		case eSW_SurfaceWater:
-			SW_Output[k].pfunc = (void (*)(void)) get_surfaceWater;
-			break;
-		case eSW_Runoff:
-			SW_Output[k].pfunc = (void (*)(void)) get_runoff;
-			break;
-		case eSW_Transp:
-			SW_Output[k].pfunc = (void (*)(void)) get_transp;
-			break;
-		case eSW_EvapSoil:
-			SW_Output[k].pfunc = (void (*)(void)) get_evapSoil;
-			break;
-		case eSW_EvapSurface:
-			SW_Output[k].pfunc = (void (*)(void)) get_evapSurface;
-			break;
-		case eSW_Interception:
-			SW_Output[k].pfunc = (void (*)(void)) get_interception;
-			break;
-		case eSW_SoilInf:
-			SW_Output[k].pfunc = (void (*)(void)) get_soilinf;
-			break;
-		case eSW_LyrDrain:
-			SW_Output[k].pfunc = (void (*)(void)) get_lyrdrain;
-			break;
-		case eSW_HydRed:
-			SW_Output[k].pfunc = (void (*)(void)) get_hydred;
-			break;
-		case eSW_AET:
-			SW_Output[k].pfunc = (void (*)(void)) get_aet;
-			break;
-		case eSW_PET:
-			SW_Output[k].pfunc = (void (*)(void)) get_pet;
-			break;
-		case eSW_WetDays:
-			SW_Output[k].pfunc = (void (*)(void)) get_wetdays;
-			break;
-		case eSW_SnowPack:
-			SW_Output[k].pfunc = (void (*)(void)) get_snowpack;
-			break;
-		case eSW_DeepSWC:
-			SW_Output[k].pfunc = (void (*)(void)) get_deepswc;
-			break;
-		case eSW_SoilTemp:
-			SW_Output[k].pfunc = (void (*)(void)) get_soiltemp;
-			break;
-		case eSW_Estab:
-			SW_Output[k].pfunc = (void (*)(void)) get_estab;
-			break;
-		case eSW_CO2Effects:
-			SW_Output[k].pfunc = (void (*)(void)) get_co2effects;
-			break;
-			// Creates a pointer to a function that expects void and returns void
-		default:
-			SW_Output[k].pfunc = (void (*)(void)) get_none;
-			break;
-
-		}
-	}
-	
-	bFlush = FALSE;
-	tOffset = 1;
-
-}
-
-void SW_OUT_new_year(void)
-{
-	/* =================================================== */
-	/* reset the terminal output days each year  */
-
-	OutKey k;
-
-	ForEachOutKey(k)
-	{
-		if (!SW_Output[k].use)
-			continue;
-
-		if (SW_Output[k].first_orig <= SW_Model.firstdoy)
-			SW_Output[k].first = SW_Model.firstdoy;
-		else
-			SW_Output[k].first = SW_Output[k].first_orig;
-
-		if (SW_Output[k].last_orig >= SW_Model.lastdoy)
-			SW_Output[k].last = SW_Model.lastdoy;
-		else
-			SW_Output[k].last = SW_Output[k].last_orig;
-
-	}
-
-}
-
-void SW_OUT_read(void)
-{
-	/* =================================================== */
-	/* read input file for output parameter setup info.
-	 * 5-Nov-01 -- now disregard the specified file name's
-	 *             extension and instead use the specified
-	 *             period as the extension.
-	 * 10-May-02 - Added conditional for interfacing to STEPPE.
-	 *             We want no output when running from STEPPE
-	 *             so the code to open the file is blocked out.
-	 *             In fact, the only keys to process are
-	 *             TRANSP, PRECIP, and TEMP.
-	 */
-	FILE *f;
-	OutKey k;
-	int x, i, itemno;
-#ifndef RSOILWAT
-	char str[MAX_FILENAMESIZE];
-#endif
-	char ext[10];
-
-	/* these dims come from the orig format str */
-	/* except for the uppercase space. */
-	char timeStep[4][10], // matrix to capture all the periods entered in outsetup.in
-			keyname[50], upkey[50], /* space for uppercase conversion */
-			sumtype[4], upsum[4], period[10], /* should be 2 chars, but we don't want overflow from user typos */
-			last[4], /* last doy for output, if "end", ==366 */
-			outfile[MAX_FILENAMESIZE];
-#ifndef RSOILWAT
-	char prefix[MAX_FILENAMESIZE];
-#endif
-	int first; /* first doy for output */
-	int useTimeStep = 0; /* flag to determine whether or not the line TIMESTEP exists */
-
-	MyFileName = SW_F_name(eOutput);
-	f = OpenFile(MyFileName, "r");
-	itemno = 0;
-
-	_Sep = '\t'; /* default in case it doesn't show up in the file */
-
-	while (GetALine(f, inbuf))
-	{
-		itemno++; /* note extra lines will cause an error */
-
-		x = sscanf(inbuf, "%s %s %s %d %s %s", keyname, sumtype, period, &first,
-				last, outfile);
-		if (Str_CompareI(keyname, "TIMESTEP") == 0)	// condition to read in the TIMESTEP line in outsetup.in
-		{
-			numPeriod = sscanf(inbuf, "%s %s %s %s %s", keyname, timeStep[0],
-					timeStep[1], timeStep[2], timeStep[3]);	// need to rescan the line because you are looking for all strings, unlike the original scan
-			numPeriod--;// decrement the count to make sure to not count keyname in the number of periods
-
-			useTimeStep = 1;
-			continue;
-		}
-		else
-		{ // If the line TIMESTEP is present, only need to read in five variables not six, so re read line.
-			if (x < 6)
-			{
-				if (Str_CompareI(keyname, "OUTSEP") == 0)
-				{
-					switch ((int) *sumtype)
-					{
-					case 't':
-						_Sep = '\t';
-						break;
-					case 's':
-						_Sep = ' ';
-						break;
-					default:
-						_Sep = *sumtype;
-					}
-					continue;
-				}
-				else
-				{
-					CloseFile(&f);
-					LogError(logfp, LOGFATAL,
-							"%s : Insufficient key parameters for item %d.",
-							MyFileName, itemno);
-					continue;
-				}
-			}
-			k = str2key(Str_ToUpper(keyname, upkey));
-			for (i = 0; i < numPeriods; i++)
-			{
-				if (i < 1 && !useTimeStep)
-				{
-					int prd = str2period(Str_ToUpper(period, ext));
-					timeSteps[k][i] = prd;
-				}
-				else if (i < numPeriod && useTimeStep)
-				{
-					int prd = str2period(Str_ToUpper(timeStep[i], ext));
-					timeSteps[k][i] = prd;
-				}
-				else
-					timeSteps[k][i] = 4;
-			}
-		}
-
-		/* Check validity of output key */
-		if (k == eSW_Estab)
-		{
-			strcpy(sumtype, "SUM");
-			first = 1;
-			strcpy(period, "YR");
-			strcpy(last, "end");
-		}
-		else if ((k == eSW_AllVeg || k == eSW_ET || k == eSW_AllWthr
-				|| k == eSW_AllH2O))
-		{
-			SW_Output[k].use = FALSE;
-			LogError(logfp, LOGNOTE, "%s : Output key %s is currently unimplemented.", MyFileName, key2str[k]);
-			continue;
-		}
-
-		/* check validity of summary type */
-		SW_Output[k].sumtype = str2stype(Str_ToUpper(sumtype, upsum));
-		if (SW_Output[k].sumtype == eSW_Fnl
-				&& !(k == eSW_VWCBulk || k == eSW_VWCMatric
-						|| k == eSW_SWPMatric || k == eSW_SWCBulk
-						|| k == eSW_SWABulk || k == eSW_SWAMatric
-						|| k == eSW_DeepSWC))
-		{
-			LogError(logfp, LOGWARN, "%s : Summary Type FIN with key %s is meaningless.\n" "  Using type AVG instead.", MyFileName, key2str[k]);
-			SW_Output[k].sumtype = eSW_Avg;
-		}
-
-		/* verify deep drainage parameters */
-		if (k == eSW_DeepSWC && SW_Output[k].sumtype != eSW_Off
-				&& !SW_Site.deepdrain)
-		{
-			LogError(logfp, LOGWARN, "%s : DEEPSWC cannot be output if flag not set in %s.", MyFileName, SW_F_name(eOutput));
-			continue;
-		}
-		//Set the values
-		SW_Output[k].use = (SW_Output[k].sumtype == eSW_Off) ? FALSE : TRUE;
-		if (SW_Output[k].use)
-		{
-			SW_Output[k].mykey = k;
-			SW_Output[k].myobj = key2obj[k];
-			SW_Output[k].period = str2period(Str_ToUpper(period, ext));
-			SW_Output[k].first_orig = first;
-			SW_Output[k].last_orig =
-					!Str_CompareI("END", last) ? 366 : atoi(last);
-			if (SW_Output[k].last_orig == 0)
-			{
-				CloseFile(&f);
-				LogError(logfp, LOGFATAL, "%s : Invalid ending day (%s), key=%s.", MyFileName, last, keyname);
-			}
-		}
-		//Set the outputs for the Periods
-#ifdef RSOILWAT
-		SW_Output[k].outfile = (char *) Str_Dup(outfile); //not really applicable
-#endif
-		for (i = 0; i < numPeriods; i++)
-		{ /* for loop to create files for all the periods that are being used */
-			/* prepare the remaining structure if use==true */
-			if (SW_Output[k].use)
-			{
-				if (timeSteps[k][i] < 4)
-				{
-				//	printf( "inside Soilwat SW_Output.c : isPartialSoilwatOutput=%d \n", isPartialSoilwatOutput);
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-					SW_OutputPrefix(prefix);
-					strcpy(str, prefix);
-					strcat(str, outfile);
-					strcat(str, ".");
-					switch (timeSteps[k][i])
-					{ /* depending on iteration through, will determine what period to use from the array of period */
-					case eSW_Day:
-						period[0] = 'd';
-						period[1] = 'y';
-						period[2] = '\0';
-						break;
-					case eSW_Week:
-						period[0] = 'w';
-						period[1] = 'k';
-						period[2] = '\0';
-						break;
-					case eSW_Month:
-						period[0] = 'm';
-						period[1] = 'o';
-						period[2] = '\0';
-						break;
-					case eSW_Year:
-						period[0] = 'y';
-						period[1] = 'r';
-						period[2] = '\0';
-						break;
-					}
-					strcat(str, Str_ToLower(period, ext));
-					SW_Output[k].outfile = (char *) Str_Dup(str);
-
-					switch (timeSteps[k][i])
-					{ /* depending on iteration through for loop, chooses the proper FILE pointer to use */
-					case eSW_Day:
-						SW_Output[k].fp_dy = OpenFile(SW_Output[k].outfile,
-								"w");
-						break;
-					case eSW_Week:
-						SW_Output[k].fp_wk = OpenFile(SW_Output[k].outfile,
-								"w");
-						break;
-					case eSW_Month:
-						SW_Output[k].fp_mo = OpenFile(SW_Output[k].outfile,
-								"w");
-						break;
-					case eSW_Year:
-						SW_Output[k].fp_yr = OpenFile(SW_Output[k].outfile,
-								"w");
-						break;
-					}
-#elif defined(STEPWAT)
-					if (isPartialSoilwatOutput == FALSE)
-					{
-						SW_OutputPrefix(prefix);
-						strcpy(str, prefix);
-						strcat(str, outfile);
-						strcat(str, ".");
-						switch (timeSteps[k][i])
-						{ /* depending on iteration through, will determine what period to use from the array of period */
-							case eSW_Day:
-							period[0] = 'd';
-							period[1] = 'y';
-							period[2] = '\0';
-							break;
-							case eSW_Week:
-							period[0] = 'w';
-							period[1] = 'k';
-							period[2] = '\0';
-							break;
-							case eSW_Month:
-							period[0] = 'm';
-							period[1] = 'o';
-							period[2] = '\0';
-							break;
-							case eSW_Year:
-							period[0] = 'y';
-							period[1] = 'r';
-							period[2] = '\0';
-							break;
-						}
-						strcat(str, Str_ToLower(period, ext));
-						SW_Output[k].outfile = (char *) Str_Dup(str);
-
-						switch (timeSteps[k][i])
-						{ /* depending on iteration through for loop, chooses the proper FILE pointer to use */
-							case eSW_Day:
-							SW_Output[k].fp_dy = OpenFile(SW_Output[k].outfile, "w");
-							break;
-							case eSW_Week:
-							SW_Output[k].fp_wk = OpenFile(SW_Output[k].outfile, "w");
-							break;
-							case eSW_Month:
-							SW_Output[k].fp_mo = OpenFile(SW_Output[k].outfile, "w");
-							break;
-							case eSW_Year:
-							SW_Output[k].fp_yr = OpenFile(SW_Output[k].outfile, "w");
-							break;
-						}
-					}
-#endif
-				}
-			}
-		}
-
-	}
-
-	CloseFile(&f);
-
-	if (EchoInits)
-		_echo_outputs();
-}
-#ifdef RSOILWAT
-void onSet_SW_OUT(SEXP OUT)
-{
-	int i;
-	char ext[10];
-	OutKey k;
-	SEXP sep, timestep,useTimeStep, KEY;
-	Bool continue1;
-	SEXP mykey, myobj, period, sumtype, use, first, last, first_orig, last_orig, outfile;
-
-	MyFileName = SW_F_name(eOutput);
-
-	PROTECT(sep = GET_SLOT(OUT, install("outputSeparator")));
-	_Sep = '\t';/*TODO Make this work.*/
-	PROTECT(useTimeStep = GET_SLOT(OUT, install("useTimeStep")));
-	PROTECT(timestep = GET_SLOT(OUT, install("timePeriods")));
-
-	PROTECT(mykey = GET_SLOT(OUT, install("mykey")));
-	PROTECT(myobj = GET_SLOT(OUT, install("myobj")));
-	PROTECT(period = GET_SLOT(OUT, install("period")));
-	PROTECT(sumtype = GET_SLOT(OUT, install("sumtype")));
-	PROTECT(use = GET_SLOT(OUT, install("use")));
-	PROTECT(first = GET_SLOT(OUT, install("first")));
-	PROTECT(last = GET_SLOT(OUT, install("last")));
-	PROTECT(first_orig = GET_SLOT(OUT, install("first_orig")));
-	PROTECT(last_orig = GET_SLOT(OUT, install("last_orig")));
-	PROTECT(outfile = GET_SLOT(OUT, install("outfile")));
-
-	ForEachOutKey(k)
-	{
-		for (i = 0; i < numPeriods; i++)
-		{
-			if (i < 1 && !LOGICAL(useTimeStep)[0])
-			{
-				timeSteps[k][i] = INTEGER(period)[k];
-			}
-			else if(LOGICAL(useTimeStep)[0] && i<LENGTH(timestep))
-			{
-				timeSteps[k][i] = INTEGER(timestep)[i];
-			}
-			else
-			{
-				timeSteps[k][i] = 4;
-			}
-		}
-		if (k == eSW_Estab)
-		{
-			INTEGER(sumtype)[k] = LOGICAL(use)[k]?eSW_Sum:eSW_Off;
-			INTEGER(first)[k] = 1;
-			INTEGER(period)[k] = 3;
-			INTEGER(last)[k] = 366;
-		}
-		continue1 = (k == eSW_AllVeg || k == eSW_ET || k == eSW_AllWthr || k == eSW_AllH2O);
-		if (continue1)
-		{
-			SW_Output[k].use = FALSE;
-			//LogError(logfp, LOGNOTE, "Output key %s is currently unimplemented.", key2str[k]);
-		}
-		if (!continue1)
-		{
-			/* check validity of summary type */
-			SW_Output[k].sumtype = INTEGER(sumtype)[k];
-			if (SW_Output[k].sumtype == eSW_Fnl && !(k == eSW_VWCBulk || k == eSW_VWCMatric || k == eSW_SWPMatric || k == eSW_SWCBulk || k == eSW_SWABulk || k == eSW_SWAMatric || k == eSW_DeepSWC))
-			{
-				LogError(logfp, LOGWARN, "output.in : Summary Type FIN with key %s is meaningless.\n"
-						"  Using type AVG instead.", key2str[k]);
-				SW_Output[k].sumtype = eSW_Avg;
-			}
-			/* verify deep drainage parameters */
-			if (k == eSW_DeepSWC && SW_Output[k].sumtype != eSW_Off && !SW_Site.deepdrain)
-			{
-				LogError(logfp, LOGWARN, "output.in : DEEPSWC cannot be output if flag not set in output.in.");
-			}
-			else
-			{
-				/* prepare the remaining structure if use==swTRUE */
-				SW_Output[k].use = (SW_Output[k].sumtype == eSW_Off) ? FALSE : TRUE;
-				if (SW_Output[k].use)
-				{
-					SW_Output[k].mykey = INTEGER(mykey)[k];
-					SW_Output[k].myobj = INTEGER(myobj)[k];
-					SW_Output[k].period = INTEGER(period)[k];
-					SW_Output[k].first_orig = INTEGER(first_orig)[k];
-					SW_Output[k].last_orig = INTEGER(last_orig)[k];
-					if (SW_Output[k].last_orig == 0)
-					{
-						LogError(logfp, LOGFATAL, "output.in : Invalid ending day (%s), key=%s.", INTEGER(last)[k], key2str[k]);
-					}
-					SW_Output[k].outfile = Str_Dup(CHAR(STRING_ELT(outfile, k)));
-				}
-			}
-		}
-	}
-	if (EchoInits)
-	_echo_outputs();
-	UNPROTECT(13);
-}
-
-SEXP onGet_SW_OUT(void)
-{
-	int i, debug = 0;
-	Bool doOnce = FALSE;
-	OutKey k;
-	SEXP swOUT;
-	SEXP OUT;
-	SEXP sep;
-	SEXP useTimeStep;
-	SEXP timestep;
-	SEXP mykey, myobj, period, sumtype, use, first, last, first_orig, last_orig, outfile;
-	char *cKEY[] =
-	{	"mykey", "myobj", "period", "sumtype", "use", "first", "last", "first_orig", "last_orig", "outfile"};
-
-	if(debug) Rprintf("onGet_SW_OUT begin\n");
-
-	PROTECT(swOUT = MAKE_CLASS("swOUT"));
-	PROTECT(OUT = NEW_OBJECT(swOUT));
-
-	PROTECT(sep=NEW_STRING(1));
-	SET_STRING_ELT(sep, 0, mkCharLen(&_Sep,1));
-	SET_SLOT(OUT, install("outputSeparator"), sep);
-
-	if(debug) Rprintf("useTimeStep before assignment = %d\n", useTimeStep);
-	PROTECT(useTimeStep = NEW_LOGICAL(1));
-	if(numPeriod == 0)
-	LOGICAL(useTimeStep)[0] = FALSE;
-	else
-	LOGICAL(useTimeStep)[0] = TRUE;
-	if(debug)
-	{
-		Rprintf("useTimeStep after assignment = %d\n", useTimeStep);
-		Rprintf("	- type of slot (10 = 'logical') %d\n", TYPEOF(useTimeStep));
-		Rprintf("	- logvalue of slot %d\n", LOGICAL_VALUE(useTimeStep));
-		if( 10 == TYPEOF(useTimeStep) )
-		Rprintf("	- logdata of slot %d\n", LOGICAL_DATA(useTimeStep));
-		else
-		Rprintf("	- logdata of slot not available because not of type 'logical'\n");
-	}
-	PROTECT(timestep = NEW_INTEGER(numPeriod));
-
-	PROTECT(mykey = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(myobj = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(period = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(sumtype = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(use = NEW_LOGICAL(SW_OUTNKEYS));
-	PROTECT(first = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(last = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(first_orig = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(last_orig = NEW_INTEGER(SW_OUTNKEYS));
-	PROTECT(outfile = NEW_STRING(SW_OUTNKEYS));
-
-	ForEachOutKey(k)
-	{
-		if(useTimeStep && SW_Output[k].use && !doOnce)
-		{
-			if(debug) Rprintf("length(timestep) = %d, numPeriod = %d\n", GET_LENGTH(timestep), numPeriod);
-			for (i = 0; i < numPeriod; i++)
-			{
-				if(debug) Rprintf("timestep, timestep[%d], and timeSteps[%d][%d] before %d assignment = %d, %d, %d\n",
-						i, i, k, k, timestep, INTEGER(timestep)[i], timeSteps[k][i]);
-				INTEGER(timestep)[i] = timeSteps[k][i];
-				if(debug) Rprintf("timestep, timestep[%d], and timeSteps[%d][%d] after %d assignment = %d, %d, %d\n",
-						i, i, k, k, timestep, INTEGER(timestep)[i], timeSteps[k][i]);
-			}
-			doOnce=TRUE;
-		}
-
-		INTEGER(mykey)[k] = SW_Output[k].mykey;
-		INTEGER(myobj)[k] = SW_Output[k].myobj;
-		INTEGER(period)[k] = SW_Output[k].period;
-		INTEGER(sumtype)[k] = SW_Output[k].sumtype;
-		LOGICAL(use)[k] = SW_Output[k].use;
-		INTEGER(first)[k] = SW_Output[k].first;
-		INTEGER(last)[k] = SW_Output[k].last;
-		INTEGER(first_orig)[k] = SW_Output[k].first_orig;
-		INTEGER(last_orig)[k] = SW_Output[k].last_orig;
-		if(SW_Output[k].use)
-		{
-			SET_STRING_ELT(outfile, k, mkChar(SW_Output[k].outfile));
-		}
-		else
-		SET_STRING_ELT(outfile, k, mkChar(""));
-	}
-	SET_SLOT(OUT, install("timePeriods"), timestep);
-
-	if(debug)
-	{
-		Rprintf("useTimeStep slot of OUT before assignment = %d\n", GET_SLOT(OUT, install("useTimeStep")));
-		Rprintf("	- type of slot %d\n", TYPEOF(GET_SLOT(OUT, install("useTimeStep"))));
-		Rprintf("	- logvalue of slot %d\n", LOGICAL_VALUE(GET_SLOT(OUT, install("useTimeStep"))));
-		if( 10 == TYPEOF(GET_SLOT(OUT, install("useTimeStep"))) )
-		Rprintf("	- logdata of slot %d\n", LOGICAL_DATA(GET_SLOT(OUT, install("useTimeStep"))));
-		else
-		Rprintf("	- logdata of slot not available because not of type 'logical'\n");
-	}
-	SET_SLOT(OUT, install("useTimeStep"), useTimeStep);
-	if(debug)
-	{
-		Rprintf("useTimeStep slot of OUT after assignment = %d\n", GET_SLOT(OUT, install("useTimeStep")));
-		Rprintf("	- type of slot (4 = 'environments') %d\n", TYPEOF(GET_SLOT(OUT, install("useTimeStep"))));
-		Rprintf("	- logvalue of slot %d\n", LOGICAL_VALUE(GET_SLOT(OUT, install("useTimeStep"))));
-		if( 10 == TYPEOF(GET_SLOT(OUT, install("useTimeStep"))) )
-		Rprintf("	- logdata of slot %d\n", LOGICAL_DATA(GET_SLOT(OUT, install("useTimeStep"))));
-		else
-		Rprintf("	- logdata of slot not available because not of type 'logical'\n");
-	}
-
-	SET_SLOT(OUT, install(cKEY[0]), mykey);
-	SET_SLOT(OUT, install(cKEY[1]), myobj);
-	SET_SLOT(OUT, install(cKEY[2]), period);
-	SET_SLOT(OUT, install(cKEY[3]), sumtype);
-	SET_SLOT(OUT, install(cKEY[4]), use);
-	SET_SLOT(OUT, install(cKEY[5]), first);
-	SET_SLOT(OUT, install(cKEY[6]), last);
-	SET_SLOT(OUT, install(cKEY[7]), first_orig);
-	SET_SLOT(OUT, install(cKEY[8]), last_orig);
-	SET_SLOT(OUT, install(cKEY[9]), outfile);
-
-	UNPROTECT(15);
-	if(debug) Rprintf("onGet_SW_OUT end\n");
-	return OUT;
-}
-#endif
-
-void SW_OUT_close_files(void)
-{
-	/* --------------------------------------------------- */
-	/* close all of the user-specified output files.
-	 * call this routine at the end of the program run.
-	 */
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	OutKey k;
-	int i;
-	ForEachOutKey(k)
-	{
-		if (SW_Output[k].use)
-			for (i = 0; i < numPeriods; i++) /*will loop through for as many periods are being used*/
-			{
-				if (timeSteps[k][i] < 4)
-				{
-					switch (timeSteps[k][i])
-					{ /*depending on iteration through loop, will close one of the time step files */
-					case eSW_Day:
-						CloseFile(&SW_Output[k].fp_dy);
-						break;
-					case eSW_Week:
-						CloseFile(&SW_Output[k].fp_wk);
-						break;
-					case eSW_Month:
-						CloseFile(&SW_Output[k].fp_mo);
-						break;
-					case eSW_Year:
-						CloseFile(&SW_Output[k].fp_yr);
-						break;
-					}
-				}
-			}
-	}
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		OutKey k;
-		int i;
-		ForEachOutKey(k)
-		{
-			if (SW_Output[k].use)
-			for (i = 0; i < numPeriods; i++) /*will loop through for as many periods are being used*/
-			{
-				if (timeSteps[k][i] < 4)
-				{
-					switch (timeSteps[k][i])
-					{ /*depending on iteration through loop, will close one of the time step files */
-						case eSW_Day:
-						CloseFile(&SW_Output[k].fp_dy);
-						break;
-						case eSW_Week:
-						CloseFile(&SW_Output[k].fp_wk);
-						break;
-						case eSW_Month:
-						CloseFile(&SW_Output[k].fp_mo);
-						break;
-						case eSW_Year:
-						CloseFile(&SW_Output[k].fp_yr);
-						break;
-					}
-				}
-			}
-		}
-	}
-#endif
-}
-
-void SW_OUT_flush(void)
-{
-	/* --------------------------------------------------- */
-	/* called at year end to process the remainder of the output
-	 * period.  This sets two module-level flags: bFlush and
-	 * tOffset to be used in the appropriate subs.
-	 */
-	bFlush = TRUE;
-	tOffset = 0;
-
-	SW_OUT_sum_today(eSWC);
-	SW_OUT_sum_today(eWTH);
-	SW_OUT_sum_today(eVES);
-	SW_OUT_write_today();
-
-	bFlush = FALSE;
-	tOffset = 1;
-
-}
-
-void SW_OUT_sum_today(ObjType otyp)
-{
-	/* =================================================== */
-	/* adds today's output values to week, month and year
-	 * accumulators and puts today's values in yesterday's
-	 * registers. This is different from the Weather.c approach
-	 * which updates Yesterday's registers during the _new_day()
-	 * function. It's more logical to update yesterday just
-	 * prior to today's calculations, but there's no logical
-	 * need to perform _new_day() on the soilwater.
-	 */
-	SW_SOILWAT *s = &SW_Soilwat;
-	SW_WEATHER *w = &SW_Weather;
-	/*  SW_VEGESTAB *v = &SW_VegEstab;  -> we don't need to sum daily for this */
-
-	OutPeriod pd;
-	IntU size = 0;
-
-	switch (otyp)
-	{
-	case eSWC:
-		size = sizeof(SW_SOILWAT_OUTPUTS);
-		break;
-	case eWTH:
-		size = sizeof(SW_WEATHER_OUTPUTS);
-		break;
-	case eVES:
-		return; /* a stub; we don't do anything with ves until get_() */
-	default:
-		LogError(stdout, LOGFATAL,
-				"Invalid object type in SW_OUT_sum_today().");
-	}
-
-	/* do this every day (kinda expensive but more general than before)*/
-	switch (otyp)
-	{
-	case eSWC:
-		memset(&s->dysum, 0, size);
-		break;
-	case eWTH:
-		memset(&w->dysum, 0, size);
-		break;
-	default:
-		break;
-	}
-
-	/* the rest only get done if new period */
-	if (SW_Model.newweek || bFlush)
-	{
-		average_for(otyp, eSW_Week);
-		switch (otyp)
-		{
-		case eSWC:
-			memset(&s->wksum, 0, size);
-			break;
-		case eWTH:
-			memset(&w->wksum, 0, size);
-			break;
-		default:
-			break;
-		}
-	}
-
-	if (SW_Model.newmonth || bFlush)
-	{
-		average_for(otyp, eSW_Month);
-		switch (otyp)
-		{
-		case eSWC:
-			memset(&s->mosum, 0, size);
-			break;
-		case eWTH:
-			memset(&w->mosum, 0, size);
-			break;
-		default:
-			break;
-		}
-	}
-
-	if (SW_Model.newyear || bFlush)
-	{
-		average_for(otyp, eSW_Year);
-		switch (otyp)
-		{
-		case eSWC:
-			memset(&s->yrsum, 0, size);
-			break;
-		case eWTH:
-			memset(&w->yrsum, 0, size);
-			break;
-		default:
-			break;
-		}
-	}
-
-	if (!bFlush)
-	{
-		ForEachOutPeriod(pd)
-			collect_sums(otyp, pd);
-	}
-}
-
-void SW_OUT_write_today(void)
-{
-	/* --------------------------------------------------- */
-	/* all output values must have been summed, averaged or
-	 * otherwise completed before this is called [now done
-	 * by SW_*_sum_*<daily|yearly>()] prior.
-	 * This subroutine organizes only the calling loop and
-	 * sending the string to output.
-	 * Each output quantity must have a print function
-	 * defined and linked to SW_Output.pfunc (currently all
-	 * starting with 'get_').  Those funcs return a properly
-	 * formatted string to be output via the module variable
-	 * 'outstr'. Furthermore, those funcs must know their
-	 * own time period.  This version of the program only
-	 * prints one period for each quantity.
-	 *
-	 * The t value tests whether the current model time is
-	 * outside the output time range requested by the user.
-	 * Recall that times are based at 0 rather than 1 for
-	 * array indexing purposes but the user request is in
-	 * natural numbers, so we add one before testing.
-	 */
-	/* 10-May-02 (cwb) Added conditional to interface with STEPPE.
-	 *           We want no output if running from STEPPE.
-	 */
-	TimeInt t = 0xffff;
-	OutKey k;
-	Bool writeit;
-	int i;
-	
-	// Adjust the model year to match simulation years for the output
-    SW_Model.year += SW_Carbon.addtl_yr;
-  
-	ForEachOutKey(k)
-	{
-		for (i = 0; i < numPeriods; i++)
-		{ /* will run through this loop for as many periods are being used */
-			if (!SW_Output[k].use)
-				continue;
-			if (timeSteps[k][i] < 4)
-			{
-				writeit = TRUE;
-				SW_Output[k].period = timeSteps[k][i]; /* set the desired period based on the iteration */
-				switch (SW_Output[k].period)
-				{
-				case eSW_Day:
-					t = SW_Model.doy;
-					break;
-				case eSW_Week:
-					writeit = (SW_Model.newweek || bFlush);
-					t = (SW_Model.week + 1) - tOffset;
-					break;
-				case eSW_Month:
-					writeit = (SW_Model.newmonth || bFlush);
-					t = (SW_Model.month + 1) - tOffset;
-					break;
-				case eSW_Year:
-					writeit = (SW_Model.newyear || bFlush);
-					t = SW_Output[k].first; /* always output this period */
-					break;
-				default:
-					LogError(stdout, LOGFATAL,
-							"Invalid period in SW_OUT_write_today().");
-				}
-				if (!writeit || t < SW_Output[k].first || t > SW_Output[k].last)
-					continue;
-
-				((void (*)(void)) SW_Output[k].pfunc)();
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-				switch (timeSteps[k][i])
-				{ /* based on iteration of for loop, determines which file to output to */
-				case eSW_Day:
-					fprintf(SW_Output[k].fp_dy, "%s\n", outstr);
-					break;
-				case eSW_Week:
-					fprintf(SW_Output[k].fp_wk, "%s\n", outstr);
-					break;
-				case eSW_Month:
-					fprintf(SW_Output[k].fp_mo, "%s\n", outstr);
-					break;
-				case eSW_Year:
-					fprintf(SW_Output[k].fp_yr, "%s\n", outstr);
-					break;
-				}
-#elif defined(STEPWAT)
-				if (isPartialSoilwatOutput == FALSE)
-				{
-					switch (timeSteps[k][i])
-					{ /* based on iteration of for loop, determines which file to output to */
-						case eSW_Day:
-						fprintf(SW_Output[k].fp_dy, "%s\n", outstr);
-						break;
-						case eSW_Week:
-						fprintf(SW_Output[k].fp_wk, "%s\n", outstr);
-						break;
-						case eSW_Month:
-						fprintf(SW_Output[k].fp_mo, "%s\n", outstr);
-						break;
-						case eSW_Year:
-						fprintf(SW_Output[k].fp_yr, "%s\n", outstr);
-						break;
-					}
-				}
-#endif
-			}
-		}
-	}
-	
-	// Revert changes to model year, as rest of the model does not use simulation years
-	SW_Model.year -= SW_Carbon.addtl_yr;
-	
-}
-
-static void get_none(void)
-{
-	/* --------------------------------------------------- */
-	/* output routine for quantities that aren't yet implemented
-	 * this just gives the main output loop something to call,
-	 * rather than an empty pointer.
-	 */
-	outstr[0] = '\0';
-}
-
-static void get_outstrleader(TimeInt pd)
-{
-	/* --------------------------------------------------- */
-	/* this is called from each of the remaining get_ funcs
-	 * to set up the first (date) columns of the output
-	 * string.  It's the same for all and easier to put in
-	 * one place.
-	 * Periodic output for Month and/or Week are actually
-	 * printing for the PREVIOUS month or week.
-	 * Also, see note on test value in _write_today() for
-	 * explanation of the +1.
-	 */
-#ifndef RSOILWAT
-	switch (pd)
-	{
-	case eSW_Day:
-		sprintf(outstr, "%d%c%d", SW_Model.year, _Sep, SW_Model.doy);
-		break;
-	case eSW_Week:
-		sprintf(outstr, "%d%c%d", SW_Model.year, _Sep,
-				(SW_Model.week + 1) - tOffset);
-		break;
-	case eSW_Month:
-		sprintf(outstr, "%d%c%d", SW_Model.year, _Sep,
-				(SW_Model.month + 1) - tOffset);
-		break;
-	case eSW_Year:
-		sprintf(outstr, "%d", SW_Model.year);
-	}
-#endif
-}
-
-void get_co2effects(void) {
-  
-	// Get the current period
-	OutPeriod pd = SW_Output[eSW_CO2Effects].period;
-	
-	// Define variables
-	SW_CARBON *c = &SW_Carbon;
-	int i, month;
-	RealD grassBiomass, shrubBiomass, treeBiomass, forbBiomass, totalBiomass;
-	RealD grassBiolive, shrubBiolive, treeBiolive, forbBiolive, totalBiolive;
-	RealD bioMult, wueMult;
-	grassBiomass = shrubBiomass = treeBiomass = forbBiomass = totalBiomass = 0;
-	grassBiolive = shrubBiolive = treeBiolive = forbBiolive = totalBiolive = 0;
-	bioMult = wueMult = 0;
-	
-	#ifndef RSOILWAT
-		char str[OUTSTRLEN];
-		get_outstrleader(pd);
-	#endif	
-
-	switch(pd) {
-		case eSW_Month:
-			month = (SW_Model.month) - tOffset;
-			if (GT(SW_VegProd.fractionGrass, 0.))
-			{
-				grassBiomass = SW_VegProd.grass.CO2_biomass[month];
-				grassBiolive = grassBiomass * SW_VegProd.grass.pct_live[month];
-			}
-			if (GT(SW_VegProd.fractionShrub, 0.))
-			{
-				shrubBiomass = SW_VegProd.shrub.CO2_biomass[month];
-				shrubBiolive = shrubBiomass * SW_VegProd.shrub.pct_live[month];
-			}
-			if (GT(SW_VegProd.fractionTree, 0.))
-			{
-				treeBiomass = SW_VegProd.tree.biomass[month];
-				treeBiolive = treeBiomass * SW_VegProd.tree.CO2_pct_live[month];
-			}
-			if (GT(SW_VegProd.fractionForb, 0.))
-			{
-				forbBiomass = SW_VegProd.forb.CO2_biomass[month];
-				forbBiolive = forbBiomass * SW_VegProd.forb.pct_live[month];
-			}
-
-			totalBiomass = grassBiomass + shrubBiomass + treeBiomass + forbBiomass;
-			totalBiolive = grassBiolive + shrubBiolive + treeBiolive + forbBiolive;
-			bioMult = c->co2_bio_mult;
-			wueMult = c->co2_wue_mult;
-		  
-			#ifdef RSOILWAT
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 0] = SW_Model.year;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 1] = month + 1;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 2] = grassBiomass;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 3] = shrubBiomass;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 4] = treeBiomass;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 5] = forbBiomass;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 6] = totalBiomass;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 7] = grassBiolive;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 8] = shrubBiolive;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 9] = treeBiolive;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 10] = forbBiolive;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 11] = totalBiolive;				
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 12] = bioMult;
-				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 13] = wueMult;
-				SW_Output[eSW_CO2Effects].mo_row++;
-			#endif
-			break;
-
-		case eSW_Year:
-			// Year avg could be done elsewhere, but it is only used in output so let's compute it here
-			for (i = 0; i < 12; i++) {
-				if (GT(SW_VegProd.fractionGrass, 0.))
-				{
-					grassBiomass += SW_VegProd.grass.CO2_biomass[i];
-					grassBiolive += grassBiomass * SW_VegProd.grass.pct_live[i];
-				}
-				if (GT(SW_VegProd.fractionShrub, 0.))
-				{
-					shrubBiomass += SW_VegProd.shrub.CO2_biomass[i];
-					shrubBiolive += shrubBiomass * SW_VegProd.shrub.pct_live[i];
-				}
-				if (GT(SW_VegProd.fractionTree, 0.))
-				{
-				  treeBiomass += SW_VegProd.tree.biomass[i];
-				  treeBiolive += treeBiomass * SW_VegProd.tree.CO2_pct_live[i];
-				}
-				if (GT(SW_VegProd.fractionForb, 0.))
-				{
-					forbBiomass += SW_VegProd.forb.CO2_biomass[i];
-					forbBiolive += forbBiomass * SW_VegProd.forb.pct_live[i];
-				}
-			}
-			
-			grassBiomass /= 12;
-			shrubBiomass /= 12;
-			treeBiomass  /= 12;
-			forbBiomass  /= 12;
-			grassBiolive /= 12;
-			shrubBiolive /= 12;
-			treeBiolive /= 12;
-			forbBiolive /= 12;
-			totalBiomass = grassBiomass + shrubBiomass + treeBiomass + forbBiomass;
-			totalBiolive = grassBiolive + shrubBiolive + treeBiolive + forbBiolive;
-			bioMult = c->co2_bio_mult;
-			wueMult = c->co2_wue_mult;
-		  
-			#ifdef RSOILWAT
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 0] = SW_Model.year;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 1] = grassBiomass;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 2] = shrubBiomass;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 3] = treeBiomass;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 4] = forbBiomass;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 5] = totalBiomass;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 6] = grassBiolive;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 7] = shrubBiolive;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 8] = treeBiolive;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 9] = forbBiolive;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 10] = totalBiolive;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 11] = bioMult;
-				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 12] = wueMult;
-				SW_Output[eSW_CO2Effects].yr_row++;
-			#endif
-			break;
-
-		// We are not interested in other results as they are just derivations and can be determined outside SOILWAT
-		case eSW_Day:
-			break;
-		case eSW_Week:
-			break;
-	}
-	
-	#ifndef RSOILWAT
-		sprintf(str, "%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f", 
-		_Sep, grassBiomass, 
-		_Sep, shrubBiomass, 
-		_Sep, treeBiomass, 
-		_Sep, forbBiomass, 
-		_Sep, totalBiomass,
-		_Sep, grassBiolive,
-		_Sep, shrubBiolive,
-		_Sep, treeBiolive,
-		_Sep, forbBiolive,
-		_Sep, totalBiolive,
-		_Sep, bioMult, 
-		_Sep, wueMult);
-		strcat(outstr, str);
-	#endif
-}
-
-static void get_estab(void)
-{
-	/* --------------------------------------------------- */
-	/* the establishment check produces, for each species in
-	 * the given set, a day of year >=0 that the species
-	 * established itself in the current year.  The output
-	 * will be a single row of numbers for each year.  Each
-	 * column represents a species in the order it was entered
-	 * in the estabs.in file.  The value will be the day that
-	 * the species established, or 0 if it didn't establish
-	 * this year.
-	 */
-	SW_VEGESTAB *v = &SW_VegEstab;
-	OutPeriod pd = SW_Output[eSW_Estab].period;
-	IntU i;
-	char str[10];
-#ifndef RSOILWAT
-	get_outstrleader(pd);
-#else
-	switch(pd)
-	{
-		case eSW_Day:
-		p_Restabs_dy[SW_Output[eSW_Estab].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Restabs_dy[SW_Output[eSW_Estab].dy_row + dy_nrow * 1] = SW_Model.doy;
-		break;
-		case eSW_Week:
-		p_Restabs_wk[SW_Output[eSW_Estab].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Restabs_wk[SW_Output[eSW_Estab].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		break;
-		case eSW_Month:
-		p_Restabs_mo[SW_Output[eSW_Estab].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Restabs_mo[SW_Output[eSW_Estab].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		break;
-		case eSW_Year:
-		p_Restabs_yr[SW_Output[eSW_Estab].yr_row + yr_nrow * 0] = SW_Model.year;
-		break;
-	}
-#endif
-	for (i = 0; i < v->count; i++)
-	{
-#ifndef RSOILWAT
-		sprintf(str, "%c%d", _Sep, v->parms[i]->estab_doy);
-		strcat(outstr, str);
-#else
-		switch(pd)
-		{
-			case eSW_Day:
-			p_Restabs_dy[SW_Output[eSW_Estab].dy_row + dy_nrow * (i + 2)] = v->parms[i]->estab_doy;
-			break;
-			case eSW_Week:
-			p_Restabs_wk[SW_Output[eSW_Estab].wk_row + wk_nrow * (i + 2)] = v->parms[i]->estab_doy;
-			break;
-			case eSW_Month:
-			p_Restabs_mo[SW_Output[eSW_Estab].mo_row + mo_nrow * (i + 2)] = v->parms[i]->estab_doy;
-			break;
-			case eSW_Year:
-			p_Restabs_yr[SW_Output[eSW_Estab].yr_row + yr_nrow * (i + 1)] = v->parms[i]->estab_doy;
-			break;
-		}
-#endif
-	}
-#ifdef RSOILWAT
-	switch(pd)
-	{
-		case eSW_Day:
-		SW_Output[eSW_Estab].dy_row++;
-		break;
-		case eSW_Week:
-		SW_Output[eSW_Estab].wk_row++;
-		break;
-		case eSW_Month:
-		SW_Output[eSW_Estab].mo_row++;
-		break;
-		case eSW_Year:
-		SW_Output[eSW_Estab].yr_row++;
-		break;
-	}
-#endif
-
-}
-
-static void get_temp(void)
-{
-	/* --------------------------------------------------- */
-	/* each of these get_<envparm> -type funcs return a
-	 * formatted string of the appropriate type and are
-	 * pointed to by SW_Output[k].pfunc so they can be called
-	 * anonymously by looping over the Output[k] list
-	 * (see _output_today() for usage.)
-	 * they all use the module-level string outstr[].
-	 */
-	/* 10-May-02 (cwb) Added conditionals for interfacing with STEPPE
-	 * 05-Mar-03 (cwb) Added code for max,min,avg. Previously, only avg was output.
-	 * 22 June-15 (akt)  Added code for adding surfaceTemp at output
-	 */
-	SW_WEATHER *v = &SW_Weather;
-	OutPeriod pd = SW_Output[eSW_Temp].period;
-	RealD v_avg = SW_MISSING;
-	RealD v_min = SW_MISSING, v_max = SW_MISSING;
-	RealD surfaceTempVal = SW_MISSING;
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-#elif defined(STEPWAT)
-	char str[OUTSTRLEN];
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		get_outstrleader(pd);
-	}
-#endif
-
-	switch (pd)
-	{
-	case eSW_Day:
-#ifndef RSOILWAT
-		v_max = v->dysum.temp_max;
-		v_min = v->dysum.temp_min;
-		v_avg = v->dysum.temp_avg;
-		surfaceTempVal = v->dysum.surfaceTemp;
-#else
-		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 2] = v->dysum.temp_max;
-		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 3] = v->dysum.temp_min;
-		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 4] = v->dysum.temp_avg;
-		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 5] = v->dysum.surfaceTemp;
-		SW_Output[eSW_Temp].dy_row++;
-#endif
-		break;
-	case eSW_Week:
-#ifndef RSOILWAT
-		v_max = v->wkavg.temp_max;
-		v_min = v->wkavg.temp_min;
-		v_avg = v->wkavg.temp_avg;
-		surfaceTempVal = v->wkavg.surfaceTemp;
-#else
-		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 2] = v->wkavg.temp_max;
-		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 3] = v->wkavg.temp_min;
-		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 4] = v->wkavg.temp_avg;
-		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 5] = v->wkavg.surfaceTemp;
-		SW_Output[eSW_Temp].wk_row++;
-#endif
-		break;
-	case eSW_Month:
-#ifndef RSOILWAT
-		v_max = v->moavg.temp_max;
-		v_min = v->moavg.temp_min;
-		v_avg = v->moavg.temp_avg;
-		surfaceTempVal = v->moavg.surfaceTemp;
-#else
-		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 2] = v->moavg.temp_max;
-		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 3] = v->moavg.temp_min;
-		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 4] = v->moavg.temp_avg;
-		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 5] = v->moavg.surfaceTemp;
-		SW_Output[eSW_Temp].mo_row++;
-#endif
-		break;
-	case eSW_Year:
-#ifndef RSOILWAT
-		v_max = v->yravg.temp_max;
-		v_min = v->yravg.temp_min;
-		v_avg = v->yravg.temp_avg;
-		surfaceTempVal = v->yravg.surfaceTemp;
-#else
-		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 1] = v->yravg.temp_max;
-		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 2] = v->yravg.temp_min;
-		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 3] = v->yravg.temp_avg;
-		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 4] = v->yravg.surfaceTemp;
-		SW_Output[eSW_Temp].yr_row++;
-#endif
-		break;
-	}
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, v_max, _Sep, v_min, _Sep,
-			v_avg, _Sep, surfaceTempVal);
-	strcat(outstr, str);
-#elif defined(STEPWAT)
-
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, v_max, _Sep, v_min, _Sep, v_avg, _Sep, surfaceTempVal);
-		strcat(outstr, str);
-	}
-	else
-	{
-
-		if (pd != eSW_Year)
-		LogError(logfp, LOGFATAL, "Invalid output period for TEMP; should be YR %7.6f, %7.6f",v_max, v_min); //added v_max, v_min for compiler
-		SXW.temp = v_avg;
-		SXW.surfaceTemp = surfaceTempVal;
-	}
-#endif
-}
-
-static void get_precip(void)
-{
-	/* --------------------------------------------------- */
-	/* 	20091015 (drs) ppt is divided into rain and snow and all three values are output into precip */
-	SW_WEATHER *v = &SW_Weather;
-	OutPeriod pd = SW_Output[eSW_Precip].period;
-	RealD val_ppt = SW_MISSING, val_rain = SW_MISSING, val_snow = SW_MISSING,
-			val_snowmelt = SW_MISSING, val_snowloss = SW_MISSING;
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-
-#elif defined(STEPWAT)
-	char str[OUTSTRLEN];
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		get_outstrleader(pd);
-	}
-#endif
-
-	switch (pd)
-	{
-	case eSW_Day:
-#ifndef RSOILWAT
-		val_ppt = v->dysum.ppt;
-		val_rain = v->dysum.rain;
-		val_snow = v->dysum.snow;
-		val_snowmelt = v->dysum.snowmelt;
-		val_snowloss = v->dysum.snowloss;
-#else
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 2] = v->dysum.ppt;
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 3] = v->dysum.rain;
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 4] = v->dysum.snow;
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 5] = v->dysum.snowmelt;
-		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 6] = v->dysum.snowloss;
-		SW_Output[eSW_Precip].dy_row++;
-#endif
-		break;
-	case eSW_Week:
-#ifndef RSOILWAT
-		val_ppt = v->wkavg.ppt;
-		val_rain = v->wkavg.rain;
-		val_snow = v->wkavg.snow;
-		val_snowmelt = v->wkavg.snowmelt;
-		val_snowloss = v->wkavg.snowloss;
-#else
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 2] = v->wkavg.ppt;
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 3] = v->wkavg.rain;
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 4] = v->wkavg.snow;
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 5] = v->wkavg.snowmelt;
-		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 6] = v->wkavg.snowloss;
-		SW_Output[eSW_Precip].wk_row++;
-#endif
-		break;
-	case eSW_Month:
-#ifndef RSOILWAT
-		val_ppt = v->moavg.ppt;
-		val_rain = v->moavg.rain;
-		val_snow = v->moavg.snow;
-		val_snowmelt = v->moavg.snowmelt;
-		val_snowloss = v->moavg.snowloss;
-#else
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 2] = v->moavg.ppt;
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 3] = v->moavg.rain;
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 4] = v->moavg.snow;
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 5] = v->moavg.snowmelt;
-		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 6] = v->moavg.snowloss;
-		SW_Output[eSW_Precip].mo_row++;
-#endif
-		break;
-	case eSW_Year:
-#ifndef RSOILWAT
-		val_ppt = v->yravg.ppt;
-		val_rain = v->yravg.rain;
-		val_snow = v->yravg.snow;
-		val_snowmelt = v->yravg.snowmelt;
-		val_snowloss = v->yravg.snowloss;
-		break;
-#else
-		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 1] = v->yravg.ppt;
-		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 2] = v->yravg.rain;
-		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 3] = v->yravg.snow;
-		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 4] = v->yravg.snowmelt;
-		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 5] = v->yravg.snowloss;
-		SW_Output[eSW_Precip].yr_row++;
-#endif
-	}
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_ppt, _Sep,
-			val_rain, _Sep, val_snow, _Sep, val_snowmelt, _Sep, val_snowloss);
-	strcat(outstr, str);
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_ppt, _Sep, val_rain, _Sep, val_snow, _Sep, val_snowmelt, _Sep, val_snowloss);
-		strcat(outstr, str);
-	}
-	else
-	{
-
-		if (pd != eSW_Year)
-		LogError(logfp, LOGFATAL, "Invalid output period for PRECIP; should be YR, %7.6f,%7.6f,%7.6f,%7.6f", val_snowloss, val_snowmelt, val_snow, val_rain); //added extra for compiler
-		SXW.ppt = val_ppt;
-	}
-#endif
-}
-
-static void get_vwcBulk(void)
-{
-	/* --------------------------------------------------- */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_VWCBulk].period;
-	RealD *val = malloc(sizeof(RealD) * SW_Site.n_layers);
-	ForEachSoilLayer(i)
-		val[i] = SW_MISSING;
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[OUTSTRLEN];
-#elif defined(STEPWAT)
-	char str[OUTSTRLEN];
-#endif
-
-	get_outstrleader(pd);
-	switch (pd)
-	{ /* vwcBulk at this point is identical to swcBulk */
-	case eSW_Day:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-			val[i] = v->dysum.vwcBulk[i] / SW_Site.lyr[i]->width;
-#else
-		p_RvwcBulk_dy[SW_Output[eSW_VWCBulk].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_RvwcBulk_dy[SW_Output[eSW_VWCBulk].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		p_RvwcBulk_dy[SW_Output[eSW_VWCBulk].dy_row + dy_nrow * (i + 2)] = v->dysum.vwcBulk[i] / SW_Site.lyr[i]->width;
-		SW_Output[eSW_VWCBulk].dy_row++;
-#endif
-		break;
-	case eSW_Week:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-			val[i] = v->wkavg.vwcBulk[i] / SW_Site.lyr[i]->width;
-#else
-		p_RvwcBulk_wk[SW_Output[eSW_VWCBulk].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_RvwcBulk_wk[SW_Output[eSW_VWCBulk].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RvwcBulk_wk[SW_Output[eSW_VWCBulk].wk_row + wk_nrow * (i + 2)] = v->wkavg.vwcBulk[i] / SW_Site.lyr[i]->width;
-		SW_Output[eSW_VWCBulk].wk_row++;
-#endif
-		break;
-	case eSW_Month:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-			val[i] = v->moavg.vwcBulk[i] / SW_Site.lyr[i]->width;
-#else
-		p_RvwcBulk_mo[SW_Output[eSW_VWCBulk].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_RvwcBulk_mo[SW_Output[eSW_VWCBulk].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RvwcBulk_mo[SW_Output[eSW_VWCBulk].mo_row + mo_nrow * (i + 2)] = v->moavg.vwcBulk[i] / SW_Site.lyr[i]->width;
-		SW_Output[eSW_VWCBulk].mo_row++;
-#endif
-		break;
-	case eSW_Year:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-			val[i] = v->yravg.vwcBulk[i] / SW_Site.lyr[i]->width;
-#else
-		p_RvwcBulk_yr[SW_Output[eSW_VWCBulk].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		p_RvwcBulk_yr[SW_Output[eSW_VWCBulk].yr_row + yr_nrow * (i + 1)] = v->yravg.vwcBulk[i] / SW_Site.lyr[i]->width;
-		SW_Output[eSW_VWCBulk].yr_row++;
-#endif
-		break;
-	}
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-			{
-				sprintf(str, "%c%7.6f", _Sep, val[i]);
-				strcat(outstr, str);
-			}
-	}
-	/*ForEachSoilLayer(i) {
-	 switch (pd) {
-	 case eSW_Day: p = t->doy-1; break; // print current but as index
-	 case eSW_Week: p = t->week-1; break; // print previous to current
-	 case eSW_Month: p = t->month-1; break; // print previous to current
-	 // YEAR should never be used with STEPWAT //
-	 }
-	 if (bFlush) p++;
-	 SXW.swc[Ilp(i,p)] = val[i];
-	 }*/
-#endif
-	free(val);
-}
-
-static void get_vwcMatric(void)
-{
-	/* --------------------------------------------------- */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_VWCMatric].period;
-	RealD convert;
-	RealD *val = malloc(sizeof(RealD) * SW_Site.n_layers);
-	ForEachSoilLayer(i)
-		val[i] = SW_MISSING;
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[OUTSTRLEN];
-#elif defined(STEPWAT)
-	char str[OUTSTRLEN];
-#endif
-
-	get_outstrleader(pd);
-	/* vwcMatric at this point is identical to swcBulk */
-	switch (pd)
-	{
-	case eSW_Day:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
-					/ SW_Site.lyr[i]->width;
-			val[i] = v->dysum.vwcMatric[i] * convert;
-		}
-#else
-		p_RvwcMatric_dy[SW_Output[eSW_VWCMatric].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_RvwcMatric_dy[SW_Output[eSW_VWCMatric].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
-			p_RvwcMatric_dy[SW_Output[eSW_VWCMatric].dy_row + dy_nrow * (i + 2)] = v->dysum.vwcMatric[i] * convert;
-		}
-		SW_Output[eSW_VWCMatric].dy_row++;
-#endif
-		break;
-	case eSW_Week:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
-					/ SW_Site.lyr[i]->width;
-			val[i] = v->wkavg.vwcMatric[i] * convert;
-		}
-#else
-		p_RvwcMatric_wk[SW_Output[eSW_VWCMatric].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_RvwcMatric_wk[SW_Output[eSW_VWCMatric].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
-			p_RvwcMatric_wk[SW_Output[eSW_VWCMatric].wk_row + wk_nrow * (i + 2)] = v->wkavg.vwcMatric[i] * convert;
-		}
-		SW_Output[eSW_VWCMatric].wk_row++;
-#endif
-		break;
-	case eSW_Month:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
-					/ SW_Site.lyr[i]->width;
-			val[i] = v->moavg.vwcMatric[i] * convert;
-		}
-#else
-		p_RvwcMatric_mo[SW_Output[eSW_VWCMatric].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_RvwcMatric_mo[SW_Output[eSW_VWCMatric].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
-			p_RvwcMatric_mo[SW_Output[eSW_VWCMatric].mo_row + mo_nrow * (i + 2)] = v->moavg.vwcMatric[i] * convert;
-		}
-		SW_Output[eSW_VWCMatric].mo_row++;
-#endif
-		break;
-	case eSW_Year:
-#ifndef RSOILWAT
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
-					/ SW_Site.lyr[i]->width;
-			val[i] = v->yravg.vwcMatric[i] * convert;
-		}
-#else
-		p_RvwcMatric_yr[SW_Output[eSW_VWCMatric].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
-      p_RvwcMatric_yr[SW_Output[eSW_VWCMatric].yr_row + yr_nrow * (i + 1)] = v->yravg.vwcMatric[i] * convert;
-		}
-		SW_Output[eSW_VWCMatric].yr_row++;
-#endif
-		break;
-	}
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-		{
-			sprintf(str, "%c%7.6f", _Sep, val[i]);
-			strcat(outstr, str);
-		}
-
-	}
-
-	/*ForEachSoilLayer(i)
-	 {
-	 switch (pd) {
-	 case eSW_Day: p = t->doy-1; break; // print current but as index
-	 case eSW_Week: p = t->week-1; break; // print previous to current
-	 case eSW_Month: p = t->month-1; break; // print previous to current
-	 // YEAR should never be used with STEPWAT
-	 }
-	 if (bFlush) p++;
-	 SXW.swc[Ilp(i,p)] = val[i];
-	 }*/
-#endif
-	free(val);
-}
-
-static void get_swcBulk(void)
-{
-	/* --------------------------------------------------- */
-	/* added 21-Oct-03, cwb */
-#ifdef STEPWAT
-	TimeInt p;
-	SW_MODEL *t = &SW_Model;
-
-#endif
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SWCBulk].period;
-	RealD val = SW_MISSING;
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.swcBulk[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.swcBulk[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.swcBulk[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.swcBulk[i];
-			break;
-		}
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#elif defined(RSOILWAT)
-	switch (pd)
-	{
-		case eSW_Day:
-		p_RswcBulk_dy[SW_Output[eSW_SWCBulk].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_RswcBulk_dy[SW_Output[eSW_SWCBulk].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		p_RswcBulk_dy[SW_Output[eSW_SWCBulk].dy_row + dy_nrow * (i + 2)] = v->dysum.swcBulk[i];
-		SW_Output[eSW_SWCBulk].dy_row++;
-		break;
-		case eSW_Week:
-		p_RswcBulk_wk[SW_Output[eSW_SWCBulk].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_RswcBulk_wk[SW_Output[eSW_SWCBulk].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RswcBulk_wk[SW_Output[eSW_SWCBulk].wk_row + wk_nrow * (i + 2)] = v->wkavg.swcBulk[i];
-		SW_Output[eSW_SWCBulk].wk_row++;
-		break;
-		case eSW_Month:
-		p_RswcBulk_mo[SW_Output[eSW_SWCBulk].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_RswcBulk_mo[SW_Output[eSW_SWCBulk].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RswcBulk_mo[SW_Output[eSW_SWCBulk].mo_row + mo_nrow * (i + 2)] = v->moavg.swcBulk[i];
-		SW_Output[eSW_SWCBulk].mo_row++;
-		break;
-		case eSW_Year:
-		p_RswcBulk_yr[SW_Output[eSW_SWCBulk].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		p_RswcBulk_yr[SW_Output[eSW_SWCBulk].yr_row + yr_nrow * (i + 1)] = v->yravg.swcBulk[i];
-		SW_Output[eSW_SWCBulk].yr_row++;
-		break;
-	}
-#elif defined(STEPWAT)
-	char str[OUTSTRLEN];
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		get_outstrleader(pd);
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day:
-				val = v->dysum.swcBulk[i];
-				break;
-				case eSW_Week:
-				val = v->wkavg.swcBulk[i];
-				break;
-				case eSW_Month:
-				val = v->moavg.swcBulk[i];
-				break;
-				case eSW_Year:
-				val = v->yravg.swcBulk[i];
-				break;
-			}
-			sprintf(str, "%c%7.6f", _Sep, val);
-			strcat(outstr, str);
-		}
-
-	}
-	else
-	{
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day:
-				p = t->doy-1;
-				val = v->dysum.swcBulk[i];
-				break; // print current but as index
-				case eSW_Week:
-				p = t->week-1;
-				val = v->wkavg.swcBulk[i];
-				break;// print previous to current
-				case eSW_Month:
-				p = t->month-1;
-				val = v->moavg.swcBulk[i];
-				break;// print previous to current
-				// YEAR should never be used with STEPWAT
-			}
-			if (bFlush) p++;
-			SXW.swc[Ilp(i,p)] = val;
-		}
-	}
-#endif
-}
-
-static void get_swpMatric(void)
-{
-	/* --------------------------------------------------- */
-	/* can't take arithmetic average of swp because it's
-	 * exponential.  At this time (until I remember to look
-	 * up whether harmonic or some other average is better
-	 * and fix this) we're not averaging swp but converting
-	 * the averaged swc.  This also avoids converting for
-	 * each day.
-	 *
-	 * added 12-Oct-03, cwb */
-
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SWPMatric].period;
-	RealD val = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-
-	get_outstrleader(pd);
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{ /* swpMatric at this point is identical to swcBulk */
-		case eSW_Day:
-			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
-					v->dysum.swpMatric[i], i);
-			break;
-		case eSW_Week:
-			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
-					v->wkavg.swpMatric[i], i);
-			break;
-		case eSW_Month:
-			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
-					v->moavg.swpMatric[i], i);
-			break;
-		case eSW_Year:
-			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
-					v->yravg.swpMatric[i], i);
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_RswpMatric_dy[SW_Output[eSW_SWPMatric].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_RswpMatric_dy[SW_Output[eSW_SWPMatric].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		p_RswpMatric_dy[SW_Output[eSW_SWPMatric].dy_row + dy_nrow * (i + 2)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->dysum.swpMatric[i], i);
-		SW_Output[eSW_SWPMatric].dy_row++;
-		break;
-		case eSW_Week:
-		p_RswpMatric_wk[SW_Output[eSW_SWPMatric].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_RswpMatric_wk[SW_Output[eSW_SWPMatric].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RswpMatric_wk[SW_Output[eSW_SWPMatric].wk_row + wk_nrow * (i + 2)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->wkavg.swpMatric[i], i);
-		SW_Output[eSW_SWPMatric].wk_row++;
-		break;
-		case eSW_Month:
-		p_RswpMatric_mo[SW_Output[eSW_SWPMatric].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_RswpMatric_mo[SW_Output[eSW_SWPMatric].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RswpMatric_mo[SW_Output[eSW_SWPMatric].mo_row + mo_nrow * (i + 2)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->moavg.swpMatric[i], i);
-		SW_Output[eSW_SWPMatric].mo_row++;
-		break;
-		case eSW_Year:
-		p_RswpMatric_yr[SW_Output[eSW_SWPMatric].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		p_RswpMatric_yr[SW_Output[eSW_SWPMatric].yr_row + yr_nrow * (i + 1)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->yravg.swpMatric[i], i);
-		SW_Output[eSW_SWPMatric].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_swaBulk(void)
-{
-	/* --------------------------------------------------- */
-
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SWABulk].period;
-	RealD val = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.swaBulk[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.swaBulk[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.swaBulk[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.swaBulk[i];
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_RswaBulk_dy[SW_Output[eSW_SWABulk].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_RswaBulk_dy[SW_Output[eSW_SWABulk].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		p_RswaBulk_dy[SW_Output[eSW_SWABulk].dy_row + dy_nrow * (i + 2)] = v->dysum.swaBulk[i];
-		SW_Output[eSW_SWABulk].dy_row++;
-		break;
-		case eSW_Week:
-		p_RswaBulk_wk[SW_Output[eSW_SWABulk].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_RswaBulk_wk[SW_Output[eSW_SWABulk].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RswaBulk_wk[SW_Output[eSW_SWABulk].wk_row + wk_nrow * (i + 2)] = v->wkavg.swaBulk[i];
-		SW_Output[eSW_SWABulk].wk_row++;
-		break;
-		case eSW_Month:
-		p_RswaBulk_mo[SW_Output[eSW_SWABulk].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_RswaBulk_mo[SW_Output[eSW_SWABulk].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		p_RswaBulk_mo[SW_Output[eSW_SWABulk].mo_row + mo_nrow * (i + 2)] = v->moavg.swaBulk[i];
-		SW_Output[eSW_SWABulk].mo_row++;
-		break;
-		case eSW_Year:
-		p_RswaBulk_yr[SW_Output[eSW_SWABulk].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		p_RswaBulk_yr[SW_Output[eSW_SWABulk].yr_row + yr_nrow * (i + 1)] = v->yravg.swaBulk[i];
-		SW_Output[eSW_SWABulk].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_swaMatric(void)
-{
-	/* --------------------------------------------------- */
-
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SWAMatric].period;
-	RealD val = SW_MISSING, convert;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	ForEachSoilLayer(i)
-	{ /* swaMatric at this point is identical to swaBulk */
-		convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.swaMatric[i] * convert;
-			break;
-		case eSW_Week:
-			val = v->wkavg.swaMatric[i] * convert;
-			break;
-		case eSW_Month:
-			val = v->moavg.swaMatric[i] * convert;
-			break;
-		case eSW_Year:
-			val = v->yravg.swaMatric[i] * convert;
-			break;
-		}
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_RswaMatric_dy[SW_Output[eSW_SWAMatric].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_RswaMatric_dy[SW_Output[eSW_SWAMatric].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
-			p_RswaMatric_dy[SW_Output[eSW_SWAMatric].dy_row + dy_nrow * (i + 2)] = v->dysum.swaMatric[i] * convert;
-		}
-		SW_Output[eSW_SWAMatric].dy_row++;
-		break;
-		case eSW_Week:
-		p_RswaMatric_wk[SW_Output[eSW_SWAMatric].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_RswaMatric_wk[SW_Output[eSW_SWAMatric].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
-			p_RswaMatric_wk[SW_Output[eSW_SWAMatric].wk_row + wk_nrow * (i + 2)] = v->wkavg.swaMatric[i] * convert;
-		}
-		SW_Output[eSW_SWAMatric].wk_row++;
-		break;
-		case eSW_Month:
-		p_RswaMatric_mo[SW_Output[eSW_SWAMatric].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_RswaMatric_mo[SW_Output[eSW_SWAMatric].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
-			p_RswaMatric_mo[SW_Output[eSW_SWAMatric].mo_row + mo_nrow * (i + 2)] = v->moavg.swaMatric[i] * convert;
-		}
-		SW_Output[eSW_SWAMatric].mo_row++;
-		break;
-		case eSW_Year:
-		p_RswaMatric_yr[SW_Output[eSW_SWAMatric].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		{
-			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
-			p_RswaMatric_yr[SW_Output[eSW_SWAMatric].yr_row + yr_nrow * (i + 1)] = v->yravg.swaMatric[i] * convert;
-		}
-		SW_Output[eSW_SWAMatric].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_surfaceWater(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SurfaceWater].period;
-	RealD val_surfacewater = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val_surfacewater = v->dysum.surfaceWater;
-		break;
-	case eSW_Week:
-		val_surfacewater = v->wkavg.surfaceWater;
-		break;
-	case eSW_Month:
-		val_surfacewater = v->moavg.surfaceWater;
-		break;
-	case eSW_Year:
-		val_surfacewater = v->yravg.surfaceWater;
-		break;
-	}
-	sprintf(str, "%c%7.6f", _Sep, val_surfacewater);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rsurface_water_dy[SW_Output[eSW_SurfaceWater].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rsurface_water_dy[SW_Output[eSW_SurfaceWater].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rsurface_water_dy[SW_Output[eSW_SurfaceWater].dy_row + dy_nrow * 2] = v->dysum.surfaceWater;
-		SW_Output[eSW_SurfaceWater].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rsurface_water_wk[SW_Output[eSW_SurfaceWater].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rsurface_water_wk[SW_Output[eSW_SurfaceWater].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rsurface_water_wk[SW_Output[eSW_SurfaceWater].wk_row + wk_nrow * 2] = v->wkavg.surfaceWater;
-		SW_Output[eSW_SurfaceWater].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rsurface_water_mo[SW_Output[eSW_SurfaceWater].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rsurface_water_mo[SW_Output[eSW_SurfaceWater].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rsurface_water_mo[SW_Output[eSW_SurfaceWater].mo_row + mo_nrow * 2] = v->moavg.surfaceWater;
-		SW_Output[eSW_SurfaceWater].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rsurface_water_yr[SW_Output[eSW_SurfaceWater].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rsurface_water_yr[SW_Output[eSW_SurfaceWater].yr_row + yr_nrow * 1] = v->yravg.surfaceWater;
-		SW_Output[eSW_SurfaceWater].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_runoff(void)
-{
-	/* --------------------------------------------------- */
-	/* (12/13/2012) (clk) Added function to output runoff variables */
-
-	SW_WEATHER *w = &SW_Weather;
-	OutPeriod pd = SW_Output[eSW_Runoff].period;
-	RealD val_totalRunoff = SW_MISSING, val_surfaceRunoff = SW_MISSING,
-			val_snowRunoff = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val_surfaceRunoff = w->dysum.surfaceRunoff;
-		val_snowRunoff = w->dysum.snowRunoff;
-		break;
-	case eSW_Week:
-		val_surfaceRunoff = w->wkavg.surfaceRunoff;
-		val_snowRunoff = w->wkavg.snowRunoff;
-		break;
-	case eSW_Month:
-		val_surfaceRunoff = w->moavg.surfaceRunoff;
-		val_snowRunoff = w->moavg.snowRunoff;
-		break;
-	case eSW_Year:
-		val_surfaceRunoff = w->yravg.surfaceRunoff;
-		val_snowRunoff = w->yravg.snowRunoff;
-		break;
-	}
-	val_totalRunoff = val_surfaceRunoff + val_snowRunoff;
-	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f", _Sep, val_totalRunoff, _Sep, val_surfaceRunoff, _Sep, val_snowRunoff);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 2] = (w->dysum.surfaceRunoff + w->dysum.snowRunoff);
-		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 3] = w->dysum.surfaceRunoff;
-		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 4] = w->dysum.snowRunoff;
-		SW_Output[eSW_Runoff].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 2] = (w->wkavg.surfaceRunoff + w->wkavg.snowRunoff);
-		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 3] = w->wkavg.surfaceRunoff;
-		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 4] = w->wkavg.snowRunoff;
-		SW_Output[eSW_Runoff].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 2] = (w->moavg.surfaceRunoff + w->moavg.snowRunoff);
-		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 3] = w->moavg.surfaceRunoff;
-		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 4] = w->moavg.snowRunoff;
-		SW_Output[eSW_Runoff].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 1] = (w->yravg.surfaceRunoff + w->yravg.snowRunoff);
-		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 2] = w->yravg.surfaceRunoff;
-		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 3] = w->yravg.snowRunoff;
-		SW_Output[eSW_Runoff].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_transp(void)
-{
-	/* --------------------------------------------------- */
-	/* 10-May-02 (cwb) Added conditional code to interface
-	 *           with STEPPE.
-	 */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_Transp].period;
-	RealD *val = malloc(sizeof(RealD) * SW_Site.n_layers);
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[OUTSTRLEN];
-#elif defined(STEPWAT)
-	char str[OUTSTRLEN];
-	TimeInt p;
-	SW_MODEL *t = &SW_Model;
-#endif
-	ForEachSoilLayer(i)
-		val[i] = 0;
-
-#ifdef RSOILWAT
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * 1] = SW_Model.doy;
-		break;
-		case eSW_Week:
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		break;
-		case eSW_Month:
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		break;
-		case eSW_Year:
-		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * 0] = SW_Model.year;
-		break;
-	}
-#endif
-
-#ifndef RSOILWAT
-	get_outstrleader(pd);
-	/* total transpiration */
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val[i] = v->dysum.transp_total[i];
-			break;
-		case eSW_Week:
-			val[i] = v->wkavg.transp_total[i];
-			break;
-		case eSW_Month:
-			val[i] = v->moavg.transp_total[i];
-			break;
-		case eSW_Year:
-			val[i] = v->yravg.transp_total[i];
-			break;
-		}
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2)] = v->dysum.transp_total[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2)] = v->wkavg.transp_total[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2)] = v->moavg.transp_total[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1)] = v->yravg.transp_total[i];
-		break;
-	}
-#endif
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-		{
-			sprintf(str, "%c%7.6f", _Sep, val[i]);
-			strcat(outstr, str);
-		}
-	}
-	else
-	{
-
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day: p = t->doy-1; break; /* print current but as index */
-				case eSW_Week: p = t->week-1; break; /* print previous to current */
-				case eSW_Month: p = t->month-1; break; /* print previous to current */
-				/* YEAR should never be used with STEPWAT */
-			}
-			if (bFlush) p++;
-			SXW.transpTotal[Ilp(i,p)] = val[i];
-		}
-	}
-#endif
-
-#ifndef RSOILWAT
-	/* tree-component transpiration */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val[i] = v->dysum.transp_tree[i];
-			break;
-		case eSW_Week:
-			val[i] = v->wkavg.transp_tree[i];
-			break;
-		case eSW_Month:
-			val[i] = v->moavg.transp_tree[i];
-			break;
-		case eSW_Year:
-			val[i] = v->yravg.transp_tree[i];
-			break;
-		}
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 1)] = v->dysum.transp_tree[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 1)] = v->wkavg.transp_tree[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 1)] = v->moavg.transp_tree[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 1)] = v->yravg.transp_tree[i];
-		break;
-	}
-#endif
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-		{
-			sprintf(str, "%c%7.6f", _Sep, val[i]);
-			strcat(outstr, str);
-		}
-	}
-	else
-	{
-
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day: p = t->doy-1; break; /* print current but as index */
-				case eSW_Week: p = t->week-1; break; /* print previous to current */
-				case eSW_Month: p = t->month-1; break; /* print previous to current */
-				/* YEAR should never be used with STEPWAT */
-			}
-			if (bFlush) p++;
-			SXW.transpTrees[Ilp(i,p)] = val[i];
-		}
-	}
-#endif
-
-#ifndef RSOILWAT
-	/* shrub-component transpiration */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val[i] = v->dysum.transp_shrub[i];
-			break;
-		case eSW_Week:
-			val[i] = v->wkavg.transp_shrub[i];
-			break;
-		case eSW_Month:
-			val[i] = v->moavg.transp_shrub[i];
-			break;
-		case eSW_Year:
-			val[i] = v->yravg.transp_shrub[i];
-			break;
-		}
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 2)] = v->dysum.transp_shrub[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 2)] = v->wkavg.transp_shrub[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 2)] = v->moavg.transp_shrub[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 2)] = v->yravg.transp_shrub[i];
-		break;
-	}
-#endif
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-		{
-			sprintf(str, "%c%7.6f", _Sep, val[i]);
-			strcat(outstr, str);
-		}
-	}
-	else
-	{
-
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day: p = t->doy-1; break; /* print current but as index */
-				case eSW_Week: p = t->week-1; break; /* print previous to current */
-				case eSW_Month: p = t->month-1; break; /* print previous to current */
-				/* YEAR should never be used with STEPWAT */
-			}
-			if (bFlush) p++;
-			SXW.transpShrubs[Ilp(i,p)] = val[i];
-		}
-	}
-#endif
-
-#ifndef RSOILWAT
-	/* forb-component transpiration */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val[i] = v->dysum.transp_forb[i];
-			break;
-		case eSW_Week:
-			val[i] = v->wkavg.transp_forb[i];
-			break;
-		case eSW_Month:
-			val[i] = v->moavg.transp_forb[i];
-			break;
-		case eSW_Year:
-			val[i] = v->yravg.transp_forb[i];
-			break;
-		}
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 3)] = v->dysum.transp_forb[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 3)] = v->wkavg.transp_forb[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 3)] = v->moavg.transp_forb[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 3)] = v->yravg.transp_forb[i];
-		break;
-	}
-#endif
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-		{
-			sprintf(str, "%c%7.6f", _Sep, val[i]);
-			strcat(outstr, str);
-		}
-	}
-	else
-	{
-
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day: p = t->doy-1; break; /* print current but as index */
-				case eSW_Week: p = t->week-1; break; /* print previous to current */
-				case eSW_Month: p = t->month-1; break; /* print previous to current */
-				/* YEAR should never be used with STEPWAT */
-			}
-			if (bFlush) p++;
-			SXW.transpForbs[Ilp(i,p)] = val[i];
-		}
-	}
-#endif
-
-#ifndef RSOILWAT
-	/* grass-component transpiration */
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val[i] = v->dysum.transp_grass[i];
-			break;
-		case eSW_Week:
-			val[i] = v->wkavg.transp_grass[i];
-			break;
-		case eSW_Month:
-			val[i] = v->moavg.transp_grass[i];
-			break;
-		case eSW_Year:
-			val[i] = v->yravg.transp_grass[i];
-			break;
-		}
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 4)] = v->dysum.transp_grass[i];
-		SW_Output[eSW_Transp].dy_row++;
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 4)] = v->wkavg.transp_grass[i];
-		SW_Output[eSW_Transp].wk_row++;
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 4)] = v->moavg.transp_grass[i];
-		SW_Output[eSW_Transp].mo_row++;
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 4)] = v->yravg.transp_grass[i];
-		SW_Output[eSW_Transp].yr_row++;
-		break;
-	}
-#endif
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	ForEachSoilLayer(i)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val[i]);
-		strcat(outstr, str);
-	}
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		ForEachSoilLayer(i)
-		{
-			sprintf(str, "%c%7.6f", _Sep, val[i]);
-			strcat(outstr, str);
-		}
-	}
-	else
-	{
-
-		ForEachSoilLayer(i)
-		{
-			switch (pd)
-			{
-				case eSW_Day: p = t->doy-1; break; /* print current but as index */
-				case eSW_Week: p = t->week-1; break; /* print previous to current */
-				case eSW_Month: p = t->month-1; break; /* print previous to current */
-				/* YEAR should never be used with STEPWAT */
-			}
-			if (bFlush) p++;
-			SXW.transpGrasses[Ilp(i,p)] = val[i];
-		}
-	}
-#endif
-	free(val);
-}
-
-static void get_evapSoil(void)
-{
-	/* --------------------------------------------------- */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_EvapSoil].period;
-	RealD val = SW_MISSING;
-
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	ForEachEvapLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.evap[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.evap[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.evap[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.evap[i];
-			break;
-		}
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Revap_soil_dy[SW_Output[eSW_EvapSoil].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Revap_soil_dy[SW_Output[eSW_EvapSoil].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachEvapLayer(i)
-		p_Revap_soil_dy[SW_Output[eSW_EvapSoil].dy_row + dy_nrow * (i + 2)] = v->dysum.evap[i];
-		SW_Output[eSW_EvapSoil].dy_row++;
-		break;
-		case eSW_Week:
-		p_Revap_soil_wk[SW_Output[eSW_EvapSoil].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Revap_soil_wk[SW_Output[eSW_EvapSoil].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachEvapLayer(i)
-		p_Revap_soil_wk[SW_Output[eSW_EvapSoil].wk_row + wk_nrow * (i + 2)] = v->wkavg.evap[i];
-		SW_Output[eSW_EvapSoil].wk_row++;
-		break;
-		case eSW_Month:
-		p_Revap_soil_mo[SW_Output[eSW_EvapSoil].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Revap_soil_mo[SW_Output[eSW_EvapSoil].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachEvapLayer(i)
-		p_Revap_soil_mo[SW_Output[eSW_EvapSoil].mo_row + mo_nrow * (i + 2)] = v->moavg.evap[i];
-		SW_Output[eSW_EvapSoil].mo_row++;
-		break;
-		case eSW_Year:
-		p_Revap_soil_yr[SW_Output[eSW_EvapSoil].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachEvapLayer(i)
-		p_Revap_soil_yr[SW_Output[eSW_EvapSoil].yr_row + yr_nrow * (i + 1)] = v->yravg.evap[i];
-		SW_Output[eSW_EvapSoil].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_evapSurface(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_EvapSurface].period;
-	RealD val_tot = SW_MISSING, val_tree = SW_MISSING, val_forb = SW_MISSING,
-			val_shrub = SW_MISSING, val_grass = SW_MISSING, val_litter =
-					SW_MISSING, val_water = SW_MISSING;
-
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val_tot = v->dysum.total_evap;
-		val_tree = v->dysum.tree_evap;
-		val_forb = v->dysum.forb_evap;
-		val_shrub = v->dysum.shrub_evap;
-		val_grass = v->dysum.grass_evap;
-		val_litter = v->dysum.litter_evap;
-		val_water = v->dysum.surfaceWater_evap;
-		break;
-	case eSW_Week:
-		val_tot = v->wkavg.total_evap;
-		val_tree = v->wkavg.tree_evap;
-		val_forb = v->wkavg.forb_evap;
-		val_shrub = v->wkavg.shrub_evap;
-		val_grass = v->wkavg.grass_evap;
-		val_litter = v->wkavg.litter_evap;
-		val_water = v->wkavg.surfaceWater_evap;
-		break;
-	case eSW_Month:
-		val_tot = v->moavg.total_evap;
-		val_tree = v->moavg.tree_evap;
-		val_forb = v->moavg.forb_evap;
-		val_shrub = v->moavg.shrub_evap;
-		val_grass = v->moavg.grass_evap;
-		val_litter = v->moavg.litter_evap;
-		val_water = v->moavg.surfaceWater_evap;
-		break;
-	case eSW_Year:
-		val_tot = v->yravg.total_evap;
-		val_tree = v->yravg.tree_evap;
-		val_forb = v->yravg.forb_evap;
-		val_shrub = v->yravg.shrub_evap;
-		val_grass = v->yravg.grass_evap;
-		val_litter = v->yravg.litter_evap;
-		val_water = v->yravg.surfaceWater_evap;
-		break;
-	}
-	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_tot, _Sep, val_tree, _Sep, val_shrub, _Sep, val_forb, _Sep, val_grass, _Sep, val_litter, _Sep, val_water);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 2] = v->dysum.total_evap;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 3] = v->dysum.tree_evap;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 4] = v->dysum.shrub_evap;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 5] = v->dysum.forb_evap;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 6] = v->dysum.grass_evap;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 7] = v->dysum.litter_evap;
-		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 8] = v->dysum.surfaceWater_evap;
-		SW_Output[eSW_EvapSurface].dy_row++;
-		break;
-		case eSW_Week:
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 2] = v->wkavg.total_evap;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 3] = v->wkavg.tree_evap;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 4] = v->wkavg.shrub_evap;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 5] = v->wkavg.forb_evap;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 6] = v->wkavg.grass_evap;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 7] = v->wkavg.litter_evap;
-		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 8] = v->wkavg.surfaceWater_evap;
-		SW_Output[eSW_EvapSurface].wk_row++;
-		break;
-		case eSW_Month:
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 2] = v->moavg.total_evap;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 3] = v->moavg.tree_evap;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 4] = v->moavg.shrub_evap;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 5] = v->moavg.forb_evap;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 6] = v->moavg.grass_evap;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 7] = v->moavg.litter_evap;
-		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 8] = v->moavg.surfaceWater_evap;
-		SW_Output[eSW_EvapSurface].mo_row++;
-		break;
-		case eSW_Year:
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 1] = v->yravg.total_evap;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 2] = v->yravg.tree_evap;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 3] = v->yravg.shrub_evap;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 4] = v->yravg.forb_evap;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 5] = v->yravg.grass_evap;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 6] = v->yravg.litter_evap;
-		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 7] = v->yravg.surfaceWater_evap;
-		SW_Output[eSW_EvapSurface].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_interception(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_Interception].period;
-	RealD val_tot = SW_MISSING, val_tree = SW_MISSING, val_forb = SW_MISSING,
-			val_shrub = SW_MISSING, val_grass = SW_MISSING, val_litter =
-					SW_MISSING;
-
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val_tot = v->dysum.total_int;
-		val_tree = v->dysum.tree_int;
-		val_forb = v->dysum.forb_int;
-		val_shrub = v->dysum.shrub_int;
-		val_grass = v->dysum.grass_int;
-		val_litter = v->dysum.litter_int;
-		break;
-	case eSW_Week:
-		val_tot = v->wkavg.total_int;
-		val_tree = v->wkavg.tree_int;
-		val_forb = v->wkavg.forb_int;
-		val_shrub = v->wkavg.shrub_int;
-		val_grass = v->wkavg.grass_int;
-		val_litter = v->wkavg.litter_int;
-		break;
-	case eSW_Month:
-		val_tot = v->moavg.total_int;
-		val_tree = v->moavg.tree_int;
-		val_forb = v->moavg.forb_int;
-		val_shrub = v->moavg.shrub_int;
-		val_grass = v->moavg.grass_int;
-		val_litter = v->moavg.litter_int;
-		break;
-	case eSW_Year:
-		val_tot = v->yravg.total_int;
-		val_tree = v->yravg.tree_int;
-		val_forb = v->yravg.forb_int;
-		val_shrub = v->yravg.shrub_int;
-		val_grass = v->yravg.grass_int;
-		val_litter = v->yravg.litter_int;
-		break;
-	}
-	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_tot, _Sep, val_tree, _Sep, val_shrub, _Sep, val_forb, _Sep, val_grass, _Sep, val_litter);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 2] = v->dysum.total_int;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 3] = v->dysum.tree_int;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 4] = v->dysum.shrub_int;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 5] = v->dysum.forb_int;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 6] = v->dysum.grass_int;
-		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 7] = v->dysum.litter_int;
-		SW_Output[eSW_Interception].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 2] = v->wkavg.total_int;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 3] = v->wkavg.tree_int;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 4] = v->wkavg.shrub_int;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 5] = v->wkavg.forb_int;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 6] = v->wkavg.grass_int;
-		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 7] = v->wkavg.litter_int;
-		SW_Output[eSW_Interception].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 2] = v->moavg.total_int;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 3] = v->moavg.tree_int;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 4] = v->moavg.shrub_int;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 5] = v->moavg.forb_int;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 6] = v->moavg.grass_int;
-		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 7] = v->moavg.litter_int;
-		SW_Output[eSW_Interception].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 1] = v->yravg.total_int;
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 2] = v->yravg.tree_int;
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 3] = v->yravg.shrub_int;
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 4] = v->yravg.forb_int;
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 5] = v->yravg.grass_int;
-		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 6] = v->yravg.litter_int;
-		SW_Output[eSW_Interception].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_soilinf(void)
-{
-	/* --------------------------------------------------- */
-	/* 20100202 (drs) added */
-	/* 20110219 (drs) added runoff */
-	/* 12/13/2012	(clk)	moved runoff, now named snowRunoff, to get_runoff(); */
-	SW_WEATHER *v = &SW_Weather;
-	OutPeriod pd = SW_Output[eSW_SoilInf].period;
-	RealD val_inf = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val_inf = v->dysum.soil_inf;
-		break;
-	case eSW_Week:
-		val_inf = v->wkavg.soil_inf;
-		break;
-	case eSW_Month:
-		val_inf = v->moavg.soil_inf;
-		break;
-	case eSW_Year:
-		val_inf = v->yravg.soil_inf;
-		break;
-	}
-	sprintf(str, "%c%7.6f", _Sep, val_inf);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rinfiltration_dy[SW_Output[eSW_SoilInf].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rinfiltration_dy[SW_Output[eSW_SoilInf].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rinfiltration_dy[SW_Output[eSW_SoilInf].dy_row + dy_nrow * 2] = v->dysum.soil_inf;
-		SW_Output[eSW_SoilInf].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rinfiltration_wk[SW_Output[eSW_SoilInf].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rinfiltration_wk[SW_Output[eSW_SoilInf].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rinfiltration_wk[SW_Output[eSW_SoilInf].wk_row + wk_nrow * 2] = v->wkavg.soil_inf;
-		SW_Output[eSW_SoilInf].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rinfiltration_mo[SW_Output[eSW_SoilInf].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rinfiltration_mo[SW_Output[eSW_SoilInf].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rinfiltration_mo[SW_Output[eSW_SoilInf].mo_row + mo_nrow * 2] = v->moavg.soil_inf;
-		SW_Output[eSW_SoilInf].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rinfiltration_yr[SW_Output[eSW_SoilInf].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rinfiltration_yr[SW_Output[eSW_SoilInf].yr_row + yr_nrow * 1] = v->yravg.soil_inf;
-		SW_Output[eSW_SoilInf].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_lyrdrain(void)
-{
-	/* --------------------------------------------------- */
-	/* 20100202 (drs) added */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_LyrDrain].period;
-	RealD val = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	for (i = 0; i < SW_Site.n_layers - 1; i++)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.lyrdrain[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.lyrdrain[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.lyrdrain[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.lyrdrain[i];
-			break;
-		}
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rpercolation_dy[SW_Output[eSW_LyrDrain].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rpercolation_dy[SW_Output[eSW_LyrDrain].dy_row + dy_nrow * 1] = SW_Model.doy;
-		for (i = 0; i < SW_Site.n_layers - 1; i++)
-		{
-			p_Rpercolation_dy[SW_Output[eSW_LyrDrain].dy_row + dy_nrow * (i + 2)] = v->dysum.lyrdrain[i];
-		}
-		SW_Output[eSW_LyrDrain].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rpercolation_wk[SW_Output[eSW_LyrDrain].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rpercolation_wk[SW_Output[eSW_LyrDrain].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		for (i = 0; i < SW_Site.n_layers - 1; i++)
-		{
-			p_Rpercolation_wk[SW_Output[eSW_LyrDrain].wk_row + wk_nrow * (i + 2)] = v->wkavg.lyrdrain[i];
-		}
-		SW_Output[eSW_LyrDrain].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rpercolation_mo[SW_Output[eSW_LyrDrain].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rpercolation_mo[SW_Output[eSW_LyrDrain].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		for (i = 0; i < SW_Site.n_layers - 1; i++)
-		{
-			p_Rpercolation_mo[SW_Output[eSW_LyrDrain].mo_row + mo_nrow * (i + 2)] = v->moavg.lyrdrain[i];
-		}
-		SW_Output[eSW_LyrDrain].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rpercolation_yr[SW_Output[eSW_LyrDrain].yr_row + yr_nrow * 0] = SW_Model.year;
-		for (i = 0; i < SW_Site.n_layers - 1; i++)
-		{
-			p_Rpercolation_yr[SW_Output[eSW_LyrDrain].yr_row + yr_nrow * (i + 1)] = v->yravg.lyrdrain[i];
-		}
-		SW_Output[eSW_LyrDrain].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_hydred(void)
-{
-	/* --------------------------------------------------- */
-	/* 20101020 (drs) added */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_HydRed].period;
-	RealD val = SW_MISSING;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	/* total output */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.hydred_total[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.hydred_total[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.hydred_total[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.hydred_total[i];
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-	/* tree output */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.hydred_tree[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.hydred_tree[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.hydred_tree[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.hydred_tree[i];
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-	/* shrub output */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.hydred_shrub[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.hydred_shrub[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.hydred_shrub[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.hydred_shrub[i];
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-	/* forb output */ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.hydred_forb[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.hydred_forb[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.hydred_forb[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.hydred_forb[i];
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-	/* grass output */
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.hydred_grass[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.hydred_grass[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.hydred_grass[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.hydred_grass[i];
-			break;
-		}
-
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	/* Date Info output */
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * 1] = SW_Model.doy;
-		break;
-		case eSW_Week:
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		break;
-		case eSW_Month:
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		break;
-		case eSW_Year:
-		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * 0] = SW_Model.year;
-		break;
-	}
-
-	/* total output */
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 0)] = v->dysum.hydred_total[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 0)] = v->wkavg.hydred_total[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 0)] = v->moavg.hydred_total[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 0)] = v->yravg.hydred_total[i];
-		break;
-	}
-
-	/* tree output */
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 1)] = v->dysum.hydred_tree[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 1)] = v->wkavg.hydred_tree[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 1)] = v->moavg.hydred_tree[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 1)] = v->yravg.hydred_tree[i];
-		break;
-	}
-
-	/* shrub output */
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 2)] = v->dysum.hydred_shrub[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 2)] = v->wkavg.hydred_shrub[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 2)] = v->moavg.hydred_shrub[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 2)] = v->yravg.hydred_shrub[i];
-		break;
-	}
-
-	/* forb output */
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 3)] = v->dysum.hydred_forb[i];
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 3)] = v->wkavg.hydred_forb[i];
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 3)] = v->moavg.hydred_forb[i];
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 3)] = v->yravg.hydred_forb[i];
-		break;
-	}
-
-	/* grass output */
-	switch (pd)
-	{
-		case eSW_Day:
-		ForEachSoilLayer(i)
-		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 4)] = v->dysum.hydred_grass[i];
-		SW_Output[eSW_HydRed].dy_row++;
-		break;
-		case eSW_Week:
-		ForEachSoilLayer(i)
-		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 4)] = v->wkavg.hydred_grass[i];
-		SW_Output[eSW_HydRed].wk_row++;
-		break;
-		case eSW_Month:
-		ForEachSoilLayer(i)
-		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 4)] = v->moavg.hydred_grass[i];
-		SW_Output[eSW_HydRed].mo_row++;
-		break;
-		case eSW_Year:
-		ForEachSoilLayer(i)
-		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 4)] = v->yravg.hydred_grass[i];
-		SW_Output[eSW_HydRed].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_aet(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_AET].period;
-	RealD val = SW_MISSING;
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	char str[20];
-#elif defined(STEPWAT)
-	char str[20];
-#endif
-
-#ifndef RSOILWAT
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val = v->dysum.aet;
-		break;
-	case eSW_Week:
-		val = v->wkavg.aet;
-		break;
-	case eSW_Month:
-		val = v->moavg.aet;
-		break;
-	case eSW_Year:
-		val = v->yravg.aet;
-		break;
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Raet_dy[SW_Output[eSW_AET].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Raet_dy[SW_Output[eSW_AET].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Raet_dy[SW_Output[eSW_AET].dy_row + dy_nrow * 2] = v->dysum.aet;
-		SW_Output[eSW_AET].dy_row++;
-		break;
-		case eSW_Week:
-		p_Raet_wk[SW_Output[eSW_AET].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Raet_wk[SW_Output[eSW_AET].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Raet_wk[SW_Output[eSW_AET].wk_row + wk_nrow * 2] = v->wkavg.aet;
-		SW_Output[eSW_AET].wk_row++;
-		break;
-		case eSW_Month:
-		p_Raet_mo[SW_Output[eSW_AET].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Raet_mo[SW_Output[eSW_AET].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Raet_mo[SW_Output[eSW_AET].mo_row + mo_nrow * 2] = v->moavg.aet;
-		SW_Output[eSW_AET].mo_row++;
-		break;
-		case eSW_Year:
-		p_Raet_yr[SW_Output[eSW_AET].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Raet_yr[SW_Output[eSW_AET].yr_row + yr_nrow * 1] = v->yravg.aet;
-		SW_Output[eSW_AET].yr_row++;
-		break;
-	}
-#endif
-
-#if !defined(STEPWAT) && !defined(RSOILWAT)
-	sprintf(str, "%c%7.6f", _Sep, val);
-	strcat(outstr, str);
-#elif defined(STEPWAT)
-	if (isPartialSoilwatOutput == FALSE)
-	{
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-	else
-	{
-		SXW.aet += val;
-	}
-#endif
-}
-
-static void get_pet(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_PET].period;
-	RealD val = SW_MISSING;
-#ifndef RSOILWAT
-	char str[20];
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val = v->dysum.pet;
-		break;
-	case eSW_Week:
-		val = v->wkavg.pet;
-		break;
-	case eSW_Month:
-		val = v->moavg.pet;
-		break;
-	case eSW_Year:
-		val = v->yravg.pet;
-		break;
-	}
-	sprintf(str, "%c%7.6f", _Sep, val);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rpet_dy[SW_Output[eSW_PET].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rpet_dy[SW_Output[eSW_PET].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rpet_dy[SW_Output[eSW_PET].dy_row + dy_nrow * 2] = v->dysum.pet;
-		SW_Output[eSW_PET].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rpet_wk[SW_Output[eSW_PET].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rpet_wk[SW_Output[eSW_PET].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rpet_wk[SW_Output[eSW_PET].wk_row + wk_nrow * 2] = v->wkavg.pet;
-		SW_Output[eSW_PET].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rpet_mo[SW_Output[eSW_PET].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rpet_mo[SW_Output[eSW_PET].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rpet_mo[SW_Output[eSW_PET].mo_row + mo_nrow * 2] = v->moavg.pet;
-		SW_Output[eSW_PET].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rpet_yr[SW_Output[eSW_PET].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rpet_yr[SW_Output[eSW_PET].yr_row + yr_nrow * 1] = v->yravg.pet;
-		SW_Output[eSW_PET].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_wetdays(void)
-{
-	/* --------------------------------------------------- */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_WetDays].period;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	int val = 99;
-	get_outstrleader(pd);
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = (v->is_wet[i]) ? 1 : 0;
-			break;
-		case eSW_Week:
-			val = (int) v->wkavg.wetdays[i];
-			break;
-		case eSW_Month:
-			val = (int) v->moavg.wetdays[i];
-			break;
-		case eSW_Year:
-			val = (int) v->yravg.wetdays[i];
-			break;
-		}
-		sprintf(str, "%c%i", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rwetdays_dy[SW_Output[eSW_WetDays].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rwetdays_dy[SW_Output[eSW_WetDays].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		{
-			p_Rwetdays_dy[SW_Output[eSW_WetDays].dy_row + dy_nrow * (i + 2)] = (v->is_wet[i]) ? 1 : 0;
-		}
-		SW_Output[eSW_WetDays].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rwetdays_wk[SW_Output[eSW_WetDays].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rwetdays_wk[SW_Output[eSW_WetDays].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			p_Rwetdays_wk[SW_Output[eSW_WetDays].wk_row + wk_nrow * (i + 2)] = (int) v->wkavg.wetdays[i];
-		}
-		SW_Output[eSW_WetDays].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rwetdays_mo[SW_Output[eSW_WetDays].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rwetdays_mo[SW_Output[eSW_WetDays].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			p_Rwetdays_mo[SW_Output[eSW_WetDays].mo_row + mo_nrow * (i + 2)] = (int) v->moavg.wetdays[i];
-		}
-		SW_Output[eSW_WetDays].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rwetdays_yr[SW_Output[eSW_WetDays].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		{
-			p_Rwetdays_yr[SW_Output[eSW_WetDays].yr_row + yr_nrow * (i + 1)] = (int) v->yravg.wetdays[i];
-		}
-		SW_Output[eSW_WetDays].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_snowpack(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SnowPack].period;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	RealD val_swe = SW_MISSING, val_depth = SW_MISSING;
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val_swe = v->dysum.snowpack;
-		val_depth = v->dysum.snowdepth;
-		break;
-	case eSW_Week:
-		val_swe = v->wkavg.snowpack;
-		val_depth = v->wkavg.snowdepth;
-		break;
-	case eSW_Month:
-		val_swe = v->moavg.snowpack;
-		val_depth = v->moavg.snowdepth;
-		break;
-	case eSW_Year:
-		val_swe = v->yravg.snowpack;
-		val_depth = v->yravg.snowdepth;
-		break;
-	}
-	sprintf(str, "%c%7.6f%c%7.6f", _Sep, val_swe, _Sep, val_depth);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 2] = v->dysum.snowpack;
-		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 3] = v->dysum.snowdepth;
-		SW_Output[eSW_SnowPack].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 2] = v->wkavg.snowpack;
-		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 3] = v->wkavg.snowdepth;
-		SW_Output[eSW_SnowPack].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 2] = v->moavg.snowpack;
-		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 3] = v->moavg.snowdepth;
-		SW_Output[eSW_SnowPack].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rsnowpack_yr[SW_Output[eSW_SnowPack].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rsnowpack_yr[SW_Output[eSW_SnowPack].yr_row + yr_nrow * 1] = v->yravg.snowpack;
-		p_Rsnowpack_yr[SW_Output[eSW_SnowPack].yr_row + yr_nrow * 2] = v->yravg.snowdepth;
-		SW_Output[eSW_SnowPack].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_deepswc(void)
-{
-	/* --------------------------------------------------- */
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_DeepSWC].period;
-#ifndef RSOILWAT
-	char str[OUTSTRLEN];
-	RealD val = SW_MISSING;
-	get_outstrleader(pd);
-	switch (pd)
-	{
-	case eSW_Day:
-		val = v->dysum.deep;
-		break;
-	case eSW_Week:
-		val = v->wkavg.deep;
-		break;
-	case eSW_Month:
-		val = v->moavg.deep;
-		break;
-	case eSW_Year:
-		val = v->yravg.deep;
-		break;
-	}
-	sprintf(str, "%c%7.6f", _Sep, val);
-	strcat(outstr, str);
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rdeep_drain_dy[SW_Output[eSW_DeepSWC].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rdeep_drain_dy[SW_Output[eSW_DeepSWC].dy_row + dy_nrow * 1] = SW_Model.doy;
-		p_Rdeep_drain_dy[SW_Output[eSW_DeepSWC].dy_row + dy_nrow * 2] = v->dysum.deep;
-		SW_Output[eSW_DeepSWC].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rdeep_drain_wk[SW_Output[eSW_DeepSWC].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rdeep_drain_wk[SW_Output[eSW_DeepSWC].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		p_Rdeep_drain_wk[SW_Output[eSW_DeepSWC].wk_row + wk_nrow * 2] = v->wkavg.deep;
-		SW_Output[eSW_DeepSWC].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rdeep_drain_mo[SW_Output[eSW_DeepSWC].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rdeep_drain_mo[SW_Output[eSW_DeepSWC].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		p_Rdeep_drain_mo[SW_Output[eSW_DeepSWC].mo_row + mo_nrow * 2] = v->moavg.deep;
-		SW_Output[eSW_DeepSWC].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rdeep_drain_yr[SW_Output[eSW_DeepSWC].yr_row + yr_nrow * 0] = SW_Model.year;
-		p_Rdeep_drain_yr[SW_Output[eSW_DeepSWC].yr_row + yr_nrow * 1] = v->yravg.deep;
-		SW_Output[eSW_DeepSWC].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void get_soiltemp(void)
-{
-	/* --------------------------------------------------- */
-	LyrIndex i;
-	SW_SOILWAT *v = &SW_Soilwat;
-	OutPeriod pd = SW_Output[eSW_SoilTemp].period;
-#ifndef RSOILWAT
-	RealD val = SW_MISSING;
-	char str[OUTSTRLEN];
-	get_outstrleader(pd);
-	ForEachSoilLayer(i)
-	{
-		switch (pd)
-		{
-		case eSW_Day:
-			val = v->dysum.sTemp[i];
-			break;
-		case eSW_Week:
-			val = v->wkavg.sTemp[i];
-			break;
-		case eSW_Month:
-			val = v->moavg.sTemp[i];
-			break;
-		case eSW_Year:
-			val = v->yravg.sTemp[i];
-			break;
-		}
-		sprintf(str, "%c%7.6f", _Sep, val);
-		strcat(outstr, str);
-	}
-#else
-	switch (pd)
-	{
-		case eSW_Day:
-		p_Rsoil_temp_dy[SW_Output[eSW_SoilTemp].dy_row + dy_nrow * 0] = SW_Model.year;
-		p_Rsoil_temp_dy[SW_Output[eSW_SoilTemp].dy_row + dy_nrow * 1] = SW_Model.doy;
-		ForEachSoilLayer(i)
-		{
-			p_Rsoil_temp_dy[SW_Output[eSW_SoilTemp].dy_row + dy_nrow * (i + 2)] = v->dysum.sTemp[i];
-		}
-		SW_Output[eSW_SoilTemp].dy_row++;
-		break;
-		case eSW_Week:
-		p_Rsoil_temp_wk[SW_Output[eSW_SoilTemp].wk_row + wk_nrow * 0] = SW_Model.year;
-		p_Rsoil_temp_wk[SW_Output[eSW_SoilTemp].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			p_Rsoil_temp_wk[SW_Output[eSW_SoilTemp].wk_row + wk_nrow * (i + 2)] = v->wkavg.sTemp[i];
-		}
-		SW_Output[eSW_SoilTemp].wk_row++;
-		break;
-		case eSW_Month:
-		p_Rsoil_temp_mo[SW_Output[eSW_SoilTemp].mo_row + mo_nrow * 0] = SW_Model.year;
-		p_Rsoil_temp_mo[SW_Output[eSW_SoilTemp].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
-		ForEachSoilLayer(i)
-		{
-			p_Rsoil_temp_mo[SW_Output[eSW_SoilTemp].mo_row + mo_nrow * (i + 2)] = v->moavg.sTemp[i];
-		}
-		SW_Output[eSW_SoilTemp].mo_row++;
-		break;
-		case eSW_Year:
-		p_Rsoil_temp_yr[SW_Output[eSW_SoilTemp].yr_row + yr_nrow * 0] = SW_Model.year;
-		ForEachSoilLayer(i)
-		{
-			p_Rsoil_temp_yr[SW_Output[eSW_SoilTemp].yr_row + yr_nrow * (i + 1)] = v->yravg.sTemp[i];
-		}
-		SW_Output[eSW_SoilTemp].yr_row++;
-		break;
-	}
-#endif
-}
-
-static void sumof_ves(SW_VEGESTAB *v, SW_VEGESTAB_OUTPUTS *s, OutKey k)
-{
-	/* --------------------------------------------------- */
-	/* k is always eSW_Estab, and this only gets called yearly */
-	/* in fact, there's nothing to do here as the get_estab()
-	 * function does everything needed.  This stub is here only
-	 * to facilitate the loop everything else uses.
-	 * That is, until we need to start outputting as-yet-unknown
-	 * establishment variables.
-	 */
-
-// just a few lines of nonsense to supress the compile warnings, doesn't actually do anything
-	if (&v == &v)
-		if (&s == &s)
-			if (k != 0)
-				return;
-
-}
-
-static void sumof_wth(SW_WEATHER *v, SW_WEATHER_OUTPUTS *s, OutKey k)
-{
-	/* --------------------------------------------------- */
-	/* 	20091015 (drs) ppt is divided into rain and snow and all three values are output into precip */
-
-	switch (k)
-	{
-
-	case eSW_Temp:
-		s->temp_max += v->now.temp_max[Today];
-		s->temp_min += v->now.temp_min[Today];
-		s->temp_avg += v->now.temp_avg[Today];
-		//added surfaceTemp for sum
-		s->surfaceTemp += v->surfaceTemp;
-		break;
-	case eSW_Precip:
-		s->ppt += v->now.ppt[Today];
-		s->rain += v->now.rain[Today];
-		s->snow += v->now.snow[Today];
-		s->snowmelt += v->now.snowmelt[Today];
-		s->snowloss += v->now.snowloss[Today];
-		break;
-	case eSW_SoilInf:
-		s->soil_inf += v->soil_inf;
-		break;
-	case eSW_Runoff:
-		s->snowRunoff += v->snowRunoff;
-		s->surfaceRunoff += v->surfaceRunoff;
-		break;
-	default:
-		LogError(stderr, LOGFATAL, "PGMR: Invalid key in sumof_wth(%s)", key2str[k]);
-	}
-
-}
-
-static void sumof_swc(SW_SOILWAT *v, SW_SOILWAT_OUTPUTS *s, OutKey k)
-{
-	/* --------------------------------------------------- */
-	LyrIndex i;
-
-	switch (k)
-	{
-
-	case eSW_VWCBulk: /* get swcBulk and convert later */
-		ForEachSoilLayer(i)
-			s->vwcBulk[i] += v->swcBulk[Today][i];
-		break;
-
-	case eSW_VWCMatric: /* get swcBulk and convert later */
-		ForEachSoilLayer(i)
-			s->vwcMatric[i] += v->swcBulk[Today][i];
-		break;
-
-	case eSW_SWCBulk:
-		ForEachSoilLayer(i)
-			s->swcBulk[i] += v->swcBulk[Today][i];
-		break;
-
-	case eSW_SWPMatric: /* can't avg swp so get swcBulk and convert later */
-		ForEachSoilLayer(i)
-			s->swpMatric[i] += v->swcBulk[Today][i];
-		break;
-
-	case eSW_SWABulk:
-		ForEachSoilLayer(i)
-			s->swaBulk[i] += fmax(
-					v->swcBulk[Today][i] - SW_Site.lyr[i]->swcBulk_wiltpt, 0.);
-		break;
-
-	case eSW_SWAMatric: /* get swaBulk and convert later */
-		ForEachSoilLayer(i)
-			s->swaMatric[i] += fmax(
-					v->swcBulk[Today][i] - SW_Site.lyr[i]->swcBulk_wiltpt, 0.);
-		break;
-
-	case eSW_SurfaceWater:
-		s->surfaceWater += v->surfaceWater;
-		break;
-
-	case eSW_Transp:
-		ForEachSoilLayer(i)
-		{
-			s->transp_total[i] += v->transpiration_tree[i]
-					+ v->transpiration_forb[i] + v->transpiration_shrub[i]
-					+ v->transpiration_grass[i];
-			s->transp_tree[i] += v->transpiration_tree[i];
-			s->transp_shrub[i] += v->transpiration_shrub[i];
-			s->transp_forb[i] += v->transpiration_forb[i];
-			s->transp_grass[i] += v->transpiration_grass[i];
-		}
-		break;
-
-	case eSW_EvapSoil:
-		ForEachEvapLayer(i)
-			s->evap[i] += v->evaporation[i];
-		break;
-
-	case eSW_EvapSurface:
-		s->total_evap += v->tree_evap + v->forb_evap + v->shrub_evap
-				+ v->grass_evap + v->litter_evap + v->surfaceWater_evap;
-		s->tree_evap += v->tree_evap;
-		s->shrub_evap += v->shrub_evap;
-		s->forb_evap += v->forb_evap;
-		s->grass_evap += v->grass_evap;
-		s->litter_evap += v->litter_evap;
-		s->surfaceWater_evap += v->surfaceWater_evap;
-		break;
-
-	case eSW_Interception:
-		s->total_int += v->tree_int + v->forb_int + v->shrub_int + v->grass_int
-				+ v->litter_int;
-		s->tree_int += v->tree_int;
-		s->shrub_int += v->shrub_int;
-		s->forb_int += v->forb_int;
-		s->grass_int += v->grass_int;
-		s->litter_int += v->litter_int;
-		break;
-
-	case eSW_LyrDrain:
-		for (i = 0; i < SW_Site.n_layers - 1; i++)
-			s->lyrdrain[i] += v->drain[i];
-		break;
-
-	case eSW_HydRed:
-		ForEachSoilLayer(i)
-		{
-			s->hydred_total[i] += v->hydred_tree[i] + v->hydred_forb[i]
-					+ v->hydred_shrub[i] + v->hydred_grass[i];
-			s->hydred_tree[i] += v->hydred_tree[i];
-			s->hydred_shrub[i] += v->hydred_shrub[i];
-			s->hydred_forb[i] += v->hydred_forb[i];
-			s->hydred_grass[i] += v->hydred_grass[i];
-		}
-		break;
-
-	case eSW_AET:
-		s->aet += v->aet;
-		break;
-
-	case eSW_PET:
-		s->pet += v->pet;
-		break;
-
-	case eSW_WetDays:
-		ForEachSoilLayer(i)
-			if (v->is_wet[i])
-				s->wetdays[i]++;
-		break;
-
-	case eSW_SnowPack:
-		s->snowpack += v->snowpack[Today];
-		s->snowdepth += v->snowdepth;
-		break;
-
-	case eSW_DeepSWC:
-		s->deep += v->swcBulk[Today][SW_Site.deep_lyr];
-		break;
-
-	case eSW_SoilTemp:
-		ForEachSoilLayer(i)
-			s->sTemp[i] += v->sTemp[i];
-		break;
-
-	default:
-		LogError(stderr, LOGFATAL, "PGMR: Invalid key in sumof_swc(%s)", key2str[k]);
-	}
-}
-
-static void average_for(ObjType otyp, OutPeriod pd)
-{
-	/* --------------------------------------------------- */
-	/* separates the task of obtaining a periodic average.
-	 * no need to average days, so this should never be
-	 * called with eSW_Day.
-	 * Enter this routine just after the summary period
-	 * is completed, so the current week and month will be
-	 * one greater than the period being summarized.
-	 */
-	/* 	20091015 (drs) ppt is divided into rain and snow and all three values are output into precip */
-	SW_SOILWAT_OUTPUTS *savg = NULL, *ssumof = NULL;
-	SW_WEATHER_OUTPUTS *wavg = NULL, *wsumof = NULL;
-	TimeInt curr_pd = 0;
-	RealD div = 0.; /* if sumtype=AVG, days in period; if sumtype=SUM, 1 */
-	OutKey k;
-	LyrIndex i;
-	int j;
-
-	if (!(otyp == eSWC || otyp == eWTH))
-		LogError(stdout, LOGFATAL, "Invalid object type in OUT_averagefor().");
-
-	ForEachOutKey(k)
-	{
-		for (j = 0; j < numPeriods; j++)
-		{ /* loop through this code for as many periods that are being used */
-			if (!SW_Output[k].use)
-				continue;
-			if (timeSteps[k][j] < 4)
-			{
-				SW_Output[k].period = timeSteps[k][j]; /* set the period to use based on the iteration of the for loop */
-				switch (pd)
-				{
-				case eSW_Week:
-					curr_pd = (SW_Model.week + 1) - tOffset;
-					savg = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.wkavg;
-					ssumof = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.wksum;
-					wavg = (SW_WEATHER_OUTPUTS *) &SW_Weather.wkavg;
-					wsumof = (SW_WEATHER_OUTPUTS *) &SW_Weather.wksum;
-					div = (bFlush) ? SW_Model.lastdoy % WKDAYS : WKDAYS;
-					break;
-
-				case eSW_Month:
-					curr_pd = (SW_Model.month + 1) - tOffset;
-					savg = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.moavg;
-					ssumof = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.mosum;
-					wavg = (SW_WEATHER_OUTPUTS *) &SW_Weather.moavg;
-					wsumof = (SW_WEATHER_OUTPUTS *) &SW_Weather.mosum;
-					div = Time_days_in_month(SW_Model.month - tOffset);
-					break;
-
-				case eSW_Year:
-					curr_pd = SW_Output[k].first;
-					savg = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.yravg;
-					ssumof = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.yrsum;
-					wavg = (SW_WEATHER_OUTPUTS *) &SW_Weather.yravg;
-					wsumof = (SW_WEATHER_OUTPUTS *) &SW_Weather.yrsum;
-					div = SW_Output[k].last - SW_Output[k].first + 1;
-					break;
-
-				default:
-					LogError(stdout, LOGFATAL, "Programmer: Invalid period in average_for().");
-				} /* end switch(pd) */
-
-				if (SW_Output[k].period != pd || SW_Output[k].myobj != otyp
-						|| curr_pd < SW_Output[k].first
-						|| curr_pd > SW_Output[k].last)
-					continue;
-
-				if (SW_Output[k].sumtype == eSW_Sum)
-					div = 1.;
-
-				/* notice that all valid keys are in this switch */
-				switch (k)
-				{
-
-				case eSW_Temp:
-					wavg->temp_max = wsumof->temp_max / div;
-					wavg->temp_min = wsumof->temp_min / div;
-					wavg->temp_avg = wsumof->temp_avg / div;
-					//added surfaceTemp for avg operation
-					wavg->surfaceTemp = wsumof->surfaceTemp / div;
-					break;
-
-				case eSW_Precip:
-					wavg->ppt = wsumof->ppt / div;
-					wavg->rain = wsumof->rain / div;
-					wavg->snow = wsumof->snow / div;
-					wavg->snowmelt = wsumof->snowmelt / div;
-					wavg->snowloss = wsumof->snowloss / div;
-					break;
-
-				case eSW_SoilInf:
-					wavg->soil_inf = wsumof->soil_inf / div;
-					break;
-
-				case eSW_Runoff:
-					wavg->snowRunoff = wsumof->snowRunoff / div;
-					wavg->surfaceRunoff = wsumof->surfaceRunoff / div;
-					break;
-
-				case eSW_SoilTemp:
-					ForEachSoilLayer(i)
-						savg->sTemp[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										SW_Soilwat.sTemp[i] :
-										ssumof->sTemp[i] / div;
-					break;
-
-				case eSW_VWCBulk:
-					ForEachSoilLayer(i)
-						/* vwcBulk at this point is identical to swcBulk */
-						savg->vwcBulk[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										SW_Soilwat.swcBulk[Yesterday][i] :
-										ssumof->vwcBulk[i] / div;
-					break;
-
-				case eSW_VWCMatric:
-					ForEachSoilLayer(i)
-						/* vwcMatric at this point is identical to swcBulk */
-						savg->vwcMatric[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										SW_Soilwat.swcBulk[Yesterday][i] :
-										ssumof->vwcMatric[i] / div;
-					break;
-
-				case eSW_SWCBulk:
-					ForEachSoilLayer(i)
-						savg->swcBulk[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										SW_Soilwat.swcBulk[Yesterday][i] :
-										ssumof->swcBulk[i] / div;
-					break;
-
-				case eSW_SWPMatric:
-					ForEachSoilLayer(i)
-						/* swpMatric at this point is identical to swcBulk */
-						savg->swpMatric[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										SW_Soilwat.swcBulk[Yesterday][i] :
-										ssumof->swpMatric[i] / div;
-					break;
-
-				case eSW_SWABulk:
-					ForEachSoilLayer(i)
-						savg->swaBulk[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										fmax(
-												SW_Soilwat.swcBulk[Yesterday][i]
-														- SW_Site.lyr[i]->swcBulk_wiltpt,
-												0.) :
-										ssumof->swaBulk[i] / div;
-					break;
-
-				case eSW_SWAMatric: /* swaMatric at this point is identical to swaBulk */
-					ForEachSoilLayer(i)
-						savg->swaMatric[i] =
-								(SW_Output[k].sumtype == eSW_Fnl) ?
-										fmax(
-												SW_Soilwat.swcBulk[Yesterday][i]
-														- SW_Site.lyr[i]->swcBulk_wiltpt,
-												0.) :
-										ssumof->swaMatric[i] / div;
-					break;
-
-				case eSW_DeepSWC:
-					savg->deep =
-							(SW_Output[k].sumtype == eSW_Fnl) ?
-									SW_Soilwat.swcBulk[Yesterday][SW_Site.deep_lyr] :
-									ssumof->deep / div;
-					break;
-
-				case eSW_SurfaceWater:
-					savg->surfaceWater = ssumof->surfaceWater / div;
-					break;
-
-				case eSW_Transp:
-					ForEachSoilLayer(i)
-					{
-						savg->transp_total[i] = ssumof->transp_total[i] / div;
-						savg->transp_tree[i] = ssumof->transp_tree[i] / div;
-						savg->transp_shrub[i] = ssumof->transp_shrub[i] / div;
-						savg->transp_forb[i] = ssumof->transp_forb[i] / div;
-						savg->transp_grass[i] = ssumof->transp_grass[i] / div;
-					}
-					break;
-
-				case eSW_EvapSoil:
-					ForEachEvapLayer(i)
-						savg->evap[i] = ssumof->evap[i] / div;
-					break;
-
-				case eSW_EvapSurface:
-					savg->total_evap = ssumof->total_evap / div;
-					savg->tree_evap = ssumof->tree_evap / div;
-					savg->shrub_evap = ssumof->shrub_evap / div;
-					savg->forb_evap = ssumof->forb_evap / div;
-					savg->grass_evap = ssumof->grass_evap / div;
-					savg->litter_evap = ssumof->litter_evap / div;
-					savg->surfaceWater_evap = ssumof->surfaceWater_evap / div;
-					break;
-
-				case eSW_Interception:
-					savg->total_int = ssumof->total_int / div;
-					savg->tree_int = ssumof->tree_int / div;
-					savg->shrub_int = ssumof->shrub_int / div;
-					savg->forb_int = ssumof->forb_int / div;
-					savg->grass_int = ssumof->grass_int / div;
-					savg->litter_int = ssumof->litter_int / div;
-					break;
-
-				case eSW_AET:
-					savg->aet = ssumof->aet / div;
-					break;
-
-				case eSW_LyrDrain:
-					for (i = 0; i < SW_Site.n_layers - 1; i++)
-						savg->lyrdrain[i] = ssumof->lyrdrain[i] / div;
-					break;
-
-				case eSW_HydRed:
-					ForEachSoilLayer(i)
-					{
-						savg->hydred_total[i] = ssumof->hydred_total[i] / div;
-						savg->hydred_tree[i] = ssumof->hydred_tree[i] / div;
-						savg->hydred_shrub[i] = ssumof->hydred_shrub[i] / div;
-						savg->hydred_forb[i] = ssumof->hydred_forb[i] / div;
-						savg->hydred_grass[i] = ssumof->hydred_grass[i] / div;
-					}
-					break;
-
-				case eSW_PET:
-					savg->pet = ssumof->pet / div;
-					break;
-
-				case eSW_WetDays:
-					ForEachSoilLayer(i)
-						savg->wetdays[i] = ssumof->wetdays[i] / div;
-					break;
-
-				case eSW_SnowPack:
-					savg->snowpack = ssumof->snowpack / div;
-					savg->snowdepth = ssumof->snowdepth / div;
-					break;
-
-				case eSW_Estab: /* do nothing, no averaging required */
-					break;
-
-				case eSW_CO2Effects: /* do nothing, no averaging required */
-					break;
-
-				default:
-
-					LogError(stderr, LOGFATAL, "PGMR: Invalid key in average_for(%s)", key2str[k]);
-				}
-			}
-		} /* end of for loop */
-	} /* end ForEachKey */
-}
-
-static void collect_sums(ObjType otyp, OutPeriod op)
-{
-	/* --------------------------------------------------- */
-
-	SW_SOILWAT *s = &SW_Soilwat;
-	SW_SOILWAT_OUTPUTS *ssum = NULL;
-	SW_WEATHER *w = &SW_Weather;
-	SW_WEATHER_OUTPUTS *wsum = NULL;
-	SW_VEGESTAB *v = &SW_VegEstab; /* vegestab only gets summed yearly */
-	SW_VEGESTAB_OUTPUTS *vsum = NULL;
-
-	TimeInt pd = 0;
-	OutKey k;
-
-	ForEachOutKey(k)
-	{
-		if (otyp != SW_Output[k].myobj || !SW_Output[k].use)
-			continue;
-		switch (op)
-		{
-		case eSW_Day:
-			pd = SW_Model.doy;
-			ssum = &s->dysum;
-			wsum = &w->dysum;
-			break;
-		case eSW_Week:
-			pd = SW_Model.week + 1;
-			ssum = &s->wksum;
-			wsum = &w->wksum;
-			break;
-		case eSW_Month:
-			pd = SW_Model.month + 1;
-			ssum = &s->mosum;
-			wsum = &w->mosum;
-			break;
-		case eSW_Year:
-			pd = SW_Model.doy;
-			ssum = &s->yrsum;
-			wsum = &w->yrsum;
-			vsum = &v->yrsum; /* yearly, y'see */
-			break;
-		default:
-			LogError(logfp, LOGFATAL, "PGMR: Invalid outperiod in collect_sums()");
-		}
-
-		if (pd >= SW_Output[k].first && pd <= SW_Output[k].last)
-		{
-			switch (otyp)
-			{
-			case eSWC:
-				sumof_swc(s, ssum, k);
-				break;
-			case eWTH:
-				sumof_wth(w, wsum, k);
-				break;
-			case eVES:
-				sumof_ves(v, vsum, k);
-				break;
-			default:
-				break;
-			}
-		}
-
-	} /* end ForEachOutKey */
-}
-
-static void _echo_outputs(void)
-{
-	/* --------------------------------------------------- */
-
-	OutKey k;
-
-	strcpy(errstr, "\n===============================================\n"
-			"  Output Configuration:\n");
-	ForEachOutKey(k)
-	{
-		if (!SW_Output[k].use)
-			continue;
-		strcat(errstr, "---------------------------\nKey ");
-		strcat(errstr, key2str[k]);
-		strcat(errstr, "\n\tSummary Type: ");
-		strcat(errstr, styp2str[SW_Output[k].sumtype]);
-		strcat(errstr, "\n\tOutput Period: ");
-		strcat(errstr, pd2str[SW_Output[k].period]);
-		sprintf(outstr, "\n\tStart period: %d", SW_Output[k].first_orig);
-		strcat(errstr, outstr);
-		sprintf(outstr, "\n\tEnd period  : %d", SW_Output[k].last_orig);
-		strcat(errstr, outstr);
-		strcat(errstr, "\n\tOutput File: ");
-		strcat(errstr, SW_Output[k].outfile);
-		strcat(errstr, "\n");
-	}
-
-	strcat(errstr, "\n----------  End of Output Configuration ---------- \n");
-	LogError(logfp, LOGNOTE, errstr);
-
-}
-
-#ifdef DEBUG_MEM
-#include "myMemory.h"
-/*======================================================*/
-void SW_OUT_SetMemoryRefs( void)
-{
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-	 This routine sets the known memory refs in this module
-	 so they can be  checked for leaks, etc.  Includes
-	 malloc-ed memory in SOILWAT.  All refs will have been
-	 cleared by a call to ClearMemoryRefs() before this, and
-	 will be checked via CheckMemoryRefs() after this, most
-	 likely in the main() function.
-	 */
-	OutKey k;
-
-	ForEachOutKey(k)
-	{
-		if (SW_Output[k].use)
-		NoteMemoryRef(SW_Output[k].outfile);
-	}
-
-}
-
-#endif
-
-/*==================================================================
-
- Description of the algorithm.
-
- There is a structure array (SW_OUTPUT) that contains the
- information from the outsetup.in file. This structure is filled in
- the initialization process by matching defined macros of valid keys
- with enumeration variables used as indices into the structure
- array.  A similar combination of text macros and enumeration
- constants handles the TIMEPERIOD conversion from text to numeric
- index.
-
- Each structure element of the array contains the output period
- code, start and end values, output file name, opened file pointer
- for output, on/off status, and a pointer to the function that
- prepares a complete line of formatted output per output period.
-
- A _construct() function clears the entire structure array to set
- values and flags to zero, and then assigns each specific print
- function name to the associated element's print function pointer.
- This allows the print function to be called via a simple loop that
- runs through all of the output keys.  Those output objects that are
- turned off are ignored and the print function is not called.  Thus,
- to add a new output variable, a new print function must be added to
- the loop in addition to adding the new macro and enumeration keys
- for it.  Oh, and a line or two of summarizing code.
-
- After initialization, each valid output key has an element in the
- structure array that "knows" its parameters and whether it is on or
- off.  There is still space allocated for the "off" keys but they
- are ignored by the use flag.
-
- During the daily execution loop of the model, values for each of
- the output objects are accumulated via a call to
- SW_OUT_sum_today(x) function with x being a special enumeration
- code that defines the actual module object to be summed (see
- SW_Output.h).  This enumeration code breaks up the many output
- variables into a few simple types so that adding a new output
- variable is simplified by putting it into its proper category.
-
- When the _sum_today() function is called, it calls the averaging
- function which puts the sum, average, etc into the output
- accumulators--(dy|wk|mo|yr)avg--then conditionally clears the
- summary accumulators--(dy|wk|mo|yr)sum--if a new period has
- occurred (in preparation for the new period), then calls the
- function to handle collecting the summaries called collect_sums().
-
- The collect_sums() function needs the object type (eg, eSWC, eWTH)
- and the output period (eg, dy, wk, etc) and then, for each valid
- output key, it assigns a pointer to the appropriate object's
- summary sub-structure.  (This is where the complexity of this
- approach starts to become a bit clumsy, but it nonetheless tends to
- keep the overall code size down.) After assigning the pointer to
- the summary structure, the pointers are passed to a routine to
- actually do the accumulation for the various output objects
- (currently SWC and WTH).  No other arithmetic is performed here.
- This routine is only called, however, if the current day or period
- falls within the range specified by the user.  Otherwise, the
- accumulators will remain zero.  Also, the period check is used in
- other places to determine whether to bother with averaging and
- printing.
-
- Once a period other than daily has passed, the accumulated values
- are averaged or summed as appropriate within the average_for()
- subroutine as mentioned above.
-
- After the averaging function, the values are ready to format for
- output.  The SW_OUT_write_today() routine is called from the
- end_day() function in main().  Any quantities that have finished
- their period by the current day are written out.  This requires
- testing of all of the output quantities periods each day but makes
- the code quite simple.  This is a reasonable tradeoff since there
- are only a few quantities to test; this should outweight the costs
- of having to read and understand ugly code.
-
- So to summarize, adding another output quantity requires several steps.
- - Add an appropriate element to the SW_*_OUTPUTS substructure of the
- main object (eg SW_Soilwat) to hold the output value.
- - Define a new key string and add a macro definition and enumeration
- to the appropriate list in Output.h.  Be sure the new key's position
- in the list doesn't interfere with the ForEach*() loops.
- - Increase the value of SW_OUTNKEYS macro in Output.h.
- - Add the macro and enum keys to the key2str and key2obj lists in
- SW_Output.c as appropriate, IN THE SAME LIST POSITION.
- - Create and declare a get_*() function that returns the correctly
- formatted string for output.
- - Add a line to link the get_ function to the appropriate element in
- the SW_OUTPUT array in _construct().
- - Add new code to the switch statement in sumof_*() to handle the new
- key.
- - Add new code to the switch statement in average_for() to do the
- summarizing.
-
- That should do it.  However, new code is about to be added to Output.c
- and outsetup.in that will allow quantities to be summarized by summing
- or averaging.  Possibly in the future, more types of options will be
- added (eg, geometric average, stddev, who knows).  Thus, new keys will
- be needed to handle those operations within the average_for()
- function, but the rest of the code will be the same.
-
-
- Comment (06/23/2015, akt): Adding Output at SOILWAT for further using at RSOILWAT and STEP as well
-
- Above details is good enough for knowing how to add a new output at soilwat.
- However here we are adding some more details about how we can add this output for further using that to RSOILWAT and STEP side as well.
-
- At the top with Comment (06/23/2015, drs): details about how output of SOILWAT works.
-
- Example : Adding extra place holder at existing output of SOILWAT for both STEP and RSOILWAT:
- - Adding extra place holder for existing output for both STEP and RSOILWAT: example adding extra output surfaceTemp at SW_WEATHER.
- We need to modified SW_Weather.h with adding a placeholder at SW_WEATHER and at inner structure SW_WEATHER_OUTPUTS.
- - Then somewhere this surfaceTemp value need to set at SW_WEATHER placeholder, here we add this atSW_Flow.c
- - Further modify file SW_Output.c ; add sum of surfaceTemp at function sumof_wth(). Then use this
- sum value to calculate average of surfaceTemp at function average_for().
- - Then go to function get_temp(), add extra placeholder like surfaceTempVal that will store this average surfaceTemp value.
- Add this value to both STEP and RSOILWAT side code of this function for all the periods like weekly, monthly and yearly (for
- daily set day sum value of surfaceTemp not avg), add this surfaceTempVal at end of this get_Temp() function for finally
- printing in output file.
- - Pass this surfaceTempVal to sxw.h file from STEP, by adding extra placeholder at sxw.h so that STEP model can use this value there.
- - For using this surfaceTemp value in RSOILWAT side of function get_Temp(), increment index of p_Rtemp output array
- by one and add this sum value  for daily and avg value for other periods at last index.
- - Further need to modify SW_R_lib.c, for newOutput we need to add new pointers;
- functions start() and onGetOutput() will need to be modified. For this example adding extra placeholder at existing TEMP output so
- only function onGetOutput() need to be modified; add placeholder name for surfaceTemp at array Ctemp_names[] and then 	increment
- number of columns for Rtemp outputs (Rtemp_columns) by one.
- - At RSOILWAT further we will need to modify L_swOutput.R and G_swOut.R. At L_swOutput.R increment number of columns for swOutput_TEMP.
-
- So to summarize, adding extra place holder at existing output of SOILWAT for both STEP and RSOILWAT side code above steps are useful.
-
- However, adding another new output quantity requires several steps for SOILWAT and both STEP and RSOILWAT side code as well.
- So adding more information to above details (for adding  another new output quantity that can further use in both STEP and RSOILWAT) :
- - We need to modify SW_R_lib.c of SOILWAT; add new pointers; functions start()  and onGetOutput() will need to be modified.
- - The sw_output.c of SOILWAT will need to be modified for new output quantity; add new pointers here too for RSOILWAT.
- - We will need to also read in the new config params from outputsetup_v30.in ; then we  will need to accumulate the new values ;
- write them out to file and assign the values to the RSOILWAT pointers.
- - At RSOILWAT we will need to modify L_swOutput.R and G_swOut.R
-
- */
+/********************************************************/
+/********************************************************/
+/*	Source file: Output.c
+ Type: module
+ Application: SOILWAT - soilwater dynamics simulator
+ Purpose: Read / write and otherwise manage the
+ user-specified output flags.
+
+ COMMENTS: The algorithm for the summary bookkeeping
+ is much more complicated than I'd like, but I don't
+ see a cleaner way to address the need to keep
+ running tabs without storing daily arrays for each
+ output variable.  That might make somewhat
+ simpler code, and perhaps slightly more efficient,
+ but at a high cost of memory, and the original goal
+ was to make this object oriented, so memory should
+ be used sparingly.  Plus, much of the code is quite
+ general, and the main loops are very simple indeed.
+
+ Generally, adding a new output key is fairly simple,
+ and much of the code need not be considered.
+ Refer to the comment block at the very end of this
+ file for details.
+
+ Comment (06/23/2015, drs): In summary, the output of SOILWAT works as follows
+ SW_OUT_flush() calls at end of year and SW_Control.c/_collect_values() calls daily
+ 1) SW_OUT_sum_today() that
+ 1.1) if end of an output period, call average_for(): converts the (previously summed values (by sumof_wth) of) SW_WEATHER_OUTPUTS portion of SW_Weather from the ‘Xsum' to the ‘Xavg'
+ 1.2) on each day calls collect_sums() that calls sumof_wth(): SW_Weather (simulation slot ’now') values are summed up during each output period and stored in the SW_WEATHER_OUTPUTS (output) slots 'Xsum' of SW_Weather
+
+ 2) SW_OUT_write_today() that
+ 2.1) calls the get_temp() etc functions via SW_Output.pfunc: the values stored in ‘Xavg’ by average_for are converted to text string 'outstr’
+ 2.2) outputs the text string 'outstr’ with the fresh values to a text file via SW_Output.fp_X
+
+
+
+ History:
+ 9/11/01 cwb -- INITIAL CODING
+ 10-May-02 cwb -- Added conditionals for interfacing
+ with STEPPE.  See SW_OUT_read(), SW_OUT_close_files(),
+ SW_OUT_write_today(), get_temp() and get_transp().
+ The changes prevent the model from opening, closing,
+ and writing to files because SXW only requires periodic
+ (eg, weekly) transpiration and yearly temperature
+ from get_transp() and get_temp(), resp.
+ --The output config file must be prepared by the SXW
+ interface code such that only yearly temp and daily,
+ weekly, or monthly transpiration are requested for
+ periods (1,end).
+
+ 12/02 - IMPORTANT CHANGE - cwb
+ refer to comments in Times.h regarding base0
+
+ 27-Aug-03 (cwb) Just a comment that this code doesn't
+ handle missing values in the summaries, especially
+ the averages.  This really needs to be addressed
+ sometime, but for now it's the user's responsibility
+ to make sure there are no missing values.  The
+ model doesn't generate any on its own, but it
+ still needs to be fixed, although that will take
+ a bit of work to keep track of the number of
+ missing days, etc.
+ 20090826 (drs) stricmp -> strcmp -> Str_CompareI; in SW_OUT_sum_today () added break; after default:
+ 20090827 (drs) changed output-strings str[12] to #define OUTSTRLEN 18; str[OUTSTRLEN]; because of sprintf(str, ...) overflow and memory corruption into for-index i
+ 20090909 (drs) strcmp -> Str_CompareI (not case-sensitive)
+ 20090915 (drs) wetdays output was not working: changed in get_wetdays() the output from sprintf(fmt, "%c%%3.0f", _Sep); to sprintf(str, "%c%i", _Sep, val);
+ 20091013 (drs) output period of static void get_swcBulk(void) was erroneously set to eSW_SWP instead of eSW_SWCBulk
+ 20091015 (drs) ppt is divided into rain and snow and all three values plust snowmelt are output into precip
+ 20100202 (drs) changed SW_CANOPY to SW_CANOPYEV and SW_LITTER to SW_LITTEREV;
+ and eSW_Canopy to eSW_CanopyEv and eSW_Litter to eSW_LitterEv;
+ added SWC_CANOPYINT, SW_LITTERINT, SW_SOILINF, SW_LYRDRAIN;
+ added eSW_CanopyInt, eSW_LitterInt, eSW_SoilInf, eSW_LyrDrain;
+ updated key2str, key2obj;
+ added private functions get_canint(), get_litint(), get_soilinf(), get_lyrdrain();
+ updated SW_OUT_construct(), sumof_swc() and average_for() with new functions and keys
+ for layer drain use only for(i=0; i < SW_Site.n_layers-1; i++)
+ 04/16/2010 (drs) added SWC_SWA, eSW_SWABulk; updated key2str, key2obj; added private functions get_swaBulk();
+ updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
+ 10/20/2010 (drs) added SW_HYDRED, eSW_HydRed; updated key2str, key2obj; added private functions get_hydred();
+ updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
+ 11/16/2010 (drs) added forest intercepted water to canopy interception
+ updated get_canint(), SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for()
+ 01/03/2011	(drs) changed parameter type of str2period(), str2key(), and str2type() from 'const char *' to 'char *' to avoid 'discard qualifiers from pointer target type' in Str_ComparI()
+ 01/05/2011	(drs) made typecast explicit: changed in SW_OUT_write_today(): SW_Output[k].pfunc() to ((void (*)(void))SW_Output[k].pfunc)(); -> doesn't solve problem under darwin10
+ -> 'abort trap' was due to str[OUTSTRLEN] being too short (OUTSTRLEN 18), changed to OUTSTRLEN 100
+ 01/06/2011	(drs) changed all floating-point output from %7.4f to %7.6f to avoid rounding errors in post-run output calculations
+ 03/06/2011	(drs) in average_for() changed loop to average hydred from "for(i=0; i < SW_Site.n_layers-1; i++)" to "ForEachSoilLayer(i)" because deepest layer was not averaged
+ 07/22/2011 (drs) added SW_SURFACEW and SW_EVAPSURFACE, eSW_SurfaceWater and eSW_EvapSurface; updated key2str, key2obj; added private functions get_surfaceWater() and get_evapSurface();
+ updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
+ 09/12/2011	(drs)	renamed SW_EVAP to SW_EVAPSOIL, and eSW_Evap to eSW_EvapSoil;
+ deleted SW_CANOPYEV, eSW_CanopyEv, SW_LITTEREV, eSW_LitterEv, SW_CANOPYINT, eSW_CanopyInt, SW_LITTERINT, and eSW_LitterInt;
+ added SW_INTERCEPTION and eSW_Interception
+ 09/12/2011	(drs)	renamed get_evap() to get_evapSoil(); renamed get_EvapsurfaceWater() to get_evapSurface()
+ deleted get_canevap(), get_litevap(), get_canint(), and get_litint()
+ added get_interception()
+ 09/12/2011	(drs)	increased #define OUTSTRLEN from 100 to 400 (since transpiration and hydraulic redistribution will be 4x as long)
+ increased static char outstr[0xff] from 0xff=255 to OUTSTRLEN
+ 09/12/2011	(drs)	updated SW_OUT_construct(), sumof_swc()[->make calculation here] and average_for() with new functions and keys
+ 09/12/2011	(drs)	added snowdepth as output to snowpack, i.e., updated updated get_snowpack(), sumof_swc()[->make calculation here] and average_for()
+ 09/30/2011	(drs)	in SW_OUT_read(): opening of output files: SW_Output[k].outfile is extended by SW_Files.in:SW_OutputPrefix()
+ 01/09/2012	(drs)	'abort trap' in get_transp due to outstr[OUTSTRLEN] being too short (OUTSTRLEN 400), changed to OUTSTRLEN 1000
+ 05/25/2012  (DLM) added SW_SOILTEMP to keytostr, updated keytoobj;  wrote get_soiltemp(void) function, added code in the _construct() function to link to get_soiltemp() correctly;  added code to sumof and average_for() to handle the new key
+ 05/25/2012  (DLM) added a few lines of nonsense to sumof_ves() function in order to get rid of the annoying compiler warnings
+ 06/12/2012  (DLM) changed OUTSTRLEN from 1000 to 2000
+ 07/02/2012  (DLM) updated # of chars in keyname & upkey arrays in SW_OUT_READ() function to account for longer keynames... for some reason it would still read them in correctly on OS X without an error, but wouldn't on JANUS.
+ 11/30/2012	(clk)	changed get_surfaceWater() to ouput amound of surface water, surface runoff, and snowmelt runoff, respectively.
+ 12/13/2012	(clk, drs)	changed get_surfaceWater() to output amount of surface water
+ added get_runoff() to output surface runoff, and snowmelt runoff, respectively, in a separate file -> new version of outsetupin;
+ updated key2str and OutKey
+ 12/14/2012 (drs)	changed OUTSTRLEN from 2000 to 3000 to prevent 'Abort trap: 6' at runtime
+ 01/10/2013	(clk)	in function SW_OUT_read, when creating the output files, needed to loop through this four times
+ for each OutKey, giving us the output files for day, week, month, and year. Also, added
+ a switch statement to acqurie the dy, wk, mo, or yr suffix based on the iteration of the for loop.
+ When reading in lines from outsetup, removed PERIOD from the read in because it is unneeded in since
+ we are doing all time steps.
+ Removed the line SW_Output[k].period = str2period(Str_ToUpper(period, ext)), since we are no longer
+ reading in a period.
+ in function SW_OUT_close_files need to loop through and close all four time step files for each
+ OutKey, determined which file to close based on the iteration of the for loop.
+ in function SW_OUT_write_today needed to loop through the code four times for each OutKey, changing
+ the period of the output for each iteration. With the for loop, I am also able to pick the
+ proper FILE pointer to choose when outputting the data.
+ in function average_for needed to loop through the code four times for each OutKey, changing
+ the period of the output for each iteration.
+ the function str2period is no longer used in the code, but will leave it in the code for now.
+ 01/17/2013	(clk)	in function SW_OUT_read, created an additional condition that if the keyname was TIMESTEP,
+ the code would rescan the line looking for up to 5 strings. The first one would be saved
+ back into keyname, while the other four would be stored in a matrix. These values would be
+ the desired timesteps to output. Then you would convert these strings to periods, and store
+ them in an array of integers and keep track of how many timesteps were actually read in.
+ The other changes are modifications of the changes made on 01/10/2013. For all the for loops, instead of
+ looping through 4 times, we now loop through for as many times as periods that we read in from the
+ TIMESTEP line. Also, in all the switch cases where we increased that value which changed the period
+ to the next period, we now use the array of integers that stored the period and move through that with
+ each iteration.
+ 02/05/2013	(clk) in the function get_soiltemp(), when determing the period, the code was using SW_Output[eSW_SWCBulk].period,
+ which needed to be SW_Output[eSW_SoilTemp].period, since we are looking at soil temp, not SWCM.
+ 04/16/2013	(clk)	Added two new ouputs: vwcMatric and swaMatric.
+ in the get functions, the calculation is
+ (the matric value) = (the bulk value)/(1-fractionVolBulk_gravel)
+ Also changed the names of swp -> swpMatric, swc -> swcBulk, swcm -> vwcBulk, and swa -> swaBulk
+ 06/27/2013	(drs)	closed open files if LogError() with LOGFATAL is called in SW_OUT_read()
+
+ 07/01/2013	(clk)	Changed the outsetup file so that the TIMESTEP line could be used or not used, depending on the need
+ If the TIMESTEP line is not used, need to have an additional column for the period again
+ Within the code, changed the timesteps array to be two dimensional, and keep track of the periods to be used
+ for each of the outputs. Then, at every for loop that was implemented for the TIMESTEP code, put in
+ place a conditional that will determine which of the four possible periods are to be used for each output.
+ 07/09/2013	(clk)	Added forb to the outputs: transpiration, surface evaporation, interception, and hydraulic redistribution
+ 08/21/2013	(clk)	Modified the establisment output to actually output for each species and not just the last one in the group.
+ 06/23/2015 (akt)	Added output for surface temperature to get_temp()
+ */
+/********************************************************/
+/********************************************************/
+
+/* =================================================== */
+/*                INCLUDES / DEFINES                   */
+/* --------------------------------------------------- */
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "generic.h"
+#include "filefuncs.h"
+#include "myMemory.h"
+#include "Times.h"
+
+#include "SW_Carbon.h"
+#include "SW_Defines.h"
+#include "SW_Files.h"
+#include "SW_Model.h"
+#include "SW_Site.h"
+#include "SW_SoilWater.h"
+#include "SW_Times.h"
+#include "SW_Output.h"
+#include "SW_Weather.h"
+#include "SW_VegEstab.h"
+#include "SW_VegProd.h"
+
+#ifdef RSOILWAT
+#include "R.h"
+#include "Rdefines.h"
+#include "Rconfig.h"
+#include "Rinternals.h"
+#endif
+
+/* =================================================== */
+/*                  Global Variables                   */
+/* --------------------------------------------------- */
+extern SW_SITE SW_Site;
+extern SW_SOILWAT SW_Soilwat;
+extern SW_MODEL SW_Model;
+extern SW_WEATHER SW_Weather;
+extern SW_VEGPROD SW_VegProd;
+extern SW_VEGESTAB SW_VegEstab;
+extern Bool EchoInits;
+extern SW_CARBON SW_Carbon;
+#define OUTSTRLEN 3000 /* max output string length: in get_transp: 4*every soil layer with 14 chars */
+
+SW_OUTPUT SW_Output[SW_OUTNKEYS]; /* declared here, externed elsewhere */
+
+#ifdef RSOILWAT
+extern RealD *p_Raet_yr, *p_Rdeep_drain_yr, *p_Restabs_yr, *p_Revap_soil_yr, *p_Revap_surface_yr, *p_Rhydred_yr, *p_Rinfiltration_yr, *p_Rinterception_yr, *p_Rpercolation_yr,
+*p_Rpet_yr, *p_Rprecip_yr, *p_Rrunoff_yr, *p_Rsnowpack_yr, *p_Rsoil_temp_yr, *p_Rsurface_water_yr, *p_RvwcBulk_yr, *p_RvwcMatric_yr, *p_RswcBulk_yr, *p_RswpMatric_yr,
+*p_RswaBulk_yr, *p_RswaMatric_yr, *p_Rtemp_yr, *p_Rtransp_yr, *p_Rwetdays_yr, *p_Rco2effects_yr;
+extern RealD *p_Raet_mo, *p_Rdeep_drain_mo, *p_Restabs_mo, *p_Revap_soil_mo, *p_Revap_surface_mo, *p_Rhydred_mo, *p_Rinfiltration_mo, *p_Rinterception_mo, *p_Rpercolation_mo,
+*p_Rpet_mo, *p_Rprecip_mo, *p_Rrunoff_mo, *p_Rsnowpack_mo, *p_Rsoil_temp_mo, *p_Rsurface_water_mo, *p_RvwcBulk_mo, *p_RvwcMatric_mo, *p_RswcBulk_mo, *p_RswpMatric_mo,
+*p_RswaBulk_mo, *p_RswaMatric_mo, *p_Rtemp_mo, *p_Rtransp_mo, *p_Rwetdays_mo, *p_Rco2effects_mo;
+extern RealD *p_Raet_wk, *p_Rdeep_drain_wk, *p_Restabs_wk, *p_Revap_soil_wk, *p_Revap_surface_wk, *p_Rhydred_wk, *p_Rinfiltration_wk, *p_Rinterception_wk, *p_Rpercolation_wk,
+*p_Rpet_wk, *p_Rprecip_wk, *p_Rrunoff_wk, *p_Rsnowpack_wk, *p_Rsoil_temp_wk, *p_Rsurface_water_wk, *p_RvwcBulk_wk, *p_RvwcMatric_wk, *p_RswcBulk_wk, *p_RswpMatric_wk,
+*p_RswaBulk_wk, *p_RswaMatric_wk, *p_Rtemp_wk, *p_Rtransp_wk, *p_Rwetdays_wk, *p_Rco2effects_wk;
+extern RealD *p_Raet_dy, *p_Rdeep_drain_dy, *p_Restabs_dy, *p_Revap_soil_dy, *p_Revap_surface_dy, *p_Rhydred_dy, *p_Rinfiltration_dy, *p_Rinterception_dy, *p_Rpercolation_dy,
+*p_Rpet_dy, *p_Rprecip_dy, *p_Rrunoff_dy, *p_Rsnowpack_dy, *p_Rsoil_temp_dy, *p_Rsurface_water_dy, *p_RvwcBulk_dy, *p_RvwcMatric_dy, *p_RswcBulk_dy, *p_RswpMatric_dy,
+*p_RswaBulk_dy, *p_RswaMatric_dy, *p_Rtemp_dy, *p_Rtransp_dy, *p_Rwetdays_dy, *p_Rsoil_temp_dy, *p_Rco2effects_dy;
+extern unsigned int yr_nrow, mo_nrow, wk_nrow, dy_nrow;
+#endif
+
+#ifdef STEPWAT
+#include "../sxw.h"
+extern SXW_t SXW;
+#endif
+
+Bool isPartialSoilwatOutput =FALSE;
+
+/* =================================================== */
+/*                Module-Level Variables               */
+/* --------------------------------------------------- */
+static char *MyFileName;
+static char outstr[OUTSTRLEN];
+static char _Sep; /* output delimiter */
+
+static int numPeriod;// variable to keep track of the number of periods that are listed in the line TIMESTEP
+static int numPeriods = 4;// the total number of periods that can be used in the code
+static int timeSteps[SW_OUTNKEYS][4];// array to keep track of the periods that will be used for each output
+
+static Bool bFlush; /* process partial period ? */
+static TimeInt tOffset; /* 1 or 0 means we're writing previous or current period */
+
+/* These MUST be in the same order as enum OutKey in
+ * SW_Output.h */
+static char *key2str[] =
+{ SW_WETHR, SW_TEMP, SW_PRECIP, SW_SOILINF, SW_RUNOFF, SW_ALLH2O, SW_VWCBULK,
+		SW_VWCMATRIC, SW_SWCBULK, SW_SWABULK, SW_SWAMATRIC, SW_SWPMATRIC,
+		SW_SURFACEW, SW_TRANSP, SW_EVAPSOIL, SW_EVAPSURFACE, SW_INTERCEPTION,
+		SW_LYRDRAIN, SW_HYDRED, SW_ET, SW_AET, SW_PET, SW_WETDAY, SW_SNOWPACK,
+		SW_DEEPSWC, SW_SOILTEMP,
+		SW_ALLVEG, SW_ESTAB, SW_CO2EFFECTS };
+/* converts an enum output key (OutKey type) to a module  */
+/* or object type. see SW_Output.h for OutKey order.         */
+/* MUST be SW_OUTNKEYS of these */
+static ObjType key2obj[] =
+{ eWTH, eWTH, eWTH, eWTH, eWTH, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC,
+		eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC, eSWC,
+		eSWC, eVES, eVES, eVES };
+
+static char *pd2str[] =
+{ SW_DAY, SW_WEEK, SW_MONTH, SW_YEAR };
+static char *styp2str[] =
+{ SW_SUM_OFF, SW_SUM_SUM, SW_SUM_AVG, SW_SUM_FNL };
+
+/* =================================================== */
+/* =================================================== */
+/*             Private Function Definitions            */
+/* --------------------------------------------------- */
+static void _echo_outputs(void);
+static void average_for(ObjType otyp, OutPeriod pd);
+#ifndef RSOILWAT
+static void get_outstrleader(TimeInt pd);
+#endif
+static void get_temp(void);
+static void get_precip(void);
+static void get_vwcBulk(void);
+static void get_vwcMatric(void);
+static void get_swcBulk(void);
+static void get_swpMatric(void);
+static void get_swaBulk(void);
+static void get_swaMatric(void);
+static void get_surfaceWater(void);
+static void get_runoff(void);
+static void get_transp(void);
+static void get_evapSoil(void);
+static void get_evapSurface(void);
+static void get_interception(void);
+static void get_soilinf(void);
+static void get_lyrdrain(void);
+static void get_hydred(void);
+static void get_aet(void);
+static void get_pet(void);
+static void get_wetdays(void);
+static void get_snowpack(void);
+static void get_deepswc(void);
+static void get_estab(void);
+static void get_soiltemp(void);
+void get_co2effects(void); // Uses Carbon.h
+static void get_none(void); /* default until defined */
+
+static void collect_sums(ObjType otyp, OutPeriod op);
+static void sumof_wth(SW_WEATHER *v, SW_WEATHER_OUTPUTS *s, OutKey k);
+static void sumof_swc(SW_SOILWAT *v, SW_SOILWAT_OUTPUTS *s, OutKey k);
+static void sumof_ves(SW_VEGESTAB *v, SW_VEGESTAB_OUTPUTS *s, OutKey k);
+
+static OutPeriod str2period(char *s)
+{
+	/* --------------------------------------------------- */
+	IntUS pd;
+	for (pd = 0; Str_CompareI(s, pd2str[pd]) && pd < SW_OUTNPERIODS; pd++) ;
+
+	return pd;
+}
+
+static OutKey str2key(char *s)
+{
+	/* --------------------------------------------------- */
+	IntUS key;
+
+	for (key = 0; key < SW_OUTNKEYS && Str_CompareI(s, key2str[key]); key++) ;
+	if (key == SW_OUTNKEYS)
+	{
+		LogError(logfp, LOGFATAL, "%s : Invalid key (%s) in %s", SW_F_name(eOutput), s);
+	}
+	return key;
+}
+
+static OutSum str2stype(char *s)
+{
+	/* --------------------------------------------------- */
+	OutSum styp;
+
+	for (styp = eSW_Off; styp < SW_NSUMTYPES && Str_CompareI(s, styp2str[styp]); styp++) ;
+	if (styp == SW_NSUMTYPES)
+	{
+		LogError(logfp, LOGFATAL, "%s : Invalid summary type (%s)\n", SW_F_name(eOutput), s);
+	}
+	return styp;
+}
+
+/* =================================================== */
+/* =================================================== */
+/*             Public Function Definitions             */
+/* --------------------------------------------------- */
+void SW_OUT_construct(void)
+{
+	/* =================================================== */
+	OutKey k;
+
+	/* note that an initializer that is called during
+	 * execution (better called clean() or something)
+	 * will need to free all allocated memory first
+	 * before clearing structure.
+	 */
+	ForEachOutKey(k)
+	{
+		if (!isnull(SW_Output[k].outfile))
+		{	//Clear memory before setting it
+			Mem_Free(SW_Output[k].outfile);
+			SW_Output[k].outfile = NULL;
+		}
+	}
+	memset(&SW_Output, 0, sizeof(SW_Output));
+
+	/* attach the printing functions for each output
+	 * quantity to the appropriate element in the
+	 * output structure.  Using a loop makes it convenient
+	 * to simply add a line as new quantities are
+	 * implemented and leave the default case for every
+	 * thing else.
+	 */ForEachOutKey(k)
+	{
+#ifdef RSOILWAT
+		SW_Output[k].yr_row = 0;
+		SW_Output[k].mo_row = 0;
+		SW_Output[k].wk_row = 0;
+		SW_Output[k].dy_row = 0;
+#endif
+		switch (k)
+		{
+		case eSW_Temp:
+			SW_Output[k].pfunc = (void (*)(void)) get_temp;
+			break;
+		case eSW_Precip:
+			SW_Output[k].pfunc = (void (*)(void)) get_precip;
+			break;
+		case eSW_VWCBulk:
+			SW_Output[k].pfunc = (void (*)(void)) get_vwcBulk;
+			break;
+		case eSW_VWCMatric:
+			SW_Output[k].pfunc = (void (*)(void)) get_vwcMatric;
+			break;
+		case eSW_SWCBulk:
+			SW_Output[k].pfunc = (void (*)(void)) get_swcBulk;
+			break;
+		case eSW_SWPMatric:
+			SW_Output[k].pfunc = (void (*)(void)) get_swpMatric;
+			break;
+		case eSW_SWABulk:
+			SW_Output[k].pfunc = (void (*)(void)) get_swaBulk;
+			break;
+		case eSW_SWAMatric:
+			SW_Output[k].pfunc = (void (*)(void)) get_swaMatric;
+			break;
+		case eSW_SurfaceWater:
+			SW_Output[k].pfunc = (void (*)(void)) get_surfaceWater;
+			break;
+		case eSW_Runoff:
+			SW_Output[k].pfunc = (void (*)(void)) get_runoff;
+			break;
+		case eSW_Transp:
+			SW_Output[k].pfunc = (void (*)(void)) get_transp;
+			break;
+		case eSW_EvapSoil:
+			SW_Output[k].pfunc = (void (*)(void)) get_evapSoil;
+			break;
+		case eSW_EvapSurface:
+			SW_Output[k].pfunc = (void (*)(void)) get_evapSurface;
+			break;
+		case eSW_Interception:
+			SW_Output[k].pfunc = (void (*)(void)) get_interception;
+			break;
+		case eSW_SoilInf:
+			SW_Output[k].pfunc = (void (*)(void)) get_soilinf;
+			break;
+		case eSW_LyrDrain:
+			SW_Output[k].pfunc = (void (*)(void)) get_lyrdrain;
+			break;
+		case eSW_HydRed:
+			SW_Output[k].pfunc = (void (*)(void)) get_hydred;
+			break;
+		case eSW_AET:
+			SW_Output[k].pfunc = (void (*)(void)) get_aet;
+			break;
+		case eSW_PET:
+			SW_Output[k].pfunc = (void (*)(void)) get_pet;
+			break;
+		case eSW_WetDays:
+			SW_Output[k].pfunc = (void (*)(void)) get_wetdays;
+			break;
+		case eSW_SnowPack:
+			SW_Output[k].pfunc = (void (*)(void)) get_snowpack;
+			break;
+		case eSW_DeepSWC:
+			SW_Output[k].pfunc = (void (*)(void)) get_deepswc;
+			break;
+		case eSW_SoilTemp:
+			SW_Output[k].pfunc = (void (*)(void)) get_soiltemp;
+			break;
+		case eSW_Estab:
+			SW_Output[k].pfunc = (void (*)(void)) get_estab;
+			break;
+		case eSW_CO2Effects:
+			SW_Output[k].pfunc = (void (*)(void)) get_co2effects;
+			break;
+			// Creates a pointer to a function that expects void and returns void
+		default:
+			SW_Output[k].pfunc = (void (*)(void)) get_none;
+			break;
+
+		}
+	}
+
+	bFlush = FALSE;
+	tOffset = 1;
+
+}
+
+void SW_OUT_new_year(void)
+{
+	/* =================================================== */
+	/* reset the terminal output days each year  */
+
+	OutKey k;
+
+	ForEachOutKey(k)
+	{
+		if (!SW_Output[k].use)
+			continue;
+
+		if (SW_Output[k].first_orig <= SW_Model.firstdoy)
+			SW_Output[k].first = SW_Model.firstdoy;
+		else
+			SW_Output[k].first = SW_Output[k].first_orig;
+
+		if (SW_Output[k].last_orig >= SW_Model.lastdoy)
+			SW_Output[k].last = SW_Model.lastdoy;
+		else
+			SW_Output[k].last = SW_Output[k].last_orig;
+
+	}
+
+}
+
+void SW_OUT_read(void)
+{
+	/* =================================================== */
+	/* read input file for output parameter setup info.
+	 * 5-Nov-01 -- now disregard the specified file name's
+	 *             extension and instead use the specified
+	 *             period as the extension.
+	 * 10-May-02 - Added conditional for interfacing to STEPPE.
+	 *             We want no output when running from STEPPE
+	 *             so the code to open the file is blocked out.
+	 *             In fact, the only keys to process are
+	 *             TRANSP, PRECIP, and TEMP.
+	 */
+	FILE *f;
+	OutKey k;
+	int x, i, itemno;
+#ifndef RSOILWAT
+	char str[MAX_FILENAMESIZE];
+#endif
+	char ext[10];
+
+	/* these dims come from the orig format str */
+	/* except for the uppercase space. */
+	char timeStep[4][10], // matrix to capture all the periods entered in outsetup.in
+			keyname[50], upkey[50], /* space for uppercase conversion */
+			sumtype[4], upsum[4], period[10], /* should be 2 chars, but we don't want overflow from user typos */
+			last[4], /* last doy for output, if "end", ==366 */
+			outfile[MAX_FILENAMESIZE];
+#ifndef RSOILWAT
+	char prefix[MAX_FILENAMESIZE];
+#endif
+	int first; /* first doy for output */
+	int useTimeStep = 0; /* flag to determine whether or not the line TIMESTEP exists */
+
+	MyFileName = SW_F_name(eOutput);
+	f = OpenFile(MyFileName, "r");
+	itemno = 0;
+
+	_Sep = '\t'; /* default in case it doesn't show up in the file */
+
+	while (GetALine(f, inbuf))
+	{
+		itemno++; /* note extra lines will cause an error */
+
+		x = sscanf(inbuf, "%s %s %s %d %s %s", keyname, sumtype, period, &first,
+				last, outfile);
+		if (Str_CompareI(keyname, "TIMESTEP") == 0)	// condition to read in the TIMESTEP line in outsetup.in
+		{
+			numPeriod = sscanf(inbuf, "%s %s %s %s %s", keyname, timeStep[0],
+					timeStep[1], timeStep[2], timeStep[3]);	// need to rescan the line because you are looking for all strings, unlike the original scan
+			numPeriod--;// decrement the count to make sure to not count keyname in the number of periods
+
+			useTimeStep = 1;
+			continue;
+		}
+		else
+		{ // If the line TIMESTEP is present, only need to read in five variables not six, so re read line.
+			if (x < 6)
+			{
+				if (Str_CompareI(keyname, "OUTSEP") == 0)
+				{
+					switch ((int) *sumtype)
+					{
+					case 't':
+						_Sep = '\t';
+						break;
+					case 's':
+						_Sep = ' ';
+						break;
+					default:
+						_Sep = *sumtype;
+					}
+					continue;
+				}
+				else
+				{
+					CloseFile(&f);
+					LogError(logfp, LOGFATAL,
+							"%s : Insufficient key parameters for item %d.",
+							MyFileName, itemno);
+					continue;
+				}
+			}
+			k = str2key(Str_ToUpper(keyname, upkey));
+			for (i = 0; i < numPeriods; i++)
+			{
+				if (i < 1 && !useTimeStep)
+				{
+					int prd = str2period(Str_ToUpper(period, ext));
+					timeSteps[k][i] = prd;
+				}
+				else if (i < numPeriod && useTimeStep)
+				{
+					int prd = str2period(Str_ToUpper(timeStep[i], ext));
+					timeSteps[k][i] = prd;
+				}
+				else
+					timeSteps[k][i] = 4;
+			}
+		}
+
+		/* Check validity of output key */
+		if (k == eSW_Estab)
+		{
+			strcpy(sumtype, "SUM");
+			first = 1;
+			strcpy(period, "YR");
+			strcpy(last, "end");
+		}
+		else if ((k == eSW_AllVeg || k == eSW_ET || k == eSW_AllWthr
+				|| k == eSW_AllH2O))
+		{
+			SW_Output[k].use = FALSE;
+			LogError(logfp, LOGNOTE, "%s : Output key %s is currently unimplemented.", MyFileName, key2str[k]);
+			continue;
+		}
+
+		/* check validity of summary type */
+		SW_Output[k].sumtype = str2stype(Str_ToUpper(sumtype, upsum));
+		if (SW_Output[k].sumtype == eSW_Fnl
+				&& !(k == eSW_VWCBulk || k == eSW_VWCMatric
+						|| k == eSW_SWPMatric || k == eSW_SWCBulk
+						|| k == eSW_SWABulk || k == eSW_SWAMatric
+						|| k == eSW_DeepSWC))
+		{
+			LogError(logfp, LOGWARN, "%s : Summary Type FIN with key %s is meaningless.\n" "  Using type AVG instead.", MyFileName, key2str[k]);
+			SW_Output[k].sumtype = eSW_Avg;
+		}
+
+		/* verify deep drainage parameters */
+		if (k == eSW_DeepSWC && SW_Output[k].sumtype != eSW_Off
+				&& !SW_Site.deepdrain)
+		{
+			LogError(logfp, LOGWARN, "%s : DEEPSWC cannot be output if flag not set in %s.", MyFileName, SW_F_name(eOutput));
+			continue;
+		}
+		//Set the values
+		SW_Output[k].use = (SW_Output[k].sumtype == eSW_Off) ? FALSE : TRUE;
+		if (SW_Output[k].use)
+		{
+			SW_Output[k].mykey = k;
+			SW_Output[k].myobj = key2obj[k];
+			SW_Output[k].period = str2period(Str_ToUpper(period, ext));
+			SW_Output[k].first_orig = first;
+			SW_Output[k].last_orig =
+					!Str_CompareI("END", last) ? 366 : atoi(last);
+			if (SW_Output[k].last_orig == 0)
+			{
+				CloseFile(&f);
+				LogError(logfp, LOGFATAL, "%s : Invalid ending day (%s), key=%s.", MyFileName, last, keyname);
+			}
+		}
+		//Set the outputs for the Periods
+#ifdef RSOILWAT
+		SW_Output[k].outfile = (char *) Str_Dup(outfile); //not really applicable
+#endif
+		for (i = 0; i < numPeriods; i++)
+		{ /* for loop to create files for all the periods that are being used */
+			/* prepare the remaining structure if use==true */
+			if (SW_Output[k].use)
+			{
+				if (timeSteps[k][i] < 4)
+				{
+				//	printf( "inside Soilwat SW_Output.c : isPartialSoilwatOutput=%d \n", isPartialSoilwatOutput);
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+					SW_OutputPrefix(prefix);
+					strcpy(str, prefix);
+					strcat(str, outfile);
+					strcat(str, ".");
+					switch (timeSteps[k][i])
+					{ /* depending on iteration through, will determine what period to use from the array of period */
+					case eSW_Day:
+						period[0] = 'd';
+						period[1] = 'y';
+						period[2] = '\0';
+						break;
+					case eSW_Week:
+						period[0] = 'w';
+						period[1] = 'k';
+						period[2] = '\0';
+						break;
+					case eSW_Month:
+						period[0] = 'm';
+						period[1] = 'o';
+						period[2] = '\0';
+						break;
+					case eSW_Year:
+						period[0] = 'y';
+						period[1] = 'r';
+						period[2] = '\0';
+						break;
+					}
+					strcat(str, Str_ToLower(period, ext));
+					SW_Output[k].outfile = (char *) Str_Dup(str);
+
+					switch (timeSteps[k][i])
+					{ /* depending on iteration through for loop, chooses the proper FILE pointer to use */
+					case eSW_Day:
+						SW_Output[k].fp_dy = OpenFile(SW_Output[k].outfile,
+								"w");
+						break;
+					case eSW_Week:
+						SW_Output[k].fp_wk = OpenFile(SW_Output[k].outfile,
+								"w");
+						break;
+					case eSW_Month:
+						SW_Output[k].fp_mo = OpenFile(SW_Output[k].outfile,
+								"w");
+						break;
+					case eSW_Year:
+						SW_Output[k].fp_yr = OpenFile(SW_Output[k].outfile,
+								"w");
+						break;
+					}
+#elif defined(STEPWAT)
+					if (isPartialSoilwatOutput == FALSE)
+					{
+						SW_OutputPrefix(prefix);
+						strcpy(str, prefix);
+						strcat(str, outfile);
+						strcat(str, ".");
+						switch (timeSteps[k][i])
+						{ /* depending on iteration through, will determine what period to use from the array of period */
+							case eSW_Day:
+							period[0] = 'd';
+							period[1] = 'y';
+							period[2] = '\0';
+							break;
+							case eSW_Week:
+							period[0] = 'w';
+							period[1] = 'k';
+							period[2] = '\0';
+							break;
+							case eSW_Month:
+							period[0] = 'm';
+							period[1] = 'o';
+							period[2] = '\0';
+							break;
+							case eSW_Year:
+							period[0] = 'y';
+							period[1] = 'r';
+							period[2] = '\0';
+							break;
+						}
+						strcat(str, Str_ToLower(period, ext));
+						SW_Output[k].outfile = (char *) Str_Dup(str);
+
+						switch (timeSteps[k][i])
+						{ /* depending on iteration through for loop, chooses the proper FILE pointer to use */
+							case eSW_Day:
+							SW_Output[k].fp_dy = OpenFile(SW_Output[k].outfile, "w");
+							break;
+							case eSW_Week:
+							SW_Output[k].fp_wk = OpenFile(SW_Output[k].outfile, "w");
+							break;
+							case eSW_Month:
+							SW_Output[k].fp_mo = OpenFile(SW_Output[k].outfile, "w");
+							break;
+							case eSW_Year:
+							SW_Output[k].fp_yr = OpenFile(SW_Output[k].outfile, "w");
+							break;
+						}
+					}
+#endif
+				}
+			}
+		}
+
+	}
+
+	CloseFile(&f);
+
+	if (EchoInits)
+		_echo_outputs();
+}
+#ifdef RSOILWAT
+void onSet_SW_OUT(SEXP OUT)
+{
+	int i;
+	char ext[10];
+	OutKey k;
+	SEXP sep, timestep,useTimeStep, KEY;
+	Bool continue1;
+	SEXP mykey, myobj, period, sumtype, use, first, last, first_orig, last_orig, outfile;
+
+	MyFileName = SW_F_name(eOutput);
+
+	PROTECT(sep = GET_SLOT(OUT, install("outputSeparator")));
+	_Sep = '\t';/*TODO Make this work.*/
+	PROTECT(useTimeStep = GET_SLOT(OUT, install("useTimeStep")));
+	PROTECT(timestep = GET_SLOT(OUT, install("timePeriods")));
+
+	PROTECT(mykey = GET_SLOT(OUT, install("mykey")));
+	PROTECT(myobj = GET_SLOT(OUT, install("myobj")));
+	PROTECT(period = GET_SLOT(OUT, install("period")));
+	PROTECT(sumtype = GET_SLOT(OUT, install("sumtype")));
+	PROTECT(use = GET_SLOT(OUT, install("use")));
+	PROTECT(first = GET_SLOT(OUT, install("first")));
+	PROTECT(last = GET_SLOT(OUT, install("last")));
+	PROTECT(first_orig = GET_SLOT(OUT, install("first_orig")));
+	PROTECT(last_orig = GET_SLOT(OUT, install("last_orig")));
+	PROTECT(outfile = GET_SLOT(OUT, install("outfile")));
+
+	ForEachOutKey(k)
+	{
+		for (i = 0; i < numPeriods; i++)
+		{
+			if (i < 1 && !LOGICAL(useTimeStep)[0])
+			{
+				timeSteps[k][i] = INTEGER(period)[k];
+			}
+			else if(LOGICAL(useTimeStep)[0] && i<LENGTH(timestep))
+			{
+				timeSteps[k][i] = INTEGER(timestep)[i];
+			}
+			else
+			{
+				timeSteps[k][i] = 4;
+			}
+		}
+		if (k == eSW_Estab)
+		{
+			INTEGER(sumtype)[k] = LOGICAL(use)[k]?eSW_Sum:eSW_Off;
+			INTEGER(first)[k] = 1;
+			INTEGER(period)[k] = 3;
+			INTEGER(last)[k] = 366;
+		}
+		continue1 = (k == eSW_AllVeg || k == eSW_ET || k == eSW_AllWthr || k == eSW_AllH2O);
+		if (continue1)
+		{
+			SW_Output[k].use = FALSE;
+			//LogError(logfp, LOGNOTE, "Output key %s is currently unimplemented.", key2str[k]);
+		}
+		if (!continue1)
+		{
+			/* check validity of summary type */
+			SW_Output[k].sumtype = INTEGER(sumtype)[k];
+			if (SW_Output[k].sumtype == eSW_Fnl && !(k == eSW_VWCBulk || k == eSW_VWCMatric || k == eSW_SWPMatric || k == eSW_SWCBulk || k == eSW_SWABulk || k == eSW_SWAMatric || k == eSW_DeepSWC))
+			{
+				LogError(logfp, LOGWARN, "output.in : Summary Type FIN with key %s is meaningless.\n"
+						"  Using type AVG instead.", key2str[k]);
+				SW_Output[k].sumtype = eSW_Avg;
+			}
+			/* verify deep drainage parameters */
+			if (k == eSW_DeepSWC && SW_Output[k].sumtype != eSW_Off && !SW_Site.deepdrain)
+			{
+				LogError(logfp, LOGWARN, "output.in : DEEPSWC cannot be output if flag not set in output.in.");
+			}
+			else
+			{
+				/* prepare the remaining structure if use==swTRUE */
+				SW_Output[k].use = (SW_Output[k].sumtype == eSW_Off) ? FALSE : TRUE;
+				if (SW_Output[k].use)
+				{
+					SW_Output[k].mykey = INTEGER(mykey)[k];
+					SW_Output[k].myobj = INTEGER(myobj)[k];
+					SW_Output[k].period = INTEGER(period)[k];
+					SW_Output[k].first_orig = INTEGER(first_orig)[k];
+					SW_Output[k].last_orig = INTEGER(last_orig)[k];
+					if (SW_Output[k].last_orig == 0)
+					{
+						LogError(logfp, LOGFATAL, "output.in : Invalid ending day (%s), key=%s.", INTEGER(last)[k], key2str[k]);
+					}
+					SW_Output[k].outfile = Str_Dup(CHAR(STRING_ELT(outfile, k)));
+				}
+			}
+		}
+	}
+	if (EchoInits)
+	_echo_outputs();
+	UNPROTECT(13);
+}
+
+SEXP onGet_SW_OUT(void)
+{
+	int i, debug = 0;
+	Bool doOnce = FALSE;
+	OutKey k;
+	SEXP swOUT;
+	SEXP OUT;
+	SEXP sep;
+	SEXP useTimeStep;
+	SEXP timestep;
+	SEXP mykey, myobj, period, sumtype, use, first, last, first_orig, last_orig, outfile;
+	char *cKEY[] =
+	{	"mykey", "myobj", "period", "sumtype", "use", "first", "last", "first_orig", "last_orig", "outfile"};
+
+	if(debug) Rprintf("onGet_SW_OUT begin\n");
+
+	PROTECT(swOUT = MAKE_CLASS("swOUT"));
+	PROTECT(OUT = NEW_OBJECT(swOUT));
+
+	PROTECT(sep=NEW_STRING(1));
+	SET_STRING_ELT(sep, 0, mkCharLen(&_Sep,1));
+	SET_SLOT(OUT, install("outputSeparator"), sep);
+
+	if(debug) Rprintf("useTimeStep before assignment = %d\n", useTimeStep);
+	PROTECT(useTimeStep = NEW_LOGICAL(1));
+	if(numPeriod == 0)
+	LOGICAL(useTimeStep)[0] = FALSE;
+	else
+	LOGICAL(useTimeStep)[0] = TRUE;
+	if(debug)
+	{
+		Rprintf("useTimeStep after assignment = %d\n", useTimeStep);
+		Rprintf("	- type of slot (10 = 'logical') %d\n", TYPEOF(useTimeStep));
+		Rprintf("	- logvalue of slot %d\n", LOGICAL_VALUE(useTimeStep));
+		if( 10 == TYPEOF(useTimeStep) )
+		Rprintf("	- logdata of slot %d\n", LOGICAL_DATA(useTimeStep));
+		else
+		Rprintf("	- logdata of slot not available because not of type 'logical'\n");
+	}
+	PROTECT(timestep = NEW_INTEGER(numPeriod));
+
+	PROTECT(mykey = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(myobj = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(period = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(sumtype = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(use = NEW_LOGICAL(SW_OUTNKEYS));
+	PROTECT(first = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(last = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(first_orig = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(last_orig = NEW_INTEGER(SW_OUTNKEYS));
+	PROTECT(outfile = NEW_STRING(SW_OUTNKEYS));
+
+	ForEachOutKey(k)
+	{
+		if(useTimeStep && SW_Output[k].use && !doOnce)
+		{
+			if(debug) Rprintf("length(timestep) = %d, numPeriod = %d\n", GET_LENGTH(timestep), numPeriod);
+			for (i = 0; i < numPeriod; i++)
+			{
+				if(debug) Rprintf("timestep, timestep[%d], and timeSteps[%d][%d] before %d assignment = %d, %d, %d\n",
+						i, i, k, k, timestep, INTEGER(timestep)[i], timeSteps[k][i]);
+				INTEGER(timestep)[i] = timeSteps[k][i];
+				if(debug) Rprintf("timestep, timestep[%d], and timeSteps[%d][%d] after %d assignment = %d, %d, %d\n",
+						i, i, k, k, timestep, INTEGER(timestep)[i], timeSteps[k][i]);
+			}
+			doOnce=TRUE;
+		}
+
+		INTEGER(mykey)[k] = SW_Output[k].mykey;
+		INTEGER(myobj)[k] = SW_Output[k].myobj;
+		INTEGER(period)[k] = SW_Output[k].period;
+		INTEGER(sumtype)[k] = SW_Output[k].sumtype;
+		LOGICAL(use)[k] = SW_Output[k].use;
+		INTEGER(first)[k] = SW_Output[k].first;
+		INTEGER(last)[k] = SW_Output[k].last;
+		INTEGER(first_orig)[k] = SW_Output[k].first_orig;
+		INTEGER(last_orig)[k] = SW_Output[k].last_orig;
+		if(SW_Output[k].use)
+		{
+			SET_STRING_ELT(outfile, k, mkChar(SW_Output[k].outfile));
+		}
+		else
+		SET_STRING_ELT(outfile, k, mkChar(""));
+	}
+	SET_SLOT(OUT, install("timePeriods"), timestep);
+
+	if(debug)
+	{
+		Rprintf("useTimeStep slot of OUT before assignment = %d\n", GET_SLOT(OUT, install("useTimeStep")));
+		Rprintf("	- type of slot %d\n", TYPEOF(GET_SLOT(OUT, install("useTimeStep"))));
+		Rprintf("	- logvalue of slot %d\n", LOGICAL_VALUE(GET_SLOT(OUT, install("useTimeStep"))));
+		if( 10 == TYPEOF(GET_SLOT(OUT, install("useTimeStep"))) )
+		Rprintf("	- logdata of slot %d\n", LOGICAL_DATA(GET_SLOT(OUT, install("useTimeStep"))));
+		else
+		Rprintf("	- logdata of slot not available because not of type 'logical'\n");
+	}
+	SET_SLOT(OUT, install("useTimeStep"), useTimeStep);
+	if(debug)
+	{
+		Rprintf("useTimeStep slot of OUT after assignment = %d\n", GET_SLOT(OUT, install("useTimeStep")));
+		Rprintf("	- type of slot (4 = 'environments') %d\n", TYPEOF(GET_SLOT(OUT, install("useTimeStep"))));
+		Rprintf("	- logvalue of slot %d\n", LOGICAL_VALUE(GET_SLOT(OUT, install("useTimeStep"))));
+		if( 10 == TYPEOF(GET_SLOT(OUT, install("useTimeStep"))) )
+		Rprintf("	- logdata of slot %d\n", LOGICAL_DATA(GET_SLOT(OUT, install("useTimeStep"))));
+		else
+		Rprintf("	- logdata of slot not available because not of type 'logical'\n");
+	}
+
+	SET_SLOT(OUT, install(cKEY[0]), mykey);
+	SET_SLOT(OUT, install(cKEY[1]), myobj);
+	SET_SLOT(OUT, install(cKEY[2]), period);
+	SET_SLOT(OUT, install(cKEY[3]), sumtype);
+	SET_SLOT(OUT, install(cKEY[4]), use);
+	SET_SLOT(OUT, install(cKEY[5]), first);
+	SET_SLOT(OUT, install(cKEY[6]), last);
+	SET_SLOT(OUT, install(cKEY[7]), first_orig);
+	SET_SLOT(OUT, install(cKEY[8]), last_orig);
+	SET_SLOT(OUT, install(cKEY[9]), outfile);
+
+	UNPROTECT(15);
+	if(debug) Rprintf("onGet_SW_OUT end\n");
+	return OUT;
+}
+#endif
+
+void SW_OUT_close_files(void)
+{
+	/* --------------------------------------------------- */
+	/* close all of the user-specified output files.
+	 * call this routine at the end of the program run.
+	 */
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	OutKey k;
+	int i;
+	ForEachOutKey(k)
+	{
+		if (SW_Output[k].use)
+			for (i = 0; i < numPeriods; i++) /*will loop through for as many periods are being used*/
+			{
+				if (timeSteps[k][i] < 4)
+				{
+					switch (timeSteps[k][i])
+					{ /*depending on iteration through loop, will close one of the time step files */
+					case eSW_Day:
+						CloseFile(&SW_Output[k].fp_dy);
+						break;
+					case eSW_Week:
+						CloseFile(&SW_Output[k].fp_wk);
+						break;
+					case eSW_Month:
+						CloseFile(&SW_Output[k].fp_mo);
+						break;
+					case eSW_Year:
+						CloseFile(&SW_Output[k].fp_yr);
+						break;
+					}
+				}
+			}
+	}
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		OutKey k;
+		int i;
+		ForEachOutKey(k)
+		{
+			if (SW_Output[k].use)
+			for (i = 0; i < numPeriods; i++) /*will loop through for as many periods are being used*/
+			{
+				if (timeSteps[k][i] < 4)
+				{
+					switch (timeSteps[k][i])
+					{ /*depending on iteration through loop, will close one of the time step files */
+						case eSW_Day:
+						CloseFile(&SW_Output[k].fp_dy);
+						break;
+						case eSW_Week:
+						CloseFile(&SW_Output[k].fp_wk);
+						break;
+						case eSW_Month:
+						CloseFile(&SW_Output[k].fp_mo);
+						break;
+						case eSW_Year:
+						CloseFile(&SW_Output[k].fp_yr);
+						break;
+					}
+				}
+			}
+		}
+	}
+#endif
+}
+
+void SW_OUT_flush(void)
+{
+	/* --------------------------------------------------- */
+	/* called at year end to process the remainder of the output
+	 * period.  This sets two module-level flags: bFlush and
+	 * tOffset to be used in the appropriate subs.
+	 */
+	bFlush = TRUE;
+	tOffset = 0;
+
+	SW_OUT_sum_today(eSWC);
+	SW_OUT_sum_today(eWTH);
+	SW_OUT_sum_today(eVES);
+	SW_OUT_write_today();
+
+	bFlush = FALSE;
+	tOffset = 1;
+
+}
+
+void SW_OUT_sum_today(ObjType otyp)
+{
+	/* =================================================== */
+	/* adds today's output values to week, month and year
+	 * accumulators and puts today's values in yesterday's
+	 * registers. This is different from the Weather.c approach
+	 * which updates Yesterday's registers during the _new_day()
+	 * function. It's more logical to update yesterday just
+	 * prior to today's calculations, but there's no logical
+	 * need to perform _new_day() on the soilwater.
+	 */
+	SW_SOILWAT *s = &SW_Soilwat;
+	SW_WEATHER *w = &SW_Weather;
+	/*  SW_VEGESTAB *v = &SW_VegEstab;  -> we don't need to sum daily for this */
+
+	OutPeriod pd;
+	IntU size = 0;
+
+	switch (otyp)
+	{
+	case eSWC:
+		size = sizeof(SW_SOILWAT_OUTPUTS);
+		break;
+	case eWTH:
+		size = sizeof(SW_WEATHER_OUTPUTS);
+		break;
+	case eVES:
+		return; /* a stub; we don't do anything with ves until get_() */
+	default:
+		LogError(stdout, LOGFATAL,
+				"Invalid object type in SW_OUT_sum_today().");
+	}
+
+	/* do this every day (kinda expensive but more general than before)*/
+	switch (otyp)
+	{
+	case eSWC:
+		memset(&s->dysum, 0, size);
+		break;
+	case eWTH:
+		memset(&w->dysum, 0, size);
+		break;
+	default:
+		break;
+	}
+
+	/* the rest only get done if new period */
+	if (SW_Model.newweek || bFlush)
+	{
+		average_for(otyp, eSW_Week);
+		switch (otyp)
+		{
+		case eSWC:
+			memset(&s->wksum, 0, size);
+			break;
+		case eWTH:
+			memset(&w->wksum, 0, size);
+			break;
+		default:
+			break;
+		}
+	}
+
+	if (SW_Model.newmonth || bFlush)
+	{
+		average_for(otyp, eSW_Month);
+		switch (otyp)
+		{
+		case eSWC:
+			memset(&s->mosum, 0, size);
+			break;
+		case eWTH:
+			memset(&w->mosum, 0, size);
+			break;
+		default:
+			break;
+		}
+	}
+
+	if (SW_Model.newyear || bFlush)
+	{
+		average_for(otyp, eSW_Year);
+		switch (otyp)
+		{
+		case eSWC:
+			memset(&s->yrsum, 0, size);
+			break;
+		case eWTH:
+			memset(&w->yrsum, 0, size);
+			break;
+		default:
+			break;
+		}
+	}
+
+	if (!bFlush)
+	{
+		ForEachOutPeriod(pd)
+			collect_sums(otyp, pd);
+	}
+}
+
+void SW_OUT_write_today(void)
+{
+	/* --------------------------------------------------- */
+	/* all output values must have been summed, averaged or
+	 * otherwise completed before this is called [now done
+	 * by SW_*_sum_*<daily|yearly>()] prior.
+	 * This subroutine organizes only the calling loop and
+	 * sending the string to output.
+	 * Each output quantity must have a print function
+	 * defined and linked to SW_Output.pfunc (currently all
+	 * starting with 'get_').  Those funcs return a properly
+	 * formatted string to be output via the module variable
+	 * 'outstr'. Furthermore, those funcs must know their
+	 * own time period.  This version of the program only
+	 * prints one period for each quantity.
+	 *
+	 * The t value tests whether the current model time is
+	 * outside the output time range requested by the user.
+	 * Recall that times are based at 0 rather than 1 for
+	 * array indexing purposes but the user request is in
+	 * natural numbers, so we add one before testing.
+	 */
+	/* 10-May-02 (cwb) Added conditional to interface with STEPPE.
+	 *           We want no output if running from STEPPE.
+	 */
+	TimeInt t = 0xffff;
+	OutKey k;
+	Bool writeit;
+	int i;
+
+	// Adjust the model year to match simulation years for the output
+    SW_Model.year += SW_Carbon.addtl_yr;
+
+	ForEachOutKey(k)
+	{
+		for (i = 0; i < numPeriods; i++)
+		{ /* will run through this loop for as many periods are being used */
+			if (!SW_Output[k].use)
+				continue;
+			if (timeSteps[k][i] < 4)
+			{
+				writeit = TRUE;
+				SW_Output[k].period = timeSteps[k][i]; /* set the desired period based on the iteration */
+				switch (SW_Output[k].period)
+				{
+				case eSW_Day:
+					t = SW_Model.doy;
+					break;
+				case eSW_Week:
+					writeit = (SW_Model.newweek || bFlush);
+					t = (SW_Model.week + 1) - tOffset;
+					break;
+				case eSW_Month:
+					writeit = (SW_Model.newmonth || bFlush);
+					t = (SW_Model.month + 1) - tOffset;
+					break;
+				case eSW_Year:
+					writeit = (SW_Model.newyear || bFlush);
+					t = SW_Output[k].first; /* always output this period */
+					break;
+				default:
+					LogError(stdout, LOGFATAL,
+							"Invalid period in SW_OUT_write_today().");
+				}
+				if (!writeit || t < SW_Output[k].first || t > SW_Output[k].last)
+					continue;
+
+				((void (*)(void)) SW_Output[k].pfunc)();
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+				switch (timeSteps[k][i])
+				{ /* based on iteration of for loop, determines which file to output to */
+				case eSW_Day:
+					fprintf(SW_Output[k].fp_dy, "%s\n", outstr);
+					break;
+				case eSW_Week:
+					fprintf(SW_Output[k].fp_wk, "%s\n", outstr);
+					break;
+				case eSW_Month:
+					fprintf(SW_Output[k].fp_mo, "%s\n", outstr);
+					break;
+				case eSW_Year:
+					fprintf(SW_Output[k].fp_yr, "%s\n", outstr);
+					break;
+				}
+#elif defined(STEPWAT)
+				if (isPartialSoilwatOutput == FALSE)
+				{
+					switch (timeSteps[k][i])
+					{ /* based on iteration of for loop, determines which file to output to */
+						case eSW_Day:
+						fprintf(SW_Output[k].fp_dy, "%s\n", outstr);
+						break;
+						case eSW_Week:
+						fprintf(SW_Output[k].fp_wk, "%s\n", outstr);
+						break;
+						case eSW_Month:
+						fprintf(SW_Output[k].fp_mo, "%s\n", outstr);
+						break;
+						case eSW_Year:
+						fprintf(SW_Output[k].fp_yr, "%s\n", outstr);
+						break;
+					}
+				}
+#endif
+			}
+		}
+	}
+
+	// Revert changes to model year, as rest of the model does not use simulation years
+	SW_Model.year -= SW_Carbon.addtl_yr;
+
+}
+
+static void get_none(void)
+{
+	/* --------------------------------------------------- */
+	/* output routine for quantities that aren't yet implemented
+	 * this just gives the main output loop something to call,
+	 * rather than an empty pointer.
+	 */
+	outstr[0] = '\0';
+}
+
+static void get_outstrleader(TimeInt pd)
+{
+	/* --------------------------------------------------- */
+	/* this is called from each of the remaining get_ funcs
+	 * to set up the first (date) columns of the output
+	 * string.  It's the same for all and easier to put in
+	 * one place.
+	 * Periodic output for Month and/or Week are actually
+	 * printing for the PREVIOUS month or week.
+	 * Also, see note on test value in _write_today() for
+	 * explanation of the +1.
+	 */
+#ifndef RSOILWAT
+	switch (pd)
+	{
+	case eSW_Day:
+		sprintf(outstr, "%d%c%d", SW_Model.year, _Sep, SW_Model.doy);
+		break;
+	case eSW_Week:
+		sprintf(outstr, "%d%c%d", SW_Model.year, _Sep,
+				(SW_Model.week + 1) - tOffset);
+		break;
+	case eSW_Month:
+		sprintf(outstr, "%d%c%d", SW_Model.year, _Sep,
+				(SW_Model.month + 1) - tOffset);
+		break;
+	case eSW_Year:
+		sprintf(outstr, "%d", SW_Model.year);
+	}
+#endif
+}
+
+void get_co2effects(void) {
+	// Get the current period
+	OutPeriod pd = SW_Output[eSW_CO2Effects].period;
+
+	// Define variables
+	SW_CARBON *c = &SW_Carbon;
+	int i, doy, month;
+	RealD grassBiomass, shrubBiomass, treeBiomass, forbBiomass, totalBiomass;
+	RealD grassBioMult, shrubBioMult, treeBioMult, forbBioMult, grassWueMult, shrubWueMult, treeWueMult, forbWueMult;
+	RealD grassBiolive, shrubBiolive, treeBiolive, forbBiolive, totalBiolive;
+	grassBiomass = shrubBiomass = treeBiomass = forbBiomass = totalBiomass = 0;
+	grassBiolive = shrubBiolive = treeBiolive = forbBiolive = totalBiolive = 0;
+
+	// Grab the multipliers that were just used
+	// No averaging or summing required
+	grassBioMult = c->co2_bio_mult.grass;
+	shrubBioMult = c->co2_bio_mult.shrub;
+	treeBioMult = c->co2_bio_mult.tree;
+	forbBioMult = c->co2_bio_mult.forb;
+	grassWueMult = c->co2_wue_mult.grass;
+	shrubWueMult = c->co2_wue_mult.shrub;
+	treeWueMult = c->co2_wue_mult.tree;
+	forbWueMult = c->co2_wue_mult.forb;
+
+	#ifndef RSOILWAT
+		char str[OUTSTRLEN];
+		get_outstrleader(pd);
+	#endif
+
+	switch(pd) {
+		case eSW_Day:
+			doy = SW_Model.doy;
+
+			// Grab the interpolated values
+			if (GT(SW_VegProd.fractionGrass, 0.))
+			{
+				grassBiomass = SW_VegProd.grass.biomass_daily[doy];
+				grassBiolive = SW_VegProd.grass.biolive_daily[doy];
+			}
+			if (GT(SW_VegProd.fractionShrub, 0.))
+			{
+				shrubBiomass = SW_VegProd.shrub.biomass_daily[doy];
+				shrubBiolive = SW_VegProd.shrub.biolive_daily[doy];
+			}
+			if (GT(SW_VegProd.fractionTree, 0.))
+			{
+				treeBiomass = SW_VegProd.tree.biomass_daily[doy];
+				treeBiolive = SW_VegProd.tree.biolive_daily[doy];
+			}
+			if (GT(SW_VegProd.fractionForb, 0.))
+			{
+				forbBiomass = SW_VegProd.forb.biomass_daily[doy];
+				forbBiolive = SW_VegProd.forb.biolive_daily[doy];
+			}
+
+			totalBiomass = grassBiomass + shrubBiomass + treeBiomass + forbBiomass;
+			totalBiolive = grassBiolive + shrubBiolive + treeBiolive + forbBiolive;
+
+			#ifdef RSOILWAT
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 0] = SW_Model.year;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 1] = doy;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 2] = grassBiomass;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 3] = shrubBiomass;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 4] = treeBiomass;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 5] = forbBiomass;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 6] = totalBiomass;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 7] = grassBiolive;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 8] = shrubBiolive;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 9] = treeBiolive;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 10] = forbBiolive;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 11] = totalBiolive;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 12] = grassBioMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 13] = shrubBioMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 14] = treeBioMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 15] = forbBioMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 16] = grassWueMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 17] = shrubWueMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 18] = treeWueMult;
+				p_Rco2effects_dy[SW_Output[eSW_CO2Effects].dy_row + dy_nrow * 19] = forbWueMult;
+				SW_Output[eSW_CO2Effects].dy_row++;
+			#endif
+			break;
+
+		case eSW_Week:
+			doy = SW_Model.doy;
+
+			/* Get weekly values by grabbing the previous 7 days and averaging */
+
+			// Grab last 7 days
+			for (i = doy - WKDAYS; i < doy; i++)
+			{
+				if (GT(SW_VegProd.fractionGrass, 0.))
+				{
+					grassBiomass += SW_VegProd.grass.biomass_daily[i];
+					grassBiolive += SW_VegProd.grass.biolive_daily[i];
+				}
+				if (GT(SW_VegProd.fractionShrub, 0.))
+				{
+					shrubBiomass += SW_VegProd.shrub.biomass_daily[i];
+					shrubBiolive += SW_VegProd.shrub.biolive_daily[i];
+				}
+				if (GT(SW_VegProd.fractionTree, 0.))
+				{
+					treeBiomass += SW_VegProd.tree.biomass_daily[i];
+					treeBiolive += SW_VegProd.tree.biolive_daily[i];
+				}
+				if (GT(SW_VegProd.fractionForb, 0.))
+				{
+					forbBiomass += SW_VegProd.forb.biomass_daily[i];
+					forbBiolive += SW_VegProd.forb.biolive_daily[i];
+				}
+			}
+
+			// Calculate averages
+			grassBiomass /= 7;
+			shrubBiomass /= 7;
+			treeBiomass /= 7;
+			forbBiomass /= 7;
+			grassBiolive /= 7;
+			shrubBiolive /= 7;
+			treeBiolive /= 7;
+			forbBiolive /= 7;
+
+			// Sum PFT totals
+			totalBiomass = grassBiomass + shrubBiomass + treeBiomass + forbBiomass;
+			totalBiolive = grassBiolive + shrubBiolive + treeBiolive + forbBiolive;
+
+			#ifdef RSOILWAT
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 0] = SW_Model.year;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 2] = grassBiomass;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 3] = shrubBiomass;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 4] = treeBiomass;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 5] = forbBiomass;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 6] = totalBiomass;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 7] = grassBiolive;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 8] = shrubBiolive;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 9] = treeBiolive;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 10] = forbBiolive;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 11] = totalBiolive;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 12] = grassBioMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 13] = shrubBioMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 14] = treeBioMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 15] = forbBioMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 16] = grassWueMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 17] = shrubWueMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 18] = treeWueMult;
+				p_Rco2effects_wk[SW_Output[eSW_CO2Effects].wk_row + wk_nrow * 19] = forbWueMult;
+				SW_Output[eSW_CO2Effects].wk_row++;
+			#endif
+			break;
+
+		case eSW_Month:
+			month = (SW_Model.month) - tOffset;
+
+			// Daily and weekly values came from interpolating monthly values, so just use the real values here
+			if (GT(SW_VegProd.fractionGrass, 0.))
+			{
+				grassBiomass = SW_VegProd.grass.CO2_biomass[month];
+				grassBiolive = grassBiomass * SW_VegProd.grass.pct_live[month];  // Calculate biolive at the monthly level for simplicity
+			}
+			if (GT(SW_VegProd.fractionShrub, 0.))
+			{
+				shrubBiomass = SW_VegProd.shrub.CO2_biomass[month];
+				shrubBiolive = shrubBiomass * SW_VegProd.shrub.pct_live[month];
+			}
+			if (GT(SW_VegProd.fractionTree, 0.))
+			{
+				treeBiomass = SW_VegProd.tree.biomass[month];
+				treeBiolive = treeBiomass * SW_VegProd.tree.CO2_pct_live[month];
+			}
+			if (GT(SW_VegProd.fractionForb, 0.))
+			{
+				forbBiomass = SW_VegProd.forb.CO2_biomass[month];
+				forbBiolive = forbBiomass * SW_VegProd.forb.pct_live[month];
+			}
+
+			totalBiomass = grassBiomass + shrubBiomass + treeBiomass + forbBiomass;
+			totalBiolive = grassBiolive + shrubBiolive + treeBiolive + forbBiolive;
+
+			#ifdef RSOILWAT
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 0] = SW_Model.year;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 1] = month + 1;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 2] = grassBiomass;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 3] = shrubBiomass;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 4] = treeBiomass;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 5] = forbBiomass;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 6] = totalBiomass;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 7] = grassBiolive;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 8] = shrubBiolive;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 9] = treeBiolive;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 10] = forbBiolive;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 11] = totalBiolive;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 12] = grassBioMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 13] = shrubBioMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 14] = treeBioMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 15] = forbBioMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 16] = grassWueMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 17] = shrubWueMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 18] = treeWueMult;
+				p_Rco2effects_mo[SW_Output[eSW_CO2Effects].mo_row + mo_nrow * 19] = forbWueMult;
+				SW_Output[eSW_CO2Effects].mo_row++;
+			#endif
+			break;
+
+		case eSW_Year:
+			// Get totals per PFT
+			for (i = 0; i < 12; i++) {
+				if (GT(SW_VegProd.fractionGrass, 0.))
+				{
+					grassBiomass += SW_VegProd.grass.CO2_biomass[i];
+					grassBiolive += grassBiomass * SW_VegProd.grass.pct_live[i];
+				}
+				if (GT(SW_VegProd.fractionShrub, 0.))
+				{
+					shrubBiomass += SW_VegProd.shrub.CO2_biomass[i];
+					shrubBiolive += shrubBiomass * SW_VegProd.shrub.pct_live[i];
+				}
+				if (GT(SW_VegProd.fractionTree, 0.))
+				{
+				  treeBiomass += SW_VegProd.tree.biomass[i];
+				  treeBiolive += treeBiomass * SW_VegProd.tree.CO2_pct_live[i];
+				}
+				if (GT(SW_VegProd.fractionForb, 0.))
+				{
+					forbBiomass += SW_VegProd.forb.CO2_biomass[i];
+					forbBiolive += forbBiomass * SW_VegProd.forb.pct_live[i];
+				}
+			}
+
+			// Calculate averages
+			grassBiomass /= 12;
+			shrubBiomass /= 12;
+			treeBiomass  /= 12;
+			forbBiomass  /= 12;
+			grassBiolive /= 12;
+			shrubBiolive /= 12;
+			treeBiolive /= 12;
+			forbBiolive /= 12;
+
+			// Sum PFT totals
+			totalBiomass = grassBiomass + shrubBiomass + treeBiomass + forbBiomass;
+			totalBiolive = grassBiolive + shrubBiolive + treeBiolive + forbBiolive;
+
+			#ifdef RSOILWAT
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 0] = SW_Model.year;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 1] = grassBiomass;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 2] = shrubBiomass;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 3] = treeBiomass;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 4] = forbBiomass;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 5] = totalBiomass;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 6] = grassBiolive;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 7] = shrubBiolive;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 8] = treeBiolive;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 9] = forbBiolive;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 10] = totalBiolive;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 11] = grassBioMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 12] = shrubBioMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 13] = treeBioMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 14] = forbBioMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 15] = grassWueMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 16] = shrubWueMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 17] = treeWueMult;
+				p_Rco2effects_yr[SW_Output[eSW_CO2Effects].yr_row + yr_nrow * 18] = forbWueMult;
+				SW_Output[eSW_CO2Effects].yr_row++;
+			#endif
+			break;
+	}
+
+	#ifndef RSOILWAT
+		sprintf(str, "%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f%c%f",
+		_Sep, grassBiomass,
+		_Sep, shrubBiomass,
+		_Sep, treeBiomass,
+		_Sep, forbBiomass,
+		_Sep, totalBiomass,
+		_Sep, grassBiolive,
+		_Sep, shrubBiolive,
+		_Sep, treeBiolive,
+		_Sep, forbBiolive,
+		_Sep, totalBiolive,
+		_Sep, grassBioMult,
+		_Sep, shrubBioMult,
+		_Sep, treeBioMult,
+		_Sep, forbBioMult,
+		_Sep, grassWueMult,
+		_Sep, shrubWueMult,
+		_Sep, treeWueMult,
+		_Sep, forbWueMult);
+		strcat(outstr, str);
+	#endif
+}
+
+static void get_estab(void)
+{
+	/* --------------------------------------------------- */
+	/* the establishment check produces, for each species in
+	 * the given set, a day of year >=0 that the species
+	 * established itself in the current year.  The output
+	 * will be a single row of numbers for each year.  Each
+	 * column represents a species in the order it was entered
+	 * in the estabs.in file.  The value will be the day that
+	 * the species established, or 0 if it didn't establish
+	 * this year.
+	 */
+	SW_VEGESTAB *v = &SW_VegEstab;
+	OutPeriod pd = SW_Output[eSW_Estab].period;
+	IntU i;
+	char str[10];
+#ifndef RSOILWAT
+	get_outstrleader(pd);
+#else
+	switch(pd)
+	{
+		case eSW_Day:
+		p_Restabs_dy[SW_Output[eSW_Estab].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Restabs_dy[SW_Output[eSW_Estab].dy_row + dy_nrow * 1] = SW_Model.doy;
+		break;
+		case eSW_Week:
+		p_Restabs_wk[SW_Output[eSW_Estab].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Restabs_wk[SW_Output[eSW_Estab].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		break;
+		case eSW_Month:
+		p_Restabs_mo[SW_Output[eSW_Estab].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Restabs_mo[SW_Output[eSW_Estab].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		break;
+		case eSW_Year:
+		p_Restabs_yr[SW_Output[eSW_Estab].yr_row + yr_nrow * 0] = SW_Model.year;
+		break;
+	}
+#endif
+	for (i = 0; i < v->count; i++)
+	{
+#ifndef RSOILWAT
+		sprintf(str, "%c%d", _Sep, v->parms[i]->estab_doy);
+		strcat(outstr, str);
+#else
+		switch(pd)
+		{
+			case eSW_Day:
+			p_Restabs_dy[SW_Output[eSW_Estab].dy_row + dy_nrow * (i + 2)] = v->parms[i]->estab_doy;
+			break;
+			case eSW_Week:
+			p_Restabs_wk[SW_Output[eSW_Estab].wk_row + wk_nrow * (i + 2)] = v->parms[i]->estab_doy;
+			break;
+			case eSW_Month:
+			p_Restabs_mo[SW_Output[eSW_Estab].mo_row + mo_nrow * (i + 2)] = v->parms[i]->estab_doy;
+			break;
+			case eSW_Year:
+			p_Restabs_yr[SW_Output[eSW_Estab].yr_row + yr_nrow * (i + 1)] = v->parms[i]->estab_doy;
+			break;
+		}
+#endif
+	}
+#ifdef RSOILWAT
+	switch(pd)
+	{
+		case eSW_Day:
+		SW_Output[eSW_Estab].dy_row++;
+		break;
+		case eSW_Week:
+		SW_Output[eSW_Estab].wk_row++;
+		break;
+		case eSW_Month:
+		SW_Output[eSW_Estab].mo_row++;
+		break;
+		case eSW_Year:
+		SW_Output[eSW_Estab].yr_row++;
+		break;
+	}
+#endif
+
+}
+
+static void get_temp(void)
+{
+	/* --------------------------------------------------- */
+	/* each of these get_<envparm> -type funcs return a
+	 * formatted string of the appropriate type and are
+	 * pointed to by SW_Output[k].pfunc so they can be called
+	 * anonymously by looping over the Output[k] list
+	 * (see _output_today() for usage.)
+	 * they all use the module-level string outstr[].
+	 */
+	/* 10-May-02 (cwb) Added conditionals for interfacing with STEPPE
+	 * 05-Mar-03 (cwb) Added code for max,min,avg. Previously, only avg was output.
+	 * 22 June-15 (akt)  Added code for adding surfaceTemp at output
+	 */
+	SW_WEATHER *v = &SW_Weather;
+	OutPeriod pd = SW_Output[eSW_Temp].period;
+	RealD v_avg = SW_MISSING;
+	RealD v_min = SW_MISSING, v_max = SW_MISSING;
+	RealD surfaceTempVal = SW_MISSING;
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+#elif defined(STEPWAT)
+	char str[OUTSTRLEN];
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		get_outstrleader(pd);
+	}
+#endif
+
+	switch (pd)
+	{
+	case eSW_Day:
+#ifndef RSOILWAT
+		v_max = v->dysum.temp_max;
+		v_min = v->dysum.temp_min;
+		v_avg = v->dysum.temp_avg;
+		surfaceTempVal = v->dysum.surfaceTemp;
+#else
+		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 2] = v->dysum.temp_max;
+		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 3] = v->dysum.temp_min;
+		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 4] = v->dysum.temp_avg;
+		p_Rtemp_dy[SW_Output[eSW_Temp].dy_row + dy_nrow * 5] = v->dysum.surfaceTemp;
+		SW_Output[eSW_Temp].dy_row++;
+#endif
+		break;
+	case eSW_Week:
+#ifndef RSOILWAT
+		v_max = v->wkavg.temp_max;
+		v_min = v->wkavg.temp_min;
+		v_avg = v->wkavg.temp_avg;
+		surfaceTempVal = v->wkavg.surfaceTemp;
+#else
+		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 2] = v->wkavg.temp_max;
+		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 3] = v->wkavg.temp_min;
+		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 4] = v->wkavg.temp_avg;
+		p_Rtemp_wk[SW_Output[eSW_Temp].wk_row + wk_nrow * 5] = v->wkavg.surfaceTemp;
+		SW_Output[eSW_Temp].wk_row++;
+#endif
+		break;
+	case eSW_Month:
+#ifndef RSOILWAT
+		v_max = v->moavg.temp_max;
+		v_min = v->moavg.temp_min;
+		v_avg = v->moavg.temp_avg;
+		surfaceTempVal = v->moavg.surfaceTemp;
+#else
+		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 2] = v->moavg.temp_max;
+		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 3] = v->moavg.temp_min;
+		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 4] = v->moavg.temp_avg;
+		p_Rtemp_mo[SW_Output[eSW_Temp].mo_row + mo_nrow * 5] = v->moavg.surfaceTemp;
+		SW_Output[eSW_Temp].mo_row++;
+#endif
+		break;
+	case eSW_Year:
+#ifndef RSOILWAT
+		v_max = v->yravg.temp_max;
+		v_min = v->yravg.temp_min;
+		v_avg = v->yravg.temp_avg;
+		surfaceTempVal = v->yravg.surfaceTemp;
+#else
+		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 1] = v->yravg.temp_max;
+		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 2] = v->yravg.temp_min;
+		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 3] = v->yravg.temp_avg;
+		p_Rtemp_yr[SW_Output[eSW_Temp].yr_row + yr_nrow * 4] = v->yravg.surfaceTemp;
+		SW_Output[eSW_Temp].yr_row++;
+#endif
+		break;
+	}
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, v_max, _Sep, v_min, _Sep,
+			v_avg, _Sep, surfaceTempVal);
+	strcat(outstr, str);
+#elif defined(STEPWAT)
+
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, v_max, _Sep, v_min, _Sep, v_avg, _Sep, surfaceTempVal);
+		strcat(outstr, str);
+	}
+	else
+	{
+
+		if (pd != eSW_Year)
+		LogError(logfp, LOGFATAL, "Invalid output period for TEMP; should be YR %7.6f, %7.6f",v_max, v_min); //added v_max, v_min for compiler
+		SXW.temp = v_avg;
+		SXW.surfaceTemp = surfaceTempVal;
+	}
+#endif
+}
+
+static void get_precip(void)
+{
+	/* --------------------------------------------------- */
+	/* 	20091015 (drs) ppt is divided into rain and snow and all three values are output into precip */
+	SW_WEATHER *v = &SW_Weather;
+	OutPeriod pd = SW_Output[eSW_Precip].period;
+	RealD val_ppt = SW_MISSING, val_rain = SW_MISSING, val_snow = SW_MISSING,
+			val_snowmelt = SW_MISSING, val_snowloss = SW_MISSING;
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+
+#elif defined(STEPWAT)
+	char str[OUTSTRLEN];
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		get_outstrleader(pd);
+	}
+#endif
+
+	switch (pd)
+	{
+	case eSW_Day:
+#ifndef RSOILWAT
+		val_ppt = v->dysum.ppt;
+		val_rain = v->dysum.rain;
+		val_snow = v->dysum.snow;
+		val_snowmelt = v->dysum.snowmelt;
+		val_snowloss = v->dysum.snowloss;
+#else
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 2] = v->dysum.ppt;
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 3] = v->dysum.rain;
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 4] = v->dysum.snow;
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 5] = v->dysum.snowmelt;
+		p_Rprecip_dy[SW_Output[eSW_Precip].dy_row + dy_nrow * 6] = v->dysum.snowloss;
+		SW_Output[eSW_Precip].dy_row++;
+#endif
+		break;
+	case eSW_Week:
+#ifndef RSOILWAT
+		val_ppt = v->wkavg.ppt;
+		val_rain = v->wkavg.rain;
+		val_snow = v->wkavg.snow;
+		val_snowmelt = v->wkavg.snowmelt;
+		val_snowloss = v->wkavg.snowloss;
+#else
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 2] = v->wkavg.ppt;
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 3] = v->wkavg.rain;
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 4] = v->wkavg.snow;
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 5] = v->wkavg.snowmelt;
+		p_Rprecip_wk[SW_Output[eSW_Precip].wk_row + wk_nrow * 6] = v->wkavg.snowloss;
+		SW_Output[eSW_Precip].wk_row++;
+#endif
+		break;
+	case eSW_Month:
+#ifndef RSOILWAT
+		val_ppt = v->moavg.ppt;
+		val_rain = v->moavg.rain;
+		val_snow = v->moavg.snow;
+		val_snowmelt = v->moavg.snowmelt;
+		val_snowloss = v->moavg.snowloss;
+#else
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 2] = v->moavg.ppt;
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 3] = v->moavg.rain;
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 4] = v->moavg.snow;
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 5] = v->moavg.snowmelt;
+		p_Rprecip_mo[SW_Output[eSW_Precip].mo_row + mo_nrow * 6] = v->moavg.snowloss;
+		SW_Output[eSW_Precip].mo_row++;
+#endif
+		break;
+	case eSW_Year:
+#ifndef RSOILWAT
+		val_ppt = v->yravg.ppt;
+		val_rain = v->yravg.rain;
+		val_snow = v->yravg.snow;
+		val_snowmelt = v->yravg.snowmelt;
+		val_snowloss = v->yravg.snowloss;
+		break;
+#else
+		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 1] = v->yravg.ppt;
+		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 2] = v->yravg.rain;
+		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 3] = v->yravg.snow;
+		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 4] = v->yravg.snowmelt;
+		p_Rprecip_yr[SW_Output[eSW_Precip].yr_row + yr_nrow * 5] = v->yravg.snowloss;
+		SW_Output[eSW_Precip].yr_row++;
+#endif
+	}
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_ppt, _Sep,
+			val_rain, _Sep, val_snow, _Sep, val_snowmelt, _Sep, val_snowloss);
+	strcat(outstr, str);
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_ppt, _Sep, val_rain, _Sep, val_snow, _Sep, val_snowmelt, _Sep, val_snowloss);
+		strcat(outstr, str);
+	}
+	else
+	{
+
+		if (pd != eSW_Year)
+		LogError(logfp, LOGFATAL, "Invalid output period for PRECIP; should be YR, %7.6f,%7.6f,%7.6f,%7.6f", val_snowloss, val_snowmelt, val_snow, val_rain); //added extra for compiler
+		SXW.ppt = val_ppt;
+	}
+#endif
+}
+
+static void get_vwcBulk(void)
+{
+	/* --------------------------------------------------- */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_VWCBulk].period;
+	RealD *val = malloc(sizeof(RealD) * SW_Site.n_layers);
+	ForEachSoilLayer(i)
+		val[i] = SW_MISSING;
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[OUTSTRLEN];
+#elif defined(STEPWAT)
+	char str[OUTSTRLEN];
+#endif
+
+	get_outstrleader(pd);
+	switch (pd)
+	{ /* vwcBulk at this point is identical to swcBulk */
+	case eSW_Day:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+			val[i] = v->dysum.vwcBulk[i] / SW_Site.lyr[i]->width;
+#else
+		p_RvwcBulk_dy[SW_Output[eSW_VWCBulk].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_RvwcBulk_dy[SW_Output[eSW_VWCBulk].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		p_RvwcBulk_dy[SW_Output[eSW_VWCBulk].dy_row + dy_nrow * (i + 2)] = v->dysum.vwcBulk[i] / SW_Site.lyr[i]->width;
+		SW_Output[eSW_VWCBulk].dy_row++;
+#endif
+		break;
+	case eSW_Week:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+			val[i] = v->wkavg.vwcBulk[i] / SW_Site.lyr[i]->width;
+#else
+		p_RvwcBulk_wk[SW_Output[eSW_VWCBulk].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_RvwcBulk_wk[SW_Output[eSW_VWCBulk].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RvwcBulk_wk[SW_Output[eSW_VWCBulk].wk_row + wk_nrow * (i + 2)] = v->wkavg.vwcBulk[i] / SW_Site.lyr[i]->width;
+		SW_Output[eSW_VWCBulk].wk_row++;
+#endif
+		break;
+	case eSW_Month:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+			val[i] = v->moavg.vwcBulk[i] / SW_Site.lyr[i]->width;
+#else
+		p_RvwcBulk_mo[SW_Output[eSW_VWCBulk].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_RvwcBulk_mo[SW_Output[eSW_VWCBulk].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RvwcBulk_mo[SW_Output[eSW_VWCBulk].mo_row + mo_nrow * (i + 2)] = v->moavg.vwcBulk[i] / SW_Site.lyr[i]->width;
+		SW_Output[eSW_VWCBulk].mo_row++;
+#endif
+		break;
+	case eSW_Year:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+			val[i] = v->yravg.vwcBulk[i] / SW_Site.lyr[i]->width;
+#else
+		p_RvwcBulk_yr[SW_Output[eSW_VWCBulk].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		p_RvwcBulk_yr[SW_Output[eSW_VWCBulk].yr_row + yr_nrow * (i + 1)] = v->yravg.vwcBulk[i] / SW_Site.lyr[i]->width;
+		SW_Output[eSW_VWCBulk].yr_row++;
+#endif
+		break;
+	}
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+			{
+				sprintf(str, "%c%7.6f", _Sep, val[i]);
+				strcat(outstr, str);
+			}
+	}
+	/*ForEachSoilLayer(i) {
+	 switch (pd) {
+	 case eSW_Day: p = t->doy-1; break; // print current but as index
+	 case eSW_Week: p = t->week-1; break; // print previous to current
+	 case eSW_Month: p = t->month-1; break; // print previous to current
+	 // YEAR should never be used with STEPWAT //
+	 }
+	 if (bFlush) p++;
+	 SXW.swc[Ilp(i,p)] = val[i];
+	 }*/
+#endif
+	free(val);
+}
+
+static void get_vwcMatric(void)
+{
+	/* --------------------------------------------------- */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_VWCMatric].period;
+	RealD convert;
+	RealD *val = malloc(sizeof(RealD) * SW_Site.n_layers);
+	ForEachSoilLayer(i)
+		val[i] = SW_MISSING;
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[OUTSTRLEN];
+#elif defined(STEPWAT)
+	char str[OUTSTRLEN];
+#endif
+
+	get_outstrleader(pd);
+	/* vwcMatric at this point is identical to swcBulk */
+	switch (pd)
+	{
+	case eSW_Day:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
+					/ SW_Site.lyr[i]->width;
+			val[i] = v->dysum.vwcMatric[i] * convert;
+		}
+#else
+		p_RvwcMatric_dy[SW_Output[eSW_VWCMatric].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_RvwcMatric_dy[SW_Output[eSW_VWCMatric].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
+			p_RvwcMatric_dy[SW_Output[eSW_VWCMatric].dy_row + dy_nrow * (i + 2)] = v->dysum.vwcMatric[i] * convert;
+		}
+		SW_Output[eSW_VWCMatric].dy_row++;
+#endif
+		break;
+	case eSW_Week:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
+					/ SW_Site.lyr[i]->width;
+			val[i] = v->wkavg.vwcMatric[i] * convert;
+		}
+#else
+		p_RvwcMatric_wk[SW_Output[eSW_VWCMatric].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_RvwcMatric_wk[SW_Output[eSW_VWCMatric].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
+			p_RvwcMatric_wk[SW_Output[eSW_VWCMatric].wk_row + wk_nrow * (i + 2)] = v->wkavg.vwcMatric[i] * convert;
+		}
+		SW_Output[eSW_VWCMatric].wk_row++;
+#endif
+		break;
+	case eSW_Month:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
+					/ SW_Site.lyr[i]->width;
+			val[i] = v->moavg.vwcMatric[i] * convert;
+		}
+#else
+		p_RvwcMatric_mo[SW_Output[eSW_VWCMatric].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_RvwcMatric_mo[SW_Output[eSW_VWCMatric].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
+			p_RvwcMatric_mo[SW_Output[eSW_VWCMatric].mo_row + mo_nrow * (i + 2)] = v->moavg.vwcMatric[i] * convert;
+		}
+		SW_Output[eSW_VWCMatric].mo_row++;
+#endif
+		break;
+	case eSW_Year:
+#ifndef RSOILWAT
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel)
+					/ SW_Site.lyr[i]->width;
+			val[i] = v->yravg.vwcMatric[i] * convert;
+		}
+#else
+		p_RvwcMatric_yr[SW_Output[eSW_VWCMatric].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel) / SW_Site.lyr[i]->width;
+      p_RvwcMatric_yr[SW_Output[eSW_VWCMatric].yr_row + yr_nrow * (i + 1)] = v->yravg.vwcMatric[i] * convert;
+		}
+		SW_Output[eSW_VWCMatric].yr_row++;
+#endif
+		break;
+	}
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+		{
+			sprintf(str, "%c%7.6f", _Sep, val[i]);
+			strcat(outstr, str);
+		}
+
+	}
+
+	/*ForEachSoilLayer(i)
+	 {
+	 switch (pd) {
+	 case eSW_Day: p = t->doy-1; break; // print current but as index
+	 case eSW_Week: p = t->week-1; break; // print previous to current
+	 case eSW_Month: p = t->month-1; break; // print previous to current
+	 // YEAR should never be used with STEPWAT
+	 }
+	 if (bFlush) p++;
+	 SXW.swc[Ilp(i,p)] = val[i];
+	 }*/
+#endif
+	free(val);
+}
+
+static void get_swcBulk(void)
+{
+	/* --------------------------------------------------- */
+	/* added 21-Oct-03, cwb */
+#ifdef STEPWAT
+	TimeInt p;
+	SW_MODEL *t = &SW_Model;
+
+#endif
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SWCBulk].period;
+	RealD val = SW_MISSING;
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.swcBulk[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.swcBulk[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.swcBulk[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.swcBulk[i];
+			break;
+		}
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#elif defined(RSOILWAT)
+	switch (pd)
+	{
+		case eSW_Day:
+		p_RswcBulk_dy[SW_Output[eSW_SWCBulk].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_RswcBulk_dy[SW_Output[eSW_SWCBulk].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		p_RswcBulk_dy[SW_Output[eSW_SWCBulk].dy_row + dy_nrow * (i + 2)] = v->dysum.swcBulk[i];
+		SW_Output[eSW_SWCBulk].dy_row++;
+		break;
+		case eSW_Week:
+		p_RswcBulk_wk[SW_Output[eSW_SWCBulk].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_RswcBulk_wk[SW_Output[eSW_SWCBulk].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RswcBulk_wk[SW_Output[eSW_SWCBulk].wk_row + wk_nrow * (i + 2)] = v->wkavg.swcBulk[i];
+		SW_Output[eSW_SWCBulk].wk_row++;
+		break;
+		case eSW_Month:
+		p_RswcBulk_mo[SW_Output[eSW_SWCBulk].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_RswcBulk_mo[SW_Output[eSW_SWCBulk].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RswcBulk_mo[SW_Output[eSW_SWCBulk].mo_row + mo_nrow * (i + 2)] = v->moavg.swcBulk[i];
+		SW_Output[eSW_SWCBulk].mo_row++;
+		break;
+		case eSW_Year:
+		p_RswcBulk_yr[SW_Output[eSW_SWCBulk].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		p_RswcBulk_yr[SW_Output[eSW_SWCBulk].yr_row + yr_nrow * (i + 1)] = v->yravg.swcBulk[i];
+		SW_Output[eSW_SWCBulk].yr_row++;
+		break;
+	}
+#elif defined(STEPWAT)
+	char str[OUTSTRLEN];
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		get_outstrleader(pd);
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day:
+				val = v->dysum.swcBulk[i];
+				break;
+				case eSW_Week:
+				val = v->wkavg.swcBulk[i];
+				break;
+				case eSW_Month:
+				val = v->moavg.swcBulk[i];
+				break;
+				case eSW_Year:
+				val = v->yravg.swcBulk[i];
+				break;
+			}
+			sprintf(str, "%c%7.6f", _Sep, val);
+			strcat(outstr, str);
+		}
+
+	}
+	else
+	{
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day:
+				p = t->doy-1;
+				val = v->dysum.swcBulk[i];
+				break; // print current but as index
+				case eSW_Week:
+				p = t->week-1;
+				val = v->wkavg.swcBulk[i];
+				break;// print previous to current
+				case eSW_Month:
+				p = t->month-1;
+				val = v->moavg.swcBulk[i];
+				break;// print previous to current
+				// YEAR should never be used with STEPWAT
+			}
+			if (bFlush) p++;
+			SXW.swc[Ilp(i,p)] = val;
+		}
+	}
+#endif
+}
+
+static void get_swpMatric(void)
+{
+	/* --------------------------------------------------- */
+	/* can't take arithmetic average of swp because it's
+	 * exponential.  At this time (until I remember to look
+	 * up whether harmonic or some other average is better
+	 * and fix this) we're not averaging swp but converting
+	 * the averaged swc.  This also avoids converting for
+	 * each day.
+	 *
+	 * added 12-Oct-03, cwb */
+
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SWPMatric].period;
+	RealD val = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+
+	get_outstrleader(pd);
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{ /* swpMatric at this point is identical to swcBulk */
+		case eSW_Day:
+			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
+					v->dysum.swpMatric[i], i);
+			break;
+		case eSW_Week:
+			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
+					v->wkavg.swpMatric[i], i);
+			break;
+		case eSW_Month:
+			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
+					v->moavg.swpMatric[i], i);
+			break;
+		case eSW_Year:
+			val = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel,
+					v->yravg.swpMatric[i], i);
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_RswpMatric_dy[SW_Output[eSW_SWPMatric].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_RswpMatric_dy[SW_Output[eSW_SWPMatric].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		p_RswpMatric_dy[SW_Output[eSW_SWPMatric].dy_row + dy_nrow * (i + 2)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->dysum.swpMatric[i], i);
+		SW_Output[eSW_SWPMatric].dy_row++;
+		break;
+		case eSW_Week:
+		p_RswpMatric_wk[SW_Output[eSW_SWPMatric].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_RswpMatric_wk[SW_Output[eSW_SWPMatric].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RswpMatric_wk[SW_Output[eSW_SWPMatric].wk_row + wk_nrow * (i + 2)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->wkavg.swpMatric[i], i);
+		SW_Output[eSW_SWPMatric].wk_row++;
+		break;
+		case eSW_Month:
+		p_RswpMatric_mo[SW_Output[eSW_SWPMatric].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_RswpMatric_mo[SW_Output[eSW_SWPMatric].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RswpMatric_mo[SW_Output[eSW_SWPMatric].mo_row + mo_nrow * (i + 2)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->moavg.swpMatric[i], i);
+		SW_Output[eSW_SWPMatric].mo_row++;
+		break;
+		case eSW_Year:
+		p_RswpMatric_yr[SW_Output[eSW_SWPMatric].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		p_RswpMatric_yr[SW_Output[eSW_SWPMatric].yr_row + yr_nrow * (i + 1)] = SW_SWCbulk2SWPmatric(SW_Site.lyr[i]->fractionVolBulk_gravel, v->yravg.swpMatric[i], i);
+		SW_Output[eSW_SWPMatric].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_swaBulk(void)
+{
+	/* --------------------------------------------------- */
+
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SWABulk].period;
+	RealD val = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.swaBulk[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.swaBulk[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.swaBulk[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.swaBulk[i];
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_RswaBulk_dy[SW_Output[eSW_SWABulk].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_RswaBulk_dy[SW_Output[eSW_SWABulk].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		p_RswaBulk_dy[SW_Output[eSW_SWABulk].dy_row + dy_nrow * (i + 2)] = v->dysum.swaBulk[i];
+		SW_Output[eSW_SWABulk].dy_row++;
+		break;
+		case eSW_Week:
+		p_RswaBulk_wk[SW_Output[eSW_SWABulk].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_RswaBulk_wk[SW_Output[eSW_SWABulk].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RswaBulk_wk[SW_Output[eSW_SWABulk].wk_row + wk_nrow * (i + 2)] = v->wkavg.swaBulk[i];
+		SW_Output[eSW_SWABulk].wk_row++;
+		break;
+		case eSW_Month:
+		p_RswaBulk_mo[SW_Output[eSW_SWABulk].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_RswaBulk_mo[SW_Output[eSW_SWABulk].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		p_RswaBulk_mo[SW_Output[eSW_SWABulk].mo_row + mo_nrow * (i + 2)] = v->moavg.swaBulk[i];
+		SW_Output[eSW_SWABulk].mo_row++;
+		break;
+		case eSW_Year:
+		p_RswaBulk_yr[SW_Output[eSW_SWABulk].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		p_RswaBulk_yr[SW_Output[eSW_SWABulk].yr_row + yr_nrow * (i + 1)] = v->yravg.swaBulk[i];
+		SW_Output[eSW_SWABulk].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_swaMatric(void)
+{
+	/* --------------------------------------------------- */
+
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SWAMatric].period;
+	RealD val = SW_MISSING, convert;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	ForEachSoilLayer(i)
+	{ /* swaMatric at this point is identical to swaBulk */
+		convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.swaMatric[i] * convert;
+			break;
+		case eSW_Week:
+			val = v->wkavg.swaMatric[i] * convert;
+			break;
+		case eSW_Month:
+			val = v->moavg.swaMatric[i] * convert;
+			break;
+		case eSW_Year:
+			val = v->yravg.swaMatric[i] * convert;
+			break;
+		}
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_RswaMatric_dy[SW_Output[eSW_SWAMatric].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_RswaMatric_dy[SW_Output[eSW_SWAMatric].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
+			p_RswaMatric_dy[SW_Output[eSW_SWAMatric].dy_row + dy_nrow * (i + 2)] = v->dysum.swaMatric[i] * convert;
+		}
+		SW_Output[eSW_SWAMatric].dy_row++;
+		break;
+		case eSW_Week:
+		p_RswaMatric_wk[SW_Output[eSW_SWAMatric].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_RswaMatric_wk[SW_Output[eSW_SWAMatric].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
+			p_RswaMatric_wk[SW_Output[eSW_SWAMatric].wk_row + wk_nrow * (i + 2)] = v->wkavg.swaMatric[i] * convert;
+		}
+		SW_Output[eSW_SWAMatric].wk_row++;
+		break;
+		case eSW_Month:
+		p_RswaMatric_mo[SW_Output[eSW_SWAMatric].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_RswaMatric_mo[SW_Output[eSW_SWAMatric].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
+			p_RswaMatric_mo[SW_Output[eSW_SWAMatric].mo_row + mo_nrow * (i + 2)] = v->moavg.swaMatric[i] * convert;
+		}
+		SW_Output[eSW_SWAMatric].mo_row++;
+		break;
+		case eSW_Year:
+		p_RswaMatric_yr[SW_Output[eSW_SWAMatric].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		{
+			convert = 1. / (1. - SW_Site.lyr[i]->fractionVolBulk_gravel);
+			p_RswaMatric_yr[SW_Output[eSW_SWAMatric].yr_row + yr_nrow * (i + 1)] = v->yravg.swaMatric[i] * convert;
+		}
+		SW_Output[eSW_SWAMatric].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_surfaceWater(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SurfaceWater].period;
+	RealD val_surfacewater = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val_surfacewater = v->dysum.surfaceWater;
+		break;
+	case eSW_Week:
+		val_surfacewater = v->wkavg.surfaceWater;
+		break;
+	case eSW_Month:
+		val_surfacewater = v->moavg.surfaceWater;
+		break;
+	case eSW_Year:
+		val_surfacewater = v->yravg.surfaceWater;
+		break;
+	}
+	sprintf(str, "%c%7.6f", _Sep, val_surfacewater);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rsurface_water_dy[SW_Output[eSW_SurfaceWater].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rsurface_water_dy[SW_Output[eSW_SurfaceWater].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rsurface_water_dy[SW_Output[eSW_SurfaceWater].dy_row + dy_nrow * 2] = v->dysum.surfaceWater;
+		SW_Output[eSW_SurfaceWater].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rsurface_water_wk[SW_Output[eSW_SurfaceWater].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rsurface_water_wk[SW_Output[eSW_SurfaceWater].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rsurface_water_wk[SW_Output[eSW_SurfaceWater].wk_row + wk_nrow * 2] = v->wkavg.surfaceWater;
+		SW_Output[eSW_SurfaceWater].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rsurface_water_mo[SW_Output[eSW_SurfaceWater].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rsurface_water_mo[SW_Output[eSW_SurfaceWater].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rsurface_water_mo[SW_Output[eSW_SurfaceWater].mo_row + mo_nrow * 2] = v->moavg.surfaceWater;
+		SW_Output[eSW_SurfaceWater].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rsurface_water_yr[SW_Output[eSW_SurfaceWater].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rsurface_water_yr[SW_Output[eSW_SurfaceWater].yr_row + yr_nrow * 1] = v->yravg.surfaceWater;
+		SW_Output[eSW_SurfaceWater].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_runoff(void)
+{
+	/* --------------------------------------------------- */
+	/* (12/13/2012) (clk) Added function to output runoff variables */
+
+	SW_WEATHER *w = &SW_Weather;
+	OutPeriod pd = SW_Output[eSW_Runoff].period;
+	RealD val_totalRunoff = SW_MISSING, val_surfaceRunoff = SW_MISSING,
+			val_snowRunoff = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val_surfaceRunoff = w->dysum.surfaceRunoff;
+		val_snowRunoff = w->dysum.snowRunoff;
+		break;
+	case eSW_Week:
+		val_surfaceRunoff = w->wkavg.surfaceRunoff;
+		val_snowRunoff = w->wkavg.snowRunoff;
+		break;
+	case eSW_Month:
+		val_surfaceRunoff = w->moavg.surfaceRunoff;
+		val_snowRunoff = w->moavg.snowRunoff;
+		break;
+	case eSW_Year:
+		val_surfaceRunoff = w->yravg.surfaceRunoff;
+		val_snowRunoff = w->yravg.snowRunoff;
+		break;
+	}
+	val_totalRunoff = val_surfaceRunoff + val_snowRunoff;
+	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f", _Sep, val_totalRunoff, _Sep, val_surfaceRunoff, _Sep, val_snowRunoff);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 2] = (w->dysum.surfaceRunoff + w->dysum.snowRunoff);
+		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 3] = w->dysum.surfaceRunoff;
+		p_Rrunoff_dy[SW_Output[eSW_Runoff].dy_row + dy_nrow * 4] = w->dysum.snowRunoff;
+		SW_Output[eSW_Runoff].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 2] = (w->wkavg.surfaceRunoff + w->wkavg.snowRunoff);
+		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 3] = w->wkavg.surfaceRunoff;
+		p_Rrunoff_wk[SW_Output[eSW_Runoff].wk_row + wk_nrow * 4] = w->wkavg.snowRunoff;
+		SW_Output[eSW_Runoff].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 2] = (w->moavg.surfaceRunoff + w->moavg.snowRunoff);
+		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 3] = w->moavg.surfaceRunoff;
+		p_Rrunoff_mo[SW_Output[eSW_Runoff].mo_row + mo_nrow * 4] = w->moavg.snowRunoff;
+		SW_Output[eSW_Runoff].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 1] = (w->yravg.surfaceRunoff + w->yravg.snowRunoff);
+		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 2] = w->yravg.surfaceRunoff;
+		p_Rrunoff_yr[SW_Output[eSW_Runoff].yr_row + yr_nrow * 3] = w->yravg.snowRunoff;
+		SW_Output[eSW_Runoff].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_transp(void)
+{
+	/* --------------------------------------------------- */
+	/* 10-May-02 (cwb) Added conditional code to interface
+	 *           with STEPPE.
+	 */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_Transp].period;
+	RealD *val = malloc(sizeof(RealD) * SW_Site.n_layers);
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[OUTSTRLEN];
+#elif defined(STEPWAT)
+	char str[OUTSTRLEN];
+	TimeInt p;
+	SW_MODEL *t = &SW_Model;
+#endif
+	ForEachSoilLayer(i)
+		val[i] = 0;
+
+#ifdef RSOILWAT
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * 1] = SW_Model.doy;
+		break;
+		case eSW_Week:
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		break;
+		case eSW_Month:
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		break;
+		case eSW_Year:
+		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * 0] = SW_Model.year;
+		break;
+	}
+#endif
+
+#ifndef RSOILWAT
+	get_outstrleader(pd);
+	/* total transpiration */
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val[i] = v->dysum.transp_total[i];
+			break;
+		case eSW_Week:
+			val[i] = v->wkavg.transp_total[i];
+			break;
+		case eSW_Month:
+			val[i] = v->moavg.transp_total[i];
+			break;
+		case eSW_Year:
+			val[i] = v->yravg.transp_total[i];
+			break;
+		}
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2)] = v->dysum.transp_total[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2)] = v->wkavg.transp_total[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2)] = v->moavg.transp_total[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1)] = v->yravg.transp_total[i];
+		break;
+	}
+#endif
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+		{
+			sprintf(str, "%c%7.6f", _Sep, val[i]);
+			strcat(outstr, str);
+		}
+	}
+	else
+	{
+
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day: p = t->doy-1; break; /* print current but as index */
+				case eSW_Week: p = t->week-1; break; /* print previous to current */
+				case eSW_Month: p = t->month-1; break; /* print previous to current */
+				/* YEAR should never be used with STEPWAT */
+			}
+			if (bFlush) p++;
+			SXW.transpTotal[Ilp(i,p)] = val[i];
+		}
+	}
+#endif
+
+#ifndef RSOILWAT
+	/* tree-component transpiration */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val[i] = v->dysum.transp_tree[i];
+			break;
+		case eSW_Week:
+			val[i] = v->wkavg.transp_tree[i];
+			break;
+		case eSW_Month:
+			val[i] = v->moavg.transp_tree[i];
+			break;
+		case eSW_Year:
+			val[i] = v->yravg.transp_tree[i];
+			break;
+		}
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 1)] = v->dysum.transp_tree[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 1)] = v->wkavg.transp_tree[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 1)] = v->moavg.transp_tree[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 1)] = v->yravg.transp_tree[i];
+		break;
+	}
+#endif
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+		{
+			sprintf(str, "%c%7.6f", _Sep, val[i]);
+			strcat(outstr, str);
+		}
+	}
+	else
+	{
+
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day: p = t->doy-1; break; /* print current but as index */
+				case eSW_Week: p = t->week-1; break; /* print previous to current */
+				case eSW_Month: p = t->month-1; break; /* print previous to current */
+				/* YEAR should never be used with STEPWAT */
+			}
+			if (bFlush) p++;
+			SXW.transpTrees[Ilp(i,p)] = val[i];
+		}
+	}
+#endif
+
+#ifndef RSOILWAT
+	/* shrub-component transpiration */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val[i] = v->dysum.transp_shrub[i];
+			break;
+		case eSW_Week:
+			val[i] = v->wkavg.transp_shrub[i];
+			break;
+		case eSW_Month:
+			val[i] = v->moavg.transp_shrub[i];
+			break;
+		case eSW_Year:
+			val[i] = v->yravg.transp_shrub[i];
+			break;
+		}
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 2)] = v->dysum.transp_shrub[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 2)] = v->wkavg.transp_shrub[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 2)] = v->moavg.transp_shrub[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 2)] = v->yravg.transp_shrub[i];
+		break;
+	}
+#endif
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+		{
+			sprintf(str, "%c%7.6f", _Sep, val[i]);
+			strcat(outstr, str);
+		}
+	}
+	else
+	{
+
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day: p = t->doy-1; break; /* print current but as index */
+				case eSW_Week: p = t->week-1; break; /* print previous to current */
+				case eSW_Month: p = t->month-1; break; /* print previous to current */
+				/* YEAR should never be used with STEPWAT */
+			}
+			if (bFlush) p++;
+			SXW.transpShrubs[Ilp(i,p)] = val[i];
+		}
+	}
+#endif
+
+#ifndef RSOILWAT
+	/* forb-component transpiration */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val[i] = v->dysum.transp_forb[i];
+			break;
+		case eSW_Week:
+			val[i] = v->wkavg.transp_forb[i];
+			break;
+		case eSW_Month:
+			val[i] = v->moavg.transp_forb[i];
+			break;
+		case eSW_Year:
+			val[i] = v->yravg.transp_forb[i];
+			break;
+		}
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 3)] = v->dysum.transp_forb[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 3)] = v->wkavg.transp_forb[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 3)] = v->moavg.transp_forb[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 3)] = v->yravg.transp_forb[i];
+		break;
+	}
+#endif
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+		{
+			sprintf(str, "%c%7.6f", _Sep, val[i]);
+			strcat(outstr, str);
+		}
+	}
+	else
+	{
+
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day: p = t->doy-1; break; /* print current but as index */
+				case eSW_Week: p = t->week-1; break; /* print previous to current */
+				case eSW_Month: p = t->month-1; break; /* print previous to current */
+				/* YEAR should never be used with STEPWAT */
+			}
+			if (bFlush) p++;
+			SXW.transpForbs[Ilp(i,p)] = val[i];
+		}
+	}
+#endif
+
+#ifndef RSOILWAT
+	/* grass-component transpiration */
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val[i] = v->dysum.transp_grass[i];
+			break;
+		case eSW_Week:
+			val[i] = v->wkavg.transp_grass[i];
+			break;
+		case eSW_Month:
+			val[i] = v->moavg.transp_grass[i];
+			break;
+		case eSW_Year:
+			val[i] = v->yravg.transp_grass[i];
+			break;
+		}
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rtransp_dy[SW_Output[eSW_Transp].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 4)] = v->dysum.transp_grass[i];
+		SW_Output[eSW_Transp].dy_row++;
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rtransp_wk[SW_Output[eSW_Transp].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 4)] = v->wkavg.transp_grass[i];
+		SW_Output[eSW_Transp].wk_row++;
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rtransp_mo[SW_Output[eSW_Transp].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 4)] = v->moavg.transp_grass[i];
+		SW_Output[eSW_Transp].mo_row++;
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rtransp_yr[SW_Output[eSW_Transp].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 4)] = v->yravg.transp_grass[i];
+		SW_Output[eSW_Transp].yr_row++;
+		break;
+	}
+#endif
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	ForEachSoilLayer(i)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val[i]);
+		strcat(outstr, str);
+	}
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		ForEachSoilLayer(i)
+		{
+			sprintf(str, "%c%7.6f", _Sep, val[i]);
+			strcat(outstr, str);
+		}
+	}
+	else
+	{
+
+		ForEachSoilLayer(i)
+		{
+			switch (pd)
+			{
+				case eSW_Day: p = t->doy-1; break; /* print current but as index */
+				case eSW_Week: p = t->week-1; break; /* print previous to current */
+				case eSW_Month: p = t->month-1; break; /* print previous to current */
+				/* YEAR should never be used with STEPWAT */
+			}
+			if (bFlush) p++;
+			SXW.transpGrasses[Ilp(i,p)] = val[i];
+		}
+	}
+#endif
+	free(val);
+}
+
+static void get_evapSoil(void)
+{
+	/* --------------------------------------------------- */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_EvapSoil].period;
+	RealD val = SW_MISSING;
+
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	ForEachEvapLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.evap[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.evap[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.evap[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.evap[i];
+			break;
+		}
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Revap_soil_dy[SW_Output[eSW_EvapSoil].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Revap_soil_dy[SW_Output[eSW_EvapSoil].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachEvapLayer(i)
+		p_Revap_soil_dy[SW_Output[eSW_EvapSoil].dy_row + dy_nrow * (i + 2)] = v->dysum.evap[i];
+		SW_Output[eSW_EvapSoil].dy_row++;
+		break;
+		case eSW_Week:
+		p_Revap_soil_wk[SW_Output[eSW_EvapSoil].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Revap_soil_wk[SW_Output[eSW_EvapSoil].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachEvapLayer(i)
+		p_Revap_soil_wk[SW_Output[eSW_EvapSoil].wk_row + wk_nrow * (i + 2)] = v->wkavg.evap[i];
+		SW_Output[eSW_EvapSoil].wk_row++;
+		break;
+		case eSW_Month:
+		p_Revap_soil_mo[SW_Output[eSW_EvapSoil].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Revap_soil_mo[SW_Output[eSW_EvapSoil].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachEvapLayer(i)
+		p_Revap_soil_mo[SW_Output[eSW_EvapSoil].mo_row + mo_nrow * (i + 2)] = v->moavg.evap[i];
+		SW_Output[eSW_EvapSoil].mo_row++;
+		break;
+		case eSW_Year:
+		p_Revap_soil_yr[SW_Output[eSW_EvapSoil].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachEvapLayer(i)
+		p_Revap_soil_yr[SW_Output[eSW_EvapSoil].yr_row + yr_nrow * (i + 1)] = v->yravg.evap[i];
+		SW_Output[eSW_EvapSoil].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_evapSurface(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_EvapSurface].period;
+	RealD val_tot = SW_MISSING, val_tree = SW_MISSING, val_forb = SW_MISSING,
+			val_shrub = SW_MISSING, val_grass = SW_MISSING, val_litter =
+					SW_MISSING, val_water = SW_MISSING;
+
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val_tot = v->dysum.total_evap;
+		val_tree = v->dysum.tree_evap;
+		val_forb = v->dysum.forb_evap;
+		val_shrub = v->dysum.shrub_evap;
+		val_grass = v->dysum.grass_evap;
+		val_litter = v->dysum.litter_evap;
+		val_water = v->dysum.surfaceWater_evap;
+		break;
+	case eSW_Week:
+		val_tot = v->wkavg.total_evap;
+		val_tree = v->wkavg.tree_evap;
+		val_forb = v->wkavg.forb_evap;
+		val_shrub = v->wkavg.shrub_evap;
+		val_grass = v->wkavg.grass_evap;
+		val_litter = v->wkavg.litter_evap;
+		val_water = v->wkavg.surfaceWater_evap;
+		break;
+	case eSW_Month:
+		val_tot = v->moavg.total_evap;
+		val_tree = v->moavg.tree_evap;
+		val_forb = v->moavg.forb_evap;
+		val_shrub = v->moavg.shrub_evap;
+		val_grass = v->moavg.grass_evap;
+		val_litter = v->moavg.litter_evap;
+		val_water = v->moavg.surfaceWater_evap;
+		break;
+	case eSW_Year:
+		val_tot = v->yravg.total_evap;
+		val_tree = v->yravg.tree_evap;
+		val_forb = v->yravg.forb_evap;
+		val_shrub = v->yravg.shrub_evap;
+		val_grass = v->yravg.grass_evap;
+		val_litter = v->yravg.litter_evap;
+		val_water = v->yravg.surfaceWater_evap;
+		break;
+	}
+	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_tot, _Sep, val_tree, _Sep, val_shrub, _Sep, val_forb, _Sep, val_grass, _Sep, val_litter, _Sep, val_water);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 2] = v->dysum.total_evap;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 3] = v->dysum.tree_evap;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 4] = v->dysum.shrub_evap;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 5] = v->dysum.forb_evap;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 6] = v->dysum.grass_evap;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 7] = v->dysum.litter_evap;
+		p_Revap_surface_dy[SW_Output[eSW_EvapSurface].dy_row + dy_nrow * 8] = v->dysum.surfaceWater_evap;
+		SW_Output[eSW_EvapSurface].dy_row++;
+		break;
+		case eSW_Week:
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 2] = v->wkavg.total_evap;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 3] = v->wkavg.tree_evap;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 4] = v->wkavg.shrub_evap;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 5] = v->wkavg.forb_evap;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 6] = v->wkavg.grass_evap;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 7] = v->wkavg.litter_evap;
+		p_Revap_surface_wk[SW_Output[eSW_EvapSurface].wk_row + wk_nrow * 8] = v->wkavg.surfaceWater_evap;
+		SW_Output[eSW_EvapSurface].wk_row++;
+		break;
+		case eSW_Month:
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 2] = v->moavg.total_evap;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 3] = v->moavg.tree_evap;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 4] = v->moavg.shrub_evap;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 5] = v->moavg.forb_evap;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 6] = v->moavg.grass_evap;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 7] = v->moavg.litter_evap;
+		p_Revap_surface_mo[SW_Output[eSW_EvapSurface].mo_row + mo_nrow * 8] = v->moavg.surfaceWater_evap;
+		SW_Output[eSW_EvapSurface].mo_row++;
+		break;
+		case eSW_Year:
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 1] = v->yravg.total_evap;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 2] = v->yravg.tree_evap;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 3] = v->yravg.shrub_evap;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 4] = v->yravg.forb_evap;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 5] = v->yravg.grass_evap;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 6] = v->yravg.litter_evap;
+		p_Revap_surface_yr[SW_Output[eSW_EvapSurface].yr_row + yr_nrow * 7] = v->yravg.surfaceWater_evap;
+		SW_Output[eSW_EvapSurface].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_interception(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_Interception].period;
+	RealD val_tot = SW_MISSING, val_tree = SW_MISSING, val_forb = SW_MISSING,
+			val_shrub = SW_MISSING, val_grass = SW_MISSING, val_litter =
+					SW_MISSING;
+
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val_tot = v->dysum.total_int;
+		val_tree = v->dysum.tree_int;
+		val_forb = v->dysum.forb_int;
+		val_shrub = v->dysum.shrub_int;
+		val_grass = v->dysum.grass_int;
+		val_litter = v->dysum.litter_int;
+		break;
+	case eSW_Week:
+		val_tot = v->wkavg.total_int;
+		val_tree = v->wkavg.tree_int;
+		val_forb = v->wkavg.forb_int;
+		val_shrub = v->wkavg.shrub_int;
+		val_grass = v->wkavg.grass_int;
+		val_litter = v->wkavg.litter_int;
+		break;
+	case eSW_Month:
+		val_tot = v->moavg.total_int;
+		val_tree = v->moavg.tree_int;
+		val_forb = v->moavg.forb_int;
+		val_shrub = v->moavg.shrub_int;
+		val_grass = v->moavg.grass_int;
+		val_litter = v->moavg.litter_int;
+		break;
+	case eSW_Year:
+		val_tot = v->yravg.total_int;
+		val_tree = v->yravg.tree_int;
+		val_forb = v->yravg.forb_int;
+		val_shrub = v->yravg.shrub_int;
+		val_grass = v->yravg.grass_int;
+		val_litter = v->yravg.litter_int;
+		break;
+	}
+	sprintf(str, "%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f%c%7.6f", _Sep, val_tot, _Sep, val_tree, _Sep, val_shrub, _Sep, val_forb, _Sep, val_grass, _Sep, val_litter);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 2] = v->dysum.total_int;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 3] = v->dysum.tree_int;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 4] = v->dysum.shrub_int;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 5] = v->dysum.forb_int;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 6] = v->dysum.grass_int;
+		p_Rinterception_dy[SW_Output[eSW_Interception].dy_row + dy_nrow * 7] = v->dysum.litter_int;
+		SW_Output[eSW_Interception].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 2] = v->wkavg.total_int;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 3] = v->wkavg.tree_int;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 4] = v->wkavg.shrub_int;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 5] = v->wkavg.forb_int;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 6] = v->wkavg.grass_int;
+		p_Rinterception_wk[SW_Output[eSW_Interception].wk_row + wk_nrow * 7] = v->wkavg.litter_int;
+		SW_Output[eSW_Interception].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 2] = v->moavg.total_int;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 3] = v->moavg.tree_int;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 4] = v->moavg.shrub_int;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 5] = v->moavg.forb_int;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 6] = v->moavg.grass_int;
+		p_Rinterception_mo[SW_Output[eSW_Interception].mo_row + mo_nrow * 7] = v->moavg.litter_int;
+		SW_Output[eSW_Interception].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 1] = v->yravg.total_int;
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 2] = v->yravg.tree_int;
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 3] = v->yravg.shrub_int;
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 4] = v->yravg.forb_int;
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 5] = v->yravg.grass_int;
+		p_Rinterception_yr[SW_Output[eSW_Interception].yr_row + yr_nrow * 6] = v->yravg.litter_int;
+		SW_Output[eSW_Interception].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_soilinf(void)
+{
+	/* --------------------------------------------------- */
+	/* 20100202 (drs) added */
+	/* 20110219 (drs) added runoff */
+	/* 12/13/2012	(clk)	moved runoff, now named snowRunoff, to get_runoff(); */
+	SW_WEATHER *v = &SW_Weather;
+	OutPeriod pd = SW_Output[eSW_SoilInf].period;
+	RealD val_inf = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val_inf = v->dysum.soil_inf;
+		break;
+	case eSW_Week:
+		val_inf = v->wkavg.soil_inf;
+		break;
+	case eSW_Month:
+		val_inf = v->moavg.soil_inf;
+		break;
+	case eSW_Year:
+		val_inf = v->yravg.soil_inf;
+		break;
+	}
+	sprintf(str, "%c%7.6f", _Sep, val_inf);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rinfiltration_dy[SW_Output[eSW_SoilInf].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rinfiltration_dy[SW_Output[eSW_SoilInf].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rinfiltration_dy[SW_Output[eSW_SoilInf].dy_row + dy_nrow * 2] = v->dysum.soil_inf;
+		SW_Output[eSW_SoilInf].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rinfiltration_wk[SW_Output[eSW_SoilInf].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rinfiltration_wk[SW_Output[eSW_SoilInf].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rinfiltration_wk[SW_Output[eSW_SoilInf].wk_row + wk_nrow * 2] = v->wkavg.soil_inf;
+		SW_Output[eSW_SoilInf].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rinfiltration_mo[SW_Output[eSW_SoilInf].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rinfiltration_mo[SW_Output[eSW_SoilInf].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rinfiltration_mo[SW_Output[eSW_SoilInf].mo_row + mo_nrow * 2] = v->moavg.soil_inf;
+		SW_Output[eSW_SoilInf].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rinfiltration_yr[SW_Output[eSW_SoilInf].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rinfiltration_yr[SW_Output[eSW_SoilInf].yr_row + yr_nrow * 1] = v->yravg.soil_inf;
+		SW_Output[eSW_SoilInf].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_lyrdrain(void)
+{
+	/* --------------------------------------------------- */
+	/* 20100202 (drs) added */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_LyrDrain].period;
+	RealD val = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	for (i = 0; i < SW_Site.n_layers - 1; i++)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.lyrdrain[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.lyrdrain[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.lyrdrain[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.lyrdrain[i];
+			break;
+		}
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rpercolation_dy[SW_Output[eSW_LyrDrain].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rpercolation_dy[SW_Output[eSW_LyrDrain].dy_row + dy_nrow * 1] = SW_Model.doy;
+		for (i = 0; i < SW_Site.n_layers - 1; i++)
+		{
+			p_Rpercolation_dy[SW_Output[eSW_LyrDrain].dy_row + dy_nrow * (i + 2)] = v->dysum.lyrdrain[i];
+		}
+		SW_Output[eSW_LyrDrain].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rpercolation_wk[SW_Output[eSW_LyrDrain].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rpercolation_wk[SW_Output[eSW_LyrDrain].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		for (i = 0; i < SW_Site.n_layers - 1; i++)
+		{
+			p_Rpercolation_wk[SW_Output[eSW_LyrDrain].wk_row + wk_nrow * (i + 2)] = v->wkavg.lyrdrain[i];
+		}
+		SW_Output[eSW_LyrDrain].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rpercolation_mo[SW_Output[eSW_LyrDrain].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rpercolation_mo[SW_Output[eSW_LyrDrain].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		for (i = 0; i < SW_Site.n_layers - 1; i++)
+		{
+			p_Rpercolation_mo[SW_Output[eSW_LyrDrain].mo_row + mo_nrow * (i + 2)] = v->moavg.lyrdrain[i];
+		}
+		SW_Output[eSW_LyrDrain].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rpercolation_yr[SW_Output[eSW_LyrDrain].yr_row + yr_nrow * 0] = SW_Model.year;
+		for (i = 0; i < SW_Site.n_layers - 1; i++)
+		{
+			p_Rpercolation_yr[SW_Output[eSW_LyrDrain].yr_row + yr_nrow * (i + 1)] = v->yravg.lyrdrain[i];
+		}
+		SW_Output[eSW_LyrDrain].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_hydred(void)
+{
+	/* --------------------------------------------------- */
+	/* 20101020 (drs) added */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_HydRed].period;
+	RealD val = SW_MISSING;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	/* total output */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.hydred_total[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.hydred_total[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.hydred_total[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.hydred_total[i];
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+	/* tree output */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.hydred_tree[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.hydred_tree[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.hydred_tree[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.hydred_tree[i];
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+	/* shrub output */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.hydred_shrub[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.hydred_shrub[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.hydred_shrub[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.hydred_shrub[i];
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+	/* forb output */ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.hydred_forb[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.hydred_forb[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.hydred_forb[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.hydred_forb[i];
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+	/* grass output */
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.hydred_grass[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.hydred_grass[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.hydred_grass[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.hydred_grass[i];
+			break;
+		}
+
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	/* Date Info output */
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * 1] = SW_Model.doy;
+		break;
+		case eSW_Week:
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		break;
+		case eSW_Month:
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		break;
+		case eSW_Year:
+		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * 0] = SW_Model.year;
+		break;
+	}
+
+	/* total output */
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 0)] = v->dysum.hydred_total[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 0)] = v->wkavg.hydred_total[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 0)] = v->moavg.hydred_total[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 0)] = v->yravg.hydred_total[i];
+		break;
+	}
+
+	/* tree output */
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 1)] = v->dysum.hydred_tree[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 1)] = v->wkavg.hydred_tree[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 1)] = v->moavg.hydred_tree[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 1)] = v->yravg.hydred_tree[i];
+		break;
+	}
+
+	/* shrub output */
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 2)] = v->dysum.hydred_shrub[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 2)] = v->wkavg.hydred_shrub[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 2)] = v->moavg.hydred_shrub[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 2)] = v->yravg.hydred_shrub[i];
+		break;
+	}
+
+	/* forb output */
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 3)] = v->dysum.hydred_forb[i];
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 3)] = v->wkavg.hydred_forb[i];
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 3)] = v->moavg.hydred_forb[i];
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 3)] = v->yravg.hydred_forb[i];
+		break;
+	}
+
+	/* grass output */
+	switch (pd)
+	{
+		case eSW_Day:
+		ForEachSoilLayer(i)
+		p_Rhydred_dy[SW_Output[eSW_HydRed].dy_row + dy_nrow * (i + 2) + (dy_nrow * SW_Site.n_layers * 4)] = v->dysum.hydred_grass[i];
+		SW_Output[eSW_HydRed].dy_row++;
+		break;
+		case eSW_Week:
+		ForEachSoilLayer(i)
+		p_Rhydred_wk[SW_Output[eSW_HydRed].wk_row + wk_nrow * (i + 2) + (wk_nrow * SW_Site.n_layers * 4)] = v->wkavg.hydred_grass[i];
+		SW_Output[eSW_HydRed].wk_row++;
+		break;
+		case eSW_Month:
+		ForEachSoilLayer(i)
+		p_Rhydred_mo[SW_Output[eSW_HydRed].mo_row + mo_nrow * (i + 2) + (mo_nrow * SW_Site.n_layers * 4)] = v->moavg.hydred_grass[i];
+		SW_Output[eSW_HydRed].mo_row++;
+		break;
+		case eSW_Year:
+		ForEachSoilLayer(i)
+		p_Rhydred_yr[SW_Output[eSW_HydRed].yr_row + yr_nrow * (i + 1) + (yr_nrow * SW_Site.n_layers * 4)] = v->yravg.hydred_grass[i];
+		SW_Output[eSW_HydRed].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_aet(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_AET].period;
+	RealD val = SW_MISSING;
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	char str[20];
+#elif defined(STEPWAT)
+	char str[20];
+#endif
+
+#ifndef RSOILWAT
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val = v->dysum.aet;
+		break;
+	case eSW_Week:
+		val = v->wkavg.aet;
+		break;
+	case eSW_Month:
+		val = v->moavg.aet;
+		break;
+	case eSW_Year:
+		val = v->yravg.aet;
+		break;
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Raet_dy[SW_Output[eSW_AET].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Raet_dy[SW_Output[eSW_AET].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Raet_dy[SW_Output[eSW_AET].dy_row + dy_nrow * 2] = v->dysum.aet;
+		SW_Output[eSW_AET].dy_row++;
+		break;
+		case eSW_Week:
+		p_Raet_wk[SW_Output[eSW_AET].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Raet_wk[SW_Output[eSW_AET].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Raet_wk[SW_Output[eSW_AET].wk_row + wk_nrow * 2] = v->wkavg.aet;
+		SW_Output[eSW_AET].wk_row++;
+		break;
+		case eSW_Month:
+		p_Raet_mo[SW_Output[eSW_AET].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Raet_mo[SW_Output[eSW_AET].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Raet_mo[SW_Output[eSW_AET].mo_row + mo_nrow * 2] = v->moavg.aet;
+		SW_Output[eSW_AET].mo_row++;
+		break;
+		case eSW_Year:
+		p_Raet_yr[SW_Output[eSW_AET].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Raet_yr[SW_Output[eSW_AET].yr_row + yr_nrow * 1] = v->yravg.aet;
+		SW_Output[eSW_AET].yr_row++;
+		break;
+	}
+#endif
+
+#if !defined(STEPWAT) && !defined(RSOILWAT)
+	sprintf(str, "%c%7.6f", _Sep, val);
+	strcat(outstr, str);
+#elif defined(STEPWAT)
+	if (isPartialSoilwatOutput == FALSE)
+	{
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+	else
+	{
+		SXW.aet += val;
+	}
+#endif
+}
+
+static void get_pet(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_PET].period;
+	RealD val = SW_MISSING;
+#ifndef RSOILWAT
+	char str[20];
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val = v->dysum.pet;
+		break;
+	case eSW_Week:
+		val = v->wkavg.pet;
+		break;
+	case eSW_Month:
+		val = v->moavg.pet;
+		break;
+	case eSW_Year:
+		val = v->yravg.pet;
+		break;
+	}
+	sprintf(str, "%c%7.6f", _Sep, val);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rpet_dy[SW_Output[eSW_PET].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rpet_dy[SW_Output[eSW_PET].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rpet_dy[SW_Output[eSW_PET].dy_row + dy_nrow * 2] = v->dysum.pet;
+		SW_Output[eSW_PET].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rpet_wk[SW_Output[eSW_PET].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rpet_wk[SW_Output[eSW_PET].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rpet_wk[SW_Output[eSW_PET].wk_row + wk_nrow * 2] = v->wkavg.pet;
+		SW_Output[eSW_PET].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rpet_mo[SW_Output[eSW_PET].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rpet_mo[SW_Output[eSW_PET].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rpet_mo[SW_Output[eSW_PET].mo_row + mo_nrow * 2] = v->moavg.pet;
+		SW_Output[eSW_PET].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rpet_yr[SW_Output[eSW_PET].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rpet_yr[SW_Output[eSW_PET].yr_row + yr_nrow * 1] = v->yravg.pet;
+		SW_Output[eSW_PET].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_wetdays(void)
+{
+	/* --------------------------------------------------- */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_WetDays].period;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	int val = 99;
+	get_outstrleader(pd);
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = (v->is_wet[i]) ? 1 : 0;
+			break;
+		case eSW_Week:
+			val = (int) v->wkavg.wetdays[i];
+			break;
+		case eSW_Month:
+			val = (int) v->moavg.wetdays[i];
+			break;
+		case eSW_Year:
+			val = (int) v->yravg.wetdays[i];
+			break;
+		}
+		sprintf(str, "%c%i", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rwetdays_dy[SW_Output[eSW_WetDays].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rwetdays_dy[SW_Output[eSW_WetDays].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		{
+			p_Rwetdays_dy[SW_Output[eSW_WetDays].dy_row + dy_nrow * (i + 2)] = (v->is_wet[i]) ? 1 : 0;
+		}
+		SW_Output[eSW_WetDays].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rwetdays_wk[SW_Output[eSW_WetDays].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rwetdays_wk[SW_Output[eSW_WetDays].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			p_Rwetdays_wk[SW_Output[eSW_WetDays].wk_row + wk_nrow * (i + 2)] = (int) v->wkavg.wetdays[i];
+		}
+		SW_Output[eSW_WetDays].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rwetdays_mo[SW_Output[eSW_WetDays].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rwetdays_mo[SW_Output[eSW_WetDays].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			p_Rwetdays_mo[SW_Output[eSW_WetDays].mo_row + mo_nrow * (i + 2)] = (int) v->moavg.wetdays[i];
+		}
+		SW_Output[eSW_WetDays].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rwetdays_yr[SW_Output[eSW_WetDays].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		{
+			p_Rwetdays_yr[SW_Output[eSW_WetDays].yr_row + yr_nrow * (i + 1)] = (int) v->yravg.wetdays[i];
+		}
+		SW_Output[eSW_WetDays].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_snowpack(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SnowPack].period;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	RealD val_swe = SW_MISSING, val_depth = SW_MISSING;
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val_swe = v->dysum.snowpack;
+		val_depth = v->dysum.snowdepth;
+		break;
+	case eSW_Week:
+		val_swe = v->wkavg.snowpack;
+		val_depth = v->wkavg.snowdepth;
+		break;
+	case eSW_Month:
+		val_swe = v->moavg.snowpack;
+		val_depth = v->moavg.snowdepth;
+		break;
+	case eSW_Year:
+		val_swe = v->yravg.snowpack;
+		val_depth = v->yravg.snowdepth;
+		break;
+	}
+	sprintf(str, "%c%7.6f%c%7.6f", _Sep, val_swe, _Sep, val_depth);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 2] = v->dysum.snowpack;
+		p_Rsnowpack_dy[SW_Output[eSW_SnowPack].dy_row + dy_nrow * 3] = v->dysum.snowdepth;
+		SW_Output[eSW_SnowPack].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 2] = v->wkavg.snowpack;
+		p_Rsnowpack_wk[SW_Output[eSW_SnowPack].wk_row + wk_nrow * 3] = v->wkavg.snowdepth;
+		SW_Output[eSW_SnowPack].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 2] = v->moavg.snowpack;
+		p_Rsnowpack_mo[SW_Output[eSW_SnowPack].mo_row + mo_nrow * 3] = v->moavg.snowdepth;
+		SW_Output[eSW_SnowPack].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rsnowpack_yr[SW_Output[eSW_SnowPack].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rsnowpack_yr[SW_Output[eSW_SnowPack].yr_row + yr_nrow * 1] = v->yravg.snowpack;
+		p_Rsnowpack_yr[SW_Output[eSW_SnowPack].yr_row + yr_nrow * 2] = v->yravg.snowdepth;
+		SW_Output[eSW_SnowPack].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_deepswc(void)
+{
+	/* --------------------------------------------------- */
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_DeepSWC].period;
+#ifndef RSOILWAT
+	char str[OUTSTRLEN];
+	RealD val = SW_MISSING;
+	get_outstrleader(pd);
+	switch (pd)
+	{
+	case eSW_Day:
+		val = v->dysum.deep;
+		break;
+	case eSW_Week:
+		val = v->wkavg.deep;
+		break;
+	case eSW_Month:
+		val = v->moavg.deep;
+		break;
+	case eSW_Year:
+		val = v->yravg.deep;
+		break;
+	}
+	sprintf(str, "%c%7.6f", _Sep, val);
+	strcat(outstr, str);
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rdeep_drain_dy[SW_Output[eSW_DeepSWC].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rdeep_drain_dy[SW_Output[eSW_DeepSWC].dy_row + dy_nrow * 1] = SW_Model.doy;
+		p_Rdeep_drain_dy[SW_Output[eSW_DeepSWC].dy_row + dy_nrow * 2] = v->dysum.deep;
+		SW_Output[eSW_DeepSWC].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rdeep_drain_wk[SW_Output[eSW_DeepSWC].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rdeep_drain_wk[SW_Output[eSW_DeepSWC].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		p_Rdeep_drain_wk[SW_Output[eSW_DeepSWC].wk_row + wk_nrow * 2] = v->wkavg.deep;
+		SW_Output[eSW_DeepSWC].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rdeep_drain_mo[SW_Output[eSW_DeepSWC].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rdeep_drain_mo[SW_Output[eSW_DeepSWC].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		p_Rdeep_drain_mo[SW_Output[eSW_DeepSWC].mo_row + mo_nrow * 2] = v->moavg.deep;
+		SW_Output[eSW_DeepSWC].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rdeep_drain_yr[SW_Output[eSW_DeepSWC].yr_row + yr_nrow * 0] = SW_Model.year;
+		p_Rdeep_drain_yr[SW_Output[eSW_DeepSWC].yr_row + yr_nrow * 1] = v->yravg.deep;
+		SW_Output[eSW_DeepSWC].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void get_soiltemp(void)
+{
+	/* --------------------------------------------------- */
+	LyrIndex i;
+	SW_SOILWAT *v = &SW_Soilwat;
+	OutPeriod pd = SW_Output[eSW_SoilTemp].period;
+#ifndef RSOILWAT
+	RealD val = SW_MISSING;
+	char str[OUTSTRLEN];
+	get_outstrleader(pd);
+	ForEachSoilLayer(i)
+	{
+		switch (pd)
+		{
+		case eSW_Day:
+			val = v->dysum.sTemp[i];
+			break;
+		case eSW_Week:
+			val = v->wkavg.sTemp[i];
+			break;
+		case eSW_Month:
+			val = v->moavg.sTemp[i];
+			break;
+		case eSW_Year:
+			val = v->yravg.sTemp[i];
+			break;
+		}
+		sprintf(str, "%c%7.6f", _Sep, val);
+		strcat(outstr, str);
+	}
+#else
+	switch (pd)
+	{
+		case eSW_Day:
+		p_Rsoil_temp_dy[SW_Output[eSW_SoilTemp].dy_row + dy_nrow * 0] = SW_Model.year;
+		p_Rsoil_temp_dy[SW_Output[eSW_SoilTemp].dy_row + dy_nrow * 1] = SW_Model.doy;
+		ForEachSoilLayer(i)
+		{
+			p_Rsoil_temp_dy[SW_Output[eSW_SoilTemp].dy_row + dy_nrow * (i + 2)] = v->dysum.sTemp[i];
+		}
+		SW_Output[eSW_SoilTemp].dy_row++;
+		break;
+		case eSW_Week:
+		p_Rsoil_temp_wk[SW_Output[eSW_SoilTemp].wk_row + wk_nrow * 0] = SW_Model.year;
+		p_Rsoil_temp_wk[SW_Output[eSW_SoilTemp].wk_row + wk_nrow * 1] = (SW_Model.week + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			p_Rsoil_temp_wk[SW_Output[eSW_SoilTemp].wk_row + wk_nrow * (i + 2)] = v->wkavg.sTemp[i];
+		}
+		SW_Output[eSW_SoilTemp].wk_row++;
+		break;
+		case eSW_Month:
+		p_Rsoil_temp_mo[SW_Output[eSW_SoilTemp].mo_row + mo_nrow * 0] = SW_Model.year;
+		p_Rsoil_temp_mo[SW_Output[eSW_SoilTemp].mo_row + mo_nrow * 1] = (SW_Model.month + 1) - tOffset;
+		ForEachSoilLayer(i)
+		{
+			p_Rsoil_temp_mo[SW_Output[eSW_SoilTemp].mo_row + mo_nrow * (i + 2)] = v->moavg.sTemp[i];
+		}
+		SW_Output[eSW_SoilTemp].mo_row++;
+		break;
+		case eSW_Year:
+		p_Rsoil_temp_yr[SW_Output[eSW_SoilTemp].yr_row + yr_nrow * 0] = SW_Model.year;
+		ForEachSoilLayer(i)
+		{
+			p_Rsoil_temp_yr[SW_Output[eSW_SoilTemp].yr_row + yr_nrow * (i + 1)] = v->yravg.sTemp[i];
+		}
+		SW_Output[eSW_SoilTemp].yr_row++;
+		break;
+	}
+#endif
+}
+
+static void sumof_ves(SW_VEGESTAB *v, SW_VEGESTAB_OUTPUTS *s, OutKey k)
+{
+	/* --------------------------------------------------- */
+	/* k is always eSW_Estab, and this only gets called yearly */
+	/* in fact, there's nothing to do here as the get_estab()
+	 * function does everything needed.  This stub is here only
+	 * to facilitate the loop everything else uses.
+	 * That is, until we need to start outputting as-yet-unknown
+	 * establishment variables.
+	 */
+
+// just a few lines of nonsense to supress the compile warnings, doesn't actually do anything
+	if (&v == &v)
+		if (&s == &s)
+			if (k != 0)
+				return;
+
+}
+
+static void sumof_wth(SW_WEATHER *v, SW_WEATHER_OUTPUTS *s, OutKey k)
+{
+	/* --------------------------------------------------- */
+	/* 	20091015 (drs) ppt is divided into rain and snow and all three values are output into precip */
+
+	switch (k)
+	{
+
+	case eSW_Temp:
+		s->temp_max += v->now.temp_max[Today];
+		s->temp_min += v->now.temp_min[Today];
+		s->temp_avg += v->now.temp_avg[Today];
+		//added surfaceTemp for sum
+		s->surfaceTemp += v->surfaceTemp;
+		break;
+	case eSW_Precip:
+		s->ppt += v->now.ppt[Today];
+		s->rain += v->now.rain[Today];
+		s->snow += v->now.snow[Today];
+		s->snowmelt += v->now.snowmelt[Today];
+		s->snowloss += v->now.snowloss[Today];
+		break;
+	case eSW_SoilInf:
+		s->soil_inf += v->soil_inf;
+		break;
+	case eSW_Runoff:
+		s->snowRunoff += v->snowRunoff;
+		s->surfaceRunoff += v->surfaceRunoff;
+		break;
+	default:
+		LogError(stderr, LOGFATAL, "PGMR: Invalid key in sumof_wth(%s)", key2str[k]);
+	}
+
+}
+
+static void sumof_swc(SW_SOILWAT *v, SW_SOILWAT_OUTPUTS *s, OutKey k)
+{
+	/* --------------------------------------------------- */
+	LyrIndex i;
+
+	switch (k)
+	{
+
+	case eSW_VWCBulk: /* get swcBulk and convert later */
+		ForEachSoilLayer(i)
+			s->vwcBulk[i] += v->swcBulk[Today][i];
+		break;
+
+	case eSW_VWCMatric: /* get swcBulk and convert later */
+		ForEachSoilLayer(i)
+			s->vwcMatric[i] += v->swcBulk[Today][i];
+		break;
+
+	case eSW_SWCBulk:
+		ForEachSoilLayer(i)
+			s->swcBulk[i] += v->swcBulk[Today][i];
+		break;
+
+	case eSW_SWPMatric: /* can't avg swp so get swcBulk and convert later */
+		ForEachSoilLayer(i)
+			s->swpMatric[i] += v->swcBulk[Today][i];
+		break;
+
+	case eSW_SWABulk:
+		ForEachSoilLayer(i)
+			s->swaBulk[i] += fmax(
+					v->swcBulk[Today][i] - SW_Site.lyr[i]->swcBulk_wiltpt, 0.);
+		break;
+
+	case eSW_SWAMatric: /* get swaBulk and convert later */
+		ForEachSoilLayer(i)
+			s->swaMatric[i] += fmax(
+					v->swcBulk[Today][i] - SW_Site.lyr[i]->swcBulk_wiltpt, 0.);
+		break;
+
+	case eSW_SurfaceWater:
+		s->surfaceWater += v->surfaceWater;
+		break;
+
+	case eSW_Transp:
+		ForEachSoilLayer(i)
+		{
+			s->transp_total[i] += v->transpiration_tree[i]
+					+ v->transpiration_forb[i] + v->transpiration_shrub[i]
+					+ v->transpiration_grass[i];
+			s->transp_tree[i] += v->transpiration_tree[i];
+			s->transp_shrub[i] += v->transpiration_shrub[i];
+			s->transp_forb[i] += v->transpiration_forb[i];
+			s->transp_grass[i] += v->transpiration_grass[i];
+		}
+		break;
+
+	case eSW_EvapSoil:
+		ForEachEvapLayer(i)
+			s->evap[i] += v->evaporation[i];
+		break;
+
+	case eSW_EvapSurface:
+		s->total_evap += v->tree_evap + v->forb_evap + v->shrub_evap
+				+ v->grass_evap + v->litter_evap + v->surfaceWater_evap;
+		s->tree_evap += v->tree_evap;
+		s->shrub_evap += v->shrub_evap;
+		s->forb_evap += v->forb_evap;
+		s->grass_evap += v->grass_evap;
+		s->litter_evap += v->litter_evap;
+		s->surfaceWater_evap += v->surfaceWater_evap;
+		break;
+
+	case eSW_Interception:
+		s->total_int += v->tree_int + v->forb_int + v->shrub_int + v->grass_int
+				+ v->litter_int;
+		s->tree_int += v->tree_int;
+		s->shrub_int += v->shrub_int;
+		s->forb_int += v->forb_int;
+		s->grass_int += v->grass_int;
+		s->litter_int += v->litter_int;
+		break;
+
+	case eSW_LyrDrain:
+		for (i = 0; i < SW_Site.n_layers - 1; i++)
+			s->lyrdrain[i] += v->drain[i];
+		break;
+
+	case eSW_HydRed:
+		ForEachSoilLayer(i)
+		{
+			s->hydred_total[i] += v->hydred_tree[i] + v->hydred_forb[i]
+					+ v->hydred_shrub[i] + v->hydred_grass[i];
+			s->hydred_tree[i] += v->hydred_tree[i];
+			s->hydred_shrub[i] += v->hydred_shrub[i];
+			s->hydred_forb[i] += v->hydred_forb[i];
+			s->hydred_grass[i] += v->hydred_grass[i];
+		}
+		break;
+
+	case eSW_AET:
+		s->aet += v->aet;
+		break;
+
+	case eSW_PET:
+		s->pet += v->pet;
+		break;
+
+	case eSW_WetDays:
+		ForEachSoilLayer(i)
+			if (v->is_wet[i])
+				s->wetdays[i]++;
+		break;
+
+	case eSW_SnowPack:
+		s->snowpack += v->snowpack[Today];
+		s->snowdepth += v->snowdepth;
+		break;
+
+	case eSW_DeepSWC:
+		s->deep += v->swcBulk[Today][SW_Site.deep_lyr];
+		break;
+
+	case eSW_SoilTemp:
+		ForEachSoilLayer(i)
+			s->sTemp[i] += v->sTemp[i];
+		break;
+
+	default:
+		LogError(stderr, LOGFATAL, "PGMR: Invalid key in sumof_swc(%s)", key2str[k]);
+	}
+}
+
+static void average_for(ObjType otyp, OutPeriod pd)
+{
+	/* --------------------------------------------------- */
+	/* separates the task of obtaining a periodic average.
+	 * no need to average days, so this should never be
+	 * called with eSW_Day.
+	 * Enter this routine just after the summary period
+	 * is completed, so the current week and month will be
+	 * one greater than the period being summarized.
+	 */
+	/* 	20091015 (drs) ppt is divided into rain and snow and all three values are output into precip */
+	SW_SOILWAT_OUTPUTS *savg = NULL, *ssumof = NULL;
+	SW_WEATHER_OUTPUTS *wavg = NULL, *wsumof = NULL;
+	TimeInt curr_pd = 0;
+	RealD div = 0.; /* if sumtype=AVG, days in period; if sumtype=SUM, 1 */
+	OutKey k;
+	LyrIndex i;
+	int j;
+
+	if (!(otyp == eSWC || otyp == eWTH))
+		LogError(stdout, LOGFATAL, "Invalid object type in OUT_averagefor().");
+
+	ForEachOutKey(k)
+	{
+		for (j = 0; j < numPeriods; j++)
+		{ /* loop through this code for as many periods that are being used */
+			if (!SW_Output[k].use)
+				continue;
+			if (timeSteps[k][j] < 4)
+			{
+				SW_Output[k].period = timeSteps[k][j]; /* set the period to use based on the iteration of the for loop */
+				switch (pd)
+				{
+				case eSW_Week:
+					curr_pd = (SW_Model.week + 1) - tOffset;
+					savg = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.wkavg;
+					ssumof = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.wksum;
+					wavg = (SW_WEATHER_OUTPUTS *) &SW_Weather.wkavg;
+					wsumof = (SW_WEATHER_OUTPUTS *) &SW_Weather.wksum;
+					div = (bFlush) ? SW_Model.lastdoy % WKDAYS : WKDAYS;
+					break;
+
+				case eSW_Month:
+					curr_pd = (SW_Model.month + 1) - tOffset;
+					savg = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.moavg;
+					ssumof = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.mosum;
+					wavg = (SW_WEATHER_OUTPUTS *) &SW_Weather.moavg;
+					wsumof = (SW_WEATHER_OUTPUTS *) &SW_Weather.mosum;
+					div = Time_days_in_month(SW_Model.month - tOffset);
+					break;
+
+				case eSW_Year:
+					curr_pd = SW_Output[k].first;
+					savg = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.yravg;
+					ssumof = (SW_SOILWAT_OUTPUTS *) &SW_Soilwat.yrsum;
+					wavg = (SW_WEATHER_OUTPUTS *) &SW_Weather.yravg;
+					wsumof = (SW_WEATHER_OUTPUTS *) &SW_Weather.yrsum;
+					div = SW_Output[k].last - SW_Output[k].first + 1;
+					break;
+
+				default:
+					LogError(stdout, LOGFATAL, "Programmer: Invalid period in average_for().");
+				} /* end switch(pd) */
+
+				if (SW_Output[k].period != pd || SW_Output[k].myobj != otyp
+						|| curr_pd < SW_Output[k].first
+						|| curr_pd > SW_Output[k].last)
+					continue;
+
+				if (SW_Output[k].sumtype == eSW_Sum)
+					div = 1.;
+
+				/* notice that all valid keys are in this switch */
+				switch (k)
+				{
+
+				case eSW_Temp:
+					wavg->temp_max = wsumof->temp_max / div;
+					wavg->temp_min = wsumof->temp_min / div;
+					wavg->temp_avg = wsumof->temp_avg / div;
+					//added surfaceTemp for avg operation
+					wavg->surfaceTemp = wsumof->surfaceTemp / div;
+					break;
+
+				case eSW_Precip:
+					wavg->ppt = wsumof->ppt / div;
+					wavg->rain = wsumof->rain / div;
+					wavg->snow = wsumof->snow / div;
+					wavg->snowmelt = wsumof->snowmelt / div;
+					wavg->snowloss = wsumof->snowloss / div;
+					break;
+
+				case eSW_SoilInf:
+					wavg->soil_inf = wsumof->soil_inf / div;
+					break;
+
+				case eSW_Runoff:
+					wavg->snowRunoff = wsumof->snowRunoff / div;
+					wavg->surfaceRunoff = wsumof->surfaceRunoff / div;
+					break;
+
+				case eSW_SoilTemp:
+					ForEachSoilLayer(i)
+						savg->sTemp[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										SW_Soilwat.sTemp[i] :
+										ssumof->sTemp[i] / div;
+					break;
+
+				case eSW_VWCBulk:
+					ForEachSoilLayer(i)
+						/* vwcBulk at this point is identical to swcBulk */
+						savg->vwcBulk[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										SW_Soilwat.swcBulk[Yesterday][i] :
+										ssumof->vwcBulk[i] / div;
+					break;
+
+				case eSW_VWCMatric:
+					ForEachSoilLayer(i)
+						/* vwcMatric at this point is identical to swcBulk */
+						savg->vwcMatric[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										SW_Soilwat.swcBulk[Yesterday][i] :
+										ssumof->vwcMatric[i] / div;
+					break;
+
+				case eSW_SWCBulk:
+					ForEachSoilLayer(i)
+						savg->swcBulk[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										SW_Soilwat.swcBulk[Yesterday][i] :
+										ssumof->swcBulk[i] / div;
+					break;
+
+				case eSW_SWPMatric:
+					ForEachSoilLayer(i)
+						/* swpMatric at this point is identical to swcBulk */
+						savg->swpMatric[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										SW_Soilwat.swcBulk[Yesterday][i] :
+										ssumof->swpMatric[i] / div;
+					break;
+
+				case eSW_SWABulk:
+					ForEachSoilLayer(i)
+						savg->swaBulk[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										fmax(
+												SW_Soilwat.swcBulk[Yesterday][i]
+														- SW_Site.lyr[i]->swcBulk_wiltpt,
+												0.) :
+										ssumof->swaBulk[i] / div;
+					break;
+
+				case eSW_SWAMatric: /* swaMatric at this point is identical to swaBulk */
+					ForEachSoilLayer(i)
+						savg->swaMatric[i] =
+								(SW_Output[k].sumtype == eSW_Fnl) ?
+										fmax(
+												SW_Soilwat.swcBulk[Yesterday][i]
+														- SW_Site.lyr[i]->swcBulk_wiltpt,
+												0.) :
+										ssumof->swaMatric[i] / div;
+					break;
+
+				case eSW_DeepSWC:
+					savg->deep =
+							(SW_Output[k].sumtype == eSW_Fnl) ?
+									SW_Soilwat.swcBulk[Yesterday][SW_Site.deep_lyr] :
+									ssumof->deep / div;
+					break;
+
+				case eSW_SurfaceWater:
+					savg->surfaceWater = ssumof->surfaceWater / div;
+					break;
+
+				case eSW_Transp:
+					ForEachSoilLayer(i)
+					{
+						savg->transp_total[i] = ssumof->transp_total[i] / div;
+						savg->transp_tree[i] = ssumof->transp_tree[i] / div;
+						savg->transp_shrub[i] = ssumof->transp_shrub[i] / div;
+						savg->transp_forb[i] = ssumof->transp_forb[i] / div;
+						savg->transp_grass[i] = ssumof->transp_grass[i] / div;
+					}
+					break;
+
+				case eSW_EvapSoil:
+					ForEachEvapLayer(i)
+						savg->evap[i] = ssumof->evap[i] / div;
+					break;
+
+				case eSW_EvapSurface:
+					savg->total_evap = ssumof->total_evap / div;
+					savg->tree_evap = ssumof->tree_evap / div;
+					savg->shrub_evap = ssumof->shrub_evap / div;
+					savg->forb_evap = ssumof->forb_evap / div;
+					savg->grass_evap = ssumof->grass_evap / div;
+					savg->litter_evap = ssumof->litter_evap / div;
+					savg->surfaceWater_evap = ssumof->surfaceWater_evap / div;
+					break;
+
+				case eSW_Interception:
+					savg->total_int = ssumof->total_int / div;
+					savg->tree_int = ssumof->tree_int / div;
+					savg->shrub_int = ssumof->shrub_int / div;
+					savg->forb_int = ssumof->forb_int / div;
+					savg->grass_int = ssumof->grass_int / div;
+					savg->litter_int = ssumof->litter_int / div;
+					break;
+
+				case eSW_AET:
+					savg->aet = ssumof->aet / div;
+					break;
+
+				case eSW_LyrDrain:
+					for (i = 0; i < SW_Site.n_layers - 1; i++)
+						savg->lyrdrain[i] = ssumof->lyrdrain[i] / div;
+					break;
+
+				case eSW_HydRed:
+					ForEachSoilLayer(i)
+					{
+						savg->hydred_total[i] = ssumof->hydred_total[i] / div;
+						savg->hydred_tree[i] = ssumof->hydred_tree[i] / div;
+						savg->hydred_shrub[i] = ssumof->hydred_shrub[i] / div;
+						savg->hydred_forb[i] = ssumof->hydred_forb[i] / div;
+						savg->hydred_grass[i] = ssumof->hydred_grass[i] / div;
+					}
+					break;
+
+				case eSW_PET:
+					savg->pet = ssumof->pet / div;
+					break;
+
+				case eSW_WetDays:
+					ForEachSoilLayer(i)
+						savg->wetdays[i] = ssumof->wetdays[i] / div;
+					break;
+
+				case eSW_SnowPack:
+					savg->snowpack = ssumof->snowpack / div;
+					savg->snowdepth = ssumof->snowdepth / div;
+					break;
+
+				case eSW_Estab: /* do nothing, no averaging required */
+					break;
+
+				case eSW_CO2Effects: /* do nothing, custom averaging required */
+					break;
+
+				default:
+
+					LogError(stderr, LOGFATAL, "PGMR: Invalid key in average_for(%s)", key2str[k]);
+				}
+			}
+		} /* end of for loop */
+	} /* end ForEachKey */
+}
+
+static void collect_sums(ObjType otyp, OutPeriod op)
+{
+	/* --------------------------------------------------- */
+
+	SW_SOILWAT *s = &SW_Soilwat;
+	SW_SOILWAT_OUTPUTS *ssum = NULL;
+	SW_WEATHER *w = &SW_Weather;
+	SW_WEATHER_OUTPUTS *wsum = NULL;
+	SW_VEGESTAB *v = &SW_VegEstab; /* vegestab only gets summed yearly */
+	SW_VEGESTAB_OUTPUTS *vsum = NULL;
+
+	TimeInt pd = 0;
+	OutKey k;
+
+	ForEachOutKey(k)
+	{
+		if (otyp != SW_Output[k].myobj || !SW_Output[k].use)
+			continue;
+		switch (op)
+		{
+		case eSW_Day:
+			pd = SW_Model.doy;
+			ssum = &s->dysum;
+			wsum = &w->dysum;
+			break;
+		case eSW_Week:
+			pd = SW_Model.week + 1;
+			ssum = &s->wksum;
+			wsum = &w->wksum;
+			break;
+		case eSW_Month:
+			pd = SW_Model.month + 1;
+			ssum = &s->mosum;
+			wsum = &w->mosum;
+			break;
+		case eSW_Year:
+			pd = SW_Model.doy;
+			ssum = &s->yrsum;
+			wsum = &w->yrsum;
+			vsum = &v->yrsum; /* yearly, y'see */
+			break;
+		default:
+			LogError(logfp, LOGFATAL, "PGMR: Invalid outperiod in collect_sums()");
+		}
+
+		if (pd >= SW_Output[k].first && pd <= SW_Output[k].last)
+		{
+			switch (otyp)
+			{
+			case eSWC:
+				sumof_swc(s, ssum, k);
+				break;
+			case eWTH:
+				sumof_wth(w, wsum, k);
+				break;
+			case eVES:
+				sumof_ves(v, vsum, k);
+				break;
+			default:
+				break;
+			}
+		}
+
+	} /* end ForEachOutKey */
+}
+
+static void _echo_outputs(void)
+{
+	/* --------------------------------------------------- */
+
+	OutKey k;
+
+	strcpy(errstr, "\n===============================================\n"
+			"  Output Configuration:\n");
+	ForEachOutKey(k)
+	{
+		if (!SW_Output[k].use)
+			continue;
+		strcat(errstr, "---------------------------\nKey ");
+		strcat(errstr, key2str[k]);
+		strcat(errstr, "\n\tSummary Type: ");
+		strcat(errstr, styp2str[SW_Output[k].sumtype]);
+		strcat(errstr, "\n\tOutput Period: ");
+		strcat(errstr, pd2str[SW_Output[k].period]);
+		sprintf(outstr, "\n\tStart period: %d", SW_Output[k].first_orig);
+		strcat(errstr, outstr);
+		sprintf(outstr, "\n\tEnd period  : %d", SW_Output[k].last_orig);
+		strcat(errstr, outstr);
+		strcat(errstr, "\n\tOutput File: ");
+		strcat(errstr, SW_Output[k].outfile);
+		strcat(errstr, "\n");
+	}
+
+	strcat(errstr, "\n----------  End of Output Configuration ---------- \n");
+	LogError(logfp, LOGNOTE, errstr);
+
+}
+
+#ifdef DEBUG_MEM
+#include "myMemory.h"
+/*======================================================*/
+void SW_OUT_SetMemoryRefs( void)
+{
+	/* when debugging memory problems, use the bookkeeping
+	 code in myMemory.c
+	 This routine sets the known memory refs in this module
+	 so they can be  checked for leaks, etc.  Includes
+	 malloc-ed memory in SOILWAT.  All refs will have been
+	 cleared by a call to ClearMemoryRefs() before this, and
+	 will be checked via CheckMemoryRefs() after this, most
+	 likely in the main() function.
+	 */
+	OutKey k;
+
+	ForEachOutKey(k)
+	{
+		if (SW_Output[k].use)
+		NoteMemoryRef(SW_Output[k].outfile);
+	}
+
+}
+
+#endif
+
+/*==================================================================
+
+ Description of the algorithm.
+
+ There is a structure array (SW_OUTPUT) that contains the
+ information from the outsetup.in file. This structure is filled in
+ the initialization process by matching defined macros of valid keys
+ with enumeration variables used as indices into the structure
+ array.  A similar combination of text macros and enumeration
+ constants handles the TIMEPERIOD conversion from text to numeric
+ index.
+
+ Each structure element of the array contains the output period
+ code, start and end values, output file name, opened file pointer
+ for output, on/off status, and a pointer to the function that
+ prepares a complete line of formatted output per output period.
+
+ A _construct() function clears the entire structure array to set
+ values and flags to zero, and then assigns each specific print
+ function name to the associated element's print function pointer.
+ This allows the print function to be called via a simple loop that
+ runs through all of the output keys.  Those output objects that are
+ turned off are ignored and the print function is not called.  Thus,
+ to add a new output variable, a new print function must be added to
+ the loop in addition to adding the new macro and enumeration keys
+ for it.  Oh, and a line or two of summarizing code.
+
+ After initialization, each valid output key has an element in the
+ structure array that "knows" its parameters and whether it is on or
+ off.  There is still space allocated for the "off" keys but they
+ are ignored by the use flag.
+
+ During the daily execution loop of the model, values for each of
+ the output objects are accumulated via a call to
+ SW_OUT_sum_today(x) function with x being a special enumeration
+ code that defines the actual module object to be summed (see
+ SW_Output.h).  This enumeration code breaks up the many output
+ variables into a few simple types so that adding a new output
+ variable is simplified by putting it into its proper category.
+
+ When the _sum_today() function is called, it calls the averaging
+ function which puts the sum, average, etc into the output
+ accumulators--(dy|wk|mo|yr)avg--then conditionally clears the
+ summary accumulators--(dy|wk|mo|yr)sum--if a new period has
+ occurred (in preparation for the new period), then calls the
+ function to handle collecting the summaries called collect_sums().
+
+ The collect_sums() function needs the object type (eg, eSWC, eWTH)
+ and the output period (eg, dy, wk, etc) and then, for each valid
+ output key, it assigns a pointer to the appropriate object's
+ summary sub-structure.  (This is where the complexity of this
+ approach starts to become a bit clumsy, but it nonetheless tends to
+ keep the overall code size down.) After assigning the pointer to
+ the summary structure, the pointers are passed to a routine to
+ actually do the accumulation for the various output objects
+ (currently SWC and WTH).  No other arithmetic is performed here.
+ This routine is only called, however, if the current day or period
+ falls within the range specified by the user.  Otherwise, the
+ accumulators will remain zero.  Also, the period check is used in
+ other places to determine whether to bother with averaging and
+ printing.
+
+ Once a period other than daily has passed, the accumulated values
+ are averaged or summed as appropriate within the average_for()
+ subroutine as mentioned above.
+
+ After the averaging function, the values are ready to format for
+ output.  The SW_OUT_write_today() routine is called from the
+ end_day() function in main().  Any quantities that have finished
+ their period by the current day are written out.  This requires
+ testing of all of the output quantities periods each day but makes
+ the code quite simple.  This is a reasonable tradeoff since there
+ are only a few quantities to test; this should outweight the costs
+ of having to read and understand ugly code.
+
+ So to summarize, adding another output quantity requires several steps.
+ - Add an appropriate element to the SW_*_OUTPUTS substructure of the
+ main object (eg SW_Soilwat) to hold the output value.
+ - Define a new key string and add a macro definition and enumeration
+ to the appropriate list in Output.h.  Be sure the new key's position
+ in the list doesn't interfere with the ForEach*() loops.
+ - Increase the value of SW_OUTNKEYS macro in Output.h.
+ - Add the macro and enum keys to the key2str and key2obj lists in
+ SW_Output.c as appropriate, IN THE SAME LIST POSITION.
+ - Create and declare a get_*() function that returns the correctly
+ formatted string for output.
+ - Add a line to link the get_ function to the appropriate element in
+ the SW_OUTPUT array in _construct().
+ - Add new code to the switch statement in sumof_*() to handle the new
+ key.
+ - Add new code to the switch statement in average_for() to do the
+ summarizing.
+
+ That should do it.  However, new code is about to be added to Output.c
+ and outsetup.in that will allow quantities to be summarized by summing
+ or averaging.  Possibly in the future, more types of options will be
+ added (eg, geometric average, stddev, who knows).  Thus, new keys will
+ be needed to handle those operations within the average_for()
+ function, but the rest of the code will be the same.
+
+
+ Comment (06/23/2015, akt): Adding Output at SOILWAT for further using at RSOILWAT and STEP as well
+
+ Above details is good enough for knowing how to add a new output at soilwat.
+ However here we are adding some more details about how we can add this output for further using that to RSOILWAT and STEP side as well.
+
+ At the top with Comment (06/23/2015, drs): details about how output of SOILWAT works.
+
+ Example : Adding extra place holder at existing output of SOILWAT for both STEP and RSOILWAT:
+ - Adding extra place holder for existing output for both STEP and RSOILWAT: example adding extra output surfaceTemp at SW_WEATHER.
+ We need to modified SW_Weather.h with adding a placeholder at SW_WEATHER and at inner structure SW_WEATHER_OUTPUTS.
+ - Then somewhere this surfaceTemp value need to set at SW_WEATHER placeholder, here we add this atSW_Flow.c
+ - Further modify file SW_Output.c ; add sum of surfaceTemp at function sumof_wth(). Then use this
+ sum value to calculate average of surfaceTemp at function average_for().
+ - Then go to function get_temp(), add extra placeholder like surfaceTempVal that will store this average surfaceTemp value.
+ Add this value to both STEP and RSOILWAT side code of this function for all the periods like weekly, monthly and yearly (for
+ daily set day sum value of surfaceTemp not avg), add this surfaceTempVal at end of this get_Temp() function for finally
+ printing in output file.
+ - Pass this surfaceTempVal to sxw.h file from STEP, by adding extra placeholder at sxw.h so that STEP model can use this value there.
+ - For using this surfaceTemp value in RSOILWAT side of function get_Temp(), increment index of p_Rtemp output array
+ by one and add this sum value  for daily and avg value for other periods at last index.
+ - Further need to modify SW_R_lib.c, for newOutput we need to add new pointers;
+ functions start() and onGetOutput() will need to be modified. For this example adding extra placeholder at existing TEMP output so
+ only function onGetOutput() need to be modified; add placeholder name for surfaceTemp at array Ctemp_names[] and then 	increment
+ number of columns for Rtemp outputs (Rtemp_columns) by one.
+ - At RSOILWAT further we will need to modify L_swOutput.R and G_swOut.R. At L_swOutput.R increment number of columns for swOutput_TEMP.
+
+ So to summarize, adding extra place holder at existing output of SOILWAT for both STEP and RSOILWAT side code above steps are useful.
+
+ However, adding another new output quantity requires several steps for SOILWAT and both STEP and RSOILWAT side code as well.
+ So adding more information to above details (for adding  another new output quantity that can further use in both STEP and RSOILWAT) :
+ - We need to modify SW_R_lib.c of SOILWAT; add new pointers; functions start()  and onGetOutput() will need to be modified.
+ - The sw_output.c of SOILWAT will need to be modified for new output quantity; add new pointers here too for RSOILWAT.
+ - We will need to also read in the new config params from outputsetup_v30.in ; then we  will need to accumulate the new values ;
+ write them out to file and assign the values to the RSOILWAT pointers.
+ - At RSOILWAT we will need to modify L_swOutput.R and G_swOut.R
+
+ */
diff --git a/SW_R_lib.c b/SW_R_lib.c
index 00779b81a..724670d6e 100644
--- a/SW_R_lib.c
+++ b/SW_R_lib.c
@@ -1,2804 +1,2922 @@
-/*
- * SW_R_lib.c
- *
- *  Created on: Jun 25, 2013
- *      Author: Ryan Murphy
- */
-//#define RSOILWAT
-#ifdef RSOILWAT
-
-#include "SW_R_lib.h"
-#include "SW_Files.h"
-#include "SW_Carbon.h"
-
-/* =================================================== */
-/*                  Global Declarations                */
-/* external by other routines elsewhere in the program */
-/* --------------------------------------------------- */
-
-int logNote = 1;
-int logWarn = 1;
-int logFatl = 1;
-int RlogIndex;
-SEXP Rlogfile;
-SEXP InputData;
-SEXP WeatherList;
-Bool useFiles;
-Bool collectInData;
-Bool bWeatherList;
-
-int *p_yr, *p_mo, *p_wk, *p_dy;
-RealD *p_Raet_yr, *p_Rdeep_drain_yr, *p_Restabs_yr, *p_Revap_soil_yr, *p_Revap_surface_yr, *p_Rhydred_yr, *p_Rinfiltration_yr, *p_Rinterception_yr, *p_Rpercolation_yr,
-		*p_Rpet_yr, *p_Rprecip_yr, *p_Rrunoff_yr, *p_Rsnowpack_yr, *p_Rsoil_temp_yr, *p_Rsurface_water_yr, *p_RvwcBulk_yr, *p_RvwcMatric_yr, *p_RswcBulk_yr, *p_RswpMatric_yr,
-		*p_RswaBulk_yr, *p_RswaMatric_yr, *p_Rtemp_yr, *p_Rtransp_yr, *p_Rwetdays_yr, *p_Rco2effects_yr;
-RealD *p_Raet_mo, *p_Rdeep_drain_mo, *p_Restabs_mo, *p_Revap_soil_mo, *p_Revap_surface_mo, *p_Rhydred_mo, *p_Rinfiltration_mo, *p_Rinterception_mo, *p_Rpercolation_mo,
-		*p_Rpet_mo, *p_Rprecip_mo, *p_Rrunoff_mo, *p_Rsnowpack_mo, *p_Rsoil_temp_mo, *p_Rsurface_water_mo, *p_RvwcBulk_mo, *p_RvwcMatric_mo, *p_RswcBulk_mo, *p_RswpMatric_mo,
-		*p_RswaBulk_mo, *p_RswaMatric_mo, *p_Rtemp_mo, *p_Rtransp_mo, *p_Rwetdays_mo, *p_Rco2effects_mo;
-RealD *p_Raet_wk, *p_Rdeep_drain_wk, *p_Restabs_wk, *p_Revap_soil_wk, *p_Revap_surface_wk, *p_Rhydred_wk, *p_Rinfiltration_wk, *p_Rinterception_wk, *p_Rpercolation_wk,
-		*p_Rpet_wk, *p_Rprecip_wk, *p_Rrunoff_wk, *p_Rsnowpack_wk, *p_Rsoil_temp_wk, *p_Rsurface_water_wk, *p_RvwcBulk_wk, *p_RvwcMatric_wk, *p_RswcBulk_wk, *p_RswpMatric_wk,
-		*p_RswaBulk_wk, *p_RswaMatric_wk, *p_Rtemp_wk, *p_Rtransp_wk, *p_Rwetdays_wk;
-RealD *p_Raet_dy, *p_Rdeep_drain_dy, *p_Restabs_dy, *p_Revap_soil_dy, *p_Revap_surface_dy, *p_Rhydred_dy, *p_Rinfiltration_dy, *p_Rinterception_dy, *p_Rpercolation_dy,
-		*p_Rpet_dy, *p_Rprecip_dy, *p_Rrunoff_dy, *p_Rsnowpack_dy, *p_Rsoil_temp_dy, *p_Rsurface_water_dy, *p_RvwcBulk_dy, *p_RvwcMatric_dy, *p_RswcBulk_dy, *p_RswpMatric_dy,
-		*p_RswaBulk_dy, *p_RswaMatric_dy, *p_Rtemp_dy, *p_Rtransp_dy, *p_Rwetdays_dy;
-unsigned int yr_nrow = 0, mo_nrow = 0, wk_nrow = 0, dy_nrow = 0;
-
-extern char _firstfile[1024];
-//extern int timeSteps[SW_OUTNKEYS][4];
-//extern int numPeriod;
-extern SW_MODEL SW_Model;
-//extern SW_SITE SW_Site;
-extern SW_VEGESTAB SW_VegEstab;
-static   int periodUse[28][4];
-unsigned int addtl_yr = 0; /* Used to calculate the actual year being modeled */
-
-/* =================================================== */
-/*                Module-Level Declarations            */
-/* --------------------------------------------------- */
-
-void SW_FLW_construct(void);
-
-SEXP onGetInputDataFromFiles(SEXP inputOptions) {
-	int i;
-	SEXP swInputData;
-	SEXP SW_DataList;
-	SEXP swLog;
-	SEXP oRlogfile;
-
-	logged = FALSE;
-	logfp = stdout;
-	int argc = length(inputOptions);
-	char *argv[7];
-	collectInData = TRUE;
-	PROTECT(inputOptions = AS_CHARACTER(inputOptions));
-	for (i = 0; i < argc; i++) {
-		argv[i] = R_alloc(strlen(CHAR(STRING_ELT(inputOptions, i))), sizeof(char));
-	}
-	for (i = 0; i < argc; i++) {
-		strcpy(argv[i], CHAR(STRING_ELT(inputOptions, i)));
-	}
-	//Rprintf("set Args\n");
-	PROTECT(swLog = MAKE_CLASS("swLog"));
-	PROTECT(oRlogfile = NEW_OBJECT(swLog));
-	PROTECT(Rlogfile = GET_SLOT(oRlogfile,install("LogData")));
-	//Rprintf("swLog\n");
-	init_args(argc, argv);
-	SW_F_construct(_firstfile);
-	SW_MDL_construct();
-	SW_WTH_construct();
-	SW_SIT_construct();
-	SW_VES_construct();
-	SW_VPD_construct();
-	SW_OUT_construct();
-	SW_SWC_construct();
-	SW_FLW_construct();
-	SW_CBN_construct();
-	//Rprintf("Construct\n");
-	SW_F_read(NULL);
-	//Rprintf("FilesRead\n");
-	SW_MDL_read();
-	//Rprintf("mdlRead\n");
-	SW_WTH_read();
-	//Rprintf("wthRead\n");
-	SW_VPD_read();
-	//Rprintf("vpdRead\n");
-	SW_SIT_read();
-	//Rprintf("sitRead\n");
-	SW_VES_read();
-	//Rprintf("vesRead\n");
-	SW_OUT_read();
-	//Rprintf("outRead\n");
-	SW_SWC_read();
-	//Rprintf("Read\n");
-	PROTECT(swInputData = MAKE_CLASS("swInputData"));
-	PROTECT(SW_DataList = NEW_OBJECT(swInputData));
-	SET_SLOT(SW_DataList, install("files"), onGet_SW_F());
-	//Rprintf("swFiles\n");
-	SET_SLOT(SW_DataList, install("years"), onGet_SW_MDL());
-	//Rprintf("swYears\n");
-	SET_SLOT(SW_DataList, install("weather"), onGet_SW_WTH());
-	//Rprintf("swWeather\n");
-	SET_SLOT(SW_DataList, install("cloud"), onGet_SW_SKY());
-	//Rprintf("swSky\n");
-	SET_SLOT(SW_DataList, install("weatherHistory"), onGet_WTH_DATA());
-	//Rprintf("swWeatherHistory\n");
-	if (LOGICAL(GET_SLOT(GET_SLOT(SW_DataList, install("weather")), install("use_Markov")))[0]) {
-		SET_SLOT(SW_DataList, install("markov"), onGet_MKV());
-		//Rprintf("swMarkov\n");
-	}
-	SET_SLOT(SW_DataList,install("prod"),onGet_SW_VPD());
-	//Rprintf("swProd\n");
-	SET_SLOT(SW_DataList,install("site"),onGet_SW_SIT());
-	//Rprintf("swSite\n");
-	SET_SLOT(SW_DataList,install("soils"),onGet_SW_LYR());
-	//Rprintf("swSoils\n");
-	SET_SLOT(SW_DataList,install("estab"),onGet_SW_VES());
-	//Rprintf("swEstab\n");
-	SET_SLOT(SW_DataList,install("carbon"),onGet_SW_CARBON());
-	//Rprintf("swCarbon\n");
-	SET_SLOT(SW_DataList,install("output"), onGet_SW_OUT());
-	//Rprintf("swOUT\n");
-	SET_SLOT(SW_DataList,install("swc"),onGet_SW_SWC());
-	//Rprintf("swSWC\n");
-	SET_SLOT(SW_DataList,install("log"),oRlogfile);
-
-	SW_SIT_clear_layers();
-	SW_WTH_clear_runavg_list();
-	SW_VES_clear();
-
-	UNPROTECT(6);
-	return SW_DataList;
-}
-
-SEXP start(SEXP inputOptions, SEXP inputData, SEXP weatherList) {
-	int tYears = 0, tevapLayers = 0, tVegEstabCount = 0, pYearUse = 0, pMonthUse = 0, pWeekUse = 0, pDayUse = 0;
-	int i;
-	SEXP outputData;
-
-	//Main Output
-	SEXP swLog;
-	SEXP oRlogfile;
-
-	logged = FALSE;
-	logfp = stdout;
-	int argc = length(inputOptions);
-	char *argv[7];
-	collectInData = FALSE;
-	if(isNull(inputData))
-		useFiles = TRUE;
-	else {
-		useFiles = FALSE;
-		InputData = inputData;
-	}
-	//This is used to minimize copying weather data between similiar runs.
-	if(isNull(weatherList)) {
-		bWeatherList = FALSE;
-	} else {
-		bWeatherList = TRUE;
-		WeatherList = weatherList;
-	}
-
-	PROTECT(inputOptions = AS_CHARACTER(inputOptions));
-	for (i = 0; i < argc; i++) {
-		argv[i] = R_alloc(strlen(CHAR(STRING_ELT(inputOptions, i))), sizeof(char));
-	}
-	for (i = 0; i < argc; i++) {
-		strcpy(argv[i], CHAR(STRING_ELT(inputOptions, i)));
-	}
-	RlogIndex = 0;
-	// logfile
-	PROTECT(swLog = MAKE_CLASS("swLog"));
-	PROTECT(oRlogfile = NEW_OBJECT(swLog));
-	PROTECT(Rlogfile = GET_SLOT(oRlogfile,install("LogData")));
-
-	//Set the input data either from files or from memory
-	init_args(argc, argv);
-	SW_CTL_init_model(_firstfile);
-
-	PROTECT(outputData = onGetOutput(inputData));
-
-	yr_nrow = INTEGER(GET_SLOT(outputData, install("yr_nrow")))[0];
-	mo_nrow = INTEGER(GET_SLOT(outputData, install("mo_nrow")))[0];
-	wk_nrow = INTEGER(GET_SLOT(outputData, install("wk_nrow")))[0];
-	dy_nrow = INTEGER(GET_SLOT(outputData, install("dy_nrow")))[0];
-
-	// Get the pointers to the pre configured output data setup. These are used in output.c
-	p_Rco2effects_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("CO2EFFECTS")), install("Year")));
-	p_Rco2effects_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("CO2EFFECTS")), install("Month")));
-
-	if(periodUse[eSW_Temp][3]) p_Rtemp_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Year")));
-	if(periodUse[eSW_Temp][2]) p_Rtemp_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Month")));
-	if(periodUse[eSW_Temp][1]) p_Rtemp_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Week")));
-	if(periodUse[eSW_Temp][0]) p_Rtemp_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Day")));
-
-	if(periodUse[eSW_AET][3]) p_Raet_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Year")));
-	if(periodUse[eSW_AET][2]) p_Raet_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Month")));
-	if(periodUse[eSW_AET][1]) p_Raet_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Week")));
-	if(periodUse[eSW_AET][0]) p_Raet_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Day")));
-
-	if(periodUse[eSW_DeepSWC][3]) p_Rdeep_drain_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Year")));
-	if(periodUse[eSW_DeepSWC][2]) p_Rdeep_drain_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Month")));
-	if(periodUse[eSW_DeepSWC][1]) p_Rdeep_drain_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Week")));
-	if(periodUse[eSW_DeepSWC][0]) p_Rdeep_drain_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Day")));
-
-	if(periodUse[eSW_Estab][3]) p_Restabs_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Year")));
-	if(periodUse[eSW_Estab][2]) p_Restabs_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Month")));
-	if(periodUse[eSW_Estab][1]) p_Restabs_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Week")));
-	if(periodUse[eSW_Estab][0]) p_Restabs_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Day")));
-
-	if(periodUse[eSW_EvapSoil][3]) p_Revap_soil_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Year")));
-	if(periodUse[eSW_EvapSoil][2]) p_Revap_soil_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Month")));
-	if(periodUse[eSW_EvapSoil][1]) p_Revap_soil_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Week")));
-	if(periodUse[eSW_EvapSoil][0]) p_Revap_soil_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Day")));
-
-	if(periodUse[eSW_EvapSurface][3]) p_Revap_surface_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Year")));
-	if(periodUse[eSW_EvapSurface][2]) p_Revap_surface_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Month")));
-	if(periodUse[eSW_EvapSurface][1]) p_Revap_surface_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Week")));
-	if(periodUse[eSW_EvapSurface][0]) p_Revap_surface_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Day")));
-
-	if(periodUse[eSW_HydRed][3]) p_Rhydred_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Year")));
-	if(periodUse[eSW_HydRed][2]) p_Rhydred_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Month")));
-	if(periodUse[eSW_HydRed][1]) p_Rhydred_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Week")));
-	if(periodUse[eSW_HydRed][0]) p_Rhydred_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Day")));
-
-	if(periodUse[eSW_SoilInf][3]) p_Rinfiltration_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Year")));
-	if(periodUse[eSW_SoilInf][2]) p_Rinfiltration_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Month")));
-	if(periodUse[eSW_SoilInf][1]) p_Rinfiltration_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Week")));
-	if(periodUse[eSW_SoilInf][0]) p_Rinfiltration_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Day")));
-
-	if(periodUse[eSW_Interception][3]) p_Rinterception_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Year")));
-	if(periodUse[eSW_Interception][2]) p_Rinterception_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Month")));
-	if(periodUse[eSW_Interception][1]) p_Rinterception_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Week")));
-	if(periodUse[eSW_Interception][0]) p_Rinterception_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Day")));
-
-	if(periodUse[eSW_LyrDrain][3]) p_Rpercolation_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Year")));
-	if(periodUse[eSW_LyrDrain][2]) p_Rpercolation_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Month")));
-	if(periodUse[eSW_LyrDrain][1]) p_Rpercolation_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Week")));
-	if(periodUse[eSW_LyrDrain][0]) p_Rpercolation_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Day")));
-
-	if(periodUse[eSW_PET][3]) p_Rpet_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Year")));
-	if(periodUse[eSW_PET][2]) p_Rpet_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Month")));
-	if(periodUse[eSW_PET][1]) p_Rpet_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Week")));
-	if(periodUse[eSW_PET][0]) p_Rpet_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Day")));
-
-	if(periodUse[eSW_Precip][3]) p_Rprecip_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Year")));
-	if(periodUse[eSW_Precip][2]) p_Rprecip_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Month")));
-	if(periodUse[eSW_Precip][1]) p_Rprecip_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Week")));
-	if(periodUse[eSW_Precip][0]) p_Rprecip_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Day")));
-
-	if(periodUse[eSW_Runoff][3]) p_Rrunoff_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Year")));
-	if(periodUse[eSW_Runoff][2]) p_Rrunoff_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Month")));
-	if(periodUse[eSW_Runoff][1]) p_Rrunoff_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Week")));
-	if(periodUse[eSW_Runoff][0]) p_Rrunoff_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Day")));
-
-	if(periodUse[eSW_SnowPack][3]) p_Rsnowpack_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Year")));
-	if(periodUse[eSW_SnowPack][2]) p_Rsnowpack_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Month")));
-	if(periodUse[eSW_SnowPack][1]) p_Rsnowpack_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Week")));
-	if(periodUse[eSW_SnowPack][0]) p_Rsnowpack_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Day")));
-
-	if(periodUse[eSW_SoilTemp][3]) p_Rsoil_temp_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Year")));
-	if(periodUse[eSW_SoilTemp][2]) p_Rsoil_temp_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Month")));
-	if(periodUse[eSW_SoilTemp][1]) p_Rsoil_temp_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Week")));
-	if(periodUse[eSW_SoilTemp][0]) p_Rsoil_temp_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Day")));
-
-	if(periodUse[eSW_SurfaceWater][3]) p_Rsurface_water_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Year")));
-	if(periodUse[eSW_SurfaceWater][2]) p_Rsurface_water_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Month")));
-	if(periodUse[eSW_SurfaceWater][1]) p_Rsurface_water_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Week")));
-	if(periodUse[eSW_SurfaceWater][0]) p_Rsurface_water_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Day")));
-
-	if(periodUse[eSW_VWCBulk][3]) p_RvwcBulk_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Year")));
-	if(periodUse[eSW_VWCBulk][2]) p_RvwcBulk_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Month")));
-	if(periodUse[eSW_VWCBulk][1]) p_RvwcBulk_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Week")));
-	if(periodUse[eSW_VWCBulk][0]) p_RvwcBulk_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Day")));
-
-	if(periodUse[eSW_VWCMatric][3]) p_RvwcMatric_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Year")));
-	if(periodUse[eSW_VWCMatric][2]) p_RvwcMatric_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Month")));
-	if(periodUse[eSW_VWCMatric][1]) p_RvwcMatric_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Week")));
-	if(periodUse[eSW_VWCMatric][0]) p_RvwcMatric_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Day")));
-
-	if(periodUse[eSW_SWCBulk][3]) p_RswcBulk_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Year")));
-	if(periodUse[eSW_SWCBulk][2]) p_RswcBulk_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Month")));
-	if(periodUse[eSW_SWCBulk][1]) p_RswcBulk_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Week")));
-	if(periodUse[eSW_SWCBulk][0]) p_RswcBulk_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Day")));
-
-	if(periodUse[eSW_SWPMatric][3]) p_RswpMatric_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Year")));
-	if(periodUse[eSW_SWPMatric][2]) p_RswpMatric_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Month")));
-	if(periodUse[eSW_SWPMatric][1]) p_RswpMatric_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Week")));
-	if(periodUse[eSW_SWPMatric][0]) p_RswpMatric_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Day")));
-
-	if(periodUse[eSW_SWABulk][3]) p_RswaBulk_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Year")));
-	if(periodUse[eSW_SWABulk][2]) p_RswaBulk_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Month")));
-	if(periodUse[eSW_SWABulk][1]) p_RswaBulk_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Week")));
-	if(periodUse[eSW_SWABulk][0]) p_RswaBulk_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Day")));
-
-	if(periodUse[eSW_SWAMatric][3]) p_RswaMatric_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Year")));
-	if(periodUse[eSW_SWAMatric][2]) p_RswaMatric_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Month")));
-	if(periodUse[eSW_SWAMatric][1]) p_RswaMatric_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Week")));
-	if(periodUse[eSW_SWAMatric][0]) p_RswaMatric_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Day")));
-
-	if(periodUse[eSW_Transp][3]) p_Rtransp_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Year")));
-	if(periodUse[eSW_Transp][2]) p_Rtransp_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Month")));
-	if(periodUse[eSW_Transp][1]) p_Rtransp_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Week")));
-	if(periodUse[eSW_Transp][0]) p_Rtransp_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Day")));
-
-	if(periodUse[eSW_WetDays][3]) p_Rwetdays_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Year")));
-	if(periodUse[eSW_WetDays][2]) p_Rwetdays_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Month")));
-	if(periodUse[eSW_WetDays][1]) p_Rwetdays_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Week")));
-	if(periodUse[eSW_WetDays][0]) p_Rwetdays_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Day")));
-
-	//Rprintf("Day Pointers Set\n");
-	SW_CTL_main();
-
-	SW_SIT_clear_layers();
-	SW_WTH_clear_runavg_list();
-	SW_VES_clear();
-
-	UNPROTECT(5);
-
-	return(outputData);
-}
-
-/* Experience has shown that generating the Output Data structure in R is slow compared to C
- * This will generate the OUTPUT data Structure and Names*/
-SEXP onGetOutput(SEXP inputData) {
-	int debug = 0;
-
-	int tLayers=0, tYears = 0, tevapLayers = 0, tVegEstabCount = 0, pYearUse = 0, pMonthUse = 0, pWeekUse = 0, pDayUse = 0;
-	unsigned int Raet_columns, Rdeedrain_columns, Restabs_columns, Revasoil_columns, Revasurface_columns, Rhydred_columns, Rinfiltration_columns, Rinterception_columns, Rpercolation_columns,
-					Rpet_columns, Rprecip_columns, Rrunoff_columns, Rsnowpack_columns, Rsoil_temp_columns, Rsurface_water_columns, RvwcBulk_columns, RvwcMatric_columns, RswcBulk_columns, RswpMatric_columns, RswaBulk_columns,
-					RswaMatric_columns, Rtemp_columns, Rtransp_columns, Rwetdays_columns, Rco2effects_columns, /*NOT USED ->*/ Rwthr_columns,RallH2O_columns,Ret_columns,Rallveg_columns;
-	int i,j, k, pCount=0;
-	int use[29];
-	Bool useTimeStep;
-
-	SEXP swOutput, swOutput_Object;
-	char *cSWoutput_Names[] = {"yr_nrow","mo_nrow","wk_nrow","dy_nrow","WTHR","TEMP","PRECIP","SOILINFILT","RUNOFF","ALLH2O","VWCBULK","VWCMATRIC","SWCBULK","SWABULK","SWAMATRIC","SWPMATRIC","SURFACEWATER",
-	                           "TRANSP","EVAPSOIL","EVAPSURFACE","INTERCEPTION","LYRDRAIN","HYDRED","ET","AET","PET","WETDAY","SNOWPACK","DEEPSWC","SOILTEMP","ALLVEG","ESTABL", "CO2EFFECTS"};
-
-	SEXP swOutput_KEY;
-	char *cSWoutput_KEY_Names[] = {"Title","TimeStep","Columns","Day","Week","Month","Year"};
-	SEXP swOutput_KEY_WTHR, swOutput_KEY_TEMP, swOutput_KEY_PRECIP, swOutput_KEY_SOILINFILT, swOutput_KEY_RUNOFF, swOutput_KEY_ALLH2O, swOutput_KEY_VWCBULK, swOutput_KEY_VWCMATRIC, swOutput_KEY_SWCBULK,
-		swOutput_KEY_SWPMATRIC, swOutput_KEY_SWABULK, swOutput_KEY_SWAMATRIC, swOutput_KEY_SURFACEWATER, swOutput_KEY_TRANSP, swOutput_KEY_EVAPSOIL, swOutput_KEY_EVAPSURFACE, swOutput_KEY_INTERCEPTION,
-		swOutput_KEY_LYRDRAIN, swOutput_KEY_HYDRED, swOutput_KEY_ET, swOutput_KEY_AET, swOutput_KEY_PET, swOutput_KEY_WETDAY, swOutput_KEY_SNOWPACK, swOutput_KEY_DEEPSWC,
-		swOutput_KEY_SOILTEMP, swOutput_KEY_ALLVEG, swOutput_KEY_ESTABL, swOutput_KEY_CO2EFFECTS;
-	char *cSWoutput_KEY_Titles[] = {"","temp_air","precip","infiltration","runoff","","vwc_bulk","vwc_matric","swc_bulk","swa_bulk","swa_matric","swp_matric","surface_water","transp","evap_soil","evap_surface",
-		"interception","percolation","hydred","","aet","pet","wetdays","snowpack","deep_drain","temp_soil","","estabs", "co2_effects"};
-
-	SEXP Periods, TimeSteps;
-	SEXP r_dy_nrow, r_wk_nrow, r_mo_nrow, r_yr_nrow;
-	SEXP r_WTHR_NAME, r_TEMP_NAME, r_PRECIP_NAME, r_SOILINFILT_NAME, r_RUNOFF_NAME, r_ALLH2O_NAME, r_VWCBULK_NAME, r_VWCMATRIC_NAME, r_SWCBULK_NAME, r_SWPMATRIC_NAME, r_SWABULK_NAME, r_SWAMATRIC_NAME, r_SURFACEWATER_NAME, r_TRANSP_NAME, r_EVAPSOIL_NAME, r_EVAPSURFACE_NAME, r_INTERCEPTION_NAME, r_LYRDRAIN_NAME, r_HYDRED_NAME, r_ET_NAME, r_AET_NAME, r_PET_NAME, r_WETDAY_NAME, r_SNOWPACK_NAME, r_DEEPSWC_NAME, r_SOILTEMP_NAME, r_ALLVEG_NAME, r_ESTABL_NAME, r_CO2EFFECTS_NAME;
-	SEXP r_WTHR_PERIOD, r_TEMP_PERIOD, r_PRECIP_PERIOD, r_SOILINFILT_PERIOD, r_RUNOFF_PERIOD, r_ALLH2O_PERIOD, r_VWCBULK_PERIOD, r_VWCMATRIC_PERIOD, r_SWCBULK_PERIOD, r_SWPMATRIC_PERIOD, r_SWABULK_PERIOD, r_SWAMATRIC_PERIOD, r_SURFACEWATER_PERIOD, r_TRANSP_PERIOD, r_EVAPSOIL_PERIOD, r_EVAPSURFACE_PERIOD, r_INTERCEPTION_PERIOD, r_LYRDRAIN_PERIOD, r_HYDRED_PERIOD, r_ET_PERIOD, r_AET_PERIOD, r_PET_PERIOD, r_WETDAY_PERIOD, r_SNOWPACK_PERIOD, r_DEEPSWC_PERIOD, r_SOILTEMP_PERIOD, r_ALLVEG_PERIOD, r_ESTABL_PERIOD, r_CO2EFFECTS_PERIOD;
-	SEXP r_WTHR_COLUMNS, r_TEMP_COLUMNS, r_PRECIP_COLUMNS, r_SOILINFILT_COLUMNS, r_RUNOFF_COLUMNS, r_ALLH2O_COLUMNS, r_VWCBULK_COLUMNS, r_VWCMATRIC_COLUMNS, r_SWCBULK_COLUMNS, r_SWPMATRIC_COLUMNS, r_SWABULK_COLUMNS, r_SWAMATRIC_COLUMNS, r_SURFACEWATER_COLUMNS, r_TRANSP_COLUMNS, r_EVAPSOIL_COLUMNS, r_EVAPSURFACE_COLUMNS, r_INTERCEPTION_COLUMNS, r_LYRDRAIN_COLUMNS, r_HYDRED_COLUMNS, r_ET_COLUMNS, r_AET_COLUMNS, r_PET_COLUMNS, r_WETDAY_COLUMNS, r_SNOWPACK_COLUMNS, r_DEEPSWC_COLUMNS, r_SOILTEMP_COLUMNS, r_ALLVEG_COLUMNS, r_ESTABL_COLUMNS, r_CO2EFFECTS_COLUMNS;
-
-	SEXP Rallveg_yr, Ret_yr, RallH2O_yr, Rwthr_yr, Raet_yr, Rdeedrain_yr, Restabs_yr, Revasoil_yr, Revasurface_yr, Rhydred_yr, Rinfiltration_yr, Rinterception_yr, Rpercolation_yr,
-			Rpet_yr, Rprecip_yr, Rrunoff_yr, Rsnowpack_yr, Rsoil_temp_yr, Rsurface_water_yr, RvwcBulk_yr, RvwcMatric_yr, RswcBulk_yr, RswpMatric_yr,
-			RswaBulk_yr, RswaMatric_yr, Rtemp_yr, Rtransp_yr, Rwetdays_yr, Rco2effects_yr;
-	SEXP Rallveg_mo, Ret_mo, RallH2O_mo, Rwthr_mo, Raet_mo, Rdeedrain_mo, Restabs_mo, Revasoil_mo, Revasurface_mo, Rhydred_mo, Rinfiltration_mo, Rinterception_mo, Rpercolation_mo,
-			Rpet_mo, Rprecip_mo, Rrunoff_mo, Rsnowpack_mo, Rsoil_temp_mo, Rsurface_water_mo, RvwcBulk_mo, RvwcMatric_mo, RswcBulk_mo, RswpMatric_mo,
-			RswaBulk_mo, RswaMatric_mo, Rtemp_mo, Rtransp_mo, Rwetdays_mo, Rco2effects_mo;
-	SEXP Rallveg_wk, Ret_wk, RallH2O_wk, Rwthr_wk, Raet_wk, Rdeedrain_wk, Restabs_wk, Revasoil_wk, Revasurface_wk, Rhydred_wk, Rinfiltration_wk, Rinterception_wk, Rpercolation_wk,
-			Rpet_wk, Rprecip_wk, Rrunoff_wk, Rsnowpack_wk, Rsoil_temp_wk, Rsurface_water_wk, RvwcBulk_wk, RvwcMatric_wk, RswcBulk_wk, RswpMatric_wk,
-			RswaBulk_wk, RswaMatric_wk, Rtemp_wk, Rtransp_wk, Rwetdays_wk;
-	SEXP Rallveg_dy, Ret_dy, RallH2O_dy, Rwthr_dy, Raet_dy, Rdeedrain_dy, Restabs_dy, Revasoil_dy, Revasurface_dy, Rhydred_dy, Rinfiltration_dy, Rinterception_dy, Rpercolation_dy,
-			Rpet_dy, Rprecip_dy, Rrunoff_dy, Rsnowpack_dy, Rsoil_temp_dy, Rsurface_water_dy, RvwcBulk_dy, RvwcMatric_dy, RswcBulk_dy, RswpMatric_dy,
-			RswaBulk_dy, RswaMatric_dy, Rtemp_dy, Rtransp_dy, Rwetdays_dy;
-
-	/************ NAMES ****************/
-	SEXP Ret_names_yr, Ret_names_y_yr, Raet_names_yr, Raet_names_y_yr, Rdeep_drain_names_yr, Rdeep_drain_names_y_yr, Restabs_names_yr, Restabs_names_y_yr, Revap_soil_names_yr, Revap_soil_names_y_yr,
-	Revap_surface_names_yr, Revap_surface_names_y_yr, Rhydred_names_yr, Rhydred_names_y_yr, Rinfiltration_names_yr, Rinfiltration_names_y_yr, Rinterception_names_yr,
-	Rinterception_names_y_yr, Rpercolation_names_yr, Rpercolation_names_y_yr, Rpet_names_yr, Rpet_names_y_yr, Rprecip_names_yr, Rprecip_names_y_yr, Rrunoff_names_yr,
-	Rrunoff_names_y_yr, Rsnowpack_names_yr, Rsnowpack_names_y_yr, Rsoil_temp_names_yr, Rsoil_temp_names_y_yr, Rsurface_water_names_yr, Rsurface_water_names_y_yr,
-	Rsw_pot_names_yr, Rsw_pot_names_y_yr, RswaBulk_names_yr, RswaBulk_names_y_yr, RswaMatric_names_yr, RswaMatric_names_y_yr, RswcBulk_names_yr, RswcBulk_names_y_yr, Rtemp_names_yr, Rtemp_names_y_yr, Rtransp_names_yr,
-	Rtransp_names_y_yr, RvwcBulk_names_yr, RvwcBulk_names_y_yr, RvwcMatric_names_yr, RvwcMatric_names_y_yr, Rwetdays_names_yr, Rwetdays_names_y_yr, RswpMatric_names_yr, RswpMatric_names_y_yr,
-	Rco2effects_names_y_yr, Rco2effects_names_yr;
-
-	SEXP Ret_names_mo, Ret_names_y_mo, Raet_names_mo, Raet_names_y_mo, Rdeep_drain_names_mo, Rdeep_drain_names_y_mo, Restabs_names_mo, Restabs_names_y_mo, Revap_soil_names_mo, Revap_soil_names_y_mo,
-	Revap_surface_names_mo, Revap_surface_names_y_mo, Rhydred_names_mo, Rhydred_names_y_mo, Rinfiltration_names_mo, Rinfiltration_names_y_mo, Rinterception_names_mo,
-	Rinterception_names_y_mo, Rpercolation_names_mo, Rpercolation_names_y_mo, Rpet_names_mo, Rpet_names_y_mo, Rprecip_names_mo, Rprecip_names_y_mo, Rrunoff_names_mo,
-	Rrunoff_names_y_mo, Rsnowpack_names_mo, Rsnowpack_names_y_mo, Rsoil_temp_names_mo, Rsoil_temp_names_y_mo, Rsurface_water_names_mo, Rsurface_water_names_y_mo,
-	Rsw_pot_names_mo, Rsw_pot_names_y_mo, RswaBulk_names_mo, RswaBulk_names_y_mo, RswaMatric_names_mo, RswaMatric_names_y_mo, RswcBulk_names_mo, RswcBulk_names_y_mo, Rtemp_names_mo, Rtemp_names_y_mo, Rtransp_names_mo,
-	Rtransp_names_y_mo, RvwcBulk_names_mo, RvwcBulk_names_y_mo, RvwcMatric_names_mo, RvwcMatric_names_y_mo, Rwetdays_names_mo, Rwetdays_names_y_mo, RswpMatric_names_mo, RswpMatric_names_y_mo,
-	Rco2effects_names_y_mo, Rco2effects_names_mo;
-
-	SEXP Ret_names_wk, Ret_names_y_wk, Raet_names_wk, Raet_names_y_wk, Rdeep_drain_names_wk, Rdeep_drain_names_y_wk, Restabs_names_wk, Restabs_names_y_wk, Revap_soil_names_wk, Revap_soil_names_y_wk,
-	Revap_surface_names_wk, Revap_surface_names_y_wk, Rhydred_names_wk, Rhydred_names_y_wk, Rinfiltration_names_wk, Rinfiltration_names_y_wk, Rinterception_names_wk,
-	Rinterception_names_y_wk, Rpercolation_names_wk, Rpercolation_names_y_wk, Rpet_names_wk, Rpet_names_y_wk, Rprecip_names_wk, Rprecip_names_y_wk, Rrunoff_names_wk,
-	Rrunoff_names_y_wk, Rsnowpack_names_wk, Rsnowpack_names_y_wk, Rsoil_temp_names_wk, Rsoil_temp_names_y_wk, Rsurface_water_names_wk, Rsurface_water_names_y_wk,
-	Rsw_pot_names_wk, Rsw_pot_names_y_wk, RswaBulk_names_wk, RswaBulk_names_y_wk, RswaMatric_names_wk, RswaMatric_names_y_wk, RswcBulk_names_wk, RswcBulk_names_y_wk, Rtemp_names_wk, Rtemp_names_y_wk, Rtransp_names_wk,
-	Rtransp_names_y_wk, RvwcBulk_names_wk, RvwcBulk_names_y_wk, RvwcMatric_names_wk, RvwcMatric_names_y_wk, Rwetdays_names_wk, Rwetdays_names_y_wk, RswpMatric_names_wk, RswpMatric_names_y_wk;
-
-	SEXP Ret_names_dy, Ret_names_y_dy, Raet_names_dy, Raet_names_y_dy, Rdeep_drain_names_dy, Rdeep_drain_names_y_dy, Restabs_names_dy, Restabs_names_y_dy, Revap_soil_names_dy, Revap_soil_names_y_dy,
-	Revap_surface_names_dy, Revap_surface_names_y_dy, Rhydred_names_dy, Rhydred_names_y_dy, Rinfiltration_names_dy, Rinfiltration_names_y_dy, Rinterception_names_dy,
-	Rinterception_names_y_dy, Rpercolation_names_dy, Rpercolation_names_y_dy, Rpet_names_dy, Rpet_names_y_dy, Rprecip_names_dy, Rprecip_names_y_dy, Rrunoff_names_dy,
-	Rrunoff_names_y_dy, Rsnowpack_names_dy, Rsnowpack_names_y_dy, Rsoil_temp_names_dy, Rsoil_temp_names_y_dy, Rsurface_water_names_dy, Rsurface_water_names_y_dy,
-	Rsw_pot_names_dy, Rsw_pot_names_y_dy, RswaBulk_names_dy, RswaBulk_names_y_dy, RswaMatric_names_dy, RswaMatric_names_y_dy, RswcBulk_names_dy, RswcBulk_names_y_dy, Rtemp_names_dy, Rtemp_names_y_dy, Rtransp_names_dy,
-	Rtransp_names_y_dy, RvwcBulk_names_dy, RvwcBulk_names_y_dy, RvwcMatric_names_dy, RvwcMatric_names_y_dy, Rwetdays_names_dy, Rwetdays_names_y_dy, RswpMatric_names_dy, RswpMatric_names_y_dy;
-
-	char *Layers_names[] = { "Lyr_1", "Lyr_2", "Lyr_3", "Lyr_4", "Lyr_5", "Lyr_6", "Lyr_7", "Lyr_8", "Lyr_9", "Lyr_10", "Lyr_11", "Lyr_12", "Lyr_13", "Lyr_14", "Lyr_15",
-	                         "Lyr_16", "Lyr_17", "Lyr_18", "Lyr_19", "Lyr_20", "Lyr_21", "Lyr_22", "Lyr_23", "Lyr_24", "Lyr_25", "Lyr_26", "Lyr_27", "Lyr_28", "Lyr_29", "Lyr_30" };
-	char *Cevap_surface_names[] = { "total_evap", "tree_evap", "shrub_evap","forbs_evap", "grass_evap", "litter_evap", "surfaceWater_evap" };
-	char *Chydred_names[] = { "total_", "tree_", "shrub_", "forbs_", "grass_" };
-	char *Cinterception_names[] = { "total", "tree", "shrub", "forbs", "grass", "litter" };
-	char *Cprecip_names[] = { "ppt", "rain", "snow_fall", "snowmelt", "snowloss" };
-	char *Crunoff_names[] = { "total", "ponded", "snowmelt" };
-	char *Csnowpack_names[] = { "snowpackWaterEquivalent_cm", "snowdepth_cm" };
-	char *Ctemp_names[] = { "max_C", "min_C", "avg_C","surfaceTemp_C" };
-	char *Ctransp_names[] = { "transp_total_", "transp_tree_", "transp_shrub_", "transp_forbs_", "transp_grass_" };
-	char Ctemp[50];
-	/****************************************************************************************/
-
-	tLayers = 0;
-	tevapLayers=0;
-
-	for(i=0; i<length(GET_SLOT(GET_SLOT(inputData, install("output")), install("use")));i++) {
-		use[i] = LOGICAL(GET_SLOT(GET_SLOT(inputData, install("output")), install("use")))[i];
-		//pCount+=4;
-	}
-
-	use[28] = 1; // Always have this as an output, because it also holds useful biomass data
-
-	tYears = (INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EndYear")))[0] - INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("StartYear")))[0] + 1);
-	tLayers = nrows(GET_SLOT(GET_SLOT(inputData, install("soils")), install("Layers")));
-	for(i=0; i<tLayers; i++) {
-		if(REAL(GET_SLOT(GET_SLOT(inputData, install("soils")), install("Layers")))[i + (tLayers) * 3] > 0)
-			tevapLayers++;
-	}
-
-	if(debug) Rprintf("tYears: %d, tLayers: %d, tEvapLayers: %d \n", tYears, tLayers, tevapLayers);
-
-	PROTECT(TimeSteps = GET_SLOT(GET_SLOT(inputData, install("output")),install("timePeriods")));
-	useTimeStep = LOGICAL(GET_SLOT(GET_SLOT(inputData, install("output")),install("useTimeStep")))[0];
-	if(useTimeStep) {
-		PROTECT(Periods = GET_SLOT(GET_SLOT(inputData, install("output")),install("timePeriods")));
-		for (i = 0; i < LENGTH(TimeSteps); i++) {
-			switch (INTEGER(TimeSteps)[i]) {
-				case eSW_Day:
-				pDayUse = 1;
-				break;
-				case eSW_Week:
-				pWeekUse = 1;
-				break;
-				case eSW_Month:
-				pMonthUse = 1;
-				break;
-				case eSW_Year:
-				pYearUse = 1;
-				break;
-			}
-		}
-	} else {
-		PROTECT(Periods = GET_SLOT(GET_SLOT(inputData, install("output")),install("period")));
-		for(i=0; i<28; i++) {
-			switch (INTEGER(Periods)[i]) {
-				case eSW_Day:
-				pDayUse = 1;
-				break;
-				case eSW_Week:
-				pWeekUse = 1;
-				break;
-				case eSW_Month:
-				pMonthUse = 1;
-				break;
-				case eSW_Year:
-				pYearUse = 1;
-				break;
-			}
-		}
-	}
-
-	tVegEstabCount = INTEGER(GET_SLOT(GET_SLOT(inputData, install("estab")), install("count")))[0];
-
-	//tVegEstabCount = SW_VegEstab.count;
-
-	yr_nrow = tYears * pYearUse;
-	mo_nrow = tYears * 12 * pMonthUse;
-	wk_nrow = tYears * 53 * pWeekUse;
-	if (pDayUse == 1) {
-		dy_nrow = 0;
-		for (i = INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("StartYear")))[0]; i <= INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EndYear")))[0]; i++) {
-			if(i==0) {//Need to calculate the starting first day of first year
-				dy_nrow += Time_get_lastdoy_y(i) - INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("FDOFY")))[0] + 1;
-				if(debug) Rprintf("Year: %d DAYSINYEAR: %d\n",i,Time_get_lastdoy_y(i) - INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("FDOFY")))[0] + 1);
-			} else if(i==(tYears-1)) {//and last day of last year.
-				dy_nrow += INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EDOEY")))[0];
-				if(debug) Rprintf("Year: %d DAYSINYEAR: %d\n",i,INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EDOEY")))[0]);
-			} else {
-				dy_nrow += Time_get_lastdoy_y(i);
-				if(debug) Rprintf("Year: %d DAYSINYEAR: %d\n",i,Time_get_lastdoy_y(i));
-			}
-		}
-	}
-
-	if(debug) Rprintf("Year Rows: %d, Month Rows: %d, Week Rows: %d, Day Rows: %d\n",yr_nrow, mo_nrow, wk_nrow, dy_nrow);
-
-	for(i=0; i<28; i++) {
-		periodUse[i][0]=periodUse[i][1]=periodUse[i][2]=periodUse[i][3]=0;
-		if(useTimeStep) {
-			for(j=0; j<length(Periods); j++) {
-				periodUse[i][INTEGER(Periods)[j]] = 1;
-				//pCount+=3;
-			}
-		} else {
-			periodUse[i][INTEGER(Periods)[i]] = 1;
-			//pCount+=3;
-		}
-	}
-
-	// Number of Columns for outputs
-	Rwthr_columns = 0;
-	Rtemp_columns = 4;
-	Rprecip_columns = 5;
-	Rinfiltration_columns = 1;
-	Rrunoff_columns = 3;
-	RallH2O_columns = 0;
-	RvwcBulk_columns = tLayers;
-	RvwcMatric_columns = tLayers;
-	RswcBulk_columns = tLayers;
-	RswpMatric_columns = tLayers;
-	RswaBulk_columns = tLayers;
-	RswaMatric_columns = tLayers;
-	Rsurface_water_columns = 1;
-	Rtransp_columns = tLayers*5;
-	Revasoil_columns = tevapLayers;
-	Revasurface_columns = 7;
-	Rinterception_columns = 6;	// was 7
-	Rpercolation_columns = tLayers-1;
-	Rhydred_columns = tLayers*5;
-	Ret_columns = 0;
-	Raet_columns = 1;
-	Rpet_columns = 1;
-	Rwetdays_columns = tLayers;
-	Rsnowpack_columns = 2;
-	Rdeedrain_columns = 1;
-	Rsoil_temp_columns = tLayers;
-	Rallveg_columns = 0;
-	Restabs_columns = tVegEstabCount;
-	Rco2effects_columns = 12;
-	PROTECT(swOutput = MAKE_CLASS("swOutput"));
-	PROTECT(swOutput_Object = NEW_OBJECT(swOutput));
-
-	PROTECT(r_dy_nrow = allocVector(INTSXP,1));
-	INTEGER(r_dy_nrow)[0]=dy_nrow;
-	PROTECT(r_wk_nrow = allocVector(INTSXP,1));
-	INTEGER(r_wk_nrow)[0]=wk_nrow;
-	PROTECT(r_mo_nrow = allocVector(INTSXP,1));
-	INTEGER(r_mo_nrow)[0]=mo_nrow;
-	PROTECT(r_yr_nrow = allocVector(INTSXP,1));
-	INTEGER(r_yr_nrow)[0]=yr_nrow;
-
-	SET_SLOT(swOutput_Object, install(cSWoutput_Names[0]), r_yr_nrow);
-	SET_SLOT(swOutput_Object, install(cSWoutput_Names[1]), r_mo_nrow);
-	SET_SLOT(swOutput_Object, install(cSWoutput_Names[2]), r_wk_nrow);
-	SET_SLOT(swOutput_Object, install(cSWoutput_Names[3]), r_dy_nrow);
-
-//KEYS//
-	PROTECT(swOutput_KEY = MAKE_CLASS("swOutput_KEY"));
-
-	pCount+=9;
-	//WTHR - NOTUSED
-	if(use[0]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[0]);
-		PROTECT(swOutput_KEY_WTHR = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_WTHR_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_WTHR_NAME, 0, mkChar(cSWoutput_KEY_Titles[0]));
-		SET_SLOT(swOutput_KEY_WTHR, install("Title"), r_WTHR_NAME);
-		if(useTimeStep) {
-			PROTECT(r_WTHR_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++) {
-				INTEGER(r_WTHR_PERIOD)[i]=INTEGER(Periods)[i];
-			}
-			SET_SLOT(swOutput_KEY_WTHR, install("TimeStep"), r_WTHR_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_WTHR_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_WTHR_PERIOD)[0]=INTEGER(Periods)[0];
-			SET_SLOT(swOutput_KEY_WTHR, install("TimeStep"), r_WTHR_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[0][0]) {
-			PROTECT(Rwthr_dy = allocMatrix(REALSXP,dy_nrow,Rwthr_columns));
-			SET_SLOT(swOutput_KEY_WTHR, install("Day"), Rwthr_dy);
-			UNPROTECT(1);
-		}
-		if(periodUse[0][1]) {
-			PROTECT(Rwthr_wk = allocMatrix(REALSXP,wk_nrow,Rwthr_columns));
-			SET_SLOT(swOutput_KEY_WTHR, install("Week"), Rwthr_wk);
-			UNPROTECT(1);
-		}
-		if(periodUse[0][2]) {
-			PROTECT(Rwthr_mo = allocMatrix(REALSXP,mo_nrow,Rwthr_columns));
-			SET_SLOT(swOutput_KEY_WTHR, install("Month"), Rwthr_mo);
-			UNPROTECT(1);
-		}
-		if(periodUse[0][3]) {
-			PROTECT(Rwthr_yr = allocMatrix(REALSXP,yr_nrow,Rwthr_columns));
-			SET_SLOT(swOutput_KEY_WTHR, install("Year"), Rwthr_yr);
-			UNPROTECT(1);
-		}
-		PROTECT(r_WETDAY_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_WETDAY_COLUMNS)[0]=Rwthr_columns;
-		SET_SLOT(swOutput_KEY_WTHR, install("Columns"), r_WETDAY_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[4]), swOutput_KEY_WTHR);
-		UNPROTECT(3);
-	}
-	//TEMP
-	if(use[1]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[1]);
-		PROTECT(swOutput_KEY_TEMP = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_TEMP_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_TEMP_NAME, 0, mkChar(cSWoutput_KEY_Titles[1]));
-		SET_SLOT(swOutput_KEY_TEMP, install("Title"), r_TEMP_NAME);
-		if (useTimeStep) {
-			PROTECT(r_TEMP_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_TEMP_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_TEMP, install("TimeStep"), r_TEMP_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_TEMP_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_TEMP_PERIOD)[0]=INTEGER(Periods)[1];
-			SET_SLOT(swOutput_KEY_TEMP, install("TimeStep"), r_TEMP_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[1][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rtemp_dy = allocMatrix(REALSXP, dy_nrow, Rtemp_columns+2));
-			PROTECT(Rtemp_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rtemp_names_y_dy = allocVector(STRSXP, Rtemp_columns + 2));
-			SET_STRING_ELT(Rtemp_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rtemp_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Rtemp_columns; i++)
-				SET_STRING_ELT(Rtemp_names_y_dy, i + 2, mkChar(Ctemp_names[i]));
-			SET_VECTOR_ELT(Rtemp_names_dy, 1, Rtemp_names_y_dy);
-			setAttrib(Rtemp_dy, R_DimNamesSymbol, Rtemp_names_dy);
-			SET_SLOT(swOutput_KEY_TEMP, install("Day"), Rtemp_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[1][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rtemp_wk = allocMatrix(REALSXP, wk_nrow, Rtemp_columns+2));
-			PROTECT(Rtemp_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rtemp_names_y_wk = allocVector(STRSXP, Rtemp_columns + 2));
-			SET_STRING_ELT(Rtemp_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rtemp_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Rtemp_columns; i++)
-				SET_STRING_ELT(Rtemp_names_y_wk, i + 2, mkChar(Ctemp_names[i]));
-			SET_VECTOR_ELT(Rtemp_names_wk, 1, Rtemp_names_y_wk);
-			setAttrib(Rtemp_wk, R_DimNamesSymbol, Rtemp_names_wk);
-			SET_SLOT(swOutput_KEY_TEMP, install("Week"), Rtemp_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[1][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rtemp_mo = allocMatrix(REALSXP, mo_nrow, Rtemp_columns+2));
-			PROTECT(Rtemp_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rtemp_names_y_mo = allocVector(STRSXP, Rtemp_columns + 2));
-			SET_STRING_ELT(Rtemp_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rtemp_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Rtemp_columns; i++)
-				SET_STRING_ELT(Rtemp_names_y_mo, i + 2, mkChar(Ctemp_names[i]));
-			SET_VECTOR_ELT(Rtemp_names_mo, 1, Rtemp_names_y_mo);
-			setAttrib(Rtemp_mo, R_DimNamesSymbol, Rtemp_names_mo);
-			SET_SLOT(swOutput_KEY_TEMP, install("Month"), Rtemp_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[1][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rtemp_yr = allocMatrix(REALSXP, yr_nrow, Rtemp_columns+1));
-			PROTECT(Rtemp_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rtemp_names_y_yr = allocVector(STRSXP, Rtemp_columns + 1));
-			SET_STRING_ELT(Rtemp_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Rtemp_columns; i++)
-				SET_STRING_ELT(Rtemp_names_y_yr, i + 1, mkChar(Ctemp_names[i]));
-			SET_VECTOR_ELT(Rtemp_names_yr, 1, Rtemp_names_y_yr);
-			setAttrib(Rtemp_yr, R_DimNamesSymbol, Rtemp_names_yr);
-			SET_SLOT(swOutput_KEY_TEMP, install("Year"), Rtemp_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_TEMP_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_TEMP_COLUMNS)[0]=Rtemp_columns;
-		SET_SLOT(swOutput_KEY_TEMP, install("Columns"), r_TEMP_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[5]), swOutput_KEY_TEMP);
-		UNPROTECT(3);
-	}
-	//PRECIP
-	if(use[2]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[2]);
-		PROTECT(swOutput_KEY_PRECIP = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_PRECIP_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_PRECIP_NAME, 0, mkChar(cSWoutput_KEY_Titles[2]));
-		SET_SLOT(swOutput_KEY_PRECIP, install("Title"), r_PRECIP_NAME);
-		if (useTimeStep) {
-			PROTECT(r_PRECIP_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_PRECIP_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_PRECIP, install("TimeStep"), r_PRECIP_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_PRECIP_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_PRECIP_PERIOD)[0]=INTEGER(Periods)[2];
-			SET_SLOT(swOutput_KEY_PRECIP, install("TimeStep"), r_PRECIP_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[2][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rprecip_dy = allocMatrix(REALSXP, dy_nrow, Rprecip_columns+2));
-			PROTECT(Rprecip_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rprecip_names_y_dy = allocVector(STRSXP, Rprecip_columns + 2));
-			SET_STRING_ELT(Rprecip_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rprecip_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Rprecip_columns; i++)
-				SET_STRING_ELT(Rprecip_names_y_dy, i + 2, mkChar(Cprecip_names[i]));
-			SET_VECTOR_ELT(Rprecip_names_dy, 1, Rprecip_names_y_dy); //17
-			setAttrib(Rprecip_dy, R_DimNamesSymbol, Rprecip_names_dy);
-			SET_SLOT(swOutput_KEY_PRECIP, install("Day"), Rprecip_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[2][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rprecip_wk = allocMatrix(REALSXP, wk_nrow, Rprecip_columns+2));
-			PROTECT(Rprecip_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rprecip_names_y_wk = allocVector(STRSXP, Rprecip_columns + 2));
-			SET_STRING_ELT(Rprecip_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rprecip_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Rprecip_columns; i++)
-				SET_STRING_ELT(Rprecip_names_y_wk, i + 2, mkChar(Cprecip_names[i]));
-			SET_VECTOR_ELT(Rprecip_names_wk, 1, Rprecip_names_y_wk); //17
-			setAttrib(Rprecip_wk, R_DimNamesSymbol, Rprecip_names_wk);
-			SET_SLOT(swOutput_KEY_PRECIP, install("Week"), Rprecip_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[2][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rprecip_mo = allocMatrix(REALSXP, mo_nrow, Rprecip_columns+2));
-			PROTECT(Rprecip_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rprecip_names_y_mo = allocVector(STRSXP, Rprecip_columns + 2));
-			SET_STRING_ELT(Rprecip_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rprecip_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Rprecip_columns; i++)
-				SET_STRING_ELT(Rprecip_names_y_mo, i + 2, mkChar(Cprecip_names[i]));
-			SET_VECTOR_ELT(Rprecip_names_mo, 1, Rprecip_names_y_mo); //17
-			setAttrib(Rprecip_mo, R_DimNamesSymbol, Rprecip_names_mo);
-			SET_SLOT(swOutput_KEY_PRECIP, install("Month"), Rprecip_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[2][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rprecip_yr = allocMatrix(REALSXP, yr_nrow, Rprecip_columns+1));
-			PROTECT(Rprecip_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rprecip_names_y_yr = allocVector(STRSXP, Rprecip_columns + 1));
-			SET_STRING_ELT(Rprecip_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Rprecip_columns; i++)
-				SET_STRING_ELT(Rprecip_names_y_yr, i + 1, mkChar(Cprecip_names[i]));
-			SET_VECTOR_ELT(Rprecip_names_yr, 1, Rprecip_names_y_yr); //17
-			setAttrib(Rprecip_yr, R_DimNamesSymbol, Rprecip_names_yr);
-			SET_SLOT(swOutput_KEY_PRECIP, install("Year"), Rprecip_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_PRECIP_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_PRECIP_COLUMNS)[0]=Rprecip_columns;
-		SET_SLOT(swOutput_KEY_PRECIP, install("Columns"), r_PRECIP_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[6]), swOutput_KEY_PRECIP);
-		UNPROTECT(3);
-	}
-	//SoilInf
-	if(use[3]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[3]);
-		PROTECT(swOutput_KEY_SOILINFILT = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SOILINFILT_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SOILINFILT_NAME, 0, mkChar(cSWoutput_KEY_Titles[3]));
-		SET_SLOT(swOutput_KEY_SOILINFILT, install("Title"), r_SOILINFILT_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SOILINFILT_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SOILINFILT_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SOILINFILT, install("TimeStep"), r_SOILINFILT_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SOILINFILT_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SOILINFILT_PERIOD)[0]=INTEGER(Periods)[3];
-			SET_SLOT(swOutput_KEY_SOILINFILT, install("TimeStep"), r_SOILINFILT_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[3][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rinfiltration_dy = allocMatrix(REALSXP, dy_nrow, Rinfiltration_columns+2));
-			PROTECT(Rinfiltration_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rinfiltration_names_y_dy = allocVector(STRSXP, Rinfiltration_columns + 2));
-			SET_STRING_ELT(Rinfiltration_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinfiltration_names_y_dy, 1, mkChar("DOY"));
-			SET_STRING_ELT(Rinfiltration_names_y_dy, 2, mkChar("soil_inf"));
-			SET_VECTOR_ELT(Rinfiltration_names_dy, 1, Rinfiltration_names_y_dy);
-			setAttrib(Rinfiltration_dy, R_DimNamesSymbol, Rinfiltration_names_dy);
-			SET_SLOT(swOutput_KEY_SOILINFILT, install("Day"), Rinfiltration_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[3][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rinfiltration_wk = allocMatrix(REALSXP, wk_nrow, Rinfiltration_columns+2));
-			PROTECT(Rinfiltration_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rinfiltration_names_y_wk = allocVector(STRSXP, Rinfiltration_columns + 2));
-			SET_STRING_ELT(Rinfiltration_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinfiltration_names_y_wk, 1, mkChar("Week"));
-			SET_STRING_ELT(Rinfiltration_names_y_wk, 2, mkChar("soil_inf"));
-			SET_VECTOR_ELT(Rinfiltration_names_wk, 1, Rinfiltration_names_y_wk);
-			setAttrib(Rinfiltration_wk, R_DimNamesSymbol, Rinfiltration_names_wk);
-			SET_SLOT(swOutput_KEY_SOILINFILT, install("Week"), Rinfiltration_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[3][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rinfiltration_mo = allocMatrix(REALSXP, mo_nrow, Rinfiltration_columns+2));
-			PROTECT(Rinfiltration_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rinfiltration_names_y_mo = allocVector(STRSXP, Rinfiltration_columns + 2));
-			SET_STRING_ELT(Rinfiltration_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinfiltration_names_y_mo, 1, mkChar("Month"));
-			SET_STRING_ELT(Rinfiltration_names_y_mo, 2, mkChar("soil_inf"));
-			SET_VECTOR_ELT(Rinfiltration_names_mo, 1, Rinfiltration_names_y_mo);
-			setAttrib(Rinfiltration_mo, R_DimNamesSymbol, Rinfiltration_names_mo);
-			SET_SLOT(swOutput_KEY_SOILINFILT, install("Month"), Rinfiltration_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[3][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rinfiltration_yr = allocMatrix(REALSXP, yr_nrow, Rinfiltration_columns+1));
-			PROTECT(Rinfiltration_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rinfiltration_names_y_yr = allocVector(STRSXP, Rinfiltration_columns + 1));
-			SET_STRING_ELT(Rinfiltration_names_y_yr, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinfiltration_names_y_yr, 1, mkChar("soil_inf"));
-			SET_VECTOR_ELT(Rinfiltration_names_yr, 1, Rinfiltration_names_y_yr);
-			setAttrib(Rinfiltration_yr, R_DimNamesSymbol, Rinfiltration_names_yr);
-			SET_SLOT(swOutput_KEY_SOILINFILT, install("Year"), Rinfiltration_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SOILINFILT_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SOILINFILT_COLUMNS)[0]=Rinfiltration_columns;
-		SET_SLOT(swOutput_KEY_SOILINFILT, install("Columns"), r_SOILINFILT_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[7]), swOutput_KEY_SOILINFILT);
-		UNPROTECT(3);
-	}
-	//Runoff
-	if(use[4]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[4]);
-		PROTECT(swOutput_KEY_RUNOFF = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_RUNOFF_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_RUNOFF_NAME, 0, mkChar(cSWoutput_KEY_Titles[4]));
-		SET_SLOT(swOutput_KEY_RUNOFF, install("Title"), r_RUNOFF_NAME);
-		if (useTimeStep) {
-			PROTECT(r_RUNOFF_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_RUNOFF_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_RUNOFF, install("TimeStep"), r_RUNOFF_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_RUNOFF_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_RUNOFF_PERIOD)[0]=INTEGER(Periods)[4];
-			SET_SLOT(swOutput_KEY_RUNOFF, install("TimeStep"), r_RUNOFF_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[4][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rrunoff_dy = allocMatrix(REALSXP, dy_nrow, Rrunoff_columns+2));
-			PROTECT(Rrunoff_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rrunoff_names_y_dy = allocVector(STRSXP, Rrunoff_columns + 2));
-			SET_STRING_ELT(Rrunoff_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rrunoff_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Rrunoff_columns; i++)
-				SET_STRING_ELT(Rrunoff_names_y_dy, i + 2, mkChar(Crunoff_names[i]));
-			SET_VECTOR_ELT(Rrunoff_names_dy, 1, Rrunoff_names_y_dy);
-			setAttrib(Rrunoff_dy, R_DimNamesSymbol, Rrunoff_names_dy);
-			SET_SLOT(swOutput_KEY_RUNOFF, install("Day"), Rrunoff_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[4][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rrunoff_wk = allocMatrix(REALSXP, wk_nrow, Rrunoff_columns+2));
-			PROTECT(Rrunoff_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rrunoff_names_y_wk = allocVector(STRSXP, Rrunoff_columns + 2));
-			SET_STRING_ELT(Rrunoff_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rrunoff_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Rrunoff_columns; i++)
-				SET_STRING_ELT(Rrunoff_names_y_wk, i + 2, mkChar(Crunoff_names[i]));
-			SET_VECTOR_ELT(Rrunoff_names_wk, 1, Rrunoff_names_y_wk);
-			setAttrib(Rrunoff_wk, R_DimNamesSymbol, Rrunoff_names_wk);
-			SET_SLOT(swOutput_KEY_RUNOFF, install("Week"), Rrunoff_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[4][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rrunoff_mo = allocMatrix(REALSXP, mo_nrow, Rrunoff_columns+2));
-			PROTECT(Rrunoff_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rrunoff_names_y_mo = allocVector(STRSXP, Rrunoff_columns + 2));
-			SET_STRING_ELT(Rrunoff_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rrunoff_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Rrunoff_columns; i++)
-				SET_STRING_ELT(Rrunoff_names_y_mo, i + 2, mkChar(Crunoff_names[i]));
-			SET_VECTOR_ELT(Rrunoff_names_mo, 1, Rrunoff_names_y_mo);
-			setAttrib(Rrunoff_mo, R_DimNamesSymbol, Rrunoff_names_mo);
-			SET_SLOT(swOutput_KEY_RUNOFF, install("Month"), Rrunoff_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[4][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rrunoff_yr = allocMatrix(REALSXP, yr_nrow, Rrunoff_columns+1));
-			PROTECT(Rrunoff_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rrunoff_names_y_yr = allocVector(STRSXP, Rrunoff_columns + 1));
-			SET_STRING_ELT(Rrunoff_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Rrunoff_columns; i++)
-				SET_STRING_ELT(Rrunoff_names_y_yr, i + 1, mkChar(Crunoff_names[i]));
-			SET_VECTOR_ELT(Rrunoff_names_yr, 1, Rrunoff_names_y_yr);
-			setAttrib(Rrunoff_yr, R_DimNamesSymbol, Rrunoff_names_yr);
-			SET_SLOT(swOutput_KEY_RUNOFF, install("Year"), Rrunoff_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_RUNOFF_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_RUNOFF_COLUMNS)[0]=Rrunoff_columns;
-		SET_SLOT(swOutput_KEY_RUNOFF, install("Columns"), r_RUNOFF_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[8]), swOutput_KEY_RUNOFF);
-		UNPROTECT(3);
-	}
-	//AllH2O - NOT USED
-	if(use[5]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[5]);
-		PROTECT(swOutput_KEY_ALLH2O = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_ALLH2O_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_ALLH2O_NAME, 0, mkChar(cSWoutput_KEY_Titles[5]));
-		SET_SLOT(swOutput_KEY_ALLH2O, install("Title"), r_ALLH2O_NAME);
-		if (useTimeStep) {
-			PROTECT(r_ALLH2O_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_ALLH2O_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_ALLH2O, install("TimeStep"), r_ALLH2O_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_ALLH2O_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_ALLH2O_PERIOD)[0]=INTEGER(Periods)[5];
-			SET_SLOT(swOutput_KEY_ALLH2O, install("TimeStep"), r_ALLH2O_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[5][0]) {
-			PROTECT(RallH2O_dy = allocMatrix(REALSXP, dy_nrow, RallH2O_columns+2));
-			SET_SLOT(swOutput_KEY_ALLH2O, install("Day"), RallH2O_dy);
-			UNPROTECT(1);
-		}
-		if(periodUse[5][1]) {
-			PROTECT(RallH2O_wk = allocMatrix(REALSXP, wk_nrow, RallH2O_columns+2));
-			SET_SLOT(swOutput_KEY_ALLH2O, install("Week"), RallH2O_wk);
-			UNPROTECT(1);
-		}
-		if(periodUse[5][2]) {
-			PROTECT(RallH2O_mo = allocMatrix(REALSXP, mo_nrow, RallH2O_columns+2));
-			SET_SLOT(swOutput_KEY_ALLH2O, install("Month"), RallH2O_mo);
-			UNPROTECT(1);
-		}
-		if(periodUse[5][3]) {
-			PROTECT(RallH2O_yr = allocMatrix(REALSXP, yr_nrow, RallH2O_columns+1));
-			SET_SLOT(swOutput_KEY_ALLH2O, install("Year"), RallH2O_yr);
-			UNPROTECT(1);
-		}
-		PROTECT(r_ALLH2O_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_ALLH2O_COLUMNS)[0]=RallH2O_columns;
-		SET_SLOT(swOutput_KEY_ALLH2O, install("Columns"), r_ALLH2O_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[9]), swOutput_KEY_ALLH2O);
-		UNPROTECT(3);
-	}
-	//VWCBulk
-	if(use[6]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[6]);
-		PROTECT(swOutput_KEY_VWCBULK = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_VWCBULK_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_VWCBULK_NAME, 0, mkChar(cSWoutput_KEY_Titles[6]));
-		SET_SLOT(swOutput_KEY_VWCBULK, install("Title"), r_VWCBULK_NAME);
-		if (useTimeStep) {
-			PROTECT(r_VWCBULK_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_VWCBULK_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_VWCBULK, install("TimeStep"), r_VWCBULK_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_VWCBULK_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_VWCBULK_PERIOD)[0]=INTEGER(Periods)[6];
-			SET_SLOT(swOutput_KEY_VWCBULK, install("TimeStep"), r_VWCBULK_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[6][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(RvwcBulk_dy = allocMatrix(REALSXP, dy_nrow, RvwcBulk_columns+2));
-			PROTECT(RvwcBulk_names_dy = allocVector(VECSXP, 2));
-			PROTECT(RvwcBulk_names_y_dy = allocVector(STRSXP, RvwcBulk_columns + 2));
-			SET_STRING_ELT(RvwcBulk_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(RvwcBulk_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcBulk_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcBulk_names_dy, 1, RvwcBulk_names_y_dy);
-			setAttrib(RvwcBulk_dy, R_DimNamesSymbol, RvwcBulk_names_dy);
-			SET_SLOT(swOutput_KEY_VWCBULK, install("Day"), RvwcBulk_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[6][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RvwcBulk_wk = allocMatrix(REALSXP, wk_nrow, RvwcBulk_columns+2));
-			PROTECT(RvwcBulk_names_wk = allocVector(VECSXP, 2));
-			PROTECT(RvwcBulk_names_y_wk = allocVector(STRSXP, RvwcBulk_columns + 2));
-			SET_STRING_ELT(RvwcBulk_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(RvwcBulk_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcBulk_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcBulk_names_wk, 1, RvwcBulk_names_y_wk);
-			setAttrib(RvwcBulk_wk, R_DimNamesSymbol, RvwcBulk_names_wk);
-			SET_SLOT(swOutput_KEY_VWCBULK, install("Week"), RvwcBulk_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[6][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(RvwcBulk_mo = allocMatrix(REALSXP, mo_nrow, RvwcBulk_columns+2));
-			PROTECT(RvwcBulk_names_mo = allocVector(VECSXP, 2));
-			PROTECT(RvwcBulk_names_y_mo = allocVector(STRSXP, RvwcBulk_columns + 2));
-			SET_STRING_ELT(RvwcBulk_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(RvwcBulk_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcBulk_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcBulk_names_mo, 1, RvwcBulk_names_y_mo);
-			setAttrib(RvwcBulk_mo, R_DimNamesSymbol, RvwcBulk_names_mo);
-			SET_SLOT(swOutput_KEY_VWCBULK, install("Month"), RvwcBulk_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[6][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(RvwcBulk_yr = allocMatrix(REALSXP, yr_nrow, RvwcBulk_columns+1));
-			PROTECT(RvwcBulk_names_yr = allocVector(VECSXP, 2));
-			PROTECT(RvwcBulk_names_y_yr = allocVector(STRSXP, RvwcBulk_columns + 1));
-			SET_STRING_ELT(RvwcBulk_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcBulk_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcBulk_names_yr, 1, RvwcBulk_names_y_yr);
-			setAttrib(RvwcBulk_yr, R_DimNamesSymbol, RvwcBulk_names_yr);
-			SET_SLOT(swOutput_KEY_VWCBULK, install("Year"), RvwcBulk_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_VWCBULK_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_VWCBULK_COLUMNS)[0]=RvwcBulk_columns;
-		SET_SLOT(swOutput_KEY_VWCBULK, install("Columns"), r_VWCBULK_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[10]), swOutput_KEY_VWCBULK);
-		UNPROTECT(3);
-	}
-	//VWCMatrix
-	if(use[7]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[7]);
-		PROTECT(swOutput_KEY_VWCMATRIC = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_VWCMATRIC_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_VWCMATRIC_NAME, 0, mkChar(cSWoutput_KEY_Titles[7]));
-		SET_SLOT(swOutput_KEY_VWCMATRIC, install("Title"), r_VWCMATRIC_NAME);
-		if (useTimeStep) {
-			PROTECT(r_VWCMATRIC_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_VWCMATRIC_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_VWCMATRIC, install("TimeStep"), r_VWCMATRIC_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_VWCMATRIC_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_VWCMATRIC_PERIOD)[0]=INTEGER(Periods)[7];
-			SET_SLOT(swOutput_KEY_VWCMATRIC, install("TimeStep"), r_VWCMATRIC_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[7][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(RvwcMatric_dy = allocMatrix(REALSXP, dy_nrow, RvwcMatric_columns+2));
-			PROTECT(RvwcMatric_names_dy = allocVector(VECSXP, 2));
-			PROTECT(RvwcMatric_names_y_dy = allocVector(STRSXP, RvwcMatric_columns + 2));
-			SET_STRING_ELT(RvwcMatric_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(RvwcMatric_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcMatric_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcMatric_names_dy, 1, RvwcMatric_names_y_dy);
-			setAttrib(RvwcMatric_dy, R_DimNamesSymbol, RvwcMatric_names_dy);
-			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Day"), RvwcMatric_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[7][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RvwcMatric_wk = allocMatrix(REALSXP, wk_nrow, RvwcMatric_columns+2));
-			PROTECT(RvwcMatric_names_wk = allocVector(VECSXP, 2));
-			PROTECT(RvwcMatric_names_y_wk = allocVector(STRSXP, RvwcMatric_columns + 2));
-			SET_STRING_ELT(RvwcMatric_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(RvwcMatric_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcMatric_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcMatric_names_wk, 1, RvwcMatric_names_y_wk);
-			setAttrib(RvwcMatric_wk, R_DimNamesSymbol, RvwcMatric_names_wk);
-			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Week"), RvwcMatric_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[7][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(RvwcMatric_mo = allocMatrix(REALSXP, mo_nrow, RvwcMatric_columns+2));
-			PROTECT(RvwcMatric_names_mo = allocVector(VECSXP, 2));
-			PROTECT(RvwcMatric_names_y_mo = allocVector(STRSXP, RvwcMatric_columns + 2));
-			SET_STRING_ELT(RvwcMatric_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(RvwcMatric_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcMatric_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcMatric_names_mo, 1, RvwcMatric_names_y_mo);
-			setAttrib(RvwcMatric_mo, R_DimNamesSymbol, RvwcMatric_names_mo);
-			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Month"), RvwcMatric_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[7][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(RvwcMatric_yr = allocMatrix(REALSXP, yr_nrow, RvwcMatric_columns+1));
-			PROTECT(RvwcMatric_names_yr = allocVector(VECSXP, 2));
-			PROTECT(RvwcMatric_names_y_yr = allocVector(STRSXP, RvwcMatric_columns + 1));
-			SET_STRING_ELT(RvwcMatric_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RvwcMatric_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RvwcMatric_names_yr, 1, RvwcMatric_names_y_yr);
-			setAttrib(RvwcMatric_yr, R_DimNamesSymbol, RvwcMatric_names_yr);
-			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Year"), RvwcMatric_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_VWCMATRIC_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_VWCMATRIC_COLUMNS)[0]=RvwcMatric_columns;
-		SET_SLOT(swOutput_KEY_VWCMATRIC, install("Columns"), r_VWCMATRIC_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[11]), swOutput_KEY_VWCMATRIC);
-		UNPROTECT(3);
-	}
-	//SWCBulk
-	if(use[8]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[8]);
-		PROTECT(swOutput_KEY_SWCBULK = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SWCBULK_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SWCBULK_NAME, 0, mkChar(cSWoutput_KEY_Titles[8]));
-		SET_SLOT(swOutput_KEY_SWCBULK, install("Title"), r_SWCBULK_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SWCBULK_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SWCBULK_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SWCBULK, install("TimeStep"), r_SWCBULK_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SWCBULK_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SWCBULK_PERIOD)[0]=INTEGER(Periods)[8];
-			SET_SLOT(swOutput_KEY_SWCBULK, install("TimeStep"), r_SWCBULK_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[8][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(RswcBulk_dy = allocMatrix(REALSXP, dy_nrow, RswcBulk_columns+2));
-			PROTECT(RswcBulk_names_dy = allocVector(VECSXP, 2));
-			PROTECT(RswcBulk_names_y_dy = allocVector(STRSXP, RswcBulk_columns + 2));
-			SET_STRING_ELT(RswcBulk_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(RswcBulk_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswcBulk_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswcBulk_names_dy, 1, RswcBulk_names_y_dy);
-			setAttrib(RswcBulk_dy, R_DimNamesSymbol, RswcBulk_names_dy);
-			SET_SLOT(swOutput_KEY_SWCBULK, install("Day"), RswcBulk_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[8][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RswcBulk_wk = allocMatrix(REALSXP, wk_nrow, RswcBulk_columns+2));
-			PROTECT(RswcBulk_names_wk = allocVector(VECSXP, 2));
-			PROTECT(RswcBulk_names_y_wk = allocVector(STRSXP, RswcBulk_columns + 2));
-			SET_STRING_ELT(RswcBulk_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(RswcBulk_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswcBulk_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswcBulk_names_wk, 1, RswcBulk_names_y_wk);
-			setAttrib(RswcBulk_wk, R_DimNamesSymbol, RswcBulk_names_wk);
-			SET_SLOT(swOutput_KEY_SWCBULK, install("Week"), RswcBulk_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[8][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(RswcBulk_mo = allocMatrix(REALSXP, mo_nrow, RswcBulk_columns+2));
-			PROTECT(RswcBulk_names_mo = allocVector(VECSXP, 2));
-			PROTECT(RswcBulk_names_y_mo = allocVector(STRSXP, RswcBulk_columns + 2));
-			SET_STRING_ELT(RswcBulk_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(RswcBulk_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswcBulk_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswcBulk_names_mo, 1, RswcBulk_names_y_mo);
-			setAttrib(RswcBulk_mo, R_DimNamesSymbol, RswcBulk_names_mo);
-			SET_SLOT(swOutput_KEY_SWCBULK, install("Month"), RswcBulk_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[8][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(RswcBulk_yr = allocMatrix(REALSXP, yr_nrow, RswcBulk_columns+1));
-			PROTECT(RswcBulk_names_yr = allocVector(VECSXP, 2));
-			PROTECT(RswcBulk_names_y_yr = allocVector(STRSXP, RswcBulk_columns + 1));
-			SET_STRING_ELT(RswcBulk_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswcBulk_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswcBulk_names_yr, 1, RswcBulk_names_y_yr);
-			setAttrib(RswcBulk_yr, R_DimNamesSymbol, RswcBulk_names_yr);
-			SET_SLOT(swOutput_KEY_SWCBULK, install("Year"), RswcBulk_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SWCBULK_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SWCBULK_COLUMNS)[0]=RswcBulk_columns;
-		SET_SLOT(swOutput_KEY_SWCBULK, install("Columns"), r_SWCBULK_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[12]), swOutput_KEY_SWCBULK);
-		UNPROTECT(3);
-	}
-	//SWABULK
-	if(use[9]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[9]);
-		PROTECT(swOutput_KEY_SWABULK = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SWABULK_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SWABULK_NAME, 0, mkChar(cSWoutput_KEY_Titles[9]));
-		SET_SLOT(swOutput_KEY_SWABULK, install("Title"), r_SWABULK_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SWABULK_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SWABULK_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SWABULK, install("TimeStep"), r_SWABULK_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SWABULK_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SWABULK_PERIOD)[0]=INTEGER(Periods)[10];
-			SET_SLOT(swOutput_KEY_SWABULK, install("TimeStep"), r_SWABULK_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[9][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(RswaBulk_dy = allocMatrix(REALSXP, dy_nrow, RswaBulk_columns+2));
-			PROTECT(RswaBulk_names_dy = allocVector(VECSXP, 2));
-			PROTECT(RswaBulk_names_y_dy = allocVector(STRSXP, RswaBulk_columns + 2));
-			SET_STRING_ELT(RswaBulk_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(RswaBulk_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaBulk_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaBulk_names_dy, 1, RswaBulk_names_y_dy);
-			setAttrib(RswaBulk_dy, R_DimNamesSymbol, RswaBulk_names_dy);
-			SET_SLOT(swOutput_KEY_SWABULK, install("Day"), RswaBulk_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[9][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RswaBulk_wk = allocMatrix(REALSXP, wk_nrow, RswaBulk_columns+2));
-			PROTECT(RswaBulk_names_wk = allocVector(VECSXP, 2));
-			PROTECT(RswaBulk_names_y_wk = allocVector(STRSXP, RswaBulk_columns + 2));
-			SET_STRING_ELT(RswaBulk_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(RswaBulk_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaBulk_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaBulk_names_wk, 1, RswaBulk_names_y_wk);
-			setAttrib(RswaBulk_wk, R_DimNamesSymbol, RswaBulk_names_wk);
-			SET_SLOT(swOutput_KEY_SWABULK, install("Week"), RswaBulk_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[9][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(RswaBulk_mo = allocMatrix(REALSXP, mo_nrow, RswaBulk_columns+2));
-			PROTECT(RswaBulk_names_mo = allocVector(VECSXP, 2));
-			PROTECT(RswaBulk_names_y_mo = allocVector(STRSXP, RswaBulk_columns + 2));
-			SET_STRING_ELT(RswaBulk_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(RswaBulk_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaBulk_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaBulk_names_mo, 1, RswaBulk_names_y_mo);
-			setAttrib(RswaBulk_mo, R_DimNamesSymbol, RswaBulk_names_mo);
-			SET_SLOT(swOutput_KEY_SWABULK, install("Month"), RswaBulk_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[9][3]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RswaBulk_yr = allocMatrix(REALSXP, yr_nrow, RswaBulk_columns+1));
-			PROTECT(RswaBulk_names_yr = allocVector(VECSXP, 2));
-			PROTECT(RswaBulk_names_y_yr = allocVector(STRSXP, RswaBulk_columns + 1));
-			SET_STRING_ELT(RswaBulk_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaBulk_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaBulk_names_yr, 1, RswaBulk_names_y_yr);
-			setAttrib(RswaBulk_yr, R_DimNamesSymbol, RswaBulk_names_yr);
-			SET_SLOT(swOutput_KEY_SWABULK, install("Year"), RswaBulk_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SWABULK_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SWABULK_COLUMNS)[0]=RswaBulk_columns;
-		SET_SLOT(swOutput_KEY_SWABULK, install("Columns"), r_SWABULK_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[13]), swOutput_KEY_SWABULK);
-		UNPROTECT(3);
-	}
-	//SWAMATRIC
-	if(use[10]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[10]);
-		PROTECT(swOutput_KEY_SWAMATRIC = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SWAMATRIC_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SWAMATRIC_NAME, 0, mkChar(cSWoutput_KEY_Titles[10]));
-		SET_SLOT(swOutput_KEY_SWAMATRIC, install("Title"), r_SWAMATRIC_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SWAMATRIC_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SWAMATRIC_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SWAMATRIC, install("TimeStep"), r_SWAMATRIC_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SWAMATRIC_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SWAMATRIC_PERIOD)[0]=INTEGER(Periods)[11];
-			SET_SLOT(swOutput_KEY_SWAMATRIC, install("TimeStep"), r_SWAMATRIC_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[10][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(RswaMatric_dy = allocMatrix(REALSXP, dy_nrow, RswaMatric_columns+2));
-			PROTECT(RswaMatric_names_dy = allocVector(VECSXP, 2));
-			PROTECT(RswaMatric_names_y_dy = allocVector(STRSXP, RswaMatric_columns + 2));
-			SET_STRING_ELT(RswaMatric_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(RswaMatric_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaMatric_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaMatric_names_dy, 1, RswaMatric_names_y_dy);
-			setAttrib(RswaMatric_dy, R_DimNamesSymbol, RswaMatric_names_dy);
-			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Day"), RswaMatric_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[10][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RswaMatric_wk = allocMatrix(REALSXP, wk_nrow, RswaMatric_columns+2));
-			PROTECT(RswaMatric_names_wk = allocVector(VECSXP, 2));
-			PROTECT(RswaMatric_names_y_wk = allocVector(STRSXP, RswaMatric_columns + 2));
-			SET_STRING_ELT(RswaMatric_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(RswaMatric_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaMatric_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaMatric_names_wk, 1, RswaMatric_names_y_wk);
-			setAttrib(RswaMatric_wk, R_DimNamesSymbol, RswaMatric_names_wk);
-			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Week"), RswaMatric_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[10][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(RswaMatric_mo = allocMatrix(REALSXP, mo_nrow, RswaMatric_columns+2));
-			PROTECT(RswaMatric_names_mo = allocVector(VECSXP, 2));
-			PROTECT(RswaMatric_names_y_mo = allocVector(STRSXP, RswaMatric_columns + 2));
-			SET_STRING_ELT(RswaMatric_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(RswaMatric_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaMatric_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaMatric_names_mo, 1, RswaMatric_names_y_mo);
-			setAttrib(RswaMatric_mo, R_DimNamesSymbol, RswaMatric_names_mo);
-			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Month"), RswaMatric_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[10][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(RswaMatric_yr = allocMatrix(REALSXP, yr_nrow, RswaMatric_columns+1));
-			PROTECT(RswaMatric_names_yr = allocVector(VECSXP, 2));
-			PROTECT(RswaMatric_names_y_yr = allocVector(STRSXP, RswaMatric_columns + 1));
-			SET_STRING_ELT(RswaMatric_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswaMatric_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswaMatric_names_yr, 1, RswaMatric_names_y_yr);
-			setAttrib(RswaMatric_yr, R_DimNamesSymbol, RswaMatric_names_yr);
-			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Year"), RswaMatric_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SWAMATRIC_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SWAMATRIC_COLUMNS)[0]=RswaMatric_columns;
-		SET_SLOT(swOutput_KEY_SWAMATRIC, install("Columns"), r_SWAMATRIC_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[14]), swOutput_KEY_SWAMATRIC);
-		UNPROTECT(3);
-	}
-	//SWP Matric
-	if(use[11]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[11]);
-		PROTECT(swOutput_KEY_SWPMATRIC = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SWPMATRIC_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SWPMATRIC_NAME, 0, mkChar(cSWoutput_KEY_Titles[11]));
-		SET_SLOT(swOutput_KEY_SWPMATRIC, install("Title"), r_SWPMATRIC_NAME);
-		if (useTimeStep) {
-			if(debug) Rprintf("\tUseTimeStep - %d\n", length(Periods));
-			PROTECT(r_SWPMATRIC_PERIOD = NEW_INTEGER(length(Periods)));
-			if(debug) Rprintf("\tr_SWPMATRIC_PERIOD - %d\n", length(r_SWPMATRIC_PERIOD));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SWPMATRIC_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SWPMATRIC, install("TimeStep"), r_SWPMATRIC_PERIOD);
-			UNPROTECT(1);
-		} else {
-			if(debug) Rprintf("\t ! UseTimeStep\n");
-			PROTECT(r_SWPMATRIC_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SWPMATRIC_PERIOD)[0]=INTEGER(Periods)[9];
-			SET_SLOT(swOutput_KEY_SWPMATRIC, install("TimeStep"), r_SWPMATRIC_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[11][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(RswpMatric_dy = allocMatrix(REALSXP, dy_nrow, RswpMatric_columns+2));
-			PROTECT(RswpMatric_names_dy = allocVector(VECSXP, 2));
-			PROTECT(RswpMatric_names_y_dy = allocVector(STRSXP, RswpMatric_columns + 2));
-			SET_STRING_ELT(RswpMatric_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(RswpMatric_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswpMatric_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswpMatric_names_dy, 1, RswpMatric_names_y_dy);
-			setAttrib(RswpMatric_dy, R_DimNamesSymbol, RswpMatric_names_dy);
-			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Day"), RswpMatric_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[11][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(RswpMatric_wk = allocMatrix(REALSXP, wk_nrow, RswpMatric_columns+2));
-			PROTECT(RswpMatric_names_wk = allocVector(VECSXP, 2));
-			PROTECT(RswpMatric_names_y_wk = allocVector(STRSXP, RswpMatric_columns + 2));
-			SET_STRING_ELT(RswpMatric_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(RswpMatric_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswpMatric_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswpMatric_names_wk, 1, RswpMatric_names_y_wk);
-			setAttrib(RswpMatric_wk, R_DimNamesSymbol, RswpMatric_names_wk);
-			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Week"), RswpMatric_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[11][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(RswpMatric_mo = allocMatrix(REALSXP, mo_nrow, RswpMatric_columns+2));
-			PROTECT(RswpMatric_names_mo = allocVector(VECSXP, 2));
-			PROTECT(RswpMatric_names_y_mo = allocVector(STRSXP, RswpMatric_columns + 2));
-			SET_STRING_ELT(RswpMatric_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(RswpMatric_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswpMatric_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswpMatric_names_mo, 1, RswpMatric_names_y_mo);
-			setAttrib(RswpMatric_mo, R_DimNamesSymbol, RswpMatric_names_mo);
-			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Month"), RswpMatric_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[11][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(RswpMatric_yr = allocMatrix(REALSXP, yr_nrow, RswpMatric_columns+1));
-			PROTECT(RswpMatric_names_yr = allocVector(VECSXP, 2));
-			PROTECT(RswpMatric_names_y_yr = allocVector(STRSXP, RswpMatric_columns + 1));
-			SET_STRING_ELT(RswpMatric_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(RswpMatric_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(RswpMatric_names_yr, 1, RswpMatric_names_y_yr);
-			setAttrib(RswpMatric_yr, R_DimNamesSymbol, RswpMatric_names_yr);
-			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Year"), RswpMatric_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SWPMATRIC_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SWPMATRIC_COLUMNS)[0]=RswpMatric_columns;
-		SET_SLOT(swOutput_KEY_SWPMATRIC, install("Columns"), r_SWPMATRIC_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[15]), swOutput_KEY_SWPMATRIC);
-		UNPROTECT(3);
-	}
-	//SURFACE WATER
-	if(use[12]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[12]);
-		PROTECT(swOutput_KEY_SURFACEWATER = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SURFACEWATER_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SURFACEWATER_NAME, 0, mkChar(cSWoutput_KEY_Titles[12]));
-		SET_SLOT(swOutput_KEY_SURFACEWATER, install("Title"), r_SURFACEWATER_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SURFACEWATER_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SURFACEWATER_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SURFACEWATER, install("TimeStep"), r_SURFACEWATER_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SURFACEWATER_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SURFACEWATER_PERIOD)[0]=INTEGER(Periods)[12];
-			SET_SLOT(swOutput_KEY_SURFACEWATER, install("TimeStep"), r_SURFACEWATER_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[12][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rsurface_water_dy = allocMatrix(REALSXP, dy_nrow, Rsurface_water_columns+2));
-			PROTECT(Rsurface_water_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rsurface_water_names_y_dy = allocVector(STRSXP, Rsurface_water_columns + 2));
-			SET_STRING_ELT(Rsurface_water_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsurface_water_names_y_dy, 1, mkChar("DOY"));
-			SET_STRING_ELT(Rsurface_water_names_y_dy, 2, mkChar("surfaceWater_cm"));
-			SET_VECTOR_ELT(Rsurface_water_names_dy, 1, Rsurface_water_names_y_dy);
-			setAttrib(Rsurface_water_dy, R_DimNamesSymbol, Rsurface_water_names_dy);
-			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Day"), Rsurface_water_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[12][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rsurface_water_wk = allocMatrix(REALSXP, wk_nrow, Rsurface_water_columns+2));
-			PROTECT(Rsurface_water_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rsurface_water_names_y_wk = allocVector(STRSXP, Rsurface_water_columns + 2));
-			SET_STRING_ELT(Rsurface_water_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsurface_water_names_y_wk, 1, mkChar("Week"));
-			SET_STRING_ELT(Rsurface_water_names_y_wk, 2, mkChar("surfaceWater_cm"));
-			SET_VECTOR_ELT(Rsurface_water_names_wk, 1, Rsurface_water_names_y_wk);
-			setAttrib(Rsurface_water_wk, R_DimNamesSymbol, Rsurface_water_names_wk);
-			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Week"), Rsurface_water_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[12][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rsurface_water_mo = allocMatrix(REALSXP, mo_nrow, Rsurface_water_columns+2));
-			PROTECT(Rsurface_water_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rsurface_water_names_y_mo = allocVector(STRSXP, Rsurface_water_columns + 2));
-			SET_STRING_ELT(Rsurface_water_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsurface_water_names_y_mo, 1, mkChar("Month"));
-			SET_STRING_ELT(Rsurface_water_names_y_mo, 2, mkChar("surfaceWater_cm"));
-			SET_VECTOR_ELT(Rsurface_water_names_mo, 1, Rsurface_water_names_y_mo);
-			setAttrib(Rsurface_water_mo, R_DimNamesSymbol, Rsurface_water_names_mo);
-			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Month"), Rsurface_water_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[12][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rsurface_water_yr = allocMatrix(REALSXP, yr_nrow, Rsurface_water_columns+1));
-			PROTECT(Rsurface_water_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rsurface_water_names_y_yr = allocVector(STRSXP, Rsurface_water_columns + 1));
-			SET_STRING_ELT(Rsurface_water_names_y_yr, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsurface_water_names_y_yr, 1, mkChar("surfaceWater_cm"));
-			SET_VECTOR_ELT(Rsurface_water_names_yr, 1, Rsurface_water_names_y_yr);
-			setAttrib(Rsurface_water_yr, R_DimNamesSymbol, Rsurface_water_names_yr);
-			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Year"), Rsurface_water_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SURFACEWATER_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SURFACEWATER_COLUMNS)[0]=Rsurface_water_columns;
-		SET_SLOT(swOutput_KEY_SURFACEWATER, install("Columns"), r_SURFACEWATER_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[16]), swOutput_KEY_SURFACEWATER);
-		UNPROTECT(3);
-	}
-	//TRANSP
-	if(use[13]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[13]);
-		PROTECT(swOutput_KEY_TRANSP = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_TRANSP_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_TRANSP_NAME, 0, mkChar(cSWoutput_KEY_Titles[13]));
-		SET_SLOT(swOutput_KEY_TRANSP, install("Title"), r_TRANSP_NAME);
-		if (useTimeStep) {
-			PROTECT(r_TRANSP_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_TRANSP_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_TRANSP, install("TimeStep"), r_TRANSP_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_TRANSP_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_TRANSP_PERIOD)[0]=INTEGER(Periods)[13];
-			SET_SLOT(swOutput_KEY_TRANSP, install("TimeStep"), r_TRANSP_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[13][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rtransp_dy = allocMatrix(REALSXP, dy_nrow, Rtransp_columns+2));
-			PROTECT(Rtransp_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rtransp_names_y_dy = allocVector(STRSXP, Rtransp_columns + 2));
-			SET_STRING_ELT(Rtransp_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rtransp_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Ctransp_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rtransp_names_y_dy, (i * tLayers + j) + 2, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rtransp_names_dy, 1, Rtransp_names_y_dy);
-			setAttrib(Rtransp_dy, R_DimNamesSymbol, Rtransp_names_dy);
-			SET_SLOT(swOutput_KEY_TRANSP, install("Day"), Rtransp_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[13][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rtransp_wk = allocMatrix(REALSXP, wk_nrow, Rtransp_columns+2));
-			PROTECT(Rtransp_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rtransp_names_y_wk = allocVector(STRSXP, Rtransp_columns + 2));
-			SET_STRING_ELT(Rtransp_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rtransp_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Ctransp_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rtransp_names_y_wk, (i * tLayers + j) + 2, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rtransp_names_wk, 1, Rtransp_names_y_wk);
-			setAttrib(Rtransp_wk, R_DimNamesSymbol, Rtransp_names_wk);
-			SET_SLOT(swOutput_KEY_TRANSP, install("Week"), Rtransp_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[13][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rtransp_mo = allocMatrix(REALSXP, mo_nrow, Rtransp_columns+2));
-			PROTECT(Rtransp_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rtransp_names_y_mo = allocVector(STRSXP, Rtransp_columns + 2));
-			SET_STRING_ELT(Rtransp_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rtransp_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Ctransp_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rtransp_names_y_mo, (i * tLayers + j) + 2, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rtransp_names_mo, 1, Rtransp_names_y_mo);
-			setAttrib(Rtransp_mo, R_DimNamesSymbol, Rtransp_names_mo);
-			SET_SLOT(swOutput_KEY_TRANSP, install("Month"), Rtransp_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[13][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rtransp_yr = allocMatrix(REALSXP, yr_nrow, Rtransp_columns+1));
-			PROTECT(Rtransp_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rtransp_names_y_yr = allocVector(STRSXP, Rtransp_columns + 1));
-			SET_STRING_ELT(Rtransp_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Ctransp_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rtransp_names_y_yr, (i * tLayers + j) + 1, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rtransp_names_yr, 1, Rtransp_names_y_yr);
-			setAttrib(Rtransp_yr, R_DimNamesSymbol, Rtransp_names_yr);
-			SET_SLOT(swOutput_KEY_TRANSP, install("Year"), Rtransp_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_TRANSP_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_TRANSP_COLUMNS)[0]=Rtransp_columns;
-		SET_SLOT(swOutput_KEY_TRANSP, install("Columns"), r_TRANSP_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[17]), swOutput_KEY_TRANSP);
-		UNPROTECT(3);
-	}
-	//EVAP SOIL
-	if(use[14]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[14]);
-		PROTECT(swOutput_KEY_EVAPSOIL = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_EVAPSOIL_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_EVAPSOIL_NAME , 0, mkChar(cSWoutput_KEY_Titles[14]));
-		SET_SLOT(swOutput_KEY_EVAPSOIL, install("Title"), r_EVAPSOIL_NAME);
-		if (useTimeStep) {
-			PROTECT(r_EVAPSOIL_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_EVAPSOIL_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_EVAPSOIL, install("TimeStep"), r_EVAPSOIL_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_EVAPSOIL_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_EVAPSOIL_PERIOD)[0]=INTEGER(Periods)[14];
-			SET_SLOT(swOutput_KEY_EVAPSOIL, install("TimeStep"), r_EVAPSOIL_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[14][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Revasoil_dy = allocMatrix(REALSXP, dy_nrow, Revasoil_columns+2));
-			PROTECT(Revap_soil_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Revap_soil_names_y_dy = allocVector(STRSXP, Revasoil_columns + 2));
-			SET_STRING_ELT(Revap_soil_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Revap_soil_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Revasoil_columns; i++)
-				SET_STRING_ELT(Revap_soil_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Revap_soil_names_dy, 1, Revap_soil_names_y_dy);
-			setAttrib(Revasoil_dy, R_DimNamesSymbol, Revap_soil_names_dy);
-			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Day"), Revasoil_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[14][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Revasoil_wk = allocMatrix(REALSXP, wk_nrow, Revasoil_columns+2));
-			PROTECT(Revap_soil_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Revap_soil_names_y_wk = allocVector(STRSXP, Revasoil_columns + 2));
-			SET_STRING_ELT(Revap_soil_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Revap_soil_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Revasoil_columns; i++)
-				SET_STRING_ELT(Revap_soil_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Revap_soil_names_wk, 1, Revap_soil_names_y_wk);
-			setAttrib(Revasoil_wk, R_DimNamesSymbol, Revap_soil_names_wk);
-			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Week"), Revasoil_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[14][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Revasoil_mo = allocMatrix(REALSXP, mo_nrow, Revasoil_columns+2));
-			PROTECT(Revap_soil_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Revap_soil_names_y_mo = allocVector(STRSXP, Revasoil_columns + 2));
-			SET_STRING_ELT(Revap_soil_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Revap_soil_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Revasoil_columns; i++)
-				SET_STRING_ELT(Revap_soil_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Revap_soil_names_mo, 1, Revap_soil_names_y_mo);
-			setAttrib(Revasoil_mo, R_DimNamesSymbol, Revap_soil_names_mo);
-			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Month"), Revasoil_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[14][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Revasoil_yr = allocMatrix(REALSXP, yr_nrow, Revasoil_columns+1));
-			PROTECT(Revap_soil_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Revap_soil_names_y_yr = allocVector(STRSXP, Revasoil_columns + 1));
-			SET_STRING_ELT(Revap_soil_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Revasoil_columns; i++)
-				SET_STRING_ELT(Revap_soil_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Revap_soil_names_yr, 1, Revap_soil_names_y_yr);
-			setAttrib(Revasoil_yr, R_DimNamesSymbol, Revap_soil_names_yr);
-			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Year"), Revasoil_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_EVAPSOIL_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_EVAPSOIL_COLUMNS)[0]=Revasoil_columns;
-		SET_SLOT(swOutput_KEY_EVAPSOIL, install("Columns"), r_EVAPSOIL_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[18]), swOutput_KEY_EVAPSOIL);
-		UNPROTECT(3);
-	}
-	//EVAP SURFACE
-	if(use[15]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[15]);
-		PROTECT(swOutput_KEY_EVAPSURFACE = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_EVAPSURFACE_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_EVAPSURFACE_NAME, 0, mkChar(cSWoutput_KEY_Titles[15]));
-		SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Title"), r_EVAPSURFACE_NAME);
-		if (useTimeStep) {
-			PROTECT(r_EVAPSURFACE_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_EVAPSURFACE_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("TimeStep"), r_EVAPSURFACE_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_EVAPSURFACE_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_EVAPSURFACE_PERIOD)[0]=INTEGER(Periods)[15];
-			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("TimeStep"), r_EVAPSURFACE_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[15][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Revasurface_dy = allocMatrix(REALSXP, dy_nrow, Revasurface_columns+2));
-			PROTECT(Revap_surface_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Revap_surface_names_y_dy = allocVector(STRSXP, Revasurface_columns + 2));
-			SET_STRING_ELT(Revap_surface_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Revap_surface_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Revasurface_columns; i++)
-				SET_STRING_ELT(Revap_surface_names_y_dy, i + 2, mkChar(Cevap_surface_names[i]));
-			SET_VECTOR_ELT(Revap_surface_names_dy, 1, Revap_surface_names_y_dy);
-			setAttrib(Revasurface_dy, R_DimNamesSymbol, Revap_surface_names_dy);
-			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Day"), Revasurface_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[15][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Revasurface_wk = allocMatrix(REALSXP, wk_nrow, Revasurface_columns+2));
-			PROTECT(Revap_surface_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Revap_surface_names_y_wk = allocVector(STRSXP, Revasurface_columns + 2));
-			SET_STRING_ELT(Revap_surface_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Revap_surface_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Revasurface_columns; i++)
-				SET_STRING_ELT(Revap_surface_names_y_wk, i + 2, mkChar(Cevap_surface_names[i]));
-			SET_VECTOR_ELT(Revap_surface_names_wk, 1, Revap_surface_names_y_wk);
-			setAttrib(Revasurface_wk, R_DimNamesSymbol, Revap_surface_names_wk);
-			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Week"), Revasurface_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[15][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Revasurface_mo = allocMatrix(REALSXP, mo_nrow, Revasurface_columns+2));
-			PROTECT(Revap_surface_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Revap_surface_names_y_mo = allocVector(STRSXP, Revasurface_columns + 2));
-			SET_STRING_ELT(Revap_surface_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Revap_surface_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Revasurface_columns; i++)
-				SET_STRING_ELT(Revap_surface_names_y_mo, i + 2, mkChar(Cevap_surface_names[i]));
-			SET_VECTOR_ELT(Revap_surface_names_mo, 1, Revap_surface_names_y_mo);
-			setAttrib(Revasurface_mo, R_DimNamesSymbol, Revap_surface_names_mo);
-			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Month"), Revasurface_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[15][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Revasurface_yr = allocMatrix(REALSXP, yr_nrow, Revasurface_columns+1));
-			PROTECT(Revap_surface_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Revap_surface_names_y_yr = allocVector(STRSXP, Revasurface_columns + 1));
-			SET_STRING_ELT(Revap_surface_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Revasurface_columns; i++)
-				SET_STRING_ELT(Revap_surface_names_y_yr, i + 1, mkChar(Cevap_surface_names[i]));
-			SET_VECTOR_ELT(Revap_surface_names_yr, 1, Revap_surface_names_y_yr);
-			setAttrib(Revasurface_yr, R_DimNamesSymbol, Revap_surface_names_yr);
-			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Year"), Revasurface_yr);
-			UNPROTECT(3);
-		}
-
-		PROTECT(r_EVAPSURFACE_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_EVAPSURFACE_COLUMNS)[0]=Revasurface_columns;
-		SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Columns"), r_EVAPSURFACE_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[19]), swOutput_KEY_EVAPSURFACE);
-		UNPROTECT(3);
-	}
-	//SOIL INTERCEPTION
-	if(use[16]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[16]);
-		PROTECT(swOutput_KEY_INTERCEPTION = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_INTERCEPTION_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_INTERCEPTION_NAME, 0, mkChar(cSWoutput_KEY_Titles[16]));
-		SET_SLOT(swOutput_KEY_INTERCEPTION, install("Title"), r_INTERCEPTION_NAME);
-		if (useTimeStep) {
-			PROTECT(r_INTERCEPTION_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_INTERCEPTION_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_INTERCEPTION, install("TimeStep"), r_INTERCEPTION_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_INTERCEPTION_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_INTERCEPTION_PERIOD)[0]=INTEGER(Periods)[16];
-			SET_SLOT(swOutput_KEY_INTERCEPTION, install("TimeStep"), r_INTERCEPTION_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[16][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rinterception_dy = allocMatrix(REALSXP, dy_nrow, Rinterception_columns+2));
-			PROTECT(Rinterception_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rinterception_names_y_dy = allocVector(STRSXP, Rinterception_columns + 2));
-			SET_STRING_ELT(Rinterception_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinterception_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Rinterception_columns; i++)
-				SET_STRING_ELT(Rinterception_names_y_dy, i + 2, mkChar(Cinterception_names[i]));
-			SET_VECTOR_ELT(Rinterception_names_dy, 1, Rinterception_names_y_dy);
-			setAttrib(Rinterception_dy, R_DimNamesSymbol, Rinterception_names_dy);
-			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Day"), Rinterception_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[16][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rinterception_wk = allocMatrix(REALSXP, wk_nrow, Rinterception_columns+2));
-			PROTECT(Rinterception_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rinterception_names_y_wk = allocVector(STRSXP, Rinterception_columns + 2));
-			SET_STRING_ELT(Rinterception_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinterception_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Rinterception_columns; i++)
-				SET_STRING_ELT(Rinterception_names_y_wk, i + 2, mkChar(Cinterception_names[i]));
-			SET_VECTOR_ELT(Rinterception_names_wk, 1, Rinterception_names_y_wk);
-			setAttrib(Rinterception_wk, R_DimNamesSymbol, Rinterception_names_wk);
-			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Week"), Rinterception_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[16][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rinterception_mo = allocMatrix(REALSXP, mo_nrow, Rinterception_columns+2));
-			PROTECT(Rinterception_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rinterception_names_y_mo = allocVector(STRSXP, Rinterception_columns + 2));
-			SET_STRING_ELT(Rinterception_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rinterception_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Rinterception_columns; i++)
-				SET_STRING_ELT(Rinterception_names_y_mo, i + 2, mkChar(Cinterception_names[i]));
-			SET_VECTOR_ELT(Rinterception_names_mo, 1, Rinterception_names_y_mo);
-			setAttrib(Rinterception_mo, R_DimNamesSymbol, Rinterception_names_mo);
-			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Month"), Rinterception_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[16][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rinterception_yr = allocMatrix(REALSXP, yr_nrow, Rinterception_columns+1));
-			PROTECT(Rinterception_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rinterception_names_y_yr = allocVector(STRSXP, Rinterception_columns + 1));
-			SET_STRING_ELT(Rinterception_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Rinterception_columns; i++)
-				SET_STRING_ELT(Rinterception_names_y_yr, i + 1, mkChar(Cinterception_names[i]));
-			SET_VECTOR_ELT(Rinterception_names_yr, 1, Rinterception_names_y_yr);
-			setAttrib(Rinterception_yr, R_DimNamesSymbol, Rinterception_names_yr);
-			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Year"), Rinterception_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_INTERCEPTION_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_INTERCEPTION_COLUMNS)[0]=Rinterception_columns;
-		SET_SLOT(swOutput_KEY_INTERCEPTION, install("Columns"), r_INTERCEPTION_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[20]), swOutput_KEY_INTERCEPTION);
-		UNPROTECT(3);
-	}
-	//Percolation
-	if(use[17]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[17]);
-		PROTECT(swOutput_KEY_LYRDRAIN = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_LYRDRAIN_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_LYRDRAIN_NAME, 0, mkChar(cSWoutput_KEY_Titles[17]));
-		SET_SLOT(swOutput_KEY_LYRDRAIN, install("Title"), r_LYRDRAIN_NAME);
-		if (useTimeStep) {
-			PROTECT(r_LYRDRAIN_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_LYRDRAIN_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_LYRDRAIN, install("TimeStep"), r_LYRDRAIN_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_LYRDRAIN_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_LYRDRAIN_PERIOD)[0]=INTEGER(Periods)[17];
-			SET_SLOT(swOutput_KEY_LYRDRAIN, install("TimeStep"), r_LYRDRAIN_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[17][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rpercolation_dy = allocMatrix(REALSXP, dy_nrow, Rpercolation_columns+2));
-			PROTECT(Rpercolation_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rpercolation_names_y_dy = allocVector(STRSXP, Rpercolation_columns + 2));
-			SET_STRING_ELT(Rpercolation_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpercolation_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < (tLayers - 1); i++)
-				SET_STRING_ELT(Rpercolation_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rpercolation_names_dy, 1, Rpercolation_names_y_dy);
-			setAttrib(Rpercolation_dy, R_DimNamesSymbol, Rpercolation_names_dy);
-			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Day"), Rpercolation_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[17][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rpercolation_wk = allocMatrix(REALSXP, wk_nrow, Rpercolation_columns+2));
-			PROTECT(Rpercolation_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rpercolation_names_y_wk = allocVector(STRSXP, Rpercolation_columns + 2));
-			SET_STRING_ELT(Rpercolation_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpercolation_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < (tLayers - 1); i++)
-				SET_STRING_ELT(Rpercolation_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rpercolation_names_wk, 1, Rpercolation_names_y_wk);
-			setAttrib(Rpercolation_wk, R_DimNamesSymbol, Rpercolation_names_wk);
-			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Week"), Rpercolation_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[17][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rpercolation_mo = allocMatrix(REALSXP, mo_nrow, Rpercolation_columns+2));
-			PROTECT(Rpercolation_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rpercolation_names_y_mo = allocVector(STRSXP, Rpercolation_columns + 2));
-			SET_STRING_ELT(Rpercolation_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpercolation_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < (tLayers - 1); i++)
-				SET_STRING_ELT(Rpercolation_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rpercolation_names_mo, 1, Rpercolation_names_y_mo);
-			setAttrib(Rpercolation_mo, R_DimNamesSymbol, Rpercolation_names_mo);
-			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Month"), Rpercolation_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[17][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rpercolation_yr = allocMatrix(REALSXP, yr_nrow, Rpercolation_columns+1));
-			PROTECT(Rpercolation_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rpercolation_names_y_yr = allocVector(STRSXP, Rpercolation_columns + 1));
-			SET_STRING_ELT(Rpercolation_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < (tLayers - 1); i++)
-				SET_STRING_ELT(Rpercolation_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rpercolation_names_yr, 1, Rpercolation_names_y_yr);
-			setAttrib(Rpercolation_yr, R_DimNamesSymbol, Rpercolation_names_yr);
-			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Year"), Rpercolation_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_LYRDRAIN_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_LYRDRAIN_COLUMNS)[0]=Rpercolation_columns;
-		SET_SLOT(swOutput_KEY_LYRDRAIN, install("Columns"), r_LYRDRAIN_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[21]), swOutput_KEY_LYRDRAIN);
-		UNPROTECT(3);
-	}
-	//Hydred
-	if(use[18]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[18]);
-		PROTECT(swOutput_KEY_HYDRED = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_HYDRED_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_HYDRED_NAME, 0, mkChar(cSWoutput_KEY_Titles[18]));
-		SET_SLOT(swOutput_KEY_HYDRED, install("Title"), r_HYDRED_NAME);
-		if (useTimeStep) {
-			PROTECT(r_HYDRED_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_HYDRED_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_HYDRED, install("TimeStep"), r_HYDRED_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_HYDRED_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_HYDRED_PERIOD)[0]=INTEGER(Periods)[18];
-			SET_SLOT(swOutput_KEY_HYDRED, install("TimeStep"), r_HYDRED_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[18][0]) {
-			if(debug) Rprintf("\tdy\n");
-			if(debug) Rprintf("\tRows dy_nrow %d Columns %d \n", dy_nrow, Rhydred_columns + 2);
-			PROTECT(Rhydred_dy = allocMatrix(REALSXP, dy_nrow, Rhydred_columns+2));
-			PROTECT(Rhydred_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rhydred_names_y_dy = allocVector(STRSXP, Rhydred_columns + 2));
-			SET_STRING_ELT(Rhydred_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rhydred_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Chydred_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rhydred_names_y_dy, (i * tLayers + j) + 2, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rhydred_names_dy, 1, Rhydred_names_y_dy);
-			setAttrib(Rhydred_dy, R_DimNamesSymbol, Rhydred_names_dy);
-			SET_SLOT(swOutput_KEY_HYDRED, install("Day"), Rhydred_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[18][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rhydred_wk = allocMatrix(REALSXP, wk_nrow, Rhydred_columns+2));
-			PROTECT(Rhydred_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rhydred_names_y_wk = allocVector(STRSXP, Rhydred_columns + 2));
-			SET_STRING_ELT(Rhydred_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rhydred_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Chydred_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rhydred_names_y_wk, (i * tLayers + j) + 2, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rhydred_names_wk, 1, Rhydred_names_y_wk);
-			setAttrib(Rhydred_wk, R_DimNamesSymbol, Rhydred_names_wk);
-			SET_SLOT(swOutput_KEY_HYDRED, install("Week"), Rhydred_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[18][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rhydred_mo = allocMatrix(REALSXP, mo_nrow, Rhydred_columns+2));
-			PROTECT(Rhydred_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rhydred_names_y_mo = allocVector(STRSXP, Rhydred_columns + 2));
-			SET_STRING_ELT(Rhydred_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rhydred_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Chydred_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rhydred_names_y_mo, (i * tLayers + j) + 2, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rhydred_names_mo, 1, Rhydred_names_y_mo);
-			setAttrib(Rhydred_mo, R_DimNamesSymbol, Rhydred_names_mo);
-			SET_SLOT(swOutput_KEY_HYDRED, install("Month"), Rhydred_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[18][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rhydred_yr = allocMatrix(REALSXP, yr_nrow, Rhydred_columns+1));
-			PROTECT(Rhydred_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rhydred_names_y_yr = allocVector(STRSXP, Rhydred_columns + 1));
-			SET_STRING_ELT(Rhydred_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < 5; i++) {
-				for (j = 0; j < tLayers; j++) {
-					strcpy(Ctemp, Chydred_names[i]);
-					strcat(Ctemp, Layers_names[j]);
-					SET_STRING_ELT(Rhydred_names_y_yr, (i * tLayers + j) + 1, mkChar(Ctemp));
-				}
-			}
-			SET_VECTOR_ELT(Rhydred_names_yr, 1, Rhydred_names_y_yr);
-			setAttrib(Rhydred_yr, R_DimNamesSymbol, Rhydred_names_yr);
-			SET_SLOT(swOutput_KEY_HYDRED, install("Year"), Rhydred_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_HYDRED_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_HYDRED_COLUMNS)[0]=Rhydred_columns;
-		SET_SLOT(swOutput_KEY_HYDRED, install("Columns"), r_HYDRED_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[22]), swOutput_KEY_HYDRED);
-		UNPROTECT(3);
-	}
-	//ET - NOT USED
-	if(use[19]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[19]);
-		PROTECT(swOutput_KEY_ET = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_ET_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_ET_NAME, 0, mkChar(cSWoutput_KEY_Titles[19]));
-		SET_SLOT(swOutput_KEY_ET, install("Title"), r_ET_NAME);
-		if (useTimeStep) {
-			PROTECT(r_ET_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_ET_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_ET, install("TimeStep"), r_ET_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_ET_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_ET_PERIOD)[0]=INTEGER(Periods)[19];
-			SET_SLOT(swOutput_KEY_ET, install("TimeStep"), r_ET_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[19][0]) {
-			PROTECT(Ret_dy = allocMatrix(REALSXP, dy_nrow, Ret_columns+2));
-
-			setAttrib(Ret_dy, R_DimNamesSymbol, Ret_names_dy);
-			SET_SLOT(swOutput_KEY_ET, install("Day"), Ret_dy);
-			UNPROTECT(1);
-		}
-		if(periodUse[19][1]) {
-			PROTECT(Ret_wk = allocMatrix(REALSXP, wk_nrow, Ret_columns+2));
-
-			setAttrib(Ret_wk, R_DimNamesSymbol, Ret_names_dy);
-			SET_SLOT(swOutput_KEY_ET, install("Week"), Ret_wk);
-			UNPROTECT(1);
-		}
-		if(periodUse[19][2]) {
-			PROTECT(Ret_mo = allocMatrix(REALSXP, mo_nrow, Ret_columns+2));
-
-			setAttrib(Ret_mo, R_DimNamesSymbol, Ret_names_dy);
-			SET_SLOT(swOutput_KEY_ET, install("Month"), Ret_mo);
-			UNPROTECT(1);
-		}
-		if(periodUse[19][3]) {
-			PROTECT(Ret_yr = allocMatrix(REALSXP, yr_nrow, Ret_columns+1));
-
-			setAttrib(Ret_yr, R_DimNamesSymbol, Ret_names_dy);
-			SET_SLOT(swOutput_KEY_ET, install("Year"), Ret_yr);
-			UNPROTECT(1);
-		}
-		PROTECT(r_ET_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_ET_COLUMNS)[0]=Ret_columns;
-		SET_SLOT(swOutput_KEY_ET, install("Columns"), r_ET_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[23]), swOutput_KEY_ET);
-		UNPROTECT(3);
-	}
-	//AET
-	if(use[20]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[20]);
-		PROTECT(swOutput_KEY_AET = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_AET_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_AET_NAME, 0, mkChar(cSWoutput_KEY_Titles[20]));
-		SET_SLOT(swOutput_KEY_AET, install("Title"), r_AET_NAME);
-		if (useTimeStep) {
-			PROTECT(r_AET_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_AET_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_AET, install("TimeStep"), r_AET_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_AET_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_AET_PERIOD)[0]=INTEGER(Periods)[20];
-			SET_SLOT(swOutput_KEY_AET, install("TimeStep"), r_AET_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[20][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Raet_dy = allocMatrix(REALSXP, dy_nrow, Raet_columns+2));
-			PROTECT(Raet_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Raet_names_y_dy = allocVector(STRSXP, Raet_columns + 2));
-			SET_STRING_ELT(Raet_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Raet_names_y_dy, 1, mkChar("DOY"));
-			SET_STRING_ELT(Raet_names_y_dy, 2, mkChar("evapotr_cm"));
-			SET_VECTOR_ELT(Raet_names_dy, 1, Raet_names_y_dy);
-			setAttrib(Raet_dy, R_DimNamesSymbol, Raet_names_dy);
-			SET_SLOT(swOutput_KEY_AET, install("Day"), Raet_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[20][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Raet_wk = allocMatrix(REALSXP, wk_nrow, Raet_columns+2));
-			PROTECT(Raet_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Raet_names_y_wk = allocVector(STRSXP, Raet_columns + 2));
-			SET_STRING_ELT(Raet_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Raet_names_y_wk, 1, mkChar("Week"));
-			SET_STRING_ELT(Raet_names_y_wk, 2, mkChar("evapotr_cm"));
-			SET_VECTOR_ELT(Raet_names_wk, 1, Raet_names_y_wk);
-			setAttrib(Raet_wk, R_DimNamesSymbol, Raet_names_wk);
-			SET_SLOT(swOutput_KEY_AET, install("Week"), Raet_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[20][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Raet_mo = allocMatrix(REALSXP, mo_nrow, Raet_columns+2));
-			PROTECT(Raet_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Raet_names_y_mo = allocVector(STRSXP, Raet_columns + 2));
-			SET_STRING_ELT(Raet_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Raet_names_y_mo, 1, mkChar("Month"));
-			SET_STRING_ELT(Raet_names_y_mo, 2, mkChar("evapotr_cm"));
-			SET_VECTOR_ELT(Raet_names_mo, 1, Raet_names_y_mo);
-			setAttrib(Raet_mo, R_DimNamesSymbol, Raet_names_mo);
-			SET_SLOT(swOutput_KEY_AET, install("Month"), Raet_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[20][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Raet_yr = allocMatrix(REALSXP, yr_nrow, Raet_columns+1));
-			PROTECT(Raet_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Raet_names_y_yr = allocVector(STRSXP, Raet_columns + 1));
-			SET_STRING_ELT(Raet_names_y_yr, 0, mkChar("Year"));
-			SET_STRING_ELT(Raet_names_y_yr, 1, mkChar("evapotr_cm"));
-			SET_VECTOR_ELT(Raet_names_yr, 1, Raet_names_y_yr);
-			setAttrib(Raet_yr, R_DimNamesSymbol, Raet_names_yr);
-			SET_SLOT(swOutput_KEY_AET, install("Year"), Raet_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_AET_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_AET_COLUMNS)[0]=Raet_columns;
-		SET_SLOT(swOutput_KEY_AET, install("Columns"), r_AET_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[24]), swOutput_KEY_AET);
-		UNPROTECT(3);
-	}
-	//PET
-	if(use[21]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[21]);
-		PROTECT(swOutput_KEY_PET = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_PET_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_PET_NAME, 0, mkChar(cSWoutput_KEY_Titles[21]));
-		SET_SLOT(swOutput_KEY_PET, install("Title"), r_PET_NAME);
-		if (useTimeStep) {
-			PROTECT(r_PET_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_PET_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_PET, install("TimeStep"), r_PET_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_PET_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_PET_PERIOD)[0]=INTEGER(Periods)[21];
-			SET_SLOT(swOutput_KEY_PET, install("TimeStep"), r_PET_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[21][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rpet_dy = allocMatrix(REALSXP, dy_nrow, Rpet_columns+2));
-			PROTECT(Rpet_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rpet_names_y_dy = allocVector(STRSXP, Rpet_columns + 2));
-			SET_STRING_ELT(Rpet_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpet_names_y_dy, 1, mkChar("DOY"));
-			SET_STRING_ELT(Rpet_names_y_dy, 2, mkChar("pet_cm"));
-			SET_VECTOR_ELT(Rpet_names_dy, 1, Rpet_names_y_dy);
-			setAttrib(Rpet_dy, R_DimNamesSymbol, Rpet_names_dy);
-			SET_SLOT(swOutput_KEY_PET, install("Day"), Rpet_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[21][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rpet_wk = allocMatrix(REALSXP, wk_nrow, Rpet_columns+2));
-			PROTECT(Rpet_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rpet_names_y_wk = allocVector(STRSXP, Rpet_columns + 2));
-			SET_STRING_ELT(Rpet_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpet_names_y_wk, 1, mkChar("Week"));
-			SET_STRING_ELT(Rpet_names_y_wk, 2, mkChar("pet_cm"));
-			SET_VECTOR_ELT(Rpet_names_wk, 1, Rpet_names_y_wk);
-			setAttrib(Rpet_wk, R_DimNamesSymbol, Rpet_names_wk);
-			SET_SLOT(swOutput_KEY_PET, install("Week"), Rpet_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[21][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rpet_mo = allocMatrix(REALSXP, mo_nrow, Rpet_columns+2));
-			PROTECT(Rpet_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rpet_names_y_mo = allocVector(STRSXP, Rpet_columns + 2));
-			SET_STRING_ELT(Rpet_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpet_names_y_mo, 1, mkChar("Month"));
-			SET_STRING_ELT(Rpet_names_y_mo, 2, mkChar("pet_cm"));
-			SET_VECTOR_ELT(Rpet_names_mo, 1, Rpet_names_y_mo);
-			setAttrib(Rpet_mo, R_DimNamesSymbol, Rpet_names_mo);
-			SET_SLOT(swOutput_KEY_PET, install("Month"), Rpet_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[21][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rpet_yr = allocMatrix(REALSXP, yr_nrow, Rpet_columns+1));
-			PROTECT(Rpet_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rpet_names_y_yr = allocVector(STRSXP, Rpet_columns + 1));
-			SET_STRING_ELT(Rpet_names_y_yr, 0, mkChar("Year"));
-			SET_STRING_ELT(Rpet_names_y_yr, 1, mkChar("pet_cm"));
-			SET_VECTOR_ELT(Rpet_names_yr, 1, Rpet_names_y_yr);
-			setAttrib(Rpet_yr, R_DimNamesSymbol, Rpet_names_yr);
-			SET_SLOT(swOutput_KEY_PET, install("Year"), Rpet_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_PET_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_PET_COLUMNS)[0]=Rpet_columns;
-		SET_SLOT(swOutput_KEY_PET, install("Columns"), r_PET_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[25]), swOutput_KEY_PET);
-		UNPROTECT(3);
-	}
-	//WET DAYS
-	if(use[22]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[22]);
-		PROTECT(swOutput_KEY_WETDAY = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_WETDAY_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_WETDAY_NAME, 0, mkChar(cSWoutput_KEY_Titles[22]));
-		SET_SLOT(swOutput_KEY_WETDAY, install("Title"), r_WETDAY_NAME);
-		if (useTimeStep) {
-			PROTECT(r_WETDAY_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_WETDAY_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_WETDAY, install("TimeStep"), r_WETDAY_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_WETDAY_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_WETDAY_PERIOD)[0]=INTEGER(Periods)[22];
-			SET_SLOT(swOutput_KEY_WETDAY, install("TimeStep"), r_WETDAY_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[22][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rwetdays_dy = allocMatrix(REALSXP, dy_nrow, Rwetdays_columns+2));
-			PROTECT(Rwetdays_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rwetdays_names_y_dy = allocVector(STRSXP, Rwetdays_columns + 2));
-			SET_STRING_ELT(Rwetdays_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rwetdays_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rwetdays_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rwetdays_names_dy, 1, Rwetdays_names_y_dy);
-			setAttrib(Rwetdays_dy, R_DimNamesSymbol, Rwetdays_names_dy);
-			SET_SLOT(swOutput_KEY_WETDAY, install("Day"), Rwetdays_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[22][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rwetdays_wk = allocMatrix(REALSXP, wk_nrow, Rwetdays_columns+2));
-			PROTECT(Rwetdays_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rwetdays_names_y_wk = allocVector(STRSXP, Rwetdays_columns + 2));
-			SET_STRING_ELT(Rwetdays_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rwetdays_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rwetdays_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rwetdays_names_wk, 1, Rwetdays_names_y_wk);
-			setAttrib(Rwetdays_wk, R_DimNamesSymbol, Rwetdays_names_wk);
-			SET_SLOT(swOutput_KEY_WETDAY, install("Week"), Rwetdays_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[22][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rwetdays_mo = allocMatrix(REALSXP, mo_nrow, Rwetdays_columns+2));
-			PROTECT(Rwetdays_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rwetdays_names_y_mo = allocVector(STRSXP, Rwetdays_columns + 2));
-			SET_STRING_ELT(Rwetdays_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rwetdays_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rwetdays_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rwetdays_names_mo, 1, Rwetdays_names_y_mo);
-			setAttrib(Rwetdays_mo, R_DimNamesSymbol, Rwetdays_names_mo);
-			SET_SLOT(swOutput_KEY_WETDAY, install("Month"), Rwetdays_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[22][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rwetdays_yr = allocMatrix(REALSXP, yr_nrow, Rwetdays_columns+1));
-			PROTECT(Rwetdays_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rwetdays_names_y_yr = allocVector(STRSXP, Rwetdays_columns + 1));
-			SET_STRING_ELT(Rwetdays_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rwetdays_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rwetdays_names_yr, 1, Rwetdays_names_y_yr);
-			setAttrib(Rwetdays_yr, R_DimNamesSymbol, Rwetdays_names_yr);
-			SET_SLOT(swOutput_KEY_WETDAY, install("Year"), Rwetdays_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_WETDAY_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_WETDAY_COLUMNS)[0]=Rwetdays_columns;
-		SET_SLOT(swOutput_KEY_WETDAY, install("Columns"), r_WETDAY_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[26]), swOutput_KEY_WETDAY);
-		UNPROTECT(3);
-	}
-	//SNOW PACK
-	if(use[23]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[23]);
-		PROTECT(swOutput_KEY_SNOWPACK = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SNOWPACK_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SNOWPACK_NAME, 0, mkChar(cSWoutput_KEY_Titles[23]));
-		SET_SLOT(swOutput_KEY_SNOWPACK, install("Title"), r_SNOWPACK_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SNOWPACK_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SNOWPACK_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SNOWPACK, install("TimeStep"), r_SNOWPACK_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SNOWPACK_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SNOWPACK_PERIOD)[0]=INTEGER(Periods)[23];
-			SET_SLOT(swOutput_KEY_SNOWPACK, install("TimeStep"), r_SNOWPACK_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[23][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rsnowpack_dy = allocMatrix(REALSXP, dy_nrow, Rsnowpack_columns+2));
-			PROTECT(Rsnowpack_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rsnowpack_names_y_dy = allocVector(STRSXP, Rsnowpack_columns + 2));
-			SET_STRING_ELT(Rsnowpack_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsnowpack_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < Rsnowpack_columns; i++)
-				SET_STRING_ELT(Rsnowpack_names_y_dy, i + 2, mkChar(Csnowpack_names[i]));
-			SET_VECTOR_ELT(Rsnowpack_names_dy, 1, Rsnowpack_names_y_dy);
-			setAttrib(Rsnowpack_dy, R_DimNamesSymbol, Rsnowpack_names_dy);
-			SET_SLOT(swOutput_KEY_SNOWPACK, install("Day"), Rsnowpack_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[23][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rsnowpack_wk = allocMatrix(REALSXP, wk_nrow, Rsnowpack_columns+2));
-			PROTECT(Rsnowpack_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rsnowpack_names_y_wk = allocVector(STRSXP, Rsnowpack_columns + 2));
-			SET_STRING_ELT(Rsnowpack_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsnowpack_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < Rsnowpack_columns; i++)
-				SET_STRING_ELT(Rsnowpack_names_y_wk, i + 2, mkChar(Csnowpack_names[i]));
-			SET_VECTOR_ELT(Rsnowpack_names_wk, 1, Rsnowpack_names_y_wk);
-			setAttrib(Rsnowpack_wk, R_DimNamesSymbol, Rsnowpack_names_wk);
-			SET_SLOT(swOutput_KEY_SNOWPACK, install("Week"), Rsnowpack_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[23][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rsnowpack_mo = allocMatrix(REALSXP, mo_nrow, Rsnowpack_columns+2));
-			PROTECT(Rsnowpack_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rsnowpack_names_y_mo = allocVector(STRSXP, Rsnowpack_columns + 2));
-			SET_STRING_ELT(Rsnowpack_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsnowpack_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < Rsnowpack_columns; i++)
-				SET_STRING_ELT(Rsnowpack_names_y_mo, i + 2, mkChar(Csnowpack_names[i]));
-			SET_VECTOR_ELT(Rsnowpack_names_mo, 1, Rsnowpack_names_y_mo);
-			setAttrib(Rsnowpack_mo, R_DimNamesSymbol, Rsnowpack_names_mo);
-			SET_SLOT(swOutput_KEY_SNOWPACK, install("Month"), Rsnowpack_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[23][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rsnowpack_yr = allocMatrix(REALSXP, yr_nrow, Rsnowpack_columns+1));
-			PROTECT(Rsnowpack_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rsnowpack_names_y_yr = allocVector(STRSXP, Rsnowpack_columns + 1));
-			SET_STRING_ELT(Rsnowpack_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < Rsnowpack_columns; i++)
-				SET_STRING_ELT(Rsnowpack_names_y_yr, i + 1, mkChar(Csnowpack_names[i]));
-			SET_VECTOR_ELT(Rsnowpack_names_yr, 1, Rsnowpack_names_y_yr);
-			setAttrib(Rsnowpack_yr, R_DimNamesSymbol, Rsnowpack_names_yr);
-			SET_SLOT(swOutput_KEY_SNOWPACK, install("Year"), Rsnowpack_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_SNOWPACK_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SNOWPACK_COLUMNS)[0]=Rsnowpack_columns;
-		SET_SLOT(swOutput_KEY_SNOWPACK, install("Columns"), r_SNOWPACK_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[27]), swOutput_KEY_SNOWPACK);
-		UNPROTECT(3);
-	}
-	//DEEP SWC
-	if(use[24]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[24]);
-		PROTECT(swOutput_KEY_DEEPSWC = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_DEEPSWC_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_DEEPSWC_NAME, 0, mkChar(cSWoutput_KEY_Titles[24]));
-		SET_SLOT(swOutput_KEY_DEEPSWC, install("Title"), r_DEEPSWC_NAME);
-		if (useTimeStep) {
-			PROTECT(r_DEEPSWC_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_DEEPSWC_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_DEEPSWC, install("TimeStep"), r_DEEPSWC_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_DEEPSWC_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_DEEPSWC_PERIOD)[0]=INTEGER(Periods)[24];
-			SET_SLOT(swOutput_KEY_DEEPSWC, install("TimeStep"), r_DEEPSWC_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[24][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rdeedrain_dy = allocMatrix(REALSXP, dy_nrow, Rdeedrain_columns+2));
-			PROTECT(Rdeep_drain_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rdeep_drain_names_y_dy = allocVector(STRSXP, Rdeedrain_columns + 2));
-			SET_STRING_ELT(Rdeep_drain_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rdeep_drain_names_y_dy, 1, mkChar("DOY"));
-			SET_STRING_ELT(Rdeep_drain_names_y_dy, 2, mkChar("lowLayerDrain_cm"));
-			SET_VECTOR_ELT(Rdeep_drain_names_dy, 1, Rdeep_drain_names_y_dy);
-			setAttrib(Rdeedrain_dy, R_DimNamesSymbol, Rdeep_drain_names_dy);
-			SET_SLOT(swOutput_KEY_DEEPSWC, install("Day"), Rdeedrain_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[24][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rdeedrain_wk = allocMatrix(REALSXP, wk_nrow, Rdeedrain_columns+2));
-			PROTECT(Rdeep_drain_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rdeep_drain_names_y_wk = allocVector(STRSXP, Rdeedrain_columns + 2));
-			SET_STRING_ELT(Rdeep_drain_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rdeep_drain_names_y_wk, 1, mkChar("Week"));
-			SET_STRING_ELT(Rdeep_drain_names_y_wk, 2, mkChar("lowLayerDrain_cm"));
-			SET_VECTOR_ELT(Rdeep_drain_names_wk, 1, Rdeep_drain_names_y_wk);
-			setAttrib(Rdeedrain_wk, R_DimNamesSymbol, Rdeep_drain_names_wk);
-			SET_SLOT(swOutput_KEY_DEEPSWC, install("Week"), Rdeedrain_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[24][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rdeedrain_mo = allocMatrix(REALSXP, mo_nrow, Rdeedrain_columns+2));
-			PROTECT(Rdeep_drain_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rdeep_drain_names_y_mo = allocVector(STRSXP, Rdeedrain_columns + 2));
-			SET_STRING_ELT(Rdeep_drain_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rdeep_drain_names_y_mo, 1, mkChar("Month"));
-			SET_STRING_ELT(Rdeep_drain_names_y_mo, 2, mkChar("lowLayerDrain_cm"));
-			SET_VECTOR_ELT(Rdeep_drain_names_mo, 1, Rdeep_drain_names_y_mo);
-			setAttrib(Rdeedrain_mo, R_DimNamesSymbol, Rdeep_drain_names_mo);
-			SET_SLOT(swOutput_KEY_DEEPSWC, install("Month"), Rdeedrain_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[24][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rdeedrain_yr = allocMatrix(REALSXP, yr_nrow, Rdeedrain_columns+1));
-			PROTECT(Rdeep_drain_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rdeep_drain_names_y_yr = allocVector(STRSXP, Rdeedrain_columns + 1));
-			SET_STRING_ELT(Rdeep_drain_names_y_yr, 0, mkChar("Year"));
-			SET_STRING_ELT(Rdeep_drain_names_y_yr, 1, mkChar("lowLayerDrain_cm"));
-			SET_VECTOR_ELT(Rdeep_drain_names_yr, 1, Rdeep_drain_names_y_yr);
-			setAttrib(Rdeedrain_yr, R_DimNamesSymbol, Rdeep_drain_names_yr);
-			SET_SLOT(swOutput_KEY_DEEPSWC, install("Year"), Rdeedrain_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_DEEPSWC_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_DEEPSWC_COLUMNS)[0]=Rdeedrain_columns;
-		SET_SLOT(swOutput_KEY_DEEPSWC, install("Columns"), r_DEEPSWC_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[28]), swOutput_KEY_DEEPSWC);
-		UNPROTECT(3);
-	}
-	//Soil Temp
-	if(use[25]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[25]);
-		PROTECT(swOutput_KEY_SOILTEMP = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_SOILTEMP_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_SOILTEMP_NAME, 0, mkChar(cSWoutput_KEY_Titles[25]));
-		SET_SLOT(swOutput_KEY_SOILTEMP, install("Title"), r_SOILTEMP_NAME);
-		if (useTimeStep) {
-			PROTECT(r_SOILTEMP_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_SOILTEMP_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_SOILTEMP, install("TimeStep"), r_SOILTEMP_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_SOILTEMP_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_SOILTEMP_PERIOD)[0]=INTEGER(Periods)[25];
-			SET_SLOT(swOutput_KEY_SOILTEMP, install("TimeStep"), r_SOILTEMP_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[25][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Rsoil_temp_dy = allocMatrix(REALSXP, dy_nrow, Rsoil_temp_columns+2));
-			PROTECT(Rsoil_temp_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Rsoil_temp_names_y_dy = allocVector(STRSXP, Rsoil_temp_columns + 2));
-			SET_STRING_ELT(Rsoil_temp_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsoil_temp_names_y_dy, 1, mkChar("DOY"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rsoil_temp_names_y_dy, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rsoil_temp_names_dy, 1, Rsoil_temp_names_y_dy);
-			setAttrib(Rsoil_temp_dy, R_DimNamesSymbol, Rsoil_temp_names_dy);
-			SET_SLOT(swOutput_KEY_SOILTEMP, install("Day"), Rsoil_temp_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[25][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Rsoil_temp_wk = allocMatrix(REALSXP, wk_nrow, Rsoil_temp_columns+2));
-			PROTECT(Rsoil_temp_names_wk = allocVector(VECSXP, 2));
-			PROTECT(Rsoil_temp_names_y_wk = allocVector(STRSXP, Rsoil_temp_columns + 2));
-			SET_STRING_ELT(Rsoil_temp_names_y_wk, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsoil_temp_names_y_wk, 1, mkChar("Week"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rsoil_temp_names_y_wk, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rsoil_temp_names_wk, 1, Rsoil_temp_names_y_wk);
-			setAttrib(Rsoil_temp_wk, R_DimNamesSymbol, Rsoil_temp_names_wk);
-			SET_SLOT(swOutput_KEY_SOILTEMP, install("Week"), Rsoil_temp_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[25][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Rsoil_temp_mo = allocMatrix(REALSXP, mo_nrow, Rsoil_temp_columns+2));
-			PROTECT(Rsoil_temp_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Rsoil_temp_names_y_mo = allocVector(STRSXP, Rsoil_temp_columns + 2));
-			SET_STRING_ELT(Rsoil_temp_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Rsoil_temp_names_y_mo, 1, mkChar("Month"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rsoil_temp_names_y_mo, i + 2, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rsoil_temp_names_mo, 1, Rsoil_temp_names_y_mo);
-			setAttrib(Rsoil_temp_mo, R_DimNamesSymbol, Rsoil_temp_names_mo);
-			SET_SLOT(swOutput_KEY_SOILTEMP, install("Month"), Rsoil_temp_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[25][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Rsoil_temp_yr = allocMatrix(REALSXP, yr_nrow, Rsoil_temp_columns+1));
-			PROTECT(Rsoil_temp_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Rsoil_temp_names_y_yr = allocVector(STRSXP, Rsoil_temp_columns + 1));
-			SET_STRING_ELT(Rsoil_temp_names_y_yr, 0, mkChar("Year"));
-			for (i = 0; i < tLayers; i++)
-				SET_STRING_ELT(Rsoil_temp_names_y_yr, i + 1, mkChar(Layers_names[i]));
-			SET_VECTOR_ELT(Rsoil_temp_names_yr, 1, Rsoil_temp_names_y_yr);
-			setAttrib(Rsoil_temp_yr, R_DimNamesSymbol, Rsoil_temp_names_yr);
-			SET_SLOT(swOutput_KEY_SOILTEMP, install("Year"), Rsoil_temp_yr);
-			UNPROTECT(3);
-		}
-
-		PROTECT(r_SOILTEMP_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_SOILTEMP_COLUMNS)[0]=Rsoil_temp_columns;
-		SET_SLOT(swOutput_KEY_SOILTEMP, install("Columns"), r_SOILTEMP_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[29]), swOutput_KEY_SOILTEMP);
-		UNPROTECT(3);
-	}
-	//ALL VEG
-	if(use[26]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[26]);
-		PROTECT(swOutput_KEY_ALLVEG = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_ALLVEG_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_ALLVEG_NAME, 0, mkChar(cSWoutput_KEY_Titles[26]));
-		SET_SLOT(swOutput_KEY_ALLVEG, install("Title"), r_ALLVEG_NAME);
-		if (useTimeStep) {
-			PROTECT(r_ALLVEG_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_ALLVEG_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_ALLVEG, install("TimeStep"), r_ALLVEG_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_ALLVEG_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_ALLVEG_PERIOD)[0]=INTEGER(Periods)[26];
-			SET_SLOT(swOutput_KEY_ALLVEG, install("TimeStep"), r_ALLVEG_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[26][0]) {
-			PROTECT(Rallveg_dy = allocMatrix(REALSXP, dy_nrow, Rallveg_columns+2));
-
-			SET_SLOT(swOutput_KEY_ALLVEG, install("Day"), Rallveg_dy);
-			UNPROTECT(1);
-		}
-		if(periodUse[26][1]) {
-			PROTECT(Rallveg_wk = allocMatrix(REALSXP, wk_nrow, Rallveg_columns+2));
-
-			SET_SLOT(swOutput_KEY_ALLVEG, install("Week"), Rallveg_wk);
-			UNPROTECT(1);
-		}
-		if(periodUse[26][2]) {
-			PROTECT(Rallveg_mo = allocMatrix(REALSXP, mo_nrow, Rallveg_columns+2));
-
-			SET_SLOT(swOutput_KEY_ALLVEG, install("Month"), Rallveg_mo);
-			UNPROTECT(1);
-		}
-		if(periodUse[26][3]) {
-			PROTECT(Rallveg_yr = allocMatrix(REALSXP, yr_nrow, Rallveg_columns+1));
-
-			SET_SLOT(swOutput_KEY_ALLVEG, install("Year"), Rallveg_yr);
-			UNPROTECT(1);
-		}
-		PROTECT(r_ALLVEG_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_ALLVEG_COLUMNS)[0]=Rallveg_columns;
-		SET_SLOT(swOutput_KEY_ALLVEG, install("Columns"), r_ALLVEG_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[30]), swOutput_KEY_ALLVEG);
-		UNPROTECT(3);
-	}
-	//ESTABL
-	if(use[27]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[27]);
-		PROTECT(swOutput_KEY_ESTABL = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_ESTABL_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_ESTABL_NAME, 0, mkChar(cSWoutput_KEY_Titles[27]));
-		SET_SLOT(swOutput_KEY_ESTABL, install("Title"), r_ESTABL_NAME);
-		if (useTimeStep) {
-			PROTECT(r_ESTABL_PERIOD = NEW_INTEGER(length(Periods)));
-			for(i=0; i<length(Periods); i++)
-				INTEGER(r_ESTABL_PERIOD)[i]=INTEGER(Periods)[i];
-			SET_SLOT(swOutput_KEY_ESTABL, install("TimeStep"), r_ESTABL_PERIOD);
-			UNPROTECT(1);
-		} else {
-			PROTECT(r_ESTABL_PERIOD = NEW_INTEGER(1));
-			INTEGER(r_ESTABL_PERIOD)[0]=INTEGER(Periods)[27];
-			SET_SLOT(swOutput_KEY_ESTABL, install("TimeStep"), r_ESTABL_PERIOD);
-			UNPROTECT(1);
-		}
-		if(periodUse[27][0]) {
-			if(debug) Rprintf("\tdy\n");
-			PROTECT(Restabs_dy = allocMatrix(REALSXP, dy_nrow, Restabs_columns+2));
-			PROTECT(Restabs_names_dy = allocVector(VECSXP, 2));
-			PROTECT(Restabs_names_y_dy = allocVector(STRSXP, Restabs_columns+2));
-			SET_STRING_ELT(Restabs_names_y_dy, 0, mkChar("Year"));
-			SET_STRING_ELT(Restabs_names_y_dy, 1, mkChar("DOY"));
-			SET_STRING_ELT(Restabs_names_y_dy, 2, mkChar("YearlyEstabResults"));
-			SET_VECTOR_ELT(Restabs_names_dy, 1, Restabs_names_y_dy);
-			setAttrib(Restabs_dy, R_DimNamesSymbol, Restabs_names_dy);
-			// Initialize to 0; allocMatrix does not initialize
-			for (k = 0; k < dy_nrow * (Restabs_columns + 2); k++)
-        REAL(Restabs_dy)[k] = 0.;
-			SET_SLOT(swOutput_KEY_ESTABL, install("Day"), Restabs_dy);
-			UNPROTECT(3);
-		}
-		if(periodUse[27][1]) {
-			if(debug) Rprintf("\twk\n");
-			PROTECT(Restabs_wk = allocMatrix(REALSXP, wk_nrow, Restabs_columns+2));
-			 PROTECT(Restabs_names_wk = allocVector(VECSXP, 2));
-			 PROTECT(Restabs_names_y_wk = allocVector(STRSXP, Restabs_columns+2));
-			 SET_STRING_ELT(Restabs_names_y_wk, 0, mkChar("Year"));
-			 SET_STRING_ELT(Restabs_names_y_wk, 1, mkChar("Week"));
-			 SET_STRING_ELT(Restabs_names_y_wk, 2, mkChar("YearlyEstabResults"));
-			 SET_VECTOR_ELT(Restabs_names_wk, 1, Restabs_names_y_wk);
-			setAttrib(Restabs_wk, R_DimNamesSymbol, Restabs_names_wk);
-			// Initialize to 0; allocMatrix does not initialize
-			for (k = 0; k < wk_nrow * (Restabs_columns + 2); k++)
-        REAL(Restabs_wk)[k] = 0.;
-			SET_SLOT(swOutput_KEY_ESTABL, install("Week"), Restabs_wk);
-			UNPROTECT(3);
-		}
-		if(periodUse[27][2]) {
-			if(debug) Rprintf("\tmo\n");
-			PROTECT(Restabs_mo = allocMatrix(REALSXP, mo_nrow, Restabs_columns+2));
-			PROTECT(Restabs_names_mo = allocVector(VECSXP, 2));
-			PROTECT(Restabs_names_y_mo = allocVector(STRSXP, Restabs_columns+2));
-			SET_STRING_ELT(Restabs_names_y_mo, 0, mkChar("Year"));
-			SET_STRING_ELT(Restabs_names_y_mo, 1, mkChar("Month"));
-			SET_STRING_ELT(Restabs_names_y_mo, 2, mkChar("YearlyEstabResults"));
-			SET_VECTOR_ELT(Restabs_names_mo, 1, Restabs_names_y_mo);
-			setAttrib(Restabs_mo, R_DimNamesSymbol, Restabs_names_mo);
-			// Initialize to 0; allocMatrix does not initialize
-			for (k = 0; k < mo_nrow * (Restabs_columns + 2); k++)
-        REAL(Restabs_mo)[k] = 0.;
-			SET_SLOT(swOutput_KEY_ESTABL, install("Month"), Restabs_mo);
-			UNPROTECT(3);
-		}
-		if(periodUse[27][3]) {
-			if(debug) Rprintf("\tyr\n");
-			PROTECT(Restabs_yr = allocMatrix(REALSXP, yr_nrow, Restabs_columns+1));
-			PROTECT(Restabs_names_yr = allocVector(VECSXP, 2));
-			PROTECT(Restabs_names_y_yr = allocVector(STRSXP, Restabs_columns+1));
-			SET_STRING_ELT(Restabs_names_y_yr, 0, mkChar("Year"));
-			SET_STRING_ELT(Restabs_names_y_yr, 1, mkChar("YearlyEstabResults"));
-			SET_VECTOR_ELT(Restabs_names_yr, 1, Restabs_names_y_yr);
-			setAttrib(Restabs_yr, R_DimNamesSymbol, Restabs_names_yr);
-			// Initialize to 0; allocMatrix does not initialize
-			for (k = 0; k < yr_nrow * (Restabs_columns + 1); k++)
-        REAL(Restabs_yr)[k] = 0.;
-			SET_SLOT(swOutput_KEY_ESTABL, install("Year"), Restabs_yr);
-			UNPROTECT(3);
-		}
-		PROTECT(r_ESTABL_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_ESTABL_COLUMNS)[0]=Restabs_columns;
-		SET_SLOT(swOutput_KEY_ESTABL, install("Columns"), r_ESTABL_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[31]), swOutput_KEY_ESTABL);
-		UNPROTECT(3);
-	}
-
-	// Establish co2effects as an output to Rsoilwat
-	if (use[28]) {
-		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[28]);
-
-		// Construct the co2effects output key with title and time step
-		PROTECT(swOutput_KEY_CO2EFFECTS = NEW_OBJECT(swOutput_KEY));
-		PROTECT(r_CO2EFFECTS_NAME = NEW_STRING(1));
-		SET_STRING_ELT(r_CO2EFFECTS_NAME, 0, mkChar(cSWoutput_KEY_Titles[28]));
-		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Title"), r_CO2EFFECTS_NAME);
-
-		// Construct the time step for the output key
-		PROTECT(r_CO2EFFECTS_PERIOD = NEW_INTEGER(1));
-		INTEGER(r_CO2EFFECTS_PERIOD)[0] = 2;
-		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("TimeStep"), r_CO2EFFECTS_PERIOD);
-
-		/* Construct the monthly output structure */
-		PROTECT(Rco2effects_mo = allocMatrix(REALSXP, mo_nrow, Rco2effects_columns + 2));
-		PROTECT(Rco2effects_names_mo = allocVector(VECSXP, 2));
-		PROTECT(Rco2effects_names_y_mo = allocVector(STRSXP, Rco2effects_columns + 2));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 0, mkChar("Year"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 1, mkChar("Month"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 2, mkChar("GrassBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 3, mkChar("ShrubBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 4, mkChar("TreeBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 5, mkChar("ForbBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 6, mkChar("TotalBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 7, mkChar("GrassBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 8, mkChar("ShrubBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 9, mkChar("TreeBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 10, mkChar("ForbBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 11, mkChar("TotalBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 12, mkChar("BiomassMultiplier"));
-		SET_STRING_ELT(Rco2effects_names_y_mo, 13, mkChar("WUEMultiplier"));
-		SET_VECTOR_ELT(Rco2effects_names_mo, 1, Rco2effects_names_y_mo);
-		// Initialize to 0; allocMatrix does not initialize
-		for (k = 0; k < mo_nrow * (Rco2effects_columns + 2); k++)
-			REAL(Rco2effects_mo)[k] = 0.;
-		setAttrib(Rco2effects_mo, R_DimNamesSymbol, Rco2effects_names_mo);
-		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Month"), Rco2effects_mo);
-		
-		/* Construct the yearly output structure */
-		PROTECT(Rco2effects_yr = allocMatrix(REALSXP, yr_nrow, Rco2effects_columns + 1));
-		PROTECT(Rco2effects_names_yr = allocVector(VECSXP, 2));
-		PROTECT(Rco2effects_names_y_yr = allocVector(STRSXP, Rco2effects_columns + 1));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 0, mkChar("Year"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 1, mkChar("GrassBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 2, mkChar("ShrubBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 3, mkChar("TreeBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 4, mkChar("ForbBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 5, mkChar("TotalBiomass"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 6, mkChar("GrassBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 7, mkChar("ShrubBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 8, mkChar("TreeBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 9, mkChar("ForbBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 10, mkChar("TotalBiolive"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 11, mkChar("BiomassMultiplier"));
-		SET_STRING_ELT(Rco2effects_names_y_yr, 12, mkChar("WUEMultiplier"));
-		SET_VECTOR_ELT(Rco2effects_names_yr, 1, Rco2effects_names_y_yr);
-		// Initialize to 0; allocMatrix does not initialize
-		for (k = 0; k < yr_nrow * (Rco2effects_columns + 1); k++)
-		  REAL(Rco2effects_yr)[k] = 0.;
-		setAttrib(Rco2effects_yr, R_DimNamesSymbol, Rco2effects_names_yr);
-		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Year"), Rco2effects_yr);
-
-		// Add co2effects to the output class
-		PROTECT(r_CO2EFFECTS_COLUMNS = NEW_INTEGER(1));
-		INTEGER(r_CO2EFFECTS_COLUMNS)[0] = Rco2effects_columns;
-		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Columns"), r_CO2EFFECTS_COLUMNS);
-		SET_SLOT(swOutput_Object, install(cSWoutput_Names[32]), swOutput_KEY_CO2EFFECTS);
-
-		// Free protected data as they are no longer needed
-		UNPROTECT(10);
-	}
-
-
-	UNPROTECT(pCount);
-	return swOutput_Object;
-}
-
-#endif
+/*
+ * SW_R_lib.c
+ *
+ *  Created on: Jun 25, 2013
+ *      Author: Ryan Murphy
+ */
+//#define RSOILWAT
+#ifdef RSOILWAT
+
+#include "SW_R_lib.h"
+#include "SW_Files.h"
+#include "SW_Carbon.h"
+
+/* =================================================== */
+/*                  Global Declarations                */
+/* external by other routines elsewhere in the program */
+/* --------------------------------------------------- */
+
+int logNote = 1;
+int logWarn = 1;
+int logFatl = 1;
+int RlogIndex;
+SEXP Rlogfile;
+SEXP InputData;
+SEXP WeatherList;
+Bool useFiles;
+Bool collectInData;
+Bool bWeatherList;
+
+int *p_yr, *p_mo, *p_wk, *p_dy;
+RealD *p_Raet_yr, *p_Rdeep_drain_yr, *p_Restabs_yr, *p_Revap_soil_yr, *p_Revap_surface_yr, *p_Rhydred_yr, *p_Rinfiltration_yr, *p_Rinterception_yr, *p_Rpercolation_yr,
+		*p_Rpet_yr, *p_Rprecip_yr, *p_Rrunoff_yr, *p_Rsnowpack_yr, *p_Rsoil_temp_yr, *p_Rsurface_water_yr, *p_RvwcBulk_yr, *p_RvwcMatric_yr, *p_RswcBulk_yr, *p_RswpMatric_yr,
+		*p_RswaBulk_yr, *p_RswaMatric_yr, *p_Rtemp_yr, *p_Rtransp_yr, *p_Rwetdays_yr, *p_Rco2effects_yr;
+RealD *p_Raet_mo, *p_Rdeep_drain_mo, *p_Restabs_mo, *p_Revap_soil_mo, *p_Revap_surface_mo, *p_Rhydred_mo, *p_Rinfiltration_mo, *p_Rinterception_mo, *p_Rpercolation_mo,
+		*p_Rpet_mo, *p_Rprecip_mo, *p_Rrunoff_mo, *p_Rsnowpack_mo, *p_Rsoil_temp_mo, *p_Rsurface_water_mo, *p_RvwcBulk_mo, *p_RvwcMatric_mo, *p_RswcBulk_mo, *p_RswpMatric_mo,
+		*p_RswaBulk_mo, *p_RswaMatric_mo, *p_Rtemp_mo, *p_Rtransp_mo, *p_Rwetdays_mo, *p_Rco2effects_mo;
+RealD *p_Raet_wk, *p_Rdeep_drain_wk, *p_Restabs_wk, *p_Revap_soil_wk, *p_Revap_surface_wk, *p_Rhydred_wk, *p_Rinfiltration_wk, *p_Rinterception_wk, *p_Rpercolation_wk,
+		*p_Rpet_wk, *p_Rprecip_wk, *p_Rrunoff_wk, *p_Rsnowpack_wk, *p_Rsoil_temp_wk, *p_Rsurface_water_wk, *p_RvwcBulk_wk, *p_RvwcMatric_wk, *p_RswcBulk_wk, *p_RswpMatric_wk,
+		*p_RswaBulk_wk, *p_RswaMatric_wk, *p_Rtemp_wk, *p_Rtransp_wk, *p_Rwetdays_wk, *p_Rco2effects_wk;
+RealD *p_Raet_dy, *p_Rdeep_drain_dy, *p_Restabs_dy, *p_Revap_soil_dy, *p_Revap_surface_dy, *p_Rhydred_dy, *p_Rinfiltration_dy, *p_Rinterception_dy, *p_Rpercolation_dy,
+		*p_Rpet_dy, *p_Rprecip_dy, *p_Rrunoff_dy, *p_Rsnowpack_dy, *p_Rsoil_temp_dy, *p_Rsurface_water_dy, *p_RvwcBulk_dy, *p_RvwcMatric_dy, *p_RswcBulk_dy, *p_RswpMatric_dy,
+		*p_RswaBulk_dy, *p_RswaMatric_dy, *p_Rtemp_dy, *p_Rtransp_dy, *p_Rwetdays_dy, *p_Rco2effects_dy;
+unsigned int yr_nrow = 0, mo_nrow = 0, wk_nrow = 0, dy_nrow = 0;
+
+extern char _firstfile[1024];
+//extern int timeSteps[SW_OUTNKEYS][4];
+//extern int numPeriod;
+extern SW_MODEL SW_Model;
+//extern SW_SITE SW_Site;
+extern SW_VEGESTAB SW_VegEstab;
+static   int periodUse[29][4];
+unsigned int addtl_yr = 0; /* Used to calculate the actual year being modeled */
+
+/* =================================================== */
+/*                Module-Level Declarations            */
+/* --------------------------------------------------- */
+
+void SW_FLW_construct(void);
+
+SEXP onGetInputDataFromFiles(SEXP inputOptions) {
+	int i;
+	SEXP swInputData;
+	SEXP SW_DataList;
+	SEXP swLog;
+	SEXP oRlogfile;
+
+	logged = FALSE;
+	logfp = stdout;
+	int argc = length(inputOptions);
+	char *argv[7];
+	collectInData = TRUE;
+	PROTECT(inputOptions = AS_CHARACTER(inputOptions));
+	for (i = 0; i < argc; i++) {
+		argv[i] = R_alloc(strlen(CHAR(STRING_ELT(inputOptions, i))), sizeof(char));
+	}
+	for (i = 0; i < argc; i++) {
+		strcpy(argv[i], CHAR(STRING_ELT(inputOptions, i)));
+	}
+	//Rprintf("set Args\n");
+	PROTECT(swLog = MAKE_CLASS("swLog"));
+	PROTECT(oRlogfile = NEW_OBJECT(swLog));
+	PROTECT(Rlogfile = GET_SLOT(oRlogfile,install("LogData")));
+	//Rprintf("swLog\n");
+	init_args(argc, argv);
+	SW_F_construct(_firstfile);
+	SW_MDL_construct();
+	SW_WTH_construct();
+	SW_SIT_construct();
+	SW_VES_construct();
+	SW_VPD_construct();
+	SW_OUT_construct();
+	SW_SWC_construct();
+	SW_FLW_construct();
+	SW_CBN_construct();
+	//Rprintf("Construct\n");
+	SW_F_read(NULL);
+	//Rprintf("FilesRead\n");
+	SW_MDL_read();
+	//Rprintf("mdlRead\n");
+	SW_WTH_read();
+	//Rprintf("wthRead\n");
+	SW_VPD_read();
+	//Rprintf("vpdRead\n");
+	SW_SIT_read();
+	//Rprintf("sitRead\n");
+	SW_VES_read();
+	//Rprintf("vesRead\n");
+	SW_OUT_read();
+	//Rprintf("outRead\n");
+	SW_SWC_read();
+	//Rprintf("Read\n");
+	PROTECT(swInputData = MAKE_CLASS("swInputData"));
+	PROTECT(SW_DataList = NEW_OBJECT(swInputData));
+	SET_SLOT(SW_DataList, install("files"), onGet_SW_F());
+	//Rprintf("swFiles\n");
+	SET_SLOT(SW_DataList, install("years"), onGet_SW_MDL());
+	//Rprintf("swYears\n");
+	SET_SLOT(SW_DataList, install("weather"), onGet_SW_WTH());
+	//Rprintf("swWeather\n");
+	SET_SLOT(SW_DataList, install("cloud"), onGet_SW_SKY());
+	//Rprintf("swSky\n");
+	SET_SLOT(SW_DataList, install("weatherHistory"), onGet_WTH_DATA());
+	//Rprintf("swWeatherHistory\n");
+	if (LOGICAL(GET_SLOT(GET_SLOT(SW_DataList, install("weather")), install("use_Markov")))[0]) {
+		SET_SLOT(SW_DataList, install("markov"), onGet_MKV());
+		//Rprintf("swMarkov\n");
+	}
+	SET_SLOT(SW_DataList,install("prod"),onGet_SW_VPD());
+	//Rprintf("swProd\n");
+	SET_SLOT(SW_DataList,install("site"),onGet_SW_SIT());
+	//Rprintf("swSite\n");
+	SET_SLOT(SW_DataList,install("soils"),onGet_SW_LYR());
+	//Rprintf("swSoils\n");
+	SET_SLOT(SW_DataList,install("estab"),onGet_SW_VES());
+	//Rprintf("swEstab\n");
+	SET_SLOT(SW_DataList,install("carbon"),onGet_SW_CARBON());
+	//Rprintf("swCarbon\n");
+	SET_SLOT(SW_DataList,install("output"), onGet_SW_OUT());
+	//Rprintf("swOUT\n");
+	SET_SLOT(SW_DataList,install("swc"),onGet_SW_SWC());
+	//Rprintf("swSWC\n");
+	SET_SLOT(SW_DataList,install("log"),oRlogfile);
+
+	SW_SIT_clear_layers();
+	SW_WTH_clear_runavg_list();
+	SW_VES_clear();
+
+	UNPROTECT(6);
+	return SW_DataList;
+}
+
+SEXP start(SEXP inputOptions, SEXP inputData, SEXP weatherList) {
+	int tYears = 0, tevapLayers = 0, tVegEstabCount = 0, pYearUse = 0, pMonthUse = 0, pWeekUse = 0, pDayUse = 0;
+	int i;
+	SEXP outputData;
+
+	//Main Output
+	SEXP swLog;
+	SEXP oRlogfile;
+
+	logged = FALSE;
+	logfp = stdout;
+	int argc = length(inputOptions);
+	char *argv[7];
+	collectInData = FALSE;
+	if(isNull(inputData))
+		useFiles = TRUE;
+	else {
+		useFiles = FALSE;
+		InputData = inputData;
+	}
+	//This is used to minimize copying weather data between similiar runs.
+	if(isNull(weatherList)) {
+		bWeatherList = FALSE;
+	} else {
+		bWeatherList = TRUE;
+		WeatherList = weatherList;
+	}
+
+	PROTECT(inputOptions = AS_CHARACTER(inputOptions));
+	for (i = 0; i < argc; i++) {
+		argv[i] = R_alloc(strlen(CHAR(STRING_ELT(inputOptions, i))), sizeof(char));
+	}
+	for (i = 0; i < argc; i++) {
+		strcpy(argv[i], CHAR(STRING_ELT(inputOptions, i)));
+	}
+	RlogIndex = 0;
+	// logfile
+	PROTECT(swLog = MAKE_CLASS("swLog"));
+	PROTECT(oRlogfile = NEW_OBJECT(swLog));
+	PROTECT(Rlogfile = GET_SLOT(oRlogfile,install("LogData")));
+
+	//Set the input data either from files or from memory
+	init_args(argc, argv);
+	SW_CTL_init_model(_firstfile);
+
+	PROTECT(outputData = onGetOutput(inputData));
+
+	yr_nrow = INTEGER(GET_SLOT(outputData, install("yr_nrow")))[0];
+	mo_nrow = INTEGER(GET_SLOT(outputData, install("mo_nrow")))[0];
+	wk_nrow = INTEGER(GET_SLOT(outputData, install("wk_nrow")))[0];
+	dy_nrow = INTEGER(GET_SLOT(outputData, install("dy_nrow")))[0];
+
+	// Get the pointers to the pre configured output data setup. These are used in output.c
+	if(periodUse[eSW_CO2Effects][3]) p_Rco2effects_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("CO2EFFECTS")), install("Year")));
+	if(periodUse[eSW_CO2Effects][2]) p_Rco2effects_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("CO2EFFECTS")), install("Month")));
+	if(periodUse[eSW_CO2Effects][1]) p_Rco2effects_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("CO2EFFECTS")), install("Week")));
+	if(periodUse[eSW_CO2Effects][0]) p_Rco2effects_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("CO2EFFECTS")), install("Day")));
+
+	if(periodUse[eSW_Temp][3]) p_Rtemp_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Year")));
+	if(periodUse[eSW_Temp][2]) p_Rtemp_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Month")));
+	if(periodUse[eSW_Temp][1]) p_Rtemp_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Week")));
+	if(periodUse[eSW_Temp][0]) p_Rtemp_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("TEMP")),install("Day")));
+
+	if(periodUse[eSW_AET][3]) p_Raet_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Year")));
+	if(periodUse[eSW_AET][2]) p_Raet_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Month")));
+	if(periodUse[eSW_AET][1]) p_Raet_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Week")));
+	if(periodUse[eSW_AET][0]) p_Raet_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("AET")),install("Day")));
+
+	if(periodUse[eSW_DeepSWC][3]) p_Rdeep_drain_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Year")));
+	if(periodUse[eSW_DeepSWC][2]) p_Rdeep_drain_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Month")));
+	if(periodUse[eSW_DeepSWC][1]) p_Rdeep_drain_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Week")));
+	if(periodUse[eSW_DeepSWC][0]) p_Rdeep_drain_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("DEEPSWC")),install("Day")));
+
+	if(periodUse[eSW_Estab][3]) p_Restabs_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Year")));
+	if(periodUse[eSW_Estab][2]) p_Restabs_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Month")));
+	if(periodUse[eSW_Estab][1]) p_Restabs_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Week")));
+	if(periodUse[eSW_Estab][0]) p_Restabs_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("ESTABL")),install("Day")));
+
+	if(periodUse[eSW_EvapSoil][3]) p_Revap_soil_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Year")));
+	if(periodUse[eSW_EvapSoil][2]) p_Revap_soil_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Month")));
+	if(periodUse[eSW_EvapSoil][1]) p_Revap_soil_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Week")));
+	if(periodUse[eSW_EvapSoil][0]) p_Revap_soil_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSOIL")),install("Day")));
+
+	if(periodUse[eSW_EvapSurface][3]) p_Revap_surface_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Year")));
+	if(periodUse[eSW_EvapSurface][2]) p_Revap_surface_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Month")));
+	if(periodUse[eSW_EvapSurface][1]) p_Revap_surface_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Week")));
+	if(periodUse[eSW_EvapSurface][0]) p_Revap_surface_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("EVAPSURFACE")),install("Day")));
+
+	if(periodUse[eSW_HydRed][3]) p_Rhydred_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Year")));
+	if(periodUse[eSW_HydRed][2]) p_Rhydred_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Month")));
+	if(periodUse[eSW_HydRed][1]) p_Rhydred_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Week")));
+	if(periodUse[eSW_HydRed][0]) p_Rhydred_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("HYDRED")),install("Day")));
+
+	if(periodUse[eSW_SoilInf][3]) p_Rinfiltration_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Year")));
+	if(periodUse[eSW_SoilInf][2]) p_Rinfiltration_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Month")));
+	if(periodUse[eSW_SoilInf][1]) p_Rinfiltration_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Week")));
+	if(periodUse[eSW_SoilInf][0]) p_Rinfiltration_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILINFILT")),install("Day")));
+
+	if(periodUse[eSW_Interception][3]) p_Rinterception_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Year")));
+	if(periodUse[eSW_Interception][2]) p_Rinterception_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Month")));
+	if(periodUse[eSW_Interception][1]) p_Rinterception_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Week")));
+	if(periodUse[eSW_Interception][0]) p_Rinterception_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("INTERCEPTION")),install("Day")));
+
+	if(periodUse[eSW_LyrDrain][3]) p_Rpercolation_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Year")));
+	if(periodUse[eSW_LyrDrain][2]) p_Rpercolation_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Month")));
+	if(periodUse[eSW_LyrDrain][1]) p_Rpercolation_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Week")));
+	if(periodUse[eSW_LyrDrain][0]) p_Rpercolation_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("LYRDRAIN")),install("Day")));
+
+	if(periodUse[eSW_PET][3]) p_Rpet_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Year")));
+	if(periodUse[eSW_PET][2]) p_Rpet_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Month")));
+	if(periodUse[eSW_PET][1]) p_Rpet_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Week")));
+	if(periodUse[eSW_PET][0]) p_Rpet_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("PET")),install("Day")));
+
+	if(periodUse[eSW_Precip][3]) p_Rprecip_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Year")));
+	if(periodUse[eSW_Precip][2]) p_Rprecip_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Month")));
+	if(periodUse[eSW_Precip][1]) p_Rprecip_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Week")));
+	if(periodUse[eSW_Precip][0]) p_Rprecip_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("PRECIP")),install("Day")));
+
+	if(periodUse[eSW_Runoff][3]) p_Rrunoff_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Year")));
+	if(periodUse[eSW_Runoff][2]) p_Rrunoff_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Month")));
+	if(periodUse[eSW_Runoff][1]) p_Rrunoff_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Week")));
+	if(periodUse[eSW_Runoff][0]) p_Rrunoff_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("RUNOFF")),install("Day")));
+
+	if(periodUse[eSW_SnowPack][3]) p_Rsnowpack_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Year")));
+	if(periodUse[eSW_SnowPack][2]) p_Rsnowpack_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Month")));
+	if(periodUse[eSW_SnowPack][1]) p_Rsnowpack_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Week")));
+	if(periodUse[eSW_SnowPack][0]) p_Rsnowpack_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SNOWPACK")),install("Day")));
+
+	if(periodUse[eSW_SoilTemp][3]) p_Rsoil_temp_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Year")));
+	if(periodUse[eSW_SoilTemp][2]) p_Rsoil_temp_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Month")));
+	if(periodUse[eSW_SoilTemp][1]) p_Rsoil_temp_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Week")));
+	if(periodUse[eSW_SoilTemp][0]) p_Rsoil_temp_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SOILTEMP")),install("Day")));
+
+	if(periodUse[eSW_SurfaceWater][3]) p_Rsurface_water_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Year")));
+	if(periodUse[eSW_SurfaceWater][2]) p_Rsurface_water_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Month")));
+	if(periodUse[eSW_SurfaceWater][1]) p_Rsurface_water_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Week")));
+	if(periodUse[eSW_SurfaceWater][0]) p_Rsurface_water_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SURFACEWATER")),install("Day")));
+
+	if(periodUse[eSW_VWCBulk][3]) p_RvwcBulk_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Year")));
+	if(periodUse[eSW_VWCBulk][2]) p_RvwcBulk_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Month")));
+	if(periodUse[eSW_VWCBulk][1]) p_RvwcBulk_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Week")));
+	if(periodUse[eSW_VWCBulk][0]) p_RvwcBulk_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCBULK")),install("Day")));
+
+	if(periodUse[eSW_VWCMatric][3]) p_RvwcMatric_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Year")));
+	if(periodUse[eSW_VWCMatric][2]) p_RvwcMatric_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Month")));
+	if(periodUse[eSW_VWCMatric][1]) p_RvwcMatric_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Week")));
+	if(periodUse[eSW_VWCMatric][0]) p_RvwcMatric_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("VWCMATRIC")),install("Day")));
+
+	if(periodUse[eSW_SWCBulk][3]) p_RswcBulk_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Year")));
+	if(periodUse[eSW_SWCBulk][2]) p_RswcBulk_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Month")));
+	if(periodUse[eSW_SWCBulk][1]) p_RswcBulk_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Week")));
+	if(periodUse[eSW_SWCBulk][0]) p_RswcBulk_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWCBULK")),install("Day")));
+
+	if(periodUse[eSW_SWPMatric][3]) p_RswpMatric_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Year")));
+	if(periodUse[eSW_SWPMatric][2]) p_RswpMatric_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Month")));
+	if(periodUse[eSW_SWPMatric][1]) p_RswpMatric_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Week")));
+	if(periodUse[eSW_SWPMatric][0]) p_RswpMatric_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWPMATRIC")),install("Day")));
+
+	if(periodUse[eSW_SWABulk][3]) p_RswaBulk_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Year")));
+	if(periodUse[eSW_SWABulk][2]) p_RswaBulk_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Month")));
+	if(periodUse[eSW_SWABulk][1]) p_RswaBulk_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Week")));
+	if(periodUse[eSW_SWABulk][0]) p_RswaBulk_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWABULK")),install("Day")));
+
+	if(periodUse[eSW_SWAMatric][3]) p_RswaMatric_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Year")));
+	if(periodUse[eSW_SWAMatric][2]) p_RswaMatric_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Month")));
+	if(periodUse[eSW_SWAMatric][1]) p_RswaMatric_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Week")));
+	if(periodUse[eSW_SWAMatric][0]) p_RswaMatric_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("SWAMATRIC")),install("Day")));
+
+	if(periodUse[eSW_Transp][3]) p_Rtransp_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Year")));
+	if(periodUse[eSW_Transp][2]) p_Rtransp_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Month")));
+	if(periodUse[eSW_Transp][1]) p_Rtransp_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Week")));
+	if(periodUse[eSW_Transp][0]) p_Rtransp_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("TRANSP")),install("Day")));
+
+	if(periodUse[eSW_WetDays][3]) p_Rwetdays_yr = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Year")));
+	if(periodUse[eSW_WetDays][2]) p_Rwetdays_mo = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Month")));
+	if(periodUse[eSW_WetDays][1]) p_Rwetdays_wk = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Week")));
+	if(periodUse[eSW_WetDays][0]) p_Rwetdays_dy = REAL(GET_SLOT(GET_SLOT(outputData, install("WETDAY")),install("Day")));
+
+	//Rprintf("Day Pointers Set\n");
+	SW_CTL_main();
+
+	SW_SIT_clear_layers();
+	SW_WTH_clear_runavg_list();
+	SW_VES_clear();
+
+	UNPROTECT(5);
+
+	return(outputData);
+}
+
+/* Experience has shown that generating the Output Data structure in R is slow compared to C
+ * This will generate the OUTPUT data Structure and Names*/
+SEXP onGetOutput(SEXP inputData) {
+	int debug = 0;
+
+	int tLayers=0, tYears = 0, tevapLayers = 0, tVegEstabCount = 0, pYearUse = 0, pMonthUse = 0, pWeekUse = 0, pDayUse = 0;
+	unsigned int Raet_columns, Rdeedrain_columns, Restabs_columns, Revasoil_columns, Revasurface_columns, Rhydred_columns, Rinfiltration_columns, Rinterception_columns, Rpercolation_columns,
+					Rpet_columns, Rprecip_columns, Rrunoff_columns, Rsnowpack_columns, Rsoil_temp_columns, Rsurface_water_columns, RvwcBulk_columns, RvwcMatric_columns, RswcBulk_columns, RswpMatric_columns, RswaBulk_columns,
+					RswaMatric_columns, Rtemp_columns, Rtransp_columns, Rwetdays_columns, Rco2effects_columns, /*NOT USED ->*/ Rwthr_columns,RallH2O_columns,Ret_columns,Rallveg_columns;
+	int i,j, k, pCount=0;
+	int use[29];
+	Bool useTimeStep;
+
+	SEXP swOutput, swOutput_Object;
+	char *cSWoutput_Names[] = {"yr_nrow","mo_nrow","wk_nrow","dy_nrow","WTHR","TEMP","PRECIP","SOILINFILT","RUNOFF","ALLH2O","VWCBULK","VWCMATRIC","SWCBULK","SWABULK","SWAMATRIC","SWPMATRIC","SURFACEWATER",
+	                           "TRANSP","EVAPSOIL","EVAPSURFACE","INTERCEPTION","LYRDRAIN","HYDRED","ET","AET","PET","WETDAY","SNOWPACK","DEEPSWC","SOILTEMP","ALLVEG","ESTABL", "CO2EFFECTS"};
+
+	SEXP swOutput_KEY;
+	char *cSWoutput_KEY_Names[] = {"Title","TimeStep","Columns","Day","Week","Month","Year"};
+	SEXP swOutput_KEY_WTHR, swOutput_KEY_TEMP, swOutput_KEY_PRECIP, swOutput_KEY_SOILINFILT, swOutput_KEY_RUNOFF, swOutput_KEY_ALLH2O, swOutput_KEY_VWCBULK, swOutput_KEY_VWCMATRIC, swOutput_KEY_SWCBULK,
+		swOutput_KEY_SWPMATRIC, swOutput_KEY_SWABULK, swOutput_KEY_SWAMATRIC, swOutput_KEY_SURFACEWATER, swOutput_KEY_TRANSP, swOutput_KEY_EVAPSOIL, swOutput_KEY_EVAPSURFACE, swOutput_KEY_INTERCEPTION,
+		swOutput_KEY_LYRDRAIN, swOutput_KEY_HYDRED, swOutput_KEY_ET, swOutput_KEY_AET, swOutput_KEY_PET, swOutput_KEY_WETDAY, swOutput_KEY_SNOWPACK, swOutput_KEY_DEEPSWC,
+		swOutput_KEY_SOILTEMP, swOutput_KEY_ALLVEG, swOutput_KEY_ESTABL, swOutput_KEY_CO2EFFECTS;
+	char *cSWoutput_KEY_Titles[] = {"","temp_air","precip","infiltration","runoff","","vwc_bulk","vwc_matric","swc_bulk","swa_bulk","swa_matric","swp_matric","surface_water","transp","evap_soil","evap_surface",
+		"interception","percolation","hydred","","aet","pet","wetdays","snowpack","deep_drain","temp_soil","","estabs", "co2_effects"};
+
+	SEXP Periods, TimeSteps;
+	SEXP r_dy_nrow, r_wk_nrow, r_mo_nrow, r_yr_nrow;
+	SEXP r_WTHR_NAME, r_TEMP_NAME, r_PRECIP_NAME, r_SOILINFILT_NAME, r_RUNOFF_NAME, r_ALLH2O_NAME, r_VWCBULK_NAME, r_VWCMATRIC_NAME, r_SWCBULK_NAME, r_SWPMATRIC_NAME, r_SWABULK_NAME, r_SWAMATRIC_NAME, r_SURFACEWATER_NAME, r_TRANSP_NAME, r_EVAPSOIL_NAME, r_EVAPSURFACE_NAME, r_INTERCEPTION_NAME, r_LYRDRAIN_NAME, r_HYDRED_NAME, r_ET_NAME, r_AET_NAME, r_PET_NAME, r_WETDAY_NAME, r_SNOWPACK_NAME, r_DEEPSWC_NAME, r_SOILTEMP_NAME, r_ALLVEG_NAME, r_ESTABL_NAME, r_CO2EFFECTS_NAME;
+	SEXP r_WTHR_PERIOD, r_TEMP_PERIOD, r_PRECIP_PERIOD, r_SOILINFILT_PERIOD, r_RUNOFF_PERIOD, r_ALLH2O_PERIOD, r_VWCBULK_PERIOD, r_VWCMATRIC_PERIOD, r_SWCBULK_PERIOD, r_SWPMATRIC_PERIOD, r_SWABULK_PERIOD, r_SWAMATRIC_PERIOD, r_SURFACEWATER_PERIOD, r_TRANSP_PERIOD, r_EVAPSOIL_PERIOD, r_EVAPSURFACE_PERIOD, r_INTERCEPTION_PERIOD, r_LYRDRAIN_PERIOD, r_HYDRED_PERIOD, r_ET_PERIOD, r_AET_PERIOD, r_PET_PERIOD, r_WETDAY_PERIOD, r_SNOWPACK_PERIOD, r_DEEPSWC_PERIOD, r_SOILTEMP_PERIOD, r_ALLVEG_PERIOD, r_ESTABL_PERIOD, r_CO2EFFECTS_PERIOD;
+	SEXP r_WTHR_COLUMNS, r_TEMP_COLUMNS, r_PRECIP_COLUMNS, r_SOILINFILT_COLUMNS, r_RUNOFF_COLUMNS, r_ALLH2O_COLUMNS, r_VWCBULK_COLUMNS, r_VWCMATRIC_COLUMNS, r_SWCBULK_COLUMNS, r_SWPMATRIC_COLUMNS, r_SWABULK_COLUMNS, r_SWAMATRIC_COLUMNS, r_SURFACEWATER_COLUMNS, r_TRANSP_COLUMNS, r_EVAPSOIL_COLUMNS, r_EVAPSURFACE_COLUMNS, r_INTERCEPTION_COLUMNS, r_LYRDRAIN_COLUMNS, r_HYDRED_COLUMNS, r_ET_COLUMNS, r_AET_COLUMNS, r_PET_COLUMNS, r_WETDAY_COLUMNS, r_SNOWPACK_COLUMNS, r_DEEPSWC_COLUMNS, r_SOILTEMP_COLUMNS, r_ALLVEG_COLUMNS, r_ESTABL_COLUMNS, r_CO2EFFECTS_COLUMNS;
+
+	SEXP Rallveg_yr, Ret_yr, RallH2O_yr, Rwthr_yr, Raet_yr, Rdeedrain_yr, Restabs_yr, Revasoil_yr, Revasurface_yr, Rhydred_yr, Rinfiltration_yr, Rinterception_yr, Rpercolation_yr,
+			Rpet_yr, Rprecip_yr, Rrunoff_yr, Rsnowpack_yr, Rsoil_temp_yr, Rsurface_water_yr, RvwcBulk_yr, RvwcMatric_yr, RswcBulk_yr, RswpMatric_yr,
+			RswaBulk_yr, RswaMatric_yr, Rtemp_yr, Rtransp_yr, Rwetdays_yr, Rco2effects_yr;
+	SEXP Rallveg_mo, Ret_mo, RallH2O_mo, Rwthr_mo, Raet_mo, Rdeedrain_mo, Restabs_mo, Revasoil_mo, Revasurface_mo, Rhydred_mo, Rinfiltration_mo, Rinterception_mo, Rpercolation_mo,
+			Rpet_mo, Rprecip_mo, Rrunoff_mo, Rsnowpack_mo, Rsoil_temp_mo, Rsurface_water_mo, RvwcBulk_mo, RvwcMatric_mo, RswcBulk_mo, RswpMatric_mo,
+			RswaBulk_mo, RswaMatric_mo, Rtemp_mo, Rtransp_mo, Rwetdays_mo, Rco2effects_mo;
+	SEXP Rallveg_wk, Ret_wk, RallH2O_wk, Rwthr_wk, Raet_wk, Rdeedrain_wk, Restabs_wk, Revasoil_wk, Revasurface_wk, Rhydred_wk, Rinfiltration_wk, Rinterception_wk, Rpercolation_wk,
+			Rpet_wk, Rprecip_wk, Rrunoff_wk, Rsnowpack_wk, Rsoil_temp_wk, Rsurface_water_wk, RvwcBulk_wk, RvwcMatric_wk, RswcBulk_wk, RswpMatric_wk,
+			RswaBulk_wk, RswaMatric_wk, Rtemp_wk, Rtransp_wk, Rwetdays_wk, Rco2effects_wk;
+	SEXP Rallveg_dy, Ret_dy, RallH2O_dy, Rwthr_dy, Raet_dy, Rdeedrain_dy, Restabs_dy, Revasoil_dy, Revasurface_dy, Rhydred_dy, Rinfiltration_dy, Rinterception_dy, Rpercolation_dy,
+			Rpet_dy, Rprecip_dy, Rrunoff_dy, Rsnowpack_dy, Rsoil_temp_dy, Rsurface_water_dy, RvwcBulk_dy, RvwcMatric_dy, RswcBulk_dy, RswpMatric_dy,
+			RswaBulk_dy, RswaMatric_dy, Rtemp_dy, Rtransp_dy, Rwetdays_dy, Rco2effects_dy;
+
+	/************ NAMES ****************/
+	SEXP Ret_names_yr, Ret_names_y_yr, Raet_names_yr, Raet_names_y_yr, Rdeep_drain_names_yr, Rdeep_drain_names_y_yr, Restabs_names_yr, Restabs_names_y_yr, Revap_soil_names_yr, Revap_soil_names_y_yr,
+	Revap_surface_names_yr, Revap_surface_names_y_yr, Rhydred_names_yr, Rhydred_names_y_yr, Rinfiltration_names_yr, Rinfiltration_names_y_yr, Rinterception_names_yr,
+	Rinterception_names_y_yr, Rpercolation_names_yr, Rpercolation_names_y_yr, Rpet_names_yr, Rpet_names_y_yr, Rprecip_names_yr, Rprecip_names_y_yr, Rrunoff_names_yr,
+	Rrunoff_names_y_yr, Rsnowpack_names_yr, Rsnowpack_names_y_yr, Rsoil_temp_names_yr, Rsoil_temp_names_y_yr, Rsurface_water_names_yr, Rsurface_water_names_y_yr,
+	Rsw_pot_names_yr, Rsw_pot_names_y_yr, RswaBulk_names_yr, RswaBulk_names_y_yr, RswaMatric_names_yr, RswaMatric_names_y_yr, RswcBulk_names_yr, RswcBulk_names_y_yr, Rtemp_names_yr, Rtemp_names_y_yr, Rtransp_names_yr,
+	Rtransp_names_y_yr, RvwcBulk_names_yr, RvwcBulk_names_y_yr, RvwcMatric_names_yr, RvwcMatric_names_y_yr, Rwetdays_names_yr, Rwetdays_names_y_yr, RswpMatric_names_yr, RswpMatric_names_y_yr,
+	Rco2effects_names_y_yr, Rco2effects_names_yr;
+
+	SEXP Ret_names_mo, Ret_names_y_mo, Raet_names_mo, Raet_names_y_mo, Rdeep_drain_names_mo, Rdeep_drain_names_y_mo, Restabs_names_mo, Restabs_names_y_mo, Revap_soil_names_mo, Revap_soil_names_y_mo,
+	Revap_surface_names_mo, Revap_surface_names_y_mo, Rhydred_names_mo, Rhydred_names_y_mo, Rinfiltration_names_mo, Rinfiltration_names_y_mo, Rinterception_names_mo,
+	Rinterception_names_y_mo, Rpercolation_names_mo, Rpercolation_names_y_mo, Rpet_names_mo, Rpet_names_y_mo, Rprecip_names_mo, Rprecip_names_y_mo, Rrunoff_names_mo,
+	Rrunoff_names_y_mo, Rsnowpack_names_mo, Rsnowpack_names_y_mo, Rsoil_temp_names_mo, Rsoil_temp_names_y_mo, Rsurface_water_names_mo, Rsurface_water_names_y_mo,
+	Rsw_pot_names_mo, Rsw_pot_names_y_mo, RswaBulk_names_mo, RswaBulk_names_y_mo, RswaMatric_names_mo, RswaMatric_names_y_mo, RswcBulk_names_mo, RswcBulk_names_y_mo, Rtemp_names_mo, Rtemp_names_y_mo, Rtransp_names_mo,
+	Rtransp_names_y_mo, RvwcBulk_names_mo, RvwcBulk_names_y_mo, RvwcMatric_names_mo, RvwcMatric_names_y_mo, Rwetdays_names_mo, Rwetdays_names_y_mo, RswpMatric_names_mo, RswpMatric_names_y_mo,
+	Rco2effects_names_y_mo, Rco2effects_names_mo;
+
+	SEXP Ret_names_wk, Ret_names_y_wk, Raet_names_wk, Raet_names_y_wk, Rdeep_drain_names_wk, Rdeep_drain_names_y_wk, Restabs_names_wk, Restabs_names_y_wk, Revap_soil_names_wk, Revap_soil_names_y_wk,
+	Revap_surface_names_wk, Revap_surface_names_y_wk, Rhydred_names_wk, Rhydred_names_y_wk, Rinfiltration_names_wk, Rinfiltration_names_y_wk, Rinterception_names_wk,
+	Rinterception_names_y_wk, Rpercolation_names_wk, Rpercolation_names_y_wk, Rpet_names_wk, Rpet_names_y_wk, Rprecip_names_wk, Rprecip_names_y_wk, Rrunoff_names_wk,
+	Rrunoff_names_y_wk, Rsnowpack_names_wk, Rsnowpack_names_y_wk, Rsoil_temp_names_wk, Rsoil_temp_names_y_wk, Rsurface_water_names_wk, Rsurface_water_names_y_wk,
+	Rsw_pot_names_wk, Rsw_pot_names_y_wk, RswaBulk_names_wk, RswaBulk_names_y_wk, RswaMatric_names_wk, RswaMatric_names_y_wk, RswcBulk_names_wk, RswcBulk_names_y_wk, Rtemp_names_wk, Rtemp_names_y_wk, Rtransp_names_wk,
+	Rtransp_names_y_wk, RvwcBulk_names_wk, RvwcBulk_names_y_wk, RvwcMatric_names_wk, RvwcMatric_names_y_wk, Rwetdays_names_wk, Rwetdays_names_y_wk, RswpMatric_names_wk, RswpMatric_names_y_wk,
+	Rco2effects_names_y_wk, Rco2effects_names_wk;
+
+	SEXP Ret_names_dy, Ret_names_y_dy, Raet_names_dy, Raet_names_y_dy, Rdeep_drain_names_dy, Rdeep_drain_names_y_dy, Restabs_names_dy, Restabs_names_y_dy, Revap_soil_names_dy, Revap_soil_names_y_dy,
+	Revap_surface_names_dy, Revap_surface_names_y_dy, Rhydred_names_dy, Rhydred_names_y_dy, Rinfiltration_names_dy, Rinfiltration_names_y_dy, Rinterception_names_dy,
+	Rinterception_names_y_dy, Rpercolation_names_dy, Rpercolation_names_y_dy, Rpet_names_dy, Rpet_names_y_dy, Rprecip_names_dy, Rprecip_names_y_dy, Rrunoff_names_dy,
+	Rrunoff_names_y_dy, Rsnowpack_names_dy, Rsnowpack_names_y_dy, Rsoil_temp_names_dy, Rsoil_temp_names_y_dy, Rsurface_water_names_dy, Rsurface_water_names_y_dy,
+	Rsw_pot_names_dy, Rsw_pot_names_y_dy, RswaBulk_names_dy, RswaBulk_names_y_dy, RswaMatric_names_dy, RswaMatric_names_y_dy, RswcBulk_names_dy, RswcBulk_names_y_dy, Rtemp_names_dy, Rtemp_names_y_dy, Rtransp_names_dy,
+	Rtransp_names_y_dy, RvwcBulk_names_dy, RvwcBulk_names_y_dy, RvwcMatric_names_dy, RvwcMatric_names_y_dy, Rwetdays_names_dy, Rwetdays_names_y_dy, RswpMatric_names_dy, RswpMatric_names_y_dy,
+	Rco2effects_names_y_dy, Rco2effects_names_dy;
+
+	char *Layers_names[] = { "Lyr_1", "Lyr_2", "Lyr_3", "Lyr_4", "Lyr_5", "Lyr_6", "Lyr_7", "Lyr_8", "Lyr_9", "Lyr_10", "Lyr_11", "Lyr_12", "Lyr_13", "Lyr_14", "Lyr_15",
+	                         "Lyr_16", "Lyr_17", "Lyr_18", "Lyr_19", "Lyr_20", "Lyr_21", "Lyr_22", "Lyr_23", "Lyr_24", "Lyr_25", "Lyr_26", "Lyr_27", "Lyr_28", "Lyr_29", "Lyr_30" };
+	char *Cevap_surface_names[] = { "total_evap", "tree_evap", "shrub_evap","forbs_evap", "grass_evap", "litter_evap", "surfaceWater_evap" };
+	char *Chydred_names[] = { "total_", "tree_", "shrub_", "forbs_", "grass_" };
+	char *Cinterception_names[] = { "total", "tree", "shrub", "forbs", "grass", "litter" };
+	char *Cprecip_names[] = { "ppt", "rain", "snow_fall", "snowmelt", "snowloss" };
+	char *Crunoff_names[] = { "total", "ponded", "snowmelt" };
+	char *Csnowpack_names[] = { "snowpackWaterEquivalent_cm", "snowdepth_cm" };
+	char *Ctemp_names[] = { "max_C", "min_C", "avg_C","surfaceTemp_C" };
+	char *Ctransp_names[] = { "transp_total_", "transp_tree_", "transp_shrub_", "transp_forbs_", "transp_grass_" };
+	char Ctemp[50];
+	/****************************************************************************************/
+
+	tLayers = 0;
+	tevapLayers=0;
+
+	for(i=0; i<length(GET_SLOT(GET_SLOT(inputData, install("output")), install("use")));i++) {
+		use[i] = LOGICAL(GET_SLOT(GET_SLOT(inputData, install("output")), install("use")))[i];
+		//pCount+=4;
+	}
+
+	use[28] = 1; // Always have this as an output, because it also holds useful biomass data
+
+	tYears = (INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EndYear")))[0] - INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("StartYear")))[0] + 1);
+	tLayers = nrows(GET_SLOT(GET_SLOT(inputData, install("soils")), install("Layers")));
+	for(i=0; i<tLayers; i++) {
+		if(REAL(GET_SLOT(GET_SLOT(inputData, install("soils")), install("Layers")))[i + (tLayers) * 3] > 0)
+			tevapLayers++;
+	}
+
+	if(debug) Rprintf("tYears: %d, tLayers: %d, tEvapLayers: %d \n", tYears, tLayers, tevapLayers);
+
+	PROTECT(TimeSteps = GET_SLOT(GET_SLOT(inputData, install("output")),install("timePeriods")));
+	useTimeStep = LOGICAL(GET_SLOT(GET_SLOT(inputData, install("output")),install("useTimeStep")))[0];
+	if(useTimeStep) {
+		PROTECT(Periods = GET_SLOT(GET_SLOT(inputData, install("output")),install("timePeriods")));
+		for (i = 0; i < LENGTH(TimeSteps); i++) {
+			switch (INTEGER(TimeSteps)[i]) {
+				case eSW_Day:
+				pDayUse = 1;
+				break;
+				case eSW_Week:
+				pWeekUse = 1;
+				break;
+				case eSW_Month:
+				pMonthUse = 1;
+				break;
+				case eSW_Year:
+				pYearUse = 1;
+				break;
+			}
+		}
+	} else {
+		PROTECT(Periods = GET_SLOT(GET_SLOT(inputData, install("output")),install("period")));
+		for(i=0; i<29; i++) {
+			switch (INTEGER(Periods)[i]) {
+				case eSW_Day:
+				pDayUse = 1;
+				break;
+				case eSW_Week:
+				pWeekUse = 1;
+				break;
+				case eSW_Month:
+				pMonthUse = 1;
+				break;
+				case eSW_Year:
+				pYearUse = 1;
+				break;
+			}
+		}
+	}
+
+	tVegEstabCount = INTEGER(GET_SLOT(GET_SLOT(inputData, install("estab")), install("count")))[0];
+
+	//tVegEstabCount = SW_VegEstab.count;
+
+	yr_nrow = tYears * pYearUse;
+	mo_nrow = tYears * 12 * pMonthUse;
+	wk_nrow = tYears * 53 * pWeekUse;
+	if (pDayUse == 1) {
+		dy_nrow = 0;
+		for (i = INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("StartYear")))[0]; i <= INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EndYear")))[0]; i++) {
+			if(i==0) {//Need to calculate the starting first day of first year
+				dy_nrow += Time_get_lastdoy_y(i) - INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("FDOFY")))[0] + 1;
+				if(debug) Rprintf("Year: %d DAYSINYEAR: %d\n",i,Time_get_lastdoy_y(i) - INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("FDOFY")))[0] + 1);
+			} else if(i==(tYears-1)) {//and last day of last year.
+				dy_nrow += INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EDOEY")))[0];
+				if(debug) Rprintf("Year: %d DAYSINYEAR: %d\n",i,INTEGER(GET_SLOT(GET_SLOT(inputData, install("years")), install("EDOEY")))[0]);
+			} else {
+				dy_nrow += Time_get_lastdoy_y(i);
+				if(debug) Rprintf("Year: %d DAYSINYEAR: %d\n",i,Time_get_lastdoy_y(i));
+			}
+		}
+	}
+
+	if(debug) Rprintf("Year Rows: %d, Month Rows: %d, Week Rows: %d, Day Rows: %d\n",yr_nrow, mo_nrow, wk_nrow, dy_nrow);
+
+	for(i=0; i<29; i++) {
+		periodUse[i][0]=periodUse[i][1]=periodUse[i][2]=periodUse[i][3]=0;
+		if(useTimeStep) {
+			for(j=0; j<length(Periods); j++) {
+				periodUse[i][INTEGER(Periods)[j]] = 1;
+				//pCount+=3;
+			}
+		} else {
+			periodUse[i][INTEGER(Periods)[i]] = 1;
+			//pCount+=3;
+		}
+	}
+
+	// Number of Columns for outputs
+	Rwthr_columns = 0;
+	Rtemp_columns = 4;
+	Rprecip_columns = 5;
+	Rinfiltration_columns = 1;
+	Rrunoff_columns = 3;
+	RallH2O_columns = 0;
+	RvwcBulk_columns = tLayers;
+	RvwcMatric_columns = tLayers;
+	RswcBulk_columns = tLayers;
+	RswpMatric_columns = tLayers;
+	RswaBulk_columns = tLayers;
+	RswaMatric_columns = tLayers;
+	Rsurface_water_columns = 1;
+	Rtransp_columns = tLayers*5;
+	Revasoil_columns = tevapLayers;
+	Revasurface_columns = 7;
+	Rinterception_columns = 6;	// was 7
+	Rpercolation_columns = tLayers-1;
+	Rhydred_columns = tLayers*5;
+	Ret_columns = 0;
+	Raet_columns = 1;
+	Rpet_columns = 1;
+	Rwetdays_columns = tLayers;
+	Rsnowpack_columns = 2;
+	Rdeedrain_columns = 1;
+	Rsoil_temp_columns = tLayers;
+	Rallveg_columns = 0;
+	Restabs_columns = tVegEstabCount;
+	Rco2effects_columns = 18;
+	PROTECT(swOutput = MAKE_CLASS("swOutput"));
+	PROTECT(swOutput_Object = NEW_OBJECT(swOutput));
+
+	PROTECT(r_dy_nrow = allocVector(INTSXP,1));
+	INTEGER(r_dy_nrow)[0]=dy_nrow;
+	PROTECT(r_wk_nrow = allocVector(INTSXP,1));
+	INTEGER(r_wk_nrow)[0]=wk_nrow;
+	PROTECT(r_mo_nrow = allocVector(INTSXP,1));
+	INTEGER(r_mo_nrow)[0]=mo_nrow;
+	PROTECT(r_yr_nrow = allocVector(INTSXP,1));
+	INTEGER(r_yr_nrow)[0]=yr_nrow;
+
+	SET_SLOT(swOutput_Object, install(cSWoutput_Names[0]), r_yr_nrow);
+	SET_SLOT(swOutput_Object, install(cSWoutput_Names[1]), r_mo_nrow);
+	SET_SLOT(swOutput_Object, install(cSWoutput_Names[2]), r_wk_nrow);
+	SET_SLOT(swOutput_Object, install(cSWoutput_Names[3]), r_dy_nrow);
+
+//KEYS//
+	PROTECT(swOutput_KEY = MAKE_CLASS("swOutput_KEY"));
+
+	pCount+=9;
+	//WTHR - NOTUSED
+	if(use[0]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[0]);
+		PROTECT(swOutput_KEY_WTHR = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_WTHR_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_WTHR_NAME, 0, mkChar(cSWoutput_KEY_Titles[0]));
+		SET_SLOT(swOutput_KEY_WTHR, install("Title"), r_WTHR_NAME);
+		if(useTimeStep) {
+			PROTECT(r_WTHR_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++) {
+				INTEGER(r_WTHR_PERIOD)[i]=INTEGER(Periods)[i];
+			}
+			SET_SLOT(swOutput_KEY_WTHR, install("TimeStep"), r_WTHR_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_WTHR_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_WTHR_PERIOD)[0]=INTEGER(Periods)[0];
+			SET_SLOT(swOutput_KEY_WTHR, install("TimeStep"), r_WTHR_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[0][0]) {
+			PROTECT(Rwthr_dy = allocMatrix(REALSXP,dy_nrow,Rwthr_columns));
+			SET_SLOT(swOutput_KEY_WTHR, install("Day"), Rwthr_dy);
+			UNPROTECT(1);
+		}
+		if(periodUse[0][1]) {
+			PROTECT(Rwthr_wk = allocMatrix(REALSXP,wk_nrow,Rwthr_columns));
+			SET_SLOT(swOutput_KEY_WTHR, install("Week"), Rwthr_wk);
+			UNPROTECT(1);
+		}
+		if(periodUse[0][2]) {
+			PROTECT(Rwthr_mo = allocMatrix(REALSXP,mo_nrow,Rwthr_columns));
+			SET_SLOT(swOutput_KEY_WTHR, install("Month"), Rwthr_mo);
+			UNPROTECT(1);
+		}
+		if(periodUse[0][3]) {
+			PROTECT(Rwthr_yr = allocMatrix(REALSXP,yr_nrow,Rwthr_columns));
+			SET_SLOT(swOutput_KEY_WTHR, install("Year"), Rwthr_yr);
+			UNPROTECT(1);
+		}
+		PROTECT(r_WETDAY_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_WETDAY_COLUMNS)[0]=Rwthr_columns;
+		SET_SLOT(swOutput_KEY_WTHR, install("Columns"), r_WETDAY_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[4]), swOutput_KEY_WTHR);
+		UNPROTECT(3);
+	}
+	//TEMP
+	if(use[1]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[1]);
+		PROTECT(swOutput_KEY_TEMP = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_TEMP_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_TEMP_NAME, 0, mkChar(cSWoutput_KEY_Titles[1]));
+		SET_SLOT(swOutput_KEY_TEMP, install("Title"), r_TEMP_NAME);
+		if (useTimeStep) {
+			PROTECT(r_TEMP_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_TEMP_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_TEMP, install("TimeStep"), r_TEMP_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_TEMP_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_TEMP_PERIOD)[0]=INTEGER(Periods)[1];
+			SET_SLOT(swOutput_KEY_TEMP, install("TimeStep"), r_TEMP_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[1][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rtemp_dy = allocMatrix(REALSXP, dy_nrow, Rtemp_columns+2));
+			PROTECT(Rtemp_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rtemp_names_y_dy = allocVector(STRSXP, Rtemp_columns + 2));
+			SET_STRING_ELT(Rtemp_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rtemp_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Rtemp_columns; i++)
+				SET_STRING_ELT(Rtemp_names_y_dy, i + 2, mkChar(Ctemp_names[i]));
+			SET_VECTOR_ELT(Rtemp_names_dy, 1, Rtemp_names_y_dy);
+			setAttrib(Rtemp_dy, R_DimNamesSymbol, Rtemp_names_dy);
+			SET_SLOT(swOutput_KEY_TEMP, install("Day"), Rtemp_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[1][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rtemp_wk = allocMatrix(REALSXP, wk_nrow, Rtemp_columns+2));
+			PROTECT(Rtemp_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rtemp_names_y_wk = allocVector(STRSXP, Rtemp_columns + 2));
+			SET_STRING_ELT(Rtemp_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rtemp_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Rtemp_columns; i++)
+				SET_STRING_ELT(Rtemp_names_y_wk, i + 2, mkChar(Ctemp_names[i]));
+			SET_VECTOR_ELT(Rtemp_names_wk, 1, Rtemp_names_y_wk);
+			setAttrib(Rtemp_wk, R_DimNamesSymbol, Rtemp_names_wk);
+			SET_SLOT(swOutput_KEY_TEMP, install("Week"), Rtemp_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[1][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rtemp_mo = allocMatrix(REALSXP, mo_nrow, Rtemp_columns+2));
+			PROTECT(Rtemp_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rtemp_names_y_mo = allocVector(STRSXP, Rtemp_columns + 2));
+			SET_STRING_ELT(Rtemp_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rtemp_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Rtemp_columns; i++)
+				SET_STRING_ELT(Rtemp_names_y_mo, i + 2, mkChar(Ctemp_names[i]));
+			SET_VECTOR_ELT(Rtemp_names_mo, 1, Rtemp_names_y_mo);
+			setAttrib(Rtemp_mo, R_DimNamesSymbol, Rtemp_names_mo);
+			SET_SLOT(swOutput_KEY_TEMP, install("Month"), Rtemp_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[1][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rtemp_yr = allocMatrix(REALSXP, yr_nrow, Rtemp_columns+1));
+			PROTECT(Rtemp_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rtemp_names_y_yr = allocVector(STRSXP, Rtemp_columns + 1));
+			SET_STRING_ELT(Rtemp_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Rtemp_columns; i++)
+				SET_STRING_ELT(Rtemp_names_y_yr, i + 1, mkChar(Ctemp_names[i]));
+			SET_VECTOR_ELT(Rtemp_names_yr, 1, Rtemp_names_y_yr);
+			setAttrib(Rtemp_yr, R_DimNamesSymbol, Rtemp_names_yr);
+			SET_SLOT(swOutput_KEY_TEMP, install("Year"), Rtemp_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_TEMP_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_TEMP_COLUMNS)[0]=Rtemp_columns;
+		SET_SLOT(swOutput_KEY_TEMP, install("Columns"), r_TEMP_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[5]), swOutput_KEY_TEMP);
+		UNPROTECT(3);
+	}
+	//PRECIP
+	if(use[2]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[2]);
+		PROTECT(swOutput_KEY_PRECIP = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_PRECIP_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_PRECIP_NAME, 0, mkChar(cSWoutput_KEY_Titles[2]));
+		SET_SLOT(swOutput_KEY_PRECIP, install("Title"), r_PRECIP_NAME);
+		if (useTimeStep) {
+			PROTECT(r_PRECIP_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_PRECIP_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_PRECIP, install("TimeStep"), r_PRECIP_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_PRECIP_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_PRECIP_PERIOD)[0]=INTEGER(Periods)[2];
+			SET_SLOT(swOutput_KEY_PRECIP, install("TimeStep"), r_PRECIP_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[2][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rprecip_dy = allocMatrix(REALSXP, dy_nrow, Rprecip_columns+2));
+			PROTECT(Rprecip_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rprecip_names_y_dy = allocVector(STRSXP, Rprecip_columns + 2));
+			SET_STRING_ELT(Rprecip_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rprecip_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Rprecip_columns; i++)
+				SET_STRING_ELT(Rprecip_names_y_dy, i + 2, mkChar(Cprecip_names[i]));
+			SET_VECTOR_ELT(Rprecip_names_dy, 1, Rprecip_names_y_dy); //17
+			setAttrib(Rprecip_dy, R_DimNamesSymbol, Rprecip_names_dy);
+			SET_SLOT(swOutput_KEY_PRECIP, install("Day"), Rprecip_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[2][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rprecip_wk = allocMatrix(REALSXP, wk_nrow, Rprecip_columns+2));
+			PROTECT(Rprecip_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rprecip_names_y_wk = allocVector(STRSXP, Rprecip_columns + 2));
+			SET_STRING_ELT(Rprecip_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rprecip_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Rprecip_columns; i++)
+				SET_STRING_ELT(Rprecip_names_y_wk, i + 2, mkChar(Cprecip_names[i]));
+			SET_VECTOR_ELT(Rprecip_names_wk, 1, Rprecip_names_y_wk); //17
+			setAttrib(Rprecip_wk, R_DimNamesSymbol, Rprecip_names_wk);
+			SET_SLOT(swOutput_KEY_PRECIP, install("Week"), Rprecip_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[2][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rprecip_mo = allocMatrix(REALSXP, mo_nrow, Rprecip_columns+2));
+			PROTECT(Rprecip_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rprecip_names_y_mo = allocVector(STRSXP, Rprecip_columns + 2));
+			SET_STRING_ELT(Rprecip_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rprecip_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Rprecip_columns; i++)
+				SET_STRING_ELT(Rprecip_names_y_mo, i + 2, mkChar(Cprecip_names[i]));
+			SET_VECTOR_ELT(Rprecip_names_mo, 1, Rprecip_names_y_mo); //17
+			setAttrib(Rprecip_mo, R_DimNamesSymbol, Rprecip_names_mo);
+			SET_SLOT(swOutput_KEY_PRECIP, install("Month"), Rprecip_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[2][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rprecip_yr = allocMatrix(REALSXP, yr_nrow, Rprecip_columns+1));
+			PROTECT(Rprecip_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rprecip_names_y_yr = allocVector(STRSXP, Rprecip_columns + 1));
+			SET_STRING_ELT(Rprecip_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Rprecip_columns; i++)
+				SET_STRING_ELT(Rprecip_names_y_yr, i + 1, mkChar(Cprecip_names[i]));
+			SET_VECTOR_ELT(Rprecip_names_yr, 1, Rprecip_names_y_yr); //17
+			setAttrib(Rprecip_yr, R_DimNamesSymbol, Rprecip_names_yr);
+			SET_SLOT(swOutput_KEY_PRECIP, install("Year"), Rprecip_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_PRECIP_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_PRECIP_COLUMNS)[0]=Rprecip_columns;
+		SET_SLOT(swOutput_KEY_PRECIP, install("Columns"), r_PRECIP_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[6]), swOutput_KEY_PRECIP);
+		UNPROTECT(3);
+	}
+	//SoilInf
+	if(use[3]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[3]);
+		PROTECT(swOutput_KEY_SOILINFILT = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SOILINFILT_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SOILINFILT_NAME, 0, mkChar(cSWoutput_KEY_Titles[3]));
+		SET_SLOT(swOutput_KEY_SOILINFILT, install("Title"), r_SOILINFILT_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SOILINFILT_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SOILINFILT_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SOILINFILT, install("TimeStep"), r_SOILINFILT_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SOILINFILT_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SOILINFILT_PERIOD)[0]=INTEGER(Periods)[3];
+			SET_SLOT(swOutput_KEY_SOILINFILT, install("TimeStep"), r_SOILINFILT_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[3][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rinfiltration_dy = allocMatrix(REALSXP, dy_nrow, Rinfiltration_columns+2));
+			PROTECT(Rinfiltration_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rinfiltration_names_y_dy = allocVector(STRSXP, Rinfiltration_columns + 2));
+			SET_STRING_ELT(Rinfiltration_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinfiltration_names_y_dy, 1, mkChar("DOY"));
+			SET_STRING_ELT(Rinfiltration_names_y_dy, 2, mkChar("soil_inf"));
+			SET_VECTOR_ELT(Rinfiltration_names_dy, 1, Rinfiltration_names_y_dy);
+			setAttrib(Rinfiltration_dy, R_DimNamesSymbol, Rinfiltration_names_dy);
+			SET_SLOT(swOutput_KEY_SOILINFILT, install("Day"), Rinfiltration_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[3][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rinfiltration_wk = allocMatrix(REALSXP, wk_nrow, Rinfiltration_columns+2));
+			PROTECT(Rinfiltration_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rinfiltration_names_y_wk = allocVector(STRSXP, Rinfiltration_columns + 2));
+			SET_STRING_ELT(Rinfiltration_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinfiltration_names_y_wk, 1, mkChar("Week"));
+			SET_STRING_ELT(Rinfiltration_names_y_wk, 2, mkChar("soil_inf"));
+			SET_VECTOR_ELT(Rinfiltration_names_wk, 1, Rinfiltration_names_y_wk);
+			setAttrib(Rinfiltration_wk, R_DimNamesSymbol, Rinfiltration_names_wk);
+			SET_SLOT(swOutput_KEY_SOILINFILT, install("Week"), Rinfiltration_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[3][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rinfiltration_mo = allocMatrix(REALSXP, mo_nrow, Rinfiltration_columns+2));
+			PROTECT(Rinfiltration_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rinfiltration_names_y_mo = allocVector(STRSXP, Rinfiltration_columns + 2));
+			SET_STRING_ELT(Rinfiltration_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinfiltration_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Rinfiltration_names_y_mo, 2, mkChar("soil_inf"));
+			SET_VECTOR_ELT(Rinfiltration_names_mo, 1, Rinfiltration_names_y_mo);
+			setAttrib(Rinfiltration_mo, R_DimNamesSymbol, Rinfiltration_names_mo);
+			SET_SLOT(swOutput_KEY_SOILINFILT, install("Month"), Rinfiltration_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[3][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rinfiltration_yr = allocMatrix(REALSXP, yr_nrow, Rinfiltration_columns+1));
+			PROTECT(Rinfiltration_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rinfiltration_names_y_yr = allocVector(STRSXP, Rinfiltration_columns + 1));
+			SET_STRING_ELT(Rinfiltration_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinfiltration_names_y_yr, 1, mkChar("soil_inf"));
+			SET_VECTOR_ELT(Rinfiltration_names_yr, 1, Rinfiltration_names_y_yr);
+			setAttrib(Rinfiltration_yr, R_DimNamesSymbol, Rinfiltration_names_yr);
+			SET_SLOT(swOutput_KEY_SOILINFILT, install("Year"), Rinfiltration_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SOILINFILT_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SOILINFILT_COLUMNS)[0]=Rinfiltration_columns;
+		SET_SLOT(swOutput_KEY_SOILINFILT, install("Columns"), r_SOILINFILT_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[7]), swOutput_KEY_SOILINFILT);
+		UNPROTECT(3);
+	}
+	//Runoff
+	if(use[4]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[4]);
+		PROTECT(swOutput_KEY_RUNOFF = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_RUNOFF_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_RUNOFF_NAME, 0, mkChar(cSWoutput_KEY_Titles[4]));
+		SET_SLOT(swOutput_KEY_RUNOFF, install("Title"), r_RUNOFF_NAME);
+		if (useTimeStep) {
+			PROTECT(r_RUNOFF_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_RUNOFF_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_RUNOFF, install("TimeStep"), r_RUNOFF_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_RUNOFF_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_RUNOFF_PERIOD)[0]=INTEGER(Periods)[4];
+			SET_SLOT(swOutput_KEY_RUNOFF, install("TimeStep"), r_RUNOFF_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[4][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rrunoff_dy = allocMatrix(REALSXP, dy_nrow, Rrunoff_columns+2));
+			PROTECT(Rrunoff_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rrunoff_names_y_dy = allocVector(STRSXP, Rrunoff_columns + 2));
+			SET_STRING_ELT(Rrunoff_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rrunoff_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Rrunoff_columns; i++)
+				SET_STRING_ELT(Rrunoff_names_y_dy, i + 2, mkChar(Crunoff_names[i]));
+			SET_VECTOR_ELT(Rrunoff_names_dy, 1, Rrunoff_names_y_dy);
+			setAttrib(Rrunoff_dy, R_DimNamesSymbol, Rrunoff_names_dy);
+			SET_SLOT(swOutput_KEY_RUNOFF, install("Day"), Rrunoff_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[4][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rrunoff_wk = allocMatrix(REALSXP, wk_nrow, Rrunoff_columns+2));
+			PROTECT(Rrunoff_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rrunoff_names_y_wk = allocVector(STRSXP, Rrunoff_columns + 2));
+			SET_STRING_ELT(Rrunoff_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rrunoff_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Rrunoff_columns; i++)
+				SET_STRING_ELT(Rrunoff_names_y_wk, i + 2, mkChar(Crunoff_names[i]));
+			SET_VECTOR_ELT(Rrunoff_names_wk, 1, Rrunoff_names_y_wk);
+			setAttrib(Rrunoff_wk, R_DimNamesSymbol, Rrunoff_names_wk);
+			SET_SLOT(swOutput_KEY_RUNOFF, install("Week"), Rrunoff_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[4][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rrunoff_mo = allocMatrix(REALSXP, mo_nrow, Rrunoff_columns+2));
+			PROTECT(Rrunoff_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rrunoff_names_y_mo = allocVector(STRSXP, Rrunoff_columns + 2));
+			SET_STRING_ELT(Rrunoff_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rrunoff_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Rrunoff_columns; i++)
+				SET_STRING_ELT(Rrunoff_names_y_mo, i + 2, mkChar(Crunoff_names[i]));
+			SET_VECTOR_ELT(Rrunoff_names_mo, 1, Rrunoff_names_y_mo);
+			setAttrib(Rrunoff_mo, R_DimNamesSymbol, Rrunoff_names_mo);
+			SET_SLOT(swOutput_KEY_RUNOFF, install("Month"), Rrunoff_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[4][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rrunoff_yr = allocMatrix(REALSXP, yr_nrow, Rrunoff_columns+1));
+			PROTECT(Rrunoff_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rrunoff_names_y_yr = allocVector(STRSXP, Rrunoff_columns + 1));
+			SET_STRING_ELT(Rrunoff_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Rrunoff_columns; i++)
+				SET_STRING_ELT(Rrunoff_names_y_yr, i + 1, mkChar(Crunoff_names[i]));
+			SET_VECTOR_ELT(Rrunoff_names_yr, 1, Rrunoff_names_y_yr);
+			setAttrib(Rrunoff_yr, R_DimNamesSymbol, Rrunoff_names_yr);
+			SET_SLOT(swOutput_KEY_RUNOFF, install("Year"), Rrunoff_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_RUNOFF_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_RUNOFF_COLUMNS)[0]=Rrunoff_columns;
+		SET_SLOT(swOutput_KEY_RUNOFF, install("Columns"), r_RUNOFF_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[8]), swOutput_KEY_RUNOFF);
+		UNPROTECT(3);
+	}
+	//AllH2O - NOT USED
+	if(use[5]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[5]);
+		PROTECT(swOutput_KEY_ALLH2O = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_ALLH2O_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_ALLH2O_NAME, 0, mkChar(cSWoutput_KEY_Titles[5]));
+		SET_SLOT(swOutput_KEY_ALLH2O, install("Title"), r_ALLH2O_NAME);
+		if (useTimeStep) {
+			PROTECT(r_ALLH2O_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_ALLH2O_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_ALLH2O, install("TimeStep"), r_ALLH2O_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_ALLH2O_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_ALLH2O_PERIOD)[0]=INTEGER(Periods)[5];
+			SET_SLOT(swOutput_KEY_ALLH2O, install("TimeStep"), r_ALLH2O_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[5][0]) {
+			PROTECT(RallH2O_dy = allocMatrix(REALSXP, dy_nrow, RallH2O_columns+2));
+			SET_SLOT(swOutput_KEY_ALLH2O, install("Day"), RallH2O_dy);
+			UNPROTECT(1);
+		}
+		if(periodUse[5][1]) {
+			PROTECT(RallH2O_wk = allocMatrix(REALSXP, wk_nrow, RallH2O_columns+2));
+			SET_SLOT(swOutput_KEY_ALLH2O, install("Week"), RallH2O_wk);
+			UNPROTECT(1);
+		}
+		if(periodUse[5][2]) {
+			PROTECT(RallH2O_mo = allocMatrix(REALSXP, mo_nrow, RallH2O_columns+2));
+			SET_SLOT(swOutput_KEY_ALLH2O, install("Month"), RallH2O_mo);
+			UNPROTECT(1);
+		}
+		if(periodUse[5][3]) {
+			PROTECT(RallH2O_yr = allocMatrix(REALSXP, yr_nrow, RallH2O_columns+1));
+			SET_SLOT(swOutput_KEY_ALLH2O, install("Year"), RallH2O_yr);
+			UNPROTECT(1);
+		}
+		PROTECT(r_ALLH2O_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_ALLH2O_COLUMNS)[0]=RallH2O_columns;
+		SET_SLOT(swOutput_KEY_ALLH2O, install("Columns"), r_ALLH2O_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[9]), swOutput_KEY_ALLH2O);
+		UNPROTECT(3);
+	}
+	//VWCBulk
+	if(use[6]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[6]);
+		PROTECT(swOutput_KEY_VWCBULK = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_VWCBULK_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_VWCBULK_NAME, 0, mkChar(cSWoutput_KEY_Titles[6]));
+		SET_SLOT(swOutput_KEY_VWCBULK, install("Title"), r_VWCBULK_NAME);
+		if (useTimeStep) {
+			PROTECT(r_VWCBULK_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_VWCBULK_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_VWCBULK, install("TimeStep"), r_VWCBULK_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_VWCBULK_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_VWCBULK_PERIOD)[0]=INTEGER(Periods)[6];
+			SET_SLOT(swOutput_KEY_VWCBULK, install("TimeStep"), r_VWCBULK_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[6][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(RvwcBulk_dy = allocMatrix(REALSXP, dy_nrow, RvwcBulk_columns+2));
+			PROTECT(RvwcBulk_names_dy = allocVector(VECSXP, 2));
+			PROTECT(RvwcBulk_names_y_dy = allocVector(STRSXP, RvwcBulk_columns + 2));
+			SET_STRING_ELT(RvwcBulk_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(RvwcBulk_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcBulk_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcBulk_names_dy, 1, RvwcBulk_names_y_dy);
+			setAttrib(RvwcBulk_dy, R_DimNamesSymbol, RvwcBulk_names_dy);
+			SET_SLOT(swOutput_KEY_VWCBULK, install("Day"), RvwcBulk_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[6][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RvwcBulk_wk = allocMatrix(REALSXP, wk_nrow, RvwcBulk_columns+2));
+			PROTECT(RvwcBulk_names_wk = allocVector(VECSXP, 2));
+			PROTECT(RvwcBulk_names_y_wk = allocVector(STRSXP, RvwcBulk_columns + 2));
+			SET_STRING_ELT(RvwcBulk_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(RvwcBulk_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcBulk_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcBulk_names_wk, 1, RvwcBulk_names_y_wk);
+			setAttrib(RvwcBulk_wk, R_DimNamesSymbol, RvwcBulk_names_wk);
+			SET_SLOT(swOutput_KEY_VWCBULK, install("Week"), RvwcBulk_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[6][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(RvwcBulk_mo = allocMatrix(REALSXP, mo_nrow, RvwcBulk_columns+2));
+			PROTECT(RvwcBulk_names_mo = allocVector(VECSXP, 2));
+			PROTECT(RvwcBulk_names_y_mo = allocVector(STRSXP, RvwcBulk_columns + 2));
+			SET_STRING_ELT(RvwcBulk_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(RvwcBulk_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcBulk_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcBulk_names_mo, 1, RvwcBulk_names_y_mo);
+			setAttrib(RvwcBulk_mo, R_DimNamesSymbol, RvwcBulk_names_mo);
+			SET_SLOT(swOutput_KEY_VWCBULK, install("Month"), RvwcBulk_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[6][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(RvwcBulk_yr = allocMatrix(REALSXP, yr_nrow, RvwcBulk_columns+1));
+			PROTECT(RvwcBulk_names_yr = allocVector(VECSXP, 2));
+			PROTECT(RvwcBulk_names_y_yr = allocVector(STRSXP, RvwcBulk_columns + 1));
+			SET_STRING_ELT(RvwcBulk_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcBulk_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcBulk_names_yr, 1, RvwcBulk_names_y_yr);
+			setAttrib(RvwcBulk_yr, R_DimNamesSymbol, RvwcBulk_names_yr);
+			SET_SLOT(swOutput_KEY_VWCBULK, install("Year"), RvwcBulk_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_VWCBULK_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_VWCBULK_COLUMNS)[0]=RvwcBulk_columns;
+		SET_SLOT(swOutput_KEY_VWCBULK, install("Columns"), r_VWCBULK_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[10]), swOutput_KEY_VWCBULK);
+		UNPROTECT(3);
+	}
+	//VWCMatrix
+	if(use[7]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[7]);
+		PROTECT(swOutput_KEY_VWCMATRIC = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_VWCMATRIC_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_VWCMATRIC_NAME, 0, mkChar(cSWoutput_KEY_Titles[7]));
+		SET_SLOT(swOutput_KEY_VWCMATRIC, install("Title"), r_VWCMATRIC_NAME);
+		if (useTimeStep) {
+			PROTECT(r_VWCMATRIC_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_VWCMATRIC_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_VWCMATRIC, install("TimeStep"), r_VWCMATRIC_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_VWCMATRIC_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_VWCMATRIC_PERIOD)[0]=INTEGER(Periods)[7];
+			SET_SLOT(swOutput_KEY_VWCMATRIC, install("TimeStep"), r_VWCMATRIC_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[7][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(RvwcMatric_dy = allocMatrix(REALSXP, dy_nrow, RvwcMatric_columns+2));
+			PROTECT(RvwcMatric_names_dy = allocVector(VECSXP, 2));
+			PROTECT(RvwcMatric_names_y_dy = allocVector(STRSXP, RvwcMatric_columns + 2));
+			SET_STRING_ELT(RvwcMatric_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(RvwcMatric_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcMatric_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcMatric_names_dy, 1, RvwcMatric_names_y_dy);
+			setAttrib(RvwcMatric_dy, R_DimNamesSymbol, RvwcMatric_names_dy);
+			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Day"), RvwcMatric_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[7][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RvwcMatric_wk = allocMatrix(REALSXP, wk_nrow, RvwcMatric_columns+2));
+			PROTECT(RvwcMatric_names_wk = allocVector(VECSXP, 2));
+			PROTECT(RvwcMatric_names_y_wk = allocVector(STRSXP, RvwcMatric_columns + 2));
+			SET_STRING_ELT(RvwcMatric_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(RvwcMatric_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcMatric_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcMatric_names_wk, 1, RvwcMatric_names_y_wk);
+			setAttrib(RvwcMatric_wk, R_DimNamesSymbol, RvwcMatric_names_wk);
+			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Week"), RvwcMatric_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[7][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(RvwcMatric_mo = allocMatrix(REALSXP, mo_nrow, RvwcMatric_columns+2));
+			PROTECT(RvwcMatric_names_mo = allocVector(VECSXP, 2));
+			PROTECT(RvwcMatric_names_y_mo = allocVector(STRSXP, RvwcMatric_columns + 2));
+			SET_STRING_ELT(RvwcMatric_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(RvwcMatric_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcMatric_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcMatric_names_mo, 1, RvwcMatric_names_y_mo);
+			setAttrib(RvwcMatric_mo, R_DimNamesSymbol, RvwcMatric_names_mo);
+			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Month"), RvwcMatric_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[7][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(RvwcMatric_yr = allocMatrix(REALSXP, yr_nrow, RvwcMatric_columns+1));
+			PROTECT(RvwcMatric_names_yr = allocVector(VECSXP, 2));
+			PROTECT(RvwcMatric_names_y_yr = allocVector(STRSXP, RvwcMatric_columns + 1));
+			SET_STRING_ELT(RvwcMatric_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RvwcMatric_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RvwcMatric_names_yr, 1, RvwcMatric_names_y_yr);
+			setAttrib(RvwcMatric_yr, R_DimNamesSymbol, RvwcMatric_names_yr);
+			SET_SLOT(swOutput_KEY_VWCMATRIC, install("Year"), RvwcMatric_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_VWCMATRIC_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_VWCMATRIC_COLUMNS)[0]=RvwcMatric_columns;
+		SET_SLOT(swOutput_KEY_VWCMATRIC, install("Columns"), r_VWCMATRIC_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[11]), swOutput_KEY_VWCMATRIC);
+		UNPROTECT(3);
+	}
+	//SWCBulk
+	if(use[8]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[8]);
+		PROTECT(swOutput_KEY_SWCBULK = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SWCBULK_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SWCBULK_NAME, 0, mkChar(cSWoutput_KEY_Titles[8]));
+		SET_SLOT(swOutput_KEY_SWCBULK, install("Title"), r_SWCBULK_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SWCBULK_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SWCBULK_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SWCBULK, install("TimeStep"), r_SWCBULK_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SWCBULK_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SWCBULK_PERIOD)[0]=INTEGER(Periods)[8];
+			SET_SLOT(swOutput_KEY_SWCBULK, install("TimeStep"), r_SWCBULK_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[8][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(RswcBulk_dy = allocMatrix(REALSXP, dy_nrow, RswcBulk_columns+2));
+			PROTECT(RswcBulk_names_dy = allocVector(VECSXP, 2));
+			PROTECT(RswcBulk_names_y_dy = allocVector(STRSXP, RswcBulk_columns + 2));
+			SET_STRING_ELT(RswcBulk_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(RswcBulk_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswcBulk_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswcBulk_names_dy, 1, RswcBulk_names_y_dy);
+			setAttrib(RswcBulk_dy, R_DimNamesSymbol, RswcBulk_names_dy);
+			SET_SLOT(swOutput_KEY_SWCBULK, install("Day"), RswcBulk_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[8][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RswcBulk_wk = allocMatrix(REALSXP, wk_nrow, RswcBulk_columns+2));
+			PROTECT(RswcBulk_names_wk = allocVector(VECSXP, 2));
+			PROTECT(RswcBulk_names_y_wk = allocVector(STRSXP, RswcBulk_columns + 2));
+			SET_STRING_ELT(RswcBulk_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(RswcBulk_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswcBulk_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswcBulk_names_wk, 1, RswcBulk_names_y_wk);
+			setAttrib(RswcBulk_wk, R_DimNamesSymbol, RswcBulk_names_wk);
+			SET_SLOT(swOutput_KEY_SWCBULK, install("Week"), RswcBulk_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[8][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(RswcBulk_mo = allocMatrix(REALSXP, mo_nrow, RswcBulk_columns+2));
+			PROTECT(RswcBulk_names_mo = allocVector(VECSXP, 2));
+			PROTECT(RswcBulk_names_y_mo = allocVector(STRSXP, RswcBulk_columns + 2));
+			SET_STRING_ELT(RswcBulk_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(RswcBulk_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswcBulk_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswcBulk_names_mo, 1, RswcBulk_names_y_mo);
+			setAttrib(RswcBulk_mo, R_DimNamesSymbol, RswcBulk_names_mo);
+			SET_SLOT(swOutput_KEY_SWCBULK, install("Month"), RswcBulk_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[8][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(RswcBulk_yr = allocMatrix(REALSXP, yr_nrow, RswcBulk_columns+1));
+			PROTECT(RswcBulk_names_yr = allocVector(VECSXP, 2));
+			PROTECT(RswcBulk_names_y_yr = allocVector(STRSXP, RswcBulk_columns + 1));
+			SET_STRING_ELT(RswcBulk_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswcBulk_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswcBulk_names_yr, 1, RswcBulk_names_y_yr);
+			setAttrib(RswcBulk_yr, R_DimNamesSymbol, RswcBulk_names_yr);
+			SET_SLOT(swOutput_KEY_SWCBULK, install("Year"), RswcBulk_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SWCBULK_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SWCBULK_COLUMNS)[0]=RswcBulk_columns;
+		SET_SLOT(swOutput_KEY_SWCBULK, install("Columns"), r_SWCBULK_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[12]), swOutput_KEY_SWCBULK);
+		UNPROTECT(3);
+	}
+	//SWABULK
+	if(use[9]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[9]);
+		PROTECT(swOutput_KEY_SWABULK = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SWABULK_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SWABULK_NAME, 0, mkChar(cSWoutput_KEY_Titles[9]));
+		SET_SLOT(swOutput_KEY_SWABULK, install("Title"), r_SWABULK_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SWABULK_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SWABULK_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SWABULK, install("TimeStep"), r_SWABULK_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SWABULK_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SWABULK_PERIOD)[0]=INTEGER(Periods)[10];
+			SET_SLOT(swOutput_KEY_SWABULK, install("TimeStep"), r_SWABULK_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[9][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(RswaBulk_dy = allocMatrix(REALSXP, dy_nrow, RswaBulk_columns+2));
+			PROTECT(RswaBulk_names_dy = allocVector(VECSXP, 2));
+			PROTECT(RswaBulk_names_y_dy = allocVector(STRSXP, RswaBulk_columns + 2));
+			SET_STRING_ELT(RswaBulk_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(RswaBulk_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaBulk_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaBulk_names_dy, 1, RswaBulk_names_y_dy);
+			setAttrib(RswaBulk_dy, R_DimNamesSymbol, RswaBulk_names_dy);
+			SET_SLOT(swOutput_KEY_SWABULK, install("Day"), RswaBulk_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[9][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RswaBulk_wk = allocMatrix(REALSXP, wk_nrow, RswaBulk_columns+2));
+			PROTECT(RswaBulk_names_wk = allocVector(VECSXP, 2));
+			PROTECT(RswaBulk_names_y_wk = allocVector(STRSXP, RswaBulk_columns + 2));
+			SET_STRING_ELT(RswaBulk_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(RswaBulk_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaBulk_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaBulk_names_wk, 1, RswaBulk_names_y_wk);
+			setAttrib(RswaBulk_wk, R_DimNamesSymbol, RswaBulk_names_wk);
+			SET_SLOT(swOutput_KEY_SWABULK, install("Week"), RswaBulk_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[9][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(RswaBulk_mo = allocMatrix(REALSXP, mo_nrow, RswaBulk_columns+2));
+			PROTECT(RswaBulk_names_mo = allocVector(VECSXP, 2));
+			PROTECT(RswaBulk_names_y_mo = allocVector(STRSXP, RswaBulk_columns + 2));
+			SET_STRING_ELT(RswaBulk_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(RswaBulk_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaBulk_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaBulk_names_mo, 1, RswaBulk_names_y_mo);
+			setAttrib(RswaBulk_mo, R_DimNamesSymbol, RswaBulk_names_mo);
+			SET_SLOT(swOutput_KEY_SWABULK, install("Month"), RswaBulk_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[9][3]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RswaBulk_yr = allocMatrix(REALSXP, yr_nrow, RswaBulk_columns+1));
+			PROTECT(RswaBulk_names_yr = allocVector(VECSXP, 2));
+			PROTECT(RswaBulk_names_y_yr = allocVector(STRSXP, RswaBulk_columns + 1));
+			SET_STRING_ELT(RswaBulk_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaBulk_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaBulk_names_yr, 1, RswaBulk_names_y_yr);
+			setAttrib(RswaBulk_yr, R_DimNamesSymbol, RswaBulk_names_yr);
+			SET_SLOT(swOutput_KEY_SWABULK, install("Year"), RswaBulk_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SWABULK_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SWABULK_COLUMNS)[0]=RswaBulk_columns;
+		SET_SLOT(swOutput_KEY_SWABULK, install("Columns"), r_SWABULK_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[13]), swOutput_KEY_SWABULK);
+		UNPROTECT(3);
+	}
+	//SWAMATRIC
+	if(use[10]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[10]);
+		PROTECT(swOutput_KEY_SWAMATRIC = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SWAMATRIC_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SWAMATRIC_NAME, 0, mkChar(cSWoutput_KEY_Titles[10]));
+		SET_SLOT(swOutput_KEY_SWAMATRIC, install("Title"), r_SWAMATRIC_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SWAMATRIC_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SWAMATRIC_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SWAMATRIC, install("TimeStep"), r_SWAMATRIC_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SWAMATRIC_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SWAMATRIC_PERIOD)[0]=INTEGER(Periods)[11];
+			SET_SLOT(swOutput_KEY_SWAMATRIC, install("TimeStep"), r_SWAMATRIC_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[10][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(RswaMatric_dy = allocMatrix(REALSXP, dy_nrow, RswaMatric_columns+2));
+			PROTECT(RswaMatric_names_dy = allocVector(VECSXP, 2));
+			PROTECT(RswaMatric_names_y_dy = allocVector(STRSXP, RswaMatric_columns + 2));
+			SET_STRING_ELT(RswaMatric_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(RswaMatric_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaMatric_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaMatric_names_dy, 1, RswaMatric_names_y_dy);
+			setAttrib(RswaMatric_dy, R_DimNamesSymbol, RswaMatric_names_dy);
+			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Day"), RswaMatric_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[10][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RswaMatric_wk = allocMatrix(REALSXP, wk_nrow, RswaMatric_columns+2));
+			PROTECT(RswaMatric_names_wk = allocVector(VECSXP, 2));
+			PROTECT(RswaMatric_names_y_wk = allocVector(STRSXP, RswaMatric_columns + 2));
+			SET_STRING_ELT(RswaMatric_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(RswaMatric_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaMatric_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaMatric_names_wk, 1, RswaMatric_names_y_wk);
+			setAttrib(RswaMatric_wk, R_DimNamesSymbol, RswaMatric_names_wk);
+			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Week"), RswaMatric_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[10][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(RswaMatric_mo = allocMatrix(REALSXP, mo_nrow, RswaMatric_columns+2));
+			PROTECT(RswaMatric_names_mo = allocVector(VECSXP, 2));
+			PROTECT(RswaMatric_names_y_mo = allocVector(STRSXP, RswaMatric_columns + 2));
+			SET_STRING_ELT(RswaMatric_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(RswaMatric_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaMatric_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaMatric_names_mo, 1, RswaMatric_names_y_mo);
+			setAttrib(RswaMatric_mo, R_DimNamesSymbol, RswaMatric_names_mo);
+			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Month"), RswaMatric_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[10][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(RswaMatric_yr = allocMatrix(REALSXP, yr_nrow, RswaMatric_columns+1));
+			PROTECT(RswaMatric_names_yr = allocVector(VECSXP, 2));
+			PROTECT(RswaMatric_names_y_yr = allocVector(STRSXP, RswaMatric_columns + 1));
+			SET_STRING_ELT(RswaMatric_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswaMatric_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswaMatric_names_yr, 1, RswaMatric_names_y_yr);
+			setAttrib(RswaMatric_yr, R_DimNamesSymbol, RswaMatric_names_yr);
+			SET_SLOT(swOutput_KEY_SWAMATRIC, install("Year"), RswaMatric_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SWAMATRIC_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SWAMATRIC_COLUMNS)[0]=RswaMatric_columns;
+		SET_SLOT(swOutput_KEY_SWAMATRIC, install("Columns"), r_SWAMATRIC_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[14]), swOutput_KEY_SWAMATRIC);
+		UNPROTECT(3);
+	}
+	//SWP Matric
+	if(use[11]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[11]);
+		PROTECT(swOutput_KEY_SWPMATRIC = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SWPMATRIC_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SWPMATRIC_NAME, 0, mkChar(cSWoutput_KEY_Titles[11]));
+		SET_SLOT(swOutput_KEY_SWPMATRIC, install("Title"), r_SWPMATRIC_NAME);
+		if (useTimeStep) {
+			if(debug) Rprintf("\tUseTimeStep - %d\n", length(Periods));
+			PROTECT(r_SWPMATRIC_PERIOD = NEW_INTEGER(length(Periods)));
+			if(debug) Rprintf("\tr_SWPMATRIC_PERIOD - %d\n", length(r_SWPMATRIC_PERIOD));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SWPMATRIC_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SWPMATRIC, install("TimeStep"), r_SWPMATRIC_PERIOD);
+			UNPROTECT(1);
+		} else {
+			if(debug) Rprintf("\t ! UseTimeStep\n");
+			PROTECT(r_SWPMATRIC_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SWPMATRIC_PERIOD)[0]=INTEGER(Periods)[9];
+			SET_SLOT(swOutput_KEY_SWPMATRIC, install("TimeStep"), r_SWPMATRIC_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[11][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(RswpMatric_dy = allocMatrix(REALSXP, dy_nrow, RswpMatric_columns+2));
+			PROTECT(RswpMatric_names_dy = allocVector(VECSXP, 2));
+			PROTECT(RswpMatric_names_y_dy = allocVector(STRSXP, RswpMatric_columns + 2));
+			SET_STRING_ELT(RswpMatric_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(RswpMatric_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswpMatric_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswpMatric_names_dy, 1, RswpMatric_names_y_dy);
+			setAttrib(RswpMatric_dy, R_DimNamesSymbol, RswpMatric_names_dy);
+			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Day"), RswpMatric_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[11][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(RswpMatric_wk = allocMatrix(REALSXP, wk_nrow, RswpMatric_columns+2));
+			PROTECT(RswpMatric_names_wk = allocVector(VECSXP, 2));
+			PROTECT(RswpMatric_names_y_wk = allocVector(STRSXP, RswpMatric_columns + 2));
+			SET_STRING_ELT(RswpMatric_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(RswpMatric_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswpMatric_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswpMatric_names_wk, 1, RswpMatric_names_y_wk);
+			setAttrib(RswpMatric_wk, R_DimNamesSymbol, RswpMatric_names_wk);
+			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Week"), RswpMatric_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[11][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(RswpMatric_mo = allocMatrix(REALSXP, mo_nrow, RswpMatric_columns+2));
+			PROTECT(RswpMatric_names_mo = allocVector(VECSXP, 2));
+			PROTECT(RswpMatric_names_y_mo = allocVector(STRSXP, RswpMatric_columns + 2));
+			SET_STRING_ELT(RswpMatric_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(RswpMatric_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswpMatric_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswpMatric_names_mo, 1, RswpMatric_names_y_mo);
+			setAttrib(RswpMatric_mo, R_DimNamesSymbol, RswpMatric_names_mo);
+			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Month"), RswpMatric_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[11][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(RswpMatric_yr = allocMatrix(REALSXP, yr_nrow, RswpMatric_columns+1));
+			PROTECT(RswpMatric_names_yr = allocVector(VECSXP, 2));
+			PROTECT(RswpMatric_names_y_yr = allocVector(STRSXP, RswpMatric_columns + 1));
+			SET_STRING_ELT(RswpMatric_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(RswpMatric_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(RswpMatric_names_yr, 1, RswpMatric_names_y_yr);
+			setAttrib(RswpMatric_yr, R_DimNamesSymbol, RswpMatric_names_yr);
+			SET_SLOT(swOutput_KEY_SWPMATRIC, install("Year"), RswpMatric_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SWPMATRIC_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SWPMATRIC_COLUMNS)[0]=RswpMatric_columns;
+		SET_SLOT(swOutput_KEY_SWPMATRIC, install("Columns"), r_SWPMATRIC_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[15]), swOutput_KEY_SWPMATRIC);
+		UNPROTECT(3);
+	}
+	//SURFACE WATER
+	if(use[12]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[12]);
+		PROTECT(swOutput_KEY_SURFACEWATER = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SURFACEWATER_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SURFACEWATER_NAME, 0, mkChar(cSWoutput_KEY_Titles[12]));
+		SET_SLOT(swOutput_KEY_SURFACEWATER, install("Title"), r_SURFACEWATER_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SURFACEWATER_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SURFACEWATER_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SURFACEWATER, install("TimeStep"), r_SURFACEWATER_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SURFACEWATER_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SURFACEWATER_PERIOD)[0]=INTEGER(Periods)[12];
+			SET_SLOT(swOutput_KEY_SURFACEWATER, install("TimeStep"), r_SURFACEWATER_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[12][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rsurface_water_dy = allocMatrix(REALSXP, dy_nrow, Rsurface_water_columns+2));
+			PROTECT(Rsurface_water_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rsurface_water_names_y_dy = allocVector(STRSXP, Rsurface_water_columns + 2));
+			SET_STRING_ELT(Rsurface_water_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsurface_water_names_y_dy, 1, mkChar("DOY"));
+			SET_STRING_ELT(Rsurface_water_names_y_dy, 2, mkChar("surfaceWater_cm"));
+			SET_VECTOR_ELT(Rsurface_water_names_dy, 1, Rsurface_water_names_y_dy);
+			setAttrib(Rsurface_water_dy, R_DimNamesSymbol, Rsurface_water_names_dy);
+			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Day"), Rsurface_water_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[12][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rsurface_water_wk = allocMatrix(REALSXP, wk_nrow, Rsurface_water_columns+2));
+			PROTECT(Rsurface_water_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rsurface_water_names_y_wk = allocVector(STRSXP, Rsurface_water_columns + 2));
+			SET_STRING_ELT(Rsurface_water_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsurface_water_names_y_wk, 1, mkChar("Week"));
+			SET_STRING_ELT(Rsurface_water_names_y_wk, 2, mkChar("surfaceWater_cm"));
+			SET_VECTOR_ELT(Rsurface_water_names_wk, 1, Rsurface_water_names_y_wk);
+			setAttrib(Rsurface_water_wk, R_DimNamesSymbol, Rsurface_water_names_wk);
+			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Week"), Rsurface_water_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[12][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rsurface_water_mo = allocMatrix(REALSXP, mo_nrow, Rsurface_water_columns+2));
+			PROTECT(Rsurface_water_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rsurface_water_names_y_mo = allocVector(STRSXP, Rsurface_water_columns + 2));
+			SET_STRING_ELT(Rsurface_water_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsurface_water_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Rsurface_water_names_y_mo, 2, mkChar("surfaceWater_cm"));
+			SET_VECTOR_ELT(Rsurface_water_names_mo, 1, Rsurface_water_names_y_mo);
+			setAttrib(Rsurface_water_mo, R_DimNamesSymbol, Rsurface_water_names_mo);
+			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Month"), Rsurface_water_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[12][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rsurface_water_yr = allocMatrix(REALSXP, yr_nrow, Rsurface_water_columns+1));
+			PROTECT(Rsurface_water_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rsurface_water_names_y_yr = allocVector(STRSXP, Rsurface_water_columns + 1));
+			SET_STRING_ELT(Rsurface_water_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsurface_water_names_y_yr, 1, mkChar("surfaceWater_cm"));
+			SET_VECTOR_ELT(Rsurface_water_names_yr, 1, Rsurface_water_names_y_yr);
+			setAttrib(Rsurface_water_yr, R_DimNamesSymbol, Rsurface_water_names_yr);
+			SET_SLOT(swOutput_KEY_SURFACEWATER, install("Year"), Rsurface_water_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SURFACEWATER_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SURFACEWATER_COLUMNS)[0]=Rsurface_water_columns;
+		SET_SLOT(swOutput_KEY_SURFACEWATER, install("Columns"), r_SURFACEWATER_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[16]), swOutput_KEY_SURFACEWATER);
+		UNPROTECT(3);
+	}
+	//TRANSP
+	if(use[13]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[13]);
+		PROTECT(swOutput_KEY_TRANSP = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_TRANSP_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_TRANSP_NAME, 0, mkChar(cSWoutput_KEY_Titles[13]));
+		SET_SLOT(swOutput_KEY_TRANSP, install("Title"), r_TRANSP_NAME);
+		if (useTimeStep) {
+			PROTECT(r_TRANSP_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_TRANSP_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_TRANSP, install("TimeStep"), r_TRANSP_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_TRANSP_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_TRANSP_PERIOD)[0]=INTEGER(Periods)[13];
+			SET_SLOT(swOutput_KEY_TRANSP, install("TimeStep"), r_TRANSP_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[13][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rtransp_dy = allocMatrix(REALSXP, dy_nrow, Rtransp_columns+2));
+			PROTECT(Rtransp_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rtransp_names_y_dy = allocVector(STRSXP, Rtransp_columns + 2));
+			SET_STRING_ELT(Rtransp_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rtransp_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Ctransp_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rtransp_names_y_dy, (i * tLayers + j) + 2, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rtransp_names_dy, 1, Rtransp_names_y_dy);
+			setAttrib(Rtransp_dy, R_DimNamesSymbol, Rtransp_names_dy);
+			SET_SLOT(swOutput_KEY_TRANSP, install("Day"), Rtransp_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[13][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rtransp_wk = allocMatrix(REALSXP, wk_nrow, Rtransp_columns+2));
+			PROTECT(Rtransp_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rtransp_names_y_wk = allocVector(STRSXP, Rtransp_columns + 2));
+			SET_STRING_ELT(Rtransp_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rtransp_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Ctransp_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rtransp_names_y_wk, (i * tLayers + j) + 2, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rtransp_names_wk, 1, Rtransp_names_y_wk);
+			setAttrib(Rtransp_wk, R_DimNamesSymbol, Rtransp_names_wk);
+			SET_SLOT(swOutput_KEY_TRANSP, install("Week"), Rtransp_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[13][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rtransp_mo = allocMatrix(REALSXP, mo_nrow, Rtransp_columns+2));
+			PROTECT(Rtransp_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rtransp_names_y_mo = allocVector(STRSXP, Rtransp_columns + 2));
+			SET_STRING_ELT(Rtransp_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rtransp_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Ctransp_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rtransp_names_y_mo, (i * tLayers + j) + 2, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rtransp_names_mo, 1, Rtransp_names_y_mo);
+			setAttrib(Rtransp_mo, R_DimNamesSymbol, Rtransp_names_mo);
+			SET_SLOT(swOutput_KEY_TRANSP, install("Month"), Rtransp_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[13][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rtransp_yr = allocMatrix(REALSXP, yr_nrow, Rtransp_columns+1));
+			PROTECT(Rtransp_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rtransp_names_y_yr = allocVector(STRSXP, Rtransp_columns + 1));
+			SET_STRING_ELT(Rtransp_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Ctransp_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rtransp_names_y_yr, (i * tLayers + j) + 1, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rtransp_names_yr, 1, Rtransp_names_y_yr);
+			setAttrib(Rtransp_yr, R_DimNamesSymbol, Rtransp_names_yr);
+			SET_SLOT(swOutput_KEY_TRANSP, install("Year"), Rtransp_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_TRANSP_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_TRANSP_COLUMNS)[0]=Rtransp_columns;
+		SET_SLOT(swOutput_KEY_TRANSP, install("Columns"), r_TRANSP_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[17]), swOutput_KEY_TRANSP);
+		UNPROTECT(3);
+	}
+	//EVAP SOIL
+	if(use[14]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[14]);
+		PROTECT(swOutput_KEY_EVAPSOIL = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_EVAPSOIL_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_EVAPSOIL_NAME , 0, mkChar(cSWoutput_KEY_Titles[14]));
+		SET_SLOT(swOutput_KEY_EVAPSOIL, install("Title"), r_EVAPSOIL_NAME);
+		if (useTimeStep) {
+			PROTECT(r_EVAPSOIL_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_EVAPSOIL_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_EVAPSOIL, install("TimeStep"), r_EVAPSOIL_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_EVAPSOIL_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_EVAPSOIL_PERIOD)[0]=INTEGER(Periods)[14];
+			SET_SLOT(swOutput_KEY_EVAPSOIL, install("TimeStep"), r_EVAPSOIL_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[14][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Revasoil_dy = allocMatrix(REALSXP, dy_nrow, Revasoil_columns+2));
+			PROTECT(Revap_soil_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Revap_soil_names_y_dy = allocVector(STRSXP, Revasoil_columns + 2));
+			SET_STRING_ELT(Revap_soil_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Revap_soil_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Revasoil_columns; i++)
+				SET_STRING_ELT(Revap_soil_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Revap_soil_names_dy, 1, Revap_soil_names_y_dy);
+			setAttrib(Revasoil_dy, R_DimNamesSymbol, Revap_soil_names_dy);
+			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Day"), Revasoil_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[14][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Revasoil_wk = allocMatrix(REALSXP, wk_nrow, Revasoil_columns+2));
+			PROTECT(Revap_soil_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Revap_soil_names_y_wk = allocVector(STRSXP, Revasoil_columns + 2));
+			SET_STRING_ELT(Revap_soil_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Revap_soil_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Revasoil_columns; i++)
+				SET_STRING_ELT(Revap_soil_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Revap_soil_names_wk, 1, Revap_soil_names_y_wk);
+			setAttrib(Revasoil_wk, R_DimNamesSymbol, Revap_soil_names_wk);
+			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Week"), Revasoil_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[14][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Revasoil_mo = allocMatrix(REALSXP, mo_nrow, Revasoil_columns+2));
+			PROTECT(Revap_soil_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Revap_soil_names_y_mo = allocVector(STRSXP, Revasoil_columns + 2));
+			SET_STRING_ELT(Revap_soil_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Revap_soil_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Revasoil_columns; i++)
+				SET_STRING_ELT(Revap_soil_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Revap_soil_names_mo, 1, Revap_soil_names_y_mo);
+			setAttrib(Revasoil_mo, R_DimNamesSymbol, Revap_soil_names_mo);
+			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Month"), Revasoil_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[14][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Revasoil_yr = allocMatrix(REALSXP, yr_nrow, Revasoil_columns+1));
+			PROTECT(Revap_soil_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Revap_soil_names_y_yr = allocVector(STRSXP, Revasoil_columns + 1));
+			SET_STRING_ELT(Revap_soil_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Revasoil_columns; i++)
+				SET_STRING_ELT(Revap_soil_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Revap_soil_names_yr, 1, Revap_soil_names_y_yr);
+			setAttrib(Revasoil_yr, R_DimNamesSymbol, Revap_soil_names_yr);
+			SET_SLOT(swOutput_KEY_EVAPSOIL, install("Year"), Revasoil_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_EVAPSOIL_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_EVAPSOIL_COLUMNS)[0]=Revasoil_columns;
+		SET_SLOT(swOutput_KEY_EVAPSOIL, install("Columns"), r_EVAPSOIL_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[18]), swOutput_KEY_EVAPSOIL);
+		UNPROTECT(3);
+	}
+	//EVAP SURFACE
+	if(use[15]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[15]);
+		PROTECT(swOutput_KEY_EVAPSURFACE = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_EVAPSURFACE_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_EVAPSURFACE_NAME, 0, mkChar(cSWoutput_KEY_Titles[15]));
+		SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Title"), r_EVAPSURFACE_NAME);
+		if (useTimeStep) {
+			PROTECT(r_EVAPSURFACE_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_EVAPSURFACE_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("TimeStep"), r_EVAPSURFACE_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_EVAPSURFACE_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_EVAPSURFACE_PERIOD)[0]=INTEGER(Periods)[15];
+			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("TimeStep"), r_EVAPSURFACE_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[15][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Revasurface_dy = allocMatrix(REALSXP, dy_nrow, Revasurface_columns+2));
+			PROTECT(Revap_surface_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Revap_surface_names_y_dy = allocVector(STRSXP, Revasurface_columns + 2));
+			SET_STRING_ELT(Revap_surface_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Revap_surface_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Revasurface_columns; i++)
+				SET_STRING_ELT(Revap_surface_names_y_dy, i + 2, mkChar(Cevap_surface_names[i]));
+			SET_VECTOR_ELT(Revap_surface_names_dy, 1, Revap_surface_names_y_dy);
+			setAttrib(Revasurface_dy, R_DimNamesSymbol, Revap_surface_names_dy);
+			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Day"), Revasurface_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[15][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Revasurface_wk = allocMatrix(REALSXP, wk_nrow, Revasurface_columns+2));
+			PROTECT(Revap_surface_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Revap_surface_names_y_wk = allocVector(STRSXP, Revasurface_columns + 2));
+			SET_STRING_ELT(Revap_surface_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Revap_surface_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Revasurface_columns; i++)
+				SET_STRING_ELT(Revap_surface_names_y_wk, i + 2, mkChar(Cevap_surface_names[i]));
+			SET_VECTOR_ELT(Revap_surface_names_wk, 1, Revap_surface_names_y_wk);
+			setAttrib(Revasurface_wk, R_DimNamesSymbol, Revap_surface_names_wk);
+			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Week"), Revasurface_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[15][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Revasurface_mo = allocMatrix(REALSXP, mo_nrow, Revasurface_columns+2));
+			PROTECT(Revap_surface_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Revap_surface_names_y_mo = allocVector(STRSXP, Revasurface_columns + 2));
+			SET_STRING_ELT(Revap_surface_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Revap_surface_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Revasurface_columns; i++)
+				SET_STRING_ELT(Revap_surface_names_y_mo, i + 2, mkChar(Cevap_surface_names[i]));
+			SET_VECTOR_ELT(Revap_surface_names_mo, 1, Revap_surface_names_y_mo);
+			setAttrib(Revasurface_mo, R_DimNamesSymbol, Revap_surface_names_mo);
+			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Month"), Revasurface_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[15][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Revasurface_yr = allocMatrix(REALSXP, yr_nrow, Revasurface_columns+1));
+			PROTECT(Revap_surface_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Revap_surface_names_y_yr = allocVector(STRSXP, Revasurface_columns + 1));
+			SET_STRING_ELT(Revap_surface_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Revasurface_columns; i++)
+				SET_STRING_ELT(Revap_surface_names_y_yr, i + 1, mkChar(Cevap_surface_names[i]));
+			SET_VECTOR_ELT(Revap_surface_names_yr, 1, Revap_surface_names_y_yr);
+			setAttrib(Revasurface_yr, R_DimNamesSymbol, Revap_surface_names_yr);
+			SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Year"), Revasurface_yr);
+			UNPROTECT(3);
+		}
+
+		PROTECT(r_EVAPSURFACE_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_EVAPSURFACE_COLUMNS)[0]=Revasurface_columns;
+		SET_SLOT(swOutput_KEY_EVAPSURFACE, install("Columns"), r_EVAPSURFACE_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[19]), swOutput_KEY_EVAPSURFACE);
+		UNPROTECT(3);
+	}
+	//SOIL INTERCEPTION
+	if(use[16]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[16]);
+		PROTECT(swOutput_KEY_INTERCEPTION = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_INTERCEPTION_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_INTERCEPTION_NAME, 0, mkChar(cSWoutput_KEY_Titles[16]));
+		SET_SLOT(swOutput_KEY_INTERCEPTION, install("Title"), r_INTERCEPTION_NAME);
+		if (useTimeStep) {
+			PROTECT(r_INTERCEPTION_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_INTERCEPTION_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_INTERCEPTION, install("TimeStep"), r_INTERCEPTION_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_INTERCEPTION_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_INTERCEPTION_PERIOD)[0]=INTEGER(Periods)[16];
+			SET_SLOT(swOutput_KEY_INTERCEPTION, install("TimeStep"), r_INTERCEPTION_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[16][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rinterception_dy = allocMatrix(REALSXP, dy_nrow, Rinterception_columns+2));
+			PROTECT(Rinterception_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rinterception_names_y_dy = allocVector(STRSXP, Rinterception_columns + 2));
+			SET_STRING_ELT(Rinterception_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinterception_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Rinterception_columns; i++)
+				SET_STRING_ELT(Rinterception_names_y_dy, i + 2, mkChar(Cinterception_names[i]));
+			SET_VECTOR_ELT(Rinterception_names_dy, 1, Rinterception_names_y_dy);
+			setAttrib(Rinterception_dy, R_DimNamesSymbol, Rinterception_names_dy);
+			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Day"), Rinterception_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[16][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rinterception_wk = allocMatrix(REALSXP, wk_nrow, Rinterception_columns+2));
+			PROTECT(Rinterception_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rinterception_names_y_wk = allocVector(STRSXP, Rinterception_columns + 2));
+			SET_STRING_ELT(Rinterception_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinterception_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Rinterception_columns; i++)
+				SET_STRING_ELT(Rinterception_names_y_wk, i + 2, mkChar(Cinterception_names[i]));
+			SET_VECTOR_ELT(Rinterception_names_wk, 1, Rinterception_names_y_wk);
+			setAttrib(Rinterception_wk, R_DimNamesSymbol, Rinterception_names_wk);
+			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Week"), Rinterception_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[16][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rinterception_mo = allocMatrix(REALSXP, mo_nrow, Rinterception_columns+2));
+			PROTECT(Rinterception_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rinterception_names_y_mo = allocVector(STRSXP, Rinterception_columns + 2));
+			SET_STRING_ELT(Rinterception_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rinterception_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Rinterception_columns; i++)
+				SET_STRING_ELT(Rinterception_names_y_mo, i + 2, mkChar(Cinterception_names[i]));
+			SET_VECTOR_ELT(Rinterception_names_mo, 1, Rinterception_names_y_mo);
+			setAttrib(Rinterception_mo, R_DimNamesSymbol, Rinterception_names_mo);
+			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Month"), Rinterception_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[16][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rinterception_yr = allocMatrix(REALSXP, yr_nrow, Rinterception_columns+1));
+			PROTECT(Rinterception_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rinterception_names_y_yr = allocVector(STRSXP, Rinterception_columns + 1));
+			SET_STRING_ELT(Rinterception_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Rinterception_columns; i++)
+				SET_STRING_ELT(Rinterception_names_y_yr, i + 1, mkChar(Cinterception_names[i]));
+			SET_VECTOR_ELT(Rinterception_names_yr, 1, Rinterception_names_y_yr);
+			setAttrib(Rinterception_yr, R_DimNamesSymbol, Rinterception_names_yr);
+			SET_SLOT(swOutput_KEY_INTERCEPTION, install("Year"), Rinterception_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_INTERCEPTION_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_INTERCEPTION_COLUMNS)[0]=Rinterception_columns;
+		SET_SLOT(swOutput_KEY_INTERCEPTION, install("Columns"), r_INTERCEPTION_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[20]), swOutput_KEY_INTERCEPTION);
+		UNPROTECT(3);
+	}
+	//Percolation
+	if(use[17]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[17]);
+		PROTECT(swOutput_KEY_LYRDRAIN = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_LYRDRAIN_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_LYRDRAIN_NAME, 0, mkChar(cSWoutput_KEY_Titles[17]));
+		SET_SLOT(swOutput_KEY_LYRDRAIN, install("Title"), r_LYRDRAIN_NAME);
+		if (useTimeStep) {
+			PROTECT(r_LYRDRAIN_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_LYRDRAIN_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_LYRDRAIN, install("TimeStep"), r_LYRDRAIN_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_LYRDRAIN_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_LYRDRAIN_PERIOD)[0]=INTEGER(Periods)[17];
+			SET_SLOT(swOutput_KEY_LYRDRAIN, install("TimeStep"), r_LYRDRAIN_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[17][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rpercolation_dy = allocMatrix(REALSXP, dy_nrow, Rpercolation_columns+2));
+			PROTECT(Rpercolation_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rpercolation_names_y_dy = allocVector(STRSXP, Rpercolation_columns + 2));
+			SET_STRING_ELT(Rpercolation_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpercolation_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < (tLayers - 1); i++)
+				SET_STRING_ELT(Rpercolation_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rpercolation_names_dy, 1, Rpercolation_names_y_dy);
+			setAttrib(Rpercolation_dy, R_DimNamesSymbol, Rpercolation_names_dy);
+			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Day"), Rpercolation_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[17][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rpercolation_wk = allocMatrix(REALSXP, wk_nrow, Rpercolation_columns+2));
+			PROTECT(Rpercolation_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rpercolation_names_y_wk = allocVector(STRSXP, Rpercolation_columns + 2));
+			SET_STRING_ELT(Rpercolation_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpercolation_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < (tLayers - 1); i++)
+				SET_STRING_ELT(Rpercolation_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rpercolation_names_wk, 1, Rpercolation_names_y_wk);
+			setAttrib(Rpercolation_wk, R_DimNamesSymbol, Rpercolation_names_wk);
+			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Week"), Rpercolation_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[17][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rpercolation_mo = allocMatrix(REALSXP, mo_nrow, Rpercolation_columns+2));
+			PROTECT(Rpercolation_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rpercolation_names_y_mo = allocVector(STRSXP, Rpercolation_columns + 2));
+			SET_STRING_ELT(Rpercolation_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpercolation_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < (tLayers - 1); i++)
+				SET_STRING_ELT(Rpercolation_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rpercolation_names_mo, 1, Rpercolation_names_y_mo);
+			setAttrib(Rpercolation_mo, R_DimNamesSymbol, Rpercolation_names_mo);
+			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Month"), Rpercolation_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[17][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rpercolation_yr = allocMatrix(REALSXP, yr_nrow, Rpercolation_columns+1));
+			PROTECT(Rpercolation_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rpercolation_names_y_yr = allocVector(STRSXP, Rpercolation_columns + 1));
+			SET_STRING_ELT(Rpercolation_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < (tLayers - 1); i++)
+				SET_STRING_ELT(Rpercolation_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rpercolation_names_yr, 1, Rpercolation_names_y_yr);
+			setAttrib(Rpercolation_yr, R_DimNamesSymbol, Rpercolation_names_yr);
+			SET_SLOT(swOutput_KEY_LYRDRAIN, install("Year"), Rpercolation_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_LYRDRAIN_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_LYRDRAIN_COLUMNS)[0]=Rpercolation_columns;
+		SET_SLOT(swOutput_KEY_LYRDRAIN, install("Columns"), r_LYRDRAIN_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[21]), swOutput_KEY_LYRDRAIN);
+		UNPROTECT(3);
+	}
+	//Hydred
+	if(use[18]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[18]);
+		PROTECT(swOutput_KEY_HYDRED = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_HYDRED_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_HYDRED_NAME, 0, mkChar(cSWoutput_KEY_Titles[18]));
+		SET_SLOT(swOutput_KEY_HYDRED, install("Title"), r_HYDRED_NAME);
+		if (useTimeStep) {
+			PROTECT(r_HYDRED_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_HYDRED_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_HYDRED, install("TimeStep"), r_HYDRED_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_HYDRED_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_HYDRED_PERIOD)[0]=INTEGER(Periods)[18];
+			SET_SLOT(swOutput_KEY_HYDRED, install("TimeStep"), r_HYDRED_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[18][0]) {
+			if(debug) Rprintf("\tdy\n");
+			if(debug) Rprintf("\tRows dy_nrow %d Columns %d \n", dy_nrow, Rhydred_columns + 2);
+			PROTECT(Rhydred_dy = allocMatrix(REALSXP, dy_nrow, Rhydred_columns+2));
+			PROTECT(Rhydred_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rhydred_names_y_dy = allocVector(STRSXP, Rhydred_columns + 2));
+			SET_STRING_ELT(Rhydred_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rhydred_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Chydred_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rhydred_names_y_dy, (i * tLayers + j) + 2, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rhydred_names_dy, 1, Rhydred_names_y_dy);
+			setAttrib(Rhydred_dy, R_DimNamesSymbol, Rhydred_names_dy);
+			SET_SLOT(swOutput_KEY_HYDRED, install("Day"), Rhydred_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[18][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rhydred_wk = allocMatrix(REALSXP, wk_nrow, Rhydred_columns+2));
+			PROTECT(Rhydred_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rhydred_names_y_wk = allocVector(STRSXP, Rhydred_columns + 2));
+			SET_STRING_ELT(Rhydred_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rhydred_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Chydred_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rhydred_names_y_wk, (i * tLayers + j) + 2, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rhydred_names_wk, 1, Rhydred_names_y_wk);
+			setAttrib(Rhydred_wk, R_DimNamesSymbol, Rhydred_names_wk);
+			SET_SLOT(swOutput_KEY_HYDRED, install("Week"), Rhydred_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[18][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rhydred_mo = allocMatrix(REALSXP, mo_nrow, Rhydred_columns+2));
+			PROTECT(Rhydred_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rhydred_names_y_mo = allocVector(STRSXP, Rhydred_columns + 2));
+			SET_STRING_ELT(Rhydred_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rhydred_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Chydred_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rhydred_names_y_mo, (i * tLayers + j) + 2, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rhydred_names_mo, 1, Rhydred_names_y_mo);
+			setAttrib(Rhydred_mo, R_DimNamesSymbol, Rhydred_names_mo);
+			SET_SLOT(swOutput_KEY_HYDRED, install("Month"), Rhydred_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[18][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rhydred_yr = allocMatrix(REALSXP, yr_nrow, Rhydred_columns+1));
+			PROTECT(Rhydred_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rhydred_names_y_yr = allocVector(STRSXP, Rhydred_columns + 1));
+			SET_STRING_ELT(Rhydred_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < 5; i++) {
+				for (j = 0; j < tLayers; j++) {
+					strcpy(Ctemp, Chydred_names[i]);
+					strcat(Ctemp, Layers_names[j]);
+					SET_STRING_ELT(Rhydred_names_y_yr, (i * tLayers + j) + 1, mkChar(Ctemp));
+				}
+			}
+			SET_VECTOR_ELT(Rhydred_names_yr, 1, Rhydred_names_y_yr);
+			setAttrib(Rhydred_yr, R_DimNamesSymbol, Rhydred_names_yr);
+			SET_SLOT(swOutput_KEY_HYDRED, install("Year"), Rhydred_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_HYDRED_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_HYDRED_COLUMNS)[0]=Rhydred_columns;
+		SET_SLOT(swOutput_KEY_HYDRED, install("Columns"), r_HYDRED_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[22]), swOutput_KEY_HYDRED);
+		UNPROTECT(3);
+	}
+	//ET - NOT USED
+	if(use[19]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[19]);
+		PROTECT(swOutput_KEY_ET = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_ET_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_ET_NAME, 0, mkChar(cSWoutput_KEY_Titles[19]));
+		SET_SLOT(swOutput_KEY_ET, install("Title"), r_ET_NAME);
+		if (useTimeStep) {
+			PROTECT(r_ET_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_ET_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_ET, install("TimeStep"), r_ET_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_ET_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_ET_PERIOD)[0]=INTEGER(Periods)[19];
+			SET_SLOT(swOutput_KEY_ET, install("TimeStep"), r_ET_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[19][0]) {
+			PROTECT(Ret_dy = allocMatrix(REALSXP, dy_nrow, Ret_columns+2));
+
+			setAttrib(Ret_dy, R_DimNamesSymbol, Ret_names_dy);
+			SET_SLOT(swOutput_KEY_ET, install("Day"), Ret_dy);
+			UNPROTECT(1);
+		}
+		if(periodUse[19][1]) {
+			PROTECT(Ret_wk = allocMatrix(REALSXP, wk_nrow, Ret_columns+2));
+
+			setAttrib(Ret_wk, R_DimNamesSymbol, Ret_names_dy);
+			SET_SLOT(swOutput_KEY_ET, install("Week"), Ret_wk);
+			UNPROTECT(1);
+		}
+		if(periodUse[19][2]) {
+			PROTECT(Ret_mo = allocMatrix(REALSXP, mo_nrow, Ret_columns+2));
+
+			setAttrib(Ret_mo, R_DimNamesSymbol, Ret_names_dy);
+			SET_SLOT(swOutput_KEY_ET, install("Month"), Ret_mo);
+			UNPROTECT(1);
+		}
+		if(periodUse[19][3]) {
+			PROTECT(Ret_yr = allocMatrix(REALSXP, yr_nrow, Ret_columns+1));
+
+			setAttrib(Ret_yr, R_DimNamesSymbol, Ret_names_dy);
+			SET_SLOT(swOutput_KEY_ET, install("Year"), Ret_yr);
+			UNPROTECT(1);
+		}
+		PROTECT(r_ET_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_ET_COLUMNS)[0]=Ret_columns;
+		SET_SLOT(swOutput_KEY_ET, install("Columns"), r_ET_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[23]), swOutput_KEY_ET);
+		UNPROTECT(3);
+	}
+	//AET
+	if(use[20]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[20]);
+		PROTECT(swOutput_KEY_AET = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_AET_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_AET_NAME, 0, mkChar(cSWoutput_KEY_Titles[20]));
+		SET_SLOT(swOutput_KEY_AET, install("Title"), r_AET_NAME);
+		if (useTimeStep) {
+			PROTECT(r_AET_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_AET_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_AET, install("TimeStep"), r_AET_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_AET_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_AET_PERIOD)[0]=INTEGER(Periods)[20];
+			SET_SLOT(swOutput_KEY_AET, install("TimeStep"), r_AET_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[20][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Raet_dy = allocMatrix(REALSXP, dy_nrow, Raet_columns+2));
+			PROTECT(Raet_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Raet_names_y_dy = allocVector(STRSXP, Raet_columns + 2));
+			SET_STRING_ELT(Raet_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Raet_names_y_dy, 1, mkChar("DOY"));
+			SET_STRING_ELT(Raet_names_y_dy, 2, mkChar("evapotr_cm"));
+			SET_VECTOR_ELT(Raet_names_dy, 1, Raet_names_y_dy);
+			setAttrib(Raet_dy, R_DimNamesSymbol, Raet_names_dy);
+			SET_SLOT(swOutput_KEY_AET, install("Day"), Raet_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[20][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Raet_wk = allocMatrix(REALSXP, wk_nrow, Raet_columns+2));
+			PROTECT(Raet_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Raet_names_y_wk = allocVector(STRSXP, Raet_columns + 2));
+			SET_STRING_ELT(Raet_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Raet_names_y_wk, 1, mkChar("Week"));
+			SET_STRING_ELT(Raet_names_y_wk, 2, mkChar("evapotr_cm"));
+			SET_VECTOR_ELT(Raet_names_wk, 1, Raet_names_y_wk);
+			setAttrib(Raet_wk, R_DimNamesSymbol, Raet_names_wk);
+			SET_SLOT(swOutput_KEY_AET, install("Week"), Raet_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[20][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Raet_mo = allocMatrix(REALSXP, mo_nrow, Raet_columns+2));
+			PROTECT(Raet_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Raet_names_y_mo = allocVector(STRSXP, Raet_columns + 2));
+			SET_STRING_ELT(Raet_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Raet_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Raet_names_y_mo, 2, mkChar("evapotr_cm"));
+			SET_VECTOR_ELT(Raet_names_mo, 1, Raet_names_y_mo);
+			setAttrib(Raet_mo, R_DimNamesSymbol, Raet_names_mo);
+			SET_SLOT(swOutput_KEY_AET, install("Month"), Raet_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[20][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Raet_yr = allocMatrix(REALSXP, yr_nrow, Raet_columns+1));
+			PROTECT(Raet_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Raet_names_y_yr = allocVector(STRSXP, Raet_columns + 1));
+			SET_STRING_ELT(Raet_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Raet_names_y_yr, 1, mkChar("evapotr_cm"));
+			SET_VECTOR_ELT(Raet_names_yr, 1, Raet_names_y_yr);
+			setAttrib(Raet_yr, R_DimNamesSymbol, Raet_names_yr);
+			SET_SLOT(swOutput_KEY_AET, install("Year"), Raet_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_AET_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_AET_COLUMNS)[0]=Raet_columns;
+		SET_SLOT(swOutput_KEY_AET, install("Columns"), r_AET_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[24]), swOutput_KEY_AET);
+		UNPROTECT(3);
+	}
+	//PET
+	if(use[21]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[21]);
+		PROTECT(swOutput_KEY_PET = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_PET_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_PET_NAME, 0, mkChar(cSWoutput_KEY_Titles[21]));
+		SET_SLOT(swOutput_KEY_PET, install("Title"), r_PET_NAME);
+		if (useTimeStep) {
+			PROTECT(r_PET_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_PET_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_PET, install("TimeStep"), r_PET_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_PET_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_PET_PERIOD)[0]=INTEGER(Periods)[21];
+			SET_SLOT(swOutput_KEY_PET, install("TimeStep"), r_PET_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[21][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rpet_dy = allocMatrix(REALSXP, dy_nrow, Rpet_columns+2));
+			PROTECT(Rpet_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rpet_names_y_dy = allocVector(STRSXP, Rpet_columns + 2));
+			SET_STRING_ELT(Rpet_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpet_names_y_dy, 1, mkChar("DOY"));
+			SET_STRING_ELT(Rpet_names_y_dy, 2, mkChar("pet_cm"));
+			SET_VECTOR_ELT(Rpet_names_dy, 1, Rpet_names_y_dy);
+			setAttrib(Rpet_dy, R_DimNamesSymbol, Rpet_names_dy);
+			SET_SLOT(swOutput_KEY_PET, install("Day"), Rpet_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[21][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rpet_wk = allocMatrix(REALSXP, wk_nrow, Rpet_columns+2));
+			PROTECT(Rpet_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rpet_names_y_wk = allocVector(STRSXP, Rpet_columns + 2));
+			SET_STRING_ELT(Rpet_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpet_names_y_wk, 1, mkChar("Week"));
+			SET_STRING_ELT(Rpet_names_y_wk, 2, mkChar("pet_cm"));
+			SET_VECTOR_ELT(Rpet_names_wk, 1, Rpet_names_y_wk);
+			setAttrib(Rpet_wk, R_DimNamesSymbol, Rpet_names_wk);
+			SET_SLOT(swOutput_KEY_PET, install("Week"), Rpet_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[21][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rpet_mo = allocMatrix(REALSXP, mo_nrow, Rpet_columns+2));
+			PROTECT(Rpet_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rpet_names_y_mo = allocVector(STRSXP, Rpet_columns + 2));
+			SET_STRING_ELT(Rpet_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpet_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Rpet_names_y_mo, 2, mkChar("pet_cm"));
+			SET_VECTOR_ELT(Rpet_names_mo, 1, Rpet_names_y_mo);
+			setAttrib(Rpet_mo, R_DimNamesSymbol, Rpet_names_mo);
+			SET_SLOT(swOutput_KEY_PET, install("Month"), Rpet_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[21][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rpet_yr = allocMatrix(REALSXP, yr_nrow, Rpet_columns+1));
+			PROTECT(Rpet_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rpet_names_y_yr = allocVector(STRSXP, Rpet_columns + 1));
+			SET_STRING_ELT(Rpet_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Rpet_names_y_yr, 1, mkChar("pet_cm"));
+			SET_VECTOR_ELT(Rpet_names_yr, 1, Rpet_names_y_yr);
+			setAttrib(Rpet_yr, R_DimNamesSymbol, Rpet_names_yr);
+			SET_SLOT(swOutput_KEY_PET, install("Year"), Rpet_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_PET_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_PET_COLUMNS)[0]=Rpet_columns;
+		SET_SLOT(swOutput_KEY_PET, install("Columns"), r_PET_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[25]), swOutput_KEY_PET);
+		UNPROTECT(3);
+	}
+	//WET DAYS
+	if(use[22]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[22]);
+		PROTECT(swOutput_KEY_WETDAY = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_WETDAY_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_WETDAY_NAME, 0, mkChar(cSWoutput_KEY_Titles[22]));
+		SET_SLOT(swOutput_KEY_WETDAY, install("Title"), r_WETDAY_NAME);
+		if (useTimeStep) {
+			PROTECT(r_WETDAY_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_WETDAY_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_WETDAY, install("TimeStep"), r_WETDAY_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_WETDAY_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_WETDAY_PERIOD)[0]=INTEGER(Periods)[22];
+			SET_SLOT(swOutput_KEY_WETDAY, install("TimeStep"), r_WETDAY_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[22][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rwetdays_dy = allocMatrix(REALSXP, dy_nrow, Rwetdays_columns+2));
+			PROTECT(Rwetdays_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rwetdays_names_y_dy = allocVector(STRSXP, Rwetdays_columns + 2));
+			SET_STRING_ELT(Rwetdays_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rwetdays_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rwetdays_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rwetdays_names_dy, 1, Rwetdays_names_y_dy);
+			setAttrib(Rwetdays_dy, R_DimNamesSymbol, Rwetdays_names_dy);
+			SET_SLOT(swOutput_KEY_WETDAY, install("Day"), Rwetdays_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[22][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rwetdays_wk = allocMatrix(REALSXP, wk_nrow, Rwetdays_columns+2));
+			PROTECT(Rwetdays_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rwetdays_names_y_wk = allocVector(STRSXP, Rwetdays_columns + 2));
+			SET_STRING_ELT(Rwetdays_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rwetdays_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rwetdays_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rwetdays_names_wk, 1, Rwetdays_names_y_wk);
+			setAttrib(Rwetdays_wk, R_DimNamesSymbol, Rwetdays_names_wk);
+			SET_SLOT(swOutput_KEY_WETDAY, install("Week"), Rwetdays_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[22][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rwetdays_mo = allocMatrix(REALSXP, mo_nrow, Rwetdays_columns+2));
+			PROTECT(Rwetdays_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rwetdays_names_y_mo = allocVector(STRSXP, Rwetdays_columns + 2));
+			SET_STRING_ELT(Rwetdays_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rwetdays_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rwetdays_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rwetdays_names_mo, 1, Rwetdays_names_y_mo);
+			setAttrib(Rwetdays_mo, R_DimNamesSymbol, Rwetdays_names_mo);
+			SET_SLOT(swOutput_KEY_WETDAY, install("Month"), Rwetdays_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[22][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rwetdays_yr = allocMatrix(REALSXP, yr_nrow, Rwetdays_columns+1));
+			PROTECT(Rwetdays_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rwetdays_names_y_yr = allocVector(STRSXP, Rwetdays_columns + 1));
+			SET_STRING_ELT(Rwetdays_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rwetdays_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rwetdays_names_yr, 1, Rwetdays_names_y_yr);
+			setAttrib(Rwetdays_yr, R_DimNamesSymbol, Rwetdays_names_yr);
+			SET_SLOT(swOutput_KEY_WETDAY, install("Year"), Rwetdays_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_WETDAY_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_WETDAY_COLUMNS)[0]=Rwetdays_columns;
+		SET_SLOT(swOutput_KEY_WETDAY, install("Columns"), r_WETDAY_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[26]), swOutput_KEY_WETDAY);
+		UNPROTECT(3);
+	}
+	//SNOW PACK
+	if(use[23]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[23]);
+		PROTECT(swOutput_KEY_SNOWPACK = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SNOWPACK_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SNOWPACK_NAME, 0, mkChar(cSWoutput_KEY_Titles[23]));
+		SET_SLOT(swOutput_KEY_SNOWPACK, install("Title"), r_SNOWPACK_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SNOWPACK_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SNOWPACK_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SNOWPACK, install("TimeStep"), r_SNOWPACK_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SNOWPACK_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SNOWPACK_PERIOD)[0]=INTEGER(Periods)[23];
+			SET_SLOT(swOutput_KEY_SNOWPACK, install("TimeStep"), r_SNOWPACK_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[23][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rsnowpack_dy = allocMatrix(REALSXP, dy_nrow, Rsnowpack_columns+2));
+			PROTECT(Rsnowpack_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rsnowpack_names_y_dy = allocVector(STRSXP, Rsnowpack_columns + 2));
+			SET_STRING_ELT(Rsnowpack_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsnowpack_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < Rsnowpack_columns; i++)
+				SET_STRING_ELT(Rsnowpack_names_y_dy, i + 2, mkChar(Csnowpack_names[i]));
+			SET_VECTOR_ELT(Rsnowpack_names_dy, 1, Rsnowpack_names_y_dy);
+			setAttrib(Rsnowpack_dy, R_DimNamesSymbol, Rsnowpack_names_dy);
+			SET_SLOT(swOutput_KEY_SNOWPACK, install("Day"), Rsnowpack_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[23][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rsnowpack_wk = allocMatrix(REALSXP, wk_nrow, Rsnowpack_columns+2));
+			PROTECT(Rsnowpack_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rsnowpack_names_y_wk = allocVector(STRSXP, Rsnowpack_columns + 2));
+			SET_STRING_ELT(Rsnowpack_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsnowpack_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < Rsnowpack_columns; i++)
+				SET_STRING_ELT(Rsnowpack_names_y_wk, i + 2, mkChar(Csnowpack_names[i]));
+			SET_VECTOR_ELT(Rsnowpack_names_wk, 1, Rsnowpack_names_y_wk);
+			setAttrib(Rsnowpack_wk, R_DimNamesSymbol, Rsnowpack_names_wk);
+			SET_SLOT(swOutput_KEY_SNOWPACK, install("Week"), Rsnowpack_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[23][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rsnowpack_mo = allocMatrix(REALSXP, mo_nrow, Rsnowpack_columns+2));
+			PROTECT(Rsnowpack_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rsnowpack_names_y_mo = allocVector(STRSXP, Rsnowpack_columns + 2));
+			SET_STRING_ELT(Rsnowpack_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsnowpack_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < Rsnowpack_columns; i++)
+				SET_STRING_ELT(Rsnowpack_names_y_mo, i + 2, mkChar(Csnowpack_names[i]));
+			SET_VECTOR_ELT(Rsnowpack_names_mo, 1, Rsnowpack_names_y_mo);
+			setAttrib(Rsnowpack_mo, R_DimNamesSymbol, Rsnowpack_names_mo);
+			SET_SLOT(swOutput_KEY_SNOWPACK, install("Month"), Rsnowpack_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[23][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rsnowpack_yr = allocMatrix(REALSXP, yr_nrow, Rsnowpack_columns+1));
+			PROTECT(Rsnowpack_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rsnowpack_names_y_yr = allocVector(STRSXP, Rsnowpack_columns + 1));
+			SET_STRING_ELT(Rsnowpack_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < Rsnowpack_columns; i++)
+				SET_STRING_ELT(Rsnowpack_names_y_yr, i + 1, mkChar(Csnowpack_names[i]));
+			SET_VECTOR_ELT(Rsnowpack_names_yr, 1, Rsnowpack_names_y_yr);
+			setAttrib(Rsnowpack_yr, R_DimNamesSymbol, Rsnowpack_names_yr);
+			SET_SLOT(swOutput_KEY_SNOWPACK, install("Year"), Rsnowpack_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_SNOWPACK_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SNOWPACK_COLUMNS)[0]=Rsnowpack_columns;
+		SET_SLOT(swOutput_KEY_SNOWPACK, install("Columns"), r_SNOWPACK_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[27]), swOutput_KEY_SNOWPACK);
+		UNPROTECT(3);
+	}
+	//DEEP SWC
+	if(use[24]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[24]);
+		PROTECT(swOutput_KEY_DEEPSWC = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_DEEPSWC_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_DEEPSWC_NAME, 0, mkChar(cSWoutput_KEY_Titles[24]));
+		SET_SLOT(swOutput_KEY_DEEPSWC, install("Title"), r_DEEPSWC_NAME);
+		if (useTimeStep) {
+			PROTECT(r_DEEPSWC_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_DEEPSWC_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_DEEPSWC, install("TimeStep"), r_DEEPSWC_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_DEEPSWC_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_DEEPSWC_PERIOD)[0]=INTEGER(Periods)[24];
+			SET_SLOT(swOutput_KEY_DEEPSWC, install("TimeStep"), r_DEEPSWC_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[24][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rdeedrain_dy = allocMatrix(REALSXP, dy_nrow, Rdeedrain_columns+2));
+			PROTECT(Rdeep_drain_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rdeep_drain_names_y_dy = allocVector(STRSXP, Rdeedrain_columns + 2));
+			SET_STRING_ELT(Rdeep_drain_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rdeep_drain_names_y_dy, 1, mkChar("DOY"));
+			SET_STRING_ELT(Rdeep_drain_names_y_dy, 2, mkChar("lowLayerDrain_cm"));
+			SET_VECTOR_ELT(Rdeep_drain_names_dy, 1, Rdeep_drain_names_y_dy);
+			setAttrib(Rdeedrain_dy, R_DimNamesSymbol, Rdeep_drain_names_dy);
+			SET_SLOT(swOutput_KEY_DEEPSWC, install("Day"), Rdeedrain_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[24][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rdeedrain_wk = allocMatrix(REALSXP, wk_nrow, Rdeedrain_columns+2));
+			PROTECT(Rdeep_drain_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rdeep_drain_names_y_wk = allocVector(STRSXP, Rdeedrain_columns + 2));
+			SET_STRING_ELT(Rdeep_drain_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rdeep_drain_names_y_wk, 1, mkChar("Week"));
+			SET_STRING_ELT(Rdeep_drain_names_y_wk, 2, mkChar("lowLayerDrain_cm"));
+			SET_VECTOR_ELT(Rdeep_drain_names_wk, 1, Rdeep_drain_names_y_wk);
+			setAttrib(Rdeedrain_wk, R_DimNamesSymbol, Rdeep_drain_names_wk);
+			SET_SLOT(swOutput_KEY_DEEPSWC, install("Week"), Rdeedrain_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[24][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rdeedrain_mo = allocMatrix(REALSXP, mo_nrow, Rdeedrain_columns+2));
+			PROTECT(Rdeep_drain_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rdeep_drain_names_y_mo = allocVector(STRSXP, Rdeedrain_columns + 2));
+			SET_STRING_ELT(Rdeep_drain_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rdeep_drain_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Rdeep_drain_names_y_mo, 2, mkChar("lowLayerDrain_cm"));
+			SET_VECTOR_ELT(Rdeep_drain_names_mo, 1, Rdeep_drain_names_y_mo);
+			setAttrib(Rdeedrain_mo, R_DimNamesSymbol, Rdeep_drain_names_mo);
+			SET_SLOT(swOutput_KEY_DEEPSWC, install("Month"), Rdeedrain_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[24][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rdeedrain_yr = allocMatrix(REALSXP, yr_nrow, Rdeedrain_columns+1));
+			PROTECT(Rdeep_drain_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rdeep_drain_names_y_yr = allocVector(STRSXP, Rdeedrain_columns + 1));
+			SET_STRING_ELT(Rdeep_drain_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Rdeep_drain_names_y_yr, 1, mkChar("lowLayerDrain_cm"));
+			SET_VECTOR_ELT(Rdeep_drain_names_yr, 1, Rdeep_drain_names_y_yr);
+			setAttrib(Rdeedrain_yr, R_DimNamesSymbol, Rdeep_drain_names_yr);
+			SET_SLOT(swOutput_KEY_DEEPSWC, install("Year"), Rdeedrain_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_DEEPSWC_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_DEEPSWC_COLUMNS)[0]=Rdeedrain_columns;
+		SET_SLOT(swOutput_KEY_DEEPSWC, install("Columns"), r_DEEPSWC_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[28]), swOutput_KEY_DEEPSWC);
+		UNPROTECT(3);
+	}
+	//Soil Temp
+	if(use[25]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[25]);
+		PROTECT(swOutput_KEY_SOILTEMP = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_SOILTEMP_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_SOILTEMP_NAME, 0, mkChar(cSWoutput_KEY_Titles[25]));
+		SET_SLOT(swOutput_KEY_SOILTEMP, install("Title"), r_SOILTEMP_NAME);
+		if (useTimeStep) {
+			PROTECT(r_SOILTEMP_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_SOILTEMP_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_SOILTEMP, install("TimeStep"), r_SOILTEMP_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_SOILTEMP_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_SOILTEMP_PERIOD)[0]=INTEGER(Periods)[25];
+			SET_SLOT(swOutput_KEY_SOILTEMP, install("TimeStep"), r_SOILTEMP_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[25][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Rsoil_temp_dy = allocMatrix(REALSXP, dy_nrow, Rsoil_temp_columns+2));
+			PROTECT(Rsoil_temp_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rsoil_temp_names_y_dy = allocVector(STRSXP, Rsoil_temp_columns + 2));
+			SET_STRING_ELT(Rsoil_temp_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsoil_temp_names_y_dy, 1, mkChar("DOY"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rsoil_temp_names_y_dy, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rsoil_temp_names_dy, 1, Rsoil_temp_names_y_dy);
+			setAttrib(Rsoil_temp_dy, R_DimNamesSymbol, Rsoil_temp_names_dy);
+			SET_SLOT(swOutput_KEY_SOILTEMP, install("Day"), Rsoil_temp_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[25][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Rsoil_temp_wk = allocMatrix(REALSXP, wk_nrow, Rsoil_temp_columns+2));
+			PROTECT(Rsoil_temp_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rsoil_temp_names_y_wk = allocVector(STRSXP, Rsoil_temp_columns + 2));
+			SET_STRING_ELT(Rsoil_temp_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsoil_temp_names_y_wk, 1, mkChar("Week"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rsoil_temp_names_y_wk, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rsoil_temp_names_wk, 1, Rsoil_temp_names_y_wk);
+			setAttrib(Rsoil_temp_wk, R_DimNamesSymbol, Rsoil_temp_names_wk);
+			SET_SLOT(swOutput_KEY_SOILTEMP, install("Week"), Rsoil_temp_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[25][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Rsoil_temp_mo = allocMatrix(REALSXP, mo_nrow, Rsoil_temp_columns+2));
+			PROTECT(Rsoil_temp_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rsoil_temp_names_y_mo = allocVector(STRSXP, Rsoil_temp_columns + 2));
+			SET_STRING_ELT(Rsoil_temp_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rsoil_temp_names_y_mo, 1, mkChar("Month"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rsoil_temp_names_y_mo, i + 2, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rsoil_temp_names_mo, 1, Rsoil_temp_names_y_mo);
+			setAttrib(Rsoil_temp_mo, R_DimNamesSymbol, Rsoil_temp_names_mo);
+			SET_SLOT(swOutput_KEY_SOILTEMP, install("Month"), Rsoil_temp_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[25][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Rsoil_temp_yr = allocMatrix(REALSXP, yr_nrow, Rsoil_temp_columns+1));
+			PROTECT(Rsoil_temp_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rsoil_temp_names_y_yr = allocVector(STRSXP, Rsoil_temp_columns + 1));
+			SET_STRING_ELT(Rsoil_temp_names_y_yr, 0, mkChar("Year"));
+			for (i = 0; i < tLayers; i++)
+				SET_STRING_ELT(Rsoil_temp_names_y_yr, i + 1, mkChar(Layers_names[i]));
+			SET_VECTOR_ELT(Rsoil_temp_names_yr, 1, Rsoil_temp_names_y_yr);
+			setAttrib(Rsoil_temp_yr, R_DimNamesSymbol, Rsoil_temp_names_yr);
+			SET_SLOT(swOutput_KEY_SOILTEMP, install("Year"), Rsoil_temp_yr);
+			UNPROTECT(3);
+		}
+
+		PROTECT(r_SOILTEMP_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_SOILTEMP_COLUMNS)[0]=Rsoil_temp_columns;
+		SET_SLOT(swOutput_KEY_SOILTEMP, install("Columns"), r_SOILTEMP_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[29]), swOutput_KEY_SOILTEMP);
+		UNPROTECT(3);
+	}
+	//ALL VEG
+	if(use[26]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[26]);
+		PROTECT(swOutput_KEY_ALLVEG = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_ALLVEG_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_ALLVEG_NAME, 0, mkChar(cSWoutput_KEY_Titles[26]));
+		SET_SLOT(swOutput_KEY_ALLVEG, install("Title"), r_ALLVEG_NAME);
+		if (useTimeStep) {
+			PROTECT(r_ALLVEG_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_ALLVEG_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_ALLVEG, install("TimeStep"), r_ALLVEG_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_ALLVEG_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_ALLVEG_PERIOD)[0]=INTEGER(Periods)[26];
+			SET_SLOT(swOutput_KEY_ALLVEG, install("TimeStep"), r_ALLVEG_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[26][0]) {
+			PROTECT(Rallveg_dy = allocMatrix(REALSXP, dy_nrow, Rallveg_columns+2));
+
+			SET_SLOT(swOutput_KEY_ALLVEG, install("Day"), Rallveg_dy);
+			UNPROTECT(1);
+		}
+		if(periodUse[26][1]) {
+			PROTECT(Rallveg_wk = allocMatrix(REALSXP, wk_nrow, Rallveg_columns+2));
+
+			SET_SLOT(swOutput_KEY_ALLVEG, install("Week"), Rallveg_wk);
+			UNPROTECT(1);
+		}
+		if(periodUse[26][2]) {
+			PROTECT(Rallveg_mo = allocMatrix(REALSXP, mo_nrow, Rallveg_columns+2));
+
+			SET_SLOT(swOutput_KEY_ALLVEG, install("Month"), Rallveg_mo);
+			UNPROTECT(1);
+		}
+		if(periodUse[26][3]) {
+			PROTECT(Rallveg_yr = allocMatrix(REALSXP, yr_nrow, Rallveg_columns+1));
+
+			SET_SLOT(swOutput_KEY_ALLVEG, install("Year"), Rallveg_yr);
+			UNPROTECT(1);
+		}
+		PROTECT(r_ALLVEG_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_ALLVEG_COLUMNS)[0]=Rallveg_columns;
+		SET_SLOT(swOutput_KEY_ALLVEG, install("Columns"), r_ALLVEG_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[30]), swOutput_KEY_ALLVEG);
+		UNPROTECT(3);
+	}
+	//ESTABL
+	if(use[27]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[27]);
+		PROTECT(swOutput_KEY_ESTABL = NEW_OBJECT(swOutput_KEY));
+		PROTECT(r_ESTABL_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_ESTABL_NAME, 0, mkChar(cSWoutput_KEY_Titles[27]));
+		SET_SLOT(swOutput_KEY_ESTABL, install("Title"), r_ESTABL_NAME);
+		if (useTimeStep) {
+			PROTECT(r_ESTABL_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_ESTABL_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_ESTABL, install("TimeStep"), r_ESTABL_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_ESTABL_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_ESTABL_PERIOD)[0]=INTEGER(Periods)[27];
+			SET_SLOT(swOutput_KEY_ESTABL, install("TimeStep"), r_ESTABL_PERIOD);
+			UNPROTECT(1);
+		}
+		if(periodUse[27][0]) {
+			if(debug) Rprintf("\tdy\n");
+			PROTECT(Restabs_dy = allocMatrix(REALSXP, dy_nrow, Restabs_columns+2));
+			PROTECT(Restabs_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Restabs_names_y_dy = allocVector(STRSXP, Restabs_columns+2));
+			SET_STRING_ELT(Restabs_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Restabs_names_y_dy, 1, mkChar("DOY"));
+			SET_STRING_ELT(Restabs_names_y_dy, 2, mkChar("YearlyEstabResults"));
+			SET_VECTOR_ELT(Restabs_names_dy, 1, Restabs_names_y_dy);
+			setAttrib(Restabs_dy, R_DimNamesSymbol, Restabs_names_dy);
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < dy_nrow * (Restabs_columns + 2); k++)
+        REAL(Restabs_dy)[k] = 0.;
+			SET_SLOT(swOutput_KEY_ESTABL, install("Day"), Restabs_dy);
+			UNPROTECT(3);
+		}
+		if(periodUse[27][1]) {
+			if(debug) Rprintf("\twk\n");
+			PROTECT(Restabs_wk = allocMatrix(REALSXP, wk_nrow, Restabs_columns+2));
+			 PROTECT(Restabs_names_wk = allocVector(VECSXP, 2));
+			 PROTECT(Restabs_names_y_wk = allocVector(STRSXP, Restabs_columns+2));
+			 SET_STRING_ELT(Restabs_names_y_wk, 0, mkChar("Year"));
+			 SET_STRING_ELT(Restabs_names_y_wk, 1, mkChar("Week"));
+			 SET_STRING_ELT(Restabs_names_y_wk, 2, mkChar("YearlyEstabResults"));
+			 SET_VECTOR_ELT(Restabs_names_wk, 1, Restabs_names_y_wk);
+			setAttrib(Restabs_wk, R_DimNamesSymbol, Restabs_names_wk);
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < wk_nrow * (Restabs_columns + 2); k++)
+        REAL(Restabs_wk)[k] = 0.;
+			SET_SLOT(swOutput_KEY_ESTABL, install("Week"), Restabs_wk);
+			UNPROTECT(3);
+		}
+		if(periodUse[27][2]) {
+			if(debug) Rprintf("\tmo\n");
+			PROTECT(Restabs_mo = allocMatrix(REALSXP, mo_nrow, Restabs_columns+2));
+			PROTECT(Restabs_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Restabs_names_y_mo = allocVector(STRSXP, Restabs_columns+2));
+			SET_STRING_ELT(Restabs_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Restabs_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Restabs_names_y_mo, 2, mkChar("YearlyEstabResults"));
+			SET_VECTOR_ELT(Restabs_names_mo, 1, Restabs_names_y_mo);
+			setAttrib(Restabs_mo, R_DimNamesSymbol, Restabs_names_mo);
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < mo_nrow * (Restabs_columns + 2); k++)
+        REAL(Restabs_mo)[k] = 0.;
+			SET_SLOT(swOutput_KEY_ESTABL, install("Month"), Restabs_mo);
+			UNPROTECT(3);
+		}
+		if(periodUse[27][3]) {
+			if(debug) Rprintf("\tyr\n");
+			PROTECT(Restabs_yr = allocMatrix(REALSXP, yr_nrow, Restabs_columns+1));
+			PROTECT(Restabs_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Restabs_names_y_yr = allocVector(STRSXP, Restabs_columns+1));
+			SET_STRING_ELT(Restabs_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Restabs_names_y_yr, 1, mkChar("YearlyEstabResults"));
+			SET_VECTOR_ELT(Restabs_names_yr, 1, Restabs_names_y_yr);
+			setAttrib(Restabs_yr, R_DimNamesSymbol, Restabs_names_yr);
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < yr_nrow * (Restabs_columns + 1); k++)
+        REAL(Restabs_yr)[k] = 0.;
+			SET_SLOT(swOutput_KEY_ESTABL, install("Year"), Restabs_yr);
+			UNPROTECT(3);
+		}
+		PROTECT(r_ESTABL_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_ESTABL_COLUMNS)[0]=Restabs_columns;
+		SET_SLOT(swOutput_KEY_ESTABL, install("Columns"), r_ESTABL_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[31]), swOutput_KEY_ESTABL);
+		UNPROTECT(3);
+	}
+
+	// Establish CO2EFFECTS as an output to rSOILWAT2
+	if (use[28]) {
+		if(debug) Rprintf("%s\n",cSWoutput_KEY_Titles[28]);
+
+		/* Construct the CO2EFFECTS output key with title and time step */
+		PROTECT(swOutput_KEY_CO2EFFECTS = NEW_OBJECT(swOutput_KEY));
+
+		// Construct the title
+		PROTECT(r_CO2EFFECTS_NAME = NEW_STRING(1));
+		SET_STRING_ELT(r_CO2EFFECTS_NAME, 0, mkChar(cSWoutput_KEY_Titles[28]));
+		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Title"), r_CO2EFFECTS_NAME);
+
+		// Construct the time step
+		/*PROTECT(r_CO2EFFECTS_PERIOD = NEW_INTEGER(1));
+		INTEGER(r_CO2EFFECTS_PERIOD)[0] = 4;  // was 2
+		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("TimeStep"), r_CO2EFFECTS_PERIOD);*/
+
+		if (useTimeStep) {
+			PROTECT(r_CO2EFFECTS_PERIOD = NEW_INTEGER(length(Periods)));
+			for(i=0; i<length(Periods); i++)
+				INTEGER(r_CO2EFFECTS_PERIOD)[i]=INTEGER(Periods)[i];
+			SET_SLOT(swOutput_KEY_CO2EFFECTS, install("TimeStep"), r_CO2EFFECTS_PERIOD);
+			UNPROTECT(1);
+		} else {
+			PROTECT(r_ESTABL_PERIOD = NEW_INTEGER(1));
+			INTEGER(r_ESTABL_PERIOD)[0]=INTEGER(Periods)[28];
+			SET_SLOT(swOutput_KEY_CO2EFFECTS, install("TimeStep"), r_CO2EFFECTS_PERIOD);
+			UNPROTECT(1);
+		}
+
+		/* Allocate outputs per time period */
+		if (periodUse[28][0])
+		{
+			/* Construct the daily output structure */
+			PROTECT(Rco2effects_dy = allocMatrix(REALSXP, dy_nrow, Rco2effects_columns + 2));
+			PROTECT(Rco2effects_names_dy = allocVector(VECSXP, 2));
+			PROTECT(Rco2effects_names_y_dy = allocVector(STRSXP, Rco2effects_columns + 2));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 0, mkChar("Year"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 1, mkChar("Week"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 2, mkChar("GrassBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 3, mkChar("ShrubBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 4, mkChar("TreeBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 5, mkChar("ForbBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 6, mkChar("TotalBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 7, mkChar("GrassBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 8, mkChar("ShrubBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 9, mkChar("TreeBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 10, mkChar("ForbBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 11, mkChar("TotalBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 12, mkChar("GrassBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 13, mkChar("ShrubBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 14, mkChar("TreeBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 15, mkChar("ForbBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 16, mkChar("GrassWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 17, mkChar("ShrubWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 18, mkChar("TreeWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_dy, 19, mkChar("ForbWUEMult"));
+			SET_VECTOR_ELT(Rco2effects_names_dy, 1, Rco2effects_names_y_dy);
+
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < dy_nrow * (Rco2effects_columns + 2); k++)
+				REAL(Rco2effects_dy)[k] = 0.;
+			setAttrib(Rco2effects_dy, R_DimNamesSymbol, Rco2effects_names_dy);
+			SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Day"), Rco2effects_dy);
+
+			UNPROTECT(3);
+		}
+
+		if (periodUse[28][1])
+		{
+			/* Construct the weekly output structure */
+			PROTECT(Rco2effects_wk = allocMatrix(REALSXP, wk_nrow, Rco2effects_columns + 2));
+			PROTECT(Rco2effects_names_wk = allocVector(VECSXP, 2));
+			PROTECT(Rco2effects_names_y_wk = allocVector(STRSXP, Rco2effects_columns + 2));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 0, mkChar("Year"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 1, mkChar("Week"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 2, mkChar("GrassBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 3, mkChar("ShrubBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 4, mkChar("TreeBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 5, mkChar("ForbBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 6, mkChar("TotalBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 7, mkChar("GrassBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 8, mkChar("ShrubBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 9, mkChar("TreeBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 10, mkChar("ForbBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 11, mkChar("TotalBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 12, mkChar("GrassBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 13, mkChar("ShrubBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 14, mkChar("TreeBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 15, mkChar("ForbBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 16, mkChar("GrassWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 17, mkChar("ShrubWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 18, mkChar("TreeWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_wk, 19, mkChar("ForbWUEMult"));
+			SET_VECTOR_ELT(Rco2effects_names_wk, 1, Rco2effects_names_y_wk);
+
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < wk_nrow * (Rco2effects_columns + 2); k++)
+				REAL(Rco2effects_wk)[k] = 0.;
+			setAttrib(Rco2effects_wk, R_DimNamesSymbol, Rco2effects_names_wk);
+			SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Week"), Rco2effects_wk);
+
+			UNPROTECT(3);
+		}
+
+		if (periodUse[28][2])
+		{
+			/* Construct the monthly output structure */
+			PROTECT(Rco2effects_mo = allocMatrix(REALSXP, mo_nrow, Rco2effects_columns + 2));
+			PROTECT(Rco2effects_names_mo = allocVector(VECSXP, 2));
+			PROTECT(Rco2effects_names_y_mo = allocVector(STRSXP, Rco2effects_columns + 2));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 0, mkChar("Year"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 1, mkChar("Month"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 2, mkChar("GrassBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 3, mkChar("ShrubBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 4, mkChar("TreeBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 5, mkChar("ForbBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 6, mkChar("TotalBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 7, mkChar("GrassBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 8, mkChar("ShrubBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 9, mkChar("TreeBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 10, mkChar("ForbBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 11, mkChar("TotalBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 12, mkChar("GrassBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 13, mkChar("ShrubBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 14, mkChar("TreeBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 15, mkChar("ForbBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 16, mkChar("GrassWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 17, mkChar("ShrubWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 18, mkChar("TreeWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_mo, 19, mkChar("ForbWUEMult"));
+			SET_VECTOR_ELT(Rco2effects_names_mo, 1, Rco2effects_names_y_mo);
+
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < mo_nrow * (Rco2effects_columns + 2); k++)
+				REAL(Rco2effects_mo)[k] = 0.;
+			setAttrib(Rco2effects_mo, R_DimNamesSymbol, Rco2effects_names_mo);
+			SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Month"), Rco2effects_mo);
+
+			UNPROTECT(3);
+		}
+
+		if (periodUse[28][3])
+		{
+			/* Construct the yearly output structure */
+			PROTECT(Rco2effects_yr = allocMatrix(REALSXP, yr_nrow, Rco2effects_columns + 1));
+			PROTECT(Rco2effects_names_yr = allocVector(VECSXP, 2));
+			PROTECT(Rco2effects_names_y_yr = allocVector(STRSXP, Rco2effects_columns + 1));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 0, mkChar("Year"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 1, mkChar("GrassBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 2, mkChar("ShrubBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 3, mkChar("TreeBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 4, mkChar("ForbBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 5, mkChar("TotalBiomass"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 6, mkChar("GrassBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 7, mkChar("ShrubBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 8, mkChar("TreeBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 9, mkChar("ForbBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 10, mkChar("TotalBiolive"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 11, mkChar("GrassBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 12, mkChar("ShrubBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 13, mkChar("TreeBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 14, mkChar("ForbBioMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 15, mkChar("GrassWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 16, mkChar("ShrubWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 17, mkChar("TreeWUEMult"));
+			SET_STRING_ELT(Rco2effects_names_y_yr, 18, mkChar("ForbWUEMult"));
+			SET_VECTOR_ELT(Rco2effects_names_yr, 1, Rco2effects_names_y_yr);
+
+			// Initialize to 0; allocMatrix does not initialize
+			for (k = 0; k < yr_nrow * (Rco2effects_columns + 1); k++)
+			  REAL(Rco2effects_yr)[k] = 0.;
+			setAttrib(Rco2effects_yr, R_DimNamesSymbol, Rco2effects_names_yr);
+			SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Year"), Rco2effects_yr);
+
+			UNPROTECT(3);
+		}
+
+		// Add CO2EFFECTS to the output class
+		PROTECT(r_CO2EFFECTS_COLUMNS = NEW_INTEGER(1));
+		INTEGER(r_CO2EFFECTS_COLUMNS)[0] = Rco2effects_columns;
+		SET_SLOT(swOutput_KEY_CO2EFFECTS, install("Columns"), r_CO2EFFECTS_COLUMNS);
+		SET_SLOT(swOutput_Object, install(cSWoutput_Names[32]), swOutput_KEY_CO2EFFECTS);
+
+		// Free protected data as they are no longer needed
+		UNPROTECT(3);
+	}
+
+
+	UNPROTECT(pCount);
+	return swOutput_Object;
+}
+
+#endif
diff --git a/SW_VegProd.c b/SW_VegProd.c
index 1daf69308..f67376ed6 100644
--- a/SW_VegProd.c
+++ b/SW_VegProd.c
@@ -1,39 +1,39 @@
 /********************************************************/
 /********************************************************/
 /*	Source file: Veg_Prod.c
- Type: module
- Application: SOILWAT - soilwater dynamics simulator
- Purpose: Read / write and otherwise manage the model's
- vegetation production parameter information.
- History:
- (8/28/01) -- INITIAL CODING - cwb
- 11/16/2010	(drs) added LAIforest, biofoliage_for, lai_conv_for, TypeGrassOrShrub, TypeForest to SW_VEGPROD
- lai_live/biolive/total_agb include now LAIforest, respectively biofoliage_for
- updated SW_VPD_read(), SW_VPD_init(), and _echo_inits()
- increased length of char outstr[1000] to outstr[1500] because of increased echo
- 02/22/2011	(drs) added scan for litter_for to SW_VPD_read()
- 02/22/2011	(drs) added litter_for to SW_VegProd.litter and to SW_VegProd.tot_agb
- 02/22/2011	(drs) if TypeGrassOrShrub is turned off, then its biomass, litter, etc. values are set to 0
- 08/22/2011	(drs) use variable veg_height [MAX_MONTHS] from SW_VEGPROD instead of static canopy_ht
- 09/08/2011	(drs) adapted SW_VPD_read() and SW_VPD_init() to reflect that now each vegetation type has own elements
- 09/08/2011	(drs) added input in SW_VPD_read() of tanfunc_t tr_shade_effects, and RealD shade_scale and shade_deadmax (they were previously hidden as constants in code in SW_Flow_lib.h)
- 09/08/2011	(drs) moved all input of hydraulic redistribution variables from SW_Site.c to SW_VPD_read() for each vegetation type
- 09/08/2011	(drs) added input in SW_VPD_read() of RealD veg_intPPT_a, veg_intPPT_b, veg_intPPT_c, veg_intPPT_d (they were previously hidden as constants in code in SW_Flow_lib.h)
- 09/09/2011	(drs) added input in SW_VPD_read() of RealD EsTpartitioning_param (it were previously hidden as constant in code in SW_Flow_lib.h)
- 09/09/2011	(drs) added input in SW_VPD_read() of RealD Es_param_limit (it was previously hidden as constant in code in SW_Flow_lib.h)
- 09/13/2011	(drs) added input in SW_VPD_read() of RealD litt_intPPT_a, litt_intPPT_b, litt_intPPT_c, litt_intPPT_d (they were previously hidden as constants in code in SW_Flow_lib.h)
- 09/13/2011	(drs) added input in SW_VPD_read() of RealD canopy_height_constant and updated SW_VPD_init() (as option: if > 0 then constant canopy height (cm) and overriding cnpy-tangens=f(biomass))
- 09/15/2011	(drs) added input in SW_VPD_read() of RealD albedo
- 09/26/2011	(drs)	added calls to Times.c:interpolate_monthlyValues() in SW_VPD_init() for each monthly input variable; replaced monthly loop with a daily loop for additional daily variables; adjusted _echo_inits()
- 10/17/2011	(drs)	in SW_VPD_init(): v->tree.total_agb_daily[doy] = v->tree.litter_daily[doy] + v->tree.biolive_daily[doy] instead of = v->tree.litter_daily[doy] + v->tree.biomass_daily[doy] to adjust for better scaling of potential bare-soil evaporation
- 02/04/2012	(drs) 	added input in SW_VPD_read() of RealD SWPcrit
- 01/29/2013	(clk)	changed the read in to account for the extra fractional component in total vegetation, bare ground
- added the variable RealF help_bareGround as a place holder for the sscanf call.
- 01/31/2013	(clk)	changed the read in to account for the albedo for bare ground, storing the input in bareGround_albedo
- changed _echo_inits() to now display the bare ground components in logfile.log
- 06/27/2013	(drs)	closed open files if LogError() with LOGFATAL is called in SW_VPD_read()
- 07/09/2013	(clk)	added initialization of all the values of the new vegtype variable forb and fractionForb
- */
+Type: module
+Application: SOILWAT - soilwater dynamics simulator
+Purpose: Read / write and otherwise manage the model's
+vegetation production parameter information.
+History:
+(8/28/01) -- INITIAL CODING - cwb
+11/16/2010	(drs) added LAIforest, biofoliage_for, lai_conv_for, TypeGrassOrShrub, TypeForest to SW_VEGPROD
+lai_live/biolive/total_agb include now LAIforest, respectively biofoliage_for
+updated SW_VPD_read(), SW_VPD_init(), and _echo_inits()
+increased length of char outstr[1000] to outstr[1500] because of increased echo
+02/22/2011	(drs) added scan for litter_for to SW_VPD_read()
+02/22/2011	(drs) added litter_for to SW_VegProd.litter and to SW_VegProd.tot_agb
+02/22/2011	(drs) if TypeGrassOrShrub is turned off, then its biomass, litter, etc. values are set to 0
+08/22/2011	(drs) use variable veg_height [MAX_MONTHS] from SW_VEGPROD instead of static canopy_ht
+09/08/2011	(drs) adapted SW_VPD_read() and SW_VPD_init() to reflect that now each vegetation type has own elements
+09/08/2011	(drs) added input in SW_VPD_read() of tanfunc_t tr_shade_effects, and RealD shade_scale and shade_deadmax (they were previously hidden as constants in code in SW_Flow_lib.h)
+09/08/2011	(drs) moved all input of hydraulic redistribution variables from SW_Site.c to SW_VPD_read() for each vegetation type
+09/08/2011	(drs) added input in SW_VPD_read() of RealD veg_intPPT_a, veg_intPPT_b, veg_intPPT_c, veg_intPPT_d (they were previously hidden as constants in code in SW_Flow_lib.h)
+09/09/2011	(drs) added input in SW_VPD_read() of RealD EsTpartitioning_param (it were previously hidden as constant in code in SW_Flow_lib.h)
+09/09/2011	(drs) added input in SW_VPD_read() of RealD Es_param_limit (it was previously hidden as constant in code in SW_Flow_lib.h)
+09/13/2011	(drs) added input in SW_VPD_read() of RealD litt_intPPT_a, litt_intPPT_b, litt_intPPT_c, litt_intPPT_d (they were previously hidden as constants in code in SW_Flow_lib.h)
+09/13/2011	(drs) added input in SW_VPD_read() of RealD canopy_height_constant and updated SW_VPD_init() (as option: if > 0 then constant canopy height (cm) and overriding cnpy-tangens=f(biomass))
+09/15/2011	(drs) added input in SW_VPD_read() of RealD albedo
+09/26/2011	(drs)	added calls to Times.c:interpolate_monthlyValues() in SW_VPD_init() for each monthly input variable; replaced monthly loop with a daily loop for additional daily variables; adjusted _echo_inits()
+10/17/2011	(drs)	in SW_VPD_init(): v->tree.total_agb_daily[doy] = v->tree.litter_daily[doy] + v->tree.biolive_daily[doy] instead of = v->tree.litter_daily[doy] + v->tree.biomass_daily[doy] to adjust for better scaling of potential bare-soil evaporation
+02/04/2012	(drs) 	added input in SW_VPD_read() of RealD SWPcrit
+01/29/2013	(clk)	changed the read in to account for the extra fractional component in total vegetation, bare ground
+added the variable RealF help_bareGround as a place holder for the sscanf call.
+01/31/2013	(clk)	changed the read in to account for the albedo for bare ground, storing the input in bareGround_albedo
+changed _echo_inits() to now display the bare ground components in logfile.log
+06/27/2013	(drs)	closed open files if LogError() with LOGFATAL is called in SW_VPD_read()
+07/09/2013	(clk)	added initialization of all the values of the new vegtype variable forb and fractionForb
+*/
 /********************************************************/
 /********************************************************/
 
@@ -91,8 +91,8 @@ void SW_VPD_read(void) {
 	FILE *f;
 	Months mon = Jan;
 	int x, lineno = 0;
-	const int line_help = 31;
-	RealF help_grass, help_shrub, help_tree, help_forb, help_bareGround, litt, biom, pctl, laic, co2_bio_coeff1, co2_bio_coeff2, co2_wue_coeff1, co2_wue_coeff2;
+	const int line_help = 33;
+	RealF help_grass, help_shrub, help_tree, help_forb, help_bareGround, litt, biom, pctl, laic, co2_coeff_grass, co2_coeff_shrub, co2_coeff_tree, co2_coeff_forb;
 	RealD fraction_sum = 0.;
 
 	MyFileName = SW_F_name(eVegProd);
@@ -116,7 +116,7 @@ void SW_VPD_read(void) {
 				v->fractionBareGround = help_bareGround;
 				break;
 
-				/* albedo */
+			/* albedo */
 			case 2:
 				x = sscanf(inbuf, "%f %f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb, &help_bareGround);
 				if (x < 5) {
@@ -131,7 +131,7 @@ void SW_VPD_read(void) {
 				v->bareGround_albedo = help_bareGround;
 				break;
 
-				/* LAI converter for % cover */
+			/* LAI converter for % cover */
 			case 3:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -145,7 +145,7 @@ void SW_VPD_read(void) {
 				v->forb.conv_stcr = help_forb;
 				break;
 
-				/* canopy height */
+			/* canopy height */
 			case 4:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -207,7 +207,7 @@ void SW_VPD_read(void) {
 				v->forb.canopy_height_constant = help_forb;
 				break;
 
-				/* vegetation interception parameters */
+			/* vegetation interception parameters */
 			case 9:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -257,7 +257,7 @@ void SW_VPD_read(void) {
 				v->forb.veg_intPPT_d = help_forb;
 				break;
 
-				/* litter interception parameters */
+			/* litter interception parameters */
 			case 13:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -307,7 +307,7 @@ void SW_VPD_read(void) {
 				v->forb.litt_intPPT_d = help_forb;
 				break;
 
-				/* parameter for partitioning of bare-soil evaporation and transpiration */
+			/* parameter for partitioning of bare-soil evaporation and transpiration */
 			case 17:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -321,7 +321,7 @@ void SW_VPD_read(void) {
 				v->forb.EsTpartitioning_param = help_forb;
 				break;
 
-				/* Parameter for scaling and limiting bare soil evaporation rate */
+			/* Parameter for scaling and limiting bare soil evaporation rate */
 			case 18:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -335,7 +335,7 @@ void SW_VPD_read(void) {
 				v->forb.Es_param_limit = help_forb;
 				break;
 
-				/* shade effects */
+			/* shade effects */
 			case 19:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -409,7 +409,7 @@ void SW_VPD_read(void) {
 				v->forb.tr_shade_effects.slope = help_forb;
 				break;
 
-				/* Hydraulic redistribution */
+			/* Hydraulic redistribution */
 			case 25:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -459,7 +459,7 @@ void SW_VPD_read(void) {
 				v->forb.shapeCond = help_forb;
 				break;
 
-				/* Critical soil water potential */
+			/* Critical soil water potential */
 			case 29:
 				x = sscanf(inbuf, "%f %f %f %f", &help_grass, &help_shrub, &help_tree, &help_forb);
 				if (x < 4) {
@@ -474,33 +474,66 @@ void SW_VPD_read(void) {
 				break;
 
 			/* CO2 Biomass Power Equation */
+			// Coefficient 1
 			case 30:
-			x = sscanf(inbuf, "%f %f", &co2_bio_coeff1, &co2_bio_coeff2);
-			if (x < 2) {
-				sprintf(errstr, "ERROR: Not enough arguments for the CO2 Biomass Power Equation in %s\n", MyFileName);
-				CloseFile(&f);
-				LogError(logfp, LOGFATAL, errstr);
-			}
-			v->co2_bio_coeff1 = co2_bio_coeff1;
-			v->co2_bio_coeff2 = co2_bio_coeff2;
-			break;
-
-			/* CO2 Stomatal Power Equation */
+				x = sscanf(inbuf, "%f %f %f %f", &co2_coeff_grass, &co2_coeff_shrub, &co2_coeff_tree, &co2_coeff_forb);
+				if (x < 4) {
+					sprintf(errstr, "ERROR: Not enough arguments for CO2 Biomass Coefficient 1 in %s\n", MyFileName);
+					CloseFile(&f);
+					LogError(logfp, LOGFATAL, errstr);
+				}
+				v->co2_bio_coeff1.grass = co2_coeff_grass;
+				v->co2_bio_coeff1.shrub = co2_coeff_shrub;
+				v->co2_bio_coeff1.tree = co2_coeff_tree;
+				v->co2_bio_coeff1.forb = co2_coeff_forb;
+				break;
+			// Coefficient 2
 			case 31:
-			x = sscanf(inbuf, "%f %f", &co2_wue_coeff1, &co2_wue_coeff2);
-			if (x < 2) {
-				sprintf(errstr, "ERROR: Not enough arguments for the CO2 WUE Power Equation in %s\n", MyFileName);
-				CloseFile(&f);
-				LogError(logfp, LOGFATAL, errstr);
-			}
-			v->co2_wue_coeff1 = co2_wue_coeff1;
-			v->co2_wue_coeff2 = co2_wue_coeff2;
-			break;
+				x = sscanf(inbuf, "%f %f %f %f", &co2_coeff_grass, &co2_coeff_shrub, &co2_coeff_tree, &co2_coeff_forb);
+				if (x < 4) {
+					sprintf(errstr, "ERROR: Not enough arguments for CO2 Biomass Coefficient 2 in %s\n", MyFileName);
+					CloseFile(&f);
+					LogError(logfp, LOGFATAL, errstr);
+				}
+				v->co2_bio_coeff2.grass = co2_coeff_grass;
+				v->co2_bio_coeff2.shrub = co2_coeff_shrub;
+				v->co2_bio_coeff2.tree = co2_coeff_tree;
+				v->co2_bio_coeff2.forb = co2_coeff_forb;
+				break;
+
+			/* CO2 WUE Power Equation */
+			// Coefficient 1
+			case 32:
+				x = sscanf(inbuf, "%f %f %f %f", &co2_coeff_grass, &co2_coeff_shrub, &co2_coeff_tree, &co2_coeff_forb);
+				if (x < 4) {
+					sprintf(errstr, "ERROR: Not enough arguments for CO2 WUE Coefficient 1 in %s\n", MyFileName);
+					CloseFile(&f);
+					LogError(logfp, LOGFATAL, errstr);
+				}
+				v->co2_wue_coeff1.grass = co2_coeff_grass;
+				v->co2_wue_coeff1.shrub = co2_coeff_shrub;
+				v->co2_wue_coeff1.tree = co2_coeff_tree;
+				v->co2_wue_coeff1.forb = co2_coeff_forb;
+				break;
+			// Coefficient 2
+			case 33:
+				x = sscanf(inbuf, "%f %f %f %f", &co2_coeff_grass, &co2_coeff_shrub, &co2_coeff_tree, &co2_coeff_forb);
+				if (x < 4) {
+					sprintf(errstr, "ERROR: Not enough arguments for CO2 WUE Coefficient 2 in %s\n", MyFileName);
+					CloseFile(&f);
+					LogError(logfp, LOGFATAL, errstr);
+				}
+				v->co2_wue_coeff2.grass = co2_coeff_grass;
+				v->co2_wue_coeff2.shrub = co2_coeff_shrub;
+				v->co2_wue_coeff2.tree = co2_coeff_tree;
+				v->co2_wue_coeff2.forb = co2_coeff_forb;
+				break;
 
 			default:
 				break;
 			}
-		} else {
+		}
+		else {
 			if (lineno == line_help + 1 || lineno == line_help + 1 + 12 || lineno == line_help + 1 + 12 * 2 || lineno == line_help + 1 + 12 * 3)
 				mon = Jan;
 
@@ -515,17 +548,20 @@ void SW_VPD_read(void) {
 				v->forb.biomass[mon] = biom;
 				v->forb.pct_live[mon] = pctl;
 				v->forb.lai_conv[mon] = laic;
-			} else if (lineno > line_help + 12 * 2 && lineno <= line_help + 12 * 3) {
+			}
+			else if (lineno > line_help + 12 * 2 && lineno <= line_help + 12 * 3) {
 				v->tree.litter[mon] = litt;
 				v->tree.biomass[mon] = biom;
 				v->tree.pct_live[mon] = pctl;
 				v->tree.lai_conv[mon] = laic;
-			} else if (lineno > line_help + 12 && lineno <= line_help + 12 * 2) {
+			}
+			else if (lineno > line_help + 12 && lineno <= line_help + 12 * 2) {
 				v->shrub.litter[mon] = litt;
 				v->shrub.biomass[mon] = biom;
 				v->shrub.pct_live[mon] = pctl;
 				v->shrub.lai_conv[mon] = laic;
-			} else if (lineno > line_help && lineno <= line_help + 12) {
+			}
+			else if (lineno > line_help && lineno <= line_help + 12) {
 				v->grass.litter[mon] = litt;
 				v->grass.biomass[mon] = biom;
 				v->grass.pct_live[mon] = pctl;
@@ -545,7 +581,7 @@ void SW_VPD_read(void) {
 	fraction_sum = v->fractionGrass + v->fractionShrub + v->fractionTree + v->fractionForb + v->fractionBareGround;
 	if (!EQ(fraction_sum, 1.0)) {
 		LogError(logfp, LOGWARN, "%s : Fractions of vegetation components were normalized, "
-				"sum of fractions (%5.4f) != 1.0.\nNew coefficients are:", MyFileName, fraction_sum);
+			"sum of fractions (%5.4f) != 1.0.\nNew coefficients are:", MyFileName, fraction_sum);
 		v->fractionGrass /= fraction_sum;
 		v->fractionShrub /= fraction_sum;
 		v->fractionTree /= fraction_sum;
@@ -559,16 +595,16 @@ void SW_VPD_read(void) {
 	}
 
 	CloseFile(&f);
-	#ifdef RSOILWAT
-		if (!collectInData)
-	#endif
+#ifdef RSOILWAT
+	if (!collectInData)
+#endif
 
 	SW_VPD_init();
 
 	if (EchoInits)
 		_echo_inits();
 	//save original  copy of SW_VegProd at oldSW_VegProd before it getting updated in code flow
-	Old_SW_VegProd  = SW_VegProd;
+	Old_SW_VegProd = SW_VegProd;
 }
 #ifdef RSOILWAT
 SEXP onGet_SW_VPD() {
@@ -577,8 +613,8 @@ SEXP onGet_SW_VPD() {
 	SEXP swProd;
 	SEXP VegProd, VegProd_names;
 	char *cVegProd_names[] = { "Composition", "Albedo", "Cover_stcr", "CanopyHeight", "VegetationInterceptionParameters", "LitterInterceptionParameters",
-			"EsTpartitioning_param", "Es_param_limit", "Shade", "HydraulicRedistribution_use", "HydraulicRedistribution", "CriticalSoilWaterPotential",
-			"MonthlyProductionValues_grass", "MonthlyProductionValues_shrub", "MonthlyProductionValues_tree", "MonthlyProductionValues_forb", "CO2Coefficients" };
+		"EsTpartitioning_param", "Es_param_limit", "Shade", "HydraulicRedistribution_use", "HydraulicRedistribution", "CriticalSoilWaterPotential",
+		"MonthlyProductionValues_grass", "MonthlyProductionValues_shrub", "MonthlyProductionValues_tree", "MonthlyProductionValues_forb", "CO2Coefficients" };
 
 	SEXP VegComp, VegComp_names;
 	SEXP Albedo;
@@ -619,28 +655,43 @@ SEXP onGet_SW_VPD() {
 	// Initialize variables
 	SEXP CO2Coefficients, CO2_names, CO2_row_names, CO2_col_names;
 	RealD *p_CO2Coefficients;
+
 	// Create row and column names
-	char *cCO2_col_names[] = { "Biomass", "Stomatal" };
-	char *cCO2_row_names[] = { "Coeff1", "Coeff2" };
-	PROTECT(CO2_col_names = allocVector(STRSXP, 2));
-	for (i = 0; i < 2; i++)
+	char *cCO2_col_names[] = { "Grass", "Shrub", "Tree", "Forb" };
+	char *cCO2_row_names[] = { "Biomass Coeff1", "Biomass Coeff2", "WUE Coeff1", "WUE Coeff2" };
+	PROTECT(CO2_col_names = allocVector(STRSXP, 4));
+	for (i = 0; i < 4; i++)
 		SET_STRING_ELT(CO2_col_names, i, mkChar(cCO2_col_names[i]));
-	PROTECT(CO2_row_names = allocVector(STRSXP, 2));
-	for (i = 0; i < 2; i++)
+	PROTECT(CO2_row_names = allocVector(STRSXP, 4));
+	for (i = 0; i < 4; i++)
 		SET_STRING_ELT(CO2_row_names, i, mkChar(cCO2_row_names[i]));
+
 	// Create matrix containing the multipliers
-	PROTECT(CO2Coefficients = allocMatrix(REALSXP, 2, 2));
+	PROTECT(CO2Coefficients = allocMatrix(REALSXP, 4, 4));
 	p_CO2Coefficients = REAL(CO2Coefficients);
-	p_CO2Coefficients[0] = v->co2_bio_coeff1;
-	p_CO2Coefficients[1] = v->co2_bio_coeff2;
-	p_CO2Coefficients[2] = v->co2_wue_coeff1;
-	p_CO2Coefficients[3] = v->co2_wue_coeff2;
+	p_CO2Coefficients[0] = v->co2_bio_coeff1.grass;
+	p_CO2Coefficients[1] = v->co2_bio_coeff1.shrub;
+	p_CO2Coefficients[2] = v->co2_bio_coeff1.tree;
+	p_CO2Coefficients[3] = v->co2_bio_coeff1.forb;
+	p_CO2Coefficients[4] = v->co2_bio_coeff2.grass;
+	p_CO2Coefficients[5] = v->co2_bio_coeff2.shrub;
+	p_CO2Coefficients[6] = v->co2_bio_coeff2.tree;
+	p_CO2Coefficients[7] = v->co2_bio_coeff2.forb;
+	p_CO2Coefficients[8] = v->co2_wue_coeff1.grass;
+	p_CO2Coefficients[9] = v->co2_wue_coeff1.shrub;
+	p_CO2Coefficients[10] = v->co2_wue_coeff1.tree;
+	p_CO2Coefficients[11] = v->co2_wue_coeff1.forb;
+	p_CO2Coefficients[12] = v->co2_wue_coeff2.grass;
+	p_CO2Coefficients[13] = v->co2_wue_coeff2.shrub;
+	p_CO2Coefficients[14] = v->co2_wue_coeff2.tree;
+	p_CO2Coefficients[15] = v->co2_wue_coeff2.forb;
+
+	// Integrate values with names
 	PROTECT(CO2_names = allocVector(VECSXP, 2));
 	SET_VECTOR_ELT(CO2_names, 1, CO2_col_names);
 	SET_VECTOR_ELT(CO2_names, 0, CO2_row_names);
 	setAttrib(CO2Coefficients, R_DimNamesSymbol, CO2_names);
 
-
 	RealD *p_Grasslands, *p_Shrublands, *p_Forest, *p_Forb;
 	SEXP MonthlyProductionValues_Column_names, MonthlyProductionValues_Row_names;
 	char *cMonthlyProductionValues_Column_names[] = { "Litter", "Biomass", "Live_pct", "LAI_conv" };
@@ -837,19 +888,19 @@ SEXP onGet_SW_VPD() {
 	p_Hydraulic[10] = v->forb.swpMatric50;
 	p_Hydraulic[11] = v->forb.shapeCond;
 	PROTECT(Hydraulic_names = allocVector(VECSXP, 2));
-	PROTECT(Hydraulic_names_x = allocVector(STRSXP,3));
+	PROTECT(Hydraulic_names_x = allocVector(STRSXP, 3));
 	for (i = 0; i < 3; i++) {
 		SET_STRING_ELT(Hydraulic_names_x, i, mkChar(cHydraulic_names[i]));
 	}
-	SET_VECTOR_ELT(Hydraulic_names,0,Hydraulic_names_x);
-	SET_VECTOR_ELT(Hydraulic_names,1,col_names);
+	SET_VECTOR_ELT(Hydraulic_names, 0, Hydraulic_names_x);
+	SET_VECTOR_ELT(Hydraulic_names, 1, col_names);
 	setAttrib(Hydraulic, R_DimNamesSymbol, Hydraulic_names);
 
 	PROTECT(CSWP = allocVector(REALSXP, 4));
-	REAL(CSWP)[0] = v->grass.SWPcrit/-10; //Grass
-	REAL(CSWP)[1] = v->shrub.SWPcrit/-10; //Shrub
-	REAL(CSWP)[2] = v->tree.SWPcrit/-10; //Tree
-	REAL(CSWP)[3] = v->forb.SWPcrit/-10; //Forb
+	REAL(CSWP)[0] = v->grass.SWPcrit / -10; //Grass
+	REAL(CSWP)[1] = v->shrub.SWPcrit / -10; //Shrub
+	REAL(CSWP)[2] = v->tree.SWPcrit / -10; //Tree
+	REAL(CSWP)[3] = v->forb.SWPcrit / -10; //Forb
 	setAttrib(CSWP, R_NamesSymbol, col_names);
 
 	PROTECT(MonthlyProductionValues_Column_names = allocVector(STRSXP, 4));
@@ -938,8 +989,8 @@ void onSet_SW_VPD(SEXP SW_VPD) {
 	SW_VEGPROD *v = &SW_VegProd;
 
 	char *cVegProd_names[] = { "Composition", "Albedo", "Cover_stcr", "CanopyHeight", "VegetationInterceptionParameters", "LitterInterceptionParameters",
-				"EsTpartitioning_param", "Es_param_limit", "Shade", "HydraulicRedistribution_use", "HydraulicRedistribution", "CriticalSoilWaterPotential",
-				"MonthlyProductionValues_grass", "MonthlyProductionValues_shrub", "MonthlyProductionValues_tree", "MonthlyProductionValues_forb", "CO2Coefficients"};
+		"EsTpartitioning_param", "Es_param_limit", "Shade", "HydraulicRedistribution_use", "HydraulicRedistribution", "CriticalSoilWaterPotential",
+		"MonthlyProductionValues_grass", "MonthlyProductionValues_shrub", "MonthlyProductionValues_tree", "MonthlyProductionValues_forb", "CO2Coefficients" };
 	SEXP VegComp;
 	SEXP Albedo;
 	SEXP conv_stcr;
@@ -1105,13 +1156,13 @@ void onSet_SW_VPD(SEXP SW_VPD) {
 	v->forb.swpMatric50 = REAL(Hydraulic)[10]; //Forb
 	v->forb.shapeCond = REAL(Hydraulic)[11]; //Forb
 
-	PROTECT(CSWP =GET_SLOT(SW_VPD, install(cVegProd_names[11])));
+	PROTECT(CSWP = GET_SLOT(SW_VPD, install(cVegProd_names[11])));
 	v->grass.SWPcrit = -10 * REAL(CSWP)[0]; //Grass
 	v->shrub.SWPcrit = -10 * REAL(CSWP)[1]; //Shrub
 	v->tree.SWPcrit = -10 * REAL(CSWP)[2]; //Tree
 	v->forb.SWPcrit = -10 * REAL(CSWP)[3]; //Forb
 
-	//PROTECT(MonthlyProductionValues = VECTOR_ELT(SW_VPD, 11));
+ 	//PROTECT(MonthlyProductionValues = VECTOR_ELT(SW_VPD, 11));
 	PROTECT(Grasslands = GET_SLOT(SW_VPD, install(cVegProd_names[12])));
 	p_Grasslands = REAL(Grasslands);
 	for (i = 0; i < 12; i++) {
@@ -1146,25 +1197,38 @@ void onSet_SW_VPD(SEXP SW_VPD) {
 	}
 
 	PROTECT(CO2Coefficients = GET_SLOT(SW_VPD, install(cVegProd_names[16])));
-	v->co2_bio_coeff1 = REAL(CO2Coefficients)[0];
-	v->co2_bio_coeff2 = REAL(CO2Coefficients)[1];
-	v->co2_wue_coeff1 = REAL(CO2Coefficients)[2];
-	v->co2_wue_coeff2 = REAL(CO2Coefficients)[3];
+	v->co2_bio_coeff1.grass = REAL(CO2Coefficients)[0];
+	v->co2_bio_coeff1.shrub = REAL(CO2Coefficients)[1];
+	v->co2_bio_coeff1.tree = REAL(CO2Coefficients)[2];
+	v->co2_bio_coeff1.forb = REAL(CO2Coefficients)[3];
+	v->co2_bio_coeff2.grass = REAL(CO2Coefficients)[4];
+	v->co2_bio_coeff2.shrub = REAL(CO2Coefficients)[5];
+	v->co2_bio_coeff2.tree = REAL(CO2Coefficients)[6];
+	v->co2_bio_coeff2.forb = REAL(CO2Coefficients)[7];
+	v->co2_wue_coeff1.grass = REAL(CO2Coefficients)[8];
+	v->co2_wue_coeff1.shrub = REAL(CO2Coefficients)[9];
+	v->co2_wue_coeff1.tree = REAL(CO2Coefficients)[10];
+	v->co2_wue_coeff1.forb = REAL(CO2Coefficients)[11];
+	v->co2_wue_coeff2.grass = REAL(CO2Coefficients)[12];
+	v->co2_wue_coeff2.shrub = REAL(CO2Coefficients)[13];
+	v->co2_wue_coeff2.tree = REAL(CO2Coefficients)[14];
+	v->co2_wue_coeff2.forb = REAL(CO2Coefficients)[15];
+
 
 	fraction_sum = v->fractionGrass + v->fractionShrub + v->fractionTree + v->fractionForb + v->fractionBareGround;
 	if (!EQ(fraction_sum, 1.0)) {
-			LogError(logfp, LOGWARN, "%s : Fractions of vegetation components were normalized, "
-					"sum of fractions (%5.4f) != 1.0.\nNew coefficients are:", MyFileName, fraction_sum);
-			v->fractionGrass /= fraction_sum;
-			v->fractionShrub /= fraction_sum;
-			v->fractionTree /= fraction_sum;
-			v->fractionBareGround /= fraction_sum;
-			v->fractionForb /= fraction_sum;
-			LogError(logfp, LOGWARN, "  Grassland fraction : %5.4f", v->fractionGrass);
-			LogError(logfp, LOGWARN, "  Shrubland fraction : %5.4f", v->fractionShrub);
-			LogError(logfp, LOGWARN, "  Forest/tree fraction : %5.4f", v->fractionTree);
-			LogError(logfp, LOGWARN, "  FORB fraction : %5.4f", v->fractionForb);
-			LogError(logfp, LOGWARN, "  Bare Ground fraction : %5.4f", v->fractionBareGround);
+		LogError(logfp, LOGWARN, "%s : Fractions of vegetation components were normalized, "
+			"sum of fractions (%5.4f) != 1.0.\nNew coefficients are:", MyFileName, fraction_sum);
+		v->fractionGrass /= fraction_sum;
+		v->fractionShrub /= fraction_sum;
+		v->fractionTree /= fraction_sum;
+		v->fractionBareGround /= fraction_sum;
+		v->fractionForb /= fraction_sum;
+		LogError(logfp, LOGWARN, "  Grassland fraction : %5.4f", v->fractionGrass);
+		LogError(logfp, LOGWARN, "  Shrubland fraction : %5.4f", v->fractionShrub);
+		LogError(logfp, LOGWARN, "  Forest/tree fraction : %5.4f", v->fractionTree);
+		LogError(logfp, LOGWARN, "  FORB fraction : %5.4f", v->fractionForb);
+		LogError(logfp, LOGWARN, "  Bare Ground fraction : %5.4f", v->fractionBareGround);
 	}
 
 	SW_VPD_init();
@@ -1186,24 +1250,24 @@ void SW_VPD_construct(void) {
 void SW_VPD_init(void) {
 	/* ================================================== */
 	/* set up vegetation parameters to be used in
-	 * the "watrflow" subroutine.
-	 *
-	 * History:
-	 *     Originally included in the FORTRAN model.
-	 *
-	 *     20-Oct-03 (cwb) removed the calculation of
-	 *        lai_corr and changed the lai_conv value of 80
-	 *        as found in the prod.in file.  The conversion
-	 *        factor is now simply a divisor rather than
-	 *        an equation.  Removed the following code:
-	 lai_corr = v->lai_conv[m] * (1. - pstem) + aconst * pstem;
-	 lai_standing    = v->biomass[m] / lai_corr;
-	 where pstem = 0.3,
-	 aconst = 464.0,
-	 conv_stcr = 3.0;
-	 *
-	 *
-	 */
+	* the "watrflow" subroutine.
+	*
+	* History:
+	*     Originally included in the FORTRAN model.
+	*
+	*     20-Oct-03 (cwb) removed the calculation of
+	*        lai_corr and changed the lai_conv value of 80
+	*        as found in the prod.in file.  The conversion
+	*        factor is now simply a divisor rather than
+	*        an equation.  Removed the following code:
+	lai_corr = v->lai_conv[m] * (1. - pstem) + aconst * pstem;
+	lai_standing    = v->biomass[m] / lai_corr;
+	where pstem = 0.3,
+	aconst = 464.0,
+	conv_stcr = 3.0;
+	*
+	*
+	*/
 
 	SW_VEGPROD *v = &SW_VegProd; /* convenience */
 	SW_CARBON  *c = &SW_Carbon;
@@ -1211,13 +1275,16 @@ void SW_VPD_init(void) {
 	TimeInt doy; /* base1 */
 	TimeInt year;
 
-	/* Apply this year's CO2 effects */
-	year = m->year + c->addtl_yr;
+	// Grab the real year so we can access CO2 data
+	year = m->year + c->addtl_yr;  // addtl_yr will be 0 unless we are running a future scenario
 	c->co2_bio_mult = c->co2_multipliers[BIO_INDEX][year];
 	c->co2_wue_mult = c->co2_multipliers[WUE_INDEX][year];
 
 	if (GT(v->fractionGrass, 0.)) {
-	  apply_CO2(v->grass.CO2_biomass, v->grass.biomass);
+		// CO2
+		apply_CO2(v->grass.CO2_biomass, v->grass.biomass, c->co2_bio_mult.grass);
+
+		// Interpolation
 		interpolate_monthlyValues(v->grass.litter, v->grass.litter_daily);
 		interpolate_monthlyValues(v->grass.CO2_biomass, v->grass.biomass_daily);
 		interpolate_monthlyValues(v->grass.pct_live, v->grass.pct_live_daily);
@@ -1225,7 +1292,10 @@ void SW_VPD_init(void) {
 	}
 
 	if (GT(v->fractionShrub, 0.)) {
-	  apply_CO2(v->shrub.CO2_biomass, v->shrub.biomass);
+		// CO2
+		apply_CO2(v->shrub.CO2_biomass, v->shrub.biomass, c->co2_bio_mult.shrub);
+
+		// Interpolation
 		interpolate_monthlyValues(v->shrub.litter, v->shrub.litter_daily);
 		interpolate_monthlyValues(v->shrub.CO2_biomass, v->shrub.biomass_daily);
 		interpolate_monthlyValues(v->shrub.pct_live, v->shrub.pct_live_daily);
@@ -1233,7 +1303,10 @@ void SW_VPD_init(void) {
 	}
 
 	if (GT(v->fractionTree, 0.)) {
-	  apply_CO2(v->tree.CO2_pct_live, v->tree.pct_live);
+		// CO2
+		apply_CO2(v->tree.CO2_pct_live, v->tree.pct_live, c->co2_bio_mult.tree);
+
+		// Interpolation
 		interpolate_monthlyValues(v->tree.litter, v->tree.litter_daily);
 		interpolate_monthlyValues(v->tree.biomass, v->tree.biomass_daily);
 		interpolate_monthlyValues(v->tree.CO2_pct_live, v->tree.pct_live_daily);
@@ -1241,7 +1314,10 @@ void SW_VPD_init(void) {
 	}
 
 	if (GT(v->fractionForb, 0.)) {
-	  apply_CO2(v->forb.CO2_biomass, v->forb.biomass);
+		// CO2
+		apply_CO2(v->forb.CO2_biomass, v->forb.biomass, c->co2_bio_mult.forb);
+
+		// Interpolation
 		interpolate_monthlyValues(v->forb.litter, v->forb.litter_daily);
 		interpolate_monthlyValues(v->forb.CO2_biomass, v->forb.biomass_daily);
 		interpolate_monthlyValues(v->forb.pct_live, v->forb.pct_live_daily);
@@ -1254,19 +1330,21 @@ void SW_VPD_init(void) {
 			v->grass.pct_cover_daily[doy] = lai_standing / v->grass.conv_stcr;
 			if (GT(v->grass.canopy_height_constant, 0.)) {
 				v->grass.veg_height_daily[doy] = v->grass.canopy_height_constant;
-			} else {
+			}
+			else {
 				v->grass.veg_height_daily[doy] = tanfunc(v->grass.biomass_daily[doy],
-						v->grass.cnpy.xinflec,
-						v->grass.cnpy.yinflec,
-						v->grass.cnpy.range,
-						v->grass.cnpy.slope); /* used for vegcov and for snowdepth_scale */
+					v->grass.cnpy.xinflec,
+					v->grass.cnpy.yinflec,
+					v->grass.cnpy.range,
+					v->grass.cnpy.slope); /* used for vegcov and for snowdepth_scale */
 			}
 			v->grass.lai_live_daily[doy] = lai_standing * v->grass.pct_live_daily[doy];
 			v->grass.vegcov_daily[doy] = v->grass.pct_cover_daily[doy] * v->grass.veg_height_daily[doy]; /* used for vegetation interception */
 			v->grass.biolive_daily[doy] = v->grass.biomass_daily[doy] * v->grass.pct_live_daily[doy];
 			v->grass.biodead_daily[doy] = v->grass.biomass_daily[doy] - v->grass.biolive_daily[doy]; /* used for transpiration */
 			v->grass.total_agb_daily[doy] = v->grass.litter_daily[doy] + v->grass.biomass_daily[doy]; /* used for bare-soil evaporation */
-		} else {
+		}
+		else {
 			v->grass.lai_live_daily[doy] = 0.;
 			v->grass.vegcov_daily[doy] = 0.;
 			v->grass.biolive_daily[doy] = 0.;
@@ -1279,19 +1357,21 @@ void SW_VPD_init(void) {
 			v->shrub.pct_cover_daily[doy] = lai_standing / v->shrub.conv_stcr;
 			if (GT(v->shrub.canopy_height_constant, 0.)) {
 				v->shrub.veg_height_daily[doy] = v->shrub.canopy_height_constant;
-			} else {
+			}
+			else {
 				v->shrub.veg_height_daily[doy] = tanfunc(v->shrub.biomass_daily[doy],
-						v->shrub.cnpy.xinflec,
-						v->shrub.cnpy.yinflec,
-						v->shrub.cnpy.range,
-						v->shrub.cnpy.slope); /* used for vegcov and for snowdepth_scale */
+					v->shrub.cnpy.xinflec,
+					v->shrub.cnpy.yinflec,
+					v->shrub.cnpy.range,
+					v->shrub.cnpy.slope); /* used for vegcov and for snowdepth_scale */
 			}
 			v->shrub.lai_live_daily[doy] = lai_standing * v->shrub.pct_live_daily[doy];
 			v->shrub.vegcov_daily[doy] = v->shrub.pct_cover_daily[doy] * v->shrub.veg_height_daily[doy]; /* used for vegetation interception */
 			v->shrub.biolive_daily[doy] = v->shrub.biomass_daily[doy] * v->shrub.pct_live_daily[doy];
 			v->shrub.biodead_daily[doy] = v->shrub.biomass_daily[doy] - v->shrub.biolive_daily[doy]; /* used for transpiration */
 			v->shrub.total_agb_daily[doy] = v->shrub.litter_daily[doy] + v->shrub.biomass_daily[doy]; /* used for bare-soil evaporation */
-		} else {
+		}
+		else {
 			v->shrub.lai_live_daily[doy] = 0.;
 			v->shrub.vegcov_daily[doy] = 0.;
 			v->shrub.biolive_daily[doy] = 0.;
@@ -1304,19 +1384,21 @@ void SW_VPD_init(void) {
 			v->tree.pct_cover_daily[doy] = lai_standing / v->tree.conv_stcr;
 			if (GT(v->tree.canopy_height_constant, 0.)) {
 				v->tree.veg_height_daily[doy] = v->tree.canopy_height_constant;
-			} else {
+			}
+			else {
 				v->tree.veg_height_daily[doy] = tanfunc(v->tree.biomass_daily[doy],
-						v->tree.cnpy.xinflec,
-						v->tree.cnpy.yinflec,
-						v->tree.cnpy.range,
-						v->tree.cnpy.slope); /* used for vegcov and for snowdepth_scale */
+					v->tree.cnpy.xinflec,
+					v->tree.cnpy.yinflec,
+					v->tree.cnpy.range,
+					v->tree.cnpy.slope); /* used for vegcov and for snowdepth_scale */
 			}
 			v->tree.lai_live_daily[doy] = lai_standing * v->tree.pct_live_daily[doy]; /* used for vegetation interception */
 			v->tree.vegcov_daily[doy] = v->tree.pct_cover_daily[doy] * v->tree.veg_height_daily[doy];
 			v->tree.biolive_daily[doy] = v->tree.biomass_daily[doy] * v->tree.pct_live_daily[doy];
 			v->tree.biodead_daily[doy] = v->tree.biomass_daily[doy] - v->tree.biolive_daily[doy]; /* used for transpiration */
 			v->tree.total_agb_daily[doy] = v->tree.litter_daily[doy] + v->tree.biolive_daily[doy]; /* used for bare-soil evaporation */
-		} else {
+		}
+		else {
 			v->tree.lai_live_daily[doy] = 0.;
 			v->tree.vegcov_daily[doy] = 0.;
 			v->tree.biolive_daily[doy] = 0.;
@@ -1329,19 +1411,21 @@ void SW_VPD_init(void) {
 			v->forb.pct_cover_daily[doy] = lai_standing / v->forb.conv_stcr;
 			if (GT(v->forb.canopy_height_constant, 0.)) {
 				v->forb.veg_height_daily[doy] = v->forb.canopy_height_constant;
-			} else {
+			}
+			else {
 				v->forb.veg_height_daily[doy] = tanfunc(v->forb.biomass_daily[doy],
-						v->forb.cnpy.xinflec,
-						v->forb.cnpy.yinflec,
-						v->forb.cnpy.range,
-						v->forb.cnpy.slope); /* used for vegcov and for snowdepth_scale */
+					v->forb.cnpy.xinflec,
+					v->forb.cnpy.yinflec,
+					v->forb.cnpy.range,
+					v->forb.cnpy.slope); /* used for vegcov and for snowdepth_scale */
 			}
 			v->forb.lai_live_daily[doy] = lai_standing * v->forb.pct_live_daily[doy]; /* used for vegetation interception */
 			v->forb.vegcov_daily[doy] = v->forb.pct_cover_daily[doy] * v->forb.veg_height_daily[doy];
 			v->forb.biolive_daily[doy] = v->forb.biomass_daily[doy] * v->forb.pct_live_daily[doy];
 			v->forb.biodead_daily[doy] = v->forb.biomass_daily[doy] - v->forb.biolive_daily[doy]; /* used for transpiration */
 			v->forb.total_agb_daily[doy] = v->forb.litter_daily[doy] + v->forb.biolive_daily[doy]; /* used for bare-soil evaporation */
-		} else {
+		}
+		else {
 			v->forb.lai_live_daily[doy] = 0.;
 			v->forb.vegcov_daily[doy] = 0.;
 			v->forb.biolive_daily[doy] = 0.;
@@ -1358,36 +1442,36 @@ static void _echo_inits(void) {
 	char outstr[1500];
 
 	sprintf(errstr, "\n==============================================\n"
-			"Vegetation Production Parameters\n\n");
+		"Vegetation Production Parameters\n\n");
 	strcpy(outstr, errstr);
 	LogError(logfp, LOGNOTE, outstr);
 
 	sprintf(errstr, "Grassland component\t= %1.2f\n"
-			"\tAlbedo\t= %1.2f\n"
-			"\tHydraulic redistribution flag\t= %d\n", v->fractionGrass, v->grass.albedo, v->grass.flagHydraulicRedistribution);
+		"\tAlbedo\t= %1.2f\n"
+		"\tHydraulic redistribution flag\t= %d\n", v->fractionGrass, v->grass.albedo, v->grass.flagHydraulicRedistribution);
 	strcpy(outstr, errstr);
 	LogError(logfp, LOGNOTE, outstr);
 
 	sprintf(errstr, "Shrubland component\t= %1.2f\n"
-			"\tAlbedo\t= %1.2f\n"
-			"\tHydraulic redistribution flag\t= %d\n", v->fractionShrub, v->shrub.albedo, v->shrub.flagHydraulicRedistribution);
+		"\tAlbedo\t= %1.2f\n"
+		"\tHydraulic redistribution flag\t= %d\n", v->fractionShrub, v->shrub.albedo, v->shrub.flagHydraulicRedistribution);
 	strcpy(outstr, errstr);
 	LogError(logfp, LOGNOTE, outstr);
 
 	sprintf(errstr, "Forest-Tree component\t= %1.2f\n"
-			"\tAlbedo\t= %1.2f\n"
-			"\tHydraulic redistribution flag\t= %d\n", v->fractionTree, v->tree.albedo, v->tree.flagHydraulicRedistribution);
+		"\tAlbedo\t= %1.2f\n"
+		"\tHydraulic redistribution flag\t= %d\n", v->fractionTree, v->tree.albedo, v->tree.flagHydraulicRedistribution);
 	strcpy(outstr, errstr);
 	LogError(logfp, LOGNOTE, outstr);
 
 	sprintf(errstr, "FORB component\t= %1.2f\n"
-			"\tAlbedo\t= %1.2f\n"
-			"\tHydraulic redistribution flag\t= %d\n", v->fractionForb, v->forb.albedo, v->forb.flagHydraulicRedistribution);
+		"\tAlbedo\t= %1.2f\n"
+		"\tHydraulic redistribution flag\t= %d\n", v->fractionForb, v->forb.albedo, v->forb.flagHydraulicRedistribution);
 	strcpy(outstr, errstr);
 	LogError(logfp, LOGNOTE, outstr);
 
 	sprintf(errstr, "Bare Ground component\t= %1.2f\n"
-			"\tAlbedo\t= %1.2f\n", v->fractionBareGround, v->bareGround_albedo);
+		"\tAlbedo\t= %1.2f\n", v->fractionBareGround, v->bareGround_albedo);
 	strcpy(outstr, errstr);
 	LogError(logfp, LOGNOTE, outstr);
 }
diff --git a/SW_VegProd.h b/SW_VegProd.h
index 42fdefa87..c69a68bd8 100644
--- a/SW_VegProd.h
+++ b/SW_VegProd.h
@@ -35,6 +35,8 @@
 #define SW_VEGPROD_H
 
 #include "SW_Defines.h"    /* for MAX_MONTHS and tanfunc_t*/
+#include "SW_Carbon.h"     /* for PFTs structure */
+
 #ifdef RSOILWAT
 #include <R.h>
 #include <Rdefines.h>
@@ -98,7 +100,7 @@ typedef struct {
 
 	RealD bareGround_albedo; /* create this here instead of creating a bareGround VegType, because it only needs albedo and no other data member */
 
-	RealD co2_bio_coeff1, co2_bio_coeff2, co2_wue_coeff1, co2_wue_coeff2;
+	PFTs co2_bio_coeff1, co2_bio_coeff2, co2_wue_coeff1, co2_wue_coeff2;
 
 } SW_VEGPROD;
 
diff --git a/testing/Input/sbe_prod_v31.in b/testing/Input/sbe_prod_v31.in
index 9632d9f27..260841e70 100755
--- a/testing/Input/sbe_prod_v31.in
+++ b/testing/Input/sbe_prod_v31.in
@@ -1,149 +1,151 @@
 # Plant production data file for SOILWAT
-# Location:
-
-# ---- Composition of vegetation type components (0-1; must add up to 1)
-# Grasses	Shrubs		Trees		Forbs		Bare Ground
-0.0			0.0			0.0			1.0			0.0
-
-
-# ---- Albedo
-# Grasses	Shrubs		Trees		Forbs		Bare Ground
-0.167		0.143		0.106		0.167		0.15	# albedo:	(Houldcroft et al. 2009) MODIS snowfree 'grassland', 'open shrub', ‘evergreen needle forest’ with MODIS albedo aggregated over pure IGBP cells where NDVI is greater than the 98th percentile NDVI
-
-
-# ---- % Cover: divide standing LAI by this to get % cover
-# Grasses	Shrubs		Trees		Forbs
-3.0			2.22		5.			3.0
-
-
-# -- Canopy height (cm) parameters either constant through season or as tanfunc with respect to biomass (g/m^2)
-# Grasses	Shrubs		Trees		Forbs
-300.0		0.0			0.0     	300.0	# xinflec
-29.5		5.0			5.0     	29.5	# yinflec
-85.			100.		3000.		85.		# range
-0.002		0.003		0.00008 	0.002	# slope
-0.			50.			1200.		0.		# if > 0 then constant canopy height (cm)
-
-
-# --- Vegetation interception parameters for equation: intercepted rain = (a + b*veg) + (c+d*veg) * ppt; Grasses+Shrubs: veg=vegcov, Trees: veg=LAI
-# Grasses	Shrubs		Trees		Forbs
-0.0182		0.			0.00461		0.0182	# a
-0.0065		0.0026		0.01405		0.0065	# b
-0.0019		0.			0.0383		0.0019	# c
-0.0054		0.0033		0.0337		0.0054	# d
-
-
-# --- Litter interception parameters for equation: intercepted rain = (a + b*litter) + (c+d*litter) * ppt
-# Grass-Litter	Shrub-Litter	Tree-Litter	Forbs-Litter
-0.0151			0.0151			0.0151		0.0151	# a
-0.00005			0.00005			0.00005		0.00005	# b
-0.0116			0.0116			0.0116		0.0116	# c
-0.00002			0.00002			0.00002		0.00002	# d
-
-
-# ---- Parameter for partitioning of bare-soil evaporation and transpiration as in Es = exp(-param*LAI)
-# Grasses	Shrubs		Trees		Forbs
-1.			1.			0.41		1.	# Trees: According to a regression based on a review by Daikoku, K., S. Hattori, A. Deguchi, Y. Aoki, M. Miyashita, K. Matsumoto, J. Akiyama, S. Iida, T. Toba, Y. Fujita, and T. Ohta. 2008. Influence of evaporation from the forest floor on evapotranspiration from the dry canopy. Hydrological Processes 22:4083-4096.
-
-
-# ---- Parameter for scaling and limiting bare soil evaporation rate: if totagb (g/m2) > param then no bare-soil evaporation
-# Grasses	Shrubs		Trees		Forbs
-999.		999.		2099.		999.	#
-
-
-# --- Shade effects on transpiration based on live and dead biomass
-# Grasses	Shrubs		Trees		Forbs
-0.3			0.3			0.3			0.3		# shade scale
-150.		150.		150.		150.	# shade maximal dead biomass
-300.		300.		0.			300.	# tanfunc: xinflec
-12.			12.			0.			12.		# yinflec
-34.			34.			2.			34.		# range
-0.002		0.002		0.0002		0.002	# slope
-
-
-# ---- Hydraulic redistribution: Ryel, Ryel R, Caldwell, Caldwell M, Yoder, Yoder C, Or, Or D, Leffler, Leffler A. 2002. Hydraulic redistribution in a stand of Artemisia tridentata: evaluation of benefits to transpiration assessed with a simulation model. Oecologia 130: 173-184.
-# Grasses	Shrubs		Trees		Forbs
-1			1			1			1		# flag to turn on/off (1/0) hydraulic redistribution
--0.2328		-0.2328		-0.2328		-0.2328	# maxCondroot - maximum radial soil-root conductance of the entire active root system for water (cm/-bar/day) = 0.097 cm/MPa/h
-10.			10.			10.			10.		# swp50 - soil water potential (-bar) where conductance is reduced by 50% = -1. MPa
-3.22		3.22		3.22		3.22	# shapeCond - shaping parameter for the empirical relationship from van Genuchten to model relative soil-root conductance for water
-
-
-# ---- Critical soil water potential (MPa), i.e., when transpiration rates cannot sustained anymore, for instance, for many crop species -1.5 MPa is assumed and called wilting point
-# Grasses	Shrubs		Trees		Forbs
--3.5		-3.9		-2.0		-2.0
-
-# CO2 Coefficients: Coeff1 * ppm^Coeff2
-# Biomass
-# Coeff1 Coeff2
-  0.127 0.3501 0. 0.
-# WUE
-# Coeff1 Coeff2
-  22.464 -0.531 0. 0.
-
-# Grasslands component:
-# -------------- Monthly production values ------------
-# Litter   - dead leafy material on the ground (g/m^2 ).
-# Biomass  - living and dead/woody aboveground standing biomass (g/m^2).
-# %Live    - proportion of Biomass that is actually living (0-1.0).
-# LAI_conv - monthly amount of biomass needed to produce LAI=1.0 (g/m^2).
-# There should be 12 rows, one for each month, starting with January.
-#
-#Litter  Biomass  %Live LAI_conv
- 75.0    150.0    0.00  300.     # January
- 80.0    150.0    0.00  300.     # February
- 85.0    150.0    0.10  300.     # March
- 90.0    170.0    0.20  300.     # April
- 50.0    190.0    0.40  300.     # May
- 50.0    220.0    0.60  300.     # June
- 50.0    250.0    0.40  300.     # July
- 55.0    220.0    0.60  300.     # August
- 60.0    190.0    0.40  300.     # September
- 65.0    180.0    0.20  300.     # October
- 70.0    170.0    0.10  300.     # November
- 75.0    160.0    0.00  300.     # December
-
-# Shrublands component:
-#Litter  Biomass  %Live LAI_conv
-85.4   210.0     0.06     372      # January
-88.2   212.0     0.08     372      # February
-95.3   228.0     0.20     372      # March
-100.5   272.0     0.33     372      # April
-166.4   400.0     0.57     372      # May
-186.0   404.0     0.55     372      # June
-177.1   381.0     0.50     372      # July
-212.2   352.0     0.46     372      # August
-157.4   286.0     0.32     372      # September
-124.9   235.0     0.15     372      # October
-110.4   218.0     0.08     372      # November
-104.3   214.0     0.06     372      # December
-
-# Forest component:
-#Litter  Biomass  %Live 	LAI_conv
-2000	15000     0.083		500      # January
-2000	15000     0.083		500      # February
-2000	15000     0.083		500      # March
-2000	15000     0.083		500      # April
-2000	15000     0.083		500     # May
-2000	15000     0.083		500      # June
-2000	15000     0.083		500      # July
-2000	15000     0.083		500      # August
-2000	15000     0.083		500      # September
-2000	15000     0.083		500      # October
-2000	15000     0.083		500      # November
-2000	15000     0.083		500      # December
-
-# FORB component:
-#Litter  Biomass  %Live LAI_conv
- 75.0    150.0    0.00  300.     # January
- 80.0    150.0    0.00  300.     # February
- 85.0    150.0    0.10  300.     # March
- 90.0    170.0    0.20  300.     # April
- 50.0    190.0    0.40  300.     # May
- 50.0    220.0    0.60  300.     # June
- 50.0    250.0    0.40  300.     # July
- 55.0    220.0    0.60  300.     # August
- 60.0    190.0    0.40  300.     # September
- 65.0    180.0    0.20  300.     # October
- 70.0    170.0    0.10  300.     # November
- 75.0    160.0    0.00  300.     # December
+# Location:
+
+# ---- Composition of vegetation type components (0-1; must add up to 1)
+# Grasses	Shrubs		Trees		Forbs		Bare Ground
+0.0			0.0			0.0			1.0			0.0
+
+
+# ---- Albedo
+# Grasses	Shrubs		Trees		Forbs		Bare Ground
+0.167		0.143		0.106		0.167		0.15	# albedo:	(Houldcroft et al. 2009) MODIS snowfree 'grassland', 'open shrub', ‘evergreen needle forest’ with MODIS albedo aggregated over pure IGBP cells where NDVI is greater than the 98th percentile NDVI
+
+
+# ---- % Cover: divide standing LAI by this to get % cover
+# Grasses	Shrubs		Trees		Forbs
+3.0			2.22		5.			3.0
+
+
+# -- Canopy height (cm) parameters either constant through season or as tanfunc with respect to biomass (g/m^2)
+# Grasses	Shrubs		Trees		Forbs
+300.0		0.0			0.0     	300.0	# xinflec
+29.5		5.0			5.0     	29.5	# yinflec
+85.			100.		3000.		85.		# range
+0.002		0.003		0.00008 	0.002	# slope
+0.			50.			1200.		0.		# if > 0 then constant canopy height (cm)
+
+
+# --- Vegetation interception parameters for equation: intercepted rain = (a + b*veg) + (c+d*veg) * ppt; Grasses+Shrubs: veg=vegcov, Trees: veg=LAI
+# Grasses	Shrubs		Trees		Forbs
+0.0182		0.			0.00461		0.0182	# a
+0.0065		0.0026		0.01405		0.0065	# b
+0.0019		0.			0.0383		0.0019	# c
+0.0054		0.0033		0.0337		0.0054	# d
+
+
+# --- Litter interception parameters for equation: intercepted rain = (a + b*litter) + (c+d*litter) * ppt
+# Grass-Litter	Shrub-Litter	Tree-Litter	Forbs-Litter
+0.0151			0.0151			0.0151		0.0151	# a
+0.00005			0.00005			0.00005		0.00005	# b
+0.0116			0.0116			0.0116		0.0116	# c
+0.00002			0.00002			0.00002		0.00002	# d
+
+
+# ---- Parameter for partitioning of bare-soil evaporation and transpiration as in Es = exp(-param*LAI)
+# Grasses	Shrubs		Trees		Forbs
+1.			1.			0.41		1.	# Trees: According to a regression based on a review by Daikoku, K., S. Hattori, A. Deguchi, Y. Aoki, M. Miyashita, K. Matsumoto, J. Akiyama, S. Iida, T. Toba, Y. Fujita, and T. Ohta. 2008. Influence of evaporation from the forest floor on evapotranspiration from the dry canopy. Hydrological Processes 22:4083-4096.
+
+
+# ---- Parameter for scaling and limiting bare soil evaporation rate: if totagb (g/m2) > param then no bare-soil evaporation
+# Grasses	Shrubs		Trees		Forbs
+999.		999.		2099.		999.	#
+
+
+# --- Shade effects on transpiration based on live and dead biomass
+# Grasses	Shrubs		Trees		Forbs
+0.3			0.3			0.3			0.3		# shade scale
+150.		150.		150.		150.	# shade maximal dead biomass
+300.		300.		0.			300.	# tanfunc: xinflec
+12.			12.			0.			12.		# yinflec
+34.			34.			2.			34.		# range
+0.002		0.002		0.0002		0.002	# slope
+
+
+# ---- Hydraulic redistribution: Ryel, Ryel R, Caldwell, Caldwell M, Yoder, Yoder C, Or, Or D, Leffler, Leffler A. 2002. Hydraulic redistribution in a stand of Artemisia tridentata: evaluation of benefits to transpiration assessed with a simulation model. Oecologia 130: 173-184.
+# Grasses	Shrubs		Trees		Forbs
+1			1			1			1		# flag to turn on/off (1/0) hydraulic redistribution
+-0.2328		-0.2328		-0.2328		-0.2328	# maxCondroot - maximum radial soil-root conductance of the entire active root system for water (cm/-bar/day) = 0.097 cm/MPa/h
+10.			10.			10.			10.		# swp50 - soil water potential (-bar) where conductance is reduced by 50% = -1. MPa
+3.22		3.22		3.22		3.22	# shapeCond - shaping parameter for the empirical relationship from van Genuchten to model relative soil-root conductance for water
+
+
+# ---- Critical soil water potential (MPa), i.e., when transpiration rates cannot sustained anymore, for instance, for many crop species -1.5 MPa is assumed and called wilting point
+# Grasses	Shrubs		Trees		Forbs
+-3.5		-3.9		-2.0		-2.0
+
+# CO2 Coefficients: Coeff1 * ppm^Coeff2
+# Biomass
+# Grasses  Shrubs  Trees  Forbs
+  0.127    0.127   0.127  0.127  # Coeff1
+  0.3501   0.3501  0.3501 0.3501 # Coeff2
+# WUE
+# Grasses  Shrubs  Trees  Forbs
+  22.464   22.464  22.464 22.464 # Coeff1
+  -0.531   -0.531  -0.531 -0.531 # Coeff2
+
+# Grasslands component:
+# -------------- Monthly production values ------------
+# Litter   - dead leafy material on the ground (g/m^2 ).
+# Biomass  - living and dead/woody aboveground standing biomass (g/m^2).
+# %Live    - proportion of Biomass that is actually living (0-1.0).
+# LAI_conv - monthly amount of biomass needed to produce LAI=1.0 (g/m^2).
+# There should be 12 rows, one for each month, starting with January.
+#
+#Litter  Biomass  %Live LAI_conv
+ 75.0    150.0    0.00  300.     # January
+ 80.0    150.0    0.00  300.     # February
+ 85.0    150.0    0.10  300.     # March
+ 90.0    170.0    0.20  300.     # April
+ 50.0    190.0    0.40  300.     # May
+ 50.0    220.0    0.60  300.     # June
+ 50.0    250.0    0.40  300.     # July
+ 55.0    220.0    0.60  300.     # August
+ 60.0    190.0    0.40  300.     # September
+ 65.0    180.0    0.20  300.     # October
+ 70.0    170.0    0.10  300.     # November
+ 75.0    160.0    0.00  300.     # December
+
+# Shrublands component:
+#Litter  Biomass  %Live LAI_conv
+85.4   210.0     0.06     372      # January
+88.2   212.0     0.08     372      # February
+95.3   228.0     0.20     372      # March
+100.5   272.0     0.33     372      # April
+166.4   400.0     0.57     372      # May
+186.0   404.0     0.55     372      # June
+177.1   381.0     0.50     372      # July
+212.2   352.0     0.46     372      # August
+157.4   286.0     0.32     372      # September
+124.9   235.0     0.15     372      # October
+110.4   218.0     0.08     372      # November
+104.3   214.0     0.06     372      # December
+
+# Forest component:
+#Litter  Biomass  %Live 	LAI_conv
+2000	15000     0.083		500      # January
+2000	15000     0.083		500      # February
+2000	15000     0.083		500      # March
+2000	15000     0.083		500      # April
+2000	15000     0.083		500     # May
+2000	15000     0.083		500      # June
+2000	15000     0.083		500      # July
+2000	15000     0.083		500      # August
+2000	15000     0.083		500      # September
+2000	15000     0.083		500      # October
+2000	15000     0.083		500      # November
+2000	15000     0.083		500      # December
+
+# FORB component:
+#Litter  Biomass  %Live LAI_conv
+ 75.0    150.0    0.00  300.     # January
+ 80.0    150.0    0.00  300.     # February
+ 85.0    150.0    0.10  300.     # March
+ 90.0    170.0    0.20  300.     # April
+ 50.0    190.0    0.40  300.     # May
+ 50.0    220.0    0.60  300.     # June
+ 50.0    250.0    0.40  300.     # July
+ 55.0    220.0    0.60  300.     # August
+ 60.0    190.0    0.40  300.     # September
+ 65.0    180.0    0.20  300.     # October
+ 70.0    170.0    0.10  300.     # November
+ 75.0    160.0    0.00  300.     # December