Skip to content

Commit 46f8cd6

Browse files
committed
Merge branch 'dev' into ms/#1438-abstracting-power-value-sources
# Conflicts: # CHANGELOG.md # src/main/java/edu/ie3/datamodel/io/csv/CsvLoadProfileMetaInformation.java # src/main/java/edu/ie3/datamodel/io/source/LoadProfileSource.java # src/main/java/edu/ie3/datamodel/io/source/csv/CsvLoadProfileSource.java
2 parents 7eb0ca7 + 976291d commit 46f8cd6

File tree

61 files changed

+634
-339
lines changed

Some content is hidden

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

61 files changed

+634
-339
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- Added weathersource documentation [#1390](https://github.com/ie3-institute/PowerSystemDataModel/issues/1390)
1111
- Added standard asset parameter for `3wTransformer` in `ReadTheDocs` [#1417](https://github.com/ie3-institute/PowerSystemDataModel/issues/1417)
12+
- Added getter sRated for SystemParticipant inputs and updated them in tests in src[#1412](https://github.com/ie3-institute/PowerSystemDataModel/issues/1412)
13+
- Added converters documentation [#1139](https://github.com/ie3-institute/PowerSystemDataModel/issues/1139)
1214
- Added abstraction for power value sources [#1438](https://github.com/ie3-institute/PowerSystemDataModel/issues/1438)
1315

1416
### Fixed
1517
- Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)
1618
- Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
1719
- Added mising fields to field validation [#1422](https://github.com/ie3-institute/PowerSystemDataModel/issues/1422)
1820
- Fixed the issues with rtd for Cylindrical thermal storage [#1273](https://github.com/ie3-institute/PowerSystemDataModel/issues/1273)
21+
- Updated Controlling_em for all the loads in readthedocs[#1447](https://github.com/ie3-institute/PowerSystemDataModel/issues/1447)
22+
- Included a doFirst clause into `checkJavaVersion.gradle` [#1462](https://github.com/ie3-institute/PowerSystemDataModel/issues/1462)
1923

2024
### Changed
2125
- Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
2226
- Extend `GermanVoltageLevelUtils` with more synonymousIds [#143](https://github.com/ie3-institute/PowerSystemDataModel/issues/143)
2327
- Change spotless to use googleJavaFormat('1.28.0') [#1409](https://github.com/ie3-institute/PowerSystemDataModel/issues/1409)
2428
- Change `TimeSeries` to no longer extend `UniqueEntity` [#1441](https://github.com/ie3-institute/PowerSystemDataModel/issues/1441)
29+
- Refactor CSV handling into shared file-based infrastructure. [#1450](https://github.com/ie3-institute/PowerSystemDataModel/issues/1445)
2530

2631
## [8.1.0] - 2025-07-25
2732

@@ -126,6 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
126131
- Fixed `MappingEntryies` not getting processed by adding `Getter` methods for record fields [#1084](https://github.com/ie3-institute/PowerSystemDataModel/issues/1084)
127132
- Fixed "depth of discharge" in documentation [#872](https://github.com/ie3-institute/PowerSystemDataModel/issues/872)
128133
- Fixed project being build twice in CI [#994](https://github.com/ie3-institute/PowerSystemDataModel/issues/994)
134+
- Fix figure of SubGridContainer in rtd and clarify definitions [#1458](https://github.com/ie3-institute/PowerSystemDataModel/issues/1458)
129135

130136
### Changed
131137
- Improvements to the search for corner points in `IdCoordinateSource` [#1016](https://github.com/ie3-institute/PowerSystemDataModel/issues/1016)

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
id 'signing'
66
id 'pmd' // code check, working on source code
77
id 'com.diffplug.spotless' version '8.0.0' //code format
8-
id 'com.github.spotbugs' version '6.4.2' // code check, working on byte code
8+
id 'com.github.spotbugs' version '6.4.4' // code check, working on byte code
99
id 'de.undercouch.download' version '5.6.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1111
id 'jacoco' // java code coverage plugin
12-
id "org.sonarqube" version "6.3.1.5724" // sonarqube
12+
id "org.sonarqube" version "7.0.0.6105" // sonarqube
1313
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
1414
id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
1515
}
@@ -20,7 +20,7 @@ ext {
2020
groovyVersion = "4.0"
2121
groovyBinaryVersion = "4.0.28"
2222

23-
junitVersion = '1.12.0'
23+
junitVersion = '6.0.0'
2424
testcontainersVersion = '1.21.3'
2525

2626
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
@@ -82,7 +82,7 @@ dependencies {
8282
testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
8383
testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
8484
testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
85-
testImplementation 'net.bytebuddy:byte-buddy:1.17.7' // Mocks of classes
85+
testImplementation 'net.bytebuddy:byte-buddy:1.17.8' // Mocks of classes
8686

8787
// testcontainers (docker framework for testing)
8888
testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -99,7 +99,7 @@ dependencies {
9999

100100
// Databases
101101
implementation 'org.influxdb:influxdb-java:2.25'
102-
implementation 'com.couchbase.client:java-client:3.9.1'
102+
implementation 'com.couchbase.client:java-client:3.9.2'
103103
runtimeOnly 'org.postgresql:postgresql:42.7.8' // postgresql jdbc driver required during runtime
104104

105105
implementation 'commons-io:commons-io:2.20.0' // I/O functionalities
6.57 KB
Loading

docs/readthedocs/_static/figures/transformerWithSwitchGear.tex

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
\definecolor{tuViolette}{cmyk}{0.25, 1, 0, 0}
5959
\definecolor{tuYellow}{cmyk}{0.05, 0.08, 1, 0}
6060
\definecolor{tuBrown}{cmyk}{0.05, 0.69, 1, 0}
61+
\definecolor{red}{rgb}{1, 0, 0}
62+
\definecolor{blue}{rgb}{0, 0, 1}
6163

6264
% === pgfplots ===
6365
% Definition of cycle lists
@@ -176,9 +178,26 @@
176178
\draw (port_d.east) -- (winding_a.west) (winding_b.east) -- (port_e.west);
177179

178180
\node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_a.south) {A \\ \SI{110}{\kV} \\ 1};
179-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1};
180-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1};
181-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1};
181+
\node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1};
182+
\node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1};
183+
\node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1};
182184
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_e.south) {E \\ \SI{10}{\kV} \\ 2};
185+
186+
% Corner points of SubGridContainerA
187+
\node[anchor=south west, font=\footnotesize] (SGC_A_SW) at (-0.5, 0.75) {SubGridContainer A}; % South West corner
188+
\node[anchor=south east] (SGC_A_SE) at (5.25, 1.0) {}; % South East corner
189+
\node[anchor=south west] (SGC_A_NW) at (-0.5, -1.5) {}; % North West corner
190+
\node[anchor=south east] (SGC_A_NE) at (5.25, -1.5) {}; % North East corner
191+
192+
% Corner points of SubGridContainerA
193+
\node[anchor=south west] (SGC_B_NW) at (4.0, 0.75) {}; % North West corner
194+
\node[anchor=south east, font=\footnotesize] (SGC_B_NE) at (8.25, 0.75) {SubGridContainer B}; % North East corner
195+
\node[anchor=north west] (SGC_B_SW) at (4.0, -2.0) {}; % South West corner
196+
\node[anchor=south east] (SGC_B_SE) at (8.25, -2.0) {}; % South East corner
197+
198+
% Draw a red rectangle using the defined nodes
199+
\draw [red] (SGC_A_SW.north west) -- (SGC_A_SE.north east) -- (SGC_A_NE.south east) -- (SGC_A_NW.south west) -- cycle;
200+
% Draw a bluerectangle using the defined nodes
201+
\draw [blue] (SGC_B_SW.north west) -- (SGC_B_SE.south east) -- (SGC_B_NE.south east) -- (SGC_B_NW.south west) -- cycle;
183202
\end{tikzpicture}
184203
\end{document}

docs/readthedocs/io/basiciousage.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ csvfiles
1212
sql
1313
influxdb
1414
ValidationUtils.md
15+
converters.md
1516
```
1617

1718
## Data sink structure

docs/readthedocs/io/converters.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Converters
2+
This page lists all converters from and to the PSDM format that are known to us.
3+
4+
## Converters to PSDM
5+
6+
- [simBench2psdm](https://github.com/ie3-institute/simBench2psdm): SimBench has been research project of Kassel university, Fraunhofer IEE, RWTH Aachen university and TU Dortmund university, aiming at provision of realistic models of electrical distribution grids including time series. The data is availabe [here](https://simbench.de).
7+
- [powerFactory2psdm](https://github.com/ie3-institute/powerFactory2psdm): This tool is used to convert PowerFactory projects into the PSDM format.
8+
- [pp2psdm](https://github.com/ie3-institute/pp2psdm): Converter for grid models from pandapower into PowerSystemDataModel format.
9+
10+
## Converts from PSDM
11+
12+
- [psdm2powerfactory](https://github.com/ie3-institute/psdm2powerfactory): Converter from PSDM to PowerFactory file format.
13+
14+
## Other Converters
15+
16+
- [simBench2PowerFactory](https://github.com/ie3-institute/simBench2PowerFactory): Converts SimBench grids to the PowerFactory file format.
17+
- The tool [here](https://github.com/e2nIEE/simbench) enables the use of the SimBench data set in the simulation tool [pandapower](https://github.com/e2nIEE/pandapower).

docs/readthedocs/models/input/em.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Participants are connected to an EM each via their `em` field.
4040
* - controllingEm
4141
-
4242
- Reference to a superior Energy Management Unit that is controlling this EM.
43-
Field can be empty or missing, if this EM itself is not controlled.
43+
Field can be empty, if this EM itself is not controlled.
4444
4545
```
4646

docs/readthedocs/models/input/grid/gridcontainer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In contrast to the `JointGridContainer` it only covers one voltage level and the
1818
for the predominant voltage level apparent in the container.
1919
Why predominant?
2020
As of convention, the `SubGridContainers` hold also reference to the transformers leading to higher sub grids
21-
and their higher voltage coupling point.
21+
and their higher voltage coupling point. Thus, the higher voltage coupling point is part of more than one `SubGridContainer`.
2222

2323
![Sub grid boundary definition for transformers with upstream switchgear](../../../_static/figures/transformerWithSwitchGear.png)
2424

docs/readthedocs/models/input/participant/bm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Model of a biomass power plant.
110110
* - controllingEm
111111
-
112112
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
113-
this system participant. Field can be empty or missing, if this participant
113+
this system participant. Field can be empty, if this participant
114114
is not controlled.
115115
116116
```

docs/readthedocs/models/input/participant/chp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Combined heat and power plant.
117117
* - controllingEm
118118
-
119119
- UUID reference to an [Energy Management Unit](em_model) that is controlling
120-
this system participant. Field can be empty or missing, if this participant
120+
this system participant. Field can be empty, if this participant
121121
is not controlled.
122122
123123
```

0 commit comments

Comments
 (0)