Merge pull request #1332 from ie3-institute/ms/#1331-fix-em-fields-in-input-models

Fixed em fields in input models.

Author: danielfeismann

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
+- -Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
 
 ### Changed
 - Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)

docs/readthedocs/models/input/em.md

@@ -37,7 +37,7 @@ Participants are connected to an EM each via their `em` field.
      -
      - String representation (e.g. name) of a control strategy
 
-   * - parentEm
+   * - controllingEm
      -
      - Reference to a superior Energy Management Unit that is controlling this EM.
        Field can be empty or missing, if this EM itself is not controlled.

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

@@ -107,7 +107,7 @@ Model of a biomass power plant.
      - € / MWh
      - Fixed feed in tariff
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -114,7 +114,7 @@ Combined heat and power plant.
      - Whether to adapt output based on (volatile)
        market price or not
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -97,7 +97,7 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
      -
      - 
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -63,7 +63,7 @@ station and has some limitations outlined below.
      - Boolean
      - Vehicle to grid (V2G) support, true if the charging station supports feed in.
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -49,7 +49,7 @@ model can be derived.
      -
      - Rated power factor
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -93,7 +93,7 @@ Model of a heat pump.
      -
      -
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -56,7 +56,7 @@ Model of (mainly) domestic loads.
      -
      - Rated power factor
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

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

@@ -76,7 +76,7 @@ Detailed model of a photovoltaic power plant.
      -
      - Rated power factor
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant