Merge branch 'dev' into ms/#1362-add-support-for-custom-loadprofiles

# Conflicts:
#	CHANGELOG.md

Author: staudtMarius

.github/workflows/ci.yml

@@ -88,9 +88,13 @@ jobs:
         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' || github.ref == 'refs/heads/dev'
+        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,9 +7,18 @@ 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 support for custom load profiles [#1362](https://github.com/ie3-institute/PowerSystemDataModel/issues/1362)
 
+### Fixed
+
+### Changed
+
+## [8.0.0] - 2025-07-22
+
+### Added
+- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
+- Added `CITATION.cff` [#1380](https://github.com/ie3-institute/PowerSystemDataModel/issues/1380)
+
 ### Fixed
 - Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
 - Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
@@ -19,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
 - Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
 - Improved error messages when reading and validating an invalid grid [#1354](https://github.com/ie3-institute/PowerSystemDataModel/issues/1354)
+- Changed `SubgridContainer` to represent galvanically seperated grids [#1226](https://github.com/ie3-institute/PowerSystemDataModel/issues/1226)
 
 ## [7.0.0] - 2025-05-08
 
@@ -371,7 +381,8 @@ 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.0.0...HEAD
+[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

@@ -0,0 +1,65 @@
+cff-version: 1.0.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
+authors:
+  - name: "ie³ - Institute of Energy Systems, Energy Efficiency and Energy Economics - TU Dortmund University"
+    alias: ie³
+    address: "Martin-Schmeißer-Weg 12"
+    city: Dortmund
+    country: DE
+    post-code: 44227
+    website: "https://ie3.etit.tu-dortmund.de/"
+  - family-names: Hiry
+    given-names: Johannes
+    orcid: https://orcid.org/0000-0002-1447-0607
+  - family-names: Kittl
+    given-names: Chris
+    orcid: https://orcid.org/0000-0002-1187-0568
+  - family-names: Sen-Sarma
+    given-names: Debopama        
+  - family-names: Peter
+    given-names: Sebastian
+    orcid: https://orcid.org/0000-0001-6311-6113
+  - family-names: Oberließen
+    given-names: Thomas
+    orcid: https://orcid.org/0000-0001-5805-5408
+  - family-names: Feismann
+    given-names: Daniel
+    orcid: https://orcid.org/0000-0002-3531-9025
+  - family-names: Bao
+    given-names: Johannes
+    orcid: https://orcid.org/0009-0008-3641-6469
+  - family-names: Hohmann
+    given-names: Julian
+  - family-names: Staudt
+    given-names: Marius
+    orcid: https://orcid.org/0009-0005-3309-5258
+  - family-names: Steffan
+    given-names: Niklas
+  - family-names: Kraus
+    given-names: Mia
+  - family-names: Strehle
+    given-names: Dennis
+  - family-names: Mahr
+    given-names: Christian
+  - family-names: Zachopoulos
+    given-names: Vasilios
+  - family-names: Bajpai
+    given-names: Shubham
+  - family-names: Roumeliotis
+    given-names: Lara
+  - family-names: Bung
+    given-names: Vicky
+  - family-names: Hütte
+    given-names: Simon
+  - family-names: Petersmeier
+    given-names: Pierre
+repository-code: https://github.com/ie3-institute/PowerSystemDataModel
+keywords:
+  - power system data model
+  - power system
+  - energy system
+license: BSD-3-Clause
+version: 7.0.0
+date-released: 2025-06-05

build.gradle

@@ -4,7 +4,7 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '7.1.0' //code format
+  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 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
@@ -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'
@@ -91,18 +92,18 @@ dependencies {
   testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
 
   // logging
-  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.0')
+  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.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.25'
-  implementation 'com.couchbase.client:java-client:3.8.2'
+  implementation 'com.couchbase.client:java-client:3.8.3'
   runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
 
-  implementation 'commons-io:commons-io:2.19.0' // I/O functionalities
-  implementation 'commons-codec:commons-codec:1.18.0' // needed by commons-compress
+  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
 }
 

docs/readthedocs/_static/figures/transformerWithSwitchGear.png

@@ -159,9 +159,9 @@
 	    \begin{tikzpicture}
 	    % === Anschlüsse ===
 	        \node[circle, draw = tuGreen, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_a) at (0,0){};
-	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
-	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
-	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
+	        \node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
+	        \node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
+	        \node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
 	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_e) at (62.5mm,0){};
 
 	        \draw (port_a.west) -- ++(-3mm, -1mm) -- ++(0mm, -2mm) edge[densely dotted] ++(0mm, -1.8mm);
@@ -176,9 +176,9 @@
 	        \draw (port_d.east) -- (winding_a.west) (winding_b.east) -- (port_e.west);
 
 	        \node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_a.south) {A \\ \SI{110}{\kV} \\ 1};
-	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 2};
-	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 2};
-	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 2};
+	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1};
+	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1};
+	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1};
 	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_e.south) {E \\ \SI{10}{\kV} \\ 2};
 	    \end{tikzpicture}
 \end{document}

