Merge branch 'develop' of https://github.com/NREL/ssc into ssc_1378_custom_generation_lifetime

Author: brtietz

shared/lib_irradproc.h

@@ -89,7 +89,7 @@ void solarpos(int year, int month, int day, int hour, double minute, double lat,
 /** @defgroup solarpos_spa Solar Position Algorithm group/
 *   The functions in this group are used to calculate the sun's position at any given timestep
 *   based on the Solar Position Algorithm reported by Reda and Andreas in NREL/TP-560-34302, 2008.
-*   The functions used in this implementation were taken from a C code implementation provided at https://midcdmz.nrel.gov/spa/
+*   The functions used in this implementation were taken from a C code implementation provided at https://midcdmz.nlr.gov/spa/
 *   @{
 */
 /**

solarpilot/interop.cpp

@@ -2491,7 +2491,7 @@ void grid_emulator_base::AddRow(int row, std::string label, std::string units, d
 	//Row adding method for simple performance runs
 
 	if ((GetNumberCols() < 6) || (GetNumberRows() < row + 1))
-		throw spexception("Sorry! Results table incorrectly formatted. Please contact solarpilot.support@nrel.gov for help.");
+		throw spexception("Sorry! Results table incorrectly formatted. Please contact solarpilot.support@nlr.gov for help.");
 
 	bool is_currency = false;
 	if (units.find("$") != std::string::npos) is_currency = true;

ssc/cmod_communitysolar.cpp

@@ -3298,7 +3298,7 @@ void cm_pvsamv1::exec()
 
         // calculate system performance factor
         // reference: (http://files.sma.de/dl/7680/Perfratio-UEN100810.pdf)
-        // additional reference: (http://www.nrel.gov/docs/fy05osti/37358.pdf)
+        // additional reference: (http://www.nlr.gov/docs/fy05osti/37358.pdf)
         // PR = net_ac (kWh) / ( total input radiation (kWh) * stc efficiency (%) )
         // bug fix 6/15/15 jmf: total input radiation for PR should NOT including shading or soiling, hence use Nominal value.
         assign("performance_ratio", var_data((ssc_number_t)(ac_net / (nom_rad * mod_eff / 100.0))));

ssc/cmod_equpartflip.cpp

@@ -839,20 +839,6 @@ enum {
     CF_util_escal_rate,
 
 
-    // SAM 1038
-    CF_itc_fed_amount,
-    CF_itc_fed_percent_fraction,
-    CF_itc_fed_percent_amount,
-    CF_itc_fed_percent_maxvalue,
-    CF_itc_fed,
-    CF_itc_sta_amount,
-    CF_itc_sta_percent_fraction,
-    CF_itc_sta_percent_amount,
-    CF_itc_sta_percent_maxvalue,
-    CF_itc_sta,
-    CF_itc_total,
-
-
     CF_max,
  };