[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 <marine.guibert@artelys.com>

…e Control Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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

Mutliple commits changed this, last one is 42bfe28 and this is fixed now

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!

changed in 743827b

I see you moved the line to follow Damien's instructions but you didn't add the line I asked for.

adressed in 1b27134, and cleaned in a7c6a58 (Damien <3)

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: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

😅 fixed in e83f8af

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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

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

rename to LfArea

renamed in 743827b

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

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 ?

changed this, mostly in 097d801 and f3930a8

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

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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

I think there is still a problem: you didn't move it back to its initial place. See the diff view to check if you rolled-back correctly all those modifications

Do not remember the last commit on this but the diff seems ok now

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

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

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>

jeandemanged · 2024-07-29T09:54:34Z

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

@@ -19,13 +21,27 @@
 */
 abstract class AbstractAcOuterLoopConfig implements AcOuterLoopConfig {


ExplicitAcOuterLoopConfig needs also to be modified to include new AreaInterchangeControl OL

jeandemanged · 2024-07-29T11:26:51Z

src/main/java/com/powsybl/openloadflow/lf/outerloop/DistributedActivePowerContextData.java

I would keep this one unchanged, and make another one extending it specifically for AIC, containing also the details of distributed power per area

@jeandemanged I agree, and this makes me think that we should change AcLoadFlowResult to have distributed active power per area. Is that also what you were thinking about ?

jeandemanged · 2024-07-29T11:32:06Z

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

+ void addBus(LfBus bus);
+
+ void addBoundaryP(Supplier<Evaluable> p);


addBus and addBoundaryP should not be part of LfArea interface, this is only internal to LfNetworkLoaderImpl

jeandemanged · 2024-07-29T11:33:36Z

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

+ double getSlackInjection(double slackBusActivePowerMismatch);
+
+ void addExternalBusSlackParticipationFactor(LfBus bus, double shareFactor);
+
+ /**
+ * Some buses are not in the Area, but their slack should be considered for the slack of the Area
+ * (This happens for example when a bus is connected to multiple Areas but the flow through the bus is not considered for those areas' interchange power flow).
+ * The slack of this buses can need to be shared with other Areas with a factor for each area.
+ * @return A map of the external buses considered for the slack of the Area with the share factor of the Area
+ */
+ Map<LfBus, Double> getExternalBusesSlackParticipationFactors();


should not be part of LfArea interface, this is internal to AIC outerloop

src/main/java/com/powsybl/openloadflow/ac/outerloop/AreaInterchangeControlOuterloop.java

jeandemanged · 2024-07-29T11:43:35Z

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

+
+ private Map<LfBus, Double> externalBusesSlackParticipationFactors = new HashMap<>();
+
+ public LfAreaImpl(Area area, LfNetwork network, LfNetworkParameters parameters) {


jeandemanged · 2024-07-29T11:47:18Z

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

+ @Override
+ public void addBus(LfBus bus) {
+ buses.add(bus);
+ }
+
+ @Override
+ public void addBoundaryP(Supplier<Evaluable> getP) {
+ boundariesP.add(getP);
+ }


buses and boundaries should be part of constructor/create

jeandemanged · 2024-07-29T11:47:46Z

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

+ @Override
+ public double getSlackInjection(double slackBusActivePowerMismatch) {
+ int totalSlackBusCount = (int) getNetwork().getSlackBuses().stream().count();
+ int areaSlackBusCount = (int) getBuses().stream().filter(LfBus::isSlack).count();
+ double areaExternalSlackBusShare = getExternalBusesSlackParticipationFactors().entrySet().stream().filter(entry -> entry.getKey().isSlack()).mapToDouble(Map.Entry::getValue).sum();
+ return totalSlackBusCount == 0 ? 0.0 : slackBusActivePowerMismatch * (areaSlackBusCount + areaExternalSlackBusShare) / totalSlackBusCount;
+ }
+
+ @Override
+ public void addExternalBusSlackParticipationFactor(LfBus bus, double shareFactor) {
+ if (bus != null) {
+ externalBusesSlackParticipationFactors.put(bus, shareFactor);
+ }
+ }
+
+ @Override
+ public Map<LfBus, Double> getExternalBusesSlackParticipationFactors() {
+ return externalBusesSlackParticipationFactors;
+ }


this logic should not be here, but in the AIC outerloop

jeandemanged · 2024-07-29T11:58:27Z

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

to be revised so that LfArea-s are created once with all buses and boundaries without being mutated further, there should not be any addBus or addBoundary method in LfArea or LfAreaImpl

also need to include LfArea to LfNetworkLoaderPostProcessor with a new method

void onAreaAdded(Object element, LfArea lfArea);

jeandemanged · 2024-07-29T12:09:33Z

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

+ List<LfBus> handledBuses = lfNetwork.getAreas().stream().flatMap(area ->
+ area.getBuses().stream())
+ .toList();
+ List<LfBus> unhandledBuses = lfNetwork.getBuses().stream().filter(b -> !handledBuses.contains(b)).toList();


performance issue here, especially the .filter(b -> !handledBuses.contains(b)) because handledBuses is a List.

changing to a Set could be an option, but we can see here that we need in LfBus a method like

Optional<LfArea> getLfArea()

jeandemanged · 2024-07-29T12:14:47Z

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

+ // If the flow through this bus is considered for the interchange of some of the connected areas,
+ // then it has already been added to the Area's externalBusesSlackParticipationFactors map with a factor 0.0
+ // Here we want to share the slack injection of this bus between the areas that are not considering the flow through this bus for their interchange power flow
+ Set<LfArea> areasSharingSlack = connectedAreas.stream().filter(area -> !area.getExternalBusesSlackParticipationFactors().containsKey(unhandledBus)).collect(Collectors.toSet());
+ if (!areasSharingSlack.isEmpty()) {
+ areasSharingSlack.forEach(area -> area.addExternalBusSlackParticipationFactor(unhandledBus, 1.0 / areasSharingSlack.size()));
+ LOGGER.info("Bus {} is not in any Area and is connected to Areas: {} but the flow through this bus is not considered for their interchange flow. For a correct balancing, its slack injection will be shared between those areas", unhandledBus.getId(), connectedAreas.stream().map(LfArea::getId).toList());
+ }


this, and probably the entire method, should be moved outside LfNetworkLoader to be AIC outerloop code (e.g. in init part)

jeandemanged · 2024-07-29T12:17:26Z

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

+ static void checkDuplicatedAreas(List<LfNetwork> lfNetworks) {
+ List<String> duplicatedAreas = lfNetworks.stream()
+ .flatMap(lfNetwork -> lfNetwork.getAreas().stream())
+ .collect(Collectors.groupingBy(LfArea::getId, Collectors.counting()))
+ .entrySet().stream()
+ .filter(e -> e.getValue() > 1)
+ .map(Map.Entry::getKey)
+ .toList();
+ if (!duplicatedAreas.isEmpty()) {
+ throw new PowsyblException("Areas with ids " + duplicatedAreas + " are present in more than one LfNetwork. Load flow computation with area interchange control is not supported in this case.");
+ }
+ }


with this, in practice, you are going to throw for all real case networks which always have small portions here and there.

The correct check is verifying that each area has all its boundaries are in the same LfNetwork.

Also, should not throw, just warn

jeandemanged · 2024-07-29T12:32:52Z

src/main/java/com/powsybl/openloadflow/ac/outerloop/AreaInterchangeControlOuterloop.java

+ double distributedActivePower = areaActivePowerMismatch - remainingMismatch;
+ totalDistributedActivePower += distributedActivePower;
+ movedBuses |= result.movedBuses();
+ totalIterations += result.iteration();


I don' think this sum has anything meaningful, only the value per area is meaningful.

jeandemanged · 2024-07-29T14:36:54Z

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

+public interface LfArea extends PropertyBag {
+ String getId();
+
+ double getInterchangeTarget();


please prepare also a setter, would be used later on when we will implement area actions

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

Co-authored-by: jeandemanged <damien.jeandemange@artelys.com> Signed-off-by: Valentin Mouradian <144696437+vmouradian@users.noreply.github.com>

sonarcloud · 2024-08-02T08:41:45Z

Quality Gate passed

Issues
10 New issues
0 Accepted issues

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

See analysis details on SonarCloud

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

…l outerloop Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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 <marine.guibert@artelys.com>

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 <valentin.mouradian@artelys.com>

finish adding af the 2 new Control Area parameters

1c2dc4c

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

add areaInterchangeControlAreaType to LfNetworkParameters

c41efe6

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

Initiate LfControlArea interface and impl + add to LfNetwork

a44d4f0

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

Load Areas to lfNetwork in LfNetworkLoader

f30d7f7

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

(wip) Unit test

5a5a00d

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

change methods order in LfControlArea

10bf131

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

replace Evaluable by supplier in ControlArea boundaries

04dedf3

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

LfNetworkLoader unit test

bfc656a

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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 <valentin.mouradian@artelys.com>

jeandemanged reviewed Jul 18, 2024

View reviewed changes

src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java Outdated Show resolved Hide resolved

jeandemanged reviewed Jul 18, 2024

View reviewed changes

src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTests.java Outdated Show resolved Hide resolved

vmouradian added 3 commits July 18, 2024 12:07

rename LfcontrolArea to LfArea + move new parameters to bottom

743827b

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

rename

60adb95

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

clarify areas conversion in LfNetworkLoader

097d801

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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 <valentin.mouradian@artelys.com>

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

vmouradian and others added 10 commits July 25, 2024 10:15

Fix copyrights and javadoc

d7456e7

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

Improve logging and reports

e107aac

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

fix wrong slack injection computation

ad6a151

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

improve comment

05c9a97

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

fix error message and unit test

b5fefc8

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

check buses with no areas and handle slack on boundary buses

f3930a8

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

check areas duplicated over multiple LfNetworks

f8142ae

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

update unit tests

a0d05fb

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

clean OpenLoadFlowParameters

a7c6a58

Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>

fix

995a1b4

Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>

jeandemanged reviewed Jul 29, 2024

View reviewed changes

src/main/java/com/powsybl/openloadflow/ac/outerloop/AreaInterchangeControlOuterloop.java Outdated Show resolved Hide resolved

jeandemanged reviewed Jul 29, 2024

View reviewed changes

vmouradian and others added 2 commits August 2, 2024 10:20

rename AreaInterchangeControlTest

e83f8af

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

fix logger

ccdd43d

Co-authored-by: jeandemanged <damien.jeandemange@artelys.com> Signed-off-by: Valentin Mouradian <144696437+vmouradian@users.noreply.github.com>

vmouradian added 3 commits August 2, 2024 10:44

add Area interchange control creation to ExplicitAcOuterLoopConfig

7294008

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

add setter for LfArea interchange target

c2f88b5

Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

refactor Areas creation and slack handling in area interchange contro…

9a9478c

…l outerloop Signed-off-by: vmouradian <valentin.mouradian@artelys.com>

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

		@@ -19,13 +21,27 @@
		*/
		abstract class AbstractAcOuterLoopConfig implements AcOuterLoopConfig {

		void addBus(LfBus bus);

		void addBoundaryP(Supplier<Evaluable> p);


		private Map<LfBus, Double> externalBusesSlackParticipationFactors = new HashMap<>();

		public LfAreaImpl(Area area, LfNetwork network, LfNetworkParameters parameters) {

[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

Choose a reason for hiding this comment

jeandemanged Jul 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeandemanged Jul 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeandemanged Jul 29, 2024 • edited Loading

Choose a reason for hiding this comment

sonarcloud bot commented Aug 2, 2024

Quality Gate passed

m-guibert commented Jul 1, 2024 •

edited

Loading

jeandemanged Jul 29, 2024 •

edited

Loading

jeandemanged Jul 29, 2024 •

edited

Loading

jeandemanged Jul 29, 2024 •

edited

Loading