Skip to content

Commit ab133b3

Browse files
Merge pull request #962 from ie3-institute/sp/#957-spi-em
Have system participants reference their respective EMs
2 parents 8423502 + dbb273c commit ab133b3

File tree

111 files changed

+1600
-948
lines changed

Some content is hidden

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

111 files changed

+1600
-948
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2323
- Changing from comparing strings to comparing uuids in `EntitySource.findFirstEntityByUuid` [#829](https://github.com/ie3-institute/PowerSystemDataModel/issues/829)
2424
- Adding JavaDoc to `EntitySource.safeMapGet` [#828](https://github.com/ie3-institute/PowerSystemDataModel/issues/828)
2525
- Abstracting some methods in `ValidationUtils` [#852](https://github.com/ie3-institute/PowerSystemDataModel/issues/852)
26-
- `EmInput` should not be connected to the grid [#955](https://github.com/ie3-institute/PowerSystemDataModel/issues/955)
26+
- Changes to Energy Management inputs:
27+
- `EmInput` should not be connected to the grid [#955](https://github.com/ie3-institute/PowerSystemDataModel/issues/955)
28+
- System participants now reference the em entity [#957](https://github.com/ie3-institute/PowerSystemDataModel/issues/957)
2729
- Enhancing the error message for coordinate sources with invalid column names [#670](https://github.com/ie3-institute/PowerSystemDataModel/issues/670)
2830
- Allowing for additional unused columns in sources [#839](https://github.com/ie3-institute/PowerSystemDataModel/issues/839)
2931
- Improving column name validation to only run once per source [#849](https://github.com/ie3-institute/PowerSystemDataModel/issues/849)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ Model of a biomass power plant.
107107
- € / MWh
108108
- Fixed feed in tariff
109109
110+
* - em
111+
- --
112+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
113+
| this system participant. Field can be empty or missing, if this participant
114+
| is not controlled.
115+
110116
```
111117

112118
## Caveats

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ Combined heat and power plant.
114114
- | Whether to adapt output based on (volatile)
115115
| market price or not
116116
117+
* - em
118+
- --
119+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
120+
| this system participant. Field can be empty or missing, if this participant
121+
| is not controlled.
122+
117123
```
118124

119125
## Caveats
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
(em_model)=
2+
3+
# Energy Management Unit
4+
5+
A model of an Energy Management Unit that controls the power of connected system participants.
6+
Participants are connected to an EM each via their `em` field.
7+
8+
## Attributes, Units and Remarks
9+
10+
```{eval-rst}
11+
.. list-table::
12+
:widths: 33 33 33
13+
:header-rows: 0
14+
15+
16+
* - Attribute
17+
- Unit
18+
- Remarks
19+
20+
* - uuid
21+
- --
22+
-
23+
24+
* - id
25+
- --
26+
- Human readable identifier
27+
28+
* - operator
29+
- --
30+
-
31+
32+
* - operationTime
33+
- --
34+
- Timely restriction of operation
35+
36+
* - controlStrategy
37+
- --
38+
- String representation (e.g. name) of a control strategy
39+
40+
* - parentEm
41+
- --
42+
- | 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.
44+
45+
```
46+
47+
## Caveats
48+
49+
Nothing - at least not known.
50+
If you found something, please contact us!

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
9393
- --
9494
-
9595
96+
* - em
97+
- --
98+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
99+
| this system participant. Field can be empty or missing, if this participant
100+
| is not controlled.
101+
96102
```
97103

98104
## Caveats

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ station and has some limitations outlined below.
5959
- --
6060
- :ref:`Charging station location types<location-types>`
6161
62+
* - em
63+
- --
64+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
65+
| this system participant. Field can be empty or missing, if this participant
66+
| is not controlled.
67+
6268
```
6369

6470
### Type Model

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ model can be derived.
4949
- --
5050
- Rated power factor
5151
52+
* - em
53+
- --
54+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
55+
| this system participant. Field can be empty or missing, if this participant
56+
| is not controlled.
57+
5258
```
5359

5460
## Caveats

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ Model of a heat pump.
9393
- --
9494
-
9595
96+
* - em
97+
- --
98+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
99+
| this system participant. Field can be empty or missing, if this participant
100+
| is not controlled.
101+
96102
97103
```
98104

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ Model of (mainly) domestic loads.
6060
- --
6161
- Rated power factor
6262
63+
* - em
64+
- --
65+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
66+
| this system participant. Field can be empty or missing, if this participant
67+
| is not controlled.
68+
6369
```
6470

6571
## Caveats

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ Detailed model of a photovoltaic power plant.
7676
- --
7777
- Rated power factor
7878
79+
* - em
80+
- --
81+
- | UUID reference to an :ref:`Energy Management Unit<em_model>` that is controlling
82+
| this system participant. Field can be empty or missing, if this participant
83+
| is not controlled.
84+
7985
```
8086

8187
## Caveats

0 commit comments

Comments
 (0)