diff --git a/.gitignore b/.gitignore
index 7cbb73c34..a99c96c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,4 +242,9 @@ docs/readthedocs/_build
**/*.synctex.gz
**/*.synctex(busy)
-docs/javadoc
\ No newline at end of file
+### Metals ###
+.metals/
+.bloop/
+project/**/metals.sbt
+
+docs/javadoc
diff --git a/AUTHORS b/AUTHORS
index 4c5ffecc5..4c0b256d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,14 @@
-Copyright (c) 2023, Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)
+Copyright (c) 2024, Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)
All rights reserved.
Lead Developers:
- Johannes Hiry
- Chris Kittl
- Debopama Sen-Sarma
+ - Thomas Oberließen
+ - Daniel Feismann
+ - Johannes Bao
+ - Sebastian Peter
Main Contributers:
- Johannes Hiry - https://github.com/johanneshiry
@@ -20,3 +24,8 @@ Main Contributers:
- Marius Staudt - https://github.com/staudtMarius
- Lara Roumeliotis - https://github.com/lararou
- Vicky Bung - https://github.com/vickybung1
+ - Daniel Feismann - https://github.com/danielfeismann
+ - Johannes Bao - https://github.com/jo-bao
+ - Julian Hohmann - https://github.com/julianhohmann
+ - Simon Huette - https://github.com/SimonHuette
+ - Pierre Petersmeier - http://github.com/pierrepetersmeier
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 397ee653d..2348e5bb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,13 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased/Snapshot]
### Added
+- Formatting Spotless Groovy import order [#960](https://github.com/ie3-institute/PowerSystemDataModel/issues/960)
+- Implementing missing typical methods in `Try` [#970](https://github.com/ie3-institute/PowerSystemDataModel/issues/970)
+- Added log warning when using `SwitchInputs` with `parallelDevices` parameter [#840](https://github.com/ie3-institute/PowerSystemDataModel/issues/840)
+- Validation for `EvcsInput` [#1000](https://github.com/ie3-institute/PowerSystemDataModel/issues/1000)
+- Scaling method in system participant copy builders [#1011](https://github.com/ie3-institute/PowerSystemDataModel/issues/1011)
### Fixed
- Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)
+- Fixed hyperlink in line documentation [#965](https://github.com/ie3-institute/PowerSystemDataModel/issues/965)
+- Fixed some tests no failing when they should [#958](https://github.com/ie3-institute/PowerSystemDataModel/issues/958)
+- Fixed thermal-house-documentation [#873](https://github.com/ie3-institute/PowerSystemDataModel/issues/873)
+- Fixed ElectricVehicle Documentation [#875](https://github.com/ie3-institute/PowerSystemDataModel/issues/875)
+- Fixed Equal behavior of `ConnectorResult` [#1001](https://github.com/ie3-institute/PowerSystemDataModel/issues/1001)
### Changed
- Changing from comparing strings to comparing uuids in `EntitySource.findFirstEntityByUuid` [#829](https://github.com/ie3-institute/PowerSystemDataModel/issues/829)
-
+- Adding JavaDoc to `EntitySource.safeMapGet` [#828](https://github.com/ie3-institute/PowerSystemDataModel/issues/828)
+- Abstracting some methods in `ValidationUtils` [#852](https://github.com/ie3-institute/PowerSystemDataModel/issues/852)
+- Changes to Energy Management inputs:
+ - `EmInput` should not be connected to the grid [#955](https://github.com/ie3-institute/PowerSystemDataModel/issues/955)
+ - System participants now reference the em entity [#957](https://github.com/ie3-institute/PowerSystemDataModel/issues/957)
+- Enhancing the error message for coordinate sources with invalid column names [#670](https://github.com/ie3-institute/PowerSystemDataModel/issues/670)
+- Allowing for additional unused columns in sources [#839](https://github.com/ie3-institute/PowerSystemDataModel/issues/839)
+- Improving column name validation to only run once per source [#849](https://github.com/ie3-institute/PowerSystemDataModel/issues/849)
+- Refactored and abstracted `EntitySource`s and `EntityData` creation [#969](https://github.com/ie3-institute/PowerSystemDataModel/issues/969)
+- Updated contributing.md [#737](https://github.com/ie3-institute/PowerSystemDataModel/issues/737)
+- Don't throw exceptions for not yet implemented validations [#879](https://github.com/ie3-institute/PowerSystemDataModel/issues/879)
+- `CsvDataSource` throws exceptions on error [#954](https://github.com/ie3-institute/PowerSystemDataModel/issues/954)
## [4.1.0] - 2023-11-02
@@ -37,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixed wrong rated power unit hint [#804](https://github.com/ie3-institute/PowerSystemDataModel/issues/804)
- Fixed wrong hash code generation of ConnectorResult [#817](https://github.com/ie3-institute/PowerSystemDataModel/issues/817)
+- Fixed wrong path for timeSeriesMapping [#886](https://github.com/ie3-institute/PowerSystemDataModel/issues/886)
### Changed
- Removing deprecated classes and methods [#540](https://github.com/ie3-institute/PowerSystemDataModel/issues/540)
@@ -45,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use nio paths instead of strings for file path [#723](https://github.com/ie3-institute/PowerSystemDataModel/issues/723)
- Data source will throw an exceptions instead of returning an empty optionals [#707](https://github.com/ie3-institute/PowerSystemDataModel/issues/707)
- Improving `ValidationUtils` [#758](https://github.com/ie3-institute/PowerSystemDataModel/issues/758)
+- conversion from rst to markdown myst[#979](https://github.com/ie3-institute/PowerSystemDataModel/pull/985)
## [3.0.0] - 2023-02-16
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 613c30be6..02981e3ca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ With this document we would like to give you some orientation on how you can con
## Testing and reporting bugs
We really appreciate your usage of this project.
Whenever you find a bug, it would be nice to check, if this isn't a feature to us. :wink:
-You may find extensive information about the intended behaviour when you [Read the Docs](https://powersystemdatamodel.readthedocs.io/en/latest/) or within the [javadoc](https://ie3-institute.github.io/PowerSystemDataModel/javadoc/).
+You may find extensive information about the intended behaviour when you [Read the Docs](https://powersystemdatamodel.readthedocs.io/en/latest/).
If you still think it's a bug, please raise an [issue](https://guides.github.com/features/issues/) for us.
Considering the following aspects in your inquiry, assists us in helping you:
@@ -67,9 +67,6 @@ Before marking the pull request as 'ready to review', take these precautionary a
`gradle finalizePR` summarizes all of these steps .
## For any doubts
-... please contact
-* Johannes (@johanneshiry),
-* Debopama (@sensarmad) or
-* Chris (@ckittl)
+... please contact [us](AUTHORS)
We are happy to help! :smiley:
diff --git a/Jenkinsfile b/Jenkinsfile
index cf2156d11..1a6029879 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -451,7 +451,6 @@ def constantBranchesProps() {
[
string(defaultValue: '', description: '', name: 'deploy', trim: true)
]),
- [$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false],
[$class: 'ThrottleJobProperty', categories: [], limitOneJobWithMatchingParams: false, maxConcurrentPerNode: 0, maxConcurrentTotal: 0, paramsToUseForLimit: '', throttleEnabled: true, throttleOption: 'project']
])
}
diff --git a/build.gradle b/build.gradle
index c0d3a0a32..12d31457b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,8 @@ plugins {
id 'maven-publish'
id 'signing'
id 'pmd' // code check, working on source code
- id 'com.diffplug.spotless' version '6.22.0' //code format
- id 'com.github.spotbugs' version '5.2.3' // code check, working on byte code
+ id 'com.diffplug.spotless' version '6.25.0' //code format
+ id 'com.github.spotbugs' version '6.0.7' // code check, working on byte code
id 'de.undercouch.download' version '5.5.0'
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
id 'jacoco' // java code coverage plugin
@@ -17,8 +17,8 @@ ext {
//version (changing these should be considered thoroughly!)
javaVersion = JavaVersion.VERSION_17
groovyVersion = "4.0"
- groovyBinaryVersion = "4.0.15"
- testcontainersVersion = '1.19.3'
+ groovyBinaryVersion = "4.0.18"
+ testcontainersVersion = '1.19.5'
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
}
@@ -70,10 +70,10 @@ dependencies {
// testing
testImplementation "org.apache.groovy:groovy:$groovyBinaryVersion"
- testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+ testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
testImplementation 'org.objenesis:objenesis:3.3' // Mock creation with constructor parameters
- testImplementation 'net.bytebuddy:byte-buddy:1.14.10' // Mocks of classes
+ testImplementation 'net.bytebuddy:byte-buddy:1.14.12' // Mocks of classes
// testcontainers (docker framework for testing)
testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -83,17 +83,17 @@ dependencies {
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
// logging
- implementation platform('org.apache.logging.log4j:log4j-bom:2.22.0')
+ implementation platform('org.apache.logging.log4j:log4j-bom:2.22.1')
implementation 'org.apache.logging.log4j:log4j-api' // log4j
implementation 'org.apache.logging.log4j:log4j-core' // log4j
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
// Databases
- implementation 'org.influxdb:influxdb-java:2.23'
- implementation 'com.couchbase.client:java-client:3.5.0'
- runtimeOnly 'org.postgresql:postgresql:42.7.0' // postgresql jdbc driver required during runtime
+ implementation 'org.influxdb:influxdb-java:2.24'
+ implementation 'com.couchbase.client:java-client:3.5.3'
+ runtimeOnly 'org.postgresql:postgresql:42.7.2' // postgresql jdbc driver required during runtime
- implementation 'commons-io:commons-io:2.15.0' // I/O functionalities
+ implementation 'commons-io:commons-io:2.15.1' // I/O functionalities
implementation 'org.apache.commons:commons-compress:1.25.0' // I/O functionalities
implementation 'org.apache.commons:commons-lang3:3.14.0'
}
diff --git a/docs/readthedocs/gettingstarted.md b/docs/readthedocs/gettingstarted.md
new file mode 100644
index 000000000..92a2d54e4
--- /dev/null
+++ b/docs/readthedocs/gettingstarted.md
@@ -0,0 +1,47 @@
+# Getting started
+
+Welcome, dear fellow of bottom up power system modelling!
+This section is meant to give you some help getting hands on our project.
+If you feel, something is missing, please contact us!
+
+## Requirements
+
+Java > v 17
+
+## Where to get
+
+Checkout latest from [GitHub](https://github.com/ie3-institute/PowerSystemDataModel) or use maven for dependency
+management:
+
+### Stable releases
+
+On [Maven central](https://search.maven.org/artifact/com.github.ie3-institute/PowerSystemDataModel):
+
+```xml
+
+ com.github.ie3-institute
+ PowerSystemDataModel
+ 2.1.0
+
+```
+
+### Snapshot releases
+
+Available on [OSS Sonatype](https://s01.oss.sonatype.org/).
+Add the correct repository:
+
+```xml
+
+ https://s01.oss.sonatype.org/content/repositories/snapshots
+
+```
+
+and add the dependency:
+
+```xml
+
+ com.github.ie3-institute
+ PowerSystemDataModel
+ 3.0-SNAPSHOT
+
+```
diff --git a/docs/readthedocs/gettingstarted.rst b/docs/readthedocs/gettingstarted.rst
deleted file mode 100644
index 6115152b9..000000000
--- a/docs/readthedocs/gettingstarted.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-###############
-Getting started
-###############
-Welcome, dear fellow of bottom up power system modelling!
-This section is meant to give you some help getting hands on our project.
-If you feel, something is missing, please contact us!
-
-************
-Requirements
-************
-Java > v 17
-
-************
-Where to get
-************
-Checkout latest from `GitHub `_ or use maven for dependency
-management:
-
-Stable releases
-===============
-On `Maven central `_:
-
-.. code-block:: xml
-
-
- com.github.ie3-institute
- PowerSystemDataModel
- 2.1.0
-
-
-Snapshot releases
-=================
-Available on `OSS Sonatype `_.
-Add the correct repository:
-
-.. code-block:: xml
-
-
- https://s01.oss.sonatype.org/content/repositories/snapshots
-
-
-and add the dependency:
-
-.. code-block:: xml
-
-
- com.github.ie3-institute
- PowerSystemDataModel
- 3.0-SNAPSHOT
-
diff --git a/docs/readthedocs/index.md b/docs/readthedocs/index.md
new file mode 100644
index 000000000..f73b866a1
--- /dev/null
+++ b/docs/readthedocs/index.md
@@ -0,0 +1,34 @@
+# Documentation of the PowerSystemDataModel
+
+Welcome to the documentation of the PowerSystemDataModel.
+It provides an extensive data model capable of modelling energy systems with high granularity e.g. for bottom-up simulations.
+Additionally, useful functions to process, augment and furnish model i/o information is provided.
+Effective handling of geographic information related to power grids is also possible.
+
+```{toctree}
+:caption: 'Contents:'
+:maxdepth: 2
+
+gettingstarted
+models/models
+io/basiciousage
+```
+
+## Contact the (Main) Maintainers
+
+If you feel, something this missing, wrong or misleading, please contact one of our main contributors:
+
+> - [@sensarmad](https://github.com/sensarmad)
+> - [@t-ober](https://github.com/t-ober)
+> - [@danielfeismann](https://github.com/danielfeismann)
+> - [@sebastian-peter](https://github.com/sebastian-peter)
+> - [@jo-bao](https://github.com/jo-bao)
+> - [@julianhohmann](https://github.com/julianhohmann)
+
+Hat tip to all other contributors!
+
+# Indices and tables
+
+- {ref}`genindex`
+- {ref}`modindex`
+- {ref}`search`
diff --git a/docs/readthedocs/index.rst b/docs/readthedocs/index.rst
deleted file mode 100644
index edae434d4..000000000
--- a/docs/readthedocs/index.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-Documentation of the PowerSystemDataModel
-=========================================
-
-Welcome to the documentation of the PowerSystemDataModel.
-It provides an extensive data model capable of modelling energy systems with high granularity e.g. for bottom-up simulations.
-Additionally, useful functions to process, augment and furnish model i/o information is provided.
-Effective handling of geographic information related to power grids is also possible.
-
-.. toctree::
- :maxdepth: 2
- :caption: Contents:
-
- gettingstarted
- models/models
- io/basiciousage
-
-Contact the (Main) Maintainers
-------------------------------
-If you feel, something this missing, wrong or misleading, please contact one of our main contributors:
-
- * `@sensarmad `_
- * `@t-ober `_
- * `@danielfeismann `_
- * `@sebastian-peter `_
- * `@jo-bao `_
- * `@julianhohmann `_
-
-Hat tip to all other contributors!
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/docs/readthedocs/io/csvfiles.md b/docs/readthedocs/io/csvfiles.md
index e022918ad..34111a343 100644
--- a/docs/readthedocs/io/csvfiles.md
+++ b/docs/readthedocs/io/csvfiles.md
@@ -58,7 +58,7 @@ You may extend / alter the naming with pre- or suffix by calling `new EntityPers
Let's spend a few more words on the individual time series:
Those files are meant to carry different types of content - one might give information about wholesale market prices,
the other is a record of power values provided by a real system.
-To be able to understand, what's inside of the file, the *columnScheme* part of the file name gives insight of it's
+To be able to understand, what's inside of the file, the *columnScheme* part of the file name gives insight of its
content.
The following keys are supported until now:
diff --git a/docs/readthedocs/io/influxdb.rst b/docs/readthedocs/io/influxdb.md
similarity index 66%
rename from docs/readthedocs/io/influxdb.rst
rename to docs/readthedocs/io/influxdb.md
index 1bd69d48c..630705ffe 100644
--- a/docs/readthedocs/io/influxdb.rst
+++ b/docs/readthedocs/io/influxdb.md
@@ -1,33 +1,32 @@
-********
-InfluxDB
-********
-`InfluxDB `_ is a time series database. As such, it can only
-handle time based data like weather data or results.
-The PowerSystemDataModel offers two interface implementations for InfluxDB 1.x: WeatherSource and OutputDataSink.
-
-Introduction to InfluxDB
-========================
-InfluxDB is a NoSQL database as it is neither relational nor able to handle SQL queries, even though InfluxDB's own
-QueryLanguage, `InfluxQL `_ is very similar to SQL.
-InfluxDB persists data in *measurements*. A measurement is comparable to a table in a relational data model. It consists
-of a *measurement name*, *fields*, *tags* and a *time column*. The measurement name is the equivalent of a table name. Fields
-and tags are similar as they both hold data like columns in relational data. But while fields are supposed to hold
-the actual data, tags should only hold metadata, which is why tag values can only be strings. Under default
-configuration, one tag key can only hold 10 000 distinct tag values. This choice was made as tags are indexed and
-supposed to be queried. Fields should only be queried if not avoidable. The time column is automatically provided, it
-holds timestamps in `RFC3339 UTC `_, which for example looks like
-"2020-06-22T10:14:50.52Z". The equivalent to a table row is a measurement point. It holds field and tag values as well
-as the time. While the data values are optional, a timestamp is not. If no time is provided when persisting, the current
-system time is used.
-
-Instantiating an InfluxDB DataConnector
-=======================================
-To instantiate an InfluxDbConnector a connection url, a database name and a scenario name should be provided. The
-scenario name is used to build measurement names for results.
-If none of those are provided, default values are used.
-
-.. code-block:: java
-
- InfluxDbConnector unparameterizedInfluxDb = new InfluxDbConnector();
- InfluxDbConnector defaultInfluxDb = new InfluxDbConnector(""http://localhost:8086/", "ie3_in", null);
- unparameterizedInfluxDb.equals(defaultInfluxDb); //true
\ No newline at end of file
+# InfluxDB
+
+[InfluxDB](https://www.influxdata.com/products/influxdb-overview/) is a time series database. As such, it can only
+handle time based data like weather data or results.
+The PowerSystemDataModel offers two interface implementations for InfluxDB 1.x: WeatherSource and OutputDataSink.
+
+## Introduction to InfluxDB
+
+InfluxDB is a NoSQL database as it is neither relational nor able to handle SQL queries, even though InfluxDB's own
+QueryLanguage, [InfluxQL](https://docs.influxdata.com/influxdb/v1.8/query_language/) is very similar to SQL.
+InfluxDB persists data in *measurements*. A measurement is comparable to a table in a relational data model. It consists
+of a *measurement name*, *fields*, *tags* and a *time column*. The measurement name is the equivalent of a table name. Fields
+and tags are similar as they both hold data like columns in relational data. But while fields are supposed to hold
+the actual data, tags should only hold metadata, which is why tag values can only be strings. Under default
+configuration, one tag key can only hold 10 000 distinct tag values. This choice was made as tags are indexed and
+supposed to be queried. Fields should only be queried if not avoidable. The time column is automatically provided, it
+holds timestamps in [RFC3339 UTC](https://www.ietf.org/rfc/rfc3339.txt), which for example looks like
+"2020-06-22T10:14:50.52Z". The equivalent to a table row is a measurement point. It holds field and tag values as well
+as the time. While the data values are optional, a timestamp is not. If no time is provided when persisting, the current
+system time is used.
+
+## Instantiating an InfluxDB DataConnector
+
+To instantiate an InfluxDbConnector a connection url, a database name and a scenario name should be provided. The
+scenario name is used to build measurement names for results.
+If none of those are provided, default values are used.
+
+```java
+InfluxDbConnector unparameterizedInfluxDb = new InfluxDbConnector();
+InfluxDbConnector defaultInfluxDb = new InfluxDbConnector(""http://localhost:8086/", "ie3_in", null);
+unparameterizedInfluxDb.equals(defaultInfluxDb); //true
+```
diff --git a/docs/readthedocs/models/input/grid/gridcontainer.md b/docs/readthedocs/models/input/grid/gridcontainer.md
index e40d20c5c..c39ab3386 100644
--- a/docs/readthedocs/models/input/grid/gridcontainer.md
+++ b/docs/readthedocs/models/input/grid/gridcontainer.md
@@ -37,17 +37,49 @@ A synoptic overview of both classes' attributes is given here:
## Attributes, Units and Remarks
-| Attribute | Unit | Remarks |
-|:------------------------|:-----|:--------------------------------------------------|
-| gridName | -- | Human readable identifier |
-| rawGrid | -- | see below |
-| systemParticipants | -- | see below |
-| graphics | -- | see below |
-| subGridTopologyGraph | -- | topology of sub grids - only `JointGridContainer` |
-| predominantVoltageLevel | -- | main voltage level - only `SubGridContainer` |
-| subnet | -- | sub grid number - only `SubGridContainer` |
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - gridName
+ - –
+ - Human readable identifier
+
+ * - rawGrid
+ - –
+ - see below
+
+ * - systemParticipants
+ - –
+ - see below
+
+ * - graphics
+ - –
+ - see below
+
+ * - subGridTopologyGraph
+ - –
+ - topology of sub grids - only
+ ``JointGridContainer``
+
+ * - predominantVoltageLevel
+ - –
+ - main voltage level - only
+ ``SubGridContainer``
+
+ * - subnet
+ - –
+ - sub grid number - only
+ ``SubGridContainer``
+
+```
+
### RawGridElements
This sub container simply holds:
@@ -89,4 +121,4 @@ This sub container simply holds:
## Caveats
Nothing - at least not known.
-If you found something, please contact us!
\ No newline at end of file
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/line.md b/docs/readthedocs/models/input/grid/line.md
index 7c8facdf7..bd4a6f719 100644
--- a/docs/readthedocs/models/input/grid/line.md
+++ b/docs/readthedocs/models/input/grid/line.md
@@ -6,94 +6,475 @@ Representation of an AC line.
### Type Model
-| Attribute | Unit | Remarks |
-|:----------|:--------|:--------------------------------------------|
-| uuid | -- | |
-| id | -- | Human readable identifier |
-| r | Ω / km | Phase resistance per length |
-| x | Ω / km | Phase reactance per length |
-| g | µS / km | Phase-to-ground conductance per length |
-| b | µS / km | Phase-to-ground susceptance per length |
-| iMax | A | Maximum permissible current |
-| vRated | kV | Rated voltage |
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+ * - Attribute
+ - Unit
+ - Remarks
-A list with some standard line types can be found here: `Standard Line Types`_
+ * - uuid
+ - –
+ -
+ * - id
+ - –
+ - Human readable identifier
+
+ * - r
+ - Ω / km
+ - Phase resistance per length
+
+ * - x
+ - Ω / km
+ - Phase resistance per length
+
+ * - g
+ - µS / km
+ - Phase-to-ground conductance per length
+
+ * - b
+ - µS / km
+ - Phase-to-ground conductance per length
+
+ * - iMax
+ - A
+ - Maximum permissible current
+
+ * - vRated
+ - kV
+ - Rated voltage
+
+```
+
+A list with some standard line types can be found here: [Standard Line Types](#standard-line-types)
### Entity Model
-| Attribute | Unit | Remarks |
-|:------------------|:-----|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| uuid | -- | |
-| id | -- | Human readable identifier |
-| operator | -- | |
-| operationTime | -- | Timely restriction of operation |
-| nodeA | -- | |
-| nodeB | -- | |
-| parallelDevices | -- | overall amount of parallel lines to automatically
construct (e.g. parallelDevices = 2 will build a
total of two lines using the specified parameters) |
-| type | -- | |
-| length | km | |
-| geoPosition | -- | Line string of geographical locations describing the
position of the line |
-| olmCharacteristic | -- | Characteristic of possible overhead line monitoring
Can be given in the form of `olm:{}`.
The pairs are wind velocity in x and permissible
loading in y. |
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - –
+ -
+
+ * - id
+ - –
+ - Human readable identifier
+
+ * - operator
+ - –
+ -
+
+ * - operationTime
+ - –
+ - Timely restriction of operation
+
+ * - nodeA
+ - –
+ -
+
+ * - nodeB
+ - –
+ -
+
+ * - parallelDevices
+ - –
+ - | overall amount of parallel lines to automatically construct
+ | (e.g. parallelDevices = 2 will build a total of two lines
+ | using the specified parameters)
+
+ * - type
+ - –
+ -
+
+ * - length
+ - km
+ -
+ * - geoPosition
+ - –
+ - Line string of geographical locations describing the
+ position of the line
+ * - olmCharacteristic
+ - –
+ - | Characteristic of possible overhead line monitoring Can be
+ | given in the form of ``olm:{}``. The pairs
+ | are wind velocity in x and permissible loading in y.
+
+```
## Standard Line Types
Following there are some standard line types with their source. A ``csv file`` containing the types listed below can be found
-`here `_. This file can be used directly
+[here](https://github.com/ie3-institute/PowerSystemDataModel/tree/dev/input/StandardAssetTypes). This file can be used directly
for any simulation with ``simona``.
-The lines which source is ``simBench`` are from `here `_.
+The lines which source is ``simBench`` are from [here](https://simbench.de/en/download/datasets/).
### Overhead Lines
Some standard overhead lines.
-| uuid | b | g | iMax | id | r | vRated | x | source |
-|:--------------------------------------|--------:|----:|--------:|--------------------:|---------:|-------:|---------:|:---------|
-| 91617ab8-3de2-4fba-be45-a54473ba09a9 | 3.61283 | 0.0 | 1300.0 | LineType_1 | 0.08 | 380.0 | 0.32 | simBench |
-| b3b231ae-a971-4432-80d7-4ce2f2a56a32 | 3.22799 | 0.0 | 1950.0 | LineType_4 | 0.033333 | 380.0 | 0.333333 | simBench |
-| 24595f91-8295-41f8-a3d8-c9418d860d9c | 1.076 | 0.0 | 650.0 | LineType_6 | 0.1 | 380.0 | 1.0 | simBench |
-| f0fc57ec-aa5a-4484-b870-be70a5428cbd | 6.45597 | 0.0 | 3900.0 | LineType_9 | 0.016667 | 380.0 | 0.166667 | simBench |
-| ba70d8e7-b082-49bc-8c45-3c10e1236c3e | 8.60796 | 0.0 | 5200.0 | LineType_10 | 0.0125 | 380.0 | 0.125 | simBench |
-| veee8eeed-62c9-4345-aa5a-3743fe32007d | 12.9119 | 0.0 | 7800.0 | LineType_11 | 0.008333 | 380.0 | 0.083333 | simBench |
-| d2b16935-dcd7-44d2-8623-cec4c703ccdc | 17.2159 | 0.0 | 10400.0 | LineType_12 | 0.00625 | 380.0 | 0.0625 | simBench |
-| a490c96e-6e90-485a-b0d7-adeb81fa09cd | 4.30398 | 0.0 | 2600.0 | LineType_2 | 0.025 | 220.0 | 0.25 | simBench |
-| 5272bcbc-7d0e-4759-85fa-27943fd8d19c | 2.15199 | 0.0 | 1300.0 | LineType_3 | 0.05 | 220.0 | 0.5 | simBench |
-| dd0bac07-de8d-4608-af36-b8ff2819f55a | 7.22566 | 0.0 | 2600.0 | LineType_5 | 0.04 | 220.0 | 0.16 | simBench |
-| 64c1dcb5-57a5-4f35-b2bf-9ae4e6cc4943 | 1.80642 | 0.0 | 650.0 | LineType_7 | 0.16 | 220.0 | 0.64 | simBench |
-| bdc83a85-c796-4bcb-8b79-8988dc2804f8 | 5.41925 | 0.0 | 1950.0 | LineType_8 | 0.053333 | 220.0 | 0.213333 | simBench |
-| 3d75fb6b-f0be-4451-ab4c-7f00c0ebd619 | 2.8274 | 0.0 | 680.0 | Al/St_265/35 | 0.1095 | 110.0 | 0.296 | simBench |
-| f5dcaf44-7a9a-4b85-89ba-5c15c04c5766 | 3.45575 | 0.0 | 105.0 | 15-AL1/3-ST1A 20.0 | 1.8769 | 20.0 | 0.409 | simBench |
-| 9cbf484b-7256-4e7a-9c35-3e1049909aa0 | 3.53429 | 0.0 | 140.0 | 24-AL1/4-ST1A 20.0 | 1.2012 | 20.0 | 0.394 | simBench |
-| 5b542a50-b0c2-4497-ba90-b2b31aafaa0b | 2.87456 | 0.0 | 170.0 | 34-AL1/6-ST1A 20.0 | 0.8342 | 20.0 | 0.382 | simBench |
-| d594cd67-4459-44bc-9594-db710372db71 | 2.98451 | 0.0 | 210.0 | 48-AL1/8-ST1A 20.0 | 0.5939 | 20.0 | 0.372 | simBench |
-| 305e60ad-cfd2-4127-9d83-8d9b21942d93 | 3.04734 | 0.0 | 290.0 | 70-AL1/11-ST1A 20.0 | 0.4132 | 20.0 | 0.36 | simBench |
+```{eval-rst}
+.. list-table::
+ :widths: 11 11 11 11 11 11 11 11 11
+ :header-rows: 0
+
+
+ * - uuid
+ - b
+ - g
+ - iMax
+ - id
+ - r
+ - vRated
+ - x
+ - source
+
+ * - 91617ab8-3de2-4fba-be45-a54473ba09a9
+ - 3.61283
+ - 0.0
+ - 1300.0
+ - LineType_1
+ - 0.08
+ - 380.0
+ - 0.32
+ - simBench
+
+ * - b3b231ae-a971-4432-80d7-4ce2f2a56a32
+ - 3.22799
+ - 0.0
+ - 1950.0
+ - LineType_4
+ - 0.033333
+ - 380.0
+ - 0.333333
+ - simBench
+
+ * - 24595f91-8295-41f8-a3d8-c9418d860d9c
+ - 1.076
+ - 0.0
+ - 650.0
+ - LineType_6
+ - 0.1
+ - 380.0
+ - 1.0
+ - simBench
+
+ * - f0fc57ec-aa5a-4484-b870-be70a5428cbd
+ - 6.45597
+ - 0.0
+ - 3900.0
+ - LineType_9
+ - 0.016667
+ - 380.0
+ - 0.166667
+ - simBench
+
+ * - ba70d8e7-b082-49bc-8c45-3c10e1236c3e
+ - 8.60796
+ - 0.0
+ - 5200.0
+ - LineType_10
+ - 0.0125
+ - 380.0
+ - 0.125
+ - simBench
+
+ * - veee8eeed-62c9-4345-aa5a-3743fe32007d
+ - 12.9119
+ - 0.0
+ - 7800.0
+ - LineType_11
+ - 0.008333
+ - 380.0
+ - 0.083333
+ - simBench
+
+ * - d2b16935-dcd7-44d2-8623-cec4c703ccdc
+ - 17.2159
+ - 0.0
+ - 10400.0
+ - LineType_12
+ - 0.00625
+ - 380.0
+ - 0.0625
+ - simBench
+
+ * - a490c96e-6e90-485a-b0d7-adeb81fa09cd
+ - 4.30398
+ - 0.0
+ - 2600.0
+ - LineType_2
+ - 0.025
+ - 220.0
+ - 0.25
+ - simBench
+
+ * - 5272bcbc-7d0e-4759-85fa-27943fd8d19c
+ - 2.15199
+ - 0.0
+ - 1300.0
+ - LineType_3
+ - 0.05
+ - 220.0
+ - 0.5
+ - simBench
+
+ * - dd0bac07-de8d-4608-af36-b8ff2819f55a
+ - 7.22566
+ - 0.0
+ - 2600.0
+ - LineType_5
+ - 0.04
+ - 220.0
+ - 0.16
+ - simBench
+
+ * - 64c1dcb5-57a5-4f35-b2bf-9ae4e6cc4943
+ - 1.80642
+ - 0.0
+ - 650.0
+ - LineType_7
+ - 0.16
+ - 220.0
+ - 0.64
+ - simBench
+
+ * - bdc83a85-c796-4bcb-8b79-8988dc2804f8
+ - 5.41925
+ - 0.0
+ - 1950.0
+ - LineType_8
+ - 0.053333
+ - 220.0
+ - 0.213333
+ - simBench
+
+ * - 3d75fb6b-f0be-4451-ab4c-7f00c0ebd619
+ - 2.8274
+ - 0.0
+ - 680.0
+ - Al/St_265/35
+ - 0.1095
+ - 110.0
+ - 0.296
+ - simBench
+
+ * - 5b542a50-b0c2-4497-ba90-b2b31aafaa0b
+ - 2.87456
+ - 0.0
+ - 170.0
+ - 34-AL1/6-ST1A 20.0
+ - 0.8342
+ - 20.0
+ - 0.382
+ - simBench
+
+ * - d594cd67-4459-44bc-9594-db710372db71
+ - 2.98451
+ - 0.0
+ - 210.0
+ - 48-AL1/8-ST1A 20.0
+ - 0.5939
+ - 20.0
+ - 0.372
+ - simBench
+
+ * - 305e60ad-cfd2-4127-9d83-8d9b21942d93
+ - 3.04734
+ - 0.0
+ - 290.0
+ - 70-AL1/11-ST1A 20.0
+ - 0.4132
+ - 20.0
+ - 0.36
+ - simBench
+```
+
### Cables
Some standard cables.
-| uuid | b | g | iMax | id | r | vRated | x | source |
-|:-------------------------------------|--------:|----:|------:|-----------------------------:|-------:|-------:|----------:|:---------|
-| cc59abd4-770b-45d2-98c8-919c91f1ca4b | 58.7478 | 0.0 | 652.0 | 1x630_RM/50 | 0.122 | 110.0 | 0.122522 | simBench |
-| 82ea1b98-2b21-48bd-841a-8d17d8ac20c9 | 59.3761 | 0.0 | 158.0 | NA2XS2Y 1x50 RM/25 12/20 kV | 0.64 | 20.0 | 0.145 | simBench |
-| 4adef9e6-5e40-416d-8bd2-b6768d156c54 | 59.6903 | 0.0 | 220.0 | NA2XS2Y 1x70 RM/25 12/20 kV | 0.443 | 20.0 | 0.132 | simBench |
-| d5c03484-59c2-44d5-a2ee-63a5a0d623b4 | 67.8584 | 0.0 | 252.0 | NA2XS2Y 1x95 RM/25 12/20 kV | 0.313 | 20.0 | 0.132 | simBench |
-| 9c13909d-1dd1-4e2d-980b-55345bdf0fd0 | 72.2566 | 0.0 | 283.0 | NA2XS2Y 1x120 RM/25 12/20 kV | 0.253 | 20.0 | 0.119 | simBench |
-| 36243493-eb31-4e81-bd13-b54ef59c4cbe | 78.5398 | 0.0 | 319.0 | NA2XS2Y 1x150 RM/25 12/20 kV | 0.206 | 20.0 | 0.116 | simBench |
-| 437689f8-366d-4b04-b42d-d7a754db074b | 85.7655 | 0.0 | 362.0 | NA2XS2Y 1x185 RM/25 12/20 kV | 0.161 | 20.0 | 0.117 | simBench |
-| b459115d-d4eb-47d4-b7ec-625339ee0dcc | 95.5044 | 0.0 | 421.0 | NA2XS2Y 1x240 RM/25 12/20 kV | 0.122 | 20.0 | 0.112 | simBench |
-| 9aed5818-c037-4033-8d15-806c62d70b8f | 113.097 | 0.0 | 315.0 | NA2XS2Y 1x150 RM/25 6/10 kV | 0.206 | 10.0 | 0.11 | simBench |
-| 60d37bc7-157a-4c32-b1b5-e74c10d70531 | 127.549 | 0.0 | 358.0 | NA2XS2Y 1x185 RM/25 6/10 kV | 0.161 | 10.0 | 0.11 | simBench |
-| a3ced617-2ffd-4593-b8e9-bcad9a521aab | 143.257 | 0.0 | 416.0 | NA2XS2Y 1x240 RM/25 6/10 kV | 0.122 | 10.0 | 0.105 | simBench |
-| f0484bb6-9d0d-4d13-bfbe-b83783b8352a | 150.796 | 0.0 | 471.0 | NA2XS2Y 1x300 RM/25 6/10 kV | 0.1 | 10.0 | 0.0974 | simBench |
-| 6b223bc3-69e2-4eb8-a2c0-76be1cd2c998 | 169.646 | 0.0 | 535.0 | NA2XS2Y 1x400 RM/25 6/10 kV | 0.078 | 10.0 | 0.0942 | simBench |
-| 65181464-230a-487b-978f-81e406e9eb22 | 260.752 | 0.0 | 270.0 | NAYY 4x150SE 0.6/1kV | 0.2067 | 0.4 | 0.0804248 | simBench |
-| 1200d9eb-6d10-47f3-8543-abea43b128d3 | 273.319 | 0.0 | 357.0 | NAYY 4x240SE 0.6/1kV | 0.1267 | 0.4 | 0.0797965 | simBench |
+```{eval-rst}
+.. list-table::
+ :widths: 11 11 11 11 11 11 11 11 11
+ :header-rows: 0
+
+
+ * - uuid
+ - b
+ - g
+ - iMax
+ - id
+ - r
+ - vRated
+ - x
+ - source
+
+ * - cc59abd4-770b-45d2-98c8-919c91f1ca4b
+ - 58.7478
+ - 0.0
+ - 652.0
+ - 1x630_RM/50
+ - 0.122
+ - 110.0
+ - 0.122522
+ - simBench
+
+ * - 82ea1b98-2b21-48bd-841a-8d17d8ac20c9
+ - 59.3761
+ - 0.0
+ - 158.0
+ - NA2XS2Y 1x50 RM/25 12/20 kV
+ - 0.64
+ - 20.0
+ - 0.145
+ - simBench
+
+ * - 4adef9e6-5e40-416d-8bd2-b6768d156c54
+ - 59.6903
+ - 0.0
+ - 220.0
+ - NA2XS2Y 1x70 RM/25 12/20 kV
+ - 0.443
+ - 20.0
+ - 0.132
+ - simBench
+
+ * - d5c03484-59c2-44d5-a2ee-63a5a0d623b4
+ - 67.8584
+ - 0.0
+ - 252.0
+ - NA2XS2Y 1x95 RM/25 12/20 kV
+ - 0.313
+ - 20.0
+ - 0.132
+ - simBench
+
+ * - 9c13909d-1dd1-4e2d-980b-55345bdf0fd0
+ - 72.2566
+ - 0.0
+ - 283.0
+ - NA2XS2Y 1x120 RM/25 12/20 kV
+ - 0.253
+ - 20.0
+ - 0.119
+ - simBench
+
+ * - 36243493-eb31-4e81-bd13-b54ef59c4cbe
+ - 78.5398
+ - 0.0
+ - 319.0
+ - NA2XS2Y 1x150 RM/25 12/20 kV
+ - 0.206
+ - 20.0
+ - 0.116
+ - simBench
+
+ * - 437689f8-366d-4b04-b42d-d7a754db074b
+ - 85.7655
+ - 0.0
+ - 362.0
+ - NA2XS2Y 1x185 RM/25 12/20 kV
+ - 0.161
+ - 20.0
+ - 0.117
+ - simBench
+
+ * - b459115d-d4eb-47d4-b7ec-625339ee0dcc
+ - 95.5044
+ - 0.0
+ - 421.0
+ - NA2XS2Y 1x240 RM/25 12/20 kV
+ - 0.122
+ - 20.0
+ - 0.112
+ - simBench
+
+ * - 9aed5818-c037-4033-8d15-806c62d70b8f
+ - 113.097
+ - 0.0
+ - 315.0
+ - NA2XS2Y 1x150 RM/25 6/10 kV
+ - 0.206
+ - 10.0
+ - 0.11
+ - simBench
+
+ * - 60d37bc7-157a-4c32-b1b5-e74c10d70531
+ - 127.549
+ - 0.0
+ - 358.0
+ - NA2XS2Y 1x185 RM/25 6/10 kV
+ - 0.161
+ - 10.0
+ - 0.11
+ - simBench
+
+ * - a3ced617-2ffd-4593-b8e9-bcad9a521aab
+ - 143.257
+ - 0.0
+ - 416.0
+ - NA2XS2Y 1x240 RM/25 6/10 kV
+ - 0.122
+ - 10.0
+ - 0.105
+ - simBench
+
+ * - f0484bb6-9d0d-4d13-bfbe-b83783b8352a
+ - 150.796
+ - 0.0
+ - 471.0
+ - NA2XS2Y 1x300 RM/25 6/10 kV
+ - 0.1
+ - 10.0
+ - 0.0974
+ - simBench
+
+ * - 6b223bc3-69e2-4eb8-a2c0-76be1cd2c998
+ - 169.646
+ - 0.0
+ - 535.0
+ - NA2XS2Y 1x400 RM/25 6/10 kV
+ - 0.078
+ - 10.0
+ - 0.0942
+ - simBench
+
+ * - 65181464-230a-487b-978f-81e406e9eb22
+ - 260.752
+ - 0.0
+ - 270.0
+ - NAYY 4x150SE 0.6/1kV
+ - 0.2067
+ - 0.4
+ - 0.0804248
+ - simBench
+
+ * - 1200d9eb-6d10-47f3-8543-abea43b128d3
+ - 273.319
+ - 0.0
+ - 357.0
+ - NAYY 4x240SE 0.6/1kV
+ - 0.1267
+ - 0.4
+ - 0.0797965
+ - simBench
+```
## Caveats
diff --git a/docs/readthedocs/models/input/grid/linegraphic.md b/docs/readthedocs/models/input/grid/linegraphic.md
new file mode 100644
index 000000000..d97d695ab
--- /dev/null
+++ b/docs/readthedocs/models/input/grid/linegraphic.md
@@ -0,0 +1,41 @@
+(line-graphic-model)=
+
+# Schematic Line Graphic
+
+Schematic drawing information for a line model.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - graphicLayer
+ - --
+ - | Human readable identifier of the graphic layer to draw
+ | this element on
+
+ * - path
+ - --
+ - Line string of coordinates describing the drawing
+
+ * - line
+ - --
+ - Reference to the physical line model
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/linegraphic.rst b/docs/readthedocs/models/input/grid/linegraphic.rst
deleted file mode 100644
index f187ed05a..000000000
--- a/docs/readthedocs/models/input/grid/linegraphic.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-.. _line_graphic_model:
-
-Schematic Line Graphic
-----------------------
-Schematic drawing information for a line model.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+--------------+------+-----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==============+======+===========================================================+
-| uuid | -- | |
-+--------------+------+-----------------------------------------------------------+
-| graphicLayer | -- | | Human readable identifier of the graphic layer to draw |
-| | | | this element on |
-+--------------+------+-----------------------------------------------------------+
-| path | -- | Line string of coordinates describing the drawing |
-+--------------+------+-----------------------------------------------------------+
-| line | -- | Reference to the physical line model |
-+--------------+------+-----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/measurementunit.md b/docs/readthedocs/models/input/grid/measurementunit.md
new file mode 100644
index 000000000..0d00d0f3a
--- /dev/null
+++ b/docs/readthedocs/models/input/grid/measurementunit.md
@@ -0,0 +1,62 @@
+(measurement-unit-model)=
+
+# Measurement Unit
+
+Representation of a measurement unit placed at a node.
+It can be used to mark restrictive access to simulation results to e.g. control algorithms.
+The measured information are indicated by boolean fields.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - vMag
+ - --
+ - Voltage magnitude measurements are available
+
+ * - vAng
+ - --
+ - Voltage angle measurements are available
+
+ * - p
+ - --
+ - Active power measurements are available
+
+ * - q
+ - --
+ - Reactive power measurements are available
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/measurementunit.rst b/docs/readthedocs/models/input/grid/measurementunit.rst
deleted file mode 100644
index 56cada24f..000000000
--- a/docs/readthedocs/models/input/grid/measurementunit.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. _measurement_unit_model:
-
-Measurement Unit
-----------------
-Representation of a measurement unit placed at a node.
-It can be used to mark restrictive access to simulation results to e.g. control algorithms.
-The measured information are indicated by boolean fields.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+---------------+------+----------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+======+==============================================+
-| uuid | -- | |
-+---------------+------+----------------------------------------------+
-| id | -- | Human readable identifier |
-+---------------+------+----------------------------------------------+
-| operator | -- | |
-+---------------+------+----------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+---------------+------+----------------------------------------------+
-| node | -- | |
-+---------------+------+----------------------------------------------+
-| vMag | -- | Voltage magnitude measurements are available |
-+---------------+------+----------------------------------------------+
-| vAng | -- | Voltage angle measurements are available |
-+---------------+------+----------------------------------------------+
-| p | -- | Active power measurements are available |
-+---------------+------+----------------------------------------------+
-| q | -- | Reactive power measurements are available |
-+---------------+------+----------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/node.md b/docs/readthedocs/models/input/grid/node.md
new file mode 100644
index 000000000..f60c0d21a
--- /dev/null
+++ b/docs/readthedocs/models/input/grid/node.md
@@ -0,0 +1,62 @@
+(node-model)=
+
+# Node
+
+Representation of an electrical node, with no further distinction into bus bar, auxiliary node or others.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - vTarget
+ - p.u.
+ - Target voltage magnitude to be used by voltage regulation entities
+
+ * - slack
+ - --
+ - | Boolean indicator, if this nodes serves as a slack node in power
+ | flow calculation
+
+ * - geoPosition
+ - --
+ - Geographical location
+
+ * - voltLvl
+ - --
+ - Information of the voltage level (id and nominal voltage)
+
+ * - subnet
+ - --
+ - Sub grid number
+
+```
+
+## Caveats
+
+System participants, that need to have geographical locations, inherit the position from the node.
+If the overall location does not play a big role, you are able to use the default location with
+{code}`NodeInput#DEFAULT_GEO_POSITION` being located on TU Dortmund university's campus ([See on OpenStreetMaps](https://www.openstreetmap.org/search?query=51.4843281%2C%207.4116482#map=15/51.4843/7.4117)).
diff --git a/docs/readthedocs/models/input/grid/node.rst b/docs/readthedocs/models/input/grid/node.rst
deleted file mode 100644
index eedd8f42b..000000000
--- a/docs/readthedocs/models/input/grid/node.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. _node_model:
-
-Node
-----
-Representation of an electrical node, with no further distinction into bus bar, auxiliary node or others.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+---------------+------+--------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+======+====================================================================+
-| uuid | -- | |
-+---------------+------+--------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+---------------+------+--------------------------------------------------------------------+
-| operator | -- | |
-+---------------+------+--------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+---------------+------+--------------------------------------------------------------------+
-| vTarget | p.u. | Target voltage magnitude to be used by voltage regulation entities |
-+---------------+------+--------------------------------------------------------------------+
-| slack | -- | | Boolean indicator, if this nodes serves as a slack node in power |
-| | | | flow calculation |
-+---------------+------+--------------------------------------------------------------------+
-| geoPosition | -- | Geographical location |
-+---------------+------+--------------------------------------------------------------------+
-| voltLvl | -- | Information of the voltage level (id and nominal voltage) |
-+---------------+------+--------------------------------------------------------------------+
-| subnet | -- | Sub grid number |
-+---------------+------+--------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-System participants, that need to have geographical locations, inherit the position from the node.
-If the overall location does not play a big role, you are able to use the default location with
-:code:`NodeInput#DEFAULT_GEO_POSITION` being located on TU Dortmund university's campus (`See on OpenStreetMaps `_).
diff --git a/docs/readthedocs/models/input/grid/nodegraphic.md b/docs/readthedocs/models/input/grid/nodegraphic.md
new file mode 100644
index 000000000..6bb73c0ef
--- /dev/null
+++ b/docs/readthedocs/models/input/grid/nodegraphic.md
@@ -0,0 +1,45 @@
+(node-graphic-model)=
+
+# Schematic Node Graphic
+
+Schematic drawing information for a node model.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - graphicLayer
+ - --
+ - | Human readable identifier of the graphic layer to draw
+ | this element on
+
+ * - path
+ - --
+ - Line string of coordinates describing the drawing, e.g. for bus bars
+
+ * - point
+ - --
+ - Alternative to line string, only drawing a point coordinate
+
+ * - node
+ - --
+ - Reference to the physical node model
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/nodegraphic.rst b/docs/readthedocs/models/input/grid/nodegraphic.rst
deleted file mode 100644
index afdbb1c9a..000000000
--- a/docs/readthedocs/models/input/grid/nodegraphic.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _node_graphic_model:
-
-Schematic Node Graphic
-----------------------
-Schematic drawing information for a node model.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+--------------+------+----------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==============+======+======================================================================+
-| uuid | -- | |
-+--------------+------+----------------------------------------------------------------------+
-| graphicLayer | -- | | Human readable identifier of the graphic layer to draw |
-| | | | this element on |
-+--------------+------+----------------------------------------------------------------------+
-| path | -- | Line string of coordinates describing the drawing, e.g. for bus bars |
-+--------------+------+----------------------------------------------------------------------+
-| point | -- | Alternative to line string, only drawing a point coordinate |
-+--------------+------+----------------------------------------------------------------------+
-| node | -- | Reference to the physical node model |
-+--------------+------+----------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/switch.md b/docs/readthedocs/models/input/grid/switch.md
new file mode 100644
index 000000000..a4ab706cc
--- /dev/null
+++ b/docs/readthedocs/models/input/grid/switch.md
@@ -0,0 +1,53 @@
+(switch-model)=
+
+# Switch
+
+Model of an ideal switch connecting two node models of the same voltage level
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - nodeA
+ - --
+ -
+
+ * - nodeB
+ - --
+ -
+
+ * - closed
+ - --
+ - true, if the switch is closed
+
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/switch.rst b/docs/readthedocs/models/input/grid/switch.rst
deleted file mode 100644
index c41346886..000000000
--- a/docs/readthedocs/models/input/grid/switch.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-.. _switch_model:
-
-Switch
-------
-Model of an ideal switch connecting two node models of the same voltage level
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+---------------+------+---------------------------------+
-| Attribute | Unit | Remarks |
-+===============+======+=================================+
-| uuid | -- | |
-+---------------+------+---------------------------------+
-| id | -- | Human readable identifier |
-+---------------+------+---------------------------------+
-| operator | -- | |
-+---------------+------+---------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+---------------+------+---------------------------------+
-| nodeA | -- | |
-+---------------+------+---------------------------------+
-| nodeB | -- | |
-+---------------+------+---------------------------------+
-| closed | -- | true, if the switch is closed |
-+---------------+------+---------------------------------+
-
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/grid/transformer2w.md b/docs/readthedocs/models/input/grid/transformer2w.md
index a213b09dc..6e4ef7c6f 100644
--- a/docs/readthedocs/models/input/grid/transformer2w.md
+++ b/docs/readthedocs/models/input/grid/transformer2w.md
@@ -10,66 +10,347 @@ It is assumed, that node A is the node with higher voltage.
All impedances and admittances are given with respect to the higher voltage side.
As obvious, the parameter can be used in T- as in 𝜋-equivalent circuit representations.
-| Attribute | Unit | Remarks |
-|:----------|:-----|:--------------------------------------------------------|
-| id | | Human readable identifier |
-| rSc | Ω | Short circuit resistance |
-| xSc | Ω | Short circuit reactance |
-| gM | nS | No load conductance |
-| bM | nS | No load susceptance |
-| sRated | kVA | Rated apparent power |
-| vRatedA | kV | Rated voltage at higher voltage terminal |
-| vRatedB | kV | Rated voltage at lower voltage terminal |
-| dV | % | Voltage magnitude increase per tap position |
-| dPhi | ° | Voltage angle increase per tap position |
-| tapSide | | true, if tap changer is installed on lower voltage side |
-| tapNeutr | | Neutral tap position |
-| tapMin | | Minimum tap position |
-| tapMax | | Maximum tap position |
-
-A list with some standard transformer types can be found here: `Standard Two Winding Transformer Types`_
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - id
+ -
+ - Human readable identifier
+
+ * - rSc
+ - Ω
+ - Short circuit resistance
+
+ * - xSc
+ - Ω
+ - Short circuit reactance
+
+ * - gM
+ - nS
+ - No load conductance
+
+ * - bM
+ - nS
+ - No load susceptance
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - vRatedA
+ - kV
+ - Rated voltage at higher voltage terminal
+
+ * - vRatedB
+ - kV
+ - Rated voltage at lower voltage terminal
+
+ * - dV
+ - %
+ - Voltage magnitude increase per tap position
+
+ * - dPhi
+ - °
+ - Voltage angle increase per tap position
+
+ * - tapSide
+ -
+ - true, if tap changer is installed on lower voltage
+ side
+
+ * - tapNeutr
+ -
+ - Neutral tap position
+
+ * - tapMin
+ -
+ - Minimum tap position
+
+ * - tapMax
+ -
+ - Maximum tap position
+```
+
+A list with some standard transformer types can be found here: [Standard Two Winding Transformer Types](#standard-two-winding-transformer-types)
### Entity Model
-| Attribute | Unit | Remarks |
-|:----------------|:-----|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| uuid | -- | |
-| id | -- | Human readable identifier |
-| operator | -- | |
-| operationTime | -- | Timely restriction of operation |
-| nodeA | -- | Higher voltage node |
-| nodeB | -- | Lower voltage node |
-| parallelDevices | -- | overall amount of parallel transformers to automatically
construct (e.g. parallelDevices = 2 will build a
total of two transformers using the specified parameters) |
-| type | -- | |
-| tapPos | -- | Current position of the tap changer |
-| autoTap | -- | true, if there is a tap regulation apparent and active |
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+ * - Attribute
+ - Unit
+ - Remarks
-## Standard Two Winding Transformer Types
+ * - uuid
+ - –
+ -
+ * - id
+ - –
+ - Human readable identifier
-Following there are some standard two winding transformer types with their source. A ``csv file`` containing the types listed
-below can be found `here `_. This
-file can be used directly for any simulation with ``simona``.
-The transformers which source is ``simBench`` are from `here `_.
+ * - operator
+ - –
+ -
+
+ * - operationTime
+ - –
+ - Timely restriction of operation
+
+ * - nodeA
+ - –
+ - Higher voltage node
+
+ * - nodeB
+ - –
+ - Lower voltage node
+ * - parallelDevices
+ - –
+ - | overall amount of parallel transformers to automatically
+ | construct (e.g. parallelDevices = 2 will build a total of
+ | two transformers using the specified parameters)
-| uuid | bM | dPhi | dV | gM | id | rSc | sRated | tapMax | tapMin | tapNeutr | tapSide | vRatedA | vRatedB | xSc | source |
-|:-------------------------------------|--------------------:|-----:|----:|-------------------:|------------------------------------:|--------------------:|---------:|-------:|-------:|---------:|--------:|--------:|--------:|-------------------:|:---------|
-| 5a890aae-b9c9-4ebf-8a49-8850ae9df402 | 219.43184927638458 | 0.0 | 1.0 | 1731.3019390581715 | Typ_x_380/220 | 0.6016666666666666 | 600000.0 | 16 | -16 | 0 | false | 380.0 | 220.0 | 44.51926783240413 | simBench |
-| 03159c0d-126e-47cc-9871-066870df3a3f | 1193.4686938790917 | 0.0 | 1.0 | 831.0249307479223 | 350MVA_380/110 | 1.0608979591836734 | 350000.0 | 16 | -16 | 0 | false | 380.0 | 110.0 | 9 0.75951402093402 | simBench |
-| 7cb289cb-e6af-4470-9c68-e5a91978a5e7 | 2013.800484464662 | 0.0 | 1.0 | 1446.280991735537 | 300MVA_220/110 | 0.20704444444444442 | 300000.0 | 16 | -16 | 0 | false | 220.0 | 110.0 | 19.358892855688435 | simBench |
-| 73644bc6-78cf-4882-9837-e6508cab092d | 867.7685950413226 | 0.0 | 1.5 | 1157.0247933884295 | 25 MVA 110/20 kV YNd5 | 1.9843999999999997 | 25000.0 | 9 | -9 | 0 | false | 110.0 | 20.0 | 58.04608993412045 | simBench |
-| 6935ae26-374a-4c24-aeee-6d5760d6ddf3 | 720.4791642215993 | 0.0 | 1.5 | 1487.603305785124 | 40 MVA 110/20 kV YNd5 | 1.0285 | 40000.0 | 9 | -9 | 0 | false | 110.0 | 20.0 | 48.994205909984906 | simBench |
-| b49db20f-b8b5-4265-8318-f669b9d121e9 | 1015.6886939330394 | 0.0 | 1.5 | 1818.181818181818 | 63 MVA 110/10 kV YNd5 | .6146031746031745 | 63000.0 | 9 | -9 | 0 | false | 110.0 | 10.0 | 34.56596500037509 | simBench |
-| 0843b836-cee4-4a8c-81a4-098400fe91cf | 24.495101551166183 | 0.0 | 2.5 | 2999.9999999999995 | 0.4 MVA 20/0.4 kV Dyn5 ASEA | 11.999999999999998 | 400.0 | 2 | -2 | 0 | false | 20.0 | 0.4 | 58.787753826796276 | simBench |
-| a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1 | 9.591746452043322 | 0.0 | 2.5 | 1149.9999999999998 | 0.16 MVA 20/0.4 kV DOTE 160/20 SGB | 36.71874999999999 | 160.0 | 2 | -2 | 0 | false | 20.0 | 0.4 | 93.01469452961452 | simBench |
-| 0644c120-a247-425f-bbe4-31b153f7f440 | 16.583241729259253 | 0.0 | 2.5 | 2199.9999999999995 | 0.25 MVA 20/0.4 kV Dyn5 ASEA | 21.119999999999997 | 250.0 | 2 | -2 | 0 | false | 20.0 | 0.4 | 93.6479876986153 | simBench |
-| bdf22ee4-deba-41f4-a187-ae00638a6880 | 36.47380569074435 | 0.0 | 2.5 | 4125.0 | 0.63 MVA 20/0.4 kV Dyn5 ASEA | 6.953892668178382 | 630.0 | 2 | -2 | 0 | false | 20.0 | 0.4 | 37.45518044666632 | simBench |
-| a0cbd90a-4e9f-47db-8dca-041d3a288f77 | 145.8952227629774 | 0.0 | 2.5 | 16500.0 | 0.63 MVA 10/0.4 kV Dyn5 ASEA | 1.7384731670445954 | 630.0 | 2 | -2 | 0 | false | 10.0 | 0.4 | 9.36379511166658 | simBench |
+ * - type
+ - –
+ -
+ * - tapPos
+ - –
+ - Current position of the tap changer
+
+ * - autoTap
+ - –
+ - true, if there is a tap regulation apparent and active
+```
+
+## Standard Two Winding Transformer Types
+
+
+Following there are some standard two winding transformer types with their source. A ``csv file`` containing the types listed
+below can be found [here](https://github.com/ie3-institute/PowerSystemDataModel/tree/dev/input/StandardAssetTypes). This
+file can be used directly for any simulation with ``simona``.
+The transformers which source is ``simBench`` are from [here](https://simbench.de/en/download/datasets/).
+```{eval-rst}
+.. list-table::
+ :widths: 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
+ :header-rows: 0
+
+ * - uuid
+ - bM
+ - dPhi
+ - dV
+ - gM
+ - id
+ - rSc
+ - sRated
+ - tapMax
+ - tapMin
+ - tapNeutr
+ - tapSide
+ - vRatedA
+ - vRatedB
+ - xSc
+ - source
+
+ * - 5a890aae-b9c9-4ebf-8a49-8850ae9df402
+ - 219.43184927638458
+ - 0.0
+ - 1.0
+ - 1731.3019390581715
+ - Typ_x_380/220
+ - 0.6016666666666666
+ - 600000.0
+ - 16
+ - -16
+ - 0
+ - false
+ - 380.0
+ - 220.0
+ - 44.51926783240413
+ - simBench
+
+ * - 03159c0d-126e-47cc-9871-066870df3a3f
+ - 1193.4686938790917
+ - 0.0
+ - 1.0
+ - 831.0249307479223
+ - 350MVA_380/110
+ - 1.0608979591836734
+ - 350000.0
+ - 16
+ - -16
+ - 0
+ - false
+ - 380.0
+ - 110.0
+ - 90.75951402093402
+ - simBench
+
+ * - 7cb289cb-e6af-4470-9c68-e5a91978a5e7
+ - 2013.800484464662
+ - 0.0
+ - 1.0
+ - 1446.280991735537
+ - 300MVA_220/110
+ - 0.20704444444444442
+ - 300000.0
+ - 16
+ - -16
+ - 0
+ - false
+ - 220.0
+ - 110.0
+ - 19.358892855688435
+ - simBench
+
+ * - 73644bc6-78cf-4882-9837-e6508cab092d
+ - 867.7685950413226
+ - 0.0
+ - 1.5
+ - 1157.0247933884295
+ - 25 MVA 110/20 kV YNd5
+ - 1.9843999999999997
+ - 25000.0
+ - 9
+ - -9
+ - 0
+ - false
+ - 110.0
+ - 20.0
+ - 58.04608993412045
+ - simBench
+
+ * - 6935ae26-374a-4c24-aeee-6d5760d6ddf3
+ - 720.4791642215993
+ - 0.0
+ - 1.5
+ - 1487.603305785124
+ - 40 MVA 110/20 kV YNd5
+ - 1.0285
+ - 40000.0
+ - 9
+ - -9
+ - 0
+ - false
+ - 110.0
+ - 20.0
+ - 48.994205909984906
+ - simBench
+
+ * - b49db20f-b8b5-4265-8318-f669b9d121e9
+ - 1015.6886939330394
+ - 0.0
+ - 1.5
+ - 1818.181818181818
+ - 63 MVA 110/10 kV YNd5
+ - 0.6146031746031745
+ - 63000.0
+ - 9
+ - -9
+ - 0
+ - false
+ - 110.0
+ - 10.0
+ - 34.56596500037509
+ - simBench
+
+ * - 0843b836-cee4-4a8c-81a4-098400fe91cf
+ - 24.495101551166183
+ - 0.0
+ - 2.5
+ - 2999.9999999999995
+ - 0.4 MVA 20/0.4 kV Dyn5 ASEA
+ - 11.999999999999998
+ - 400.0
+ - 2
+ - -2
+ - 0
+ - false
+ - 20.0
+ - 0.4
+ - 58.787753826796276
+ - simBench
+
+ * - a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1
+ - 9.591746452043322
+ - 0.0
+ - 2.5
+ - 1149.9999999999998
+ - 0.16 MVA 20/0.4 kV DOTE 160/20 SGB
+ - 36.71874999999999
+ - 160.0
+ - 2
+ - -2
+ - 0
+ - false
+ - 20.0
+ - 0.4
+ - 93.01469452961452
+ - simBench
+
+ * - 0644c120-a247-425f-bbe4-31b153f7f440
+ - 16.583241729259253
+ - 0.0
+ - 2.5
+ - 2199.9999999999995
+ - 0.25 MVA 20/0.4 kV Dyn5 ASEA
+ - 21.119999999999997
+ - 250.0
+ - 2
+ - -2
+ - 0
+ - false
+ - 20.0
+ - 0.4
+ - 93.6479876986153
+ - simBench
+
+ * - bdf22ee4-deba-41f4-a187-ae00638a6880
+ - 36.47380569074435
+ - 0.0
+ - 2.5
+ - 4125.0
+ - 0.63 MVA 20/0.4 kV Dyn5 ASEA
+ - 6.953892668178382
+ - 630.0
+ - 2
+ - -2
+ - 0
+ - false
+ - 20.0
+ - 0.4
+ - 37.45518044666632
+ - simBench
+
+ * - a0cbd90a-4e9f-47db-8dca-041d3a288f77
+ - 145.8952227629774
+ - 0.0
+ - 2.5
+ - 16500.0
+ - 0.63 MVA 10/0.4 kV Dyn5 ASEA
+ - 1.7384731670445954
+ - 630.0
+ - 2
+ - -2
+ - 0
+ - false
+ - 10.0
+ - 0.4
+ - 9.36379511166658
+ - simBench
+```
## Caveats
diff --git a/docs/readthedocs/models/input/grid/transformer3w.md b/docs/readthedocs/models/input/grid/transformer3w.md
new file mode 100644
index 000000000..15575c78c
--- /dev/null
+++ b/docs/readthedocs/models/input/grid/transformer3w.md
@@ -0,0 +1,186 @@
+(transformer3w-model)=
+
+# Three Winding Transformer
+
+Model of a three winding transformer.
+It is assumed, that node A is the node with highest, node B with intermediate and node C with lowest voltage.
+
+The assumed mathematical model is inspired by *ABB Schaltanlagenhanbuch* [^cite_gremmel1999], but with the addition of a
+central phase-to-ground admittance, cf. following picture.
+
+```{figure} ../../../_static/figures/ecdTransformer3w.png
+---
+align: center
+name: Equivalent circuit diagram of a three winding transformer
+---
+"Star like" T-equivalent circuit diagram of a three winding transformer
+```
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+All impedances and admittances are given with respect to the higher voltage side.
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ -
+ -
+
+ * - id
+ -
+ - Human readable identifier
+
+ * - rScA
+ - Ω
+ - Short circuit resistance in branch A
+
+ * - rScB
+ - Ω
+ - Short circuit resistance in branch B
+
+ * - rScC
+ - Ω
+ - Short circuit resistance in branch C
+
+ * - xScA
+ - Ω
+ - Short circuit reactance in branch A
+
+ * - xScB
+ - Ω
+ - Short circuit reactance in branch B
+
+ * - xScC
+ - Ω
+ - Short circuit reactance in branch C
+
+ * - gM
+ - nS
+ - No load conductance
+
+ * - bM
+ - nS
+ - No load susceptance
+
+ * - sRatedA
+ - kVA
+ - Rated apparent power of branch A
+
+ * - sRatedB
+ - kVA
+ - Rated apparent power of branch B
+
+ * - sRatedC
+ - kVA
+ - Rated apparent power of branch C
+
+ * - vRatedA
+ - kV
+ - Rated voltage at higher node A
+
+ * - vRatedB
+ - kV
+ - Rated voltage at higher node B
+
+ * - vRatedC
+ - kV
+ - Rated voltage at higher node C
+
+ * - dV
+ - %
+ - Voltage magnitude increase per tap position
+
+ * - dPhi
+ - °
+ - Voltage angle increase per tap position
+
+ * - tapNeutr
+ -
+ - Neutral tap position
+
+ * - tapMin
+ -
+ - Minimum tap position
+
+ * - tapMax
+ -
+ - Maximum tap position
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - nodeA
+ - --
+ - Higher voltage node
+
+ * - nodeB
+ - --
+ - Intermediate voltage node
+
+ * - nodeC
+ - --
+ - Lowest voltage node
+
+ * - parallelDevices
+ - --
+ - | overall amount of parallel transformers to automatically
+ | construct (e.g. parallelDevices = 2 will build a
+ | total of two transformers using the specified parameters)
+
+ * - type
+ - --
+ -
+
+ * - tapPos
+ - --
+ - Current position of the tap changer
+
+ * - autoTap
+ - --
+ - true, if there is a tap regulation apparent and active
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
+
+[^cite_gremmel1999]: Gremmel, H., Ed., Schaltanlagen. Cornelsen Verlag, 1999, Vol. 10, isbn: 3-464-48235-9.
diff --git a/docs/readthedocs/models/input/grid/transformer3w.rst b/docs/readthedocs/models/input/grid/transformer3w.rst
deleted file mode 100644
index 1e62a7463..000000000
--- a/docs/readthedocs/models/input/grid/transformer3w.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-.. _transformer3w_model:
-
-Three Winding Transformer
--------------------------
-Model of a three winding transformer.
-It is assumed, that node A is the node with highest, node B with intermediate and node C with lowest voltage.
-
-The assumed mathematical model is inspired by *ABB Schaltanlagenhanbuch* [Gremmel1999]_, but with the addition of a
-central phase-to-ground admittance, cf. following picture.
-
-.. figure:: ../../../_static/figures/ecdTransformer3w.png
- :align: center
- :alt: Equivalent circuit diagram of a three winding transformer
-
- "Star like" T-equivalent circuit diagram of a three winding transformer
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-All impedances and admittances are given with respect to the higher voltage side.
-
-+-----------+------+---------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===========+======+=========================================================+
-| uuid | | |
-+-----------+------+---------------------------------------------------------+
-| id | | Human readable identifier |
-+-----------+------+---------------------------------------------------------+
-| rScA | Ω | Short circuit resistance in branch A |
-+-----------+------+---------------------------------------------------------+
-| rScB | Ω | Short circuit resistance in branch B |
-+-----------+------+---------------------------------------------------------+
-| rScC | Ω | Short circuit resistance in branch C |
-+-----------+------+---------------------------------------------------------+
-| xScA | Ω | Short circuit reactance in branch A |
-+-----------+------+---------------------------------------------------------+
-| xScB | Ω | Short circuit reactance in branch B |
-+-----------+------+---------------------------------------------------------+
-| xScC | Ω | Short circuit reactance in branch C |
-+-----------+------+---------------------------------------------------------+
-| gM | nS | No load conductance |
-+-----------+------+---------------------------------------------------------+
-| bM | nS | No load susceptance |
-+-----------+------+---------------------------------------------------------+
-| sRatedA | kVA | Rated apparent power of branch A |
-+-----------+------+---------------------------------------------------------+
-| sRatedB | kVA | Rated apparent power of branch B |
-+-----------+------+---------------------------------------------------------+
-| sRatedC | kVA | Rated apparent power of branch C |
-+-----------+------+---------------------------------------------------------+
-| vRatedA | kV | Rated voltage at higher node A |
-+-----------+------+---------------------------------------------------------+
-| vRatedB | kV | Rated voltage at higher node B |
-+-----------+------+---------------------------------------------------------+
-| vRatedC | kV | Rated voltage at higher node C |
-+-----------+------+---------------------------------------------------------+
-| dV | % | Voltage magnitude increase per tap position |
-+-----------+------+---------------------------------------------------------+
-| dPhi | ° | Voltage angle increase per tap position |
-+-----------+------+---------------------------------------------------------+
-| tapNeutr | | Neutral tap position |
-+-----------+------+---------------------------------------------------------+
-| tapMin | | Minimum tap position |
-+-----------+------+---------------------------------------------------------+
-| tapMax | | Maximum tap position |
-+-----------+------+---------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+-----------------+------+------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=================+======+============================================================+
-| uuid | -- | |
-+-----------------+------+------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+-----------------+------+------------------------------------------------------------+
-| operator | -- | |
-+-----------------+------+------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+-----------------+------+------------------------------------------------------------+
-| nodeA | -- | Higher voltage node |
-+-----------------+------+------------------------------------------------------------+
-| nodeB | -- | Intermediate voltage node |
-+-----------------+------+------------------------------------------------------------+
-| nodeC | -- | Lowest voltage node |
-+-----------------+------+------------------------------------------------------------+
-| parallelDevices | -- | | overall amount of parallel transformers to automatically |
-| | | | construct (e.g. parallelDevices = 2 will build a |
-| | | | total of two transformers using the specified parameters)|
-+-----------------+------+------------------------------------------------------------+
-| type | -- | |
-+-----------------+------+------------------------------------------------------------+
-| tapPos | -- | Current position of the tap changer |
-+-----------------+------+------------------------------------------------------------+
-| autoTap | -- | true, if there is a tap regulation apparent and active |
-+-----------------+------+------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
-
-.. [Gremmel1999] Gremmel, H., Ed., Schaltanlagen. Cornelsen Verlag, 1999, Vol. 10, isbn: 3-464-48235-9.
\ No newline at end of file
diff --git a/docs/readthedocs/models/input/operator.md b/docs/readthedocs/models/input/operator.md
new file mode 100644
index 000000000..dc560f18d
--- /dev/null
+++ b/docs/readthedocs/models/input/operator.md
@@ -0,0 +1,46 @@
+(operator-model)=
+
+# Operator
+
+This is a simple identifier object, representing a natural or legal person that is the owner or responsible person
+having control over one or more physical entitites.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+```
+
+(operator-example)=
+
+## Application example
+
+```{code-block} java
+:linenos: true
+
+OperatorInput profBroccoli = new OperatorInput(
+ UUID.fromString("f15105c4-a2de-4ab8-a621-4bc98e372d92"),
+ "Univ.-Prof. Dr. rer. hort. Klaus-Dieter Brokkoli"
+ )
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/operator.rst b/docs/readthedocs/models/input/operator.rst
deleted file mode 100644
index 64d067a8d..000000000
--- a/docs/readthedocs/models/input/operator.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-.. _operator_model:
-
-Operator
---------
-This is a simple identifier object, representing a natural or legal person that is the owner or responsible person
-having control over one or more physical entitites.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+-----------+------+---------------------------+
-| Attribute | Unit | Remarks |
-+===========+======+===========================+
-| uuid | -- | |
-+-----------+------+---------------------------+
-| id | -- | Human readable identifier |
-+-----------+------+---------------------------+
-
-.. _operator_example:
-
-Application example
-^^^^^^^^^^^^^^^^^^^
-.. code-block:: java
- :linenos:
-
- OperatorInput profBroccoli = new OperatorInput(
- UUID.fromString("f15105c4-a2de-4ab8-a621-4bc98e372d92"),
- "Univ.-Prof. Dr. rer. hort. Klaus-Dieter Brokkoli"
- )
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/bm.md b/docs/readthedocs/models/input/participant/bm.md
new file mode 100644
index 000000000..ff1854e10
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/bm.md
@@ -0,0 +1,121 @@
+(bm-model)=
+
+# Biomass plant
+
+Model of a biomass power plant.
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - capex
+ - €
+ - Capital expenditure to purchase one entity of this type
+
+ * - opex
+ - € / MWh
+ - | Operational expenditure to operate one entity of
+ | this type
+
+ * - activePowerGradient
+ - % / h
+ - Maximum permissible rate of change of power
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - etaConv
+ - %
+ - Efficiency of the assets inverter
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ -
+
+ * - marketReaction
+ - --
+ - | Whether to adapt output based on (volatile)
+ | market price or not
+
+ * - costControlled
+ - --
+ - | Whether to adapt output based on the difference
+ | between production costs and fixed feed in tariff or not
+
+ * - feedInTariff
+ - € / MWh
+ - Fixed feed in tariff
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/bm.rst b/docs/readthedocs/models/input/participant/bm.rst
deleted file mode 100644
index 5314251e4..000000000
--- a/docs/readthedocs/models/input/participant/bm.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-.. _bm_model:
-
-Biomass plant
--------------
-Model of a biomass power plant.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-
-+---------------------+---------+------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=====================+=========+============================================================+
-| uuid | -- | |
-+---------------------+---------+------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+---------------------+---------+------------------------------------------------------------+
-| capex | € | Capital expenditure to purchase one entity of this type |
-+---------------------+---------+------------------------------------------------------------+
-| opex | € / MWh | | Operational expenditure to operate one entity of |
-| | | | this type |
-+---------------------+---------+------------------------------------------------------------+
-| activePowerGradient | % / h | Maximum permissible rate of change of power |
-+---------------------+---------+------------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+---------------------+---------+------------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+---------------------+---------+------------------------------------------------------------+
-| etaConv | % | Efficiency of the assets inverter |
-+---------------------+---------+------------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| type | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| marketReaction | -- | | Whether to adapt output based on (volatile) |
-| | | | market price or not |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| costControlled | -- | | Whether to adapt output based on the difference |
-| | | | between production costs and fixed feed in tariff or not |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| feedInTariff | € / MWh | Fixed feed in tariff |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/chp.md b/docs/readthedocs/models/input/participant/chp.md
new file mode 100644
index 000000000..ad4ff729e
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/chp.md
@@ -0,0 +1,128 @@
+(chp-model)=
+
+# Combined Heat and Power Plant
+
+Combined heat and power plant.
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - capex
+ - €
+ - Capital expenditure to purchase one entity of this type
+
+ * - opex
+ - € / MWh
+ - | Operational expenditure to operate one entity of
+ | this type
+
+ * - etaEl
+ - %
+ - Efficiency of the electrical inverter
+
+ * - etaThermal
+ - %
+ - Thermal efficiency of the system
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - pThermal
+ - kW
+ - Rated thermal power (at rated electrical power)
+
+ * - pOwn
+ - kW
+ - Needed self-consumption
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - thermalBus
+ - --
+ - Connection point to the thermal system
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ -
+
+ * - thermalStorage
+ - --
+ - Reference to thermal storage
+
+ * - marketReaction
+ - --
+ - | Whether to adapt output based on (volatile)
+ | market price or not
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/chp.rst b/docs/readthedocs/models/input/participant/chp.rst
deleted file mode 100644
index 14cd2fd46..000000000
--- a/docs/readthedocs/models/input/participant/chp.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-.. _chp_model:
-
-Combined Heat and Power Plant
------------------------------
-Combined heat and power plant.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-
-+-------------+---------+---------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=============+=========+=========================================================+
-| uuid | -- | |
-+-------------+---------+---------------------------------------------------------+
-| id | -- | Human readable identifier |
-+-------------+---------+---------------------------------------------------------+
-| capex | € | Capital expenditure to purchase one entity of this type |
-+-------------+---------+---------------------------------------------------------+
-| opex | € / MWh | | Operational expenditure to operate one entity of |
-| | | | this type |
-+-------------+---------+---------------------------------------------------------+
-| etaEl | % | Efficiency of the electrical inverter |
-+-------------+---------+---------------------------------------------------------+
-| etaThermal | % | Thermal efficiency of the system |
-+-------------+---------+---------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+-------------+---------+---------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+-------------+---------+---------------------------------------------------------+
-| pThermal | kW | Rated thermal power (at rated electrical power) |
-+-------------+---------+---------------------------------------------------------+
-| pOwn | kW | Needed self-consumption |
-+-------------+---------+---------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| thermalBus | -- | Connection point to the thermal system |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| type | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| thermalStorage | -- | Reference to thermal storage |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| marketReaction | -- | | Whether to adapt output based on (volatile) |
-| | | | market price or not |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/cylindricalstorage.md b/docs/readthedocs/models/input/participant/cylindricalstorage.md
new file mode 100644
index 000000000..5e3b8d40c
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/cylindricalstorage.md
@@ -0,0 +1,64 @@
+(cylindricalstorage-model)=
+
+# Cylindrical Thermal Storage
+
+Model of a cylindrical thermal storage using a fluent to store thermal energy.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - thermalBus
+ - --
+ - Connection point to the thermal system
+
+ * - storageVolumeLvl
+ - m³
+ - Overall available storage volume
+
+ * - storageVolumeLvlMin
+ - m³
+ - Minimum permissible storage volume
+
+ * - inletTemp
+ - °C
+ - Temperature of the inlet
+
+ * - returnTemp
+ - °C
+ - Temperature of the outlet
+
+ * - c
+ - kWh / (K :math:`\cdot` m³)
+ - Specific heat capacity of the storage medium
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/cylindricalstorage.rst b/docs/readthedocs/models/input/participant/cylindricalstorage.rst
deleted file mode 100644
index feaed6c3d..000000000
--- a/docs/readthedocs/models/input/participant/cylindricalstorage.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. _cylindricalstorage_model:
-
-Cylindrical Thermal Storage
---------------------------------
-Model of a cylindrical thermal storage using a fluent to store thermal energy.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+---------------------+----------------------------+----------------------------------------------+
-| Attribute | Unit | Remarks |
-+=====================+============================+==============================================+
-| uuid | -- | |
-+---------------------+----------------------------+----------------------------------------------+
-| id | -- | Human readable identifier |
-+---------------------+----------------------------+----------------------------------------------+
-| operator | -- | |
-+---------------------+----------------------------+----------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+---------------------+----------------------------+----------------------------------------------+
-| thermalBus | -- | Connection point to the thermal system |
-+---------------------+----------------------------+----------------------------------------------+
-| storageVolumeLvl | m³ | Overall available storage volume |
-+---------------------+----------------------------+----------------------------------------------+
-| storageVolumeLvlMin | m³ | Minimum permissible storage volume |
-+---------------------+----------------------------+----------------------------------------------+
-| inletTemp | °C | Temperature of the inlet |
-+---------------------+----------------------------+----------------------------------------------+
-| returnTemp | °C | Temperature of the outlet |
-+---------------------+----------------------------+----------------------------------------------+
-| c | kWh / (K :math:`\cdot` m³) | Specific heat capacity of the storage medium |
-+---------------------+----------------------------+----------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/em.md b/docs/readthedocs/models/input/participant/em.md
new file mode 100644
index 000000000..3e842e612
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/em.md
@@ -0,0 +1,50 @@
+(em_model)=
+
+# Energy Management Unit
+
+A model of an Energy Management Unit that controls the power of connected system participants.
+Participants are connected to an EM each via their `em` field.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - controlStrategy
+ - --
+ - String representation (e.g. name) of a control strategy
+
+ * - parentEm
+ - --
+ - | 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.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/ev.md b/docs/readthedocs/models/input/participant/ev.md
new file mode 100644
index 000000000..036a92312
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/ev.md
@@ -0,0 +1,107 @@
+(ev-model)=
+
+# Electric Vehicle
+
+Model of an electric vehicle, that is occasionally connected to the grid via an [electric vehicle charging system](evcs.md#electric-vehicle-charging-station).
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - capex
+ - €
+ - Capital expenditure to purchase one entity of this type
+
+ * - opex
+ - € / MWh
+ - | Operational expenditure to operate one entity of
+ | this type
+
+ * - eStorage
+ - kWh
+ - Available battery capacity
+
+ * - eCons
+ - kWh / km
+ - Energy consumption per driven kilometre
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ -
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+The {code}`node` attribute only marks the vehicles home connection point.
+The actual connection to the grid is always given through {code}`EvcsInput`'s relation.
diff --git a/docs/readthedocs/models/input/participant/ev.rst b/docs/readthedocs/models/input/participant/ev.rst
deleted file mode 100644
index cd98d6d86..000000000
--- a/docs/readthedocs/models/input/participant/ev.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-.. _ev_model:
-
-Electric Vehicle
------------------------------
-Model of an electric vehicle, that is occasionally connected to the grid via an :ref:`electric vehicle charging system`.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-+-------------+----------+---------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=============+==========+=========================================================+
-| uuid | -- | |
-+-------------+----------+---------------------------------------------------------+
-| id | -- | Human readable identifier |
-+-------------+----------+---------------------------------------------------------+
-| capex | € | Capital expenditure to purchase one entity of this type |
-+-------------+----------+---------------------------------------------------------+
-| opex | € / MWh | | Operational expenditure to operate one entity of |
-| | | | this type |
-+-------------+----------+---------------------------------------------------------+
-| eStorage | kWh | Available battery capacity |
-+-------------+----------+---------------------------------------------------------+
-| eCons | kWh / km | Energy consumption per driven kilometre |
-+-------------+----------+---------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+-------------+----------+---------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+-------------+----------+---------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+------------------+---------+---------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+=================================+
-| uuid | -- | |
-+------------------+---------+---------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+---------------------------------+
-| operator | -- | |
-+------------------+---------+---------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+---------------------------------+
-| node | -- | |
-+------------------+---------+---------------------------------+
-| type | -- | |
-+------------------+---------+---------------------------------+
-
-Caveats
-^^^^^^^
-The :code:`node` attribute only marks the vehicles home connection point.
-The actual connection to the grid is always given through :code:`EvcsInput`'s relation.
diff --git a/docs/readthedocs/models/input/participant/evcs.md b/docs/readthedocs/models/input/participant/evcs.md
new file mode 100644
index 000000000..b97def9c3
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/evcs.md
@@ -0,0 +1,262 @@
+(evcs-model)=
+
+# Electric Vehicle Charging Station
+
+Model of a charging station for electric vehicles. This model only covers the basic characteristics of a charging
+station and has some limitations outlined below.
+
+## Model Definition
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ - :ref:`Charging point type` (valid for all installed points)
+
+ * - chargingPoints
+ - --
+ - no of installed charging points @ the specific station
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - locationType
+ - --
+ - :ref:`Charging station location types`
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+### Type Model
+
+In contrast to other models, electric vehicle charging station types are not configured via separate type file or table,
+but 'inline' of a charging station entry. This is justified by the fact, that the station type (in contrast to e.g.
+the type of a wind energy converter) only consists of a few, more or less standardized parameters, that are (most of the
+time) equal for all manufacturers. Hence, to simplify the type model handling, types are provided either by a string
+literal of their id or by providing a custom one. See [Charging point types](evcs.md#charging-point-types) for details of on
+available standard types and how to use custom types.
+
+The actual model definition for charging point types looks as follows:
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - electricCurrentType
+ - --
+ - Electric current type
+
+ * - synonymousIds
+ - --
+ - Set of alternative human readable identifiers
+
+```
+
+(evcs-point-types)=
+
+## Charging Point Types
+
+### Available Standard Types
+
+To simplify the application of electric vehicle charging stations, some common standard types are available out-of-the-box.
+They can either by used code wise or directly from database or file input by referencing their id or one of their
+synonymous ids. All standard types can be found in {code}`edu.ie3.datamodel.models.input.system.type.chargingpoint.ChargingPointTypeUtils`.
+
+```{eval-rst}
+.. list-table::
+ :widths: 25 25 25 25
+ :header-rows: 0
+
+
+ * - id
+ - synonymous ids
+ - sRated in kVA
+ - electric current type
+
+ * - HouseholdSocket
+ - household, hhs, schuko-simple
+ - 2.3
+ - AC
+
+ * - BlueHouseholdSocket
+ - bluehousehold, bhs, schuko-camping
+ - 3.6
+ - AC
+
+ * - Cee16ASocket
+ - cee16
+ - 11
+ - AC
+
+ * - Cee32ASocket
+ - cee32
+ - 22
+ - AC
+
+ * - Cee63ASocket
+ - cee63
+ - 43
+ - AC
+
+ * - ChargingStationType1
+ - cst1, stationtype1, cstype1
+ - 7.2
+ - AC
+
+ * - ChargingStationType2
+ - cst2, stationtype2, cstype2
+ - 43
+ - AC
+
+ * - ChargingStationCcsComboType1
+ - csccs1, csccscombo1
+ - 11
+ - DC
+
+ * - ChargingStationCcsComboType2
+ - csccs2, csccscombo2
+ - 50
+ - DC
+
+ * - TeslaSuperChargerV1
+ - tesla1, teslav1, supercharger1, supercharger
+ - 135
+ - DC
+
+ * - TeslaSuperChargerV2
+ - tesla2, teslav2, supercharger2
+ - 150
+ - DC
+
+ * - TeslaSuperChargerV3
+ - tesla3, teslav3, supercharger3
+ - 250
+ - DC
+
+
+```
+
+### Custom Types
+
+While the provided standard types should be suitable for most scenarios, providing an individual type for a specific
+scenario might be necessary. To do so, a custom type can be provided instead of a common id. This custom type is tested
+against the following regex {code}`(\w+\d*)\s*\(\s*(\d+\.?\d+)\s*\|\s*(AC|DC)\s*\)`, or more generally, the custom
+type string has to be in the following syntax:
+
+```
+(|) e.g. FastCharger(50|DC) or SlowCharger(2.5|AC)
+```
+
+Please note, that in accordance with {code}`edu.ie3.datamodel.models.StandardUnits` the apparent power is expected to
+be in kVA!
+
+### Limitations
+
+- the available charging types are currently limited to only some common standard charging point types and not configurable
+ via a type file or table. Nevertheless, providing custom types is possible using the syntax explained above.
+ If there is additional need for a more granular type configuration via type file please contact us.
+- each charging station can hold one or more charging points. If more than one charging point is available
+ all attributes (e.g. {code}`sRated` or {code}`connectionType`) are considered to be equal for all connection
+ points
+
+(location-types)=
+
+## Location types
+
+Evcs location types describe the type of charging location of a charging station. Parsing of these types is case-insensitive
+and underscores and minuses are ignored, that means "charginghubtown" is parsed as type {code}`CHARGING_HUB_TOWN`.
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - type name
+ - public/private
+ - description
+
+ * - HOME
+ - private
+ - Charging at home
+
+ * - WORK
+ - private
+ - Charging at work
+
+ * - CUSTOMER_PARKING
+ - public
+ - Charging at store parking lots
+
+ * - STREET
+ - public
+ - Charging at street side
+
+ * - CHARGING_HUB_TOWN
+ - public
+ - Charging at hub in town
+
+ * - CHARGING_HUB_HIGHWAY
+ - public
+ - Charging at hub out of town
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/evcs.rst b/docs/readthedocs/models/input/participant/evcs.rst
deleted file mode 100644
index 251003c20..000000000
--- a/docs/readthedocs/models/input/participant/evcs.rst
+++ /dev/null
@@ -1,149 +0,0 @@
-.. _evcs_model:
-
-Electric Vehicle Charging Station
----------------------------------
-Model of a charging station for electric vehicles. This model only covers the basic characteristics of a charging
-station and has some limitations outlined below.
-
-Model Definition
-^^^^^^^^^^^^^^^^
-
-Entity Model
-""""""""""""
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| type | -- | :ref:`Charging point type` (valid for all installed points) |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| chargingPoints | -- | no of installed charging points @ the specific station |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| cosPhiRated | -- | Rated power factor |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| locationType | -- | :ref:`Charging station location types` |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-Type Model
-""""""""""""
-In contrast to other models, electric vehicle charging station types are not configured via separate type file or table,
-but 'inline' of a charging station entry. This is justified by the fact, that the station type (in contrast to e.g.
-the type of a wind energy converter) only consists of a few, more or less standardized parameters, that are (most of the
-time) equal for all manufacturers. Hence, to simplify the type model handling, types are provided either by a string
-literal of their id or by providing a custom one. See :ref:`Charging point types` for details of on
-available standard types and how to use custom types.
-
-The actual model definition for charging point types looks as follows:
-
-+------------------------+---------+--------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+========================+=========+================================================================================+
-| id | -- | Human readable identifier |
-+------------------------+---------+--------------------------------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+------------------------+---------+--------------------------------------------------------------------------------+
-| electricCurrentType | -- | Electric current type |
-+------------------------+---------+--------------------------------------------------------------------------------+
-|synonymousIds | -- | Set of alternative human readable identifiers |
-+------------------------+---------+--------------------------------------------------------------------------------+
-
-.. _evcs_point_types:
-
-Charging Point Types
-^^^^^^^^^^^^^^^^^^^^
-Available Standard Types
-""""""""""""""""""""""""
-To simplify the application of electric vehicle charging stations, some common standard types are available out-of-the-box.
-They can either by used code wise or directly from database or file input by referencing their id or one of their
-synonymous ids. All standard types can be found in :code:`edu.ie3.datamodel.models.input.system.type.chargingpoint.ChargingPointTypeUtils`.
-
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| id | synonymous ids | sRated in kVA | electric current type |
-+===============================+===============================================+===============+=======================+
-| HouseholdSocket | household, hhs, schuko-simple | 2.3 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| BlueHouseholdSocket | bluehousehold, bhs, schuko-camping | 3.6 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| Cee16ASocket | cee16 | 11 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| Cee32ASocket | cee32 | 22 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| Cee63ASocket | cee63 | 43 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| ChargingStationType1 | cst1, stationtype1, cstype1 | 7.2 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| ChargingStationType2 | cst2, stationtype2, cstype2 | 43 | AC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| ChargingStationCcsComboType1 | csccs1, csccscombo1 | 11 | DC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| ChargingStationCcsComboType2 | csccs2, csccscombo2 | 50 | DC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| TeslaSuperChargerV1 | tesla1, teslav1, supercharger1, supercharger | 135 | DC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| TeslaSuperChargerV2 | tesla2, teslav2, supercharger2 | 150 | DC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-| TeslaSuperChargerV3 | tesla3, teslav3, supercharger3 | 250 | DC |
-+-------------------------------+-----------------------------------------------+---------------+-----------------------+
-
-
-Custom Types
-""""""""""""
-While the provided standard types should be suitable for most scenarios, providing an individual type for a specific
-scenario might be necessary. To do so, a custom type can be provided instead of a common id. This custom type is tested
-against the following regex :code:`(\w+\d*)\s*\(\s*(\d+\.?\d+)\s*\|\s*(AC|DC)\s*\)`, or more generally, the custom
-type string has to be in the following syntax::
-
- (|) e.g. FastCharger(50|DC) or SlowCharger(2.5|AC)
-
-Please note, that in accordance with :code:`edu.ie3.datamodel.models.StandardUnits` the apparent power is expected to
-be in kVA!
-
-Limitations
-"""""""""""
-
-- the available charging types are currently limited to only some common standard charging point types and not configurable
- via a type file or table. Nevertheless, providing custom types is possible using the syntax explained above.
- If there is additional need for a more granular type configuration via type file please contact us.
-- each charging station can hold one or more charging points. If more than one charging point is available
- all attributes (e.g. :code:`sRated` or :code:`connectionType`) are considered to be equal for all connection
- points
-
-.. _location_types:
-
-Location types
-^^^^^^^^^^^^^^
-
-Evcs location types describe the type of charging location of a charging station. Parsing of these types is case-insensitive
-and underscores and minuses are ignored, that means "charginghubtown" is parsed as type :code:`CHARGING_HUB_TOWN`.
-
-+-------------------------------+-------------------+----------------------------------+
-| type name | public/private | description |
-+===============================+===================+==================================+
-| HOME | private | Charging at home |
-+-------------------------------+-------------------+----------------------------------+
-| WORK | private | Charging at work |
-+-------------------------------+-------------------+----------------------------------+
-| CUSTOMER_PARKING | public | Charging at store parking lots |
-+-------------------------------+-------------------+----------------------------------+
-| STREET | public | Charging at street side |
-+-------------------------------+-------------------+----------------------------------+
-| CHARGING_HUB_TOWN | public | Charging at hub in town |
-+-------------------------------+-------------------+----------------------------------+
-| CHARGING_HUB_HIGHWAY | public | Charging at hub out of town |
-+-------------------------------+-------------------+----------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/fixedfeedin.md b/docs/readthedocs/models/input/participant/fixedfeedin.md
new file mode 100644
index 000000000..2098271de
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/fixedfeedin.md
@@ -0,0 +1,63 @@
+(fixed-feed-in-model)=
+
+# Fixed Feed In Facility
+
+Model of a facility, that provides constant power feed in, as no further information about the actual behaviour of the
+model can be derived.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/fixedfeedin.rst b/docs/readthedocs/models/input/participant/fixedfeedin.rst
deleted file mode 100644
index f317d5534..000000000
--- a/docs/readthedocs/models/input/participant/fixedfeedin.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-.. _fixed_feed_in_model:
-
-Fixed Feed In Facility
-----------------------
-Model of a facility, that provides constant power feed in, as no further information about the actual behaviour of the
-model can be derived.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/general.md b/docs/readthedocs/models/input/participant/general.md
new file mode 100644
index 000000000..7dd45d438
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/general.md
@@ -0,0 +1,45 @@
+# General Remarks on Participant Models
+
+(participant-general-q-characteristic)=
+
+## Reactive Power Characteristics
+
+Reactive power characteristics are designed to describe reactive power control behaviour of the models.
+In Germany, system operators can require system participants to follow certain characteristics specified in the
+operators technical requirements and individually selected per connected asset.
+
+Currently three different characteristics are implemented:
+
+### Fixed Power Factor
+
+Active and reactive power are coupled by a time-independent power factor.
+It can be parsed from {code}`cosPhiFixed:{(0.0, 0.95)}` (exemplary).
+
+### Active Power Dependent Power Factor
+
+The power factor is determined based on the current active power feed in or consumption.
+The characteristic in the figure below would be described by the three coordinates (0.0, 1.0), (0.9,1.0) and (1.0, 0.95).
+Alternatively it can be parsed from {code}`cosPhiP:{(0.0, 1.0),(0.9,1.0),(1.0, 0.95)}`.
+
+```{figure} ../../../_static/figures/cosPhiP.png
+---
+align: center
+name: Active power dependent power factor
+---
+Exemplary active power dependent power factor
+```
+
+### Reactive Power as Function of Nodal Voltage Magnitude
+
+The reactive power is directly derived in accordance to the nodal voltage magnitude.
+The characteristic in the figure below would be described by the three coordinates (0.92, -1), (0.97, 0.0), (1.03, 0.0)
+and (1.08, 1.0).
+Alternatively it can be parsed from {code}`qV:{(0.92, -1),(0.97, 0.0),(1.03, 0.0),(1.08, 1.0)}`.
+
+```{figure} ../../../_static/figures/qv.png
+---
+align: center
+name: Reactive power as function of nodal voltage magnitude
+---
+Exemplary reactive power as function of nodal voltage magnitude
+```
\ No newline at end of file
diff --git a/docs/readthedocs/models/input/participant/general.rst b/docs/readthedocs/models/input/participant/general.rst
deleted file mode 100644
index 6ebb861ea..000000000
--- a/docs/readthedocs/models/input/participant/general.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-General Remarks on Participant Models
--------------------------------------
-
-.. _participant_general_q_characteristic:
-
-Reactive Power Characteristics
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Reactive power characteristics are designed to describe reactive power control behaviour of the models.
-In Germany, system operators can require system participants to follow certain characteristics specified in the
-operators technical requirements and individually selected per connected asset.
-
-Currently three different characteristics are implemented:
-
-Fixed Power Factor
-""""""""""""""""""
-Active and reactive power are coupled by a time-independent power factor.
-It can be parsed from :code:`cosPhiFixed:{(0.0, 0.95)}` (exemplary).
-
-Active Power Dependent Power Factor
-"""""""""""""""""""""""""""""""""""
-The power factor is determined based on the current active power feed in or consumption.
-The characteristic in the figure below would be described by the three coordinates (0.0, 1.0), (0.9,1.0) and (1.0, 0.95).
-Alternatively it can be parsed from :code:`cosPhiP:{(0.0, 1.0),(0.9,1.0),(1.0, 0.95)}`.
-
-.. figure:: ../../../_static/figures/cosPhiP.png
- :align: center
- :alt: Active power dependent power factor
-
- Exemplary active power dependent power factor
-
-Reactive Power as Function of Nodal Voltage Magnitude
-"""""""""""""""""""""""""""""""""""""""""""""""""""""
-The reactive power is directly derived in accordance to the nodal voltage magnitude.
-The characteristic in the figure below would be described by the three coordinates (0.92, -1), (0.97, 0.0), (1.03, 0.0)
-and (1.08, 1.0).
-Alternatively it can be parsed from :code:`qV:{(0.92, -1),(0.97, 0.0),(1.03, 0.0),(1.08, 1.0)}`.
-
-.. figure:: ../../../_static/figures/qv.png
- :align: center
- :alt: Reactive power as function of nodal voltage magnitude
-
- Exemplary reactive power as function of nodal voltage magnitude
\ No newline at end of file
diff --git a/docs/readthedocs/models/input/participant/hp.md b/docs/readthedocs/models/input/participant/hp.md
new file mode 100644
index 000000000..71c8a1608
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/hp.md
@@ -0,0 +1,108 @@
+(hp-model)=
+
+# Heat Pump
+
+Model of a heat pump.
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - capex
+ - €
+ - Capital expenditure to purchase one entity of this type
+
+ * - opex
+ - € / MWh
+ - | Operational expenditure to operate one entity of
+ | this type
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - pThermal
+ - kW
+ - Rated thermal power (at rated electrical power)
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - thermalBus
+ - --
+ - Connection point to the thermal system
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ -
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/hp.rst b/docs/readthedocs/models/input/participant/hp.rst
deleted file mode 100644
index e28cc3c52..000000000
--- a/docs/readthedocs/models/input/participant/hp.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-.. _hp_model:
-
-Heat Pump
----------
-Model of a heat pump.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-
-+-------------+---------+---------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=============+=========+=========================================================+
-| uuid | -- | |
-+-------------+---------+---------------------------------------------------------+
-| id | -- | Human readable identifier |
-+-------------+---------+---------------------------------------------------------+
-| capex | € | Capital expenditure to purchase one entity of this type |
-+-------------+---------+---------------------------------------------------------+
-| opex | € / MWh | | Operational expenditure to operate one entity of |
-| | | | this type |
-+-------------+---------+---------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+-------------+---------+---------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+-------------+---------+---------------------------------------------------------+
-| pThermal | kW | Rated thermal power (at rated electrical power) |
-+-------------+---------+---------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| thermalBus | -- | Connection point to the thermal system |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| type | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/load.md b/docs/readthedocs/models/input/participant/load.md
new file mode 100644
index 000000000..c31f71549
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/load.md
@@ -0,0 +1,95 @@
+(load-model)=
+
+# Load
+
+Model of (mainly) domestic loads.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - loadProfile
+ - --
+ - :ref:`Load profile` as model behaviour
+
+ * - dsm
+ - --
+ - Whether the load is able to follow demand side management signals
+
+ * - eConsAnnual
+ - kWh
+ - Annual energy consumption
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
+
+(load-lp)=
+
+## Load Profiles
+
+The {code}`LoadProfile` is an interface, that forces its implementing classes to have a {code}`String` *key*
+and being able to parse a {code}`String` to a {code}`LoadProfile`.
+Its only purpose is to give note, which load profile has to be used by the simulation.
+The actual profile has to be provided by the simulation itself.
+If no matching standard load profile is known, {code}`LoadProfile#NO_LOAD_PROFILE` can be used.
+
+To assist the user in marking the desired load profile, the enum {code}`BdewLoadProfile` provides a collection of
+commonly known German standard electricity load profiles, defined by the bdew (Bundesverband der Energie- und
+Wasserwirtschaft; engl. Federal Association of the Energy and Water Industry). For more details see
+[the corresponding website (German only)](https://www.bdew.de/energie/standardlastprofile-strom/).
+
+Furthermore there are {code}`TemperatureDependantLoadProfiles` which can be used to note usage of load profiles for night heating storages or heat pumps for example.
+The profiles rely on the VDN description for interruptable loads.
+For more details see [here (German only)](https://www.bdew.de/media/documents/LPuVe-Praxisleitfaden.pdf).
+{code}`NbwTemperatureDependantLoadProfiles` provides sample temperature dependant load profiles that can be used.
+The `NbwTemperatureDependantLoadProfiles` consists of load profiles "ep1" for heat pumps and "ez2" for night storage heating.
diff --git a/docs/readthedocs/models/input/participant/load.rst b/docs/readthedocs/models/input/participant/load.rst
deleted file mode 100644
index f2aa5aa23..000000000
--- a/docs/readthedocs/models/input/participant/load.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-.. _load_model:
-
-Load
-----
-Model of (mainly) domestic loads.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=====================+=========+======================================================================================+
-| uuid | -- | |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| loadProfile | -- | :ref:`Load profile` as model behaviour |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| dsm | -- | Whether the load is able to follow demand side management signals |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| eConsAnnual | kWh | Annual energy consumption |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+---------------------+---------+--------------------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
-
-.. _load_lp:
-
-Load Profiles
-^^^^^^^^^^^^^^^^^^^^^^
-The :code:`LoadProfile` is an interface, that forces it's implementing classes to have a :code:`String` *key*
-and being able to parse a :code:`String` to a :code:`LoadProfile`.
-Its only purpose is to give note, which load profile has to be used by the simulation.
-The actual profile has to be provided by the simulation itself.
-If no matching standard load profile is known, :code:`LoadProfile#NO_LOAD_PROFILE` can be used.
-
-To assist the user in marking the desired load profile, the enum :code:`BdewLoadProfile` provides a collection of
-commonly known German standard electricity load profiles, defined by the bdew (Bundesverband der Energie- und
-Wasserwirtschaft; engl. Federal Association of the Energy and Water Industry). For more details see
-`the corresponding website (German only) `_.
-
-Furthermore there are :code:`TemperatureDependantLoadProfiles` which can be used to note usage of load profiles for night heating storages or heat pumps for example.
-The profiles rely on the VDN description for interruptable loads.
-For more details see `here (German only) `_.
-:code:`NbwTemperatureDependantLoadProfiles` provides sample temperature dependant load profiles that can be used.
-The `NbwTemperatureDependantLoadProfiles` consists of load profiles "ep1" for heat pumps and "ez2" for night storage heating.
diff --git a/docs/readthedocs/models/input/participant/pv.md b/docs/readthedocs/models/input/participant/pv.md
new file mode 100644
index 000000000..0746f0023
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/pv.md
@@ -0,0 +1,90 @@
+(pv-model)=
+
+# Photovoltaic Power Plant
+
+Detailed model of a photovoltaic power plant.
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - albedo
+ - --
+ - `Albedo `_ of the plant's surrounding
+
+ * - azimuth
+ - °
+ - | Inclination in a compass direction
+ | South = 0°, West = 90°, East = -90°
+
+ * - etaConv
+ - %
+ - Efficiency of the assets inverter
+
+ * - elevationAngle
+ - °
+ - Tilted inclination from horizontal [0°, 90°]
+
+ * - kG
+ - --
+ - Generator correction factor merging technical influences
+
+ * - kT
+ - --
+ - Temperature correction factor merging thermal influences
+
+ * - marketReaction
+ - --
+ - | Whether to adapt output based on (volatile)
+ | market price or not
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/pv.rst b/docs/readthedocs/models/input/participant/pv.rst
deleted file mode 100644
index 3308f9c6b..000000000
--- a/docs/readthedocs/models/input/participant/pv.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. _pv_model:
-
-Photovoltaic Power Plant
-------------------------
-Detailed model of a photovoltaic power plant.
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| albedo | -- | `Albedo `_ of the plant's surrounding |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| azimuth | ° | | Inclination in a compass direction |
-| | | | South = 0°, West = 90°, East = -90° |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| etaConv | % | Efficiency of the assets inverter |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| elevationAngle | ° | Tilted inclination from horizontal [0°, 90°] |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| kG | -- | Generator correction factor merging technical influences |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| kT | -- | Temperature correction factor merging thermal influences |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| marketReaction | -- | | Whether to adapt output based on (volatile) |
-| | | | market price or not |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/storage.md b/docs/readthedocs/models/input/participant/storage.md
new file mode 100644
index 000000000..dc4d4857d
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/storage.md
@@ -0,0 +1,135 @@
+(storage-model)=
+
+# Electrical Energy Storage
+
+Model of an ideal electrical battery energy storage.
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - capex
+ - €
+ - Capital expenditure to purchase one entity of this type
+
+ * - opex
+ - € / MWh
+ - | Operational expenditure to operate one entity of
+ | this type
+
+ * - eStorage
+ - kWh
+ - Battery capacity
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - pMax
+ - kW
+ - | Maximum permissible active power
+ | infeed or consumption
+
+ * - activePowerGradient
+ - % / h
+ - Maximum permissible rate of change of power
+
+ * - eta
+ - %
+ - Efficiency of the electrical inverter
+
+ * - dod
+ - %
+ - | Maximum permissible depth of discharge. 80 % dod
+ | is equivalent to a state of charge of 20 %.
+
+ * - lifeTime
+ - h
+ - Permissible hours of full use
+
+ * - lifeCycle
+ - --
+ - Permissible amount of full cycles
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ -
+
+ * - behaviour
+ - --
+ - | Foreseen operation strategy of the storage.
+ | Eligible input: *"market"*, *"grid"*, *"self"*
+
+
+```
+
+## Caveats
+
+The field {code}`behaviour` will be removed in version 1.x, as this is an information, that is only important to a
+smaller sub set of simulation applications.
diff --git a/docs/readthedocs/models/input/participant/storage.rst b/docs/readthedocs/models/input/participant/storage.rst
deleted file mode 100644
index 19d768a30..000000000
--- a/docs/readthedocs/models/input/participant/storage.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-.. _storage_model:
-
-Electrical Energy Storage
--------------------------
-Model of an ideal electrical battery energy storage.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-
-+---------------------+---------+---------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+=====================+=========+=========================================================+
-| uuid | -- | |
-+---------------------+---------+---------------------------------------------------------+
-| id | -- | Human readable identifier |
-+---------------------+---------+---------------------------------------------------------+
-| capex | € | Capital expenditure to purchase one entity of this type |
-+---------------------+---------+---------------------------------------------------------+
-| opex | € / MWh | | Operational expenditure to operate one entity of |
-| | | | this type |
-+---------------------+---------+---------------------------------------------------------+
-| eStorage | kWh | Battery capacity |
-+---------------------+---------+---------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+---------------------+---------+---------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+---------------------+---------+---------------------------------------------------------+
-| pMax | kW | | Maximum permissible active power |
-| | | | infeed or consumption |
-+---------------------+---------+---------------------------------------------------------+
-| activePowerGradient | % / h | Maximum permissible rate of change of power |
-+---------------------+---------+---------------------------------------------------------+
-| eta | % | Efficiency of the electrical inverter |
-+---------------------+---------+---------------------------------------------------------+
-| dod | % | | Maximum permissible depth of discharge. 80 % dod |
-| | | | is equivalent to a state of charge of 20 %. |
-+---------------------+---------+---------------------------------------------------------+
-| lifeTime | h | Permissible hours of full use |
-+---------------------+---------+---------------------------------------------------------+
-| lifeCycle | -- | Permissible amount of full cycles |
-+---------------------+---------+---------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| type | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| behaviour | -- | | Foreseen operation strategy of the storage. |
-| | | | Eligible input: *"market"*, *"grid"*, *"self"* |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-
-Caveats
-^^^^^^^
-The field :code:`behaviour` will be removed in version 1.x, as this is an information, that is only important to a
-smaller sub set of simulation applications.
diff --git a/docs/readthedocs/models/input/participant/thermalbus.md b/docs/readthedocs/models/input/participant/thermalbus.md
new file mode 100644
index 000000000..87cad5dd8
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/thermalbus.md
@@ -0,0 +1,45 @@
+(thermal-bus-model)=
+
+# Thermal Bus
+
+A coupling point to thermal system - equivalent to [electrical node](../grid/node.md#node)
+.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - bus
+ - --
+ - Connection point to the thermal system
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/thermalbus.rst b/docs/readthedocs/models/input/participant/thermalbus.rst
deleted file mode 100644
index 8b0a6300e..000000000
--- a/docs/readthedocs/models/input/participant/thermalbus.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-.. _thermal_bus_model:
-
-Thermal Bus
------------
-A coupling point to thermal system - equivalent to :ref:`electrical node `.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+---------------+------+----------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+======+========================================+
-| uuid | -- | |
-+---------------+------+----------------------------------------+
-| id | -- | Human readable identifier |
-+---------------+------+----------------------------------------+
-| operator | -- | |
-+---------------+------+----------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+---------------+------+----------------------------------------+
-| bus | -- | Connection point to the thermal system |
-+---------------+------+----------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/thermalhouse.md b/docs/readthedocs/models/input/participant/thermalhouse.md
new file mode 100644
index 000000000..15e5fd54c
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/thermalhouse.md
@@ -0,0 +1,65 @@
+(thermal-house-model)=
+
+# Thermal House Model
+
+Model for the thermal behaviour of a building.
+This reflects a simple shoe box with transmission losses
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - bus
+ - --
+ - Thermal bus, the model is connected to
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - ethLosses
+ - kW / K
+ - Thermal losses
+
+ * - ethCapa
+ - kWh / K
+ - Thermal capacity
+
+ * - targetTemperature
+ - °C
+ - Desired target temperature
+
+ * - upperTemperatureLimit
+ - °C
+ - Upper temperature boundary
+
+ * - lowerTemperatureLimit
+ - °C
+ - Lower temperature boundary
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/thermalhouse.rst b/docs/readthedocs/models/input/participant/thermalhouse.rst
deleted file mode 100644
index c5ff9b947..000000000
--- a/docs/readthedocs/models/input/participant/thermalhouse.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _thermal_house_model:
-
-Thermal House Model
--------------------
-Model for the thermal behaviour of a building.
-This reflects a simple shoe box with transmission losses
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+-----------------------+---------+---------------------------------+
-| Attribute | Unit | Remarks |
-+=======================+=========+=================================+
-| uuid | -- | |
-+-----------------------+---------+---------------------------------+
-| id | -- | Human readable identifier |
-+-----------------------+---------+---------------------------------+
-| operator | -- | |
-+-----------------------+---------+---------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+-----------------------+---------+---------------------------------+
-| ethLosses | kW / K | Thermal losses |
-+-----------------------+---------+---------------------------------+
-| ethCapa | kWh / K | Thermal capacity |
-+-----------------------+---------+---------------------------------+
-| targetTemperature | °C | Desired target temperature |
-+-----------------------+---------+---------------------------------+
-| upperTemperatureLimit | °C | Upper temperature boundary |
-+-----------------------+---------+---------------------------------+
-| lowerTemperatureLimit | °C | Lower temperature boundary |
-+-----------------------+---------+---------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/input/participant/wec.md b/docs/readthedocs/models/input/participant/wec.md
new file mode 100644
index 000000000..862cbbdcd
--- /dev/null
+++ b/docs/readthedocs/models/input/participant/wec.md
@@ -0,0 +1,127 @@
+(wec-model)=
+
+# Wind Energy Converter
+
+Model of a wind energy converter.
+
+## Attributes, Units and Remarks
+
+### Type Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - capex
+ - €
+ - Capital expenditure to purchase one entity of this type
+
+ * - opex
+ - € / MWh
+ - | Operational expenditure to operate one entity of
+ | this type
+
+ * - sRated
+ - kVA
+ - Rated apparent power
+
+ * - cosPhiRated
+ - --
+ - Rated power factor
+
+ * - cpCharacteristic
+ - --
+ - Wind velocity dependent :ref:`Betz factors`.
+
+ * - etaConv
+ - %
+ - Efficiency of the assets inverter
+
+ * - rotorArea
+ - m²
+ - Area the rotor covers
+
+ * - hubHeight
+ - m
+ - Height of the rotor hub
+
+```
+
+### Entity Model
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ -
+
+ * - id
+ - --
+ - Human readable identifier
+
+ * - operator
+ - --
+ -
+
+ * - operationTime
+ - --
+ - Timely restriction of operation
+
+ * - node
+ - --
+ -
+
+ * - qCharacteristics
+ - --
+ - :ref:`Reactive power characteristic` to follow
+
+ * - type
+ - --
+ -
+
+ * - marketReaction
+ - --
+ - | Whether to adapt output based on (volatile)
+ | market price or not
+
+ * - em
+ - --
+ - | UUID reference to an :ref:`Energy Management Unit` that is controlling
+ | this system participant. Field can be empty or missing, if this participant
+ | is not controlled.
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
+
+(wec-cp-characteristic)=
+
+## Betz Characteristic
+
+A collection of wind velocity to Betz factor pairs to be applied in
+[Betz's law](https://en.wikipedia.org/wiki/Betz's_law) to determine the wind energy coming onto the rotor area.
diff --git a/docs/readthedocs/models/input/participant/wec.rst b/docs/readthedocs/models/input/participant/wec.rst
deleted file mode 100644
index d0769d92e..000000000
--- a/docs/readthedocs/models/input/participant/wec.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-.. _wec_model:
-
-Wind Energy Converter
----------------------
-Model of a wind energy converter.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Type Model
-""""""""""
-
-+------------------+---------+----------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================+
-| uuid | -- | |
-+------------------+---------+----------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+----------------------------------------------------------------------+
-| capex | € | Capital expenditure to purchase one entity of this type |
-+------------------+---------+----------------------------------------------------------------------+
-| opex | € / MWh | | Operational expenditure to operate one entity of |
-| | | | this type |
-+------------------+---------+----------------------------------------------------------------------+
-| sRated | kVA | Rated apparent power |
-+------------------+---------+----------------------------------------------------------------------+
-| cosphiRated | -- | Rated power factor |
-+------------------+---------+----------------------------------------------------------------------+
-| cpCharacteristic | -- | Wind velocity dependent :ref:`Betz factors`. |
-+------------------+---------+----------------------------------------------------------------------+
-| etaConv | % | Efficiency of the assets inverter |
-+------------------+---------+----------------------------------------------------------------------+
-| rotorArea | m² | Area the rotor covers |
-+------------------+---------+----------------------------------------------------------------------+
-| hubHeight | m | Height of the rotor hub |
-+------------------+---------+----------------------------------------------------------------------+
-
-Entity Model
-""""""""""""
-
-+------------------+---------+--------------------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+==================+=========+======================================================================================+
-| uuid | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| id | -- | Human readable identifier |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operator | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| operationTime | -- | Timely restriction of operation |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| node | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| qCharacteristics | -- | :ref:`Reactive power characteristic` to follow |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| type | -- | |
-+------------------+---------+--------------------------------------------------------------------------------------+
-| marketReaction | -- | | Whether to adapt output based on (volatile) |
-| | | | market price or not |
-+------------------+---------+--------------------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
-
-.. _wec_cp_characteristic:
-
-Betz Characteristic
-^^^^^^^^^^^^^^^^^^^
-A collection of wind velocity to Betz factor pairs to be applied in
-`Betz's law `_ to determine the wind energy coming onto the rotor area.
diff --git a/docs/readthedocs/models/models.md b/docs/readthedocs/models/models.md
index c0e70ab78..dbb2b1ab8 100644
--- a/docs/readthedocs/models/models.md
+++ b/docs/readthedocs/models/models.md
@@ -18,22 +18,26 @@ We designed the models in a way, that does not allow for adaptions of the repres
objects.
Thereby you can be sure, that your models are *thread-safe* and no unwanted or unobserved changes are made.
-**Copyable**
+**Clonability**
With the general design principle of immutability, entity modifications (e.g. updates of field values) can become
hard and annoying. To avoid generating methods to update each field value, we provide an adapted version of the
[Builder pattern](https://en.wikipedia.org/wiki/Builder_pattern/) to make entity modifications as easy as possible.
-Each entity holds it's own copy builder class, which follows the same inheritance as the entity class itself. With a
-call of `.copy()` on an entity instance a builder instance is returned, that allows for modification of fields and
-can be terminated with `.build()` which will return an instance of the entity with modified field values as required.
-For the moment, this pattern is only implemented for a small amount of `AssetInput` entities (all entities held by a
-`GridContainer` except thermal units to be precise), but we plan to extend this capability to all input entities in the
-future.
+Each entity holds its own copy builder class, which follows the same inheritance as the entity class itself. With a
+call of `.copy()` on an entity instance a builder instance is returned, which allows for modification of fields and
+can be terminated with `.build()`. This will return an instance of the entity with modified field values as indicated.
+For the moment, this pattern is only implemented for a limited set of entities, but we plan to extend this capability
+to all input entities in the future.
+
+**Scaling entity properties**
+Using the copy builders (as described above) we provide a convenience method that helps with scaling system
+participants and respective type inputs. Scaling entities tries to preserve proportions that are related to power.
+This means that capacity, consumption etc. are scaled with the same factor as power.
**Single Point of Truth**
Throughout all models you can be sure, that no information is given twice, reducing the possibility to have ambiguous
information in your simulation set up.
"Missing" information can be received through the grids relational information - e.g. if you intend to model a wind
-energy converter in detail, you may find information of it's geographical location in the model of it's common
+energy converter in detail, you may find information of its geographical location in the model of its common
coupling point ([node](/models/input/grid/node)).
**Harmonized Units System**
@@ -135,6 +139,7 @@ input/participant/wec
input/participant/thermalbus
input/participant/thermalhouse
input/participant/cylindricalstorage
+input/participant/em
```
### Additional Data
diff --git a/docs/readthedocs/models/result/grid/connector.md b/docs/readthedocs/models/result/grid/connector.md
new file mode 100644
index 000000000..6417c5a14
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/connector.md
@@ -0,0 +1,51 @@
+(connector-result)=
+
+# Connector
+
+Representation of all kinds of connectors.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - iAMag
+ - ampere
+ - A stands for sending node
+
+ * - iAAng
+ - degree
+ -
+
+ * - iBMag
+ - ampere
+ - B stands for receiving node
+
+ * - iBAng
+ - degree
+ -
+
+```
+
+## Caveats
+
+Groups all available connectors i.e. lines, switches and transformers
diff --git a/docs/readthedocs/models/result/grid/connector.rst b/docs/readthedocs/models/result/grid/connector.rst
deleted file mode 100644
index c3749eef6..000000000
--- a/docs/readthedocs/models/result/grid/connector.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-.. _connector_result:
-
-Connector
----------
-Representation of all kinds of connectors.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| iAMag | ampere | A stands for sending node |
-+---------------+----------------+----------------------------------------------------------+
-| iAAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| iBMag | ampere | B stands for receiving node |
-+---------------+----------------+----------------------------------------------------------+
-| iBAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Groups all available connectors i.e. lines, switches and transformers
diff --git a/docs/readthedocs/models/result/grid/line.md b/docs/readthedocs/models/result/grid/line.md
new file mode 100644
index 000000000..21efaa9d6
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/line.md
@@ -0,0 +1,52 @@
+(line-result)=
+
+# Line
+
+Representation of an AC line.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - iAMag
+ - ampere
+ - A stands for sending node
+
+ * - iAAng
+ - degree
+ -
+
+ * - iBMag
+ - ampere
+ - B stands for receiving node
+
+ * - iBAng
+ - degree
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/grid/line.rst b/docs/readthedocs/models/result/grid/line.rst
deleted file mode 100644
index bea516141..000000000
--- a/docs/readthedocs/models/result/grid/line.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-.. _line_result:
-
-Line
-----
-Representation of an AC line.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| iAMag | ampere | A stands for sending node |
-+---------------+----------------+----------------------------------------------------------+
-| iAAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| iBMag | ampere | B stands for receiving node |
-+---------------+----------------+----------------------------------------------------------+
-| iBAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/grid/node.md b/docs/readthedocs/models/result/grid/node.md
new file mode 100644
index 000000000..0e7049baf
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/node.md
@@ -0,0 +1,44 @@
+(node-result)=
+
+# Node
+
+Representation of an electrical node, with no further distinction into bus bar, auxiliary node or others.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - vMag
+ - p.u.
+ -
+
+ * - vAng
+ - degree
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/grid/node.rst b/docs/readthedocs/models/result/grid/node.rst
deleted file mode 100644
index 26129af2f..000000000
--- a/docs/readthedocs/models/result/grid/node.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _node_result:
-
-Node
-----
-Representation of an electrical node, with no further distinction into bus bar, auxiliary node or others.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| vMag | p.u. | |
-+---------------+----------------+----------------------------------------------------------+
-| vAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/grid/switch.md b/docs/readthedocs/models/result/grid/switch.md
new file mode 100644
index 000000000..c17342691
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/switch.md
@@ -0,0 +1,40 @@
+(switch-result)=
+
+# Switch
+
+Representation of electrical switches.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - closed
+ - boolean
+ - status of the switching device
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/grid/switch.rst b/docs/readthedocs/models/result/grid/switch.rst
deleted file mode 100644
index aa11cda90..000000000
--- a/docs/readthedocs/models/result/grid/switch.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-.. _switch_result:
-
-Switch
-------
-Representation of electrical switches.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| closed | boolean | status of the switching device |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/grid/transformer.md b/docs/readthedocs/models/result/grid/transformer.md
new file mode 100644
index 000000000..c75bfa2f6
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/transformer.md
@@ -0,0 +1,55 @@
+(transformer-result)=
+
+# Transformer
+
+Representation of transformers.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - iAMag
+ - ampere
+ - A stands for sending node
+
+ * - iAAng
+ - degree
+ -
+
+ * - iBMag
+ - ampere
+ - B stands for receiving node
+
+ * - iBAng
+ - degree
+ -
+
+ * - tapPos
+ - --
+ -
+
+```
+
+## Caveats
+
+Groups common information to both 2W and 3W transformers.
diff --git a/docs/readthedocs/models/result/grid/transformer.rst b/docs/readthedocs/models/result/grid/transformer.rst
deleted file mode 100644
index 5246368bf..000000000
--- a/docs/readthedocs/models/result/grid/transformer.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. _transformer_result:
-
-Transformer
------------
-Representation of transformers.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| iAMag | ampere | A stands for sending node |
-+---------------+----------------+----------------------------------------------------------+
-| iAAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| iBMag | ampere | B stands for receiving node |
-+---------------+----------------+----------------------------------------------------------+
-| iBAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| tapPos | -- | |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Groups common information to both 2W and 3W transformers.
diff --git a/docs/readthedocs/models/result/grid/transformer2w.md b/docs/readthedocs/models/result/grid/transformer2w.md
new file mode 100644
index 000000000..58201162c
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/transformer2w.md
@@ -0,0 +1,55 @@
+(transformer2w-result)=
+
+# Two Winding Transformer
+
+Representation of two winding transformers.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - iAMag
+ - ampere
+ - A stands for sending node
+
+ * - iAAng
+ - degree
+ -
+
+ * - iBMag
+ - ampere
+ - B stands for receiving node
+
+ * - iBAng
+ - degree
+ -
+
+ * - tapPos
+ - --
+ -
+
+```
+
+## Caveats
+
+Assumption: Node A is the node at higher voltage.
diff --git a/docs/readthedocs/models/result/grid/transformer2w.rst b/docs/readthedocs/models/result/grid/transformer2w.rst
deleted file mode 100644
index 772a5efc6..000000000
--- a/docs/readthedocs/models/result/grid/transformer2w.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. _transformer2W_result:
-
-Two Winding Transformer
------------------------
-Representation of two winding transformers.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| iAMag | ampere | A stands for sending node |
-+---------------+----------------+----------------------------------------------------------+
-| iAAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| iBMag | ampere | B stands for receiving node |
-+---------------+----------------+----------------------------------------------------------+
-| iBAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| tapPos | -- | |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Assumption: Node A is the node at higher voltage.
diff --git a/docs/readthedocs/models/result/grid/transformer3w.md b/docs/readthedocs/models/result/grid/transformer3w.md
new file mode 100644
index 000000000..917bc59e7
--- /dev/null
+++ b/docs/readthedocs/models/result/grid/transformer3w.md
@@ -0,0 +1,64 @@
+(transformer3w-result)=
+
+# Three Winding Transformer
+
+Representation of three winding transformers.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - ZonedDateTime
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - iAMag
+ - ampere
+ - A stands for sending node
+
+ * - iAAng
+ - degree
+ -
+
+ * - iBMag
+ - ampere
+ - B stands for receiving node
+
+ * - iBAng
+ - degree
+ -
+
+ * - iCMag
+ - ampere
+ - B stands for receiving node
+
+ * - iCAng
+ - degree
+ -
+
+ * - tapPos
+ - --
+ -
+
+```
+
+## Caveats
+
+Assumption: Node A is the node at highest voltage and Node B is at intermediate voltage.
+For model specifications please check corresponding input model documentation.
diff --git a/docs/readthedocs/models/result/grid/transformer3w.rst b/docs/readthedocs/models/result/grid/transformer3w.rst
deleted file mode 100644
index e218042a9..000000000
--- a/docs/readthedocs/models/result/grid/transformer3w.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-.. _transformer3W_result:
-
-Three Winding Transformer
--------------------------
-Representation of three winding transformers.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+----------------+----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+================+==========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+----------------+----------------------------------------------------------+
-| time | ZonedDateTime | date and time for the produced result |
-+---------------+----------------+----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+----------------+----------------------------------------------------------+
-| iAMag | ampere | A stands for sending node |
-+---------------+----------------+----------------------------------------------------------+
-| iAAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| iBMag | ampere | B stands for receiving node |
-+---------------+----------------+----------------------------------------------------------+
-| iBAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| iCMag | ampere | B stands for receiving node |
-+---------------+----------------+----------------------------------------------------------+
-| iCAng | degree | |
-+---------------+----------------+----------------------------------------------------------+
-| tapPos | -- | |
-+---------------+----------------+----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Assumption: Node A is the node at highest voltage and Node B is at intermediate voltage.
-For model specifications please check corresponding input model documentation.
diff --git a/docs/readthedocs/models/result/participant/bm.md b/docs/readthedocs/models/result/participant/bm.md
new file mode 100644
index 000000000..39d9554f0
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/bm.md
@@ -0,0 +1,44 @@
+(bm-result)=
+
+# Biomass plant
+
+Result of a biomass power plant.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/bm.rst b/docs/readthedocs/models/result/participant/bm.rst
deleted file mode 100644
index 7460fda46..000000000
--- a/docs/readthedocs/models/result/participant/bm.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _bm_result:
-
-Biomass plant
--------------
-Result of a biomass power plant.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/chp.md b/docs/readthedocs/models/result/participant/chp.md
new file mode 100644
index 000000000..1f3dba2a5
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/chp.md
@@ -0,0 +1,48 @@
+(chp-result)=
+
+# Combined Heat and Power Plant
+
+Result of a combined heat and power plant.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+ * - qDot
+ - MW
+ - Thermal power
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/chp.rst b/docs/readthedocs/models/result/participant/chp.rst
deleted file mode 100644
index 2c4f76898..000000000
--- a/docs/readthedocs/models/result/participant/chp.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _chp_result:
-
-Combined Heat and Power Plant
------------------------------
-Result of a combined heat and power plant.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-| qDot | MW | Thermal power |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/cylindricalstorage.md b/docs/readthedocs/models/result/participant/cylindricalstorage.md
new file mode 100644
index 000000000..c028628c2
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/cylindricalstorage.md
@@ -0,0 +1,48 @@
+(cylindricalstorage-result)=
+
+# Cylindrical Thermal Storage
+
+Result of a cylindrical thermal storage using a fluent to store thermal energy.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - energy
+ - MWh
+ -
+
+ * - qDot
+ - MW
+ - heat demand of the sink
+
+ * - fillLevel
+ - --
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/cylindricalstorage.rst b/docs/readthedocs/models/result/participant/cylindricalstorage.rst
deleted file mode 100644
index 4b4dff95a..000000000
--- a/docs/readthedocs/models/result/participant/cylindricalstorage.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _cylindricalstorage_result:
-
-Cylindrical Thermal Storage
----------------------------
-Result of a cylindrical thermal storage using a fluent to store thermal energy.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+-----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+===========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+-----------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+-----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+-----------------------------------------------------------+
-| energy | MWh | |
-+---------------+---------+-----------------------------------------------------------+
-| qDot | MW | heat demand of the sink |
-+---------------+---------+-----------------------------------------------------------+
-| fillLevel | -- | |
-+---------------+---------+-----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/em.md b/docs/readthedocs/models/result/participant/em.md
new file mode 100644
index 000000000..7cc9977e3
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/em.md
@@ -0,0 +1,45 @@
+(em-result)=
+
+# Energy Management
+
+Result of an energy management entity.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ - active power output
+
+ * - q
+ - MW
+ - reactive power output
+
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/em.rst b/docs/readthedocs/models/result/participant/em.rst
deleted file mode 100644
index 90f47b1cb..000000000
--- a/docs/readthedocs/models/result/participant/em.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _em_result:
-
-Energy Management
------------------
-Result of an energy management entity.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+----------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+============================================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+----------------------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+----------------------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+----------------------------------------------------------------------------+
-| p | MW | active power output |
-+---------------+---------+----------------------------------------------------------------------------+
-| q | MW | reactive power output |
-+---------------+---------+----------------------------------------------------------------------------+
-
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
-
diff --git a/docs/readthedocs/models/result/participant/ev.md b/docs/readthedocs/models/result/participant/ev.md
new file mode 100644
index 000000000..05ba1e447
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/ev.md
@@ -0,0 +1,48 @@
+(ev-result)=
+
+# Electric Vehicle
+
+Result of an electric vehicle, that is occasionally connected to the grid via an [electric vehicle charging system](evcs.md#electric-vehicle-charging-station).
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+ * - soc
+ - %
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/ev.rst b/docs/readthedocs/models/result/participant/ev.rst
deleted file mode 100644
index f164588d1..000000000
--- a/docs/readthedocs/models/result/participant/ev.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _ev_result:
-
-Electric Vehicle
-----------------
-Result of an electric vehicle, that is occasionally connected to the grid via an :ref:`electric vehicle charging station`.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-| soc | % | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/evcs.md b/docs/readthedocs/models/result/participant/evcs.md
new file mode 100644
index 000000000..48af32b5a
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/evcs.md
@@ -0,0 +1,44 @@
+(evcs-result)=
+
+# Electric Vehicle Charging Station
+
+This model is currently only a dummy implementation of an electric vehicle charging station.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/evcs.rst b/docs/readthedocs/models/result/participant/evcs.rst
deleted file mode 100644
index 6e5a22136..000000000
--- a/docs/readthedocs/models/result/participant/evcs.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _evcs_result:
-
-Electric Vehicle Charging Station
----------------------------------
-This model is currently only a dummy implementation of an electric vehicle charging station.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
\ No newline at end of file
diff --git a/docs/readthedocs/models/result/participant/fixedfeedin.md b/docs/readthedocs/models/result/participant/fixedfeedin.md
new file mode 100644
index 000000000..9cf5f64de
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/fixedfeedin.md
@@ -0,0 +1,45 @@
+(fixed-feed-in-result)=
+
+# Fixed Feed In Facility
+
+Result of a facility, that provides constant power feed in, as no further information about the actual behaviour of the
+model can be derived.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/fixedfeedin.rst b/docs/readthedocs/models/result/participant/fixedfeedin.rst
deleted file mode 100644
index baabec0e0..000000000
--- a/docs/readthedocs/models/result/participant/fixedfeedin.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _fixed_feed_in_result:
-
-Fixed Feed In Facility
-----------------------
-Result of a facility, that provides constant power feed in, as no further information about the actual behaviour of the
-model can be derived.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/flexoption.md b/docs/readthedocs/models/result/participant/flexoption.md
new file mode 100644
index 000000000..34039e082
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/flexoption.md
@@ -0,0 +1,48 @@
+(flexoption-result)=
+
+# Flexibility Option
+
+Result of a flexibility option.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - pRef
+ - MW
+ - active power that was suggested for regular usage by the system participant
+
+ * - pMin
+ - MW
+ - active minimal power that was determined by the system participant
+
+ * - pMax
+ - MW
+ - active maximum power that was determined by the system participant
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/flexoption.rst b/docs/readthedocs/models/result/participant/flexoption.rst
deleted file mode 100644
index e2abe9547..000000000
--- a/docs/readthedocs/models/result/participant/flexoption.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-.. _flexoption_result:
-
-Flexibility Option
-------------------
-Result of a flexibility option.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+----------------------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+============================================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+----------------------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+----------------------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+----------------------------------------------------------------------------+
-| pRef | MW | active power that was suggested for regular usage by the system participant|
-+---------------+---------+----------------------------------------------------------------------------+
-| pMin | MW | active minimal power that was determined by the system participant |
-+---------------+---------+----------------------------------------------------------------------------+
-| pMax | MW | active maximum power that was determined by the system participant |
-+---------------+---------+----------------------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
-
diff --git a/docs/readthedocs/models/result/participant/hp.md b/docs/readthedocs/models/result/participant/hp.md
new file mode 100644
index 000000000..437dde0cb
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/hp.md
@@ -0,0 +1,48 @@
+(hp-result)=
+
+# Heat Pump
+
+Result of a heat pump.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+ * - qDot
+ - MW
+ - Thermal power
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/hp.rst b/docs/readthedocs/models/result/participant/hp.rst
deleted file mode 100644
index 5c51b59c4..000000000
--- a/docs/readthedocs/models/result/participant/hp.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _hp_result:
-
-Heat Pump
----------
-Result of a heat pump.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-| qDot | MW | Thermal power |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
\ No newline at end of file
diff --git a/docs/readthedocs/models/result/participant/load.md b/docs/readthedocs/models/result/participant/load.md
new file mode 100644
index 000000000..8e0f40912
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/load.md
@@ -0,0 +1,44 @@
+(load-result)=
+
+# Load
+
+Result of (mainly) domestic loads.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/load.rst b/docs/readthedocs/models/result/participant/load.rst
deleted file mode 100644
index 62b275d70..000000000
--- a/docs/readthedocs/models/result/participant/load.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _load_result:
-
-Load
-----
-Result of (mainly) domestic loads.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
\ No newline at end of file
diff --git a/docs/readthedocs/models/result/participant/pv.md b/docs/readthedocs/models/result/participant/pv.md
new file mode 100644
index 000000000..38df0239d
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/pv.md
@@ -0,0 +1,44 @@
+(pv-result)=
+
+# Photovoltaic Power Plant
+
+Result of a photovoltaic power plant.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/pv.rst b/docs/readthedocs/models/result/participant/pv.rst
deleted file mode 100644
index e7e3b8d75..000000000
--- a/docs/readthedocs/models/result/participant/pv.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _pv_result:
-
-Photovoltaic Power Plant
-------------------------
-Result of a photovoltaic power plant.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/storage.md b/docs/readthedocs/models/result/participant/storage.md
new file mode 100644
index 000000000..cb2d8ded0
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/storage.md
@@ -0,0 +1,48 @@
+(storage-result)=
+
+# Electrical Energy Storage
+
+Result of an electrochemical storage
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+ * - soc
+ - --
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/storage.rst b/docs/readthedocs/models/result/participant/storage.rst
deleted file mode 100644
index 486535f83..000000000
--- a/docs/readthedocs/models/result/participant/storage.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _storage_result:
-
-Electrical Energy Storage
--------------------------
-Result of an electrochemical storage
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-| soc | -- | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/systemparticipant.md b/docs/readthedocs/models/result/participant/systemparticipant.md
new file mode 100644
index 000000000..54dabb959
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/systemparticipant.md
@@ -0,0 +1,45 @@
+(system-participant-result)=
+
+# System Participant
+
+Groups together all system participants such as PV, Storage etc.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/systemparticipant.rst b/docs/readthedocs/models/result/participant/systemparticipant.rst
deleted file mode 100644
index 3393ba87b..000000000
--- a/docs/readthedocs/models/result/participant/systemparticipant.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _system_participant_result:
-
-System Participant
-------------------
-Groups together all system participants such as PV, Storage etc.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalhouse.md b/docs/readthedocs/models/result/participant/thermalhouse.md
new file mode 100644
index 000000000..af594039c
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/thermalhouse.md
@@ -0,0 +1,45 @@
+(thermal-house-result)=
+
+# Thermal House
+
+Model for the thermal behaviour of a building.
+This reflects a simple shoe box with transmission losses
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - qDot
+ - MW
+ - thermal heat demand of the sink
+
+ * - indoorTemperature
+ - °C
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalhouse.rst b/docs/readthedocs/models/result/participant/thermalhouse.rst
deleted file mode 100644
index 194302251..000000000
--- a/docs/readthedocs/models/result/participant/thermalhouse.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _thermal_house_result:
-
-Thermal House
--------------
-Model for the thermal behaviour of a building.
-This reflects a simple shoe box with transmission losses
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+-------------------+---------+-----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===================+=========+===========================================================+
-| uuid | -- | uuid for the result entity |
-+-------------------+---------+-----------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+-------------------+---------+-----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+-------------------+---------+-----------------------------------------------------------+
-| qDot | MW | thermal heat demand of the sink |
-+-------------------+---------+-----------------------------------------------------------+
-| indoorTemperature | °C | |
-+-------------------+---------+-----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalsink.md b/docs/readthedocs/models/result/participant/thermalsink.md
new file mode 100644
index 000000000..26ae65631
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/thermalsink.md
@@ -0,0 +1,40 @@
+(thermal-sink-result)=
+
+# Thermal Sink
+
+Result of a thermal sink.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - qDot
+ - MW
+ - thermal heat demand
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalsink.rst b/docs/readthedocs/models/result/participant/thermalsink.rst
deleted file mode 100644
index f761eea14..000000000
--- a/docs/readthedocs/models/result/participant/thermalsink.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-.. _thermal_sink_result:
-
-Thermal Sink
-------------
-Result of a thermal sink.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+-----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+===========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+-----------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+-----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+-----------------------------------------------------------+
-| qDot | MW | thermal heat demand |
-+---------------+---------+-----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalstorage.md b/docs/readthedocs/models/result/participant/thermalstorage.md
new file mode 100644
index 000000000..1ec9958e7
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/thermalstorage.md
@@ -0,0 +1,44 @@
+(thermal-storage-result)=
+
+# Thermal Storage
+
+Result of a thermal storage.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - energy
+ - MWh
+ -
+
+ * - qDot
+ - MW
+ - heat flowing in
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalstorage.rst b/docs/readthedocs/models/result/participant/thermalstorage.rst
deleted file mode 100644
index b64a285a2..000000000
--- a/docs/readthedocs/models/result/participant/thermalstorage.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _thermal_storage_result:
-
-Thermal Storage
----------------
-Result of a thermal storage.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+-----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+===========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+-----------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+-----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+-----------------------------------------------------------+
-| energy | MWh | |
-+---------------+---------+-----------------------------------------------------------+
-| qDot | MW | heat flowing in |
-+---------------+---------+-----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalunit.md b/docs/readthedocs/models/result/participant/thermalunit.md
new file mode 100644
index 000000000..624aeb38b
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/thermalunit.md
@@ -0,0 +1,40 @@
+(thermal-unit-result)=
+
+# Thermal Unit
+
+Result of a thermal unit.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - qDot
+ - MW
+ - thermal power exchanged
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/thermalunit.rst b/docs/readthedocs/models/result/participant/thermalunit.rst
deleted file mode 100644
index 0d33cdd9d..000000000
--- a/docs/readthedocs/models/result/participant/thermalunit.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-.. _thermal_unit_result:
-
-Thermal Unit
-------------
-Result of a thermal unit.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+-----------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+===========================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+-----------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+-----------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+-----------------------------------------------------------+
-| qDot | MW | thermal power exchanged |
-+---------------+---------+-----------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/wec.md b/docs/readthedocs/models/result/participant/wec.md
new file mode 100644
index 000000000..cc04169b7
--- /dev/null
+++ b/docs/readthedocs/models/result/participant/wec.md
@@ -0,0 +1,44 @@
+(wec-result)=
+
+# Wind Energy Converter
+
+Result of a wind turbine.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+ :widths: 33 33 33
+ :header-rows: 0
+
+
+ * - Attribute
+ - Unit
+ - Remarks
+
+ * - uuid
+ - --
+ - uuid for the result entity
+
+ * - time
+ - --
+ - date and time for the produced result
+
+ * - inputModel
+ - --
+ - uuid for the associated input model
+
+ * - p
+ - MW
+ -
+
+ * - q
+ - MVAr
+ -
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!
diff --git a/docs/readthedocs/models/result/participant/wec.rst b/docs/readthedocs/models/result/participant/wec.rst
deleted file mode 100644
index 9e56a9b85..000000000
--- a/docs/readthedocs/models/result/participant/wec.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-.. _wec_result:
-
-Wind Energy Converter
----------------------
-Result of a wind turbine.
-
-Attributes, Units and Remarks
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-+---------------+---------+--------------------------------------------------------------+
-| Attribute | Unit | Remarks |
-+===============+=========+==============================================================+
-| uuid | -- | uuid for the result entity |
-+---------------+---------+--------------------------------------------------------------+
-| time | -- | date and time for the produced result |
-+---------------+---------+--------------------------------------------------------------+
-| inputModel | -- | uuid for the associated input model |
-+---------------+---------+--------------------------------------------------------------+
-| p | MW | |
-+---------------+---------+--------------------------------------------------------------+
-| q | MVAr | |
-+---------------+---------+--------------------------------------------------------------+
-
-Caveats
-^^^^^^^
-Nothing - at least not known.
-If you found something, please contact us!
\ No newline at end of file
diff --git a/docs/readthedocs/requirements.txt b/docs/readthedocs/requirements.txt
index 6e3fa7773..cb581e840 100644
--- a/docs/readthedocs/requirements.txt
+++ b/docs/readthedocs/requirements.txt
@@ -1,6 +1,6 @@
commonmark==0.9.1
recommonmark==0.7.1
Sphinx==7.2.6
-sphinx-rtd-theme==1.3.0
+sphinx-rtd-theme==2.0.0
myst-parser==2.0.0
markdown-it-py==3.0.0
diff --git a/docs/uml/main/EntitySourceClassDiagram.puml b/docs/uml/main/EntitySourceClassDiagram.puml
index a160bc739..56ac69c40 100644
--- a/docs/uml/main/EntitySourceClassDiagram.puml
+++ b/docs/uml/main/EntitySourceClassDiagram.puml
@@ -3,12 +3,21 @@
note "Assuming all classes to implement \nthe abstract methods of their interfaces\n\n" as generalNotes
abstract class EntitySource {
- - DataSource dataSource
- - Set buildNodeAssetEntities(Class, EntityFactory, Collection, Collection, ConcurrentMap, LongAdder>)
- - Set buildNodeAssetEntities(Class, EntityFactory, Collection, Collection)
- - Set buildAssetInputEntities(Class, EntityFactory, Collection)
- - Set buildAssetInputEntities(Class, EntityFactory)
+ # DataSource dataSource
+ # {static} Try enrichEntityData(E, String, Map, BiFunction)
+ # {static} Try enrichEntityData(E, String, Map, String, Map, TriFunction)
+ # {static} Try getLinkedEntity(EntityData, String, Map)
+ # {static} Try optionallyEnrichEntityData(E, String, Map, T, BiFunction)
+ # Stream> buildNodeAssetEntities(Class, Map, Map)
+ # {static} Stream> nodeAssetInputEntityDataStream(Stream>, Map)
+ # Stream> buildAssetInputEntities(Class, Map)
+ # {static} Stream> assetInputEntityDataStream(Stream>, Map)
+ # Stream> buildEntityData(Class)
+ # {static} Map unpackMap(Stream>, Class) throws SourceException
+ # {static} Set unpackSet(Stream>, Class) throws SourceException
+ # {static} Stream unpackSet(Stream>, Class) throws SourceException
}
+
EntitySource <|-- GraphicSource
EntitySource <|-- RawGridSource
EntitySource <|-- ResultEntitySource
@@ -21,12 +30,13 @@ class GraphicSource {
- RawGridSource rawGridSource
- LineGraphicInputFactory lineGraphicInputFactory
- NodeGraphicInputFactory nodeGraphicInputFactory
- - GraphicSource(TypeSource, RawGridSource, DataSource)
- - Optional getGraphicElements()
- - Set getNodeGraphicInput()
- - Set getNodeGraphicInput(Set)
- - Set getLineGraphicInput()
- - Set getLineGraphicInput(Set)
+ + GraphicSource(TypeSource, RawGridSource, DataSource)
+ + GraphicElements getGraphicElements() throws SourceException
+ + GraphicElements getGraphicElements(Map, Map) throws SourceException
+ + Set getNodeGraphicInput() throws SourceException
+ + Set getNodeGraphicInput(Map) throws SourceException
+ + Set getLineGraphicInput() throws SourceException
+ + Set getLineGraphicInput(Map) throws SourceException
}
class RawGridSource {
@@ -37,19 +47,21 @@ class RawGridSource {
- Transformer3WInputFactory transformer3WInputFactory
- SwitchInputFactory switchInputFactory
- MeasurementUnitInputFactory measurementUnitInputFactory
- - Optional getGridData()
- - Set getNodes()
- - Set getNodes(Set)
- - Set getLines()
- - Set getLines(Set, Set, Set)
- - Set get2WTransformers()
- - Set get2WTransformers(Set, Set, Set)
- - Set get3WTransformers()
- - Set get3WTransformers(Set, Set, Set)
- - Set getSwitches()
- - Set getSwitches(Set, Set)
- - Set getMeasurementUnits()
- - Set getMeasurementUnits(Set, Set)
+ + RawGridSource(TypeSource typeSource, DataSource dataSource)
+ + RawGridElements getGridData() throws SourceException
+ + RawGridElements getGridData(Map, Map, Map) throws SourceException
+ + Map getNodes() throws SourceException
+ + Map getNodes(Map) throws SourceException
+ + Map getLines() throws SourceException
+ + Map getLines(Map, Map, Set) throws SourceException
+ + Set get2WTransformers() throws SourceException
+ + Set get2WTransformers(Map, Map, Set) throws SourceException
+ + Set get3WTransformers() throws SourceException
+ + Set get3WTransformers(Map, Map, Set) throws SourceException
+ + Set getSwitches() throws SourceException
+ + Set getSwitches(Map, Map) throws SourceException
+ + Set getMeasurementUnits() throws SourceException
+ + Set getMeasurementUnits(Map, Map) throws SourceException
}
class ResultEntitySource {
@@ -59,27 +71,27 @@ class ResultEntitySource {
- NodeResultFactory nodeResultFactory
- ConnectorResultFactory connectorResultFactory
- FlexOptionsResultFactory flexOptionsResultFactory
- - ResultEntitySource(DataSource)
- - ResultEntitySource(DataSource, String)
- - Set getNodeResults()
- - Set getSwitchResults()
- - Set getLineResults()
- - Set getTransformer2WResultResults()
- - Set getTransformer3WResultResults()
- - Set getFlexOptionsResults()
- - Set getLoadResults()
- - Set getPvResults()
- - Set getFixedFeedInResults()
- - Set getBmResults()
- - Set getChpResults()
- - Set getWecResults()
- - Set getStorageResults()
- - Set getEvcsResults()
- - Set getEvResults()
- - Set getHpResults()
- - Set getCylindricalStorageResult()
- - Set getThermalHouseResults()
- - Set getEmResults()
+ + ResultEntitySource(DataSource)
+ + ResultEntitySource(DataSource, String)
+ + Set getNodeResults() throws SourceException
+ + Set getSwitchResults() throws SourceException
+ + Set getLineResults() throws SourceException
+ + Set getTransformer2WResultResults() throws SourceException
+ + Set getTransformer3WResultResults() throws SourceException
+ + Set getFlexOptionsResults() throws SourceException
+ + Set getLoadResults() throws SourceException
+ + Set getPvResults() throws SourceException
+ + Set getFixedFeedInResults() throws SourceException
+ + Set getBmResults() throws SourceException
+ + Set getChpResults() throws SourceException
+ + Set getWecResults() throws SourceException
+ + Set getStorageResults() throws SourceException
+ + Set getEvcsResults() throws SourceException
+ + Set getEvResults() throws SourceException
+ + Set getHpResults() throws SourceException
+ + Set getCylindricalStorageResult() throws SourceException
+ + Set getThermalHouseResults() throws SourceException
+ + Set getEmResults() throws SourceException
}
class SystemParticipantSource{
@@ -96,28 +108,29 @@ class SystemParticipantSource{
- StorageInputFactory storageInputFactory
- WecInputFactory wecInputFactory
- EvcsInputFactory evcsInputFactory
- - SystemParticipantSource(TypeSource, ThermalSource, RawGridSource, DataSource)
- - Optional getSystemParticipants()
- - Set getBmPlants()
- - Set getBmPlants(Set, Set, Set)
- - Set getChpPlants()
- - Set getChpPlants(Set, Set, Set, Set, Set)
- - Set getEvs()
- - Set getEvs(Set, Set, Set)
- - Set