Skip to content

Commit 37cc69f

Browse files
committed
models: rsolves warnings of getting attr base_voltage
1 parent dfe7e92 commit 37cc69f

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

Source/PFSolver.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ void PFSolver::composeAdmittanceMatrix() {
300300
if(mLines.empty() && mTransformers.empty() && mTransformers3W.empty()) {
301301
throw std::invalid_argument("There are no bus");
302302
}
303+
304+
mSLog->info("#### System matrix:\n{}", mY);
303305
}
304306

305307
CPS::Real PFSolver::G(int i, int j) {

Source/PFSolverPowerPolar.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,19 @@ void PFSolverPowerPolar::setSolution() {
322322
}
323323
}
324324
else if (std::shared_ptr<CPS::SP::Ph1::SynchronGenerator> gen = std::dynamic_pointer_cast<CPS::SP::Ph1::SynchronGenerator>(comp)) {
325-
baseVoltage_ =gen->attribute<CPS::Real>("base_Voltage")->get();
325+
baseVoltage_ = gen->attribute<CPS::Real>("base_Voltage")->get();
326+
break;
327+
}
328+
else if (std::shared_ptr<CPS::SP::Ph1::NetworkInjection> extnet = std::dynamic_pointer_cast<CPS::SP::Ph1::NetworkInjection>(comp)) {
329+
baseVoltage_ = extnet->attribute<CPS::Real>("base_Voltage")->get();
330+
break;
331+
}
332+
else if (std::shared_ptr<CPS::SP::Ph1::Shunt> shunt = std::dynamic_pointer_cast<CPS::SP::Ph1::Shunt>(comp)) {
333+
baseVoltage_ = shunt->attribute<CPS::Real>("base_Voltage")->get();
334+
break;
335+
}
336+
else if (std::shared_ptr<CPS::SP::Ph1::Load> load = std::dynamic_pointer_cast<CPS::SP::Ph1::Load>(comp)) {
337+
baseVoltage_ = load->attribute<CPS::Real>("V_nom")->get();
326338
break;
327339
}
328340
else {

models/Source/SP/SP_Ph1_NetworkInjection.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ SP::Ph1::NetworkInjection::NetworkInjection(String uid, String name,
2828
for (auto subcomp: mSubComponents)
2929
mSLog->info("- {}", subcomp->name());
3030

31+
addAttribute<Real>("base_Voltage", &mBaseVoltage, Flags::read | Flags::write);
3132
addAttribute<Real>("V_set", &mVoltageSetPoint, Flags::read | Flags::write);
3233
addAttribute<Real>("V_set_pu", &mVoltageSetPointPerUnit, Flags::read | Flags::write);
3334
addAttribute<Real>("p_inj", &mActivePowerInjection, Flags::read | Flags::write);

models/Source/SP/SP_Ph1_Shunt.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SP::Ph1::Shunt::Shunt(String uid, String name, Logger::Level logLevel)
1616
mSLog->info("Create {} of type {}", this->type(), name);
1717
setTerminalNumber(1);
1818

19+
addAttribute<Real>("base_Voltage", &mBaseVoltage, Flags::read | Flags::write);
1920
addAttribute<Real>("G", &mConductance, Flags::write | Flags::read);
2021
addAttribute<Real>("B", &mSusceptance, Flags::write | Flags::read);
2122
}

0 commit comments

Comments
 (0)