Skip to content

Commit 457ad4f

Browse files
alexander-novoalexander-novo
committed
Rename new pointers
1 parent 37884ae commit 457ad4f

25 files changed

Lines changed: 165 additions & 165 deletions

‎GridKit/Model/PowerElectronics/Capacitor/Capacitor.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ namespace GridKit
5959
template <class ScalarT, typename IdxT>
6060
int Capacitor<ScalarT, IdxT>::evaluateInternalResidual()
6161
{
62-
int_f_[0] = -C_ * intp_[0] + y_[0] - y_[1] - int_[0];
62+
f_int_[0] = -C_ * yp_int_[0] + y_[0] - y_[1] - y_int_[0];
6363
return 0;
6464
}
6565

6666
template <class ScalarT, typename IdxT>
6767
int Capacitor<ScalarT, IdxT>::evaluateExternalResidual()
6868
{
6969
// input
70-
f_[0] = C_ * intp_[0];
70+
f_[0] = C_ * yp_int_[0];
7171
// output
72-
f_[1] = -C_ * intp_[0];
72+
f_[1] = -C_ * yp_int_[0];
7373
return 0;
7474
}
7575

‎GridKit/Model/PowerElectronics/Capacitor/Capacitor.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ namespace GridKit
2626
using CircuitComponent<ScalarT, IdxT>::time_;
2727
using CircuitComponent<ScalarT, IdxT>::alpha_;
2828
using CircuitComponent<ScalarT, IdxT>::y_;
29-
using CircuitComponent<ScalarT, IdxT>::int_;
29+
using CircuitComponent<ScalarT, IdxT>::y_int_;
3030
using CircuitComponent<ScalarT, IdxT>::yp_;
31-
using CircuitComponent<ScalarT, IdxT>::intp_;
31+
using CircuitComponent<ScalarT, IdxT>::yp_int_;
3232
using CircuitComponent<ScalarT, IdxT>::tag_;
3333
using CircuitComponent<ScalarT, IdxT>::f_;
34-
using CircuitComponent<ScalarT, IdxT>::int_f_;
34+
using CircuitComponent<ScalarT, IdxT>::f_int_;
3535
using CircuitComponent<ScalarT, IdxT>::g_;
3636
using CircuitComponent<ScalarT, IdxT>::yB_;
3737
using CircuitComponent<ScalarT, IdxT>::ypB_;

‎GridKit/Model/PowerElectronics/CircuitComponent.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,17 @@ namespace GridKit
168168

169169
void setInternalPointer(const ScalarT* internals)
170170
{
171-
int_ = internals;
171+
y_int_ = internals;
172172
}
173173

174174
void setInternalDerivativePointer(const ScalarT* internals_p)
175175
{
176-
intp_ = internals_p;
176+
yp_int_ = internals_p;
177177
}
178178

179179
void setInternalResidualPointer(ScalarT* internal_res)
180180
{
181-
int_f_ = internal_res;
181+
f_int_ = internal_res;
182182
}
183183

184184
protected:
@@ -428,11 +428,11 @@ namespace GridKit
428428
size_t current_jac_size_{0};
429429

430430
/// @brief A pointer to the internal variables of this component.
431-
const ScalarT* int_;
431+
const ScalarT* y_int_;
432432
/// @brief A pointer to the internal derivatives of this component.
433-
const ScalarT* intp_;
433+
const ScalarT* yp_int_;
434434
/// @brief A pointer to the internal residuals of this component
435-
ScalarT* int_f_;
435+
ScalarT* f_int_;
436436

437437
std::vector<ScalarT> y_;
438438
std::vector<ScalarT> yp_;

