Merge branch 'dev' into ms/#1106-transfer-LoadProfile-parsing-code-from-SIMONA

# Conflicts:
#	CHANGELOG.md
#	src/main/java/edu/ie3/datamodel/io/connectors/CsvFileConnector.java

Author: staudtMarius

CHANGELOG.md

@@ -15,10 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enhance `TimeSeriesSource` with method to retrieve the previous value before a given key [#1182](https://github.com/ie3-institute/PowerSystemDataModel/issues/1182)
 - Added `BdewLoadProfileTimeSeries` [#1230](https://github.com/ie3-institute/PowerSystemDataModel/issues/1230)
 - Added `RandomLoadProfileTimeSeries` [#1232](https://github.com/ie3-institute/PowerSystemDataModel/issues/1232)
+- Attribute `pThermalRated` for `ThermalStorage`s [#679](https://github.com/ie3-institute/PowerSystemDataModel/issues/679) 
+- Attributes `housingType` and `numberInhabitants` for `ThermalHouse`s [#1253](https://github.com/ie3-institute/PowerSystemDataModel/issues/1253)
+- Added domestic hot water storage model [#1257](https://github.com/ie3-institute/PowerSystemDataModel/issues/1257)
 - Added load profiles sources [#1106](https://github.com/ie3-institute/PowerSystemDataModel/issues/1106)
 
 ### Fixed
 - Removing opened `SwitchInput` during connectivity check [#1221](https://github.com/ie3-institute/PowerSystemDataModel/issues/1221)
+- Fixed example in ReadTheDocs [#1244](https://github.com/ie3-institute/PowerSystemDataModel/issues/1244)
 
 ### Changed
 - Storage minimum level parameter removed from cylindrical thermal storage [#1123](https://github.com/ie3-institute/PowerSystemDataModel/issues/1123)
@@ -32,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix spotless deprecations [#1123](https://github.com/ie3-institute/PowerSystemDataModel/issues/1223)
 - Refactored `CongestionResult`, removed `ModelResultEntity` [#1234](https://github.com/ie3-institute/PowerSystemDataModel/issues/1234)
 - Replaced `LoadProfileInput` with `LoadProfileTimeSeries` [#1228](https://github.com/ie3-institute/PowerSystemDataModel/issues/1228)
+- Enhance `CsvDataSource` [#1246](https://github.com/ie3-institute/PowerSystemDataModel/issues/1246)
 
 ## [5.1.0] - 2024-06-24
 

build.gradle

@@ -19,7 +19,7 @@ ext {
   javaVersion = JavaVersion.VERSION_17
   groovyVersion = "4.0"
   groovyBinaryVersion = "4.0.25"
-  testcontainersVersion = '1.20.4'
+  testcontainersVersion = '1.20.5'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
 }

docs/readthedocs/io/ValidationUtils.md

@@ -74,7 +74,7 @@ The ValidationUtils include validation checks for...
         - HpTypeInput
         - StorageTypeInput
         - WecTypeInput
-- ThermalUnitValidationUtils
+- ThermalValidationUtils
     - ThermalUnitInput
         - ThermalSinkInput
             - ThermalHouseInput

docs/readthedocs/models/input/operator.md

@@ -36,7 +36,7 @@ having control over one or more physical entitites.
 
 OperatorInput profBroccoli = new OperatorInput(
         UUID.fromString("f15105c4-a2de-4ab8-a621-4bc98e372d92"),
-        "Univ.-Prof. Dr. rer. hort. Klaus-Dieter Brokkoli"
+        "Univ.-Prof. Dr. rer. hort. Klaus-Dieter Broccoli"
       )
 ```
 

docs/readthedocs/models/input/thermal/cylindricalstorage.md

@@ -2,7 +2,7 @@
 
 # Cylindrical Thermal Storage
 
-Model of a cylindrical thermal storage using a fluent to store thermal energy.
+Model of a cylindrical thermal storage using a fluid to store thermal energy.
 
 ## Attributes, Units and Remarks
 
@@ -51,6 +51,10 @@ Model of a cylindrical thermal storage using a fluent to store thermal energy.
    * - c
      - kWh / (K :math:`\cdot` m³)
      - Specific heat capacity of the storage medium
+     
+   * - pThermalMax
+     - kW
+     - Maximum permissible thermal power of the storage
 
 ```
 

docs/readthedocs/models/input/thermal/domestichotwaterstorage.md

@@ -0,0 +1,64 @@
+(domestichotwaterstorage-model)=
+
+# Domestic Hot Water Storage
+
+Model of a domestic hot water storage using a fluid to store thermal energy.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+   :widths: 33 33 33
+   :header-rows: 1
+
+
+   * - 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
+
+   * - 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
+     
+   * - pThermalMax
+     - kW
+     - Maximum permissible thermal power of the storage
+
+```
+
+## Caveats
+
+Nothing - at least not known.
+If you found something, please contact us!

docs/readthedocs/models/input/thermal/thermalhouse.md

@@ -56,6 +56,14 @@ This reflects a simple shoe box with transmission losses
    * - lowerTemperatureLimit
      - °C
      - Lower temperature boundary
+     
+   * - housingType
+     - –
+     - Type of building can either be house or flat
+     
+   * - numberInhabititans
+     - –
+     - Number of people living in the house. Double values to enable modeling based on statistical data sources.
 
 ```
 

docs/readthedocs/models/models.md

@@ -129,6 +129,7 @@ maxdepth: 1
 input/thermal/thermalbus
 input/thermal/thermalhouse
 input/thermal/cylindricalstorage
+input/thermal/domestichotwaterstorage
 ```
 
 ### Participant Related Models
@@ -209,6 +210,7 @@ result/participant/thermalstorage
 result/participant/thermalunit
 result/participant/thermalhouse
 result/participant/cylindricalstorage
+result/participant/domestichotwaterstorage
 result/participant/systemparticipant
 result/participant/flexoption
 result/participant/em

docs/readthedocs/models/result/participant/cylindricalstorage.md

@@ -2,7 +2,7 @@
 
 # Cylindrical Thermal Storage
 
-Result of a cylindrical thermal storage using a fluent to store thermal energy.
+Result of a cylindrical thermal storage using a fluid to store thermal energy.
 
 ## Attributes, Units and Remarks
 

docs/readthedocs/models/result/participant/domestichotwaterstorage.md

@@ -0,0 +1,44 @@
+(domestichotwaterstorage-result)=
+
+# Domestic Hot Water Storage
+
+Result of a domestic hot water storage using a fluid to store thermal energy.
+
+## Attributes, Units and Remarks
+
+```{eval-rst}
+.. list-table::
+   :widths: 33 33 33
+   :header-rows: 1
+
+
+   * - Attribute
+     - Unit
+     - Remarks
+
+   * - 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!