Get transformers and shunt compensators targetV modifications (#43)

FranckLecuyer · web-flow · commit 09e4eaa03eb0 · 2024-03-21T12:48:12.000+01:00
* Get transformers and shunt compensators targetV modifications
* Modifications after powsybl upgrade to 2024.0.3
* Fix field names

Signed-off-by: Franck LECUYER &lt;franck.lecuyer@rte-france.com&gt;
diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java
@@ -21,8 +21,8 @@ public class GeneratorModificationInfos {
     private String generatorId;
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Double voltageSetpoint;
+    private Double targetV;
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Double reactivePowerSetpoint;
+    private Double targetQ;
 }
diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java
@@ -25,4 +25,7 @@ public class ShuntCompensatorModificationInfos {
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean connect;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Double targetV;
 }
diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java
@@ -24,6 +24,9 @@ public class TransformerModificationInfos {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Integer ratioTapChangerPosition;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Double ratioTapChangerTargetV;
+
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private ThreeSides legSide;
 }
diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/voltageinit/server/service/NetworkModificationService.java
@@ -10,13 +10,20 @@
 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.openreac.parameters.output.OpenReacResult;
 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.jgrapht.alg.util.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
@@ -28,8 +35,13 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.powsybl.iidm.network.IdentifiableType.TWO_WINDINGS_TRANSFORMER;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -76,28 +88,50 @@ public void deleteModificationsGroup(UUID groupUUid) {
         }
     }
 
