[WIP] Area Interchange Control as OuterLoop

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

@@ -127,6 +127,10 @@ public enum FictitiousGeneratorVoltageControlCheckMode {
 
  protected static final FictitiousGeneratorVoltageControlCheckMode FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE_DEFAULT_VALUE = FictitiousGeneratorVoltageControlCheckMode.FORCED;
 
+ public static final boolean AREA_INTERCHANGE_CONTROL_DEFAULT_VALUE = false;
+
+ public static final String AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE = LfNetworkParameters.AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE;
+
  public static final String SLACK_BUS_SELECTION_MODE_PARAM_NAME = "slackBusSelectionMode";
 
  public static final String SLACK_BUSES_IDS_PARAM_NAME = "slackBusesIds";
@@ -263,6 +267,10 @@ public enum FictitiousGeneratorVoltageControlCheckMode {
 
  public static final String FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE = "fictitiousGeneratorVoltageControlCheckMode";
 
+ public static final String AREA_INTERCHANGE_CONTROL_PARAM_NAME = "areaInterchangeControl";
+
+ public static final String AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME = "areaInterchangeControlAreaType";
+
  public static <E extends Enum<E>> List<Object> getEnumPossibleValues(Class<E> enumClass) {
  return EnumSet.allOf(enumClass).stream().map(Enum::name).collect(Collectors.toList());
  }
@@ -335,7 +343,9 @@ public static <E extends Enum<E>> List<Object> getEnumPossibleValues(Class<E> en
  new Parameter(VOLTAGE_TARGET_PRIORITIES_PARAM_NAME, ParameterType.STRING_LIST, "Voltage target priorities for voltage controls", LfNetworkParameters.VOLTAGE_CONTROL_PRIORITIES_DEFAULT_VALUE, getEnumPossibleValues(VoltageControl.Type.class)),
  new Parameter(TRANSFORMER_VOLTAGE_CONTROL_USE_INITIAL_TAP_POSITION_PARAM_NAME, ParameterType.BOOLEAN, "Maintain initial tap position if possible", LfNetworkParameters.TRANSFORMER_VOLTAGE_CONTROL_USE_INITIAL_TAP_POSITION_DEFAULT_VALUE),
  new Parameter(GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_PARAM_NAME, ParameterType.DOUBLE, "Nominal voltage under which generator voltage controls are disabled during transformer voltage control outer loop of mode AFTER_GENERATOR_VOLTAGE_CONTROL, < 0 means automatic detection", OpenLoadFlowParameters.GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_DEFAULT_VALUE),
- new Parameter(FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE, ParameterType.STRING, "Specifies fictitious generators active power checks exemption for voltage control", OpenLoadFlowParameters.FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE_DEFAULT_VALUE.name(), getEnumPossibleValues(FictitiousGeneratorVoltageControlCheckMode.class))
+ new Parameter(FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE, ParameterType.STRING, "Specifies fictitious generators active power checks exemption for voltage control", OpenLoadFlowParameters.FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE_DEFAULT_VALUE.name(), getEnumPossibleValues(FictitiousGeneratorVoltageControlCheckMode.class)),
+ new Parameter(AREA_INTERCHANGE_CONTROL_PARAM_NAME, ParameterType.BOOLEAN, "Area interchange control", AREA_INTERCHANGE_CONTROL_DEFAULT_VALUE),
+ new Parameter(AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME, ParameterType.STRING, "Area type for area interchange control", AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE)
  );
 
  public enum VoltageInitModeOverride {
@@ -513,6 +523,10 @@ public enum ReactiveRangeCheckMode {
 
  private FictitiousGeneratorVoltageControlCheckMode fictitiousGeneratorVoltageControlCheckMode = FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE_DEFAULT_VALUE;
 
+ private boolean areaInterchangeControl = AREA_INTERCHANGE_CONTROL_DEFAULT_VALUE;
+
+ private String areaInterchangeControlAreaType = AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE;
+
  public static double checkParameterValue(double parameterValue, boolean condition, String parameterName) {
  if (!condition) {
  throw new IllegalArgumentException("Invalid value for parameter " + parameterName + ": " + parameterValue);
@@ -618,11 +632,6 @@ public boolean isVoltagePerReactivePowerControl() {
  return voltagePerReactivePowerControl;
  }
 
- public OpenLoadFlowParameters setVoltagePerReactivePowerControl(boolean voltagePerReactivePowerControl) {
- this.voltagePerReactivePowerControl = voltagePerReactivePowerControl;
- return this;
- }
-
  public boolean isGeneratorReactivePowerRemoteControl() {
  return generatorReactivePowerRemoteControl;
  }
@@ -1209,6 +1218,29 @@ public OpenLoadFlowParameters setFictitiousGeneratorVoltageControlCheckMode(Fict
  return this;
  }
 
+ public boolean isAreaInterchangeControl() {
+ return areaInterchangeControl;
+ }
+
+ public OpenLoadFlowParameters setAreaInterchangeControl(boolean areaInterchangeControl) {
+ this.areaInterchangeControl = areaInterchangeControl;
+ return this;
+ }
+
+ public String getAreaInterchangeControlAreaType() {
+ return areaInterchangeControlAreaType;
+ }
+
+ public OpenLoadFlowParameters setAreaInterchangeControlAreaType(String areaInterchangeControlAreaType) {
+ this.areaInterchangeControlAreaType = Objects.requireNonNull(areaInterchangeControlAreaType);
+ return this;
+ }
+
+ public OpenLoadFlowParameters setVoltagePerReactivePowerControl(boolean voltagePerReactivePowerControl) {
+ this.voltagePerReactivePowerControl = voltagePerReactivePowerControl;
+ return this;
+ }
+
  public static OpenLoadFlowParameters load() {
  return load(PlatformConfig.defaultConfig());
  }
@@ -1284,7 +1316,9 @@ public static OpenLoadFlowParameters load(PlatformConfig platformConfig) {
  .setWriteReferenceTerminals(config.getBooleanProperty(WRITE_REFERENCE_TERMINALS_PARAM_NAME, WRITE_REFERENCE_TERMINALS_DEFAULT_VALUE))
  .setVoltageTargetPriorities(config.getStringListProperty(VOLTAGE_TARGET_PRIORITIES_PARAM_NAME, LfNetworkParameters.VOLTAGE_CONTROL_PRIORITIES_DEFAULT_VALUE))
  .setTransformerVoltageControlUseInitialTapPosition(config.getBooleanProperty(TRANSFORMER_VOLTAGE_CONTROL_USE_INITIAL_TAP_POSITION_PARAM_NAME, LfNetworkParameters.TRANSFORMER_VOLTAGE_CONTROL_USE_INITIAL_TAP_POSITION_DEFAULT_VALUE))
- .setGeneratorVoltageControlMinNominalVoltage(config.getDoubleProperty(GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_PARAM_NAME, GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_DEFAULT_VALUE)));
+ .setGeneratorVoltageControlMinNominalVoltage(config.getDoubleProperty(GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_PARAM_NAME, GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_DEFAULT_VALUE))
+ .setAreaInterchangeControl(config.getBooleanProperty(AREA_INTERCHANGE_CONTROL_PARAM_NAME, AREA_INTERCHANGE_CONTROL_DEFAULT_VALUE))
+ .setAreaInterchangeControlAreaType(config.getStringProperty(AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME, AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE)));
  return parameters;
  }
 
@@ -1439,6 +1473,10 @@ public OpenLoadFlowParameters update(Map<String, String> properties) {
  .ifPresent(prop -> this.setGeneratorVoltageControlMinNominalVoltage(Double.parseDouble(prop)));
  Optional.ofNullable(properties.get(FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE))
  .ifPresent(prop -> this.setFictitiousGeneratorVoltageControlCheckMode(FictitiousGeneratorVoltageControlCheckMode.valueOf(prop)));
+ Optional.ofNullable(properties.get(AREA_INTERCHANGE_CONTROL_PARAM_NAME))
+ .ifPresent(prop -> this.setAreaInterchangeControl(Boolean.parseBoolean(prop)));
+ Optional.ofNullable(properties.get(AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME))
+ .ifPresent(this::setAreaInterchangeControlAreaType);
  return this;
  }
 
@@ -1512,6 +1550,8 @@ public Map<String, Object> toMap() {
  map.put(TRANSFORMER_VOLTAGE_CONTROL_USE_INITIAL_TAP_POSITION_PARAM_NAME, transformerVoltageControlUseInitialTapPosition);
  map.put(GENERATOR_VOLTAGE_CONTROL_MIN_NOMINAL_VOLTAGE_PARAM_NAME, generatorVoltageControlMinNominalVoltage);
  map.put(FICTITIOUS_GENERATOR_VOLTAGE_CONTROL_CHECK_MODE, fictitiousGeneratorVoltageControlCheckMode);
+ map.put(AREA_INTERCHANGE_CONTROL_PARAM_NAME, areaInterchangeControl);
+ map.put(AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME, areaInterchangeControlAreaType);
  return map;
  }
 
@@ -1640,7 +1680,8 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
  .setSimulateAutomationSystems(parametersExt.isSimulateAutomationSystems())
  .setReferenceBusSelector(ReferenceBusSelector.fromMode(parametersExt.getReferenceBusSelectionMode()))
  .setVoltageTargetPriorities(parametersExt.getVoltageTargetPriorities())
- .setFictitiousGeneratorVoltageControlCheckMode(parametersExt.getFictitiousGeneratorVoltageControlCheckMode());
+ .setFictitiousGeneratorVoltageControlCheckMode(parametersExt.getFictitiousGeneratorVoltageControlCheckMode())
+ .setAreaInterchangeControlAreaType(parametersExt.getAreaInterchangeControlAreaType());
  }
 
  public static AcLoadFlowParameters createAcParameters(Network network, LoadFlowParameters parameters, OpenLoadFlowParameters parametersExt,
@@ -1890,7 +1931,9 @@ public static boolean equals(LoadFlowParameters parameters1, LoadFlowParameters
  Objects.equals(extension1.getVoltageTargetPriorities(), extension2.getVoltageTargetPriorities()) &&
  extension1.isTransformerVoltageControlUseInitialTapPosition() == extension2.isTransformerVoltageControlUseInitialTapPosition() &&
  extension1.getGeneratorVoltageControlMinNominalVoltage() == extension2.getGeneratorVoltageControlMinNominalVoltage() &&
- extension1.getFictitiousGeneratorVoltageControlCheckMode() == extension2.getFictitiousGeneratorVoltageControlCheckMode();
+ extension1.getFictitiousGeneratorVoltageControlCheckMode() == extension2.getFictitiousGeneratorVoltageControlCheckMode() &&
+ extension1.isAreaInterchangeControl() == extension2.isAreaInterchangeControl() &&
+ Objects.equals(extension1.getAreaInterchangeControlAreaType(), extension2.getAreaInterchangeControlAreaType());
  }
 
  public static LoadFlowParameters clone(LoadFlowParameters parameters) {
@@ -1983,7 +2026,9 @@ public static LoadFlowParameters clone(LoadFlowParameters parameters) {
  .setVoltageTargetPriorities(extension.getVoltageTargetPriorities())
  .setTransformerVoltageControlUseInitialTapPosition(extension.isTransformerVoltageControlUseInitialTapPosition())
  .setGeneratorVoltageControlMinNominalVoltage(extension.getGeneratorVoltageControlMinNominalVoltage())
- .setFictitiousGeneratorVoltageControlCheckMode(extension.getFictitiousGeneratorVoltageControlCheckMode());
+ .setFictitiousGeneratorVoltageControlCheckMode(extension.getFictitiousGeneratorVoltageControlCheckMode())
+ .setAreaInterchangeControl(extension.isAreaInterchangeControl())
+ .setAreaInterchangeControlAreaType(extension.getAreaInterchangeControlAreaType());
 
  if (extension2 != null) {
  parameters2.addExtension(OpenLoadFlowParameters.class, extension2);

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

@@ -0,0 +1,23 @@
+package com.powsybl.openloadflow.network;
+
+import com.powsybl.openloadflow.util.Evaluable;
+
+import java.util.Set;
+import java.util.function.Supplier;
+
+public interface LfArea extends PropertyBag {
+ String getId();
+
+ double getInterchangeTarget();
+
+ double getInterchange();
+
+ Set<LfBus> getBuses();
+
+ LfArea addBus(LfBus bus);
+
+ LfArea addBoundaryP(Supplier<Evaluable> p);
+
+ LfNetwork getNetwork();
+
+}

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

@@ -77,6 +77,8 @@ public class LfNetwork extends AbstractPropertyBag implements PropertyBag {
 
  private final Map<String, LfLoad> loadsById = new HashMap<>();
 
+ private final Map<String, LfArea> controlAreasById = new HashMap<>();
+
  private final List<LfHvdc> hvdcs = new ArrayList<>();
 
  private final Map<String, LfHvdc> hvdcsById = new HashMap<>();
@@ -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) {
+ Objects.requireNonNull(controlArea);
+ controlAreasById.put(controlArea.getId(), controlArea);
+ }
+
  public List<LfBus> getBuses() {
  return busesByIndex;
  }
@@ -366,6 +373,11 @@ public LfLoad getLoadById(String id) {
  return loadsById.get(id);
  }
 
+ public LfArea getControlAreaById(String id) {
+ Objects.requireNonNull(id);
+ return controlAreasById.get(id);
+ }
+
  public void addHvdc(LfHvdc hvdc) {
  Objects.requireNonNull(hvdc);
  hvdc.setNum(hvdcs.size());

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

@@ -56,6 +56,8 @@ public class LfNetworkParameters {
 
  public static final boolean SIMULATE_AUTOMATION_SYSTEMS_DEFAULT_VALUE = false;
 
+ public static final String AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE = "ControlArea";
+
  private SlackBusSelector slackBusSelector = new FirstSlackBusSelector(SLACK_BUS_COUNTRY_FILTER_DEFAULT_VALUE);
 
  private GraphConnectivityFactory<LfBus, LfBranch> connectivityFactory = new EvenShiloachGraphDecrementalConnectivityFactory<>();
@@ -142,6 +144,8 @@ public class LfNetworkParameters {
 
  private OpenLoadFlowParameters.FictitiousGeneratorVoltageControlCheckMode fictitiousGeneratorVoltageControlCheckMode = OpenLoadFlowParameters.FictitiousGeneratorVoltageControlCheckMode.FORCED;
 
+ private String areaInterchangeControlAreaType = AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE;
+
  public LfNetworkParameters() {
  }
 
@@ -186,6 +190,7 @@ public LfNetworkParameters(LfNetworkParameters other) {
  this.referenceBusSelector = other.referenceBusSelector;
  this.voltageTargetPriorities = new ArrayList<>(other.voltageTargetPriorities);
  this.fictitiousGeneratorVoltageControlCheckMode = other.fictitiousGeneratorVoltageControlCheckMode;
+ this.areaInterchangeControlAreaType = other.areaInterchangeControlAreaType;
  }
 
  public SlackBusSelector getSlackBusSelector() {
@@ -571,6 +576,15 @@ public int getVoltageTargetPriority(VoltageControl.Type voltageControlType) {
  return priority;
  }
 
+ public String getAreaInterchangeControlAreaType() {
+ return areaInterchangeControlAreaType;
+ }
+
+ public LfNetworkParameters setAreaInterchangeControlAreaType(String areaInterchangeControlAreaType) {
+ this.areaInterchangeControlAreaType = areaInterchangeControlAreaType;
+ return this;
+ }
+
  @Override
  public String toString() {
  return "LfNetworkParameters(" +
@@ -610,6 +624,7 @@ public String toString() {
  ", referenceBusSelector=" + referenceBusSelector.getClass().getSimpleName() +
  ", voltageTargetPriorities=" + voltageTargetPriorities +
  ", fictitiousGeneratorVoltageControlCheckMode=" + fictitiousGeneratorVoltageControlCheckMode +
+ ", areaInterchangeControlAreaType=" + areaInterchangeControlAreaType +
  ')';
  }
 }

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

@@ -0,0 +1,75 @@
+package com.powsybl.openloadflow.network.impl;
+
+import com.powsybl.iidm.network.*;
+import com.powsybl.openloadflow.network.*;
+import com.powsybl.openloadflow.util.Evaluable;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Supplier;
+
+public class LfAreaImpl extends AbstractPropertyBag implements LfArea {
+
+ private final LfNetwork network;
+ private final Ref<Area> areaRef;
+
+ private final double interchangeTarget;
+
+ private final Set<LfBus> buses;
+
+ private Set<Supplier<Evaluable>> boundariesP;
+
+ public LfAreaImpl(Area area, LfNetwork network, LfNetworkParameters parameters) {
+ this.network = network;
+ this.areaRef = Ref.create(area, parameters.isCacheEnabled());
+ this.interchangeTarget = area.getInterchangeTarget().orElse(Double.NaN);
+ this.buses = new HashSet<>();
+ this.boundariesP = new HashSet<>();
+ }
+
+ public static LfAreaImpl create(Area area, LfNetwork network, LfNetworkParameters parameters) {
+ return new LfAreaImpl(area, network, parameters);
+ }
+
+ private Area getArea() {
+ return areaRef.get();
+ }
+
+ @Override
+ public String getId() {
+ return getArea().getId();
+ }
+
+ @Override
+ public double getInterchangeTarget() {
+ return interchangeTarget;
+ }
+
+ @Override
+ public double getInterchange() {
+ return boundariesP.stream().map(Supplier::get).mapToDouble(Evaluable::eval).sum();
+ }
+
+ @Override
+ public Set<LfBus> getBuses() {
+ return buses;
+ }
+
+ @Override
+ public LfArea addBus(LfBus bus) {
+ buses.add(bus);
+ return this;
+ }
+
+ @Override
+ public LfArea addBoundaryP(Supplier<Evaluable> getP) {
+ boundariesP.add(getP);
+ return this;
+ }
+
+ @Override
+ public LfNetwork getNetwork() {
+ return network;
+ }
+
+}