Skip to content

Commit 370ba38

Browse files
lukelowrylukelowry
committed
Adjust breaking tests and defaults
1 parent e8a10ac commit 370ba38

18 files changed

Lines changed: 261 additions & 168 deletions

‎GridKit/Model/PhasorDynamics/Branch/Branch.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ namespace GridKit
182182
BusT* bus1_;
183183
BusT* bus2_;
184184
RealT R_{0.0};
185-
RealT X_{0.0};
185+
RealT X_{0.01};
186186
RealT G_{0.0};
187187
RealT B_{0.0};
188188
RealT Gmag_{0.0};

‎GridKit/Model/PhasorDynamics/SynchronousMachine/GENROU/Genrou.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,20 +153,20 @@ namespace GridKit
153153
RealT q0_{0.0};
154154

155155
/* Input parameters */
156-
RealT H_{0.0};
156+
RealT H_{3.0};
157157
RealT D_{0.0};
158158
RealT Ra_{0.0};
159-
RealT Tdop_{0.0};
160-
RealT Tdopp_{0.0};
161-
RealT Tqopp_{0.0};
162-
RealT Tqop_{0.0};
163-
RealT Xd_{0.0};
164-
RealT Xdp_{0.0};
165-
RealT Xdpp_{0.0};
166-
RealT Xq_{0.0};
167-
RealT Xqp_{0.0};
168-
RealT Xqpp_{0.0};
169-
RealT Xl_{0.0};
159+
RealT Tdop_{7.0};
160+
RealT Tdopp_{0.04};
161+
RealT Tqopp_{0.05};
162+
RealT Tqop_{0.75};
163+
RealT Xd_{2.1};
164+
RealT Xdp_{0.2};
165+
RealT Xdpp_{0.18};
166+
RealT Xq_{0.5};
167+
RealT Xqp_{0.5};
168+
RealT Xqpp_{0.18};
169+
RealT Xl_{0.15};
170170
RealT S10_{0.0};
171171
RealT S12_{0.0};
172172
RealT mva_base_{100.0};

‎tests/IntegrationTests/PhasorDynamics/TenGen/Classical/TenGenClassical.cpp‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,27 @@ GridKit::PhasorDynamics::GenClassicalData<real_type, index_type> genData(real_ty
4343
return data;
4444
}
4545

