diff --git a/docs/index.md b/docs/index.md index a5525d149..8aff74d9b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,6 +8,7 @@ Powsybl-dynawo is an interface between PowSyBl and [Dynaωo](https://dynawo.gith ```{toctree} :hidden: load_flow/index.md +security_analysis/index.md dynamic_simulation/index.md dynamic_security_analysis/index.md ``` diff --git a/docs/load_flow/configuration.md b/docs/load_flow/configuration.md index 87d9907c3..c122cbed6 100644 --- a/docs/load_flow/configuration.md +++ b/docs/load_flow/configuration.md @@ -66,10 +66,6 @@ The default value is `100`. **(TODO: description)** The default value is `Nan`. -**timeOfEvent** -**(TODO: description)** -The default value is `10`. - **chosenOutputs** **(TODO: description)** Available values **(TODO: describe them)**: @@ -80,12 +76,14 @@ Available values **(TODO: describe them)**: The default value is a list of all of them. +(timeStepDef)= + **timeStep** -**(TODO: description)** +`timeStep` defines the maximum time solver step value (in s). The default value is `10`. **mergeLoads** -`mergeLoads` is used to indicates if loads connected to the same bus are merged. +`mergeLoads` indicates if loads connected to the same bus are merged. The default value is `TRUE`. **startingPointMode** @@ -115,7 +113,6 @@ dynaflow-default-parameters: startTime: 0.0 stopTime: 100.0 precision: 1.0 - timeOfEvent: 10.0 chosenOutputs: [ "STEADYSTATE", "LOSTEQ", "TIMELINE", "CONSTRAINTS" ] timeStep: 2.6 mergeLoads: true @@ -141,9 +138,6 @@ Alternatively, you can provide parameters as a JSON file where supported "startTime" : 0.0, "stopTime" : 100.0, "precision" : 1.0, - "sa" : { - "timeOfEvent" : 10.0 - }, "chosenOutputs" : [ "STEADYSTATE", "LOSTEQ", "TIMELINE", "CONSTRAINTS" ], "timeStep" : 2.6, "mergeLoads" : true, diff --git a/docs/security_analysis/configuration.md b/docs/security_analysis/configuration.md new file mode 100644 index 000000000..1a8e2e7be --- /dev/null +++ b/docs/security_analysis/configuration.md @@ -0,0 +1,29 @@ +# Configuration + +The security analysis reuse the `dynaflow` [module](../load_flow/configuration.md#dynaflow-configuration) +and the `dynaflow-default-parameters` [module](../load_flow/configuration.md#default-parameters). + +## Default parameters +The `dynaflow-security-analysis-default-parameters` module defines the default values for all specific parameters of a security analysis run with DynaFlow. + +### Optional parameters + +**contingenciesStartTime** +`contingenciesStartTime` defines when the contingencies start, in seconds. +If the start time occurs between two [time steps](timeStepDef) the contingencies will start on the next time step. +The default value of this property is 10. + +### Examples + +**YAML configuration:** +```yaml +dynaflow-security-analysis-default-parameters: + contingenciesStartTime: 20 +``` + +**XML configuration:** +```xml + + 20 + +``` \ No newline at end of file diff --git a/docs/security_analysis/index.md b/docs/security_analysis/index.md new file mode 100644 index 000000000..9ecf9cd28 --- /dev/null +++ b/docs/security_analysis/index.md @@ -0,0 +1,12 @@ +# Security analysis + +```{toctree} +:hidden: +configuration.md +``` + +PowSyBl provides an implementation of the [SecurityAnalysis API from powsybl-core](inv:powsyblcore:*:*#simulation/security/index) with [DynaFlow](https://dynawo.github.io/about/dynaflow). + +## Installation + +Read this [documentation page](https://dynawo.github.io/about/dynaflow) to learn how to install and configure DynaFlow. diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowParameters.java b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowParameters.java index 78314fe1f..8590bd7ff 100644 --- a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowParameters.java +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowParameters.java @@ -6,8 +6,6 @@ */ package com.powsybl.dynaflow; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.MoreObjects; import com.powsybl.commons.config.ModuleConfig; import com.powsybl.commons.config.PlatformConfig; @@ -24,59 +22,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.util.*; import java.util.function.BiConsumer; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.powsybl.dynaflow.DynaFlowProvider.MODULE_SPECIFIC_PARAMETERS; - /** * @author Guillaume Pernin {@literal } */ public class DynaFlowParameters extends AbstractExtension { - private static final Logger LOGGER = LoggerFactory.getLogger(DynaFlowParameters.class); - - /** - * Inner class dedicated to Security Analysis (SA) namespace - */ - public static class Sa { - private static final String SECURITY_ANALYSIS = "sa"; //Security analysis - private static final double DEFAULT_TIME_OF_EVENT = 10d; - protected static final String TIME_OF_EVENT = "timeOfEvent"; - - private Double timeOfEvent = DEFAULT_TIME_OF_EVENT; - - public Double getTimeOfEvent() { - return timeOfEvent; - } - - public void setTimeOfEvent(Double timeOfEvent) { - this.timeOfEvent = timeOfEvent; - } - - @Override - public String toString() { - return MoreObjects.toStringHelper("").omitNullValues() - .add(TIME_OF_EVENT, timeOfEvent).toString(); - } - - public static void writeJson(JsonGenerator jsonGenerator, DynaFlowParameters dynaFlowParameters) throws IOException { - if (dynaFlowParameters.getSa().isSerializable()) { - jsonGenerator.writeObjectFieldStart("sa"); - jsonGenerator.writeNumberField("TimeOfEvent", dynaFlowParameters.getTimeOfEvent()); - jsonGenerator.writeEndObject(); - } - } - - @JsonIgnore - public boolean isSerializable() { - return timeOfEvent != null; - } - } + public static final String MODULE_SPECIFIC_PARAMETERS = "dynaflow-default-parameters"; + private static final Logger LOGGER = LoggerFactory.getLogger(DynaFlowParameters.class); private static final String CHOSEN_OUTPUT_STRING_DELIMITER = ","; private static final String SVC_REGULATION_ON = "svcRegulationOn"; private static final String SHUNT_REGULATION_ON = "shuntRegulationOn"; @@ -122,7 +80,6 @@ private static > List getEnumPossibleValues(Class e new Parameter(START_TIME, ParameterType.DOUBLE, "Start time", DEFAULT_START_TIME), new Parameter(STOP_TIME, ParameterType.DOUBLE, "Stop time", DEFAULT_STOP_TIME), new Parameter(PRECISION_NAME, ParameterType.DOUBLE, "Precision", DEFAULT_PRECISION), - new Parameter(Sa.TIME_OF_EVENT, ParameterType.DOUBLE, "Time of event", Sa.DEFAULT_TIME_OF_EVENT), new Parameter(CHOSEN_OUTPUTS, ParameterType.STRING_LIST, "Chosen outputs", DEFAULT_CHOSEN_OUTPUTS.stream().map(OutputTypes::name).toList(), getEnumPossibleValues(OutputTypes.class), ParameterScope.TECHNICAL), new Parameter(TIME_STEP, ParameterType.DOUBLE, "Time step", DEFAULT_TIME_STEP), new Parameter(STARTING_POINT_MODE, ParameterType.STRING, "Starting point mode", DEFAULT_STARTING_POINT_MODE.name(), getEnumPossibleValues(StartingPointMode.class)), @@ -138,7 +95,6 @@ private static > List getEnumPossibleValues(Class e private double startTime = DEFAULT_START_TIME; private double stopTime = DEFAULT_STOP_TIME; private Double precision = null; - private Sa securityAnalysis = null; private EnumSet chosenOutputs = DEFAULT_CHOSEN_OUTPUTS; private double timeStep = DEFAULT_TIME_STEP; private StartingPointMode startingPointMode = DEFAULT_STARTING_POINT_MODE; @@ -234,19 +190,6 @@ public DynaFlowParameters setPrecision(Double precision) { return this; } - @JsonIgnore - public Double getTimeOfEvent() { - return securityAnalysis == null ? null : securityAnalysis.getTimeOfEvent(); - } - - public DynaFlowParameters setTimeOfEvent(Double timeOfEvent) { - if (this.securityAnalysis == null) { - securityAnalysis = new Sa(); - } - securityAnalysis.setTimeOfEvent(timeOfEvent); - return this; - } - public Set getChosenOutputs() { return chosenOutputs; } @@ -279,15 +222,6 @@ public DynaFlowParameters setStartingPointMode(StartingPointMode startingPointMo return this; } - public Sa getSa() { - return this.securityAnalysis; - } - - public DynaFlowParameters setSa(Sa securityAnalysis) { - this.securityAnalysis = securityAnalysis; - return this; - } - public boolean isMergeLoads() { return mergeLoads; } @@ -315,7 +249,6 @@ public String toString() { .add(START_TIME, startTime) .add(STOP_TIME, stopTime) .add(PRECISION_NAME, precision) - .add(Sa.SECURITY_ANALYSIS, securityAnalysis) .add(CHOSEN_OUTPUTS, chosenOutputs) .add(TIME_STEP, timeStep) .add(STARTING_POINT_MODE, startingPointMode) @@ -326,10 +259,8 @@ public String toString() { public static DynaFlowParameters load(PlatformConfig platformConfig) { Objects.requireNonNull(platformConfig); DynaFlowParameters parameters = new DynaFlowParameters(); - platformConfig.getOptionalModuleConfig(MODULE_SPECIFIC_PARAMETERS) .ifPresent(config -> load(parameters, config)); - return parameters; } @@ -341,6 +272,12 @@ public static DynaFlowParameters load(ModuleConfig config) { return parameters; } + public static DynaFlowParameters load(Map properties) { + DynaFlowParameters parameters = new DynaFlowParameters(); + parameters.update(properties); + return parameters; + } + private static void load(DynaFlowParameters parameters, ModuleConfig config) { config.getOptionalBooleanProperty(SVC_REGULATION_ON).ifPresent(parameters::setSvcRegulationOn); config.getOptionalBooleanProperty(SHUNT_REGULATION_ON).ifPresent(parameters::setShuntRegulationOn); @@ -352,7 +289,6 @@ private static void load(DynaFlowParameters parameters, ModuleConfig config) { config.getOptionalDoubleProperty(START_TIME).ifPresent(parameters::setStartTime); config.getOptionalDoubleProperty(STOP_TIME).ifPresent(parameters::setStopTime); config.getOptionalDoubleProperty(PRECISION_NAME).ifPresent(parameters::setPrecision); - config.getOptionalDoubleProperty(Sa.TIME_OF_EVENT).ifPresent(parameters::setTimeOfEvent); config.getOptionalEnumSetProperty(CHOSEN_OUTPUTS, OutputTypes.class).ifPresent(parameters::setChosenOutputs); config.getOptionalDoubleProperty(TIME_STEP).ifPresent(parameters::setTimeStep); config.getOptionalStringProperty(STARTING_POINT_MODE).map(StartingPointMode::fromString).ifPresent(parameters::setStartingPointMode); @@ -390,12 +326,6 @@ public void update(Map properties) { Optional.ofNullable(properties.get(START_TIME)).ifPresent(prop -> setStartTime(Double.parseDouble(prop))); Optional.ofNullable(properties.get(STOP_TIME)).ifPresent(prop -> setStopTime(Double.parseDouble(prop))); Optional.ofNullable(properties.get(PRECISION_NAME)).ifPresent(prop -> setPrecision(Double.parseDouble(prop))); - Optional.ofNullable(properties.get(Sa.TIME_OF_EVENT)).ifPresent(prop -> { - if (securityAnalysis == null) { - securityAnalysis = new Sa(); - } - securityAnalysis.setTimeOfEvent(Double.parseDouble(prop)); - }); Optional.ofNullable(properties.get(CHOSEN_OUTPUTS)).ifPresent(prop -> setChosenOutputs(Stream.of(prop.split(CHOSEN_OUTPUT_STRING_DELIMITER)).map(o -> OutputTypes.valueOf(o.trim())).collect(Collectors.toSet()))); Optional.ofNullable(properties.get(TIME_STEP)).ifPresent(prop -> setTimeStep(Double.parseDouble(prop))); @@ -417,7 +347,6 @@ public Map createMapFromParameters() { addNotNullEntry(START_TIME, startTime, parameters::put); addNotNullEntry(STOP_TIME, stopTime, parameters::put); addNotNullEntry(PRECISION_NAME, precision, parameters::put); - addNotNullEntry(Sa.TIME_OF_EVENT, getTimeOfEvent(), parameters::put); if (!chosenOutputs.isEmpty()) { parameters.put(CHOSEN_OUTPUTS, String.join(CHOSEN_OUTPUT_STRING_DELIMITER, chosenOutputs.stream().map(OutputTypes::name).toList())); } @@ -432,10 +361,4 @@ private void addNotNullEntry(String key, Object value, BiConsumer properties) { - DynaFlowParameters parameters = new DynaFlowParameters(); - parameters.update(properties); - return parameters; - } } diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowProvider.java b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowProvider.java index 7a338a552..5bfffebe1 100644 --- a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowProvider.java +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowProvider.java @@ -39,8 +39,6 @@ @AutoService(LoadFlowProvider.class) public class DynaFlowProvider implements LoadFlowProvider { - public static final String MODULE_SPECIFIC_PARAMETERS = "dynaflow-default-parameters"; - private static final String WORKING_DIR_PREFIX = "dynaflow_"; private final Supplier configSupplier; @@ -74,10 +72,10 @@ public static Command getVersionCommand(DynaFlowConfig config) { .build(); } - private static DynaFlowParameters getParametersExt(LoadFlowParameters parameters) { + static DynaFlowParameters getParametersExt(LoadFlowParameters parameters) { DynaFlowParameters parametersExt = parameters.getExtension(DynaFlowParameters.class); if (parametersExt == null) { - parametersExt = new DynaFlowParameters(); + return new DynaFlowParameters(); } return parametersExt; } @@ -140,7 +138,7 @@ public List getSpecificParameters() { @Override public Optional getModuleConfig(PlatformConfig platformConfig) { - return platformConfig.getOptionalModuleConfig(MODULE_SPECIFIC_PARAMETERS); + return platformConfig.getOptionalModuleConfig(DynaFlowParameters.MODULE_SPECIFIC_PARAMETERS); } @Override diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisHandler.java b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisHandler.java index 58cbd4f42..1e8475f57 100644 --- a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisHandler.java +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisHandler.java @@ -106,15 +106,9 @@ private static void writeContingencies(List contingencies, Path wor private static void writeParameters(SecurityAnalysisParameters securityAnalysisParameters, Path workingDir) throws IOException { // TODO(Luma) Take into account also Security Analysis parameters LoadFlowParameters loadFlowParameters = securityAnalysisParameters.getLoadFlowParameters(); - DynaFlowParameters dynaFlowParameters = getParametersExt(loadFlowParameters); - DynaFlowConfigSerializer.serialize(loadFlowParameters, dynaFlowParameters, Path.of("."), workingDir.resolve(CONFIG_FILENAME)); - } - - private static DynaFlowParameters getParametersExt(LoadFlowParameters parameters) { - DynaFlowParameters parametersExt = parameters.getExtension(DynaFlowParameters.class); - if (parametersExt == null) { - parametersExt = new DynaFlowParameters(); - } - return parametersExt; + DynaFlowParameters dynaFlowParameters = DynaFlowProvider.getParametersExt(loadFlowParameters); + DynaFlowSecurityAnalysisParameters dynaFlowSecurityAnalysisParameters = DynaFlowSecurityAnalysisProvider.getParametersExt(securityAnalysisParameters); + DynaFlowConfigSerializer.serialize(loadFlowParameters, dynaFlowParameters, dynaFlowSecurityAnalysisParameters, + Path.of("."), workingDir.resolve(CONFIG_FILENAME)); } } diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisParameters.java b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisParameters.java new file mode 100644 index 000000000..7335f6764 --- /dev/null +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisParameters.java @@ -0,0 +1,84 @@ +/** + * Copyright (c) 2024, RTE (http://www.rte-france.com/) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + */ +package com.powsybl.dynaflow; + +import com.google.common.base.MoreObjects; +import com.powsybl.commons.config.ModuleConfig; +import com.powsybl.commons.config.PlatformConfig; +import com.powsybl.commons.extensions.AbstractExtension; +import com.powsybl.security.SecurityAnalysisParameters; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +/** + * @author Laurent Issertial {@literal } + */ +public class DynaFlowSecurityAnalysisParameters extends AbstractExtension { + + public static final String MODULE_SPECIFIC_PARAMETERS = "dynaflow-security-analysis-default-parameters"; + + private static final double DEFAULT_CONTINGENCIES_START_TIME = 10d; + private static final String CONTINGENCIES_START_TIME = "contingenciesStartTime"; + public static final List SPECIFIC_PARAMETER_NAMES = List.of(CONTINGENCIES_START_TIME); + + private Double contingenciesStartTime = DEFAULT_CONTINGENCIES_START_TIME; + + public Double getContingenciesStartTime() { + return contingenciesStartTime; + } + + public DynaFlowSecurityAnalysisParameters setContingenciesStartTime(Double contingenciesStartTime) { + this.contingenciesStartTime = contingenciesStartTime; + return this; + } + + @Override + public String getName() { + return "DynaFlowSecurityAnalysisParameters"; + } + + @Override + public String toString() { + return MoreObjects.toStringHelper("").omitNullValues() + .add(CONTINGENCIES_START_TIME, contingenciesStartTime).toString(); + } + + public static DynaFlowSecurityAnalysisParameters load(PlatformConfig platformConfig) { + Objects.requireNonNull(platformConfig); + DynaFlowSecurityAnalysisParameters parameters = new DynaFlowSecurityAnalysisParameters(); + platformConfig.getOptionalModuleConfig(MODULE_SPECIFIC_PARAMETERS) + .ifPresent(config -> load(parameters, config)); + return parameters; + } + + public static DynaFlowSecurityAnalysisParameters load(ModuleConfig config) { + DynaFlowSecurityAnalysisParameters parameters = new DynaFlowSecurityAnalysisParameters(); + if (config != null) { + load(parameters, config); + } + return parameters; + } + + public static DynaFlowSecurityAnalysisParameters load(Map properties) { + DynaFlowSecurityAnalysisParameters parameters = new DynaFlowSecurityAnalysisParameters(); + parameters.update(properties); + return parameters; + } + + private static void load(DynaFlowSecurityAnalysisParameters parameters, ModuleConfig config) { + config.getOptionalDoubleProperty(CONTINGENCIES_START_TIME).ifPresent(parameters::setContingenciesStartTime); + } + + public void update(Map properties) { + Objects.requireNonNull(properties); + Optional.ofNullable(properties.get(CONTINGENCIES_START_TIME)).ifPresent(prop -> setContingenciesStartTime(Double.parseDouble(prop))); + } +} diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisProvider.java b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisProvider.java index bf1eac251..25e841882 100644 --- a/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisProvider.java +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisProvider.java @@ -7,24 +7,27 @@ package com.powsybl.dynaflow; import com.google.auto.service.AutoService; +import com.powsybl.commons.config.PlatformConfig; +import com.powsybl.commons.extensions.Extension; +import com.powsybl.commons.extensions.ExtensionJsonSerializer; import com.powsybl.commons.report.ReportNode; import com.powsybl.computation.Command; import com.powsybl.computation.ExecutionEnvironment; import com.powsybl.computation.SimpleCommandBuilder; import com.powsybl.contingency.ContingenciesProvider; import com.powsybl.contingency.Contingency; +import com.powsybl.dynaflow.json.JsonDynaFlowSaParametersSerializer; import com.powsybl.dynawo.commons.DynawoUtil; import com.powsybl.dynawo.commons.PowsyblDynawoVersion; import com.powsybl.iidm.network.Network; +import com.powsybl.security.SecurityAnalysisParameters; import com.powsybl.security.SecurityAnalysisProvider; import com.powsybl.security.SecurityAnalysisReport; import com.powsybl.security.SecurityAnalysisRunParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; @@ -51,6 +54,17 @@ public DynaFlowSecurityAnalysisProvider(Supplier configSupplier) this.configSupplier = Objects.requireNonNull(configSupplier); } + public static Command getCommand(DynaFlowConfig config) { + List args = Arrays.asList("--network", NETWORK_FILENAME, + "--config", CONFIG_FILENAME, + "--contingencies", CONTINGENCIES_FILENAME); + return new SimpleCommandBuilder() + .id("dynaflow_sa") + .program(config.getProgram()) + .args(args) + .build(); + } + @Override public CompletableFuture run(Network network, String workingVariantId, @@ -84,19 +98,47 @@ public String getName() { return DYNAFLOW_NAME; } + @Override + public Optional getLoadFlowProviderName() { + return Optional.of(DYNAFLOW_NAME); + } + @Override public String getVersion() { return new PowsyblDynawoVersion().getMavenProjectVersion(); } - public static Command getCommand(DynaFlowConfig config) { - List args = Arrays.asList("--network", NETWORK_FILENAME, - "--config", CONFIG_FILENAME, - "--contingencies", CONTINGENCIES_FILENAME); - return new SimpleCommandBuilder() - .id("dynaflow_sa") - .program(config.getProgram()) - .args(args) - .build(); + @Override + public Optional> loadSpecificParameters(PlatformConfig platformConfig) { + // if not specified, dynaflow sa parameters must be default here + return Optional.of(DynaFlowSecurityAnalysisParameters.load(platformConfig)); + } + + @Override + public Optional> loadSpecificParameters(Map properties) { + return Optional.of(DynaFlowSecurityAnalysisParameters.load(properties)); + } + + @Override + public void updateSpecificParameters(Extension extension, Map properties) { + getParametersExt(extension.getExtendable()).update(properties); + } + + @Override + public List getSpecificParametersNames() { + return DynaFlowSecurityAnalysisParameters.SPECIFIC_PARAMETER_NAMES; + } + + @Override + public Optional getSpecificParametersSerializer() { + return Optional.of(new JsonDynaFlowSaParametersSerializer()); + } + + static DynaFlowSecurityAnalysisParameters getParametersExt(SecurityAnalysisParameters parameters) { + DynaFlowSecurityAnalysisParameters parametersExt = parameters.getExtension(DynaFlowSecurityAnalysisParameters.class); + if (parametersExt == null) { + return new DynaFlowSecurityAnalysisParameters(); + } + return parametersExt; } } diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/json/DynaFlowConfigSerializer.java b/dynaflow/src/main/java/com/powsybl/dynaflow/json/DynaFlowConfigSerializer.java index 3931f9191..d6c71ab26 100644 --- a/dynaflow/src/main/java/com/powsybl/dynaflow/json/DynaFlowConfigSerializer.java +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/json/DynaFlowConfigSerializer.java @@ -10,6 +10,7 @@ import com.powsybl.commons.json.JsonUtil; import com.powsybl.dynaflow.DynaFlowConstants; import com.powsybl.dynaflow.DynaFlowParameters; +import com.powsybl.dynaflow.DynaFlowSecurityAnalysisParameters; import com.powsybl.loadflow.LoadFlowParameters; import java.io.BufferedWriter; @@ -30,50 +31,32 @@ public final class DynaFlowConfigSerializer { private DynaFlowConfigSerializer() { } + public static void serialize(LoadFlowParameters lfParameters, DynaFlowParameters dynaFlowParameters, + DynaFlowSecurityAnalysisParameters saParameters, Path workingDir, Path file) throws IOException { + try (BufferedWriter writer = Files.newBufferedWriter(file, StandardCharsets.UTF_8)) { + JsonUtil.writeJson(writer, jsonGenerator -> serialize(lfParameters, dynaFlowParameters, saParameters, workingDir, jsonGenerator)); + } + } + public static void serialize(LoadFlowParameters lfParameters, DynaFlowParameters dynaFlowParameters, Path workingDir, Path file) throws IOException { try (BufferedWriter writer = Files.newBufferedWriter(file, StandardCharsets.UTF_8)) { - JsonUtil.writeJson(writer, jsonGenerator -> serialize(lfParameters, dynaFlowParameters, workingDir, jsonGenerator)); + JsonUtil.writeJson(writer, jsonGenerator -> serialize(lfParameters, dynaFlowParameters, null, workingDir, jsonGenerator)); } } public static void serialize(LoadFlowParameters lfParameters, DynaFlowParameters dynaFlowParameters, Path workingDir, Writer writer) { - JsonUtil.writeJson(writer, jsonGenerator -> serialize(lfParameters, dynaFlowParameters, workingDir, jsonGenerator)); + JsonUtil.writeJson(writer, jsonGenerator -> serialize(lfParameters, dynaFlowParameters, null, workingDir, jsonGenerator)); } - private static void serialize(LoadFlowParameters lfParameters, DynaFlowParameters dynaFlowParameters, Path workingDir, JsonGenerator jsonGenerator) { + private static void serialize(LoadFlowParameters lfParameters, DynaFlowParameters dynaFlowParameters, + DynaFlowSecurityAnalysisParameters saParameters, Path workingDir, JsonGenerator jsonGenerator) { try { jsonGenerator.writeStartObject(); jsonGenerator.writeObjectFieldStart("dfl-config"); - writeNonNullField(jsonGenerator, "SVCRegulationOn", dynaFlowParameters.getSvcRegulationOn()); - writeNonNullField(jsonGenerator, "ShuntRegulationOn", dynaFlowParameters.getShuntRegulationOn()); - writeNonNullField(jsonGenerator, "AutomaticSlackBusOn", dynaFlowParameters.getAutomaticSlackBusOn()); - writeNonNullField(jsonGenerator, "DsoVoltageLevel", dynaFlowParameters.getDsoVoltageLevel()); - jsonGenerator.writeBooleanField("InfiniteReactiveLimits", !lfParameters.isUseReactiveLimits()); - - if (dynaFlowParameters.getActivePowerCompensation() != null) { - jsonGenerator.writeStringField("ActivePowerCompensation", dynaFlowParameters.getActivePowerCompensation().getDynaflowName()); - } - writeNonNullField(jsonGenerator, "SettingPath", dynaFlowParameters.getSettingPath()); - writeNonNullField(jsonGenerator, "AssemblingPath", dynaFlowParameters.getAssemblingPath()); - writeNonNullField(jsonGenerator, "StartTime", dynaFlowParameters.getStartTime()); - writeNonNullField(jsonGenerator, "StopTime", dynaFlowParameters.getStopTime()); - writeNonNullField(jsonGenerator, "Precision", dynaFlowParameters.getPrecision()); - - if (dynaFlowParameters.getSa() != null) { - DynaFlowParameters.Sa.writeJson(jsonGenerator, dynaFlowParameters); - } - if (dynaFlowParameters.getChosenOutputs() != null) { - jsonGenerator.writeFieldName("ChosenOutputs"); - jsonGenerator.writeStartArray(); - for (DynaFlowConstants.OutputTypes outputType : dynaFlowParameters.getChosenOutputs()) { - jsonGenerator.writeString(outputType.name()); - } - jsonGenerator.writeEndArray(); - } - - writeNonNullField(jsonGenerator, "TimeStep", dynaFlowParameters.getTimeStep()); - if (dynaFlowParameters.getStartingPointMode() != null) { - jsonGenerator.writeStringField("StartingPointMode", dynaFlowParameters.getStartingPointMode().getName()); + serialize(lfParameters, jsonGenerator); + serialize(dynaFlowParameters, jsonGenerator); + if (saParameters != null) { + serialize(saParameters, jsonGenerator); } jsonGenerator.writeStringField("OutputDir", workingDir.toString()); jsonGenerator.writeEndObject(); @@ -83,6 +66,46 @@ private static void serialize(LoadFlowParameters lfParameters, DynaFlowParameter } } + private static void serialize(DynaFlowParameters dynaFlowParameters, JsonGenerator jsonGenerator) throws IOException { + writeNonNullField(jsonGenerator, "SVCRegulationOn", dynaFlowParameters.getSvcRegulationOn()); + writeNonNullField(jsonGenerator, "ShuntRegulationOn", dynaFlowParameters.getShuntRegulationOn()); + writeNonNullField(jsonGenerator, "AutomaticSlackBusOn", dynaFlowParameters.getAutomaticSlackBusOn()); + writeNonNullField(jsonGenerator, "DsoVoltageLevel", dynaFlowParameters.getDsoVoltageLevel()); + + if (dynaFlowParameters.getActivePowerCompensation() != null) { + jsonGenerator.writeStringField("ActivePowerCompensation", dynaFlowParameters.getActivePowerCompensation().getDynaflowName()); + } + writeNonNullField(jsonGenerator, "SettingPath", dynaFlowParameters.getSettingPath()); + writeNonNullField(jsonGenerator, "AssemblingPath", dynaFlowParameters.getAssemblingPath()); + writeNonNullField(jsonGenerator, "StartTime", dynaFlowParameters.getStartTime()); + writeNonNullField(jsonGenerator, "StopTime", dynaFlowParameters.getStopTime()); + writeNonNullField(jsonGenerator, "Precision", dynaFlowParameters.getPrecision()); + + if (dynaFlowParameters.getChosenOutputs() != null) { + jsonGenerator.writeFieldName("ChosenOutputs"); + jsonGenerator.writeStartArray(); + for (DynaFlowConstants.OutputTypes outputType : dynaFlowParameters.getChosenOutputs()) { + jsonGenerator.writeString(outputType.name()); + } + jsonGenerator.writeEndArray(); + } + + writeNonNullField(jsonGenerator, "TimeStep", dynaFlowParameters.getTimeStep()); + if (dynaFlowParameters.getStartingPointMode() != null) { + jsonGenerator.writeStringField("StartingPointMode", dynaFlowParameters.getStartingPointMode().getName()); + } + } + + private static void serialize(LoadFlowParameters lfParameters, JsonGenerator jsonGenerator) throws IOException { + jsonGenerator.writeBooleanField("InfiniteReactiveLimits", !lfParameters.isUseReactiveLimits()); + } + + private static void serialize(DynaFlowSecurityAnalysisParameters saParameters, JsonGenerator jsonGenerator) throws IOException { + jsonGenerator.writeObjectFieldStart("sa"); + jsonGenerator.writeNumberField("TimeOfEvent", saParameters.getContingenciesStartTime()); + jsonGenerator.writeEndObject(); + } + private static void writeNonNullField(JsonGenerator jsonGenerator, String fieldName, Boolean value) throws IOException { if (value != null) { jsonGenerator.writeBooleanField(fieldName, value); diff --git a/dynaflow/src/main/java/com/powsybl/dynaflow/json/JsonDynaFlowSaParametersSerializer.java b/dynaflow/src/main/java/com/powsybl/dynaflow/json/JsonDynaFlowSaParametersSerializer.java new file mode 100644 index 000000000..ba7c562e6 --- /dev/null +++ b/dynaflow/src/main/java/com/powsybl/dynaflow/json/JsonDynaFlowSaParametersSerializer.java @@ -0,0 +1,85 @@ +/** + * Copyright (c) 2024, RTE (http://www.rte-france.com/) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + */ +package com.powsybl.dynaflow.json; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.google.auto.service.AutoService; +import com.powsybl.commons.extensions.ExtensionJsonSerializer; +import com.powsybl.commons.json.JsonUtil; +import com.powsybl.dynaflow.DynaFlowSecurityAnalysisParameters; +import com.powsybl.security.SecurityAnalysisParameters; + +import java.io.IOException; + +/** + * Represents {@link DynaFlowSecurityAnalysisParameters} as a Json extension of {@link SecurityAnalysisParameters} + * @author Laurent Issertial {@literal } + */ +@AutoService(ExtensionJsonSerializer.class) +public class JsonDynaFlowSaParametersSerializer implements + ExtensionJsonSerializer { + + @Override + public String getCategoryName() { + return "security-analysis-parameters"; + } + + @Override + public Class getExtensionClass() { + return DynaFlowSecurityAnalysisParameters.class; + } + + @Override + public String getExtensionName() { + return "DynaFlowSecurityAnalysisParameters"; + } + + /** + * Specifies serialization for our extension: ignore name et extendable + */ + private interface SerializationSpec { + + @JsonIgnore + String getName(); + + @JsonIgnore + SecurityAnalysisParameters getExtendable(); + } + + private static ObjectMapper createMapper() { + return JsonUtil.createObjectMapper() + .addMixIn(DynaFlowSecurityAnalysisParameters.class, SerializationSpec.class) + .setSerializationInclusion(JsonInclude.Include.NON_ABSENT); + } + + @Override + public void serialize(DynaFlowSecurityAnalysisParameters jsonDynaFlowParameters, JsonGenerator jsonGenerator, + SerializerProvider provider) throws IOException { + createMapper().writeValue(jsonGenerator, jsonDynaFlowParameters); + } + + @Override + public DynaFlowSecurityAnalysisParameters deserialize(JsonParser parser, DeserializationContext context) throws IOException { + return createMapper().readValue(parser, DynaFlowSecurityAnalysisParameters.class); + } + + @Override + public DynaFlowSecurityAnalysisParameters deserializeAndUpdate(JsonParser parser, DeserializationContext context, + DynaFlowSecurityAnalysisParameters toUpdateParameters) throws IOException { + ObjectMapper objectMapper = createMapper(); + ObjectReader objectReader = objectMapper.readerForUpdating(toUpdateParameters); + return objectReader.readValue(parser, DynaFlowSecurityAnalysisParameters.class); + } +} diff --git a/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowParametersTest.java b/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowParametersTest.java index d5d299fc6..6cfc9922c 100644 --- a/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowParametersTest.java +++ b/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowParametersTest.java @@ -28,7 +28,7 @@ import java.util.*; import static com.powsybl.commons.test.ComparisonUtils.assertTxtEquals; -import static com.powsybl.dynaflow.DynaFlowProvider.MODULE_SPECIFIC_PARAMETERS; +import static com.powsybl.dynaflow.DynaFlowParameters.MODULE_SPECIFIC_PARAMETERS; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; @@ -65,7 +65,6 @@ void checkParameters() { double startTime = 0.; double stopTime = 100.; double precision = 15.45; - double timeOfEvent = 14.; List chosenOutputs = List.of(OutputTypes.STEADYSTATE.name(), OutputTypes.TIMELINE.name()); double timeStep = 0; StartingPointMode startingPointMode = StartingPointMode.FLAT; @@ -82,13 +81,12 @@ void checkParameters() { moduleConfig.setStringProperty("startTime", Double.toString(startTime)); moduleConfig.setStringProperty("stopTime", Double.toString(stopTime)); moduleConfig.setStringProperty("precision", Double.toString(precision)); - moduleConfig.setStringProperty("timeOfEvent", Double.toString(timeOfEvent)); moduleConfig.setStringListProperty("chosenOutputs", chosenOutputs); moduleConfig.setStringProperty("timeStep", Double.toString(timeStep)); moduleConfig.setStringProperty("startingPointMode", startingPointMode.getName()); moduleConfig.setStringProperty("mergeLoads", Boolean.toString(mergeLoads)); - DynaFlowParameters parameters = DynaFlowParameters.load(platformConfig); + DynaFlowParameters parameters = DynaFlowParameters.load(moduleConfig); assertEquals(svcRegulationOn, parameters.getSvcRegulationOn()); assertEquals(shuntRegulationOn, parameters.getShuntRegulationOn()); @@ -100,7 +98,6 @@ void checkParameters() { assertEquals(startTime, parameters.getStartTime(), 0.1d); assertEquals(stopTime, parameters.getStopTime(), 0.1d); assertEquals(precision, parameters.getPrecision(), 0.1d); - assertEquals(timeOfEvent, parameters.getTimeOfEvent(), 0.1d); assertThat(parameters.getChosenOutputs()).map(OutputTypes::name).containsExactlyInAnyOrderElementsOf(chosenOutputs); assertEquals(timeStep, parameters.getTimeStep(), 0.1d); assertEquals(startingPointMode, parameters.getStartingPointMode()); @@ -126,7 +123,6 @@ void checkDefaultParameters() { assertEquals(0d, parametersExt.getStartTime()); assertEquals(100d, parametersExt.getStopTime()); assertNull(parametersExt.getPrecision()); - assertNull(parametersExt.getSa()); assertThat(parametersExt.getChosenOutputs()).containsExactly(OutputTypes.TIMELINE); assertEquals(10d, parametersExt.getTimeStep()); assertEquals(StartingPointMode.WARM, parametersExt.getStartingPointMode()); @@ -157,7 +153,6 @@ void checkAllParametersAssignedToString() { double startTime = 0.; double stopTime = 100.; double precision = 15.45; - double timeOfEvent = 10.; List chosenOutputs = Arrays.asList(OutputTypes.STEADYSTATE.name(), OutputTypes.TIMELINE.name()); double timeStep = 0; StartingPointMode startingPointMode = StartingPointMode.WARM; @@ -174,7 +169,6 @@ void checkAllParametersAssignedToString() { properties.put("startTime", Double.toString(startTime)); properties.put("stopTime", Double.toString(stopTime)); properties.put("precision", Double.toString(precision)); - properties.put("timeOfEvent", Double.toString(timeOfEvent)); properties.put("chosenOutputs", OutputTypes.STEADYSTATE.name() + "," + OutputTypes.TIMELINE.name()); properties.put("timeStep", Double.toString(timeStep)); properties.put("startingPointMode", startingPointMode.name()); @@ -192,8 +186,6 @@ void checkAllParametersAssignedToString() { ", startTime=" + startTime + ", stopTime=" + stopTime + ", precision=" + precision + - ", sa=" + - "{timeOfEvent=" + timeOfEvent + "}" + ", chosenOutputs=" + chosenOutputs + ", timeStep=" + timeStep + ", startingPointMode=" + startingPointMode + @@ -239,7 +231,6 @@ void parametersSerialization() throws IOException { .setStartTime(0.) .setStopTime(100.) .setPrecision(0.) - .setTimeOfEvent(10.) .setChosenOutputs(Set.of(OutputTypes.STEADYSTATE)) .setTimeStep(2.6) .setStartingPointMode(StartingPointMode.WARM) @@ -270,7 +261,6 @@ void loadMapDynaflowParameters() { double startTime = 0.; double stopTime = 100.; double precision = 15.45; - double timeOfEvent = 10.; Set chosenOutputs = Set.of(OutputTypes.STEADYSTATE, OutputTypes.TIMELINE); double timeStep = 0; StartingPointMode startingPointMode = StartingPointMode.WARM; @@ -287,7 +277,6 @@ void loadMapDynaflowParameters() { properties.put("startTime", Double.toString(startTime)); properties.put("stopTime", Double.toString(stopTime)); properties.put("precision", Double.toString(precision)); - properties.put("timeOfEvent", Double.toString(timeOfEvent)); properties.put("chosenOutputs", "STEADYSTATE, TIMELINE"); properties.put("timeStep", Double.toString(timeStep)); properties.put("startingPointMode", startingPointMode.getName()); @@ -305,7 +294,6 @@ void loadMapDynaflowParameters() { assertEquals(startTime, dynaFlowParameters.getStartTime(), 0.1d); assertEquals(stopTime, dynaFlowParameters.getStopTime(), 0.1d); assertEquals(precision, dynaFlowParameters.getPrecision(), 0.1d); - assertEquals(timeOfEvent, dynaFlowParameters.getTimeOfEvent(), 0.1d); assertThat(dynaFlowParameters.getChosenOutputs()).containsExactlyInAnyOrderElementsOf(chosenOutputs); assertEquals(timeStep, dynaFlowParameters.getTimeStep(), 0.1d); assertEquals(startingPointMode, dynaFlowParameters.getStartingPointMode()); diff --git a/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisParametersTest.java b/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisParametersTest.java new file mode 100644 index 000000000..7945f7b7c --- /dev/null +++ b/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisParametersTest.java @@ -0,0 +1,103 @@ +/** + * Copyright (c) 2024, RTE (http://www.rte-france.com/) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + */ +package com.powsybl.dynaflow; + +import com.google.common.jimfs.Configuration; +import com.google.common.jimfs.Jimfs; +import com.powsybl.commons.config.InMemoryPlatformConfig; +import com.powsybl.commons.config.MapModuleConfig; +import com.powsybl.commons.test.AbstractSerDeTest; +import com.powsybl.dynaflow.json.DynaFlowConfigSerializer; +import com.powsybl.loadflow.LoadFlowParameters; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map; + +import static com.powsybl.commons.test.ComparisonUtils.assertTxtEquals; +import static com.powsybl.dynaflow.DynaFlowSecurityAnalysisParameters.MODULE_SPECIFIC_PARAMETERS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +/** + * @author Laurent Issertial {@literal } + */ +class DynaFlowSecurityAnalysisParametersTest extends AbstractSerDeTest { + + private InMemoryPlatformConfig platformConfig; + + @BeforeEach + @Override + public void setUp() { + fileSystem = Jimfs.newFileSystem(Configuration.unix()); + platformConfig = new InMemoryPlatformConfig(fileSystem); + } + + @AfterEach + @Override + public void tearDown() throws IOException { + fileSystem.close(); + } + + @Test + void checkParameters() { + double contingenciesStartTime = 24.; + MapModuleConfig moduleConfig = platformConfig.createModuleConfig(MODULE_SPECIFIC_PARAMETERS); + moduleConfig.setStringProperty("contingenciesStartTime", Double.toString(contingenciesStartTime)); + DynaFlowSecurityAnalysisParameters saParam = DynaFlowSecurityAnalysisParameters.load(moduleConfig); + assertEquals(contingenciesStartTime, saParam.getContingenciesStartTime()); + } + + @Test + void checkAllParametersAssignedToString() { + DynaFlowSecurityAnalysisParameters saParam = new DynaFlowSecurityAnalysisParameters(); + saParam.update(Map.of("contingenciesStartTime", Double.toString(23d))); + assertEquals("{contingenciesStartTime=23.0}", saParam.toString()); + } + + @Test + void defaultParametersSerialization() throws IOException { + Path workingDir = fileSystem.getPath("dynaflow_sa/workingDir"); + Path parameterFile = fileSystem.getPath(DynaFlowConstants.CONFIG_FILENAME); + DynaFlowConfigSerializer.serialize(LoadFlowParameters.load(platformConfig), + new DynaFlowParameters(), + new DynaFlowSecurityAnalysisParameters(), + workingDir, + parameterFile); + + try (InputStream actual = Files.newInputStream(parameterFile); + InputStream expected = getClass().getResourceAsStream("/params_default_sa.json")) { + assertNotNull(expected); + assertTxtEquals(expected, actual); + } + } + + @Test + void parametersSerialization() throws IOException { + DynaFlowSecurityAnalysisParameters saParam = new DynaFlowSecurityAnalysisParameters() + .setContingenciesStartTime(20d); + Path workingDir = fileSystem.getPath("dynaflow_sa/workingDir"); + Path parameterFile = fileSystem.getPath(DynaFlowConstants.CONFIG_FILENAME); + DynaFlowConfigSerializer.serialize(LoadFlowParameters.load(platformConfig), + new DynaFlowParameters(), + saParam, + workingDir, + parameterFile); + + try (InputStream actual = Files.newInputStream(parameterFile); + InputStream expected = getClass().getResourceAsStream("/params_sa.json")) { + assertNotNull(expected); + assertTxtEquals(expected, actual); + } + } +} diff --git a/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisTest.java b/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisTest.java index c0dd67d2e..c31c4409e 100644 --- a/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisTest.java +++ b/dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowSecurityAnalysisTest.java @@ -15,7 +15,10 @@ import com.powsybl.iidm.network.*; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import com.powsybl.loadflow.LoadFlowResult; -import com.powsybl.security.*; +import com.powsybl.security.SecurityAnalysis; +import com.powsybl.security.SecurityAnalysisReport; +import com.powsybl.security.SecurityAnalysisResult; +import com.powsybl.security.SecurityAnalysisRunParameters; import com.powsybl.security.json.SecurityAnalysisResultSerializer; import org.junit.jupiter.api.Test; @@ -33,10 +36,12 @@ import static com.powsybl.commons.test.ComparisonUtils.assertTxtEquals; import static com.powsybl.commons.test.ComparisonUtils.assertXmlEquals; -import static com.powsybl.dynaflow.DynaFlowConstants.*; -import static com.powsybl.dynaflow.SecurityAnalysisConstants.CONTINGENCIES_FILENAME; +import static com.powsybl.dynaflow.DynaFlowConstants.CONFIG_FILENAME; +import static com.powsybl.dynaflow.DynaFlowConstants.DYNAFLOW_NAME; import static com.powsybl.dynaflow.SecurityAnalysisConstants.CONSTRAINTS_FOLDER; +import static com.powsybl.dynaflow.SecurityAnalysisConstants.CONTINGENCIES_FILENAME; import static com.powsybl.dynawo.commons.DynawoConstants.NETWORK_FILENAME; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -139,6 +144,18 @@ void testCallingBadVersionDynawo() throws IOException { assertThrows(PowsyblException.class, () -> SecurityAnalysis.run(network, contingencies, runParameters)); } + @Test + void loadDynaflowParameters() { + DynaFlowSecurityAnalysisProvider provider = new DynaFlowSecurityAnalysisProvider(); + Map properties = Map.of("contingenciesStartTime", Double.toString(23d)); + assertThat(provider.loadSpecificParameters(properties)) + .isNotEmpty() + .get() + .isInstanceOf(DynaFlowSecurityAnalysisParameters.class) + .hasFieldOrPropertyWithValue("contingenciesStartTime", 23.); + + } + private static Network buildNetwork() { Network network = EurostagTutorialExample1Factory.create(); network.setCaseDate(ZonedDateTime.parse("2023-03-23T16:40:48.060+01:00")); diff --git a/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowParametersSerializerTest.java b/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowParametersSerializerTest.java index 44e474bd7..f19612f59 100644 --- a/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowParametersSerializerTest.java +++ b/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowParametersSerializerTest.java @@ -35,7 +35,6 @@ void testDeserialize() { double expectedStartTime = 0.; double expectedStopTime = 100.; double expectedPrecision = 0.; - double expectedTimeOfEvent = 10.; Set expectedChosenOutputs = Set.of(DynaFlowConstants.OutputTypes.STEADYSTATE, DynaFlowConstants.OutputTypes.TIMELINE); double expectedTimeStep = 2.6; @@ -54,7 +53,6 @@ void testDeserialize() { assertEquals(expectedStartTime, dynaFlowParameters.getStartTime(), 0.1d); assertEquals(expectedStopTime, dynaFlowParameters.getStopTime(), 0.1d); assertEquals(expectedPrecision, dynaFlowParameters.getPrecision(), 0.1d); - assertEquals(expectedTimeOfEvent, dynaFlowParameters.getTimeOfEvent(), 0.1d); assertThat(dynaFlowParameters.getChosenOutputs()).containsExactlyInAnyOrderElementsOf(expectedChosenOutputs); assertEquals(expectedTimeStep, dynaFlowParameters.getTimeStep(), 0.1d); assertEquals(DynaFlowConstants.StartingPointMode.WARM, dynaFlowParameters.getStartingPointMode()); @@ -83,7 +81,6 @@ void roundTripParameters() throws IOException { .setStartTime(0.) .setStopTime(100.) .setPrecision(0.) - .setTimeOfEvent(10.) .setChosenOutputs(Set.of(DynaFlowConstants.OutputTypes.STEADYSTATE)) .setTimeStep(2.6) .setStartingPointMode(DynaFlowConstants.StartingPointMode.WARM) diff --git a/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowSaParametersSerializerTest.java b/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowSaParametersSerializerTest.java new file mode 100644 index 000000000..704f366ff --- /dev/null +++ b/dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowSaParametersSerializerTest.java @@ -0,0 +1,55 @@ +/** + * Copyright (c) 2024, RTE (http://www.rte-france.com/) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + */ +package com.powsybl.dynaflow.json; + +import com.powsybl.commons.config.InMemoryPlatformConfig; +import com.powsybl.commons.test.AbstractSerDeTest; +import com.powsybl.dynaflow.DynaFlowSecurityAnalysisParameters; +import com.powsybl.security.SecurityAnalysisParameters; +import com.powsybl.security.json.JsonSecurityAnalysisParameters; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +/** + * @author Laurent Issertial {@literal } + */ +class JsonDynaFlowSaParametersSerializerTest extends AbstractSerDeTest { + + @Test + void roundTripParameters() throws IOException { + InMemoryPlatformConfig platformConfig = new InMemoryPlatformConfig(fileSystem); + SecurityAnalysisParameters parameters = SecurityAnalysisParameters.load(platformConfig); + DynaFlowSecurityAnalysisParameters params = new DynaFlowSecurityAnalysisParameters() + .setContingenciesStartTime(23.); + parameters.addExtension(DynaFlowSecurityAnalysisParameters.class, params); + + roundTripTest(parameters, JsonSecurityAnalysisParameters::write, + JsonSecurityAnalysisParameters::read, "/dynaflow_sa_parameters_set_serialization.json"); + } + + @Test + void serializeWithDefaultDynaflowSaParameters() throws IOException { + InMemoryPlatformConfig platformConfig = new InMemoryPlatformConfig(fileSystem); + SecurityAnalysisParameters parameters = SecurityAnalysisParameters.load(platformConfig); + roundTripTest(parameters, JsonSecurityAnalysisParameters::write, + JsonSecurityAnalysisParameters::read, "/dynaflow_sa_default_serialization.json"); + } + + @Test + void update() { + SecurityAnalysisParameters parameters = SecurityAnalysisParameters.load(); + JsonSecurityAnalysisParameters.update(parameters, getClass().getResourceAsStream("/dynaflow_sa_update.json")); + DynaFlowSecurityAnalysisParameters dynaFlowSaParameters = parameters.getExtension(DynaFlowSecurityAnalysisParameters.class); + assertNotNull(dynaFlowSaParameters); + assertEquals(14., dynaFlowSaParameters.getContingenciesStartTime()); + } +} diff --git a/dynaflow/src/test/resources/config.json b/dynaflow/src/test/resources/config.json index 87af4e32b..52144df4e 100644 --- a/dynaflow/src/test/resources/config.json +++ b/dynaflow/src/test/resources/config.json @@ -17,9 +17,6 @@ "startTime" : 0.0, "stopTime" : 100.0, "precision" : 0.0, - "sa" : { - "timeOfEvent" : 10.0 - }, "chosenOutputs" : [ "STEADYSTATE", "TIMELINE" ], "timeStep" : 2.6, "startingPointMode" : "warm", diff --git a/dynaflow/src/test/resources/dynaflow_parameters_set_serialization.json b/dynaflow/src/test/resources/dynaflow_parameters_set_serialization.json index 31c68066e..64e78fb59 100644 --- a/dynaflow/src/test/resources/dynaflow_parameters_set_serialization.json +++ b/dynaflow/src/test/resources/dynaflow_parameters_set_serialization.json @@ -31,10 +31,7 @@ "chosenOutputs" : [ "STEADYSTATE" ], "timeStep" : 2.6, "startingPointMode" : "warm", - "mergeLoads" : false, - "sa" : { - "timeOfEvent" : 10.0 - } + "mergeLoads" : false } } } \ No newline at end of file diff --git a/dynaflow/src/test/resources/dynaflow_sa_default_serialization.json b/dynaflow/src/test/resources/dynaflow_sa_default_serialization.json new file mode 100644 index 000000000..722fa4f3a --- /dev/null +++ b/dynaflow/src/test/resources/dynaflow_sa_default_serialization.json @@ -0,0 +1,50 @@ +{ + "version" : "1.2", + "increased-violations-parameters" : { + "flow-proportional-threshold" : 0.1, + "low-voltage-proportional-threshold" : 0.0, + "low-voltage-absolute-threshold" : 0.0, + "high-voltage-proportional-threshold" : 0.0, + "high-voltage-absolute-threshold" : 0.0 + }, + "intermediate-results-in-operator-strategy" : false, + "load-flow-parameters" : { + "version" : "1.9", + "voltageInitMode" : "UNIFORM_VALUES", + "transformerVoltageControlOn" : false, + "phaseShifterRegulationOn" : false, + "useReactiveLimits" : true, + "twtSplitShuntAdmittance" : false, + "shuntCompensatorVoltageControlOn" : false, + "readSlackBus" : true, + "writeSlackBus" : true, + "dc" : false, + "distributedSlack" : true, + "balanceType" : "PROPORTIONAL_TO_GENERATION_P_MAX", + "dcUseTransformerRatio" : true, + "countriesToBalance" : [ ], + "connectedComponentMode" : "MAIN", + "hvdcAcEmulation" : true, + "dcPowerFactor" : 1.0, + "extensions" : { + "DynaFlowParameters" : { + "svcRegulationOn" : true, + "shuntRegulationOn" : true, + "automaticSlackBusOn" : true, + "dsoVoltageLevel" : 45.0, + "activePowerCompensation" : "PMAX", + "startTime" : 0.0, + "stopTime" : 100.0, + "chosenOutputs" : [ "TIMELINE" ], + "timeStep" : 10.0, + "startingPointMode" : "warm", + "mergeLoads" : true + } + } + }, + "extensions" : { + "DynaFlowSecurityAnalysisParameters" : { + "contingenciesStartTime" : 10.0 + } + } +} \ No newline at end of file diff --git a/dynaflow/src/test/resources/dynaflow_sa_parameters_set_serialization.json b/dynaflow/src/test/resources/dynaflow_sa_parameters_set_serialization.json new file mode 100644 index 000000000..817194541 --- /dev/null +++ b/dynaflow/src/test/resources/dynaflow_sa_parameters_set_serialization.json @@ -0,0 +1,50 @@ +{ + "version" : "1.2", + "increased-violations-parameters" : { + "flow-proportional-threshold" : 0.1, + "low-voltage-proportional-threshold" : 0.0, + "low-voltage-absolute-threshold" : 0.0, + "high-voltage-proportional-threshold" : 0.0, + "high-voltage-absolute-threshold" : 0.0 + }, + "intermediate-results-in-operator-strategy" : false, + "load-flow-parameters" : { + "version" : "1.9", + "voltageInitMode" : "UNIFORM_VALUES", + "transformerVoltageControlOn" : false, + "phaseShifterRegulationOn" : false, + "useReactiveLimits" : true, + "twtSplitShuntAdmittance" : false, + "shuntCompensatorVoltageControlOn" : false, + "readSlackBus" : true, + "writeSlackBus" : true, + "dc" : false, + "distributedSlack" : true, + "balanceType" : "PROPORTIONAL_TO_GENERATION_P_MAX", + "dcUseTransformerRatio" : true, + "countriesToBalance" : [ ], + "connectedComponentMode" : "MAIN", + "hvdcAcEmulation" : true, + "dcPowerFactor" : 1.0, + "extensions" : { + "DynaFlowParameters" : { + "svcRegulationOn" : true, + "shuntRegulationOn" : true, + "automaticSlackBusOn" : true, + "dsoVoltageLevel" : 45.0, + "activePowerCompensation" : "PMAX", + "startTime" : 0.0, + "stopTime" : 100.0, + "chosenOutputs" : [ "TIMELINE" ], + "timeStep" : 10.0, + "startingPointMode" : "warm", + "mergeLoads" : true + } + } + }, + "extensions" : { + "DynaFlowSecurityAnalysisParameters" : { + "contingenciesStartTime" : 23.0 + } + } +} \ No newline at end of file diff --git a/dynaflow/src/test/resources/dynaflow_sa_update.json b/dynaflow/src/test/resources/dynaflow_sa_update.json new file mode 100644 index 000000000..e13f87d55 --- /dev/null +++ b/dynaflow/src/test/resources/dynaflow_sa_update.json @@ -0,0 +1,35 @@ +{ + "version" : "1.2", + "increased-violations-parameters" : { + "flow-proportional-threshold" : 0.1, + "low-voltage-proportional-threshold" : 0.0, + "low-voltage-absolute-threshold" : 0.0, + "high-voltage-proportional-threshold" : 0.0, + "high-voltage-absolute-threshold" : 0.0 + }, + "intermediate-results-in-operator-strategy" : false, + "load-flow-parameters" : { + "version" : "1.9", + "voltageInitMode" : "UNIFORM_VALUES", + "transformerVoltageControlOn" : false, + "phaseShifterRegulationOn" : false, + "useReactiveLimits" : true, + "twtSplitShuntAdmittance" : false, + "shuntCompensatorVoltageControlOn" : false, + "readSlackBus" : true, + "writeSlackBus" : true, + "dc" : false, + "distributedSlack" : true, + "balanceType" : "PROPORTIONAL_TO_GENERATION_P_MAX", + "dcUseTransformerRatio" : true, + "countriesToBalance" : [ ], + "connectedComponentMode" : "MAIN", + "hvdcAcEmulation" : true, + "dcPowerFactor" : 1.0 + }, + "extensions" : { + "DynaFlowSecurityAnalysisParameters" : { + "contingenciesStartTime" : 14.0 + } + } +} \ No newline at end of file diff --git a/dynaflow/src/test/resources/params.json b/dynaflow/src/test/resources/params.json index 9c5d96ec0..4e33e987e 100644 --- a/dynaflow/src/test/resources/params.json +++ b/dynaflow/src/test/resources/params.json @@ -1,19 +1,16 @@ { "dfl-config" : { + "InfiniteReactiveLimits" : true, "SVCRegulationOn" : true, "ShuntRegulationOn" : false, "AutomaticSlackBusOn" : true, "DsoVoltageLevel" : 32.4, - "InfiniteReactiveLimits" : true, "ActivePowerCompensation" : "P", "SettingPath" : "path/to/settingFile", "AssemblingPath" : "path/to/assemblingFile", "StartTime" : 0.0, "StopTime" : 100.0, "Precision" : 0.0, - "sa" : { - "TimeOfEvent" : 10.0 - }, "ChosenOutputs" : [ "STEADYSTATE" ], "TimeStep" : 2.6, "StartingPointMode" : "warm", diff --git a/dynaflow/src/test/resources/params_default.json b/dynaflow/src/test/resources/params_default.json index ec97490f6..085734097 100644 --- a/dynaflow/src/test/resources/params_default.json +++ b/dynaflow/src/test/resources/params_default.json @@ -1,10 +1,10 @@ { "dfl-config" : { + "InfiniteReactiveLimits" : true, "SVCRegulationOn" : true, "ShuntRegulationOn" : true, "AutomaticSlackBusOn" : true, "DsoVoltageLevel" : 45.0, - "InfiniteReactiveLimits" : true, "ActivePowerCompensation" : "PMax", "StartTime" : 0.0, "StopTime" : 100.0, diff --git a/dynaflow/src/test/resources/params_default_sa.json b/dynaflow/src/test/resources/params_default_sa.json new file mode 100644 index 000000000..8289ac92a --- /dev/null +++ b/dynaflow/src/test/resources/params_default_sa.json @@ -0,0 +1,19 @@ +{ + "dfl-config" : { + "InfiniteReactiveLimits" : false, + "SVCRegulationOn" : true, + "ShuntRegulationOn" : true, + "AutomaticSlackBusOn" : true, + "DsoVoltageLevel" : 45.0, + "ActivePowerCompensation" : "PMax", + "StartTime" : 0.0, + "StopTime" : 100.0, + "ChosenOutputs" : [ "TIMELINE" ], + "TimeStep" : 10.0, + "StartingPointMode" : "warm", + "sa" : { + "TimeOfEvent" : 10.0 + }, + "OutputDir" : "dynaflow_sa/workingDir" + } +} \ No newline at end of file diff --git a/dynaflow/src/test/resources/params_sa.json b/dynaflow/src/test/resources/params_sa.json new file mode 100644 index 000000000..16cc2890a --- /dev/null +++ b/dynaflow/src/test/resources/params_sa.json @@ -0,0 +1,19 @@ +{ + "dfl-config" : { + "InfiniteReactiveLimits" : false, + "SVCRegulationOn" : true, + "ShuntRegulationOn" : true, + "AutomaticSlackBusOn" : true, + "DsoVoltageLevel" : 45.0, + "ActivePowerCompensation" : "PMax", + "StartTime" : 0.0, + "StopTime" : 100.0, + "ChosenOutputs" : [ "TIMELINE" ], + "TimeStep" : 10.0, + "StartingPointMode" : "warm", + "sa" : { + "TimeOfEvent" : 20.0 + }, + "OutputDir" : "dynaflow_sa/workingDir" + } +} \ No newline at end of file diff --git a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaFlowTest.java b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaFlowTest.java index 70f8cc6eb..0825cb657 100644 --- a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaFlowTest.java +++ b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaFlowTest.java @@ -12,10 +12,7 @@ import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.test.TestUtil; import com.powsybl.contingency.Contingency; -import com.powsybl.dynaflow.DynaFlowConfig; -import com.powsybl.dynaflow.DynaFlowParameters; -import com.powsybl.dynaflow.DynaFlowProvider; -import com.powsybl.dynaflow.DynaFlowSecurityAnalysisProvider; +import com.powsybl.dynaflow.*; import com.powsybl.ieeecdf.converter.IeeeCdfNetworkFactory; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.VariantManagerConstants; @@ -58,12 +55,14 @@ class DynaFlowTest extends AbstractDynawoTest { @BeforeEach void setUp() throws Exception { super.setUp(); - DynaFlowConfig config = new DynaFlowConfig(Path.of("/dynaflow-launcher"), false); + DynaFlowConfig config = new DynaFlowConfig(Path.of("/dynaflow-launcher"), true); loadFlowProvider = new DynaFlowProvider(() -> config); loadFlowParameters = new LoadFlowParameters(); securityAnalysisProvider = new DynaFlowSecurityAnalysisProvider(() -> config); securityAnalysisParameters = new SecurityAnalysisParameters(); loadFlowParameters.addExtension(DynaFlowParameters.class, new DynaFlowParameters()); + securityAnalysisParameters.addExtension(DynaFlowSecurityAnalysisParameters.class, + new DynaFlowSecurityAnalysisParameters().setContingenciesStartTime(15.)); } @Test diff --git a/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_bb_results.json b/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_bb_results.json index f5dff8c5f..88089409b 100644 --- a/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_bb_results.json +++ b/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_bb_results.json @@ -215,14 +215,6 @@ "limit" : 13.386000000000001, "limitReduction" : 1.0, "value" : 13.377658087264606 - }, { - "subjectId" : "_BUS____9_VL", - "subjectName" : "BUS 9_VL", - "limitType" : "LOW_VOLTAGE", - "limitName" : "UInfUmin", - "limit" : 13.386000000000001, - "limitReduction" : 1.0, - "value" : 13.384395964628164 } ], "actionsTaken" : [ ] }, diff --git a/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_nb_results.json b/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_nb_results.json index 9ae2c0898..0341336e6 100644 --- a/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_nb_results.json +++ b/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/sa_nb_results.json @@ -29,7 +29,7 @@ "limitName" : "UInfUmin", "limit" : 220.0, "limitReduction" : 1.0, - "value" : 217.0313224616953 + "value" : 217.0314175890167 }, { "subjectId" : "S1VL2_BBS1", "subjectName" : "S1VL2_BBS1", @@ -37,7 +37,7 @@ "limitName" : "UInfUmin", "limit" : 390.0, "limitReduction" : 1.0, - "value" : 386.2578552204816 + "value" : 386.25793073656337 }, { "subjectId" : "S1VL2_BBS2", "subjectName" : "S1VL2_BBS2", @@ -45,21 +45,21 @@ "limitName" : "UInfUmin", "limit" : 390.0, "limitReduction" : 1.0, - "value" : 386.2578552204816 + "value" : 386.25793073656337 }, { "subjectId" : "S1VL1", "limitType" : "LOW_VOLTAGE", "limitName" : "UInfUmin", "limit" : 220.0, "limitReduction" : 1.0, - "value" : 217.0313224616953 + "value" : 217.0314175890167 }, { "subjectId" : "S1VL2", "limitType" : "LOW_VOLTAGE", "limitName" : "UInfUmin", "limit" : 390.0, "limitReduction" : 1.0, - "value" : 386.2578552204816 + "value" : 386.25793073656337 } ], "actionsTaken" : [ ] }, @@ -117,7 +117,7 @@ "limitName" : "UInfUmin", "limit" : 220.0, "limitReduction" : 1.0, - "value" : 217.86284536089713 + "value" : 217.86293797312413 }, { "subjectId" : "S1VL2_BBS1", "subjectName" : "S1VL2_BBS1", @@ -125,7 +125,7 @@ "limitName" : "UInfUmin", "limit" : 390.0, "limitReduction" : 1.0, - "value" : 387.735597348476 + "value" : 387.73566855444443 }, { "subjectId" : "S1VL2_BBS2", "subjectName" : "S1VL2_BBS2", @@ -133,21 +133,21 @@ "limitName" : "UInfUmin", "limit" : 390.0, "limitReduction" : 1.0, - "value" : 387.735597348476 + "value" : 387.73566855444443 }, { "subjectId" : "S1VL1", "limitType" : "LOW_VOLTAGE", "limitName" : "UInfUmin", "limit" : 220.0, "limitReduction" : 1.0, - "value" : 217.86284536089713 + "value" : 217.86293797312413 }, { "subjectId" : "S1VL2", "limitType" : "LOW_VOLTAGE", "limitName" : "UInfUmin", "limit" : 390.0, "limitReduction" : 1.0, - "value" : 387.735597348476 + "value" : 387.73566855444443 } ], "actionsTaken" : [ ] }, diff --git a/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/timeline_report_as.txt b/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/timeline_report_as.txt index 2019d5ca4..d876dbee7 100644 --- a/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/timeline_report_as.txt +++ b/dynawo-integration-tests/src/test/resources/ieee14/security-analysis/timeline_report_as.txt @@ -1,44 +1,44 @@ + Root message + Dynaflow security analysis on network 'ieee14bus' + Contingency '_BUS___10-BUS___11-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS___10-BUS___11-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS___10-BUS___11-1_AC' + Contingency '_BUS___12-BUS___13-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS___12-BUS___13-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS___12-BUS___13-1_AC' + Contingency '_BUS___13-BUS___14-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS___13-BUS___14-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS___13-BUS___14-1_AC' + Contingency '_BUS____1-BUS____2-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____1-BUS____2-1_AC' - [t=10.0] Generator : maximum reactive power limit reached on equipment '_GEN____2_SM' - [t=20.0] Generator : maximum reactive power limit reached on equipment '_GEN____3_SM' - [t=20.0] Generator : maximum reactive power limit reached on equipment '_GEN____6_SM' - [t=25.0] Generator : maximum reactive power limit reached on equipment '_GEN____8_SM' + [t=20.0] LINE : opening both sides on equipment '_BUS____1-BUS____2-1_AC' + [t=20.0] Generator : maximum reactive power limit reached on equipment '_GEN____2_SM' + [t=30.0] Generator : maximum reactive power limit reached on equipment '_GEN____3_SM' + [t=30.0] Generator : maximum reactive power limit reached on equipment '_GEN____6_SM' + [t=35.0] Generator : maximum reactive power limit reached on equipment '_GEN____8_SM' + Contingency '_BUS____1-BUS____5-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____1-BUS____5-1_AC' - [t=10.0] Generator : maximum reactive power limit reached on equipment '_GEN____2_SM' + [t=20.0] LINE : opening both sides on equipment '_BUS____1-BUS____5-1_AC' + [t=20.0] Generator : maximum reactive power limit reached on equipment '_GEN____2_SM' + Contingency '_BUS____2-BUS____3-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____2-BUS____3-1_AC' - [t=10.0] Generator : maximum reactive power limit reached on equipment '_GEN____3_SM' + [t=20.0] LINE : opening both sides on equipment '_BUS____2-BUS____3-1_AC' + [t=20.0] Generator : maximum reactive power limit reached on equipment '_GEN____3_SM' + Contingency '_BUS____2-BUS____4-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____2-BUS____4-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____2-BUS____4-1_AC' + Contingency '_BUS____2-BUS____5-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____2-BUS____5-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____2-BUS____5-1_AC' + Contingency '_BUS____3-BUS____4-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____3-BUS____4-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____3-BUS____4-1_AC' + Contingency '_BUS____4-BUS____5-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____4-BUS____5-1_AC' - [t=10.0] Generator : maximum reactive power limit reached on equipment '_GEN____2_SM' + [t=20.0] LINE : opening both sides on equipment '_BUS____4-BUS____5-1_AC' + [t=20.0] Generator : maximum reactive power limit reached on equipment '_GEN____2_SM' + Contingency '_BUS____6-BUS___11-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____6-BUS___11-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____6-BUS___11-1_AC' + Contingency '_BUS____6-BUS___12-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____6-BUS___12-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____6-BUS___12-1_AC' + Contingency '_BUS____6-BUS___13-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____6-BUS___13-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____6-BUS___13-1_AC' + Contingency '_BUS____7-BUS____8-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____7-BUS____8-1_AC' - [t=10.0] GENERATOR : disconnecting on equipment '_GEN____8_SM' + [t=20.0] LINE : opening both sides on equipment '_BUS____7-BUS____8-1_AC' + [t=20.0] GENERATOR : disconnecting on equipment '_GEN____8_SM' + Contingency '_BUS____7-BUS____9-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____7-BUS____9-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____7-BUS____9-1_AC' + Contingency '_BUS____9-BUS___10-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____9-BUS___10-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____9-BUS___10-1_AC' + Contingency '_BUS____9-BUS___14-1_AC' - [t=10.0] LINE : opening both sides on equipment '_BUS____9-BUS___14-1_AC' + [t=20.0] LINE : opening both sides on equipment '_BUS____9-BUS___14-1_AC'