-    public UUID createVoltageInitModificationGroup(OpenReacResult result) {
-        UUID modificationsGroupUuid = null;
+    private Optional<Bus> getRegulatingBus(Terminal terminal) {
+        return terminal != null && terminal.getBusView().getBus() != null ? Optional.of(terminal.getBusView().getBus()) : Optional.empty();
+    }
+
+    public UUID createVoltageInitModificationGroup(Network network, OpenReacResult result) {
+        UUID modificationsGroupUuid;
 
         try {
             VoltageInitModificationInfos voltageInitModificationInfos = new VoltageInitModificationInfos();
 
+            Map<String, Pair<Double, Double>> voltageProfile = result.getVoltageProfile();
+
             // generator modifications
             result.getGeneratorModifications().forEach(gm -> {
                 if (gm.getModifs().getTargetV() != null || gm.getModifs().getTargetQ() != null) {
                     GeneratorModificationInfos.GeneratorModificationInfosBuilder builder = GeneratorModificationInfos.builder()
                         .generatorId(gm.getGeneratorId())
-                        .voltageSetpoint(gm.getModifs().getTargetV())
-                        .reactivePowerSetpoint(gm.getModifs().getTargetQ());
+                        .targetV(gm.getModifs().getTargetV())
+                        .targetQ(gm.getModifs().getTargetQ());
                     voltageInitModificationInfos.addGeneratorModification(builder.build());
                 }
             });
 
             // transformer modifications
+            AtomicReference<Double> targetV = new AtomicReference<>();
             result.getTapPositionModifications().forEach(tp -> {
+                targetV.set(null);
+                Identifiable<?> identifiable = network.getIdentifiable(tp.getTransformerId());
+                if (identifiable != null && identifiable.getType() == TWO_WINDINGS_TRANSFORMER) {  // Only for 2WT
+                    TwoWindingsTransformer twoWindingsTransformer = (TwoWindingsTransformer) identifiable;
+                    if (twoWindingsTransformer.getRatioTapChanger() != null) {
+                        Optional<Bus> bus = getRegulatingBus(twoWindingsTransformer.getRatioTapChanger().getRegulationTerminal());
+                        bus.ifPresent(b -> {
+                            Pair<Double, Double> busUpdate = voltageProfile.get(b.getId());
+                            if (busUpdate != null) {
+                                targetV.set(busUpdate.getFirst() * b.getVoltageLevel().getNominalV());
+                            }
+                        });
+                    }
+                }
                 TransformerModificationInfos.TransformerModificationInfosBuilder builder = TransformerModificationInfos.builder()
                     .transformerId(tp.getTransformerId())
                     .ratioTapChangerPosition(tp.getTapPosition())
+                    .ratioTapChangerTargetV(targetV.get())
                     .legSide(tp.getLegSide());
                 voltageInitModificationInfos.addTransformerModification(builder.build());
             });
@@ -126,10 +160,22 @@ public UUID createVoltageInitModificationGroup(OpenReacResult result) {
 
             // shunt compensator modifications
             result.getShuntsModifications().forEach(shuntCompensatorModification -> {
+                targetV.set(null);
+                ShuntCompensator shuntCompensator = network.getShuntCompensator(shuntCompensatorModification.getShuntCompensatorId());
+                if (shuntCompensator != null) {
+                    Optional<Bus> bus = getRegulatingBus(shuntCompensator.getRegulatingTerminal());
+                    bus.ifPresent(b -> {
+                        Pair<Double, Double> busUpdate = voltageProfile.get(b.getId());
+                        if (busUpdate != null) {
+                            targetV.set(busUpdate.getFirst() * b.getVoltageLevel().getNominalV());
+                        }
+                    });
+                }
                 ShuntCompensatorModificationInfos.ShuntCompensatorModificationInfosBuilder builder = ShuntCompensatorModificationInfos.builder()
                     .shuntCompensatorId(shuntCompensatorModification.getShuntCompensatorId())
                     .sectionCount(shuntCompensatorModification.getSectionCount())
-                    .connect(shuntCompensatorModification.getConnect());
+                    .connect(shuntCompensatorModification.getConnect())
+                    .targetV(targetV.get());
                 voltageInitModificationInfos.addShuntCompensatorModification(builder.build());
             });
 
diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java
@@ -22,6 +22,7 @@
 import com.powsybl.openreac.parameters.output.OpenReacResult;
 import com.powsybl.openreac.parameters.output.OpenReacStatus;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.gridsuite.voltageinit.server.repository.VoltageInitResultRepository;
 import org.gridsuite.voltageinit.server.service.parameters.VoltageInitParametersService;
 import org.slf4j.Logger;
@@ -125,7 +126,7 @@ public static void addRestrictedVoltageLevelReport(Map<String, Double> voltageLe
         }
     }
 
-    private OpenReacResult run(VoltageInitRunContext context, UUID resultUuid) throws Exception {
+    private Pair<Network, OpenReacResult> run(VoltageInitRunContext context, UUID resultUuid) throws Exception {
         Objects.requireNonNull(context);
 
         LOGGER.info("Run voltage init...");
@@ -149,7 +150,7 @@ private OpenReacResult run(VoltageInitRunContext context, UUID resultUuid) throw
                     reportService.sendReport(context.getReportUuid(), rootReporter.get()));
         }
 
-        return future == null ? null : voltageInitObserver.observeRun("run", future::get);
+        return future == null ? Pair.of(network, null) : Pair.of(network, voltageInitObserver.observeRun("run", future::get));
     }
 
     public CompletableFuture<OpenReacResult> runVoltageInitAsync(VoltageInitRunContext context, Network network, UUID resultUuid) {
@@ -202,18 +203,20 @@ public Consumer<Message<String>> consumeRun() {
                 AtomicReference<Long> startTime = new AtomicReference<>();
 
                 startTime.set(System.nanoTime());
-                OpenReacResult result = run(resultContext.getRunContext(), resultContext.getResultUuid());
+                Pair<Network, OpenReacResult> res = run(resultContext.getRunContext(), resultContext.getResultUuid());
+                Network network = res.getLeft();
+                OpenReacResult openReacResult = res.getRight();
                 long nanoTime = System.nanoTime();
                 LOGGER.info("Just run in {}s", TimeUnit.NANOSECONDS.toSeconds(nanoTime - startTime.getAndSet(nanoTime)));
 
-                UUID modificationsGroupUuid = networkModificationService.createVoltageInitModificationGroup(result);
-                voltageInitObserver.observe("results.save", () ->
-                        resultRepository.insert(resultContext.getResultUuid(), result, modificationsGroupUuid, result.getStatus().name()));
-                LOGGER.info("Status : {}", result.getStatus());
-                LOGGER.info("Reactive slacks : {}", result.getReactiveSlacks());
-                LOGGER.info("Indicators : {}", result.getIndicators());
+                if (openReacResult != null) {  // result available
+                    UUID modificationsGroupUuid = networkModificationService.createVoltageInitModificationGroup(network, openReacResult);
+                    voltageInitObserver.observe("results.save", () ->
+                        resultRepository.insert(resultContext.getResultUuid(), openReacResult, modificationsGroupUuid, openReacResult.getStatus().name()));
+                    LOGGER.info("Status : {}", openReacResult.getStatus());
+                    LOGGER.info("Reactive slacks : {}", openReacResult.getReactiveSlacks());
+                    LOGGER.info("Indicators : {}", openReacResult.getIndicators());
 
-                if (result != null) {  // result available
                     notificationService.sendResultMessage(resultContext.getResultUuid(), resultContext.getRunContext().getReceiver());
                     LOGGER.info("Voltage initialization complete (resultUuid='{}')", resultContext.getResultUuid());
                 } else {  // result not available : stop computation request
diff --git a/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java b/src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java
@@ -44,6 +44,7 @@
 import org.gridsuite.voltageinit.server.service.UuidGeneratorService;
 import org.gridsuite.voltageinit.server.service.parameters.FilterService;
 import org.gridsuite.voltageinit.server.util.annotations.PostCompletionAdapter;
+import org.jgrapht.alg.util.Pair;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -134,9 +135,6 @@ public class VoltageInitControllerTest {
     private final ObjectMapper mapper = restTemplateConfig.objectMapper();
 
     private Network network;
-    private Network network1;
-    private Network networkForMergingView;
-    private Network otherNetworkForMergingView;
     OpenReacParameters openReacParameters;
     OpenReacResult openReacResult;
     CompletableFutureTask<OpenReacResult> completableFutureResultsTask;
@@ -155,10 +153,16 @@ private OpenReacResult buildOpenReacResult() {
         openReacAmplIOFiles.getNetworkModifications().getGeneratorModifications().add(new GeneratorModification("GEN2", m2));
 
         openReacAmplIOFiles.getNetworkModifications().getTapPositionModifications().add(new RatioTapPositionModification("NHV2_NLOAD", 2));
+        openReacAmplIOFiles.getNetworkModifications().getTapPositionModifications().add(new RatioTapPositionModification("unknown2WT", 2));
 
         openReacAmplIOFiles.getNetworkModifications().getSvcModifications().add(new StaticVarCompensatorModification("SVC_1", 227., 50.));
         openReacAmplIOFiles.getNetworkModifications().getVscModifications().add(new VscConverterStationModification("VSC_1", 385., 70.));
         openReacAmplIOFiles.getNetworkModifications().getShuntModifications().add(new ShuntCompensatorModification("SHUNT_1", true, 1));
+        openReacAmplIOFiles.getNetworkModifications().getShuntModifications().add(new ShuntCompensatorModification("unknownShunt", true, 1));
+
+        Map<String, Pair<Double, Double>> voltageProfile = openReacAmplIOFiles.getVoltageProfileOutput().getVoltageProfile();
+        voltageProfile.put("NHV2_NLOAD_busId1", Pair.of(100., 100.));
+        voltageProfile.put("SHUNT_1_busId1", Pair.of(100., 100.));
 
         openReacResult = new OpenReacResult(OpenReacStatus.OK, openReacAmplIOFiles, INDICATORS);
         return openReacResult;
@@ -213,6 +217,21 @@ public void setUp() throws Exception {
 
         // network store service mocking
         network = EurostagTutorialExample1Factory.createWithMoreGenerators(new NetworkFactoryImpl());
+        network.getVoltageLevel("VLGEN").newShuntCompensator()
+            .setId("SHUNT_1")
+            .setBus("NGEN")
+            .setConnectableBus("NGEN")
+            .setTargetV(30.)
+            .setTargetDeadband(10)
+            .setVoltageRegulatorOn(false)
+            .newLinearModel()
+            .setMaximumSectionCount(1)
+            .setBPerSection(1)
+            .setGPerSection(1)
+            .add()
+            .setSectionCount(1)
+            .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);
@@ -221,9 +240,6 @@ public void setUp() throws Exception {
         given(networkStoreService.getNetwork(NETWORK_UUID, PreloadingStrategy.COLLECTION)).willReturn(network);
         given(networkStoreService.getNetwork(OTHER_NETWORK_UUID, PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW)).willThrow(new PowsyblException("Not found"));
 
-        network1 = EurostagTutorialExample1Factory.createWithMoreGenerators(new NetworkFactoryImpl());
-        network1.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_2_ID);
-
         // OpenReac run mocking
         openReacParameters = new OpenReacParameters();
         openReacResult = buildOpenReacResult();

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public class GeneratorModificationInfos {`
`21`	`21`	`private String generatorId;`
`22`	`22`
`23`	`23`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`24`		`- private Double voltageSetpoint;`
	`24`	`+ private Double targetV;`
`25`	`25`
`26`	`26`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`27`		`- private Double reactivePowerSetpoint;`
	`27`	`+ private Double targetQ;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,7 @@ public class ShuntCompensatorModificationInfos {`
`25`	`25`
`26`	`26`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`27`	`27`	`private Boolean connect;`
	`28`	`+`
	`29`	`+ @JsonInclude(JsonInclude.Include.NON_NULL)`
	`30`	`+ private Double targetV;`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ public class TransformerModificationInfos {`
`24`	`24`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`25`	`25`	`private Integer ratioTapChangerPosition;`
`26`	`26`
	`27`	`+ @JsonInclude(JsonInclude.Include.NON_NULL)`
	`28`	`+ private Double ratioTapChangerTargetV;`
	`29`	`+`
`27`	`30`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`28`	`31`	`private ThreeSides legSide;`
`29`	`32`	`}`