46+
/// Branch data with the given line and transformer parameters
47+
GridKit::PhasorDynamics::BranchData<real_type, index_type> branchData(const real_type R,
48+
const real_type X,
49+
const real_type G,
50+
const real_type B,
51+
const real_type tap = 1.0,
52+
const real_type phase = 0.0)
53+
{
54+
using Parameter = GridKit::PhasorDynamics::BranchParameters;
55+
56+
GridKit::PhasorDynamics::BranchData<real_type, index_type> data;
57+
data.parameters[Parameter::R] = R;
58+
data.parameters[Parameter::X] = X;
59+
data.parameters[Parameter::G] = G;
60+
data.parameters[Parameter::B] = B;
61+
data.parameters[Parameter::tap] = tap;
62+
data.parameters[Parameter::phase] = phase;
63+
64+
return data;
65+
}
66+
4667
int main()
4768
{
4869
using namespace GridKit::PhasorDynamics;
@@ -68,15 +89,15 @@ int main()
6889
Bus<scalar_type, index_type> bus9(0.938638861502395, 0.344901620288291);
6990
Bus<scalar_type, index_type> bus10(0.937739191669114, 0.347340277548916);
7091

71-
Branch<scalar_type, index_type> branch12(&bus1, &bus2, 0.001, 0.005, 0, 0);
72-
Branch<scalar_type, index_type> branch23(&bus2, &bus3, 0.001, 0.005, 0, 0);
73-
Branch<scalar_type, index_type> branch34(&bus3, &bus4, 0.001, 0.005, 0, 0);
74-
Branch<scalar_type, index_type> branch45(&bus4, &bus5, 0.001, 0.005, 0, 0);
75-
Branch<scalar_type, index_type> branch56(&bus5, &bus6, 0.001, 0.1, 0, 0);
76-
Branch<scalar_type, index_type> branch67(&bus6, &bus7, 0.001, 0.005, 0, 0);
77-
Branch<scalar_type, index_type> branch78(&bus7, &bus8, 0.001, 0.005, 0, 0);
78-
Branch<scalar_type, index_type> branch89(&bus8, &bus9, 0.001, 0.005, 0, 0);
79-
Branch<scalar_type, index_type> branch910(&bus9, &bus10, 0.001, 0.005, 0, 0);
92+
Branch<scalar_type, index_type> branch12(&bus1, &bus2, branchData(0.001, 0.005, 0, 0));
93+
Branch<scalar_type, index_type> branch23(&bus2, &bus3, branchData(0.001, 0.005, 0, 0));
94+
Branch<scalar_type, index_type> branch34(&bus3, &bus4, branchData(0.001, 0.005, 0, 0));
95+
Branch<scalar_type, index_type> branch45(&bus4, &bus5, branchData(0.001, 0.005, 0, 0));
96+
Branch<scalar_type, index_type> branch56(&bus5, &bus6, branchData(0.001, 0.1, 0, 0));
97+
Branch<scalar_type, index_type> branch67(&bus6, &bus7, branchData(0.001, 0.005, 0, 0));
98+
Branch<scalar_type, index_type> branch78(&bus7, &bus8, branchData(0.001, 0.005, 0, 0));
99+
Branch<scalar_type, index_type> branch89(&bus8, &bus9, branchData(0.001, 0.005, 0, 0));
100+
Branch<scalar_type, index_type> branch910(&bus9, &bus10, branchData(0.001, 0.005, 0, 0));
80101

81102
GenClassical<scalar_type, index_type> gen2(&bus2, genData(0.5, -0.00442101));
82103
GenClassical<scalar_type, index_type> gen3(&bus3, genData(0.5, -0.02510812));

‎tests/IntegrationTests/PhasorDynamics/TenGen/Genrou/TenGenGenrou.cpp‎

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,39 @@ using scalar_type = double;
2626
using real_type = double;
2727
using index_type = size_t;
2828

29+
/// Machine data shared by the example generators
30+
GridKit::PhasorDynamics::GenrouData<real_type, index_type> genData(real_type p0, real_type q0)
31+
{
32+
using Parameter = GridKit::PhasorDynamics::GenrouParameters;
33+
34+
GridKit::PhasorDynamics::GenrouData<real_type, index_type> data;
35+
data.parameters[Parameter::p0] = p0;
36+
data.parameters[Parameter::q0] = q0;
37+
38+
return data;
39+
}
40+
41+
/// Branch data with the given line and transformer parameters
42+
GridKit::PhasorDynamics::BranchData<real_type, index_type> branchData(const real_type R,
43+
const real_type X,
44+
const real_type G,
45+
const real_type B,
46+
const real_type tap = 1.0,
47+
const real_type phase = 0.0)
48+
{
49+
using Parameter = GridKit::PhasorDynamics::BranchParameters;
50+
51+
GridKit::PhasorDynamics::BranchData<real_type, index_type> data;
52+
data.parameters[Parameter::R] = R;
53+
data.parameters[Parameter::X] = X;
54+
data.parameters[Parameter::G] = G;
55+
data.parameters[Parameter::B] = B;
56+
data.parameters[Parameter::tap] = tap;
57+
data.parameters[Parameter::phase] = phase;
58+
59+
return data;
60+
}
61+
2962
int main()
3063
{
3164
using namespace GridKit::PhasorDynamics;
@@ -51,25 +84,25 @@ int main()
5184
Bus<scalar_type, index_type> bus9(0.938638861502395, 0.344901620288291);
5285
Bus<scalar_type, index_type> bus10(0.937739191669114, 0.347340277548916);
5386

54-
Branch<scalar_type, index_type> branch12(&bus1, &bus2, 0.001, 0.005, 0, 0);
55-
Branch<scalar_type, index_type> branch23(&bus2, &bus3, 0.001, 0.005, 0, 0);
56-
Branch<scalar_type, index_type> branch34(&bus3, &bus4, 0.001, 0.005, 0, 0);
57-
Branch<scalar_type, index_type> branch45(&bus4, &bus5, 0.001, 0.005, 0, 0);
58-
Branch<scalar_type, index_type> branch56(&bus5, &bus6, 0.001, 0.1, 0, 0);
59-
Branch<scalar_type, index_type> branch67(&bus6, &bus7, 0.001, 0.005, 0, 0);
60-
Branch<scalar_type, index_type> branch78(&bus7, &bus8, 0.001, 0.005, 0, 0);
61-
Branch<scalar_type, index_type> branch89(&bus8, &bus9, 0.001, 0.005, 0, 0);
62-
Branch<scalar_type, index_type> branch910(&bus9, &bus10, 0.001, 0.005, 0, 0);
63-
64-
Genrou<scalar_type, index_type> gen2(&bus2, 0.5, -0.00442101, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
65-
Genrou<scalar_type, index_type> gen3(&bus3, 0.5, -0.02510812, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
66-
Genrou<scalar_type, index_type> gen4(&bus4, 0.5, -0.04339553, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
67-
Genrou<scalar_type, index_type> gen5(&bus5, 0.5, -0.2334993, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
68-
Genrou<scalar_type, index_type> gen6(&bus6, 0.5, 0.69907194, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
69-
Genrou<scalar_type, index_type> gen7(&bus7, 0.5, -0.08318208, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
70-
Genrou<scalar_type, index_type> gen8(&bus8, 0.5, -0.09123614, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
71-
Genrou<scalar_type, index_type> gen9(&bus9, 0.5, -0.09662372, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
72-
Genrou<scalar_type, index_type> gen10(&bus10, 0.5, -0.09932297, 3., 0., 0., 7., .04, .05, .75, 2.1, 0.2, 0.18, 0.5, 0.5, 0.18, 0.15, 0., 0.);
87+
Branch<scalar_type, index_type> branch12(&bus1, &bus2, branchData(0.001, 0.005, 0, 0));
88+
Branch<scalar_type, index_type> branch23(&bus2, &bus3, branchData(0.001, 0.005, 0, 0));
89+
Branch<scalar_type, index_type> branch34(&bus3, &bus4, branchData(0.001, 0.005, 0, 0));
90+
Branch<scalar_type, index_type> branch45(&bus4, &bus5, branchData(0.001, 0.005, 0, 0));
91+
Branch<scalar_type, index_type> branch56(&bus5, &bus6, branchData(0.001, 0.1, 0, 0));
92+
Branch<scalar_type, index_type> branch67(&bus6, &bus7, branchData(0.001, 0.005, 0, 0));
93+
Branch<scalar_type, index_type> branch78(&bus7, &bus8, branchData(0.001, 0.005, 0, 0));
94+
Branch<scalar_type, index_type> branch89(&bus8, &bus9, branchData(0.001, 0.005, 0, 0));
95+
Branch<scalar_type, index_type> branch910(&bus9, &bus10, branchData(0.001, 0.005, 0, 0));
96+
97+
Genrou<scalar_type, index_type> gen2(&bus2, genData(0.5, -0.00442101));
98+
Genrou<scalar_type, index_type> gen3(&bus3, genData(0.5, -0.02510812));
99+
Genrou<scalar_type, index_type> gen4(&bus4, genData(0.5, -0.04339553));
100+
Genrou<scalar_type, index_type> gen5(&bus5, genData(0.5, -0.2334993));
101+
Genrou<scalar_type, index_type> gen6(&bus6, genData(0.5, 0.69907194));
102+
Genrou<scalar_type, index_type> gen7(&bus7, genData(0.5, -0.08318208));
103+
Genrou<scalar_type, index_type> gen8(&bus8, genData(0.5, -0.09123614));
104+
Genrou<scalar_type, index_type> gen9(&bus9, genData(0.5, -0.09662372));
105+
Genrou<scalar_type, index_type> gen10(&bus10, genData(0.5, -0.09932297));
73106

74107
/* Connect everything together */
75108
SystemModel<scalar_type, index_type> sys;

‎tests/UnitTests/PhasorDynamics/BranchTests.hpp‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace GridKit
3737
auto* bus2 = new PhasorDynamics::Bus<ScalarT, IdxT>(1.0, 0.1);
3838

3939
PhasorDynamics::Component<ScalarT, IdxT>* branch =
40-
new PhasorDynamics::Branch<ScalarT, IdxT>(bus1, bus2);
40+
new PhasorDynamics::Branch<ScalarT, IdxT>(bus1, bus2, PhasorDynamics::BranchData<RealT, IdxT>{});
4141

4242
success *= (branch != nullptr);
4343

@@ -80,7 +80,7 @@ namespace GridKit
8080
bus2.initialize();
8181
bus2.evaluateResidual();
8282

83-
PhasorDynamics::Branch<ScalarT, IdxT> branch(&bus1, &bus2, R, X, G, B);
83+
PhasorDynamics::Branch<ScalarT, IdxT> branch(&bus1, &bus2, branchData(R, X, G, B));
8484
branch.allocate();
8585
branch.evaluateResidual();
8686

@@ -178,7 +178,7 @@ namespace GridKit
178178
bus2.Vr().setVariableNumber(2);
179179
bus2.Vi().setVariableNumber(3);
180180

181-
PhasorDynamics::Branch<DependencyTracking::Variable, IdxT> branch(&bus1, &bus2, R, X, G, B);
181+
PhasorDynamics::Branch<DependencyTracking::Variable, IdxT> branch(&bus1, &bus2, branchData(R, X, G, B));
182182
branch.allocate();
183183
branch.evaluateResidual(); ///< Computes the residual and the Jacobian values by tracking
184184
///< the dependencies
@@ -221,14 +221,7 @@ namespace GridKit
221221
PhasorDynamics::BusInfinite<DependencyTracking::Variable, IdxT> bus1(Vr1, Vi1);
222222
PhasorDynamics::BusInfinite<DependencyTracking::Variable, IdxT> bus2(Vr2, Vi2);
223223

224-
PhasorDynamics::Branch<DependencyTracking::Variable, IdxT> branch(&bus1,
225-
&bus2,
226-
R,
227-
X,
228-
G,
229-
B,
230-
tap,
231-
phase);
224+
PhasorDynamics::Branch<DependencyTracking::Variable, IdxT> branch(&bus1, &bus2, branchData(R, X, G, B, tap, phase));
232225
branch.allocate();
233226
branch.evaluateResidual();
234227

@@ -265,7 +258,7 @@ namespace GridKit
265258
bus2.setResidualIndex(i, i + 2);
266259
}
267260

268-
PhasorDynamics::Branch<ScalarT, IdxT> branch(&bus1, &bus2, 2.0, 4.0, 0.2, 1.2);
261+
PhasorDynamics::Branch<ScalarT, IdxT> branch(&bus1, &bus2, branchData(2.0, 4.0, 0.2, 1.2));
269262
branch.allocate();
270263
branch.evaluateJacobian();
271264
const IdxT nnz = branch.nnz();
@@ -334,7 +327,7 @@ namespace GridKit
334327
ref_bus2.allocate();
335328
ref_bus2.initialize();
336329
ref_bus2.evaluateResidual();
337-
PhasorDynamics::Branch<ScalarT, IdxT> ref_branch(&ref_bus1, &ref_bus2, R, X, G, B, tap, phase);
330+
PhasorDynamics::Branch<ScalarT, IdxT> ref_branch(&ref_bus1, &ref_bus2, branchData(R, X, G, B, tap, phase));
338331

339332
PhasorDynamics::Bus<ScalarT, IdxT> test_bus1(Vr1, Vi1);
340333
PhasorDynamics::Bus<ScalarT, IdxT> test_bus2(Vr2, Vi2);
@@ -344,7 +337,7 @@ namespace GridKit
344337
test_bus2.allocate();
345338
test_bus2.initialize();
346339
test_bus2.evaluateResidual();
347-
PhasorDynamics::Branch<ScalarT, IdxT> test_branch(&test_bus1, &test_bus2, 1.0, 1.0, 0.0, 0.0);
340+
PhasorDynamics::Branch<ScalarT, IdxT> test_branch(&test_bus1, &test_bus2, branchData(1.0, 1.0, 0.0, 0.0));
348341

349342
test_branch.setR(R);
350343
test_branch.setX(X);
@@ -372,25 +365,25 @@ namespace GridKit
372365
PhasorDynamics::Bus<ScalarT, IdxT> bus1(1.0, 0.0);
373366
PhasorDynamics::Bus<ScalarT, IdxT> bus2(1.0, 0.0);
374367

375-
PhasorDynamics::Branch<ScalarT, IdxT> valid_branch(&bus1, &bus2, 0.0, 0.1, 0.0, 0.0);
368+
PhasorDynamics::Branch<ScalarT, IdxT> valid_branch(&bus1, &bus2, branchData(0.0, 0.1, 0.0, 0.0));
376369
success *= (valid_branch.verify().passed());
377370

378371
const auto previous_verbosity = Log::verbosity();
379372
// Suppress expected errors from the invalid branch configurations below.
380373
// Use EVERYTHING to inspect those diagnostics.
381374
Log::setVerbosity(Log::Verbosity::NONE);
382375

383-
PhasorDynamics::Branch<ScalarT, IdxT> zero_impedance_branch(&bus1, &bus2, 0.0, 0.0, 0.0, 0.0);
376+
PhasorDynamics::Branch<ScalarT, IdxT> zero_impedance_branch(&bus1, &bus2, branchData(0.0, 0.0, 0.0, 0.0));
384377
success *= (!zero_impedance_branch.verify().passed());
385378

386-
PhasorDynamics::Branch<ScalarT, IdxT> zero_tap_branch(&bus1, &bus2, 0.0, 0.1, 0.0, 0.0, 0.0, 0.0);
379+
PhasorDynamics::Branch<ScalarT, IdxT> zero_tap_branch(&bus1, &bus2, branchData(0.0, 0.1, 0.0, 0.0, 0.0, 0.0));
387380
success *= (!zero_tap_branch.verify().passed());
388381

389-
PhasorDynamics::Branch<ScalarT, IdxT> negative_tap_branch(&bus1, &bus2, 0.0, 0.1, 0.0, 0.0, -1.0, 0.0);
382+
PhasorDynamics::Branch<ScalarT, IdxT> negative_tap_branch(&bus1, &bus2, branchData(0.0, 0.1, 0.0, 0.0, -1.0, 0.0));
390383
success *= (!negative_tap_branch.verify().passed());
391384

392385
const RealT nan = std::numeric_limits<RealT>::quiet_NaN();
393-
PhasorDynamics::Branch<ScalarT, IdxT> nonfinite_branch(&bus1, &bus2, nan, 0.1, 0.0, 0.0);
386+
PhasorDynamics::Branch<ScalarT, IdxT> nonfinite_branch(&bus1, &bus2, branchData(nan, 0.1, 0.0, 0.0));
394387
success *= (!nonfinite_branch.verify().passed());
395388

396389
Log::setVerbosity(previous_verbosity);
@@ -443,7 +436,7 @@ namespace GridKit
443436
ref_bus2.evaluateResidual();
444437

445438
PhasorDynamics::Branch<ScalarT, IdxT> data_branch(&data_bus1, &data_bus2, data);
446-
PhasorDynamics::Branch<ScalarT, IdxT> ref_branch(&ref_bus1, &ref_bus2, R, X, G, B, 1.0, 0.0);
439+
PhasorDynamics::Branch<ScalarT, IdxT> ref_branch(&ref_bus1, &ref_bus2, branchData(R, X, G, B, 1.0, 0.0));
447440

448441
data_branch.evaluateResidual();
449442
ref_branch.evaluateResidual();
@@ -457,6 +450,25 @@ namespace GridKit
457450
}
458451

459452
private:
453+
static PhasorDynamics::BranchData<RealT, IdxT> branchData(const RealT R,
454+
const RealT X,
455+
const RealT G,
456+
const RealT B,
457+
const RealT tap = 1.0,
458+
const RealT phase = 0.0)
459+
{
460+
using Parameter = PhasorDynamics::BranchParameters;
461+
462+
PhasorDynamics::BranchData<RealT, IdxT> data;
463+
data.parameters[Parameter::R] = R;
464+
data.parameters[Parameter::X] = X;
465+
data.parameters[Parameter::G] = G;
466+
data.parameters[Parameter::B] = B;
467+
data.parameters[Parameter::tap] = tap;
468+
data.parameters[Parameter::phase] = phase;
469+
return data;
470+
}
471+
460472
std::vector<DependencyTracking::Variable::DependencyMap> analyticalJacobian(const RealT R,
461473
const RealT X,
462474
const RealT G,

‎tests/UnitTests/PhasorDynamics/ComponentConnectionTests.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace GridKit
5959
static_cast<ScalarT>(1.0),
6060
static_cast<ScalarT>(0.0));
6161
PhasorDynamics::SignalNode<ScalarT, IdxT> efd;
62-
PhasorDynamics::Genrou<ScalarT, IdxT> machine(&bus);
62+
PhasorDynamics::Genrou<ScalarT, IdxT> machine(&bus, PhasorDynamics::GenrouData<RealT, IdxT>{});
6363

6464
PhasorDynamics::Exciter::Esdc1aData<RealT, IdxT> exciter_data;
6565
exciter_data.parameters[ExciterParams::Tr] = static_cast<RealT>(0.02);
@@ -107,7 +107,7 @@ namespace GridKit
107107
static_cast<ScalarT>(1.0),
108108
static_cast<ScalarT>(0.0));
109109
PhasorDynamics::SignalNode<ScalarT, IdxT> pmech;
110-
PhasorDynamics::Genrou<ScalarT, IdxT> machine(&bus);
110+
PhasorDynamics::Genrou<ScalarT, IdxT> machine(&bus, PhasorDynamics::GenrouData<RealT, IdxT>{});
111111

112112
PhasorDynamics::Governor::HygovData<RealT, IdxT> governor_data;
113113
governor_data.parameters[GovernorParams::Trate] = static_cast<RealT>(100.0);

‎tests/UnitTests/PhasorDynamics/ControllerReecbTests.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ namespace GridKit
5757

5858
PhasorDynamics::Bus<ScalarT, IdxT> bus(1.0, 0.0);
5959

60-
PhasorDynamics::Controller::Reecb<ScalarT, IdxT> empty(&bus);
60+
PhasorDynamics::Controller::Reecb<ScalarT, IdxT> empty(&bus, Data{});
6161
success *= (empty.size() == static_cast<IdxT>(Utilities::enum_size<Vars>()));
62-
success *= (empty.getMonitor() == nullptr);
6362

6463
const std::array<Vars, Utilities::enum_size<Vars>()> row_order{{
6564
Vars::VMEAS,

‎tests/UnitTests/PhasorDynamics/ControllerRepcaTests.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ namespace GridKit
5454

5555
PhasorDynamics::Bus<ScalarT, IdxT> bus(1.0, 0.0);
5656

57-
PhasorDynamics::Controller::Repca<ScalarT, IdxT> empty(&bus);
57+
PhasorDynamics::Controller::Repca<ScalarT, IdxT> empty(&bus, Data{});
5858
success *= (empty.size() == static_cast<IdxT>(Utilities::enum_size<Vars>()));
59-
success *= (empty.getMonitor() == nullptr);
6059
success *= (!empty.verify().passed());
6160

6261
Fixture<ScalarT> configured(makeData());

‎tests/UnitTests/PhasorDynamics/ConverterRegcaTests.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ namespace GridKit
4949

5050
PhasorDynamics::Bus<ScalarT, IdxT> bus(1.0, 0.0);
5151

52-
PhasorDynamics::Converter::Regca<ScalarT, IdxT> minimal(&bus);
52+
PhasorDynamics::Converter::Regca<ScalarT, IdxT> minimal(&bus, Data{});
5353
success *= (minimal.size() == static_cast<IdxT>(Utilities::enum_size<Vars>()));
54-
success *= (minimal.getMonitor() == nullptr);
5554

5655
PhasorDynamics::Converter::Regca<ScalarT, IdxT> configured(&bus, makeData());
5756
success *= (configured.size() == static_cast<IdxT>(Utilities::enum_size<Vars>()));

‎tests/UnitTests/PhasorDynamics/ExciterEsdc1aTests.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ namespace GridKit
5656

5757
PhasorDynamics::Bus<ScalarT, IdxT> bus(1.0, 0.0);
5858

59-
PhasorDynamics::Exciter::Esdc1a<ScalarT, IdxT> empty(&bus);
59+
PhasorDynamics::Exciter::Esdc1a<ScalarT, IdxT> empty(&bus, Data{});
6060
success *= (empty.size() == static_cast<IdxT>(Utilities::enum_size<Internal>()));
61-
success *= (empty.getMonitor() == nullptr);
6261
success *= (!empty.verify().passed());
6362

6463
Fixture<ScalarT> configured(makeData());

0 commit comments

Comments
 (0)