Skip to content

Added back removed test for N=8 #90

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+31 −31
Open

Added back removed test for N=8 #90

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ae921e
added back removed test
shakedregev Apr 25, 2025
b1c6849
edited names to fit coding guidelines
shakedregev Apr 25, 2025
eae392e
Apply pre-commmit fixes
shakedregev Apr 25, 2025
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
62 changes: 31 additions & 31 deletions examples/ScaleMicrogrid/ScaleMicrogrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
real_type abs_tol = SCALE_MICROGRID_ABS_TOL;

// Create circuit model
auto* sysmodel = new PowerElectronicsModel<real_type, index_type>(rel_tol,
abs_tol,
use_jac,
SCALE_MICROGRID_MAX_STEPS);
auto* sys_model = new PowerElectronicsModel<real_type, index_type>(rel_tol,
abs_tol,
use_jac,
SCALE_MICROGRID_MAX_STEPS);

const std::vector<real_type>* true_vec = &answer_key_N8;

Expand All @@ -88,7 +88,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
true_vec = &answer_key_N4;
break;
case 8:
// true_vec = &answer_key_N8;
true_vec = &answer_key_N8;
break;
default:
std::cout << "No reference solution for Nsize = " << Nsize << ".\n";
Expand Down Expand Up @@ -197,7 +197,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
{
dg_ref->setExternalConnectionNodes(4 + i, i);
}
sysmodel->addComponent(dg_ref);
sys_model->addComponent(dg_ref);

// Keep track of models and index location
index_type indexv = 12;
Expand All @@ -220,7 +220,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
dg->setExternalConnectionNodes(3 + j, indexv + j);
}
indexv += 13;
sysmodel->addComponent(dg);
sys_model->addComponent(dg);
}

// Load all the Line compoenents
Expand All @@ -244,7 +244,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
line_model->setExternalConnectionNodes(5 + j, indexv + j);
}
indexv += 2;
sysmodel->addComponent(line_model);
sys_model->addComponent(line_model);
}

// Load all the Load components
Expand All @@ -264,7 +264,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
load_model->setExternalConnectionNodes(3 + j, indexv + j);
}
indexv += 2;
sysmodel->addComponent(load_model);
sys_model->addComponent(load_model);
}

// Add all the microgrid Virtual DQ Buses
Expand All @@ -274,40 +274,40 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)

virDQbus_model->setExternalConnectionNodes(0, vdqbus_index[i]);
virDQbus_model->setExternalConnectionNodes(1, vdqbus_index[i] + 1);
sysmodel->addComponent(virDQbus_model);
sys_model->addComponent(virDQbus_model);
}

// allocate all the intial conditions
sysmodel->allocate(vec_size_total);
sys_model->allocate(vec_size_total);

if (debug_output)
{
std::cout << sysmodel->y().size() << std::endl;
std::cout << sys_model->y().size() << std::endl;
std::cout << vec_size_internals << ", " << vec_size_externals << "\n";
}

// Create Intial points for states. Every state is to specified to the zero intially
for (index_type i = 0; i < vec_size_total; i++)
{
sysmodel->y()[i] = 0.0;
sysmodel->yp()[i] = 0.0;
sys_model->y()[i] = 0.0;
sys_model->yp()[i] = 0.0;
}

// Create Intial derivatives specifics generated in MATLAB
for (index_type i = 0; i < 2 * Nsize; i++)
{
sysmodel->yp()[13 * i - 1 + 3] = DGParams_list[i].Vn_;
sysmodel->yp()[13 * i - 1 + 5] = DGParams_list[i].Kpv_ * DGParams_list[i].Vn_;
sysmodel->yp()[13 * i - 1 + 7] = (DGParams_list[i].Kpc_ * DGParams_list[i].Kpv_ * DGParams_list[i].Vn_) / DGParams_list[i].Lf_;
sys_model->yp()[13 * i - 1 + 3] = DGParams_list[i].Vn_;
sys_model->yp()[13 * i - 1 + 5] = DGParams_list[i].Kpv_ * DGParams_list[i].Vn_;
sys_model->yp()[13 * i - 1 + 7] = (DGParams_list[i].Kpc_ * DGParams_list[i].Kpv_ * DGParams_list[i].Vn_) / DGParams_list[i].Lf_;
}

// since the intial P_com = 0, the set the intial vector to the reference frame
sysmodel->y()[vec_size_internals] = DG_parms1.wb_;
sys_model->y()[vec_size_internals] = DG_parms1.wb_;

sysmodel->initialize();
sysmodel->evaluateResidual();
sys_model->initialize();
sys_model->evaluateResidual();

std::vector<real_type>& fres = sysmodel->getResidual();
std::vector<real_type>& fres = sys_model->getResidual();
if (debug_output)
{
std::cout << "Verify Intial Resisdual is Zero: {\n";
Expand All @@ -318,13 +318,13 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
std::cout << "}\n";
}

sysmodel->updateTime(0.0, 1.0e-8);
sysmodel->evaluateJacobian();
sys_model->updateTime(0.0, 1.0e-8);
sys_model->evaluateJacobian();
if (debug_output)
std::cout << "Intial Jacobian with alpha:\n";

// Create numerical integrator and configure it for the generator model
auto* idas = new AnalysisManager::Sundials::Ida<real_type, index_type>(sysmodel);
auto* idas = new AnalysisManager::Sundials::Ida<real_type, index_type>(sys_model);

// setup simulation
idas->configureSimulation();
Expand All @@ -333,7 +333,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)

idas->runSimulation(t_final);

std::vector<real_type>& yfinal = sysmodel->y();
std::vector<real_type>& yfinal = sys_model->y();

if (debug_output)
{
Expand All @@ -346,8 +346,8 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)

bool test_pass = true;

real_type sumtop = 0.0;
real_type sumbottom = 0.0;
real_type sum_top = 0.0;
real_type sum_bottom = 0.0;

// check relative error
std::cout << "Test the Relative Error for N = " << Nsize << "\n";
Expand All @@ -357,16 +357,16 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
if (debug_output)
std::cout << i << " : " << abs(true_vec->at(i) - yfinal[i]) / abs(true_vec->at(i)) << "\n";

sumtop += (true_vec->at(i) - yfinal[i]) * (true_vec->at(i) - yfinal[i]);
sumbottom += (true_vec->at(i) * true_vec->at(i));
sum_top += (true_vec->at(i) - yfinal[i]) * (true_vec->at(i) - yfinal[i]);
sum_bottom += (true_vec->at(i) * true_vec->at(i));
}

real_type norm2error = (sqrt(sumtop) / sqrt(sumbottom));
real_type norm2error = (sqrt(sum_top) / sqrt(sum_bottom));
std::cout << "2-Norm Relative Error: " << norm2error << std::endl;
test_pass = norm2error < error_tol;

delete idas;
delete sysmodel;
delete sys_model;

if (test_pass)
{
Expand Down