Skip to content

Commit 2372d68

Browse files
fix: use without loadflow feature from the lib (#125)
Signed-off-by: Joris Mancini <[email protected]>
1 parent 38f9f33 commit 2372d68

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

src/main/java/org/gridsuite/modification/modifications/BalancesAdjustmentModification.java

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import com.powsybl.balances_adjustment.balance_computation.*;
1010
import com.powsybl.balances_adjustment.util.CountryAreaFactory;
11-
import com.powsybl.balances_adjustment.util.Reports;
1211
import com.powsybl.commons.report.ReportNode;
1312
import com.powsybl.commons.report.TypedValue;
1413
import com.powsybl.computation.ComputationManager;
@@ -60,6 +59,7 @@ public String getName() {
6059
private BalanceComputationParameters createBalanceComputationParameters(ReportNode reportNode) {
6160
BalanceComputationParameters parameters = BalanceComputationParameters.load();
6261
parameters.getScalingParameters().setPriority(ScalingParameters.Priority.RESPECT_OF_VOLUME_ASKED);
62+
parameters.setWithLoadFlow(balancesAdjustmentModificationInfos.isWithLoadFlow());
6363

6464
if (!balancesAdjustmentModificationInfos.isWithLoadFlow()) {
6565
return parameters;
@@ -137,34 +137,14 @@ public void apply(Network network,
137137

138138
BalanceComputationParameters parameters = createBalanceComputationParameters(reportNode);
139139

140-
if (balancesAdjustmentModificationInfos.isWithLoadFlow()) {
141-
applyWithLoadFlow(network, computationManager, reportNode, parameters);
142-
} else {
143-
applyWithoutLoadFlow(network, reportNode, parameters);
144-
}
145-
}
146-
147-
private void applyWithLoadFlow(Network network, ComputationManager computationManager,
148-
ReportNode reportNode, BalanceComputationParameters parameters) {
149140
List<BalanceComputationArea> areas = createBalanceComputationAreas(network, reportNode);
150141

151142
BalanceComputation balanceComputation = new BalanceComputationFactoryImpl()
152-
.create(areas, LoadFlow.find(), computationManager);
143+
.create(areas, LoadFlow.find(), computationManager);
153144

154145
balanceComputation
155-
.run(network, network.getVariantManager().getWorkingVariantId(), parameters, reportNode)
156-
.join();
157-
}
158-
159-
private void applyWithoutLoadFlow(Network network, ReportNode reportNode, BalanceComputationParameters parameters) {
160-
balancesAdjustmentModificationInfos.getAreas().forEach(area -> {
161-
CountryArea countryArea = new CountryArea(network, area.getCountries());
162-
double offset = area.getNetPosition() - countryArea.getNetPosition();
163-
Scalable scalable = createScalable(area, network, reportNode);
164-
double done = scalable.scale(network, offset, parameters.getScalingParameters());
165-
Reports.reportAreaScaling(reportNode, area.getName(), offset, done);
166-
LOGGER.info("Scaling for area {}: offset={}, done={}", area.getName(), offset, done);
167-
});
146+
.run(network, network.getVariantManager().getWorkingVariantId(), parameters, reportNode)
147+
.join();
168148
}
169149

170150
private List<BalanceComputationArea> createBalanceComputationAreas(Network network, ReportNode reportNode) {

0 commit comments

Comments
 (0)