Merge pull request #1352 from NREL/ssc_195_day_of_week_improvements

Ssc 195 day of week improvements

Author: brtietz

shared/lib_battery_dispatch_manual.cpp

@@ -45,11 +45,13 @@ dispatch_manual_t::dispatch_manual_t(battery_t * Battery, double dt, double SOC_
 	util::matrix_t<size_t> dm_dynamic_sched, util::matrix_t<size_t> dm_dynamic_sched_weekend,
 	std::vector<bool> dm_charge, std::vector<bool> dm_discharge, std::vector<bool> dm_gridcharge, std::vector<bool> dm_fuelcellcharge, std::vector<bool> dm_btm_to_grid,
 	std::map<size_t, double>  dm_percent_discharge, std::map<size_t, double>  dm_percent_gridcharge, bool can_clip_charge, bool can_curtail_charge, double interconnection_limit,
+    size_t start_day_of_year,
     bool chargeOnlySystemExceedLoad, bool dischargeOnlyLoadExceedSystem, double SOC_min_outage, bool priorityChargeBattery)
 	: dispatch_t(Battery, dt, SOC_min, SOC_max, current_choice, Ic_max, Id_max, Pc_max_kwdc, Pd_max_kwdc, Pc_max_kwac, Pd_max_kwac,
 	t_min, mode, battMeterPosition, interconnection_limit, chargeOnlySystemExceedLoad, dischargeOnlyLoadExceedSystem, SOC_min_outage)
 {
-	init_with_vects(dm_dynamic_sched, dm_dynamic_sched_weekend, dm_charge, dm_discharge, dm_gridcharge, dm_fuelcellcharge, dm_btm_to_grid, dm_percent_discharge, dm_percent_gridcharge, can_clip_charge, can_curtail_charge, priorityChargeBattery);
+	init_with_vects(dm_dynamic_sched, dm_dynamic_sched_weekend, dm_charge, dm_discharge, dm_gridcharge, dm_fuelcellcharge, dm_btm_to_grid, dm_percent_discharge, dm_percent_gridcharge,
+        can_clip_charge, can_curtail_charge, priorityChargeBattery, start_day_of_year);
 }
 
 void dispatch_manual_t::init_with_vects(
@@ -64,7 +66,8 @@ void dispatch_manual_t::init_with_vects(
 	std::map<size_t, double> dm_percent_gridcharge,
     bool can_clip_charge,
     bool can_curtail_charge,
-    bool priorityChargeBattery)
+    bool priorityChargeBattery,
+    size_t start_day_of_year)
 {
 	_sched = dm_dynamic_sched;
 	_sched_weekend = dm_dynamic_sched_weekend;
@@ -79,6 +82,7 @@ void dispatch_manual_t::init_with_vects(
     _can_curtail_charge = can_curtail_charge;
     _priority_charge_battery = priorityChargeBattery;
     _iprofile = 0;
+    _start_day_of_year = start_day_of_year;
 }
 
 // deep copy from dispatch to this
@@ -88,7 +92,7 @@ dispatch_t(dispatch)
 	const dispatch_manual_t * tmp = dynamic_cast<const dispatch_manual_t *>(&dispatch);
 	init_with_vects(tmp->_sched, tmp->_sched_weekend,
 		tmp->_charge_array, tmp->_discharge_array, tmp->_gridcharge_array, tmp->_fuelcellcharge_array, tmp->_discharge_grid_array,
-		tmp->_percent_discharge_array, tmp->_percent_charge_array, tmp->_can_clip_charge, tmp->_can_curtail_charge, tmp->_priority_charge_battery);
+		tmp->_percent_discharge_array, tmp->_percent_charge_array, tmp->_can_clip_charge, tmp->_can_curtail_charge, tmp->_priority_charge_battery, tmp->_start_day_of_year);
 }
 
 // shallow copy from dispatch to this
