Skip to content

feat(balances-adjustment): use current thread for loadflow #131

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

Merged
TheMaskedTurtle merged 3 commits into from
Dec 2, 2025
Merged

feat(balances-adjustment): use current thread for loadflow #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a61f78f
feat(balances-adjustment): use current thread for loadflow
TheMaskedTurtle Dec 1, 2025
36a4fde
override appropriate method
TheMaskedTurtle Dec 2, 2025
b1ed442
Merge branch 'main' into propagate-context
TheMaskedTurtle Dec 2, 2025
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
12 changes: 5 additions & 7 deletions src/main/java/org/gridsuite/modification/modifications/BalancesAdjustmentModification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.powsybl.balances_adjustment.util.CountryAreaFactory;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.commons.report.TypedValue;
import com.powsybl.computation.ComputationManager;
import com.powsybl.computation.local.LocalComputationManager;
import com.powsybl.iidm.modification.scalable.ProportionalScalable;
import com.powsybl.iidm.modification.scalable.Scalable;
import com.powsybl.iidm.modification.scalable.ScalingParameters;
Expand All @@ -19,6 +19,7 @@
import com.powsybl.loadflow.LoadFlow;
import com.powsybl.loadflow.LoadFlowParameters;
import com.powsybl.openloadflow.OpenLoadFlowParameters;
import lombok.SneakyThrows;
import org.gridsuite.modification.IFilterService;
import org.gridsuite.modification.ILoadFlowService;
import org.gridsuite.modification.dto.*;
Expand Down Expand Up @@ -128,19 +129,16 @@ private void overrideBalanceComputationParameters(BalanceComputationParameters p
.setSlackDistributionFailureBehavior(OpenLoadFlowParameters.SlackDistributionFailureBehavior.FAIL);
}

@SneakyThrows
@Override
public void apply(Network network,
NamingStrategy namingStrategy,
boolean throwException,
ComputationManager computationManager,
ReportNode reportNode) {
public void apply(Network network, NamingStrategy namingStrategy, ReportNode reportNode) {

BalanceComputationParameters parameters = createBalanceComputationParameters(reportNode);

List<BalanceComputationArea> areas = createBalanceComputationAreas(network, reportNode);

BalanceComputation balanceComputation = new BalanceComputationFactoryImpl()
.create(areas, LoadFlow.find(), computationManager);
.create(areas, LoadFlow.find(), new LocalComputationManager(Runnable::run));

balanceComputation
.run(network, network.getVariantManager().getWorkingVariantId(), parameters, reportNode)
Expand Down
16 changes: 12 additions & 4 deletions ...est/java/org/gridsuite/modification/modifications/BalancesAdjustmentModificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.gridsuite.modification.modifications;

import com.powsybl.commons.report.ReportNode;
import com.powsybl.iidm.modification.topology.DefaultNamingStrategy;
import com.powsybl.iidm.network.Country;
import com.powsybl.iidm.network.Network;
import com.powsybl.loadflow.LoadFlowParameters;
Expand Down Expand Up @@ -102,6 +103,13 @@ protected void checkModification() {
// No checks implemented for this modification
}

@Override
@Test
public void testApply() throws Exception {
buildModification().toModification().apply(getNetwork(), new DefaultNamingStrategy(), ReportNode.NO_OP);
assertAfterNetworkModificationApplication();
}

@Test
void testApplyWithLoadFlow() {
var infos = BalancesAdjustmentModificationInfos.builder()
Expand Down Expand Up @@ -149,7 +157,7 @@ void testApplyWithLoadFlow() {
.build());
BalancesAdjustmentModification modification = (BalancesAdjustmentModification) infos.toModification();
modification.initApplicationContext(null, loadFlowService);
modification.apply(getNetwork(), false);
modification.apply(getNetwork(), new DefaultNamingStrategy(), ReportNode.NO_OP);

assertEquals(-58d, getNetwork().getGenerator("GH1").getTerminal().getP(), PRECISION);
assertEquals(-36d, getNetwork().getGenerator("GH2").getTerminal().getP(), PRECISION);
Expand Down Expand Up @@ -194,7 +202,7 @@ void testLoadFlowParametersNotFound() {
.build();

// Should not throw exception but use default parameters and complete successfully
assertDoesNotThrow(() -> modification.apply(network, false, reportNode));
assertDoesNotThrow(() -> modification.apply(network, new DefaultNamingStrategy(), reportNode));

// Verify that the appropriate report message was generated
TestUtils.assertLogMessage(
Expand Down Expand Up @@ -237,7 +245,7 @@ void testLoadFlowProviderNotSpecified() {
.build();

// Should not throw exception but use default parameters and complete successfully
assertDoesNotThrow(() -> modification.apply(network, false, reportNode));
assertDoesNotThrow(() -> modification.apply(network, new DefaultNamingStrategy(), reportNode));

// Verify that the appropriate report message was generated
TestUtils.assertLogMessageWithoutRank(
Expand Down Expand Up @@ -273,7 +281,7 @@ void testLoadFlowParametersIdNull() {
.build();

// Should not throw exception but use default parameters and complete successfully
assertDoesNotThrow(() -> modification.apply(network, false, reportNode));
assertDoesNotThrow(() -> modification.apply(network, new DefaultNamingStrategy(), reportNode));

// Verify that the appropriate report message was generated
TestUtils.assertLogMessageWithoutRank(
Expand Down