Skip to content

MVA Parameter Cleanup #435

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

Merged
pelesh merged 2 commits into from
Jun 4, 2026
Merged

MVA Parameter Cleanup #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66813ff
Use mva for synchronous machine base values
lukelowry Jun 2, 2026
cf8d303
Refactor WECC case
lukelowry Jun 2, 2026
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
6 changes: 3 additions & 3 deletions GridKit/Model/PhasorDynamics/INPUT_FORMAT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ are specified:
---------------------|------------------------------------------------------|----------------------------------|---------------------------- | -------------------------
`Branch` | algebraic pi model for a line or off-nominal transformer branch | `bus1`, `bus2` | `R`, `X`, `G`, `B`, `tap`, `phase` | `ir1`, `ii1`, `im1`, `p1`, `q1`, `ir2`, `ii2`, `im2`, `p2`, `q2`
`Load` | a basic static impedence load model | `bus` | `R`, `X` | `p`, `q`
`Genrou` | 6th order machine model | `bus`, `pmech`\*, `speed`\*, `efd`\* | `p0`, `q0`, `H`, `D`, `Ra`, `Tdop`, `Tdopp`, `Tqop`, `Tqopp`, `Xd`, `Xdp`, `Xdpp`, `Xq`, `Xqp`, `Xqpp`, `Xl`, `S10`, `S12`, `mva_base` | `ir`, `ii`, `p`, `q`, `delta`, `omega`, `speed`
`Gensal` | 5th order salient-pole machine model | `bus`, `pmech`\*, `speed`\*, `efd`\* | `p0`, `q0`, `H`, `D`, `Ra`, `Tdop`, `Tdopp`, `Tqopp`, `Xd`, `Xdp`, `Xdpp`, `Xq`, `Xl`, `S10`, `S12`, `mva_base` | `ir`, `ii`, `p`, `q`, `delta`, `omega`, `speed`, `Eqp`, `psidp`, `psiqpp`, `psidpp`, `vd`, `vq`, `te`, `id`, `iq`
`GenClassical` | the classical machine model | `bus`, `pmech`\*, `speed`\*, `efd`\* | `p0`, `q0`, `H`, `D`, `Ra`, `Xdp`, `mva_base` | `ir`, `ii`, `p`, `q`, `delta`, `omega`
`Genrou` | 6th order machine model | `bus`, `pmech`\*, `speed`\*, `efd`\* | `p0`, `q0`, `H`, `D`, `Ra`, `Tdop`, `Tdopp`, `Tqop`, `Tqopp`, `Xd`, `Xdp`, `Xdpp`, `Xq`, `Xqp`, `Xqpp`, `Xl`, `S10`, `S12`, `mva` | `ir`, `ii`, `p`, `q`, `delta`, `omega`, `speed`
`Gensal` | 5th order salient-pole machine model | `bus`, `pmech`\*, `speed`\*, `efd`\* | `p0`, `q0`, `H`, `D`, `Ra`, `Tdop`, `Tdopp`, `Tqopp`, `Xd`, `Xdp`, `Xdpp`, `Xq`, `Xl`, `S10`, `S12`, `mva` | `ir`, `ii`, `p`, `q`, `delta`, `omega`, `speed`, `Eqp`, `psidp`, `psiqpp`, `psidpp`, `vd`, `vq`, `te`, `id`, `iq`
`GenClassical` | the classical machine model | `bus`, `pmech`\*, `speed`\*, `efd`\* | `p0`, `q0`, `H`, `D`, `Ra`, `Xdp`, `mva` | `ir`, `ii`, `p`, `q`, `delta`, `omega`
`Tgov1 ` | the TGOV1 governor model | `pmech`, `speed` | `R`, `T1`, `T2`, `T3`, `Pvmax`, `Pvmin`, `Dt` | `none`
`Ieeet1` | the IEEET1 exciter model | `bus`, `speed`, `efd`, `vs`\* | `Tr`, `Ka`, `Ta`, `Ke`, `Te`, `Kf`, `Tf`, `Vrmin`, `Vrmax`, `E1`, `E2`, `Se1`, `Se2`, `Ispdlim` | `efd`, `ksat`
`SexsPti` | the SEXS-PTI simplified exciter model | `bus`, `efd`, `vs`\* | `Ta`, `Tb`, `Te`, `K`, `Efdmax`, `Efdmin` | `efd`
Expand Down
38 changes: 19 additions & 19 deletions GridKit/Model/PhasorDynamics/SynchronousMachine/GENROUwS/GenrouData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ namespace GridKit
/// Initial parameters for a Genrou generator model
enum class GenrouParameters
{
p0, ///< Initial active power
q0, ///< Initial reactive power
H, ///< Rotor inertia
D, ///< Damping coefficient
Ra, ///< Winding resistance
Tdop, ///< Open circuit direct axis transient time
Tdopp, ///< Open circuit direct axis sub-transient time
Tqop, ///< Open circuit quadrature axis transient
Tqopp, ///< Open circuit quadrature axis sub-transient time
Xd, ///< Direct axis synchronous reactance
Xdp, ///< Direct axis transient reactance
Xdpp, ///< Direct axis sub-transient reactance
Xq, ///< Quadrature axis synchronous reactance
Xqp, ///< Quadrature axis transient reactance
Xqpp, ///< Quadrature axis sub-transient reactance
Xl, ///< Stator leakage reactance
S10, ///< Saturation factor at 1.0 pu flux
S12, ///< Saturation factor at 1.2 pu flux
mva_base, ///< MVA base of the genrou model
p0, ///< Initial active power
q0, ///< Initial reactive power
H, ///< Rotor inertia
D, ///< Damping coefficient
Ra, ///< Winding resistance
Tdop, ///< Open circuit direct axis transient time
Tdopp, ///< Open circuit direct axis sub-transient time
Tqop, ///< Open circuit quadrature axis transient
Tqopp, ///< Open circuit quadrature axis sub-transient time
Xd, ///< Direct axis synchronous reactance
Xdp, ///< Direct axis transient reactance
Xdpp, ///< Direct axis sub-transient reactance
Xq, ///< Quadrature axis synchronous reactance
Xqp, ///< Quadrature axis transient reactance
Xqpp, ///< Quadrature axis sub-transient reactance
Xl, ///< Stator leakage reactance
S10, ///< Saturation factor at 1.0 pu flux
S12, ///< Saturation factor at 1.2 pu flux
mva, ///< MVA base of the genrou model
};

