Skip to content
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

Fixed bug when adding new modification point for batteries and genera… #424

Merged
merged 5 commits into from
Feb 2, 2024
Merged

Fixed bug when adding new modification point for batteries and genera… #424

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33dd63b
Fixed bug when adding new modification point for batteries and genera…
Jan 24, 2024
fff322e
Added tests
Jan 25, 2024
100e349
Removed public modifiers from test class
Jan 29, 2024
d5b18ed
Merge branch 'main' into bug-new-modification-point
ne0ds Jan 29, 2024
a9215f4
Merge branch 'main' into bug-new-modification-point
ne0ds Feb 2, 2024
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
17 changes: 10 additions & 7 deletions src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@
import com.powsybl.commons.reporter.Report;
import com.powsybl.commons.reporter.Reporter;
import com.powsybl.commons.reporter.TypedValue;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.Battery;
import com.powsybl.iidm.network.MinMaxReactiveLimits;
import com.powsybl.iidm.network.MinMaxReactiveLimitsAdder;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.ReactiveCapabilityCurve;
import com.powsybl.iidm.network.ReactiveCapabilityCurveAdder;
import com.powsybl.iidm.network.ReactiveLimits;
import com.powsybl.iidm.network.ReactiveLimitsKind;
import com.powsybl.iidm.network.extensions.ActivePowerControl;
import com.powsybl.iidm.network.extensions.ActivePowerControlAdder;
import com.powsybl.network.store.iidm.impl.MinMaxReactiveLimitsImpl;
import org.gridsuite.modification.server.NetworkModificationException;
import org.gridsuite.modification.server.dto.BatteryModificationInfos;
import org.gridsuite.modification.server.dto.ReactiveCapabilityCurveModificationInfos;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

Expand Down Expand Up @@ -49,11 +54,9 @@ public void check(Network network) throws NetworkModificationException {
MinMaxReactiveLimits minMaxReactiveLimits = battery.getReactiveLimits(MinMaxReactiveLimits.class);
ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, modificationInfos.getMinimumReactivePower(), modificationInfos.getMaximumReactivePower(), MODIFY_BATTERY_ERROR, errorMessage);
}
Collection<ReactiveCapabilityCurve.Point> points = battery.getReactiveLimits().getKind() == ReactiveLimitsKind.CURVE ? battery.getReactiveLimits(ReactiveCapabilityCurve.class).getPoints() : List.of();
List<ReactiveCapabilityCurve.Point> batteryPoints = new ArrayList<>(points);
List<ReactiveCapabilityCurveModificationInfos> modificationPoints = modificationInfos.getReactiveCapabilityCurvePoints();
if (!CollectionUtils.isEmpty(points) && modificationPoints != null) {
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(batteryPoints, modificationPoints, MODIFY_BATTERY_ERROR, errorMessage);
if (modificationPoints != null) {
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(modificationPoints, MODIFY_BATTERY_ERROR, errorMessage);
}
checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(modificationInfos, battery, MODIFY_BATTERY_ERROR, errorMessage);
}
Expand Down
28 changes: 20 additions & 8 deletions src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,36 @@
import com.powsybl.commons.reporter.Report;
import com.powsybl.commons.reporter.Reporter;
import com.powsybl.commons.reporter.TypedValue;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.*;
import com.powsybl.iidm.network.Generator;
import com.powsybl.iidm.network.MinMaxReactiveLimits;
import com.powsybl.iidm.network.MinMaxReactiveLimitsAdder;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.ReactiveCapabilityCurve;
import com.powsybl.iidm.network.ReactiveCapabilityCurveAdder;
import com.powsybl.iidm.network.ReactiveLimits;
import com.powsybl.iidm.network.ReactiveLimitsKind;
import com.powsybl.iidm.network.Terminal;
import com.powsybl.iidm.network.VoltageLevel;
import com.powsybl.iidm.network.extensions.ActivePowerControl;
import com.powsybl.iidm.network.extensions.ActivePowerControlAdder;
import com.powsybl.iidm.network.extensions.CoordinatedReactiveControl;
import com.powsybl.iidm.network.extensions.GeneratorShortCircuit;
import com.powsybl.iidm.network.extensions.GeneratorShortCircuitAdder;
import com.powsybl.iidm.network.extensions.GeneratorStartup;
import com.powsybl.iidm.network.extensions.GeneratorStartupAdder;
import com.powsybl.network.store.iidm.impl.MinMaxReactiveLimitsImpl;
import com.powsybl.network.store.iidm.impl.extensions.CoordinatedReactiveControlAdderImpl;
import org.gridsuite.modification.server.NetworkModificationException;
import org.gridsuite.modification.server.dto.GeneratorModificationInfos;
import org.gridsuite.modification.server.dto.OperationType;
import org.gridsuite.modification.server.dto.ReactiveCapabilityCurveModificationInfos;
import org.gridsuite.modification.server.dto.VoltageRegulationType;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import static org.gridsuite.modification.server.NetworkModificationException.Type.*;
import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFY_GENERATOR_ERROR;

