Merge branch 'dev' into ps/#554-HandlingNoWeatherData

Author: danielfeismann

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -84,13 +84,17 @@ jobs:
 
       #Deployment
       - name: Deploy
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
+        if: github.ref == 'refs/heads/main'
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}
-          ORG_GRADLE_PROJECT_user: ${{ secrets.MAVENCENTRAL_USER }}
-          ORG_GRADLE_PROJECT_password: ${{ secrets.MAVENCENTRAL_PASS }}
+          ORG_GRADLE_PROJECT_mavenCentralUser: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_USER ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_USER }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_PASS ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_PASS }}
+
         run: |
+          echo "Using MavenCentral Token of GitHub Actor: ${{ github.actor }}"
           if [ "${GITHUB_REF}" == "refs/heads/main" ]; then
             currentVersion=$(./gradlew -q currentVersion)
           else
@@ -100,3 +104,18 @@ jobs:
           echo "currentVersion=$currentVersion"
 
           ./gradlew publish -PdeployVersion=$currentVersion
+
+
+      #MavenCentral Staging
+      - name: MavenCentral Staging
+        if: github.ref == 'refs/heads/main'
+        env:
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}
+          ORG_GRADLE_PROJECT_mavenCentralUser: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_USER ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_USER }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_PASS ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_PASS }}
+
+        run: |
+          ./gradlew stagingAtMavenCentralPortal

CHANGELOG.md

