Merge branch 'refs/heads/dev' into df/#878-thermalGridIT

ie3-institute · Aug 20, 2024 · 0d2e353 · 0d2e353
2 parents 625e46b + ef96fad
commit 0d2e353
Show file tree

Hide file tree

Showing 43 changed files with 995 additions and 1,729 deletions.
diff --git a/.gitignore b/.gitignore
@@ -201,7 +201,13 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.gitignore.io/api/java,macos,windows,eclipse
+# Metals
+.metals/
+.bloop/
+project/**/metals.sbt
+
+
+# End of https://www.gitignore.io/api/java,macos,windows,eclipse, metals
 
 /target/
 

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -62,3 +62,7 @@ Scala and uses pekko as its main library for concurrent calculation and to repre
 - Staudt, Marius
 - Roumeliotis, Lara
 - Bung, Vicky
+- Hütte, Simon
+- Schmelter, Philipp
+- Petersmeier, Pierre
+- Heintze, Marvin
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,6 +71,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated dependabot reviewers [#888](https://github.com/ie3-institute/simona/issues/888)
 - Merged `HpModelTestData` with `HpTestData` to `HpInputTestData` [#872](https://github.com/ie3-institute/simona/issues/872)
 - Harmonised both methods that check the inner temperature of thermal house against the boundaries [#880](https://github.com/ie3-institute/simona/issues/880)
+- Convert all `eval-rst` instances in rtd to myst syntax [#901](https://github.com/ie3-institute/simona/issues/901)
+- External simulation should provide information about next tick of MobSim [#776](https://github.com/ie3-institute/simona/issues/776)
+- Reverted temporary workaround in `spotless.gradle` [#681](https://github.com/ie3-institute/simona/issues/681)
+- Updated AUTHORS.md [#904](https://github.com/ie3-institute/simona/issues/904)
+- Updated AUTHORS.md [#905](https://github.com/ie3-institute/simona/issues/905)
 
 ### Fixed
 - Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658)
@@ -160,6 +165,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed format of example grid `vn_simona` [#216](https://github.com/ie3-institute/simona/issues/216)
 - Renamed ChpData to ChpRelevantData [#494](https://github.com/ie3-institute/simona/issues/494)
 - Updated gradle to 8.2.1, cleaned up `build.gradle` and `Jenkinsfile` [#572](https://github.com/ie3-institute/simona/issues/572)
+- Changed implementation of actor naming for unique name generation [#103](https://github.com/ie3-institute/simona/issues/103)
 
 ### Fixed
 - Location of `vn_simona` test grid (was partially in Berlin and Dortmund) [#72](https://github.com/ie3-institute/simona/issues/72)

diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ ext {
   jtsVersion = '1.19.0'
   confluentKafkaVersion = '7.4.0'
   tscfgVersion = '1.0.0'
-  scapegoatVersion = '2.1.6'
+  scapegoatVersion = '3.0.0'
 
   testContainerVersion = '0.41.4'
 
@@ -89,7 +89,7 @@ dependencies {
     exclude group: 'edu.ie3'
   }
 
-  implementation('com.github.ie3-institute:simonaAPI:0.4.0') {
+  implementation('com.github.ie3-institute:simonaAPI:0.5.0') {
     exclude group: 'org.apache.logging.log4j'
     exclude group: 'org.slf4j'
     /* Exclude our own nested dependencies */
@@ -98,7 +98,7 @@ dependencies {
 
   /* logging */
   implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:3.9.5" // pekko scala logging
-  implementation "ch.qos.logback:logback-classic:1.5.6"
+  implementation "ch.qos.logback:logback-classic:1.5.7"
 
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'

diff --git a/docs/readthedocs/index.md b/docs/readthedocs/index.md
@@ -1,10 +1,9 @@
 # Welcome to simona docs
 
-```{eval-rst}
-.. figure:: ../logo/logo_tightcrop_transparent.png
-  :figwidth: 25%
-  :align: right
-  :alt: logo of simona
+```{image} ../logo/logo_tightcrop_transparent.png
+:width: 25%
+:align: right
+:alt: logo of simona
 ```
 
 Welcome to the documentation of simona - an agent-based discrete-event power system simulation model developed at the

diff --git a/docs/readthedocs/models/cts_model.md b/docs/readthedocs/models/cts_model.md
@@ -39,9 +39,9 @@ $$
 $$
 
 Reference:
-```{eval-rst} 
-* :cite:ts:`Quaschning.2013`
-```
+
+* {cite:cts}`Quaschning.2013`
+
 
 That is the mathematical description of loading and unloading processes concerning the buffer storage. Whenever heat is stored within the storage or removed from the storage this equation is used. This includes the case that the whole heat demand is satisfied by the storage.
 

diff --git a/docs/readthedocs/models/pv_model.md b/docs/readthedocs/models/pv_model.md
@@ -53,10 +53,9 @@ $$
 
 **References:**
 
-```{eval-rst}
-* :cite:cts:`Maleki.2017` 
-* :cite:ts:`Spencer.1971`
-```
+* {cite:cts}`Maleki.2017`
+* {cite:cts}`Spencer.1971`
+
 
 ### Hour Angle
 
@@ -104,11 +103,10 @@ $$
 
 **References:**
 
-```{eval-rst}
-* :cite:cts:`Watter.2013` 
-* :cite:ts:`Maleki.2017`
-* :cite:ts:`Wang.2019`
-```
+* {cite:cts}`Watter.2013`
+* {cite:cts}`Maleki.2017`
+* {cite:cts}`Wang.2019`
+
 
 ### Sunrise Angle
 
@@ -127,10 +125,10 @@ $$
 **$\phi$** = observer's latitude
 
 **References:**
-```{eval-rst}
-* :cite:cts:`Maleki.2017` 
-* :cite:ts:`Itaca_Sun`
-```
+
+* {cite:cts}`Maleki.2017`
+* {cite:cts}`Itaca_Sun`
+
 
 ### Solar Altitude Angle
 
@@ -147,10 +145,9 @@ $$
 
 **References:**
 
-```{eval-rst} 
-* :cite:ts:`Maleki.2017` p. 5
-* :cite:ts:`Itaca_Sun`
-```
+* {cite:cts}`Maleki.2017` p. 5
+* {cite:cts}`Itaca_Sun`
+
 
 ### Zenith Angle
 
@@ -192,10 +189,9 @@ $$
 
 **References:**
 
-```{eval-rst} 
-* :cite:ts:`Quaschning.2013`
-* :cite:ts:`Maleki.2017` p. 18
-```
+* {cite:cts}`Quaschning.2013`
+* {cite:cts}`Maleki.2017` p. 18
+
 
 ### Air Mass
 
@@ -211,10 +207,9 @@ $$
 
 **References:**
 
-```{eval-rst} 
-* :cite:ts:`Schoenberg.1929`
-* :cite:ts:`WikiAirMass`
-```
+* {cite:cts}`Schoenberg.1929`
+* {cite:cts}`WikiAirMass`
+
 
 ### Extraterrestrial Radiation
 
@@ -237,10 +232,9 @@ $$
 
 **References:**
 
-```{eval-rst} 
-* :cite:ts:`Zheng.2017` p. 53, formula 2.3b
-* :cite:ts:`Iqbal.1983`
-```
+* {cite:cts}`Zheng.2017` p. 53, formula 2.3b
+* {cite:cts}`Iqbal.1983`
+
 
 ### Beam Radiation on Sloped Surface
 
@@ -296,9 +290,8 @@ $$
 
 **Reference:**
 
-```{eval-rst} 
-* :cite:ts:`Duffie.2013` p. 88
-```
+* {cite:cts}`Duffie.2013` p. 88
+
 
 ### Diffuse Radiation on Sloped Surface
 
@@ -408,11 +401,10 @@ $$
 
 **References:**
 
-```{eval-rst} 
-* :cite:ts:`Perez.1987`
-* :cite:ts:`Perez.1990`
-* :cite:ts:`Myers.2017` p. 96f
-```
+* {cite:cts}`Perez.1987`
+* {cite:cts}`Perez.1990`
+* {cite:cts}`Myers.2017` p. 96f
+
 
 ### Reflected Radiation on Sloped Surface
 
@@ -427,9 +419,8 @@ $$
 **$\rho$** = albedo
 
 **Reference:**
-```{eval-rst} 
-* :cite:ts:`Maleki.2017` p. 19
-```
+
+* {cite:cts}`Maleki.2017` p. 19
 
 
 ### Output

diff --git a/docs/readthedocs/models/reference_system.md b/docs/readthedocs/models/reference_system.md
@@ -6,44 +6,41 @@ The reference system is built up by specifying the included voltage levels. The
 
 ## Default reference system
 
-```{eval-rst}
-.. list-table::
-    :widths: 33 33 33
-    :header-rows: 0
-    
-    
-    * - Voltage level (id)
-      - Nominal voltage (vNom)
-      - Apparent power (sNom)
-    
-    * - LV
-      - 0.4 kV
-      - 100 kVA
-    
-    * - MV
-      - 10 kV
-      - 40 MVA
-      
-    * - MV
-      - 20 kV
-      - 60 MVA
-      
-    * - MV
-      - 30 kV
-      - 150 MVA
-      
-    * - HV
-      - 110 kV
-      - 600 MVA
-      
-    * - EHV
-      - 220 kV
-      - 800 MVA
-      
-    * - EHV
-      - 380 kV
-      - 1000 MVA      
-
+```{list-table}
+:widths: auto
+:header-rows: 1
+
+* - Voltage level (id)
+  - Nominal voltage (vNom)
+  - Apparent power (sNom)
+
+* - LV
+  - 0.4 kV
+  - 100 kVA
+
+* - MV
+  - 10 kV
+  - 40 MVA
+  
+* - MV
+  - 20 kV
+  - 60 MVA
+  
+* - MV
+  - 30 kV
+  - 150 MVA
+  
+* - HV
+  - 110 kV
+  - 600 MVA
+  
+* - EHV
+  - 220 kV
+  - 800 MVA
+  
+* - EHV
+  - 380 kV
+  - 1000 MVA
 ```
 
 

diff --git a/docs/readthedocs/models/three_winding_transformer_model.md b/docs/readthedocs/models/three_winding_transformer_model.md
@@ -41,6 +41,4 @@ More details on the physical model transformation can be found in the Ph.D. thes
 
 **References:**
 
-```{eval-rst}
-:cite:cts:`Kittl_2022`
-```
+- {cite:cts}`Kittl_2022`
diff --git a/docs/readthedocs/references.md b/docs/readthedocs/references.md
@@ -1,26 +1,19 @@
 # Publications and References
 
-## Publications
+## SIMONA publications
 
 The following publications discuss SIMONA and implementation details as well as outcomes where SIMONA have been used:
 
-```{eval-rst}
-The following publications discuss SIMONA and implementation details as well as outcomes where SIMONA have been used:
-
-.. rubric:: SIMONA Publications
-
-.. bibliography:: _static/bibliography/bibAboutSimona.bib
-   :style: unsrt
-   :all:
-
+```{bibliography} _static/bibliography/bibAboutSimona.bib
+:style: unsrt
+:all:
+```
 
-References
-===============
+## References
 
 References of publications SIMONA referred on:
 
-.. rubric:: References
-.. bibliography:: _static/bibliography/bibtexAll.bib
-   :style: custom
-   :all:
+```{bibliography} _static/bibliography/bibtexAll.bib
+:style: custom
+:all:
 ```