Skip to content

add additional exciters to griddyn #214

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
phlptp merged 4 commits into from
Aug 28, 2026
Merged

add additional exciters to griddyn #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7115a77
add additional exciters to griddyn
phlptp Aug 28, 2026
6a92ddf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 28, 2026
49f465e
clang-tidy fixes
phlptp Aug 28, 2026
19721e4
more clang-tidy
phlptp Aug 28, 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
113 changes: 88 additions & 25 deletions docs/developer-guide/andes-compatibility.md
View file
Open in desktop

Large diffs are not rendered by default.

99 changes: 99 additions & 0 deletions src/fileInput/gridDynReadDYR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ namespace {
void loadESDC1A(CoreObject* parentObject, stringVec& tokens);
void loadESST3A(CoreObject* parentObject, stringVec& tokens);
void loadEXST1(CoreObject* parentObject, stringVec& tokens);
void loadEXAC1(CoreObject* parentObject, stringVec& tokens);
void loadEXAC2(CoreObject* parentObject, stringVec& tokens);
void loadEXAC4(CoreObject* parentObject, stringVec& tokens);
void loadTGOV1(CoreObject* parentObject, stringVec& tokens);
void loadIEEEG1(CoreObject* parentObject, stringVec& tokens);
void loadIEEEST(CoreObject* parentObject, stringVec& tokens);
Expand Down Expand Up @@ -86,6 +89,12 @@ void loadDyr(CoreObject* parentObject,
loadESST3A(parentObject, lineTokens);
} else if (type == "'EXST1'") {
loadEXST1(parentObject, lineTokens);
} else if (type == "'EXAC1'") {
loadEXAC1(parentObject, lineTokens);
} else if (type == "'EXAC2'") {
loadEXAC2(parentObject, lineTokens);
} else if (type == "'EXAC4'") {
loadEXAC4(parentObject, lineTokens);
} else if (type == "'EXDC2'") {
loadEXDC2(parentObject, lineTokens);
} else if (type == "'TGOV1'") {
Expand Down Expand Up @@ -235,6 +244,96 @@ namespace {
gen->add(exciterModel);
}

void loadEXAC1(CoreObject* parentObject, stringVec& tokens)
{
const int busId = std::stoi(tokens[0]);
const auto* bus = static_cast<GridBus*>(parentObject->findByUserID("bus", busId));
auto* gen = bus->getGen(std::stoi(tokens[2]) - 1);
const auto params = gmlc::utilities::str2vector(tokens, kNullVal);
auto* exciter =
static_cast<Exciter*>(CoreObjectFactory::instance()->createObject("exciter", "exac1"));
// Exact ANDES psse-dyr.yaml order: TR, TB, TC, KA, TA, VRMAX,
// VRMIN, TE, KF, TF, KC, KD, KE, E1, SE1, E2, SE2.
exciter->set("tr", params[3]);
exciter->set("tb", params[4]);
exciter->set("tc", params[5]);
exciter->set("ka", params[6]);
exciter->set("ta", params[7]);
exciter->set("vrmax", params[8]);
exciter->set("vrmin", params[9]);
exciter->set("te", params[10]);
exciter->set("kf", params[11]);
exciter->set("tf", params[12]);
exciter->set("kc", params[13]);
exciter->set("kd", params[14]);
exciter->set("ke", params[15]);
exciter->set("e1", params[16]);
exciter->set("se1", params[17]);
exciter->set("e2", params[18]);
exciter->set("se2", params[19]);
gen->add(exciter);
}

void loadEXAC2(CoreObject* parentObject, stringVec& tokens)
{
const int busId = std::stoi(tokens[0]);
const auto* bus = static_cast<GridBus*>(parentObject->findByUserID("bus", busId));
auto* gen = bus->getGen(std::stoi(tokens[2]) - 1);
const auto params = gmlc::utilities::str2vector(tokens, kNullVal);
auto* exciter =
static_cast<Exciter*>(CoreObjectFactory::instance()->createObject("exciter", "exac2"));
// Exact ANDES psse-dyr.yaml order: TR, TB, TC, KA, TA, VAMAX,
// VAMIN, KB, VRMAX, VRMIN, TE, KL, KH, KF, TF, KC, KD, KE, VLR,
// E1, SE1, E2, SE2.
exciter->set("tr", params[3]);
exciter->set("tb", params[4]);
exciter->set("tc", params[5]);
exciter->set("ka", params[6]);
exciter->set("ta", params[7]);
exciter->set("vamax", params[8]);
exciter->set("vamin", params[9]);
exciter->set("kb", params[10]);
exciter->set("vrmax", params[11]);
exciter->set("vrmin", params[12]);
exciter->set("te", params[13]);
exciter->set("kl", params[14]);
exciter->set("kh", params[15]);
exciter->set("kf", params[16]);
exciter->set("tf", params[17]);
exciter->set("kc", params[18]);
exciter->set("kd", params[19]);
exciter->set("ke", params[20]);
exciter->set("vlr", params[21]);
exciter->set("e1", params[22]);
exciter->set("se1", params[23]);
exciter->set("e2", params[24]);
exciter->set("se2", params[25]);
gen->add(exciter);
}

void loadEXAC4(CoreObject* parentObject, stringVec& tokens)
{
const int busId = std::stoi(tokens[0]);
const auto* bus = static_cast<GridBus*>(parentObject->findByUserID("bus", busId));
auto* gen = bus->getGen(std::stoi(tokens[2]) - 1);
const auto params = gmlc::utilities::str2vector(tokens, kNullVal);
auto* exciter =
static_cast<Exciter*>(CoreObjectFactory::instance()->createObject("exciter", "exac4"));
// Exact ANDES psse-dyr.yaml order: TR, VIMAX, VIMIN, TC, TB, KA,
// TA, VRMAX, VRMIN, KC.
exciter->set("tr", params[3]);
exciter->set("vimax", params[4]);
exciter->set("vimin", params[5]);
exciter->set("tc", params[6]);
exciter->set("tb", params[7]);
exciter->set("ka", params[8]);
exciter->set("ta", params[9]);
exciter->set("vrmax", params[10]);
exciter->set("vrmin", params[11]);
exciter->set("kc", params[12]);
gen->add(exciter);
}

void loadEXDC2(CoreObject* parentObject, stringVec& tokens)
{
const int busId = std::stoi(tokens[0]);
Expand Down
6 changes: 6 additions & 0 deletions src/griddyn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ set(exciter_headers
exciters/ExciterDC1A.h
exciters/ExciterDC2A.h
exciters/ExciterESST3A.h
exciters/ExciterEXAC1.h
exciters/ExciterEXAC2.h
exciters/ExciterEXAC4.h
exciters/ExciterEXST1.h
exciters/ExciterIEEEtype1.h
exciters/ExciterIEEEtype2.h
Expand All @@ -98,6 +101,9 @@ set(exciter_sources
exciters/ExciterDC1A.cpp
exciters/ExciterDC2A.cpp
exciters/ExciterESST3A.cpp
exciters/ExciterEXAC1.cpp
exciters/ExciterEXAC2.cpp
exciters/ExciterEXAC4.cpp
exciters/ExciterEXST1.cpp
exciters/ExciterIEEEtype1.cpp
exciters/ExciterIEEEtype2.cpp
Expand Down
6 changes: 6 additions & 0 deletions src/griddyn/exciters/Exciter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#include "ExciterDC1A.h"
#include "ExciterDC2A.h"
#include "ExciterESST3A.h"
#include "ExciterEXAC1.h"
#include "ExciterEXAC2.h"
#include "ExciterEXAC4.h"
#include "ExciterEXST1.h"
#include "ExciterIEEEtype1.h"
#include "ExciterIEEEtype2.h"
Expand All @@ -36,6 +39,9 @@ namespace exciters {
static ChildTypeFactory<ExciterDC1A, Exciter> gfeDc1a("exciter", "dc1a"); // NOLINT
static ChildTypeFactory<ExciterDC2A, Exciter> gfeDc2a("exciter", "dc2a"); // NOLINT
static ChildTypeFactory<ExciterESST3A, Exciter> gfeEsst3a("exciter", "esst3a"); // NOLINT
static ChildTypeFactory<ExciterEXAC1, Exciter> gfeExac1("exciter", "exac1"); // NOLINT
static ChildTypeFactory<ExciterEXAC2, Exciter> gfeExac2("exciter", "exac2"); // NOLINT
static ChildTypeFactory<ExciterEXAC4, Exciter> gfeExac4("exciter", "exac4"); // NOLINT
static ChildTypeFactory<ExciterEXST1, Exciter> gfeExst1("exciter", "exst1"); // NOLINT
static ChildTypeFactory<ExciterIEEEtype1, Exciter> gfeType1("exciter", "type1"); // NOLINT
static TypeFactory<Exciter> gfeDefault( // NOLINT
Expand Down
Loading