docs/readthedocs/_static/figures/transformerWithSwitchGear.tex

@@ -24,14 +24,11 @@ and their higher voltage coupling point.
 
 Let's shed a more detailed light on the boundaries of a sub grid as of our definition.
 This especially is important, if the switchgear of the transformer is modeled in detail.
-We defined, that all nodes in upstream direction of the transformer, that are connected by switches *only* (therefore
-are within the switchgear) are counted towards the inferior sub grid structure (here "2"), although they belong to a
-different voltage level.
-This decision is taken, because we assume, that the interest to operate on the given switchgear will most likely be
-placed in the inferior grid structure.
-
-The "real" coupling node A is not comprised in the sub grids node collection, but obviously has reference through the
-switch between nodes A and B.
+We defined, that all nodes in upstream direction of the transformer, including those, which are within the switchgear are
+counted towards the superior sub grid structure (here "1"), because they belong to a different voltage level.
+If a switchgear should be operated by the inferior grid, one can set the operator, that is used in the inferior grid, for
+the switchgear. This can be necessary, if we assume, that the interest to operate on the given switchgear will most likely
+be placed in the inferior grid structure.
 
 A synoptic overview of both classes' attributes is given here:
 

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

@@ -0,0 +1,39 @@
+tasks.register('stagingAtMavenCentralPortal') {
+  group = 'publishing'
+  description = 'Stages uploaded artifacts to Maven Central Portal for manual approval'
+
+  doLast {
+    def username = project.getProperty('mavenCentralUser')
+    def password =  project.getProperty('mavenCentralPassword')
+    def deployVersion = project.findProperty('deployVersion') ?: project.version
+
+    if (!username || !password) {
+      throw new GradleException("Sonatype credentials not found. Set sonatypeUser and sonatypePassword properties or environment variables.")
+    }
+
+    // Request API for repo key
+    def repositoryString = providers.exec {
+      commandLine 'curl',
+          '-u', "${username}:${password}",
+          'https://ossrh-staging-api.central.sonatype.com/manual/search/repositories'
+    }.getStandardOutput().getAsText().get()
+
+    def repositoryGroovy = new groovy.json.JsonSlurper().parseText(repositoryString)
+    def key = repositoryGroovy.repositories[0].key
+
+    // Stage via curl
+    def stageResult = providers.exec {
+      ignoreExitValue true
+      commandLine 'curl',
+          '-u', "${username}:${password}",
+          '-i', '-X', 'POST', "https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/$key"
+    }
+
+    if (stageResult.result.get().exitValue == 0) {
+      println "✓ Staging successful!"
+      println "Check status at: https://central.sonatype.com/publishing/deployments"
+    } else {
+      throw new GradleException("Staging failed")
+    }
+  }
+}

gradle/scripts/stagingAtMavenCentralPortal.gradle

@@ -11,12 +11,11 @@ tasks.register("javadocJar", Jar) {
   from { tasks.named("javadoc", Javadoc).get().destinationDir }
 }
 
-if (project.hasProperty('user') && project.hasProperty('password') && project.hasProperty('deployVersion')) {
+if (project.hasProperty('mavenCentralUser') && project.hasProperty('mavenCentralPassword') && project.hasProperty('deployVersion')) {
 
   // snapshot version differs from normal version
   String versionString = project.getProperty('deployVersion')
 
-
   publishing {
     publications {
       create("mavenJava", MavenPublication) {
@@ -73,12 +72,11 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
     }
     repositories {
       maven {
-        def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
-        def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-        url = versionString.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+        name = "MavenCentral"
+        url = "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"
         credentials {
-          username project.getProperty('user')
-          password project.getProperty('password')
+          username = project.findProperty('mavenCentralUser')
+          password = project.findProperty('mavenCentralPassword')
         }
       }
     }