[WIP] Area Interchange Control as OuterLoop #1055

m-guibert · 2024-07-01T15:52:15Z

Please check if the PR fulfills these requirements

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem?

Fixes #978

Does this PR introduce a breaking change or deprecate an API?

Yes
No

Signed-off-by: mguibert <[email protected]>

…e Control Signed-off-by: vmouradian <[email protected]>

Signed-off-by: vmouradian <[email protected]>

m-guibert · 2024-07-17T11:42:15Z

src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java

@@ -618,6 +630,24 @@ public boolean isVoltagePerReactivePowerControl() {
        return voltagePerReactivePowerControl;
    }

+    public boolean isAreaInterchangeControl() {


Move all these new methods above isVoltagePerReactivePowerControl, as isVoltagePerReactivePowerControl and setVoltagePerReactivePowerControl should remain next to each other

m-guibert · 2024-07-17T11:46:39Z

src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java

@@ -1639,6 +1677,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
                .setUseLoadModel(parametersExt.isUseLoadModel())
                .setSimulateAutomationSystems(parametersExt.isSimulateAutomationSystems())
                .setReferenceBusSelector(ReferenceBusSelector.fromMode(parametersExt.getReferenceBusSelectionMode()))
+                .setAreaInterchangeControlAreaType(parametersExt.getAreaInterchangeControlAreaType())


Add the line below above this one:
.setAreaInterchangeControl(parametersExt.isAreaInterchangeControl())

Also, both new lines should probably be mmoved just above the setTransformerVoltageControl call? (Everywhere else, the AIC new parameters/getter/setters are added next to it)

@vmouradian
cc @m-guibert

current practice is to put new parameters at the bottom

changed in 743827b

Good to know, thanks!

src/main/java/com/powsybl/openloadflow/network/LfControlArea.java

src/main/java/com/powsybl/openloadflow/network/impl/LfControlAreaImpl.java

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

m-guibert · 2024-07-17T12:41:54Z

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

+    }
+
+    private static void updateControlAreaBoundaryP(Terminal terminal, LoadingContext loadingContext, Supplier<Evaluable> getP) {
+        LfControlArea controlArea = loadingContext.controlAreaBoundaries.get(terminal);


Check if the map contains the key first

m-guibert · 2024-07-17T12:45:16Z

src/test/java/com/powsybl/openloadflow/ac/AICTests.java

+import com.powsybl.openloadflow.network.BoundaryFactory;
+import org.junit.jupiter.api.Test;
+
+class AICTests {


Rename to AreaInterchangeControlTest

change in 63eb397

Almost: you wrote TestS instead of Test

Signed-off-by: vmouradian <[email protected]>

jeandemanged · 2024-07-18T08:39:02Z

src/main/java/com/powsybl/openloadflow/network/LfControlArea.java

rename to LfArea

renamed in 743827b

jeandemanged · 2024-07-18T08:40:38Z

src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java

@@ -92,6 +92,9 @@ public enum SlackDistributionFailureBehavior {

    public static final double MAX_SUSCEPTANCE_MISMATCH_DEFAULT_VALUE = 1e-4;

+    public static final boolean AREA_INTERCHANGE_CONTROL_DEFAULT_VALUE = false;
+
+    public static final String AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE = "ControlArea";


this default should be defined in LfNetworkParameters

changed in 743827b

jeandemanged · 2024-07-18T08:44:19Z

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

+            updateControlAreaBoundaryP(branch.getTerminal1(), loadingContext, lfBranch::getP1);
+            updateControlAreaBoundaryP(branch.getTerminal2(), loadingContext, lfBranch::getP2);


update is not the right term, add instead ?

jeandemanged · 2024-07-18T08:46:59Z

src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTests.java

+        Network network = BoundaryFactory.createWithLoad();
+        network.newArea()
+                .setId("a1")
+                .setName("Area 1")
+                .setAreaType("ControlArea")
+                .setInterchangeTarget(20)
+                .addVoltageLevel(network.getVoltageLevel("vl1"))
+                .addVoltageLevel(network.getVoltageLevel("vl2"))
+                .addAreaBoundary(network.getDanglingLine("dl1").getBoundary(), true)
+                .addAreaBoundary(network.getLine("l13").getTerminal2(), true)
+                .add();


suggestion: we will need many test networks dedicated to AIC. Create a new MultiAreaNetworkFactory in com.powsybl.openloadflow.network test code ?

Signed-off-by: vmouradian <[email protected]>

m-guibert · 2024-07-19T08:48:10Z

src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java

+        return this;
+    }
+
+    public OpenLoadFlowParameters setVoltagePerReactivePowerControl(boolean voltagePerReactivePowerControl) {


@vmouradian it looks like you moved this function by error

😅 oups. Changed in 5a29ee9

m-guibert · 2024-07-19T08:57:07Z

src/main/java/com/powsybl/openloadflow/network/LfNetwork.java

@@ -299,6 +301,11 @@ public void addBus(LfBus bus) {
        bus.getLoads().forEach(load -> load.getOriginalIds().forEach(id -> loadsById.put(id, load)));
    }

+    public void addControlArea(LfArea controlArea) {


@vmouradian Rename it to addArea + change the argument name

Forgot to push it previously, my bad. Done in 5a29ee9

m-guibert · 2024-07-19T08:58:03Z

src/main/java/com/powsybl/openloadflow/network/LfNetwork.java

@@ -366,6 +373,11 @@ public LfLoad getLoadById(String id) {
        return loadsById.get(id);
    }

+    public LfArea getControlAreaById(String id) {


@vmouradian Rename it to getAreaById + change the map controlAreasById to areasById

same, updated in 5a29ee9

m-guibert · 2024-07-19T09:03:42Z

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

@@ -55,6 +56,8 @@ private static class LoadingContext {
        private final Set<ShuntCompensator> shuntSet = new LinkedHashSet<>();

        private final Set<HvdcLine> hvdcLineSet = new LinkedHashSet<>();
+
+        private final Map<Terminal, LfArea> areaBoundaries = new HashMap<>();


Naming is still confusing beacause not all those terminals are boundaries of the area (because of dangling lines).
Name it areaTerminalMap instead?

Yes I agree, I renamed it in 5a29ee9

m-guibert · 2024-07-19T09:05:48Z

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

@@ -428,6 +433,7 @@ private static void createBranches(List<LfBus> lfBuses, LfNetwork lfNetwork, LfT
            LfBus lfBus2 = getLfBus(branch.getTerminal2(), lfNetwork, parameters.isBreakers());
            LfBranchImpl lfBranch = LfBranchImpl.create(branch, lfNetwork, lfBus1, lfBus2, topoConfig, parameters);
            addBranch(lfNetwork, lfBranch, report);
+            addLineAreaBoundaries(branch, lfBranch, loadingContext);


Rename method to addBranchAreaBoundaries

changed in 5a29ee9

m-guibert · 2024-07-19T09:15:04Z

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

@@ -503,6 +511,65 @@ private static void createBranches(List<LfBus> lfBuses, LfNetwork lfNetwork, LfT
        }
    }

+    private static void updateControlArea(Bus bus, LfBus lfBus, LfNetwork network, LfNetworkParameters parameters, LoadingContext loadingContext, LfNetworkLoadingReport report) {
+        Optional<Area> areaOpt = bus.getVoltageLevel().getArea(parameters.getAreaInterchangeControlAreaType());


You should explain here that only areas necessary to the AIC are created in the LfNetwork

changed in 5a29ee9

Signed-off-by: vmouradian <[email protected]>

sonarcloud · 2024-07-19T14:30:13Z

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
96.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

m-guibert self-assigned this Jul 1, 2024

m-guibert force-pushed the area_interchange_control_outerloop branch from 91829f9 to 7bbd807 Compare July 1, 2024 16:02

Add new OLF parameter to enable area interchange control

08e2260

Signed-off-by: mguibert <[email protected]>

m-guibert force-pushed the area_interchange_control_outerloop branch from 7bbd807 to 08e2260 Compare July 3, 2024 14:39

vmouradian added 9 commits July 8, 2024 10:54

Add new OLF parameter to select the areaType used for Area Interchang…

b7e37e6

…e Control Signed-off-by: vmouradian <[email protected]>

finish adding af the 2 new Control Area parameters

1c2dc4c

Signed-off-by: vmouradian <[email protected]>

add areaInterchangeControlAreaType to LfNetworkParameters

c41efe6

Signed-off-by: vmouradian <[email protected]>

Initiate LfControlArea interface and impl + add to LfNetwork

a44d4f0

Signed-off-by: vmouradian <[email protected]>

Load Areas to lfNetwork in LfNetworkLoader

f30d7f7

Signed-off-by: vmouradian <[email protected]>

(wip) Unit test

5a5a00d

Signed-off-by: vmouradian <[email protected]>

change methods order in LfControlArea

10bf131

Signed-off-by: vmouradian <[email protected]>

replace Evaluable by supplier in ControlArea boundaries

04dedf3

Signed-off-by: vmouradian <[email protected]>

LfNetworkLoader unit test

bfc656a

Signed-off-by: vmouradian <[email protected]>

m-guibert commented Jul 17, 2024

View reviewed changes

vmouradian added 2 commits July 18, 2024 09:48

Merge branch 'main' into area_interchange_control_outerloop

1929b57

rename

63eb397

Signed-off-by: vmouradian <[email protected]>

jeandemanged reviewed Jul 18, 2024

View reviewed changes

vmouradian added 3 commits July 18, 2024 12:07

rename LfcontrolArea to LfArea + move new parameters to bottom

743827b

Signed-off-by: vmouradian <[email protected]>

rename

60adb95

Signed-off-by: vmouradian <[email protected]>

clarify areas conversion in LfNetworkLoader

097d801

Signed-off-by: vmouradian <[email protected]>

vmouradian self-assigned this Jul 18, 2024

m-guibert commented Jul 19, 2024

View reviewed changes

vmouradian force-pushed the area_interchange_control_outerloop branch 2 times, most recently from c4db184 to 26da6ec Compare July 19, 2024 12:25

rename + clean

5a29ee9

Signed-off-by: vmouradian <[email protected]>

vmouradian force-pushed the area_interchange_control_outerloop branch from 26da6ec to 5a29ee9 Compare July 19, 2024 14:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Area Interchange Control as OuterLoop #1055

[WIP] Area Interchange Control as OuterLoop #1055

m-guibert commented Jul 1, 2024 •

edited

Loading

m-guibert Jul 17, 2024

m-guibert Jul 17, 2024

jeandemanged Jul 18, 2024

vmouradian Jul 18, 2024

m-guibert Jul 19, 2024

m-guibert Jul 17, 2024

m-guibert Jul 17, 2024

vmouradian Jul 18, 2024

m-guibert Jul 19, 2024

jeandemanged Jul 18, 2024

vmouradian Jul 18, 2024

jeandemanged Jul 18, 2024

vmouradian Jul 18, 2024

jeandemanged Jul 18, 2024

jeandemanged Jul 18, 2024

m-guibert Jul 19, 2024

vmouradian Jul 19, 2024

m-guibert Jul 19, 2024

vmouradian Jul 19, 2024

m-guibert Jul 19, 2024

vmouradian Jul 19, 2024

m-guibert Jul 19, 2024

vmouradian Jul 19, 2024

m-guibert Jul 19, 2024

vmouradian Jul 19, 2024

m-guibert Jul 19, 2024

vmouradian Jul 19, 2024

sonarcloud bot commented Jul 19, 2024

		updateControlAreaBoundaryP(branch.getTerminal1(), loadingContext, lfBranch::getP1);
		updateControlAreaBoundaryP(branch.getTerminal2(), loadingContext, lfBranch::getP2);

[WIP] Area Interchange Control as OuterLoop #1055

Are you sure you want to change the base?

[WIP] Area Interchange Control as OuterLoop #1055

Conversation

m-guibert commented Jul 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Jul 19, 2024

Quality Gate passed

m-guibert commented Jul 1, 2024 •

edited

Loading