Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ssc/cmod_battery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1240,33 +1240,33 @@ battstor::battstor(var_table& vt, bool setup_model, size_t nrec, double dt_hr, c
{
/*! Generic manual dispatch model inputs */
if (batt_vars->batt_can_charge.size() != 6 || batt_vars->batt_can_discharge.size() != 6 || batt_vars->batt_can_gridcharge.size() != 6)
throw exec_error("battery", "Invalid manual dispatch control vector length, must be length 6.");
throw exec_error("battery", "Invalid battery manual dispatch control vector length, must be length 6.");

if (batt_vars->batt_discharge_schedule_weekday.nrows() != 12 || batt_vars->batt_discharge_schedule_weekday.ncols() != 24)
throw exec_error("battery", "Invalid manual dispatch schedule matrix batt_discharge_schedule dimensions, must be 12 x 24.");
throw exec_error("battery", "Invalid battery manual dispatch schedule matrix batt_discharge_schedule dimensions, must be 12 x 24.");

size_t max_period = 6;
size_t* discharge_schedule_vec = batt_vars->batt_discharge_schedule_weekday.data();
size_t* period_num = std::find_if(discharge_schedule_vec, discharge_schedule_vec + batt_vars->batt_discharge_schedule_weekday.ncells() - 1, [max_period](size_t element) { return (max_period < element); });
if (*period_num > max_period)
throw exec_error("battery", "Invalid manual dispatch period in weekday schedule. Period numbers must be less than or equal to 6.");
throw exec_error("battery", "Invalid battery manual dispatch period in weekday schedule. Period numbers must be less than or equal to 6.");

if (batt_vars->batt_discharge_schedule_weekend.nrows() != 12 || batt_vars->batt_discharge_schedule_weekend.ncols() != 24)
throw exec_error("battery", "Invalid weekend manual dispatch schedule matrix dimensions, must be 12 x 24.");
throw exec_error("battery", "Invalid weekend battery manual dispatch schedule matrix dimensions, must be 12 x 24.");

discharge_schedule_vec = batt_vars->batt_discharge_schedule_weekend.data();
period_num = std::find_if(discharge_schedule_vec, discharge_schedule_vec + batt_vars->batt_discharge_schedule_weekend.ncells() - 1, [max_period](size_t element) { return (max_period < element); });
if (*period_num > max_period)
throw exec_error("battery", "Invalid manual dispatch period in weekend schedule. Period numbers must be less than or equal to 6.");
throw exec_error("battery", "Invalid battery manual dispatch period in weekend schedule. Period numbers must be less than or equal to 6.");

if (batt_vars->en_fuelcell) {
if (batt_vars->batt_can_fuelcellcharge.size() != 6)
throw exec_error("fuelcell", "Invalid manual dispatch control vector lengths, must be length 6.");
throw exec_error("fuelcell", "Invalid battery manual dispatch control vector lengths, must be length 6.");
}

if (batt_vars->batt_meter_position == dispatch_t::BEHIND) {
if (batt_vars->batt_btm_can_discharge_to_grid.size() != 6) {
throw exec_error("Battery", "Invalid manual dispatch control vector lenghts, must be length 6.");
throw exec_error("Battery", "Invalid battery manual dispatch control vector lenghts, must be length 6.");
}

if (batt_vars->batt_dispatch_batt_system_charge_first && batt_vars->batt_dispatch_charge_only_system_exceeds_load) {
Expand Down
15 changes: 15 additions & 0 deletions ssc/cmod_fuelcell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,21 @@ void cm_fuelcell::exec()
percent_complete = as_float("percent_complete");
}
*/
if (as_integer("fuelcell_dispatch_choice") == FuelCellDispatch::MANUAL) {

size_t max_period = 6;
util::matrix_t<size_t> m_scheduleWeekday = as_matrix_unsigned_long("dispatch_manual_fuelcell_sched");
util::matrix_t<size_t> m_scheduleWeekend = as_matrix_unsigned_long("dispatch_manual_fuelcell_sched_weekend");
size_t* discharge_schedule_vec = m_scheduleWeekday.data();
size_t* period_num = std::find_if(discharge_schedule_vec, discharge_schedule_vec + m_scheduleWeekday.ncells() - 1, [max_period](size_t element) { return (max_period < element); });
if (*period_num > max_period)
throw exec_error("fuelcell", "Invalid fuel cell manual dispatch period in weekday schedule. Period numbers must be less than or equal to 6.");

discharge_schedule_vec = m_scheduleWeekend.data();
period_num = std::find_if(discharge_schedule_vec, discharge_schedule_vec + m_scheduleWeekend.ncells() - 1, [max_period](size_t element) { return (max_period < element); });
if (*period_num > max_period)
throw exec_error("fuelcell", "Invalid fuel cell manual dispatch period in weekend schedule. Period numbers must be less than or equal to 6.");
}

construct();
size_t idx = 0;
Expand Down
Loading