Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ssc_module_exec_with_error per @dguittet with filtering to fix #1105 #1107

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Add ssc_module_exec_with_error per @dguittet with filtering to fix #1105 #1107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions ssc/cmod_hybrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,25 @@ class cm_hybrid : public compute_module
{
add_var_info(_cm_vtab_hybrid);
}

void ssc_module_exec_with_error(ssc_module_t module, var_table& input, std::string compute_module) {
if (!ssc_module_exec(module, static_cast<ssc_data_t>(&input))) {
std::string str = std::string(compute_module) + " execution error.\n";
int idx = 0;
int type = -1;
while (const char* msg = ssc_module_log(module, idx++, &type, nullptr))
{
if (/*/(type == SSC_NOTICE) || */(type == SSC_WARNING) || (type == SSC_ERROR)) {
str += "\t";
str += std::string(msg);
str += "\n\n";
}
}
ssc_module_free(module);
throw std::runtime_error(str);
}
}

void exec()
{
float percent = 0;
Expand Down Expand Up @@ -120,8 +139,7 @@ class cm_hybrid : public compute_module
var_table& input = compute_module_inputs->table;
ssc_data_set_number(static_cast<ssc_data_t>(&input), "en_batt", 0);


ssc_module_exec(module, static_cast<ssc_data_t>(&input));
ssc_module_exec_with_error(module, input, compute_module);

ssc_data_t compute_module_outputs = ssc_data_create();

Expand Down Expand Up @@ -297,7 +315,7 @@ class cm_hybrid : public compute_module
throw exec_error("hybrid", "No input input_table found for ." + hybridVarTable);
var_table& hybridinput = hybrid_inputs->table;
input.merge(hybridinput, false);
ssc_module_exec(module, static_cast<ssc_data_t>(&input));
ssc_module_exec_with_error(module, input, compute_module);

ssc_data_t compute_module_outputs = ssc_data_create();

Expand Down Expand Up @@ -415,7 +433,7 @@ class cm_hybrid : public compute_module
ssc_data_set_number(static_cast<ssc_data_t>(&input), "system_use_lifetime_output", 1);
ssc_data_set_number(static_cast<ssc_data_t>(&input), "en_batt", 1); // should be done at UI level

ssc_module_exec(module, static_cast<ssc_data_t>(&input));
ssc_module_exec_with_error(module, input, compute_module);

ssc_data_t compute_module_outputs = ssc_data_create();

Expand Down Expand Up @@ -612,7 +630,7 @@ class cm_hybrid : public compute_module
std::string compute_module = financials[i];

ssc_module_t module = ssc_module_create(compute_module.c_str());
ssc_module_exec(module, static_cast<ssc_data_t>(&input));
ssc_module_exec_with_error(module, input, compute_module);


int pidx = 0;
Expand Down
Loading