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

Fix load contingency #458

Merged
merged 4 commits into from
Feb 23, 2022
Merged

Fix load contingency #458

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
070ab54
Fix bus can be null.
annetill Feb 23, 2022
e3cad0d
Add unit test.
annetill Feb 23, 2022
32554f2
Merge branch 'main' into fix-load-contingency
annetill Feb 23, 2022
f671242
Simplify
geofjamg Feb 23, 2022
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
6 changes: 4 additions & 2 deletions src/main/java/com/powsybl/openloadflow/network/impl/PropagatedContingency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,10 @@ private static PropagatedContingency create(Network network, Contingency conting
for (Load load : loadsToLose) {
Bus bus = withBreakers ? load.getTerminal().getBusBreakerView().getBus()
: load.getTerminal().getBusView().getBus();
loadIdsToShift.computeIfAbsent(bus.getId(), k -> new PowerShift())
.add(getLoadPowerShift(load, slackDistributionOnConformLoad));
if (bus != null) {
loadIdsToShift.computeIfAbsent(bus.getId(), k -> new PowerShift())
.add(getLoadPowerShift(load, slackDistributionOnConformLoad));
}
}
for (ShuntCompensator shunt : shuntsToLose) {
double nominalV = shunt.getTerminal().getVoltageLevel().getNominalV();
Expand Down
21 changes: 19 additions & 2 deletions src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,14 @@ private static void setSlackBusId(LoadFlowParameters lfParameters, String slackB
.setSlackBusId(slackBusId);
}

private static PostContingencyResult getPostContingencyResult(SecurityAnalysisResult result, String contingencyId) {
private static Optional<PostContingencyResult> getOptionalPostContingencyResult(SecurityAnalysisResult result, String contingencyId) {
return result.getPostContingencyResults().stream()
.filter(r -> r.getContingency().getId().equals(contingencyId))
.findFirst()
.findFirst();
}

private static PostContingencyResult getPostContingencyResult(SecurityAnalysisResult result, String contingencyId) {
return getOptionalPostContingencyResult(result, contingencyId)
.orElseThrow();
}

Expand Down Expand Up @@ -985,6 +989,19 @@ void testSaWithLoadContingency() {
assertEquals(99.997, l4ContingencyResult.getBranchResult("l34").getP2(), LoadFlowAssert.DELTA_POWER);
}

@Test
void testSaWithDisconnectedLoadContingency() {
Network network = DistributedSlackNetworkFactory.createNetworkWithLoads();
network.getLoad("l2").getTerminal().disconnect();

List<Contingency> contingencies = List.of(new Contingency("l2", new LoadContingency("l2")));

SecurityAnalysisResult result = runSecurityAnalysis(network, contingencies);

// load is disconnected, contingency is skipped
assertFalse(getOptionalPostContingencyResult(result, "l2").isPresent());
}

@Test
void testSaWithLoadDetailContingency() {
Network network = DistributedSlackNetworkFactory.createNetworkWithLoads();
Expand Down