Skip to content

use targetQ values from OpenAC to generate battery modifications #160

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

Open
Mathieu-Deharbe wants to merge 4 commits into
base: main
Choose a base branch
from
Open

use targetQ values from OpenAC to generate battery modifications #160

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
239c12e
use targetQ values from OpenAC to generate battery modifications
Mathieu-Deharbe Sep 4, 2026
b1de1cf
coverage for battery modification
Mathieu-Deharbe Sep 4, 2026
aebd95b
correction
Mathieu-Deharbe Sep 8, 2026
6c1432e
Merge branch 'main' into batteries-voltage-init
Mathieu-Deharbe Sep 8, 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
28 changes: 28 additions & 0 deletions src/main/java/org/gridsuite/voltageinit/server/dto/BatteryModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* Copyright (c) 2026, RTE (http://www.rte-france.com)
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.gridsuite.voltageinit.server.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.SuperBuilder;

/**
* @author Mathieu Deharbe <mathieu.deharbe at rte-france.com>
*/
@SuperBuilder
@Getter
@Setter
public class BatteryModificationInfos {
private String batteryId;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double targetV;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double targetQ;
}
6 changes: 6 additions & 0 deletions src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
public class VoltageInitModificationInfos {
private String type = "VOLTAGE_INIT_MODIFICATION";

private List<BatteryModificationInfos> batteries = new ArrayList<>();

private List<GeneratorModificationInfos> generators = new ArrayList<>();

private List<TransformerModificationInfos> transformers = new ArrayList<>();
Expand All @@ -45,6 +47,10 @@ public void addGeneratorModification(GeneratorModificationInfos generatorModific
generators.add(generatorModificationInfos);
}

public void addBatteryModification(BatteryModificationInfos batteryModificationInfos) {
batteries.add(batteryModificationInfos);
}

public void addTransformerModification(TransformerModificationInfos transformerModificationInfos) {
transformers.add(transformerModificationInfos);
}
Expand Down
46 changes: 33 additions & 13 deletions src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,11 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.powsybl.commons.PowsyblException;
import com.powsybl.iidm.network.Bus;
import com.powsybl.iidm.network.Identifiable;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.ShuntCompensator;
import com.powsybl.iidm.network.Terminal;
import com.powsybl.iidm.network.TwoWindingsTransformer;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.VoltageRegulation;
import com.powsybl.openreac.parameters.output.OpenReacResult;
import org.gridsuite.computation.service.UuidGeneratorService;
import org.gridsuite.voltageinit.server.dto.BusModificationInfos;
import org.gridsuite.voltageinit.server.dto.GeneratorModificationInfos;
import org.gridsuite.voltageinit.server.dto.ShuntCompensatorModificationInfos;
import org.gridsuite.voltageinit.server.dto.StaticVarCompensatorModificationInfos;
import org.gridsuite.voltageinit.server.dto.TransformerModificationInfos;
import org.gridsuite.voltageinit.server.dto.VoltageInitModificationInfos;
import org.gridsuite.voltageinit.server.dto.VscConverterStationModificationInfos;
import org.gridsuite.voltageinit.server.dto.*;
import org.jgrapht.alg.util.Pair;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
Expand Down Expand Up @@ -143,6 +133,36 @@ public UUID createVoltageInitModificationGroup(Network network, OpenReacResult r
voltageInitModificationInfos.addTransformerModification(builder.build());
});

// battery modifications
result.getBatteryModifications().forEach(batMod -> {
String batteryId = batMod.getBatteryId();
targetV.set(null);
Battery battery = network.getBattery(batteryId);
if (battery != null) {
VoltageRegulation voltageRegulation = battery.getExtension(VoltageRegulation.class);
if (voltageRegulation != null) {
Optional<Bus> bus = getRegulatingBus(voltageRegulation.getRegulatingTerminal());
bus.ifPresent(b -> {
Pair<Double, Double> busUpdate = voltageProfile.get(b.getId());
if (busUpdate != null) {
targetV.set(busUpdate.getFirst() * b.getVoltageLevel().getNominalV());
}
});
}
}

Double targetQ = batMod.getTargetQ();
if (targetV.get() != null || targetQ != null) {
voltageInitModificationInfos.addBatteryModification(
BatteryModificationInfos.builder()
.batteryId(batteryId)
.targetV(targetV.get())
.targetQ(targetQ)
.build()
);
}
});

// static var compensator modifications
result.getSvcModifications().forEach(staticVarCompensatorModification -> {
if (staticVarCompensatorModification.getVoltageSetpoint() != null || staticVarCompensatorModification.getReactivePowerSetpoint() != null) {
Expand Down
37 changes: 27 additions & 10 deletions src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@
import com.powsybl.commons.report.ReportNode;
import com.powsybl.computation.CompletableFutureTask;
import com.powsybl.computation.ComputationManager;
import com.powsybl.iidm.modification.GeneratorModification;
import com.powsybl.iidm.modification.ShuntCompensatorModification;
import com.powsybl.iidm.modification.StaticVarCompensatorModification;
import com.powsybl.iidm.modification.VscConverterStationModification;
import com.powsybl.iidm.modification.*;
import com.powsybl.iidm.modification.tapchanger.RatioTapPositionModification;
import com.powsybl.iidm.network.Country;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.VariantManagerConstants;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.VoltageRegulationAdder;
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
import com.powsybl.network.store.client.NetworkStoreService;
import com.powsybl.network.store.client.PreloadingStrategy;
Expand Down Expand Up @@ -97,6 +93,8 @@
import java.util.*;
import java.util.concurrent.ForkJoinPool;

import static com.powsybl.iidm.network.test.EurostagTutorialExample1Factory.NGEN;
import static com.powsybl.iidm.network.test.EurostagTutorialExample1Factory.VLGEN;
import static com.powsybl.network.store.model.NetworkStoreApi.VERSION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.gridsuite.computation.s3.ComputationS3Service.METADATA_FILE_NAME;
Expand Down Expand Up @@ -183,6 +181,7 @@ private OpenReacResult buildOpenReacResult() {
GeneratorModification.Modifs m2 = new GeneratorModification.Modifs();
m2.setTargetQ(50.);
openReacAmplIOFiles.getNetworkModifications().getGeneratorModifications().add(new GeneratorModification("GEN2", m2));
openReacAmplIOFiles.getNetworkModifications().getBatteryModifications().add(new BatteryModification("BAT", 215., 51.));

openReacAmplIOFiles.getNetworkModifications().getTapPositionModifications().add(new RatioTapPositionModification("NHV2_NLOAD", 2));
openReacAmplIOFiles.getNetworkModifications().getTapPositionModifications().add(new RatioTapPositionModification("unknown2WT", 2));
Expand Down Expand Up @@ -275,10 +274,14 @@ void setUp(final MockWebServer server) throws JsonProcessingException {

// network store service mocking
network = EurostagTutorialExample1Factory.createWithMoreGenerators(new NetworkFactoryImpl());
network.getVoltageLevel("VLGEN").newShuntCompensator()

VoltageLevel vlgen = network.getVoltageLevel(VLGEN);
Bus ngen = vlgen.getBusBreakerView().getBus(NGEN);

vlgen.newShuntCompensator()
.setId("SHUNT_1")
.setBus("NGEN")
.setConnectableBus("NGEN")
.setBus(ngen.getId())
.setConnectableBus(ngen.getId())
.setTargetV(30.)
.setTargetDeadband(10)
.setVoltageRegulatorOn(false)
Expand All @@ -290,6 +293,20 @@ void setUp(final MockWebServer server) throws JsonProcessingException {
.setSectionCount(1)
.add();

Battery bat = vlgen.newBattery()
.setId("BAT")
.setBus(ngen.getId())
.setConnectableBus(ngen.getId())
.setMinP(-9999.99)
.setMaxP(9999.99)
.setTargetP(607.0)
.setTargetQ(301.0)
.add();
bat.newExtension(VoltageRegulationAdder.class)
.withTargetV(215.)
.withVoltageRegulatorOn(false)

@sBouzols sBouzols Sep 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add a test for .withVoltageRegulatorOn(true) ?

.add();

network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_1_ID);
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_2_ID);
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_3_ID);
Expand Down
Loading