‎GridKit/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -84,58 +84,58 @@ namespace GridKit
8484
template <class ScalarT, typename IdxT>
8585
int DistributedGenerator<ScalarT, IdxT>::evaluateInternalResidual()
8686
{
87-
ScalarT omega = wb_ - mp_ * int_[0];
88-
ScalarT delta = refframe_ ? ScalarT(0.0) : int_[12];
87+
ScalarT omega = wb_ - mp_ * y_int_[0];
88+
ScalarT delta = refframe_ ? ScalarT(0.0) : y_int_[12];
8989

9090
// Take incoming voltages to current rotator reference frame
9191
ScalarT vbd_in = std::cos(delta) * y_[1] + std::sin(delta) * y_[2];
9292
ScalarT vbq_in = -std::sin(delta) * y_[1] + std::cos(delta) * y_[2];
9393

9494
// ### Internal Componenets ##
9595
// P and Q equations
96-
int_f_[0] = -intp_[0] + wc_ * (int_[8] * int_[10] + int_[9] * int_[11] - int_[0]);
97-
int_f_[1] = -intp_[1] + wc_ * (-int_[8] * int_[11] + int_[9] * int_[10] - int_[1]);
96+
f_int_[0] = -yp_int_[0] + wc_ * (y_int_[8] * y_int_[10] + y_int_[9] * y_int_[11] - y_int_[0]);
97+
f_int_[1] = -yp_int_[1] + wc_ * (-y_int_[8] * y_int_[11] + y_int_[9] * y_int_[10] - y_int_[1]);
9898

9999
// Voltage control
100-
ScalarT vod_star = Vn_ - nq_ * int_[1];
100+
ScalarT vod_star = Vn_ - nq_ * y_int_[1];
101101
ScalarT voq_star = static_cast<ScalarT>(0.0);
102102

103-
int_f_[2] = -intp_[2] + vod_star - int_[8];
104-
int_f_[3] = -intp_[3] + voq_star - int_[9];
103+
f_int_[2] = -yp_int_[2] + vod_star - y_int_[8];
104+
f_int_[3] = -yp_int_[3] + voq_star - y_int_[9];
105105

106-
ScalarT ild_star = F_ * int_[10] - wb_ * Cf_ * int_[9] + Kpv_ * (vod_star - int_[8]) + Kiv_ * int_[2];
107-
ScalarT ilq_star = F_ * int_[11] + wb_ * Cf_ * int_[8] + Kpv_ * (voq_star - int_[9]) + Kiv_ * int_[3];
106+
ScalarT ild_star = F_ * y_int_[10] - wb_ * Cf_ * y_int_[9] + Kpv_ * (vod_star - y_int_[8]) + Kiv_ * y_int_[2];
107+
ScalarT ilq_star = F_ * y_int_[11] + wb_ * Cf_ * y_int_[8] + Kpv_ * (voq_star - y_int_[9]) + Kiv_ * y_int_[3];
108108

109109
// Current control
110-
int_f_[4] = -intp_[4] + ild_star - int_[6];
111-
int_f_[5] = -intp_[5] + ilq_star - int_[7];
110+
f_int_[4] = -yp_int_[4] + ild_star - y_int_[6];
111+
f_int_[5] = -yp_int_[5] + ilq_star - y_int_[7];
112112

113-
ScalarT vid_star = -wb_ * Lf_ * int_[7] + Kpc_ * (ild_star - int_[6]) + Kic_ * int_[4];
114-
ScalarT viq_star = wb_ * Lf_ * int_[6] + Kpc_ * (ilq_star - int_[7]) + Kic_ * int_[5];
113+
ScalarT vid_star = -wb_ * Lf_ * y_int_[7] + Kpc_ * (ild_star - y_int_[6]) + Kic_ * y_int_[4];
114+
ScalarT viq_star = wb_ * Lf_ * y_int_[6] + Kpc_ * (ilq_star - y_int_[7]) + Kic_ * y_int_[5];
115115

116116
// Output LC Filter
117-
int_f_[6] = -intp_[6] - (rLf_ / Lf_) * int_[6] + omega * int_[7] + (vid_star - int_[8]) / Lf_;
118-
int_f_[7] = -intp_[7] - (rLf_ / Lf_) * int_[7] - omega * int_[6] + (viq_star - int_[9]) / Lf_;
117+
f_int_[6] = -yp_int_[6] - (rLf_ / Lf_) * y_int_[6] + omega * y_int_[7] + (vid_star - y_int_[8]) / Lf_;
118+
f_int_[7] = -yp_int_[7] - (rLf_ / Lf_) * y_int_[7] - omega * y_int_[6] + (viq_star - y_int_[9]) / Lf_;
119119

120-
int_f_[8] = -intp_[8] + omega * int_[9] + (int_[6] - int_[10]) / Cf_;
121-
int_f_[9] = -intp_[9] - omega * int_[8] + (int_[7] - int_[11]) / Cf_;
120+
f_int_[8] = -yp_int_[8] + omega * y_int_[9] + (y_int_[6] - y_int_[10]) / Cf_;
121+
f_int_[9] = -yp_int_[9] - omega * y_int_[8] + (y_int_[7] - y_int_[11]) / Cf_;
122122

123123
// Output Connector
124-
int_f_[10] = -intp_[10] - (rLc_ / Lc_) * int_[10] + omega * int_[11] + (int_[8] - vbd_in) / Lc_;
125-
int_f_[11] = -intp_[11] - (rLc_ / Lc_) * int_[11] - omega * int_[10] + (int_[9] - vbq_in) / Lc_;
124+
f_int_[10] = -yp_int_[10] - (rLc_ / Lc_) * y_int_[10] + omega * y_int_[11] + (y_int_[8] - vbd_in) / Lc_;
125+
f_int_[11] = -yp_int_[11] - (rLc_ / Lc_) * y_int_[11] - omega * y_int_[10] + (y_int_[9] - vbq_in) / Lc_;
126126

127127
// Rotor difference angle
128128
if (!refframe_)
129-
int_f_[12] = -intp_[12] + omega - y_[0];
129+
f_int_[12] = -yp_int_[12] + omega - y_[0];
130130

131131
return 0;
132132
}
133133

