Merge branch 'dev' into mh/#750-use-updated-csv-from-vn_simona

# Conflicts:
#	CHANGELOG.md

Author: sebastian-peter

CHANGELOG.md

@@ -15,10 +15,16 @@ 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)
+- Validation for BDEW load profile values [#1243](https://github.com/ie3-institute/PowerSystemDataModel/issues/1243)
+- 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)
+- Remove double test in ThermalValidationUtils [#1260](https://github.com/ie3-institute/PowerSystemDataModel/issues/1260)]
 
 ### Changed
 - Storage minimum level parameter removed from cylindrical thermal storage [#1123](https://github.com/ie3-institute/PowerSystemDataModel/issues/1123)
@@ -32,6 +38,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)
 - Updated `_joint_grid` csv files from simona [#750](https://github.com/ie3-institute/PowerSystemDataModel/issues/750)
 
 ## [5.1.0] - 2024-06-24

build.gradle

@@ -5,7 +5,7 @@ plugins {
   id 'signing'
   id 'pmd' // code check, working on source code
   id 'com.diffplug.spotless' version '7.0.2' //code format
-  id 'com.github.spotbugs' version '6.1.5' // code check, working on byte code
+  id 'com.github.spotbugs' version '6.1.6' // code check, working on byte code
   id 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin

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/io/csvfiles.md

@@ -94,11 +94,13 @@ Csv id coordinate sources can have two different ways to represent their coordin
    * - Model
      - File Name
    * - individual time series
-     - *prefix_* its *_columnScheme_UUID_suffix*
+     - *prefix_* its *_columnScheme_UUID* *_suffix*
    * - load profile input
-     - *prefix_* rts *_profileKey_UUID_suffix*
+     - *prefix_* lpts *_profileKey* *_suffix*
 ```
 
+#### Individual Time Series
+
 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.
@@ -154,6 +156,27 @@ The following keys are supported until now:
 
 ```
 
+
+##### Load Profile Time Series
+
+The following profiles are supported until now:
+```{list-table}
+   :widths: auto
+   :class: wrapping
+   :header-rows: 1
+
+   * - Key
+     - Information
+     - Supported head line.
+   * - e.g.: H0
+     - BDEW standard load profiles ([source](https://www.bdew.de/energie/standardlastprofile-strom/))
+     - Permissible head line: ``SuSa,SuSu,SuWd,TrSa,TrSu,TrWd,WiSa,WiSu,WiWd,quarterHour``
+   * - random
+     - A random load proile based on: ``Kays - Agent-based simulation environment for improving the planning of distribution grids``
+     - Permissible head line: ``kSa,kSu,kWd,mySa,mySu,myWd,sigmaSa,sigmaSu,sigmaWd,quarterHour``
+
+```
+
 ### Results
 
 ```{list-table}

docs/readthedocs/models/input/additionaldata/timeseries.md

@@ -55,4 +55,9 @@ The following different values are available:
    * - `WeatherValue`
      - Combination of irradiance, temperature and wind information
            
+   * - `BdewLoadValues`
+     - Values for combination of seasons and day types
+
+   * - `RandomLoadValues`
+     - Parameters for a probability density function to draw random power consumptions
 ```

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