Skip to content

Commit 6c03064

Browse files
EtienneLtEtienneLt
committed
Merge branch 'main' into add-controls-on-rates
Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
2 parents f5c86d5 + 1b25ff7 commit 6c03064

File tree

396 files changed

+18690
-923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+18690
-923
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ https://github.com/powsybl/powsybl-gse page.
4646

4747
Powsybl-core project is fully written in Java, so you only need few requirements:
4848
- JDK *(21 or greater)*
49-
- Maven *(3.8.1 or greater, 3.9.x recommended)* - you could use the embedded maven wrapper instead if you prefer (see [Using Maven Wrapper](#using-maven-wrapper))
49+
- Maven *(3.9.9 or greater)* - you could use the embedded maven wrapper instead if you prefer (see [Using Maven Wrapper](#using-maven-wrapper))
5050

5151
To run all the tests, simply launch the following command from the root of the repository:
5252
```
@@ -99,7 +99,7 @@ updated each time you use the `install.sh` script.
9999
| ------ | ----------- | ------------- |
100100
| --help | Display this help | |
101101
| --prefix | Set the installation directory | $HOME/powsybl |
102-
| --mvn | Set the maven command to use | mvn |
102+
| --mvn | Set the maven command to use | mvn |
103103

104104
### Default configuration file
105105
```

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:cca="http://www.powsybl.org/schema/iidm/ext/cgmes_control_areas/1_0" id="sim1" caseDate="2021-02-02T09:27:39.856+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:cca="http://www.powsybl.org/schema/iidm/ext/cgmes_control_areas/1_0" id="sim1" caseDate="2021-02-02T09:27:39.856+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
44
<iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:cdlbn="http://www.powsybl.org/schema/iidm/ext/cgmes_dangling_line_boundary_node/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:cdlbn="http://www.powsybl.org/schema/iidm/ext/cgmes_dangling_line_boundary_node/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
44
<iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:clbn="http://www.powsybl.org/schema/iidm/ext/cgmes_line_boundary_node/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:clbn="http://www.powsybl.org/schema/iidm/ext/cgmes_line_boundary_node/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
44
<iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_tap_changers.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:ctc="http://www.powsybl.org/schema/iidm/ext/cgmes_tap_changers/1_0" id="sim1" caseDate="2024-09-17T12:01:34.831Z" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:ctc="http://www.powsybl.org/schema/iidm/ext/cgmes_tap_changers/1_0" id="sim1" caseDate="2024-09-17T12:01:34.831Z" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
44
<iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:cc="http://www.powsybl.org/schema/iidm/ext/cim_characteristics/1_0" id="sim1" caseDate="2020-09-08T14:28:13.738+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:cc="http://www.powsybl.org/schema/iidm/ext/cim_characteristics/1_0" id="sim1" caseDate="2020-09-08T14:28:13.738+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
44
<iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>

‎cgmes/cgmes-extensions/src/test/resources/network_test1_cgmes_metadata_models.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:cmm="http://www.powsybl.org/schema/iidm/ext/cgmes_metadata_models/1_0" id="network" caseDate="2020-09-07T15:44:10.209+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:cmm="http://www.powsybl.org/schema/iidm/ext/cgmes_metadata_models/1_0" id="network" caseDate="2020-09-07T15:44:10.209+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="substation1" country="FR" tso="TSO1" geographicalTags="region1">
44
<iidm:voltageLevel id="voltageLevel1" nominalV="400.0" topologyKind="NODE_BREAKER">
55
<iidm:nodeBreakerTopology>

‎cgmes/cgmes-extensions/src/test/resources/no_equipment_base_voltage_mapping.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_15" xmlns:bv="http://www.powsybl.org/schema/iidm/ext/base_voltage_mapping/1_0" id="test" caseDate="2024-09-17T13:36:37.831Z" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
2+
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:bv="http://www.powsybl.org/schema/iidm/ext/base_voltage_mapping/1_0" id="test" caseDate="2024-09-17T13:36:37.831Z" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
33
<iidm:substation id="sub" country="FR" tso="RTE">
44
<iidm:voltageLevel id="vl1" name="vl1" nominalV="440.0" lowVoltageLimit="200.0" highVoltageLimit="400.0" topologyKind="BUS_BREAKER">
55
<iidm:busBreakerTopology>

‎commons/src/main/java/com/powsybl/commons/datasource/DirectoryDataSource.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.io.IOException;
1313
import java.io.InputStream;
1414
import java.io.OutputStream;
15+
import java.nio.file.FileVisitOption;
1516
import java.nio.file.Files;
1617
import java.nio.file.Path;
1718
import java.util.Objects;
@@ -126,7 +127,7 @@ public Set<String> listNames(String regex) throws IOException {
126127
// Consider only files in the given folder, do not go into folders
127128
Pattern p = Pattern.compile(regex);
128129
int maxDepth = 1;
129-
try (Stream<Path> paths = Files.walk(directory, maxDepth)) {
130+
try (Stream<Path> paths = Files.walk(directory, maxDepth, FileVisitOption.FOLLOW_LINKS)) {
130131
var filenames = paths
131132
.filter(Files::isRegularFile)
132133
.map(Path::getFileName)

‎commons/src/main/resources/com/powsybl/commons/reports.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ core.iidm.network.scTargetDeadbandUndefinedValue = Shunt compensator '${id}' - U
177177
core.iidm.network.svcReactivePowerSetpointInvalid = Static VAR compensator '${id}': reactive power setpoint value (${reactivePowerSetpoint}) is invalid
178178
core.iidm.network.svcRegulationModeInvalid = Static VAR compensator '${id}': regulation mode is invalid
179179
core.iidm.network.svcVoltageSetpointInvalid = Static VAR compensator '${id}': voltage setpoint value (${voltageSetpoint}) is invalid
180+
core.iidm.network.svcVoltageThresholdInvalid = Static VAR compensator '${id}': inconsistent low (${lowVoltageThreshold}) and high (${highVoltageThreshold}) voltage thresholds
181+
core.iidm.network.svcLowVoltageSetpointInvalid = Static VAR compensator '${id}': invalid low voltage setpoint (${lowVoltageSetpoint}) < threshold (${lowVoltageThreshold})
182+
core.iidm.network.svcHighVoltageSetpointInvalid = Static VAR compensator '${id}': invalid high voltage setpoint (${highVoltageSetpoint}) > threshold (${highVoltageThreshold})
180183
core.iidm.network.tapPositionNotSet = Transformer '${id}': tap position is not set
181184
core.iidm.network.temporaryLimitsButPermanentLimitUndefined = '${id}': permanent limit must be defined if temporary limits are present
182185
core.iidm.network.testImportPostProcessor = testing import post processor

0 commit comments

Comments
 (0)