134134
template <class ScalarT, typename IdxT>
135135
int DistributedGenerator<ScalarT, IdxT>::evaluateExternalResidual()
136136
{
137-
ScalarT omega = wb_ - mp_ * int_[0];
138-
ScalarT delta = refframe_ ? ScalarT(0.0) : int_[12];
137+
ScalarT omega = wb_ - mp_ * y_int_[0];
138+
ScalarT delta = refframe_ ? ScalarT(0.0) : y_int_[12];
139139
// ref common ref motor angle
140140
if (refframe_)
141141
{
@@ -148,8 +148,8 @@ namespace GridKit
148148

149149
// output
150150
// current transformed to common frame
151-
f_[1] = std::cos(delta) * int_[10] - std::sin(delta) * int_[11];
152-
f_[2] = std::sin(delta) * int_[10] + std::cos(delta) * int_[11];
151+
f_[1] = std::cos(delta) * y_int_[10] - std::sin(delta) * y_int_[11];
152+
f_[2] = std::sin(delta) * y_int_[10] + std::cos(delta) * y_int_[11];
153153
return 0;
154154
}
155155

@@ -189,7 +189,7 @@ namespace GridKit
189189
std::vector<IdxT> rtemp{};
190190
std::vector<RealT> valtemp{};
191191

192-
RealT delta = refframe_ ? RealT(0.0) : static_cast<RealT>(int_[12]);
192+
RealT delta = refframe_ ? RealT(0.0) : static_cast<RealT>(y_int_[12]);
193193

194194
// Create dF/dy
195195
// r = 1
@@ -205,7 +205,7 @@ namespace GridKit
205205
-sin(delta),
206206
};
207207
if (!refframe_)
208-
valtemp.push_back(-sin(delta) * static_cast<RealT>(int_[10]) - cos(delta) * static_cast<RealT>(int_[11]));
208+
valtemp.push_back(-sin(delta) * static_cast<RealT>(y_int_[10]) - cos(delta) * static_cast<RealT>(y_int_[11]));
209209
this->setJacValues(rtemp, ctemp, valtemp);
210210

