Skip to content

Commit 9781e54

Browse files
HugoKuleszaHugoKulesza
authored
Integrating powsybl-dependencies 2025.3.0 and powsybl-optimizer 0.16.0 (#1134)
Signed-off-by: Hugo KULESZA <[email protected]>
1 parent 63084a1 commit 9781e54

39 files changed

+285
-122
lines changed

‎.github/workflows/dev-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323

2424
- name: Install Maven
2525
run: |
26-
wget -q https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.tar.gz -P /tmp
26+
wget -q https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.tar.gz -P /tmp
2727
tar xf /tmp/apache-maven-*.tar.gz -C /opt
28-
echo /opt/apache-maven-3.9.11/bin >> $GITHUB_PATH
28+
echo /opt/apache-maven-3.9.12/bin >> $GITHUB_PATH
2929
3030
- name: Setup GraalVM
3131
uses: graalvm/setup-graalvm@v1

‎.github/workflows/full-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434

3535
- name: Install Maven
3636
run: |
37-
wget -q https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.tar.gz -P /tmp
37+
wget -q https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.tar.gz -P /tmp
3838
tar xf /tmp/apache-maven-*.tar.gz -C /opt
39-
echo /opt/apache-maven-3.9.11/bin >> $GITHUB_PATH
39+
echo /opt/apache-maven-3.9.12/bin >> $GITHUB_PATH
4040
4141
- name: Setup GraalVM
4242
uses: graalvm/setup-graalvm@v1

‎cpp/powsybl-cpp/powsybl-cpp.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ LoadFlowParameters::LoadFlowParameters(loadflow_parameters* src) {
330330
distributed_slack = (bool) src->distributed_slack;
331331
balance_type = static_cast<BalanceType>(src->balance_type);
332332
dc_use_transformer_ratio = (bool) src->dc_use_transformer_ratio;
333-
connected_component_mode = static_cast<ConnectedComponentMode>(src->connected_component_mode);
333+
component_mode = static_cast<ComponentMode>(src->component_mode);
334334
hvdc_ac_emulation = (bool) src->hvdc_ac_emulation;
335335
dc_power_factor = (double) src->dc_power_factor;
336336
copyCharPtrPtrToVector(src->countries_to_balance, src->countries_to_balance_count, countries_to_balance);
@@ -351,7 +351,7 @@ void LoadFlowParameters::load_to_c_struct(loadflow_parameters& res) const {
351351
res.dc_use_transformer_ratio = (unsigned char) dc_use_transformer_ratio;
352352
res.countries_to_balance = pypowsybl::copyVectorStringToCharPtrPtr(countries_to_balance);
353353
res.countries_to_balance_count = countries_to_balance.size();
354-
res.connected_component_mode = connected_component_mode;
354+
res.component_mode = component_mode;
355355
res.hvdc_ac_emulation = (unsigned char) hvdc_ac_emulation;
356356
res.dc_power_factor = dc_power_factor;
357357
providerParametersToCStruct(res.provider_parameters, provider_parameters_keys, provider_parameters_values);

‎cpp/powsybl-cpp/powsybl-cpp.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,12 @@ enum BalanceType {
253253
PROPORTIONAL_TO_CONFORM_LOAD,
254254
};
255255

256+
enum ComponentMode {
257+
MAIN_CONNECTED = 0,
258+
ALL_CONNECTED,
259+
MAIN_SYNCHRONOUS,
260+
};
261+
256262
enum ConnectedComponentMode {
257263
MAIN = 0,
258264
ALL,
@@ -317,7 +323,7 @@ class LoadFlowParameters {
317323
BalanceType balance_type;
318324
bool dc_use_transformer_ratio;
319325
std::vector<std::string> countries_to_balance;
320-
ConnectedComponentMode connected_component_mode;
326+
ComponentMode component_mode;
321327
bool hvdc_ac_emulation;
322328
double dc_power_factor;
323329
std::vector<std::string> provider_parameters_keys;

‎cpp/pypowsybl-cpp/bindings.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,11 @@ PYBIND11_MODULE(_pypowsybl, m) {
560560
.value("ALL", pypowsybl::ConnectedComponentMode::ALL, "Run on all connected components")
561561
.value("MAIN", pypowsybl::ConnectedComponentMode::MAIN, "Run only on the main connected component");
562562

563+
py::enum_<pypowsybl::ComponentMode>(m, "ComponentMode", "Define which network components to run on.")
564+
.value("ALL_CONNECTED", pypowsybl::ComponentMode::ALL_CONNECTED, "Run on all connected components")
565+
.value("MAIN_CONNECTED", pypowsybl::ComponentMode::MAIN_CONNECTED, "Run only on the main connected component")
566+
.value("MAIN_SYNCHRONOUS", pypowsybl::ComponentMode::MAIN_SYNCHRONOUS, "Run only on the main synchronous component");
567+
563568
py::class_<array_struct, std::shared_ptr<array_struct>>(m, "ArrayStruct")
564569
.def(py::init());
565570

@@ -579,7 +584,7 @@ PYBIND11_MODULE(_pypowsybl, m) {
579584
.def_readwrite("balance_type", &pypowsybl::LoadFlowParameters::balance_type)
580585
.def_readwrite("dc_use_transformer_ratio", &pypowsybl::LoadFlowParameters::dc_use_transformer_ratio)
581586
.def_readwrite("countries_to_balance", &pypowsybl::LoadFlowParameters::countries_to_balance)
582-
.def_readwrite("connected_component_mode", &pypowsybl::LoadFlowParameters::connected_component_mode)
587+
.def_readwrite("component_mode", &pypowsybl::LoadFlowParameters::component_mode)
583588
.def_readwrite("hvdc_ac_emulation", &pypowsybl::LoadFlowParameters::hvdc_ac_emulation)
584589
.def_readwrite("dc_power_factor", &pypowsybl::LoadFlowParameters::dc_power_factor)
585590
.def_readwrite("provider_parameters_keys", &pypowsybl::LoadFlowParameters::provider_parameters_keys)

‎cpp/pypowsybl-java/powsybl-api.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ typedef struct loadflow_parameters_struct {
6969
unsigned char dc_use_transformer_ratio;
7070
char** countries_to_balance;
7171
int countries_to_balance_count;
72-
int connected_component_mode;
72+
int component_mode;
7373
unsigned char hvdc_ac_emulation;
7474
double dc_power_factor;
7575
} loadflow_parameters;

‎data/rao/monitoring_parameters.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version" : "3.2",
2+
"version" : "3.2.1",
33
"objective-function" : {
44
"type" : "SECURE_FLOW",
55
"unit" : "MW"
@@ -52,7 +52,7 @@
5252
"sensitivity-parameters" : {
5353
"version" : "1.0",
5454
"load-flow-parameters" : {
55-
"version" : "1.9",
55+
"version" : "1.10",
5656
"voltageInitMode" : "UNIFORM_VALUES",
5757
"transformerVoltageControlOn" : false,
5858
"phaseShifterRegulationOn" : false,
@@ -66,7 +66,7 @@
6666
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
6767
"dcUseTransformerRatio" : false,
6868
"countriesToBalance" : [ "GR", "BE", "SK", "TR", "CH", "RS", "PL", "UA", "BG", "ES", "ME", "CZ", "HR", "AL", "RO", "HU", "AT", "FR", "PT", "DE", "MK", "BA", "SI", "IT", "NL" ],
69-
"connectedComponentMode" : "MAIN",
69+
"componentMode" : "MAIN_CONNECTED",
7070
"hvdcAcEmulation" : true,
7171
"dcPowerFactor" : 1.0,
7272
"extensions" : {

‎data/rao/rao_parameters.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version" : "3.2",
2+
"version" : "3.2.1",
33
"objective-function" : {
44
"type" : "MAX_MIN_MARGIN",
55
"unit" : "MW",
@@ -59,7 +59,7 @@
5959
"sensitivity-parameters" : {
6060
"version" : "1.0",
6161
"load-flow-parameters" : {
62-
"version" : "1.9",
62+
"version" : "1.10",
6363
"voltageInitMode" : "UNIFORM_VALUES",
6464
"transformerVoltageControlOn" : false,
6565
"phaseShifterRegulationOn" : false,
@@ -73,7 +73,7 @@
7373
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
7474
"dcUseTransformerRatio" : true,
7575
"countriesToBalance" : [ ],
76-
"connectedComponentMode" : "MAIN",
76+
"componentMode" : "MAIN_CONNECTED",
7777
"hvdcAcEmulation" : true
7878
}
7979
}

‎data/rao/rao_parameters_non_default.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version" : "3.2",
2+
"version" : "3.2.1",
33
"objective-function" : {
44
"type" : "MAX_MIN_MARGIN",
55
"unit" : "A",
@@ -53,7 +53,7 @@
5353
"sensitivity-parameters" : {
5454
"version" : "1.1",
5555
"load-flow-parameters" : {
56-
"version" : "1.9",
56+
"version" : "1.10",
5757
"voltageInitMode" : "UNIFORM_VALUES",
5858
"transformerVoltageControlOn" : false,
5959
"phaseShifterRegulationOn" : false,
@@ -67,7 +67,7 @@
6767
"balanceType" : "PROPORTIONAL_TO_GENERATION_P_MAX",
6868
"dcUseTransformerRatio" : true,
6969
"countriesToBalance" : [ ],
70-
"connectedComponentMode" : "MAIN",
70+
"componentMode" : "MAIN_CONNECTED",
7171
"hvdcAcEmulation" : true,
7272
"dcPowerFactor" : 1.0,
7373
"extensions" : {

‎data/rao/rao_parameters_with_curative.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version" : "3.2",
2+
"version" : "3.2.1",
33
"objective-function" : {
44
"type" : "SECURE_FLOW",
55
"unit" : "MW"
@@ -52,7 +52,7 @@
5252
"sensitivity-parameters" : {
5353
"version" : "1.0",
5454
"load-flow-parameters" : {
55-
"version" : "1.9",
55+
"version" : "1.10",
5656
"voltageInitMode" : "UNIFORM_VALUES",
5757
"transformerVoltageControlOn" : false,
5858
"phaseShifterRegulationOn" : false,
@@ -66,7 +66,7 @@
6666
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
6767
"dcUseTransformerRatio" : false,
6868
"countriesToBalance" : [ "GR", "BE", "SK", "TR", "CH", "RS", "PL", "UA", "BG", "ES", "ME", "CZ", "HR", "AL", "RO", "HU", "AT", "FR", "PT", "DE", "MK", "BA", "SI", "IT", "NL" ],
69-
"connectedComponentMode" : "MAIN",
69+
"componentMode" : "MAIN_CONNECTED",
7070
"hvdcAcEmulation" : true,
7171
"dcPowerFactor" : 1.0,
7272
"extensions" : {

0 commit comments

Comments
 (0)