/**
* @author Ayoub Labidi <ayoub.labidi at rte-france.com>
Expand Down Expand Up @@ -54,11 +68,9 @@ public void check(Network network) throws NetworkModificationException {
ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, modificationInfos.getMinimumReactivePower(), modificationInfos.getMaximumReactivePower(), MODIFY_GENERATOR_ERROR, errorMessage);
}
// check reactive capability curve limits
Collection<ReactiveCapabilityCurve.Point> points = generator.getReactiveLimits().getKind() == ReactiveLimitsKind.CURVE ? generator.getReactiveLimits(ReactiveCapabilityCurve.class).getPoints() : List.of();
List<ReactiveCapabilityCurve.Point> generatorPoints = new ArrayList<>(points);
List<ReactiveCapabilityCurveModificationInfos> modificationPoints = modificationInfos.getReactiveCapabilityCurvePoints();
if (!CollectionUtils.isEmpty(points) && modificationPoints != null) {
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(generatorPoints, modificationPoints, MODIFY_GENERATOR_ERROR, errorMessage);
if (modificationPoints != null) {
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(modificationPoints, MODIFY_GENERATOR_ERROR, errorMessage);
}
// check regulated terminal
if (modificationInfos.getRegulatingTerminalId() != null && modificationInfos.getRegulatingTerminalType() != null &&
Expand Down
45 changes: 27 additions & 18 deletions src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,24 +854,33 @@ public Reporter modifyActivePowerControlAttributes(ActivePowerControl<?> activeP
return subReporterSetpoints2;
}

public void checkMaxQGreaterThanMinQ(List<ReactiveCapabilityCurve.Point> equipmentPoints, List<ReactiveCapabilityCurveModificationInfos> modificationPoints,
NetworkModificationException.Type exceptionType, String errorMessage) {
IntStream.range(0, modificationPoints.size())
.forEach(i -> {
ReactiveCapabilityCurve.Point oldPoint = equipmentPoints.get(i);
ReactiveCapabilityCurveModificationInfos newPoint = modificationPoints.get(i);
Double oldMaxQ = Double.NaN;
Double oldMinQ = Double.NaN;
if (oldPoint != null) {
oldMaxQ = oldPoint.getMaxQ();
oldMinQ = oldPoint.getMinQ();
}
var maxQ = newPoint.getQmaxP() != null ? newPoint.getQmaxP() : oldMaxQ;
var minQ = newPoint.getQminP() != null ? newPoint.getQminP() : oldMinQ;
if (maxQ < minQ) {
throw new NetworkModificationException(exceptionType, errorMessage + "maximum reactive power " + maxQ + " is expected to be greater than or equal to minimum reactive power " + minQ);
}
});
public void checkMaxQGreaterThanMinQ(
List<ReactiveCapabilityCurveModificationInfos> modificationPoints,
NetworkModificationException.Type exceptionType, String errorMessage
) {
for (var point : modificationPoints) {
double maxQ = Double.NaN;
double minQ = Double.NaN;

if (point.getQmaxP() != null) {
maxQ = point.getQmaxP();
} else if (point.getOldQmaxP() != null) {
maxQ = point.getOldQmaxP();
}

if (point.getQminP() != null) {
minQ = point.getQminP();
} else if (point.getOldQminP() != null) {
minQ = point.getOldQminP();
}

if (maxQ < minQ) {
throw new NetworkModificationException(
exceptionType,
errorMessage + "maximum reactive power " + maxQ + " is expected to be greater than or equal to minimum reactive power " + minQ
);
}
}
}

public void checkMaxReactivePowerGreaterThanMinReactivePower(MinMaxReactiveLimits minMaxReactiveLimits, AttributeModification<Double> minimumReactivePowerInfo, AttributeModification<Double> maximumReactivePowerInfo, NetworkModificationException.Type exceptionType, String errorMessage) {
Expand Down
76 changes: 76 additions & 0 deletions src/test/java/org/gridsuite/modification/server/modifications/ModificationUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/**
* Copyright (c) 2024, 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.modification.server.modifications;

import org.gridsuite.modification.server.NetworkModificationException;
import org.gridsuite.modification.server.dto.ReactiveCapabilityCurveModificationInfos;
import org.junit.jupiter.api.Test;

import java.util.Collections;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchRuntimeException;
import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFY_GENERATOR_ERROR;

/**
* @author David SARTORI <david.sartori_externe at rte-france.com>
*/

public class ModificationUtilsTest {

@Test
public void testCheckMaxQGreaterThanMinQ() {
var point1 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(2.0).oldQmaxP(1.0).qminP(10.0).qmaxP(20.0).build();
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(
Collections.singletonList(point1),
MODIFY_GENERATOR_ERROR,
"old KO, new OK: No exception should be thrown");

var point2 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(1.0).oldQmaxP(2.0).qminP(20.0).qmaxP(10.0).build();
var exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(
Collections.singletonList(point2),
MODIFY_GENERATOR_ERROR,
"old OK, new KO: ")
);
assertThat(exception.getType()).isEqualTo(MODIFY_GENERATOR_ERROR);
assertThat(exception)
.hasMessageEndingWith("old OK, new KO: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0");

var point3 = ReactiveCapabilityCurveModificationInfos.builder().qminP(20.0).qmaxP(10.0).build();
exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(
Collections.singletonList(point3),
MODIFY_GENERATOR_ERROR,
"old null, new KO: ")
);
assertThat(exception.getType()).isEqualTo(MODIFY_GENERATOR_ERROR);
assertThat(exception)
.hasMessageEndingWith("old null, new KO: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0");

var point4 = ReactiveCapabilityCurveModificationInfos.builder().qminP(10.0).qmaxP(20.0).build();
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(
Collections.singletonList(point4),
MODIFY_GENERATOR_ERROR,
"old null, new OK: No exception should be thrown");

var point5 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(10.0).oldQmaxP(20.0).build();
ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(
Collections.singletonList(point5),
MODIFY_GENERATOR_ERROR,
"old OK, new null: No exception should be thrown");

var point6 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(20.0).oldQmaxP(10.0).build();
exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(
Collections.singletonList(point6),
MODIFY_GENERATOR_ERROR,
"old KO, new null: ")
);
assertThat(exception.getType()).isEqualTo(MODIFY_GENERATOR_ERROR);
assertThat(exception)
.hasMessageEndingWith("old KO, new null: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0");
}
}
Loading