211211
// r = 2
@@ -221,7 +221,7 @@ namespace GridKit
221221
cos(delta),
222222
};
223223
if (!refframe_)
224-
valtemp.push_back(cos(delta) * static_cast<RealT>(int_[10]) - sin(delta) * static_cast<RealT>(int_[11]));
224+
valtemp.push_back(cos(delta) * static_cast<RealT>(y_int_[10]) - sin(delta) * static_cast<RealT>(y_int_[11]));
225225
this->setJacValues(rtemp, ctemp, valtemp);
226226

227227
// r = 0
@@ -241,10 +241,10 @@ namespace GridKit
241241
for (size_t i = 0; i < ctemp.size(); i++)
242242
rtemp.push_back(3);
243243
valtemp = {-wc_ - alpha_,
244-
wc_ * static_cast<RealT>(int_[10]),
245-
wc_ * static_cast<RealT>(int_[11]),
246-
wc_ * static_cast<RealT>(int_[8]),
247-
wc_ * static_cast<RealT>(int_[9])};
244+
wc_ * static_cast<RealT>(y_int_[10]),
245+
wc_ * static_cast<RealT>(y_int_[11]),
246+
wc_ * static_cast<RealT>(y_int_[8]),
247+
wc_ * static_cast<RealT>(y_int_[9])};
248248
this->setJacValues(rtemp, ctemp, valtemp);
249249

250250
// r = 4
@@ -253,10 +253,10 @@ namespace GridKit
253253
for (size_t i = 0; i < ctemp.size(); i++)
254254
rtemp.push_back(4);
255255
valtemp = {-wc_ - alpha_,
256-
-wc_ * static_cast<RealT>(int_[11]),
257-
wc_ * static_cast<RealT>(int_[10]),
258-
wc_ * static_cast<RealT>(int_[9]),
259-
-wc_ * static_cast<RealT>(int_[8])};
256+
-wc_ * static_cast<RealT>(y_int_[11]),
257+
wc_ * static_cast<RealT>(y_int_[10]),
258+
wc_ * static_cast<RealT>(y_int_[9]),
259+
-wc_ * static_cast<RealT>(y_int_[8])};
260260
this->setJacValues(rtemp, ctemp, valtemp);
261261