/// Ports for a Genrou generator model
Expand Down
4 changes: 2 additions & 2 deletions GridKit/Model/PhasorDynamics/SynchronousMachine/GENROUwS/GenrouImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ namespace GridKit
S12_ = std::get<RealT>(data.parameters.at(model_data_type::Parameters::S12));
}

if (data.parameters.contains(model_data_type::Parameters::mva_base))
if (data.parameters.contains(model_data_type::Parameters::mva))
{
mva_base_ = std::get<RealT>(data.parameters.at(model_data_type::Parameters::mva_base));
mva_base_ = std::get<RealT>(data.parameters.at(model_data_type::Parameters::mva));
}

if (data.ports.contains(model_data_type::Ports::bus))
Expand Down
32 changes: 16 additions & 16 deletions GridKit/Model/PhasorDynamics/SynchronousMachine/GENSALwS/GensalData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ namespace GridKit
/// Initial parameters for a Gensal generator model
enum class GensalParameters
{
p0, ///< Initial active power
q0, ///< Initial reactive power
H, ///< Rotor inertia
D, ///< Damping coefficient
Ra, ///< Winding resistance
Tdop, ///< Open circuit direct axis transient time
Tdopp, ///< Open circuit direct axis sub-transient time
Tqopp, ///< Open circuit quadrature axis sub-transient time
Xd, ///< Direct axis synchronous reactance
Xdp, ///< Direct axis transient reactance
Xdpp, ///< Direct axis sub-transient reactance
Xq, ///< Quadrature axis synchronous reactance
Xl, ///< Stator leakage reactance
S10, ///< Saturation factor at 1.0 pu flux
S12, ///< Saturation factor at 1.2 pu flux
mva_base, ///< MVA base of the gensal model
p0, ///< Initial active power
q0, ///< Initial reactive power
H, ///< Rotor inertia
D, ///< Damping coefficient
Ra, ///< Winding resistance
Tdop, ///< Open circuit direct axis transient time
Tdopp, ///< Open circuit direct axis sub-transient time
Tqopp, ///< Open circuit quadrature axis sub-transient time
Xd, ///< Direct axis synchronous reactance
Xdp, ///< Direct axis transient reactance
Xdpp, ///< Direct axis sub-transient reactance
Xq, ///< Quadrature axis synchronous reactance
Xl, ///< Stator leakage reactance
S10, ///< Saturation factor at 1.0 pu flux
S12, ///< Saturation factor at 1.2 pu flux
mva, ///< MVA base of the gensal model
};

/// Ports for a Gensal generator model
Expand Down
4 changes: 2 additions & 2 deletions GridKit/Model/PhasorDynamics/SynchronousMachine/GENSALwS/GensalImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ namespace GridKit
S12_ = std::get<RealT>(data.parameters.at(model_data_type::Parameters::S12));
}

if (data.parameters.contains(model_data_type::Parameters::mva_base))
if (data.parameters.contains(model_data_type::Parameters::mva))
{
mva_base_ = std::get<RealT>(data.parameters.at(model_data_type::Parameters::mva_base));
mva_base_ = std::get<RealT>(data.parameters.at(model_data_type::Parameters::mva));
}
}

Expand Down
14 changes: 7 additions & 7 deletions GridKit/Model/PhasorDynamics/SynchronousMachine/GenClassical/GenClassicalData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ namespace GridKit
/// Initial parameters for a classical generator model
enum class GenClassicalParameters
{
p0, ///< Initial active power
q0, ///< Initial reactive power
H, ///< Rotor inertia
D, ///< Damping coefficient
Ra, ///< Winding resistance
Xdp, ///< Direct axis transient reactance
mva_base ///< MVA Base of the generator
p0, ///< Initial active power
q0, ///< Initial reactive power
H, ///< Rotor inertia
D, ///< Damping coefficient
Ra, ///< Winding resistance
Xdp, ///< Direct axis transient reactance
mva ///< MVA Base of the generator
};

/// Ports supported for a classical generator model
Expand Down
4 changes: 2 additions & 2 deletions GridKit/Model/PhasorDynamics/SynchronousMachine/GenClassical/GenClassicalImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ namespace GridKit
Xdp_ = std::get<RealT>(data.parameters.at(DataT::Parameters::Xdp));
}

if (data.parameters.contains(DataT::Parameters::mva_base))
if (data.parameters.contains(DataT::Parameters::mva))
{
mva_base_ = std::get<RealT>(data.parameters.at(DataT::Parameters::mva_base));
mva_base_ = std::get<RealT>(data.parameters.at(DataT::Parameters::mva));
}

if (data.ports.contains(DataT::Ports::bus))
Expand Down
Loading
Loading