@@ -98,7 +102,7 @@ void dispatch_manual_t::copy(const dispatch_t * dispatch)
 	const dispatch_manual_t * tmp = dynamic_cast<const dispatch_manual_t *>(dispatch);
 	init_with_vects(tmp->_sched, tmp->_sched_weekend,
 		tmp->_charge_array, tmp->_discharge_array, tmp->_gridcharge_array, tmp->_fuelcellcharge_array, tmp->_discharge_grid_array,
-		tmp->_percent_discharge_array, tmp->_percent_charge_array, tmp->_can_clip_charge, tmp->_can_curtail_charge, tmp->_priority_charge_battery);
+		tmp->_percent_discharge_array, tmp->_percent_charge_array, tmp->_can_clip_charge, tmp->_can_curtail_charge, tmp->_priority_charge_battery, tmp->_start_day_of_year);
 }
 
 void dispatch_manual_t::prepareDispatch(size_t hour_of_year, size_t )
@@ -108,7 +112,7 @@ void dispatch_manual_t::prepareDispatch(size_t hour_of_year, size_t )
 	size_t column = h - 1;
 	_iprofile = 0;
 
-	bool is_weekday = util::weekday(hour_of_year);
+	bool is_weekday = util::weekday(hour_of_year, _start_day_of_year);
 	if (!is_weekday && _mode == MANUAL)
         _iprofile = _sched_weekend(m - 1, column);
 	else

shared/lib_battery_dispatch_manual.h

@@ -67,6 +67,7 @@ class dispatch_manual_t : public dispatch_t
         bool can_clip_charge,
         bool can_curtail_charge,
         double interconnection_limit,
+        size_t start_day_of_year,
         bool chargeOnlySystemExceedLoad = true,
         bool dischargeOnlyLoadExceedSystem = true,
         double SOC_min_outage = 0.0,
@@ -104,7 +105,8 @@ class dispatch_manual_t : public dispatch_t
 		std::map<size_t, double> dm_percent_gridcharge,
         bool can_clip_charge,
         bool can_curtail_charge,
-        bool priorityChargeBattery);
+        bool priorityChargeBattery,
+        size_t start_day_of_year);
 
 	void SOC_controller() override;
 	bool check_constraints(double &I, size_t count) override;
@@ -129,6 +131,8 @@ class dispatch_manual_t : public dispatch_t
 	std::map<size_t, double> _percent_discharge_array;
 	std::map<size_t, double> _percent_charge_array;
 
+    size_t _start_day_of_year;
+
 };
 
 #endif // __LIB_BATTERY_DISPATCH_MANUAL_H__

shared/lib_fuel_cell_dispatch.cpp

