Maintain power factor constant on loads during slack distribution #170
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,6 +53,8 @@ public abstract class AbstractLfBus implements LfBus { | |
|
|
||
| protected int positiveLoadCount = 0; | ||
|
|
||
| protected double initialLoadTargetQ = 0; | ||
|
|
||
| protected double loadTargetQ = 0; | ||
|
|
||
| protected double generationTargetQ = 0; | ||
|
|
@@ -216,6 +218,7 @@ private List<String> getGeneratorIds() { | |
| void addLoad(Load load) { | ||
| loads.add(load); | ||
| initialLoadTargetP += load.getP0(); | ||
| initialLoadTargetQ += load.getQ0(); | ||
| loadTargetP += load.getP0(); | ||
| LoadDetail loadDetail = load.getExtension(LoadDetail.class); | ||
| if (loadDetail != null) { | ||
|
|
@@ -230,6 +233,7 @@ void addLoad(Load load) { | |
| void addBattery(Battery battery) { | ||
| batteries.add(battery); | ||
| initialLoadTargetP += battery.getP0(); | ||
| initialLoadTargetQ += battery.getQ0(); | ||
| loadTargetP += battery.getP0(); | ||
| loadTargetQ += battery.getQ0(); | ||
| } | ||
|
|
@@ -341,6 +345,11 @@ public double getLoadTargetQ() { | |
| return loadTargetQ / PerUnit.SB; | ||
| } | ||
|
|
||
| @Override | ||
| public void setLoadTargetQ(double loadTargetQ) { | ||
| this.loadTargetQ = loadTargetQ * PerUnit.SB; | ||
| } | ||
|
|
||
| private double getLimitQ(ToDoubleFunction<LfGenerator> limitQ) { | ||
| return generators.stream() | ||
| .mapToDouble(generator -> generator.hasVoltageControl() ? limitQ.applyAsDouble(generator) | ||
|
|
@@ -459,11 +468,12 @@ public void updateState(boolean reactiveLimits, boolean writeSlackBus) { | |
| updateGeneratorsState(voltageControl ? calculatedQ + loadTargetQ : generationTargetQ, reactiveLimits); | ||
|
|
||
| // update load power | ||
| double factorP = initialLoadTargetP != 0 ? loadTargetP / initialLoadTargetP : 1; | ||
| double factorQ = initialLoadTargetQ != 0 ? loadTargetQ / initialLoadTargetQ : 1; | ||
| for (Load load : loads) { | ||
| load.getTerminal() | ||
| .setP(load.getP0() >= 0 ? factorP * load.getP0() : load.getP0()) | ||
| .setQ(load.getQ0() >= 0 ? factorQ * load.getQ0() : load.getQ0()); | ||
|
Comment on lines
+485
to
+486
There was a problem hiding this comment. @annetill: why do we distinguish positive and negative loads? There was a problem hiding this comment. I think these tests are not useful, I have to check. |
||
| } | ||
|
|
||
| // update battery power (which are not part of slack distribution) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,9 @@ public final class ParameterConstants { | |
| public static final String LOW_IMPEDANCE_BRANCH_MODE_PARAM_NAME = "lowImpedanceBranchMode"; | ||
| public static final LowImpedanceBranchMode LOW_IMPEDANCE_BRANCH_MODE_DEFAULT_VALUE = LowImpedanceBranchMode.REPLACE_BY_ZERO_IMPEDANCE_LINE; | ||
|
|
||
| public static final String POWER_FACTOR_CONSTANT_PARAM_NAME = "powerFactorConstant"; | ||
|
There was a problem hiding this comment. Do not forget to increase documentation. Our web site is here: https://github.com/powsybl/powsybl.github.io There was a problem hiding this comment. Did you find the related page? it's that one: pages/documentation/simulation/powerflow/openlf.md |
||
| public static final boolean POWER_FACTOR_CONSTANT_DEFAULT_VALUE = false; | ||
|
|
||
| private ParameterConstants() { | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,10 +7,14 @@ | |
| package com.powsybl.openloadflow.util; | ||
|
|
||
| import com.powsybl.iidm.network.Bus; | ||
| import com.powsybl.iidm.network.Load; | ||
| import com.powsybl.iidm.network.Network; | ||
| import com.powsybl.iidm.network.Terminal; | ||
| import com.powsybl.loadflow.LoadFlowResult; | ||
|
|
||
| import java.util.Iterator; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| /** | ||
| * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com> | ||
|
|
@@ -47,4 +51,56 @@ public static void assertUndefinedActivePower(Terminal terminal) { | |
| public static void assertUndefinedReactivePower(Terminal terminal) { | ||
| assertTrue(Double.isNaN(terminal.getQ())); | ||
| } | ||
|
|
||
| private static void assertPowerFactor(Network network, boolean isPowerFactorConstant) { | ||
| Iterator<Load> loads = network.getLoads().iterator(); | ||
| while (loads.hasNext()) { | ||
| Load load = loads.next(); | ||
| load.getTerminal().getQ(); | ||
| if (isPowerFactorConstant) { | ||
| assertEquals(Math.round(1000000 * load.getP0() / load.getQ0()), | ||
| Math.round(1000000 * load.getTerminal().getP() / load.getTerminal().getQ()), | ||
| "power factor should be a constant value"); | ||
| } else { | ||
| assertNotEquals(Math.round(1000000 * load.getP0() / load.getQ0()), | ||
| Math.round(1000000 * load.getTerminal().getP() / load.getTerminal().getQ()), | ||
| "power factor should not be a constant value"); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public static void assertPowerFactorNotConstant(Network network) { | ||
| assertPowerFactor(network, false); | ||
| } | ||
|
|
||
| public static void assertPowerFactorConstant(Network network) { | ||
| assertPowerFactor(network, true); | ||
| } | ||
|
|
||
| public static void assertBetterLoadFlowResults(LoadFlowResult loadFlowResult, LoadFlowResult loadFlowResultBetter) { | ||
| assertTrue(loadFlowResult.isOk(), "results should be ok"); | ||
| assertTrue(loadFlowResultBetter.isOk(), "results should be ok"); | ||
| assertEquals(loadFlowResult.getComponentResults().size(), | ||
| loadFlowResultBetter.getComponentResults().size(), | ||
| "results should have same subnetwork count"); | ||
| Iterator<LoadFlowResult.ComponentResult> componentResultIterator = loadFlowResult.getComponentResults().iterator(); | ||
| Iterator<LoadFlowResult.ComponentResult> componentResultIteratorBetter = loadFlowResultBetter.getComponentResults().iterator(); | ||
| // loop over sub networks | ||
| while (componentResultIterator.hasNext()) { | ||
| LoadFlowResult.ComponentResult componentResult = componentResultIterator.next(); | ||
| LoadFlowResult.ComponentResult componentResultBetter = componentResultIteratorBetter.next(); | ||
| assertEquals(componentResult.getComponentNum(), | ||
| componentResultBetter.getComponentNum(), | ||
| "this assert has a bug, please fix it"); | ||
| assertEquals(componentResult.getSlackBusId(), | ||
| componentResultBetter.getSlackBusId(), | ||
| "this assert has a bug, please fix it"); | ||
| assertEquals(componentResult.getStatus(), | ||
| componentResultBetter.getStatus(), | ||
| "status results should be the same"); | ||
| assertTrue(componentResult.getIterationCount() >= componentResultBetter.getIterationCount(), "iteration count should be the same or lower for improved result"); | ||
| assertTrue(Math.abs(componentResult.getSlackBusActivePowerMismatch()) >= Math.abs(componentResultBetter.getSlackBusActivePowerMismatch()), "mismatch should be the same or lower for improved result"); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. As @annetill said, I'm not sure to understand this assessment. From my point of view, you should assert that the results are the expected one, not that the results are closed to the other one |
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two fields should be final?