@@ -7,8 +7,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
-- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
+- Added weathersource documentation [#1390](https://github.com/ie3-institute/PowerSystemDataModel/issues/1390)
+- Added standard asset parameter for `3wTransformer` in `ReadTheDocs` [#1417](https://github.com/ie3-institute/PowerSystemDataModel/issues/1417)
+
+### Fixed
+- Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)
+- Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
+
+
+### Changed
+- Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
+- Extend `GermanVoltageLevelUtils` with more synonymousIds [#143](https://github.com/ie3-institute/PowerSystemDataModel/issues/143)
+- Change spotless to use googleJavaFormat('1.28.0') [#1409](https://github.com/ie3-institute/PowerSystemDataModel/issues/1409)
+
+## [8.1.0] - 2025-07-25
+
+### Added
 - Added `CITATION.cff` [#1380](https://github.com/ie3-institute/PowerSystemDataModel/issues/1380)
+- Enhanced check for invalid field names in sources [#1383](https://github.com/ie3-institute/PowerSystemDataModel/issues/1383)
+- Enhancing value retrieval in `TimeSeriesSource` [1280](https://github.com/ie3-institute/PowerSystemDataModel/issues/1280)
+- Enhancing the `LoadProfileSource` to return the resolution [1288](https://github.com/ie3-institute/PowerSystemDataModel/issues/1288)
+- Enhancing Validation for sRated of `HpTypeInput` [1394](https://github.com/ie3-institute/PowerSystemDataModel/issues/1394)
+- Added updated `BdewStandardLoadProfiles` [#1292](https://github.com/ie3-institute/PowerSystemDataModel/issues/1292)
+
+### Changed
+- Fixed CFF-Version [#1392](https://github.com/ie3-institute/PowerSystemDataModel/issues/1392)
+- Enhanced `ValidationUtils` for `LoadModel` to check for correct profile naming [#1357](https://github.com/ie3-institute/PowerSystemDataModel/issues/1357)
+
+## [8.0.0] - 2025-07-22
+
+### Added
+- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
 
 ### Fixed
 - Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
@@ -374,7 +403,9 @@ coordinates or multiple exactly equal coordinates possible
 -   CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
 -   CsvDataSource now parsing multiple geoJson strings correctly
 
-[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...HEAD
+[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/8.1.0...HEAD
+[8.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/8.0.0...8.1.0
+[8.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...8.0.0
 [7.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...7.0.0
 [6.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...6.0.0
 [5.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.1...5.1.0

CITATION.cff

@@ -1,4 +1,4 @@
-cff-version: 1.0.0
+cff-version: 1.2.0
 title: "PowerSystemDataModel - Provides an elaborated data model to model energy systems with a high granularity."
 message: "If you use this software, please cite it as below."
 type: software
@@ -61,5 +61,5 @@ keywords:
   - power system
   - energy system
 license: BSD-3-Clause
-version: 7.0.0
-date-released: 2025-06-05
+version: 8.1.0
+date-released: 2025-07-25

build.gradle

@@ -5,7 +5,7 @@ plugins {
   id 'signing'
   id 'pmd' // code check, working on source code
   id 'com.diffplug.spotless' version '7.2.1' //code format
-  id 'com.github.spotbugs' version '6.2.2' // code check, working on byte code
+  id 'com.github.spotbugs' version '6.2.3' // 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
@@ -16,9 +16,9 @@ plugins {
 
 ext {
   //version (changing these should be considered thoroughly!)
-  javaVersion = JavaVersion.VERSION_17
+  javaVersion = JavaVersion.VERSION_21
   groovyVersion = "4.0"
-  groovyBinaryVersion = "4.0.27"
+  groovyBinaryVersion = "4.0.28"
 
   junitVersion = '1.12.0'
   testcontainersVersion = '1.21.3'
@@ -41,7 +41,8 @@ apply from: scriptsLocation + 'spotless.gradle'
 apply from: scriptsLocation + 'checkJavaVersion.gradle'
 apply from: scriptsLocation + 'documentation.gradle'
 apply from: scriptsLocation + 'jacoco.gradle' // jacoco java code coverage
-apply from: scriptsLocation + 'mavenCentralPublish.gradle'
+apply from: scriptsLocation + 'uploadToMavenCentralPortal.gradle' // upload for deploy
+apply from: scriptsLocation + 'stagingAtMavenCentralPortal.gradle' // stage for deploy
 apply from: scriptsLocation + 'sonarqube.gradle'
 apply from: scriptsLocation + 'vcs.gradle'
 apply from: scriptsLocation + 'semVer.gradle'
@@ -98,12 +99,12 @@ dependencies {
 
   // Databases
   implementation 'org.influxdb:influxdb-java:2.25'
-  implementation 'com.couchbase.client:java-client:3.8.3'
+  implementation 'com.couchbase.client:java-client:3.9.0'
   runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.20.0' // I/O functionalities
   implementation 'commons-codec:commons-codec:1.19.0' // needed by commons-compress
-  implementation 'org.apache.commons:commons-compress:1.27.1' // I/O functionalities
+  implementation 'org.apache.commons:commons-compress:1.28.0' // I/O functionalities
 }
 
 tasks.withType(JavaCompile) {

docs/readthedocs/gettingstarted.md

@@ -5,7 +5,7 @@ If you feel, something is missing, please contact us!
 
 ## Requirements
 
-Java > v 17
+PowerSystemDataModel requires Java to be at least Version 21.
 
 ## Where to get
 

docs/readthedocs/io/csvfiles.md

@@ -169,8 +169,11 @@ The following profiles are supported until now:
      - Information
      - Supported head line.
    * - e.g.: H0
-     - BDEW standard load profiles ([source](https://www.bdew.de/energie/standardlastprofile-strom/))
+     - BDEW standard load profiles 1999 ([source](https://www.bdew.de/energie/standardlastprofile-strom/))
      - Permissible head line: ``SuSa,SuSu,SuWd,TrSa,TrSu,TrWd,WiSa,WiSu,WiWd,quarterHour``
+   * - e.g.: h25
+     - BDEW standard load profiles 2025 ([source](https://www.bdew.de/energie/standardlastprofile-strom/))
+     - Permissible head line: ``janSa,janSu,janWd,febSa,febSu,febWd,marSa,marSu,marWd,aprSa,aprSu,aprWd,maySa,maySu,mayWd,junSa,junSu,junWd,julSa,julSu,julWd,augSa,augSu,augWd,sepSa,sepSu,sepWd,octSa,octSu,octWd,novSa,novSu,novWd,decSa,decSu,decWd,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``

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

@@ -0,0 +1,66 @@
+# WeatherSource
+
+The **`WeatherSource`** is an abstract class that provides a standardized interface for accessing time-series weather data. It serves as a foundation for concrete implementations that fetch data from various providers (e.g., CSV files or SQL databases).
+
+A `WeatherSource` relies on two key components:
+* **[`IdCoordinateSource`](idcoordinatesource.md)**: Used to resolve a numeric **coordinate ID** from the source data into a geographic `Point` object.
+* **`TimeBasedWeatherValueFactory`**: Used to construct `WeatherValue` objects from the raw data fields.
+
+***
+
+## Information
+
+The source data for any `WeatherSource` implementation is expected to contain the following information.
+
+```{list-table}
+   :widths: auto
+   :class: wrapping
+   :header-rows: 1
+
+   * - Attribute
+     - Remarks
+
+   * - **`coordinateid`**
+     - An **integer ID** for a specific geographic coordinate. This ID is used to look up the actual `Point` via the `IdCoordinateSource`.
+
+   * - **Time**
+     - The specific timestamp of the weather data, typically as a `ZonedDateTime`.
+
+   * - **Weather Data**
+     - The meteorological values, such as solar irradiance (`direct` and `diffuse`), temperature, and wind data (`speed` and `direction`).
+```
+
+## WeatherData
+
+Weather data is comprised of five key components:
+
+```{list-table}
+   :widths: auto
+   :class: wrapping
+   :header-rows: 1
+
+   * - Component
+     - Description
+     - Unit
+
+   * - **`directIrradiance`**
+     - Solar radiation that reaches the surface directly from the sun.
+     - W/m²
+
+   * - **`diffuseIrradiance`**
+     - Solar radiation scattered by the atmosphere before reaching the surface.
+     - W/m²
+
+   * - **`temperature`**
+     - Ambient air temperature.
+     - K (Kelvin)
+
+   * - **`windVelocity`**
+     - Wind speed.
+     - m/s (meters per second)
+
+   * - **`windDirection`**
+     - Wind direction, where 0° is North, 90° is East, etc.
+     - ° (degrees)
+```
+Weather data in COSMO and ICON formats is supported. Additional optional weather data can also be provided.

docs/readthedocs/models/input/grid/transformer2w.md

@@ -137,10 +137,9 @@ A list with some standard transformer types can be found here: [Standard Two Win
 ## 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/).
+Following there are some standard two winding transformer types with their source. The types are listed below in a ``csv file`` [here](https://github.com/ie3-institute/PowerSystemDataModel/tree/dev/input/StandardAssetTypes). This
+file can be used directly for any simulation with [SIMONA](https://github.com/ie3-institute/simona).
+The source for transformers from ``simBench`` can be found [here](https://simbench.de/en/download/datasets/).
 
 ```{list-table}
    :widths: auto
@@ -165,7 +164,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - source
      
    * - 5a890aae-b9c9-4ebf-8a49-8850ae9df402
-     - 219.43184927638458
+     - -219.43184927638458
      - 0.0
      - 1.0
      - 1731.3019390581715
@@ -182,7 +181,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 03159c0d-126e-47cc-9871-066870df3a3f
-     - 1193.4686938790917
+     - -1193.4686938790917
      - 0.0
      - 1.0
      - 831.0249307479223
@@ -199,7 +198,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 7cb289cb-e6af-4470-9c68-e5a91978a5e7
-     - 2013.800484464662
+     - -2013.800484464662
      - 0.0
      - 1.0
      - 1446.280991735537
@@ -216,7 +215,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 73644bc6-78cf-4882-9837-e6508cab092d
-     - 867.7685950413226
+     - -867.7685950413226
      - 0.0
      - 1.5
      - 1157.0247933884295
@@ -233,7 +232,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 6935ae26-374a-4c24-aeee-6d5760d6ddf3
-     - 720.4791642215993
+     - -720.4791642215993
      - 0.0
      - 1.5
      - 1487.603305785124
@@ -250,7 +249,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - b49db20f-b8b5-4265-8318-f669b9d121e9
-     - 1015.6886939330394
+     - -1015.6886939330394
      - 0.0
      - 1.5
      - 1818.181818181818
@@ -267,7 +266,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 0843b836-cee4-4a8c-81a4-098400fe91cf
-     - 24.495101551166183
+     - -24.495101551166183
      - 0.0
      - 2.5
      - 2999.9999999999995
@@ -284,7 +283,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - a8f3aeea-ef4d-4f3c-bb07-09a0a86766c1
-     - 9.591746452043322
+     - -9.591746452043322
      - 0.0
      - 2.5
      - 1149.9999999999998
@@ -301,7 +300,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - 0644c120-a247-425f-bbe4-31b153f7f440
-     - 16.583241729259253
+     - -16.583241729259253
      - 0.0
      - 2.5
      - 2199.9999999999995
@@ -318,7 +317,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - bdf22ee4-deba-41f4-a187-ae00638a6880
-     - 36.47380569074435
+     - -36.47380569074435
      - 0.0
      - 2.5
      - 4125.0
@@ -335,7 +334,7 @@ The transformers which source is ``simBench`` are from [here](https://simbench.d
      - simBench
      
    * - a0cbd90a-4e9f-47db-8dca-041d3a288f77
-     - 145.8952227629774
+     - -145.8952227629774
      - 0.0
      - 2.5
      - 16500.0