@@ -39,13 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "lib_power_electronics.h"
 
 
-FuelCellDispatch::FuelCellDispatch(FuelCell * fuelCell, size_t numberOfUnits, int dispatchOption, int shutdownOption, double dt_hour, double fixed_percent, 
+FuelCellDispatch::FuelCellDispatch(FuelCell * fuelCell, size_t numberOfUnits, int dispatchOption, int shutdownOption, double dt_hour, double fixed_percent, size_t start_day_of_year,
 	std::vector<double> dispatchInput_kW, std::vector<bool> canCharge, std::vector<bool> canDischarge, 
 	std::map<size_t, double> discharge_percent, std::map<size_t, size_t> discharge_units, util::matrix_t<size_t> scheduleWeekday, util::matrix_t<size_t> scheduleWeekend)
 	: m_powerTotal_kW(0), m_numberOfUnits(numberOfUnits), m_dispatchOption(dispatchOption), m_shutdownOption(shutdownOption), dt_hour(dt_hour), m_fixed_percent(fixed_percent * 0.01), 
 	m_dispatchInput_kW(dispatchInput_kW), m_canCharge(canCharge), m_canDischarge(canDischarge), 
 	m_discharge_percent(discharge_percent), m_discharge_units(discharge_units),
-	m_scheduleWeekday(scheduleWeekday), m_scheduleWeekend(scheduleWeekend)
+	m_scheduleWeekday(scheduleWeekday), m_scheduleWeekend(scheduleWeekend),
+    m_start_day_of_year(start_day_of_year)
 {
 	// Convert percentages to fractions
 	for (auto percent = m_discharge_percent.begin(); percent != m_discharge_percent.end(); percent++) {
@@ -75,7 +76,7 @@ FuelCellDispatch::FuelCellDispatch(FuelCell * fuelCell, size_t numberOfUnits, in
 			else if (m_dispatchOption == FuelCellDispatch::FC_DISPATCH_OPTION::MANUAL) {
 				size_t period = m_scheduleWeekday(0, 0);
 
-				if (!util::weekday(0)) {
+				if (!util::weekday(0, m_start_day_of_year)) {
 					period = m_scheduleWeekend(0, 0);
 				}
 				double discharge_percent_init = 0;
@@ -163,7 +164,7 @@ void FuelCellDispatch::runSingleTimeStep(size_t hour_of_year, size_t year_idx, d
 		util::month_hour(hour_of_year, month, hour);
 		size_t period = m_scheduleWeekday(month - 1, hour - 1);
 
-		if (!util::weekday(hour_of_year)) {
+		if (!util::weekday(hour_of_year, m_start_day_of_year)) {
 			period = m_scheduleWeekend(month - 1, hour - 1);
 		}
 

shared/lib_fuel_cell_dispatch.h

@@ -48,6 +48,7 @@ class FuelCellDispatch
 	/// Construct with arguments
 	FuelCellDispatch(FuelCell * fuelCell, size_t numberOfUnits, int dispatchOption, int shutdownOption, double dt_hour,
 		double fixed_percent,
+        size_t start_day_of_year,
 		std::vector<double> dispatchInput_kW,
 		std::vector<bool> canCharge,
 		std::vector<bool> canDischarge,
@@ -115,6 +116,7 @@ class FuelCellDispatch
 	int m_shutdownOption;
 	double dt_hour;
 	double m_fixed_percent;
+    size_t m_start_day_of_year;
 
 	std::vector<double> m_dispatchInput_kW;
 	std::vector< FuelCell *> m_fuelCellVector;

shared/lib_time.cpp

@@ -152,7 +152,7 @@ template void single_year_to_lifetime_interpolated<float>(bool, size_t, size_t,
 * \param[out] flat_vector - The 8760*steps per hour values at each hour
 */
 template <class T>
-std::vector<T> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::matrix_t<size_t> weekend_schedule, size_t steps_per_hour, std::vector<T> period_values, T multiplier)
+std::vector<T> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::matrix_t<size_t> weekend_schedule, size_t steps_per_hour, std::vector<T> period_values, size_t start_day_of_year, T multiplier)
 {
 	std::vector<T> flat_vector;
 	flat_vector.reserve(8760 * steps_per_hour);
@@ -162,7 +162,7 @@ std::vector<T> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::ma
 	for (size_t hour_of_year = 0; hour_of_year != 8760; hour_of_year++)
 	{
 		util::month_hour(hour_of_year % 8760, month, hour);
-		if (util::weekday(hour_of_year))
+		if (util::weekday(hour_of_year, start_day_of_year))
 			iprofile = weekday_schedule(month - 1, hour - 1);
 		else
 			iprofile = weekend_schedule(month - 1, hour - 1);
@@ -175,7 +175,7 @@ std::vector<T> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::ma
 	return flat_vector;
 }
 
-template std::vector<double> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::matrix_t<size_t> weekend_schedule, size_t steps_per_hour, std::vector<double> period_values, double multiplier);
+template std::vector<double> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::matrix_t<size_t> weekend_schedule, size_t steps_per_hour, std::vector<double> period_values, size_t start_day_of_year, double multiplier);
 
 
 /**

shared/lib_time.h

@@ -61,7 +61,7 @@ Function takes in a weekday and weekend schedule, plus the period values and an
 a vector
 */
 template<typename T>
-std::vector<T> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::matrix_t<size_t> weekend_schedule, size_t steps_per_hour, std::vector<T> period_values, T multiplier = 1.0);
+std::vector<T> flatten_diurnal(util::matrix_t<size_t> weekday_schedule, util::matrix_t<size_t> weekend_schedule, size_t steps_per_hour, std::vector<T> period_values, size_t start_day_of_year, T multiplier = 1.0);
 
 /**
 Function takes input values, desired steps per hour, and an optional multiplier and returns

shared/lib_util.cpp

@@ -949,10 +949,10 @@ size_t util::hour_of_year(size_t month, size_t day, size_t hour)
 	return h;
 }
 
-bool util::weekday(size_t hour_of_year)
+bool util::weekday(size_t hour_of_year, size_t start_day_of_year)
 {
 	int day_of_year = (int)(floor((float)(hour_of_year) / 24));
-	int day_of_week = day_of_year;
+	int day_of_week = day_of_year + start_day_of_year;
 
 	if (day_of_week > 6)
 		day_of_week = day_of_year % 7;
@@ -1033,7 +1033,7 @@ std::string util::schedule_int_to_month( int m )
 	return ret;
 }
 
-bool util::translate_schedule( int tod[8760], const char *wkday, const char *wkend, int min_val, int max_val)
+bool util::translate_schedule( int tod[8760], const char *wkday, const char *wkend, int min_val, int max_val, int start_day)
 {
 	size_t i=0;
 	if (!wkday || !wkend || strlen(wkday) != 288 || strlen(wkend) != 288)
@@ -1042,7 +1042,7 @@ bool util::translate_schedule( int tod[8760], const char *wkday, const char *wke
 		return false;
 	}
 
-	int wday = 5;
+    int wday = 5 - start_day; // start_day: 0 == Monday, 6 == Sunday
 	for (size_t m=0;m<12;m++)
 	{
 		for (size_t d=0;d<nday[m];d++)
@@ -1066,7 +1066,7 @@ bool util::translate_schedule( int tod[8760], const char *wkday, const char *wke
 }
 
 
-bool util::translate_schedule(int tod[8760], const matrix_t<double> &wkday, const matrix_t<double> &wkend, int min_val, int max_val)
+bool util::translate_schedule(int tod[8760], const matrix_t<double> &wkday, const matrix_t<double> &wkend, int min_val, int max_val, int start_day)
 {
 	size_t i = 0;
 	if ((wkday.nrows() != 12) || (wkend.nrows() != 12) || (wkday.ncols() != 24) || (wkend.ncols() != 24) )
@@ -1075,7 +1075,7 @@ bool util::translate_schedule(int tod[8760], const matrix_t<double> &wkday, cons
 		return false;
 	}
 
-	int wday = 5; // start on Monday
+	int wday = 5 - start_day; // start_day: 0 == Monday, 6 == Sunday
 	bool is_weekday = true;
 	for (size_t m = 0; m<12; m++)
 	{

shared/lib_util.h

@@ -140,14 +140,14 @@ namespace util
 	int day_of_month(int month, double time); /* month: 1-12 time: hours, starting 0=jan 1st 12am, returns 1-nday*/
 	int days_in_month(int month); /*month: 0-11, return 0-30, depending on the month*/
 	void month_hour(size_t hour_of_year, size_t & out_month, size_t & out_hour); /*given the hour of year, return the month, and hour of day*/
-	bool weekday(size_t hour_of_year); /* return true if is a weekday, assuming first hour of year is Monday at 12 am*/
+	bool weekday(size_t hour_of_year, size_t start_day_of_year); /* return true if is a weekday, start day of year = 0 is Monday at 12 am*/
 	size_t lifetimeIndex(size_t year, size_t hour_of_year, size_t step_of_hour, size_t steps_per_hour);
 	size_t yearOneIndex(double dtHour, size_t lifetimeIndex);
 	size_t yearIndex(size_t year, size_t month, size_t day, size_t hour, double minute, size_t step_per_hour);
 
 	int schedule_char_to_int( char c );
 	std::string schedule_int_to_month( int m );
-	bool translate_schedule(int tod[8760], const char *wkday, const char *wkend, int min_val, int max_val);
+	bool translate_schedule(int tod[8760], const char *wkday, const char *wkend, int min_val, int max_val, int start_day);
 
 	bool file_exists( const char *file );
 	bool dir_exists( const char *path );
@@ -860,7 +860,7 @@ namespace util
 	double linterp_col( const matrix_t<double> &mat, size_t ixcol, double xval, size_t iycol );
     size_t nearest_col_index(const matrix_t<double>& mat, size_t col, double val);
     size_t nearest_col_index(const std::vector<std::vector<double>>& mat, size_t col, double val);
-    bool translate_schedule(int tod[8760], const matrix_t<double> &wkday, const matrix_t<double> &wkend, int min_val, int max_val);
+    bool translate_schedule(int tod[8760], const matrix_t<double> &wkday, const matrix_t<double> &wkend, int min_val, int max_val, int start_day);
 
 	std::vector<double> frequency_table(double* values, size_t n_vals, double bin_width);
 };

shared/lib_utility_rate.cpp

@@ -39,12 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 UtilityRate::UtilityRate(
 	bool useRealTimePrices,
+    size_t start_day_of_year,
 	util::matrix_t<size_t> ecWeekday, 
 	util::matrix_t<size_t> ecWeekend, 
 	util::matrix_t<double> ecRatesMatrix,
 	std::vector<double> ecRealTimeBuy)
 {
-	m_useRealTimePrices = useRealTimePrices,
+    m_useRealTimePrices = useRealTimePrices;
+    m_start_day_of_year = start_day_of_year;
 	m_ecWeekday = ecWeekday;
 	m_ecWeekend = ecWeekend;
 	m_ecRatesMatrix = ecRatesMatrix;
@@ -53,6 +55,7 @@ UtilityRate::UtilityRate(
 
 UtilityRate::UtilityRate(const UtilityRate& tmp){
     m_useRealTimePrices = tmp.m_useRealTimePrices;
+    m_start_day_of_year = tmp.m_start_day_of_year;
     m_ecWeekday = tmp.m_ecWeekday;
     m_ecWeekend = tmp.m_ecWeekend;
     m_ecRatesMatrix = tmp.m_ecRatesMatrix;
@@ -144,7 +147,7 @@ size_t UtilityRateCalculator::getEnergyPeriod(size_t hourOfYear)
 	size_t period, month, hour;
 	util::month_hour(hourOfYear, month, hour);
 
-	if (util::weekday(hourOfYear)) {
+	if (util::weekday(hourOfYear, m_start_day_of_year)) {
 		if (m_ecWeekday.nrows() == 1 && m_ecWeekday.ncols() == 1) {
 			period = m_ecWeekday.at(0, 0);
 		}

shared/lib_utility_rate.h

@@ -50,6 +50,7 @@ class UtilityRate
 	UtilityRate(){};
 
 	UtilityRate(bool useRealTimePrices,
+        size_t start_day_of_year,
 		util::matrix_t<size_t> ecWeekday, 
 		util::matrix_t<size_t> ecWeekend, 
 		util::matrix_t<double> ecRatesMatrix,
@@ -77,6 +78,11 @@ class UtilityRate
 
 	/// Use real time prices or not
 	bool m_useRealTimePrices;
+
+    /// <summary>
+    ///  Monday = 0, Sunday = 6
+    /// </summary>
+    size_t m_start_day_of_year;
 };
 
 class UtilityRateCalculator : protected UtilityRate