From ac2720d5c25ca0e590e18e0433197ecf5b02d069 Mon Sep 17 00:00:00 2001 From: Hadrien Date: Fri, 18 Nov 2022 15:14:37 +0100 Subject: [PATCH 1/6] Remove addRatioToLinesWithDifferentNominalVoltageAtBothEnds parameter Signed-off-by: Hadrien --- .../openloadflow/OpenLoadFlowParameters.java | 22 ------------------- .../network/LfNetworkParameters.java | 12 ---------- .../network/impl/LfBranchImpl.java | 16 +++++--------- .../network/impl/LfNetworkLoaderImpl.java | 2 +- 4 files changed, 6 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java index 72fbbea40e..1ddcfb67e7 100644 --- a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java +++ b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java @@ -79,8 +79,6 @@ public class OpenLoadFlowParameters extends AbstractExtension properties) { .ifPresent(prop -> this.setLoadPowerFactorConstant(Boolean.parseBoolean(prop))); Optional.ofNullable(properties.get(PLAUSIBLE_ACTIVE_POWER_LIMIT_PARAM_NAME)) .ifPresent(prop -> this.setPlausibleActivePowerLimit(Double.parseDouble(prop))); - Optional.ofNullable(properties.get(ADD_RATIO_TO_LINES_WITH_DIFFERENT_NOMINAL_VOLTAGE_AT_BOTH_ENDS_NAME)) - .ifPresent(prop -> this.setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(Boolean.parseBoolean(prop))); Optional.ofNullable(properties.get(SLACK_BUS_P_MAX_MISMATCH_NAME)) .ifPresent(prop -> this.setSlackBusPMaxMismatch(Double.parseDouble(prop))); Optional.ofNullable(properties.get(VOLTAGE_PER_REACTIVE_POWER_CONTROL_NAME)) @@ -469,7 +452,6 @@ public String toString() { ", lowImpedanceBranchMode=" + lowImpedanceBranchMode + ", loadPowerFactorConstant=" + loadPowerFactorConstant + ", plausibleActivePowerLimit=" + plausibleActivePowerLimit + - ", addRatioToLinesWithDifferentNominalVoltageAtBothEnds=" + addRatioToLinesWithDifferentNominalVoltageAtBothEnds + ", slackBusPMaxMismatch=" + slackBusPMaxMismatch + ", voltagePerReactivePowerControl=" + voltagePerReactivePowerControl + ", reactivePowerRemoteControl=" + reactivePowerRemoteControl + @@ -515,7 +497,6 @@ public static void logDc(LoadFlowParameters parameters, OpenLoadFlowParameters p LOGGER.info("Distributed slack: {}", parameters.isDistributedSlack()); LOGGER.info("Balance type: {}", parameters.getBalanceType()); LOGGER.info("Plausible active power limit: {}", parametersExt.getPlausibleActivePowerLimit()); - LOGGER.info("Add ratio to lines with different nominal voltage at both ends: {}", parametersExt.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds()); LOGGER.info("Connected component mode: {}", parameters.getConnectedComponentMode()); LOGGER.info("DC power factor: {}", parametersExt.getDcPowerFactor()); } @@ -537,7 +518,6 @@ public static void logAc(LoadFlowParameters parameters, OpenLoadFlowParameters p LOGGER.info("Transformer voltage control: {}", parameters.isTransformerVoltageControlOn()); LOGGER.info("Load power factor constant: {}", parametersExt.isLoadPowerFactorConstant()); LOGGER.info("Plausible active power limit: {}", parametersExt.getPlausibleActivePowerLimit()); - LOGGER.info("Add ratio to lines with different nominal voltage at both ends: {}", parametersExt.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds()); LOGGER.info("Slack bus Pmax mismatch: {}", parametersExt.getSlackBusPMaxMismatch()); LOGGER.info("Connected component mode: {}", parameters.getConnectedComponentMode()); LOGGER.info("Voltage per reactive power control: {}", parametersExt.isVoltagePerReactivePowerControl()); @@ -597,7 +577,6 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O .setTwtSplitShuntAdmittance(parameters.isTwtSplitShuntAdmittance()) .setBreakers(breakers) .setPlausibleActivePowerLimit(parametersExt.getPlausibleActivePowerLimit()) - .setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(parametersExt.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds()) .setComputeMainConnectedComponentOnly(parameters.getConnectedComponentMode() == LoadFlowParameters.ConnectedComponentMode.MAIN) .setCountriesToBalance(parameters.getCountriesToBalance()) .setDistributedOnConformLoad(parameters.isDistributedSlack() && parameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD) @@ -680,7 +659,6 @@ public static DcLoadFlowParameters createDcParameters(LoadFlowParameters paramet .setTwtSplitShuntAdmittance(false) .setBreakers(false) .setPlausibleActivePowerLimit(parametersExt.getPlausibleActivePowerLimit()) - .setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(parametersExt.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds()) .setComputeMainConnectedComponentOnly(parameters.getConnectedComponentMode() == LoadFlowParameters.ConnectedComponentMode.MAIN) .setCountriesToBalance(parameters.getCountriesToBalance()) .setDistributedOnConformLoad(parameters.isDistributedSlack() && parameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD) diff --git a/src/main/java/com/powsybl/openloadflow/network/LfNetworkParameters.java b/src/main/java/com/powsybl/openloadflow/network/LfNetworkParameters.java index d0187782b2..67550d229e 100644 --- a/src/main/java/com/powsybl/openloadflow/network/LfNetworkParameters.java +++ b/src/main/java/com/powsybl/openloadflow/network/LfNetworkParameters.java @@ -42,8 +42,6 @@ public class LfNetworkParameters { private double plausibleActivePowerLimit = PLAUSIBLE_ACTIVE_POWER_LIMIT_DEFAULT_VALUE; - private boolean addRatioToLinesWithDifferentNominalVoltageAtBothEnds = false; - private boolean computeMainConnectedComponentOnly = true; private Set countriesToBalance = Collections.emptySet(); @@ -135,15 +133,6 @@ public LfNetworkParameters setPlausibleActivePowerLimit(double plausibleActivePo return this; } - public boolean isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds() { - return addRatioToLinesWithDifferentNominalVoltageAtBothEnds; - } - - public LfNetworkParameters setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(boolean addRatioToLinesWithDifferentNominalVoltageAtBothEnds) { - this.addRatioToLinesWithDifferentNominalVoltageAtBothEnds = addRatioToLinesWithDifferentNominalVoltageAtBothEnds; - return this; - } - public boolean isComputeMainConnectedComponentOnly() { return computeMainConnectedComponentOnly; } @@ -280,7 +269,6 @@ public String toString() { ", twtSplitShuntAdmittance=" + twtSplitShuntAdmittance + ", breakers=" + breakers + ", plausibleActivePowerLimit=" + plausibleActivePowerLimit + - ", addRatioToLinesWithDifferentNominalVoltageAtBothEnds=" + addRatioToLinesWithDifferentNominalVoltageAtBothEnds + ", computeMainConnectedComponentOnly=" + computeMainConnectedComponentOnly + ", countriesToBalance=" + countriesToBalance + ", distributedOnConformLoad=" + distributedOnConformLoad + diff --git a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java index 243606bb30..1f60813c16 100644 --- a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java +++ b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java @@ -32,16 +32,10 @@ protected LfBranchImpl(LfNetwork network, LfBus bus1, LfBus bus2, PiModel piMode this.branch = branch; } - private static LfBranchImpl createLine(Line line, LfNetwork network, LfBus bus1, LfBus bus2, double zb, boolean addRatioToLinesWithDifferentNominalVoltageAtBothEnds, - LfNetworkLoadingReport report) { + private static LfBranchImpl createLine(Line line, LfNetwork network, LfBus bus1, LfBus bus2, double zb) { double nominalV1 = line.getTerminal1().getVoltageLevel().getNominalV(); double nominalV2 = line.getTerminal2().getVoltageLevel().getNominalV(); double r1 = 1; - if (addRatioToLinesWithDifferentNominalVoltageAtBothEnds && nominalV1 != nominalV2) { - LOGGER.trace("Line '{}' has a different nominal voltage at both ends ({} and {}): add a ratio", line.getId(), nominalV1, nominalV2); - report.linesWithDifferentNominalVoltageAtBothEnds++; - r1 = 1 / Transformers.getRatioPerUnitBase(line); - } PiModel piModel = new SimplePiModel() .setR1(r1) .setR(line.getR() / zb) @@ -101,13 +95,13 @@ private static LfBranchImpl createTransformer(TwoWindingsTransformer twt, LfNetw return new LfBranchImpl(network, bus1, bus2, piModel, twt); } - public static LfBranchImpl create(Branch branch, LfNetwork network, LfBus bus1, LfBus bus2, boolean twtSplitShuntAdmittance, - boolean addRatioToLinesWithDifferentNominalVoltageAtBothEnds, LfNetworkLoadingReport report) { + public static LfBranchImpl create(Branch branch, LfNetwork network, LfBus bus1, LfBus bus2, boolean twtSplitShuntAdmittance) { Objects.requireNonNull(branch); + double nominalV1 = branch.getTerminal1().getVoltageLevel().getNominalV(); double nominalV2 = branch.getTerminal2().getVoltageLevel().getNominalV(); - double zb = nominalV2 * nominalV2 / PerUnit.SB; + double zb = nominalV1 * nominalV2 / PerUnit.SB; if (branch instanceof Line) { - return createLine((Line) branch, network, bus1, bus2, zb, addRatioToLinesWithDifferentNominalVoltageAtBothEnds, report); + return createLine((Line) branch, network, bus1, bus2, zb); } else if (branch instanceof TwoWindingsTransformer) { TwoWindingsTransformer twt = (TwoWindingsTransformer) branch; return createTransformer(twt, network, bus1, bus2, zb, twtSplitShuntAdmittance); diff --git a/src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java b/src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java index e147993738..7017679a6f 100644 --- a/src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java +++ b/src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java @@ -335,7 +335,7 @@ private static void createBranches(List lfBuses, LfNetwork lfNetwork, Loa for (Branch branch : loadingContext.branchSet) { LfBus lfBus1 = getLfBus(branch.getTerminal1(), lfNetwork, parameters.isBreakers()); LfBus lfBus2 = getLfBus(branch.getTerminal2(), lfNetwork, parameters.isBreakers()); - LfBranchImpl lfBranch = LfBranchImpl.create(branch, lfNetwork, lfBus1, lfBus2, parameters.isTwtSplitShuntAdmittance(), parameters.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(), report); + LfBranchImpl lfBranch = LfBranchImpl.create(branch, lfNetwork, lfBus1, lfBus2, parameters.isTwtSplitShuntAdmittance()); addBranch(lfNetwork, lfBranch, report, parameters.isDc()); postProcessors.forEach(pp -> pp.onBranchAdded(branch, lfBranch)); } From eee80e571c77261d8ed1ad4bcad85f1170c1a5fe Mon Sep 17 00:00:00 2001 From: Hadrien Date: Fri, 18 Nov 2022 15:37:49 +0100 Subject: [PATCH 2/6] Solve some tests Signed-off-by: Hadrien --- .../openloadflow/OpenLoadFlowParameters.java | 2 -- .../sensi/AcSensitivityAnalysis.java | 1 - .../sensi/DcSensitivityAnalysis.java | 1 - .../openloadflow/ac/AcLoadFlowBoundaryTest.java | 17 ----------------- .../AcLoadFlowEurostagTutorialExample1Test.java | 1 - .../LinesWithDifferentNominalVoltagesTest.java | 3 +-- .../powsybl/openloadflow/dc/DcLoadFlowTest.java | 1 - .../sensi/ac/AcSensitivityAnalysisTest.java | 1 - 8 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java index 22d5a68afc..33418ac76c 100644 --- a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java +++ b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java @@ -52,8 +52,6 @@ public class OpenLoadFlowParameters extends AbstractExtension 10^-2 in p.u */ diff --git a/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java index c229994504..96b34665c9 100644 --- a/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java +++ b/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java @@ -218,7 +218,6 @@ public void analyse(Network network, List contingencies, .setTwtSplitShuntAdmittance(lfParameters.isTwtSplitShuntAdmittance()) .setBreakers(breakers) .setPlausibleActivePowerLimit(lfParametersExt.getPlausibleActivePowerLimit()) - .setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(lfParametersExt.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds()) .setComputeMainConnectedComponentOnly(true) .setCountriesToBalance(lfParameters.getCountriesToBalance()) .setDistributedOnConformLoad(lfParameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD) diff --git a/src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java index 9c76ba9084..426ad48e33 100644 --- a/src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java +++ b/src/main/java/com/powsybl/openloadflow/sensi/DcSensitivityAnalysis.java @@ -792,7 +792,6 @@ public void analyse(Network network, List contingencies, .setTwtSplitShuntAdmittance(lfParameters.isTwtSplitShuntAdmittance()) .setBreakers(breakers) .setPlausibleActivePowerLimit(lfParametersExt.getPlausibleActivePowerLimit()) - .setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(lfParametersExt.isAddRatioToLinesWithDifferentNominalVoltageAtBothEnds()) .setComputeMainConnectedComponentOnly(true) .setCountriesToBalance(lfParameters.getCountriesToBalance()) .setDistributedOnConformLoad(lfParameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD) diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java index 5ef81f0b9f..63e1ba8a46 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java @@ -114,15 +114,6 @@ void testWithXnode() { assertVoltageEquals(399.999, network.getBusBreakerView().getBus("xnode")); assertVoltageEquals(399.999, network.getBusBreakerView().getBus("b3")); assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b4")); - - parametersExt.setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(false); - LoadFlowResult result2 = loadFlowRunner.run(network, parameters); - assertTrue(result2.isOk()); - - assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b1")); - assertVoltageEquals(398.139, network.getBusBreakerView().getBus("xnode")); - assertVoltageEquals(417.679, network.getBusBreakerView().getBus("b3")); - assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b4")); } @Test @@ -136,14 +127,6 @@ void testWithTieLine() { assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b1")); assertVoltageEquals(399.999, network.getBusBreakerView().getBus("b3")); assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b4")); - - parametersExt.setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(false); - LoadFlowResult result2 = loadFlowRunner.run(network, parameters); - assertTrue(result2.isOk()); - - assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b1")); - assertVoltageEquals(417.841, network.getBusBreakerView().getBus("b3")); - assertVoltageEquals(400.000, network.getBusBreakerView().getBus("b4")); } @Test diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java index b9285f4ff8..a424572e1c 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java +++ b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java @@ -257,7 +257,6 @@ void slackBusWriteTest() { @Test void lineWithDifferentNominalVoltageTest() { - parametersExt.setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(true); network.getVoltageLevel("VLHV2").setNominalV(420); LoadFlowResult result = loadFlowRunner.run(network, parameters); assertTrue(result.isOk()); diff --git a/src/test/java/com/powsybl/openloadflow/ac/LinesWithDifferentNominalVoltagesTest.java b/src/test/java/com/powsybl/openloadflow/ac/LinesWithDifferentNominalVoltagesTest.java index 0332f9f5e4..0e4fc4587b 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/LinesWithDifferentNominalVoltagesTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/LinesWithDifferentNominalVoltagesTest.java @@ -69,8 +69,7 @@ void setUp() { loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory())); parameters = new LoadFlowParameters().setDistributedSlack(true); OpenLoadFlowParameters.create(parameters) - .setSlackBusSelectionMode(SlackBusSelectionMode.LARGEST_GENERATOR) - .setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(true); + .setSlackBusSelectionMode(SlackBusSelectionMode.LARGEST_GENERATOR); } @Test diff --git a/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java b/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java index f2cd22b863..b1aeb73aa8 100644 --- a/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java +++ b/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java @@ -209,7 +209,6 @@ void multiCcTest() { void lineWithDifferentNominalVoltageTest() { parameters.setDcUseTransformerRatio(true); - parameters.getExtension(OpenLoadFlowParameters.class).setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(true); Network network = FourBusNetworkFactory.create(); loadFlowRunner.run(network, parameters); diff --git a/src/test/java/com/powsybl/openloadflow/sensi/ac/AcSensitivityAnalysisTest.java b/src/test/java/com/powsybl/openloadflow/sensi/ac/AcSensitivityAnalysisTest.java index abd12aa3cb..20571cfdce 100644 --- a/src/test/java/com/powsybl/openloadflow/sensi/ac/AcSensitivityAnalysisTest.java +++ b/src/test/java/com/powsybl/openloadflow/sensi/ac/AcSensitivityAnalysisTest.java @@ -1037,7 +1037,6 @@ void lineWithDifferentNominalVoltageTest() { assertEquals(602.290, network.getTwoWindingsTransformer("NHV2_NLOAD").getTerminal1().getP(), LoadFlowAssert.DELTA_POWER); assertEquals(-601.419, network.getTwoWindingsTransformer("NHV2_NLOAD").getTerminal2().getP(), LoadFlowAssert.DELTA_POWER); - sensiParameters.getLoadFlowParameters().getExtension(OpenLoadFlowParameters.class).setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(true); network.getVoltageLevel("VLHV2").setNominalV(360); runLf(network, sensiParameters.getLoadFlowParameters()); SensitivityAnalysisResult result2 = sensiRunner.run(network, factors, Collections.emptyList(), Collections.emptyList(), sensiParameters); From 23440f33e31cb8a586bad974e943536775f6c7b8 Mon Sep 17 00:00:00 2001 From: Hadrien Date: Fri, 18 Nov 2022 16:56:07 +0100 Subject: [PATCH 3/6] Finally keep only one zb and r1 because it is easier with shunts in case of tie line. It stays issues on voltage initializer. Signed-off-by: Hadrien --- .../openloadflow/network/impl/LfBranchImpl.java | 5 ++--- .../openloadflow/ac/AcLoadFlowBoundaryTest.java | 8 -------- .../dc/DcSensitivityAnalysisContingenciesTest.java | 12 +++--------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java index 1f60813c16..e054071111 100644 --- a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java +++ b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java @@ -35,7 +35,7 @@ protected LfBranchImpl(LfNetwork network, LfBus bus1, LfBus bus2, PiModel piMode private static LfBranchImpl createLine(Line line, LfNetwork network, LfBus bus1, LfBus bus2, double zb) { double nominalV1 = line.getTerminal1().getVoltageLevel().getNominalV(); double nominalV2 = line.getTerminal2().getVoltageLevel().getNominalV(); - double r1 = 1; + double r1 = nominalV1 / nominalV2; PiModel piModel = new SimplePiModel() .setR1(r1) .setR(line.getR() / zb) @@ -97,9 +97,8 @@ private static LfBranchImpl createTransformer(TwoWindingsTransformer twt, LfNetw public static LfBranchImpl create(Branch branch, LfNetwork network, LfBus bus1, LfBus bus2, boolean twtSplitShuntAdmittance) { Objects.requireNonNull(branch); - double nominalV1 = branch.getTerminal1().getVoltageLevel().getNominalV(); double nominalV2 = branch.getTerminal2().getVoltageLevel().getNominalV(); - double zb = nominalV1 * nominalV2 / PerUnit.SB; + double zb = nominalV2 * nominalV2 / PerUnit.SB; if (branch instanceof Line) { return createLine((Line) branch, network, bus1, bus2, zb); } else if (branch instanceof TwoWindingsTransformer) { diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java index 63e1ba8a46..64fe77cb2b 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java @@ -146,17 +146,9 @@ void testEquivalentBranch() { .setB2(0.) .add(); - parametersExt.setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(false); LoadFlowResult result = loadFlowRunner.run(network, parameters); assertTrue(result.isOk()); assertVoltageEquals(135.0, network.getBusBreakerView().getBus("BUS_1")); - assertVoltageEquals(134.227, network.getBusBreakerView().getBus("BUS_2")); - assertVoltageEquals(28.069, network.getBusBreakerView().getBus("BUS_3")); - - parametersExt.setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(true); - LoadFlowResult result2 = loadFlowRunner.run(network, parameters); - assertTrue(result2.isOk()); - assertVoltageEquals(135.0, network.getBusBreakerView().getBus("BUS_1")); assertVoltageEquals(127.198, network.getBusBreakerView().getBus("BUS_2")); assertVoltageEquals(40.19, network.getBusBreakerView().getBus("BUS_3")); } diff --git a/src/test/java/com/powsybl/openloadflow/sensi/dc/DcSensitivityAnalysisContingenciesTest.java b/src/test/java/com/powsybl/openloadflow/sensi/dc/DcSensitivityAnalysisContingenciesTest.java index 937e5a682b..6b9a9684d0 100644 --- a/src/test/java/com/powsybl/openloadflow/sensi/dc/DcSensitivityAnalysisContingenciesTest.java +++ b/src/test/java/com/powsybl/openloadflow/sensi/dc/DcSensitivityAnalysisContingenciesTest.java @@ -2149,20 +2149,14 @@ void testIeeeCdf14() { Network network = IeeeCdfNetworkFactory.create14(); network.getGeneratorStream().forEach(gen -> gen.setMaxP(5000)); SensitivityAnalysisParameters sensiParameters = createParameters(true); - sensiParameters.getLoadFlowParameters().getExtension(OpenLoadFlowParameters.class).setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(false); List factors = createFactorMatrix(Stream.of("B1-G", "B2-G", "B3-G").map(network::getGenerator).collect(Collectors.toList()), Stream.of("L1-5-1", "L2-3-1").map(network::getBranch).collect(Collectors.toList())); List contingencies = List.of(new Contingency("L1-2-1", new BranchContingency("L1-2-1"))); - SensitivityAnalysisResult result = sensiRunner.run(network, factors, contingencies, Collections.emptyList(), sensiParameters); - - assertEquals(72.247, result.getBranchFlow1FunctionReferenceValue(null, "L1-5-1"), LoadFlowAssert.DELTA_POWER); - assertEquals(69.831, result.getBranchFlow1FunctionReferenceValue(null, "L2-3-1"), LoadFlowAssert.DELTA_POWER); - sensiParameters.getLoadFlowParameters().getExtension(OpenLoadFlowParameters.class).setAddRatioToLinesWithDifferentNominalVoltageAtBothEnds(true); - SensitivityAnalysisResult result2 = sensiRunner.run(network, factors, contingencies, Collections.emptyList(), sensiParameters); + SensitivityAnalysisResult result = sensiRunner.run(network, factors, contingencies, Collections.emptyList(), sensiParameters); - assertEquals(72.224, result2.getBranchFlow1FunctionReferenceValue(null, "L1-5-1"), LoadFlowAssert.DELTA_POWER); - assertEquals(69.850, result2.getBranchFlow1FunctionReferenceValue(null, "L2-3-1"), LoadFlowAssert.DELTA_POWER); + assertEquals(72.224, result.getBranchFlow1FunctionReferenceValue(null, "L1-5-1"), LoadFlowAssert.DELTA_POWER); + assertEquals(69.850, result.getBranchFlow1FunctionReferenceValue(null, "L2-3-1"), LoadFlowAssert.DELTA_POWER); } @Test From 4beeefa8fba975f960be7e8a702ceacbfcaaa73f Mon Sep 17 00:00:00 2001 From: Anne Tilloy Date: Mon, 21 Nov 2022 09:54:02 +0100 Subject: [PATCH 4/6] Change parameters' TUs. Signed-off-by: Anne Tilloy --- .../com/powsybl/openloadflow/network/impl/LfBranchImpl.java | 5 +---- .../com/powsybl/openloadflow/OpenLoadFlowProviderTest.java | 6 +++--- src/test/resources/debug-parameters.json | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java index e054071111..ce24f6f174 100644 --- a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java +++ b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java @@ -33,11 +33,8 @@ protected LfBranchImpl(LfNetwork network, LfBus bus1, LfBus bus2, PiModel piMode } private static LfBranchImpl createLine(Line line, LfNetwork network, LfBus bus1, LfBus bus2, double zb) { - double nominalV1 = line.getTerminal1().getVoltageLevel().getNominalV(); - double nominalV2 = line.getTerminal2().getVoltageLevel().getNominalV(); - double r1 = nominalV1 / nominalV2; PiModel piModel = new SimplePiModel() - .setR1(r1) + .setR1(1 / Transformers.getRatioPerUnitBase(line)) .setR(line.getR() / zb) .setX(line.getX() / zb) .setG1(line.getG1() * zb) diff --git a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java index 9fa8d99f2a..cbb58e19e8 100644 --- a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java +++ b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java @@ -50,7 +50,7 @@ void test() { void testDcParameters() { Network network = Mockito.mock(Network.class); DcLoadFlowParameters dcParameters = OpenLoadFlowParameters.createDcParameters(network, new LoadFlowParameters().setReadSlackBus(true), new OpenLoadFlowParameters(), new DenseMatrixFactory(), new EvenShiloachGraphDecrementalConnectivityFactory<>(), true); - assertEquals("DcLoadFlowParameters(networkParameters=LfNetworkParameters(slackBusSelector=NetworkSlackBusSelector, connectivityFactory=EvenShiloachGraphDecrementalConnectivityFactory, generatorVoltageRemoteControl=false, minImpedance=false, twtSplitShuntAdmittance=false, breakers=false, plausibleActivePowerLimit=5000.0, addRatioToLinesWithDifferentNominalVoltageAtBothEnds=true, computeMainConnectedComponentOnly=true, countriesToBalance=[], distributedOnConformLoad=false, phaseControl=false, transformerVoltageControl=false, voltagePerReactivePowerControl=false, reactivePowerRemoteControl=false, dc=true, reactiveLimits=false, hvdcAcEmulation=false, minPlausibleTargetVoltage=0.8, maxPlausibleTargetVoltage=1.2, loaderPostProcessorSelection=[], reactiveRangeCheckMode=MAX), equationSystemCreationParameters=DcEquationSystemCreationParameters(updateFlows=true, indexTerms=false, forcePhaseControlOffAndAddAngle1Var=true, useTransformerRatio=true), matrixFactory=DenseMatrixFactory, distributedSlack=true, balanceType=PROPORTIONAL_TO_GENERATION_P_MAX, setVToNan=true)", + assertEquals("DcLoadFlowParameters(networkParameters=LfNetworkParameters(slackBusSelector=NetworkSlackBusSelector, connectivityFactory=EvenShiloachGraphDecrementalConnectivityFactory, generatorVoltageRemoteControl=false, minImpedance=false, twtSplitShuntAdmittance=false, breakers=false, plausibleActivePowerLimit=5000.0, computeMainConnectedComponentOnly=true, countriesToBalance=[], distributedOnConformLoad=false, phaseControl=false, transformerVoltageControl=false, voltagePerReactivePowerControl=false, reactivePowerRemoteControl=false, dc=true, reactiveLimits=false, hvdcAcEmulation=false, minPlausibleTargetVoltage=0.8, maxPlausibleTargetVoltage=1.2, loaderPostProcessorSelection=[], reactiveRangeCheckMode=MAX), equationSystemCreationParameters=DcEquationSystemCreationParameters(updateFlows=true, indexTerms=false, forcePhaseControlOffAndAddAngle1Var=true, useTransformerRatio=true), matrixFactory=DenseMatrixFactory, distributedSlack=true, balanceType=PROPORTIONAL_TO_GENERATION_P_MAX, setVToNan=true)", dcParameters.toString()); } @@ -58,7 +58,7 @@ void testDcParameters() { void testAcParameters() { Network network = Mockito.mock(Network.class); AcLoadFlowParameters acParameters = OpenLoadFlowParameters.createAcParameters(network, new LoadFlowParameters().setReadSlackBus(true), new OpenLoadFlowParameters(), new DenseMatrixFactory(), new EvenShiloachGraphDecrementalConnectivityFactory<>(), Reporter.NO_OP, false, false); - assertEquals("AcLoadFlowParameters(networkParameters=LfNetworkParameters(slackBusSelector=NetworkSlackBusSelector, connectivityFactory=EvenShiloachGraphDecrementalConnectivityFactory, generatorVoltageRemoteControl=true, minImpedance=false, twtSplitShuntAdmittance=false, breakers=false, plausibleActivePowerLimit=5000.0, addRatioToLinesWithDifferentNominalVoltageAtBothEnds=true, computeMainConnectedComponentOnly=true, countriesToBalance=[], distributedOnConformLoad=false, phaseControl=false, transformerVoltageControl=false, voltagePerReactivePowerControl=false, reactivePowerRemoteControl=false, dc=false, reactiveLimits=true, hvdcAcEmulation=true, minPlausibleTargetVoltage=0.8, maxPlausibleTargetVoltage=1.2, loaderPostProcessorSelection=[], reactiveRangeCheckMode=MAX), equationSystemCreationParameters=AcEquationSystemCreationParameters(forceA1Var=false), newtonRaphsonParameters=NewtonRaphsonParameters(maxIteration=30, minRealisticVoltage=0.5, maxRealisticVoltage=1.5, stoppingCriteria=DefaultNewtonRaphsonStoppingCriteria), outerLoops=[DistributedSlackOuterLoop, ReactiveLimitsOuterLoop], matrixFactory=DenseMatrixFactory, voltageInitializer=UniformValueVoltageInitializer)", + assertEquals("AcLoadFlowParameters(networkParameters=LfNetworkParameters(slackBusSelector=NetworkSlackBusSelector, connectivityFactory=EvenShiloachGraphDecrementalConnectivityFactory, generatorVoltageRemoteControl=true, minImpedance=false, twtSplitShuntAdmittance=false, breakers=false, plausibleActivePowerLimit=5000.0, computeMainConnectedComponentOnly=true, countriesToBalance=[], distributedOnConformLoad=false, phaseControl=false, transformerVoltageControl=false, voltagePerReactivePowerControl=false, reactivePowerRemoteControl=false, dc=false, reactiveLimits=true, hvdcAcEmulation=true, minPlausibleTargetVoltage=0.8, maxPlausibleTargetVoltage=1.2, loaderPostProcessorSelection=[], reactiveRangeCheckMode=MAX), equationSystemCreationParameters=AcEquationSystemCreationParameters(forceA1Var=false), newtonRaphsonParameters=NewtonRaphsonParameters(maxIteration=30, minRealisticVoltage=0.5, maxRealisticVoltage=1.5, stoppingCriteria=DefaultNewtonRaphsonStoppingCriteria), outerLoops=[DistributedSlackOuterLoop, ReactiveLimitsOuterLoop], matrixFactory=DenseMatrixFactory, voltageInitializer=UniformValueVoltageInitializer)", acParameters.toString()); } @@ -86,7 +86,7 @@ void testGetExtendedVoltageInitializer() { @Test void specificParametersTest() { OpenLoadFlowProvider provider = new OpenLoadFlowProvider(); - assertEquals(21, provider.getSpecificParametersNames().size()); + assertEquals(20, provider.getSpecificParametersNames().size()); LoadFlowParameters parameters = new LoadFlowParameters(); provider.loadSpecificParameters(Collections.emptyMap()) diff --git a/src/test/resources/debug-parameters.json b/src/test/resources/debug-parameters.json index f8d7a0f707..6666d7aadc 100644 --- a/src/test/resources/debug-parameters.json +++ b/src/test/resources/debug-parameters.json @@ -25,7 +25,6 @@ "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE", "loadPowerFactorConstant" : false, "plausibleActivePowerLimit" : 5000.0, - "addRatioToLinesWithDifferentNominalVoltageAtBothEnds" : true, "slackBusPMaxMismatch" : 1.0, "voltagePerReactivePowerControl" : false, "maxIteration" : 30, From 77d689ea89ca01b4621de56ac580cfa86102f646 Mon Sep 17 00:00:00 2001 From: Anne Tilloy Date: Mon, 21 Nov 2022 10:21:56 +0100 Subject: [PATCH 5/6] Fix TUs because of wrong default value for network parameters. Signed-off-by: Anne Tilloy --- .../ac/VoltageMagnitudeInitializerTest.java | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/test/java/com/powsybl/openloadflow/ac/VoltageMagnitudeInitializerTest.java b/src/test/java/com/powsybl/openloadflow/ac/VoltageMagnitudeInitializerTest.java index 7c76fbd19f..4d47191bea 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/VoltageMagnitudeInitializerTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/VoltageMagnitudeInitializerTest.java @@ -60,17 +60,17 @@ void testIeee14() { assertBusVoltage(lfNetwork, initializer, "VL1_0", 1.06, 0); assertBusVoltage(lfNetwork, initializer, "VL2_0", 1.045, 0); assertBusVoltage(lfNetwork, initializer, "VL3_0", 1.01, 0); - assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.035155, 0); - assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.035618, 0); + assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.081485, 0); + assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.064609, 0); assertBusVoltage(lfNetwork, initializer, "VL6_0", 1.07, 0); - assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.074078, 0); + assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.2489781, 0); assertBusVoltage(lfNetwork, initializer, "VL8_0", 1.09, 0); - assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.072362, 0); - assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.071942, 0); - assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.070988, 0); - assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.070186, 0); - assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.070332, 0); - assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.071474, 0); + assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.320475, 0); + assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.275961, 0); + assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.174779, 0); + assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.089793, 0); + assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.105257, 0); + assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.226377, 0); } @Test @@ -83,17 +83,17 @@ void testZeroImpedanceBranch() { assertBusVoltage(lfNetwork, initializer, "VL1_0", 1.06, 0); assertBusVoltage(lfNetwork, initializer, "VL2_0", 1.045, 0); assertBusVoltage(lfNetwork, initializer, "VL3_0", 1.01, 0); - assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.035126, 0); - assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.0356, 0); + assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.078661, 0); + assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.062842, 0); assertBusVoltage(lfNetwork, initializer, "VL6_0", 1.07, 0); - assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.073983, 0); + assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.240216, 0); assertBusVoltage(lfNetwork, initializer, "VL8_0", 1.09, 0); - assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.072171, 0); // equals VL14_0 - assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.071785, 0); - assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.070908, 0); - assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.070274, 0); - assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.070489, 0); - assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.072171, 0); // equals VL9_0 + assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.300261, 0); // equals VL14_0 + assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.25934, 0); + assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.166324, 0); + assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.099144, 0); + assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.121916, 0); + assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.300261, 0); // equals VL9_0 } @Test @@ -106,17 +106,17 @@ void testZeroImpedanceBranchConnectedToPvBus() { assertBusVoltage(lfNetwork, initializer, "VL1_0", 1.06, 0); assertBusVoltage(lfNetwork, initializer, "VL2_0", 1.045, 0); assertBusVoltage(lfNetwork, initializer, "VL3_0", 1.01, 0); - assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.035106, 0); - assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.035587, 0); + assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.076690, 0); + assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.061609, 0); assertBusVoltage(lfNetwork, initializer, "VL6_0", 1.07, 0); // equals target - assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.073916, 0); + assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.234098, 0); assertBusVoltage(lfNetwork, initializer, "VL8_0", 1.09, 0); - assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.072038, 0); - assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.071415, 0); + assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.286148, 0); + assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.220109, 0); assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.07, 0); // equals VL6_0 - assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.070161, 0); - assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.070286, 0); - assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.071272, 0); + assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.08708, 0); + assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.100426, 0); + assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.204946, 0); } @Test @@ -146,17 +146,17 @@ void testParallelBranch() { assertBusVoltage(lfNetwork, initializer, "VL1_0", 1.06, 0); assertBusVoltage(lfNetwork, initializer, "VL2_0", 1.045, 0); assertBusVoltage(lfNetwork, initializer, "VL3_0", 1.01, 0); - assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.035155, 0); - assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.035618, 0); + assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.081485, 0); + assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.064609, 0); assertBusVoltage(lfNetwork, initializer, "VL6_0", 1.07, 0); - assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.074078, 0); + assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.248978, 0); assertBusVoltage(lfNetwork, initializer, "VL8_0", 1.09, 0); - assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.072362, 0); - assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.071942, 0); - assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.070988, 0); - assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.070186, 0); - assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.070332, 0); - assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.071474, 0); + assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.320475, 0); + assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.275961, 0); + assertBusVoltage(lfNetwork, initializer, "VL11_0", 1.17478, 0); + assertBusVoltage(lfNetwork, initializer, "VL12_0", 1.089793, 0); + assertBusVoltage(lfNetwork, initializer, "VL13_0", 1.105258, 0); + assertBusVoltage(lfNetwork, initializer, "VL14_0", 1.226377, 0); } @Test @@ -202,10 +202,10 @@ void testWithTransformerVoltageControl() { assertBusVoltage(lfNetwork, initializer, "VL1_0", 1.06, 0); assertBusVoltage(lfNetwork, initializer, "VL2_0", 1.045, 0); assertBusVoltage(lfNetwork, initializer, "VL3_0", 1.01, 0); - assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.039348, 0); - assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.038242, 0); + assertBusVoltage(lfNetwork, initializer, "VL4_0", 1.050687, 0); + assertBusVoltage(lfNetwork, initializer, "VL5_0", 1.045337, 0); assertBusVoltage(lfNetwork, initializer, "VL6_0", 1.07, 0); - assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.087979, 0); + assertBusVoltage(lfNetwork, initializer, "VL7_0", 1.153402, 0); assertBusVoltage(lfNetwork, initializer, "VL8_0", 1.09, 0); assertBusVoltage(lfNetwork, initializer, "VL9_0", 1.1, 0); // this is tha transformer voltage control target! assertBusVoltage(lfNetwork, initializer, "VL10_0", 1.094668, 0); From f207a3c888da3a20ff8788fe30402e0018d9d91c Mon Sep 17 00:00:00 2001 From: Anne Tilloy Date: Mon, 21 Nov 2022 11:00:04 +0100 Subject: [PATCH 6/6] Fix code smell. Signed-off-by: Anne Tilloy --- .../com/powsybl/openloadflow/network/impl/LfBranchImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java index ce24f6f174..7a27e9fce4 100644 --- a/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java +++ b/src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java @@ -11,8 +11,6 @@ import com.powsybl.openloadflow.network.*; import com.powsybl.openloadflow.util.PerUnit; import com.powsybl.security.results.BranchResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -23,8 +21,6 @@ */ public class LfBranchImpl extends AbstractImpedantLfBranch { - private static final Logger LOGGER = LoggerFactory.getLogger(LfBranchImpl.class); - private final Branch branch; protected LfBranchImpl(LfNetwork network, LfBus bus1, LfBus bus2, PiModel piModel, Branch branch) {