Skip to content

Commit a9f37a6

Browse files
authored
Merge branch 'dev' into ms/#1292-add-updated-bdew-standard-load-profiles
2 parents bf69af7 + 8ca988e commit a9f37a6

Some content is hidden

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

49 files changed

+123
-122
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Fixed
1313
- Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
14+
- -Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
1415

1516
### Changed
1617
- Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
18+
- Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
1719

1820
## [7.0.0] - 2025-05-08
1921

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '7.0.3' //code format
8-
id 'com.github.spotbugs' version '6.1.12' // code check, working on byte code
7+
id 'com.diffplug.spotless' version '7.0.4' //code format
8+
id 'com.github.spotbugs' version '6.1.13' // 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
@@ -18,10 +18,10 @@ ext {
1818
//version (changing these should be considered thoroughly!)
1919
javaVersion = JavaVersion.VERSION_17
2020
groovyVersion = "4.0"
21-
groovyBinaryVersion = "4.0.26"
21+
groovyBinaryVersion = "4.0.27"
2222

2323
junitVersion = '1.12.0'
24-
testcontainersVersion = '1.21.0'
24+
testcontainersVersion = '1.21.1'
2525

2626
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
2727
}
@@ -99,7 +99,7 @@ dependencies {
9999
// Databases
100100
implementation 'org.influxdb:influxdb-java:2.25'
101101
implementation 'com.couchbase.client:java-client:3.8.1'
102-
runtimeOnly 'org.postgresql:postgresql:42.7.5' // postgresql jdbc driver required during runtime
102+
runtimeOnly 'org.postgresql:postgresql:42.7.6' // postgresql jdbc driver required during runtime
103103

104104
implementation 'commons-io:commons-io:2.19.0' // I/O functionalities
105105
implementation 'commons-codec:commons-codec:1.18.0' // needed by commons-compress

docs/readthedocs/models/input/em.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Participants are connected to an EM each via their `em` field.
3737
-
3838
- String representation (e.g. name) of a control strategy
3939
40-
* - parentEm
40+
* - controllingEm
4141
-
4242
- Reference to a superior Energy Management Unit that is controlling this EM.
4343
Field can be empty or missing, if this EM itself is not controlled.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Model of a biomass power plant.
107107
- € / MWh
108108
- Fixed feed in tariff
109109
110-
* - em
110+
* - controllingEm
111111
-
112112
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
113113
this system participant. Field can be empty or missing, if this participant

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Combined heat and power plant.
114114
- Whether to adapt output based on (volatile)
115115
market price or not
116116
117-
* - em
117+
* - controllingEm
118118
-
119119
- UUID reference to an [Energy Management Unit](em_model) that is controlling
120120
this system participant. Field can be empty or missing, if this participant

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
9797
-
9898
-
9999
100-
* - em
100+
* - controllingEm
101101
-
102102
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
103103
this system participant. Field can be empty or missing, if this participant

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ station and has some limitations outlined below.
6363
- Boolean
6464
- Vehicle to grid (V2G) support, true if the charging station supports feed in.
6565
66-
* - em
66+
* - controllingEm
6767
-
6868
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
6969
this system participant. Field can be empty or missing, if this participant

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ model can be derived.
4949
-
5050
- Rated power factor
5151
52-
* - em
52+
* - controllingEm
5353
-
5454
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
5555
this system participant. Field can be empty or missing, if this participant

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Model of a heat pump.
9393
-
9494
-
9595
96-
* - em
96+
* - controllingEm
9797
-
9898
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
9999
this system participant. Field can be empty or missing, if this participant

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Model of (mainly) domestic loads.
5656
-
5757
- Rated power factor
5858
59-
* - em
59+
* - controllingEm
6060
-
6161
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
6262
this system participant. Field can be empty or missing, if this participant

0 commit comments

Comments
 (0)