262262
// r = 5
@@ -296,12 +296,12 @@ namespace GridKit
296296
rtemp.clear();
297297
for (size_t i = 0; i < ctemp.size(); i++)
298298
rtemp.push_back(9);
299-
valtemp = {-mp_ * static_cast<RealT>(int_[7]),
299+
valtemp = {-mp_ * static_cast<RealT>(y_int_[7]),
300300
-(Kpc_ * Kpv_ * nq_) / Lf_,
301301
(Kpc_ * Kiv_) / Lf_,
302302
Kic_ / Lf_,
303303
-(Kpc_ + rLf_) / Lf_ - alpha_,
304-
-mp_ * static_cast<RealT>(int_[0]),
304+
-mp_ * static_cast<RealT>(y_int_[0]),
305305
-(Kpc_ * Kpv_ + 1.0) / Lf_,
306306
-(Cf_ * Kpc_ * wb_) / Lf_,
307307
(F_ * Kpc_) / Lf_};
@@ -312,10 +312,10 @@ namespace GridKit
312312
rtemp.clear();
313313
for (size_t i = 0; i < ctemp.size(); i++)
314314
rtemp.push_back(10);
315-
valtemp = {mp_ * static_cast<RealT>(int_[6]),
315+
valtemp = {mp_ * static_cast<RealT>(y_int_[6]),
316316
(Kiv_ * Kpc_) / Lf_,
317317
Kic_ / Lf_,
318-
mp_ * static_cast<RealT>(int_[0]),
318+
mp_ * static_cast<RealT>(y_int_[0]),
319319
-(Kpc_ + rLf_) / Lf_ - alpha_,
320320
(Cf_ * Kpc_ * wb_) / Lf_,
321321
-(Kpc_ * Kpv_ + 1.0) / Lf_,
@@ -327,10 +327,10 @@ namespace GridKit
327327
rtemp.clear();
328328
for (size_t i = 0; i < ctemp.size(); i++)
329329
rtemp.push_back(11);
330-
valtemp = {-mp_ * static_cast<RealT>(int_[9]),
330+
valtemp = {-mp_ * static_cast<RealT>(y_int_[9]),
331331
1.0 / Cf_,
332332
-alpha_,
333-
wb_ - mp_ * static_cast<RealT>(int_[0]),
333+
wb_ - mp_ * static_cast<RealT>(y_int_[0]),
334334
-1.0 / Cf_};
335335
this->setJacValues(rtemp, ctemp, valtemp);
336336

@@ -339,7 +339,7 @@ namespace GridKit
339339
rtemp.clear();
340340
for (size_t i = 0; i < ctemp.size(); i++)
341341
rtemp.push_back(12);
342-
valtemp = {mp_ * static_cast<RealT>(int_[8]), 1.0 / Cf_, -wb_ + mp_ * static_cast<RealT>(int_[0]), -alpha_, -1.0 / Cf_};
342+
valtemp = {mp_ * static_cast<RealT>(y_int_[8]), 1.0 / Cf_, -wb_ + mp_ * static_cast<RealT>(y_int_[0]), -alpha_, -1.0 / Cf_};
343343
this->setJacValues(rtemp, ctemp, valtemp);
344344

345345
// r = 13
@@ -352,10 +352,10 @@ namespace GridKit
352352
valtemp = {
353353
(1.0 / Lc_) * -cos(delta),
354354
(1.0 / Lc_) * -sin(delta),
355-
-mp_ * static_cast<RealT>(int_[11]),
355+
-mp_ * static_cast<RealT>(y_int_[11]),
356356
1.0 / Lc_,
357357
-rLc_ / Lc_ - alpha_,
358-
wb_ - mp_ * static_cast<RealT>(int_[0]),
358+
wb_ - mp_ * static_cast<RealT>(y_int_[0]),
359359
};
360360
if (!refframe_)
361361
valtemp.push_back((1.0 / Lc_) * (sin(delta) * static_cast<RealT>(y_[1]) - cos(delta) * static_cast<RealT>(y_[2])));
@@ -371,9 +371,9 @@ namespace GridKit
371371
valtemp = {
372372
(1.0 / Lc_) * sin(delta),
373373
(1.0 / Lc_) * -cos(delta),
374-
mp_ * static_cast<RealT>(int_[10]),
374+
mp_ * static_cast<RealT>(y_int_[10]),
375375
1.0 / Lc_,
376-
-wb_ + mp_ * static_cast<RealT>(int_[0]),
376+
-wb_ + mp_ * static_cast<RealT>(y_int_[0]),
377377
-rLc_ / Lc_ - alpha_,
378378
};
379379
if (!refframe_)

‎GridKit/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ namespace GridKit
4848
using CircuitComponent<ScalarT, IdxT>::time_;
4949
using CircuitComponent<ScalarT, IdxT>::alpha_;
5050
using CircuitComponent<ScalarT, IdxT>::y_;
51-
using CircuitComponent<ScalarT, IdxT>::int_;
51+
using CircuitComponent<ScalarT, IdxT>::y_int_;
5252
using CircuitComponent<ScalarT, IdxT>::yp_;
53-
using CircuitComponent<ScalarT, IdxT>::intp_;
53+
using CircuitComponent<ScalarT, IdxT>::yp_int_;
5454
using CircuitComponent<ScalarT, IdxT>::tag_;
5555
using CircuitComponent<ScalarT, IdxT>::f_;
56-
using CircuitComponent<ScalarT, IdxT>::int_f_;
56+
using CircuitComponent<ScalarT, IdxT>::f_int_;
5757
using CircuitComponent<ScalarT, IdxT>::g_;
5858
using CircuitComponent<ScalarT, IdxT>::yB_;
5959
using CircuitComponent<ScalarT, IdxT>::ypB_;

‎GridKit/Model/PowerElectronics/InductionMotor/InductionMotor.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ namespace GridKit
7070
template <class ScalarT, typename IdxT>
7171
int InductionMotor<ScalarT, IdxT>::evaluateInternalResidual()
7272
{
73-
int_f_[0] = (1.0 / 3.0) * (2.0 * y_[0] - y_[1] - y_[2]) - Rs_ * int_[0] - (Lls_ + Lms_) * intp_[0] - Lms_ * intp_[1];
74-
int_f_[1] = (1.0 / std::sqrt(3.0)) * (-y_[1] + y_[2]) - Rs_ * int_[1] - (Lls_ + Lms_) * intp_[1] - Lms_ * intp_[0];
75-
int_f_[2] = (y_[0] + y_[1] + y_[2]) / 3.0 - Rs_ * int_[2] - Lls_ * intp_[7];
76-
int_f_[3] = Rr_ * int_[3] + (Llr_ + Lms_) * intp_[8] + Lms_ * intp_[0] - (P_ / 2.0) * y_[3] * ((Llr_ + Lms_) * int_[4] + Lms_ * int_[1]);
77-
int_f_[4] = Rr_ * int_[4] + (Llr_ + Lms_) * intp_[9] + Lms_ * intp_[1] + (P_ / 2.0) * y_[3] * ((Llr_ + Lms_) * int_[3] + Lms_ * int_[0]);
73+
f_int_[0] = (1.0 / 3.0) * (2.0 * y_[0] - y_[1] - y_[2]) - Rs_ * y_int_[0] - (Lls_ + Lms_) * yp_int_[0] - Lms_ * yp_int_[1];
74+
f_int_[1] = (1.0 / std::sqrt(3.0)) * (-y_[1] + y_[2]) - Rs_ * y_int_[1] - (Lls_ + Lms_) * yp_int_[1] - Lms_ * yp_int_[0];
75+
f_int_[2] = (y_[0] + y_[1] + y_[2]) / 3.0 - Rs_ * y_int_[2] - Lls_ * yp_int_[7];
76+
f_int_[3] = Rr_ * y_int_[3] + (Llr_ + Lms_) * yp_int_[8] + Lms_ * yp_int_[0] - (P_ / 2.0) * y_[3] * ((Llr_ + Lms_) * y_int_[4] + Lms_ * y_int_[1]);
77+
f_int_[4] = Rr_ * y_int_[4] + (Llr_ + Lms_) * yp_int_[9] + Lms_ * yp_int_[1] + (P_ / 2.0) * y_[3] * ((Llr_ + Lms_) * y_int_[3] + Lms_ * y_int_[0]);
7878
return 0;
7979
}
8080

8181
template <class ScalarT, typename IdxT>
8282
int InductionMotor<ScalarT, IdxT>::evaluateExternalResidual()
8383
{
84-
f_[0] = int_[0] + int_[2];
85-
f_[1] = (-1.0 / 2.0) * int_[0] - (std::sqrt(3.0) / 2.0) * int_[1] + int_[2];
86-
f_[2] = (-1.0 / 2.0) * int_[0] + (std::sqrt(3.0) / 2.0) * int_[1] + int_[2];
87-
f_[3] = RJ_ * yp_[3] - (3.0 / 4.0) * P_ * Lms_ * (y_[5] * int_[4] - int_[1] * int_[3]);
84+
f_[0] = y_int_[0] + y_int_[2];
85+
f_[1] = (-1.0 / 2.0) * y_int_[0] - (std::sqrt(3.0) / 2.0) * y_int_[1] + y_int_[2];
86+
f_[2] = (-1.0 / 2.0) * y_int_[0] + (std::sqrt(3.0) / 2.0) * y_int_[1] + y_int_[2];
87+
f_[3] = RJ_ * yp_[3] - (3.0 / 4.0) * P_ * Lms_ * (y_[5] * y_int_[4] - y_int_[1] * y_int_[3]);
8888
f_[4] = yp_[4] - y_[3];
8989
return 0;
9090
}

‎GridKit/Model/PowerElectronics/InductionMotor/InductionMotor.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ namespace GridKit
2626
using CircuitComponent<ScalarT, IdxT>::time_;
2727
using CircuitComponent<ScalarT, IdxT>::alpha_;
2828
using CircuitComponent<ScalarT, IdxT>::y_;
29-
using CircuitComponent<ScalarT, IdxT>::int_;
29+
using CircuitComponent<ScalarT, IdxT>::y_int_;
3030
using CircuitComponent<ScalarT, IdxT>::yp_;
31-
using CircuitComponent<ScalarT, IdxT>::intp_;
31+
using CircuitComponent<ScalarT, IdxT>::yp_int_;
3232
using CircuitComponent<ScalarT, IdxT>::tag_;
3333
using CircuitComponent<ScalarT, IdxT>::f_;
34-
using CircuitComponent<ScalarT, IdxT>::int_f_;
34+
using CircuitComponent<ScalarT, IdxT>::f_int_;
3535
using CircuitComponent<ScalarT, IdxT>::g_;
3636
using CircuitComponent<ScalarT, IdxT>::yB_;
3737
using CircuitComponent<ScalarT, IdxT>::ypB_;

‎GridKit/Model/PowerElectronics/Inductor/Inductor.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ namespace GridKit
5858
template <class ScalarT, typename IdxT>
5959
int Inductor<ScalarT, IdxT>::evaluateInternalResidual()
6060
{
61-
int_f_[0] = -L_ * intp_[0] + y_[1] - y_[0];
61+
f_int_[0] = -L_ * yp_int_[0] + y_[1] - y_[0];
6262
return 0;
6363
}
6464

6565
template <class ScalarT, typename IdxT>
6666
int Inductor<ScalarT, IdxT>::evaluateExternalResidual()
6767
{
6868
// input
69-
f_[0] = -int_[0];
69+
f_[0] = -y_int_[0];
7070
// output
71-
f_[1] = int_[0];
71+
f_[1] = y_int_[0];
7272
return 0;
7373
}
7474

‎GridKit/Model/PowerElectronics/Inductor/Inductor.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ namespace GridKit
2828
using CircuitComponent<ScalarT, IdxT>::time_;
2929
using CircuitComponent<ScalarT, IdxT>::alpha_;
3030
using CircuitComponent<ScalarT, IdxT>::y_;
31-
using CircuitComponent<ScalarT, IdxT>::int_;
31+
using CircuitComponent<ScalarT, IdxT>::y_int_;
3232
using CircuitComponent<ScalarT, IdxT>::yp_;
33-
using CircuitComponent<ScalarT, IdxT>::intp_;
33+
using CircuitComponent<ScalarT, IdxT>::yp_int_;
3434
using CircuitComponent<ScalarT, IdxT>::tag_;
3535
using CircuitComponent<ScalarT, IdxT>::f_;
36-
using CircuitComponent<ScalarT, IdxT>::int_f_;
36+
using CircuitComponent<ScalarT, IdxT>::f_int_;
3737
using CircuitComponent<ScalarT, IdxT>::g_;
3838
using CircuitComponent<ScalarT, IdxT>::yB_;
3939
using CircuitComponent<ScalarT, IdxT>::ypB_;

0 commit comments

Comments
 (0)