Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into sp/#776-ext-sim-next-tick
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
danielfeismann committed Aug 15, 2024
2 parents fe0512a + 4973d89 commit d4308df
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 105 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ 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)

### Fixed
Expand Down
9 changes: 4 additions & 5 deletions docs/readthedocs/index.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/readthedocs/models/cts_model.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
71 changes: 31 additions & 40 deletions docs/readthedocs/models/pv_model.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -211,10 +207,9 @@ $$

**References:**

```{eval-rst}
* :cite:ts:`Schoenberg.1929`
* :cite:ts:`WikiAirMass`
```
* {cite:cts}`Schoenberg.1929`
* {cite:cts}`WikiAirMass`


### Extraterrestrial Radiation

Expand All @@ -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

Expand Down Expand Up @@ -296,9 +290,8 @@ $$

**Reference:**

```{eval-rst}
* :cite:ts:`Duffie.2013` p. 88
```
* {cite:cts}`Duffie.2013` p. 88


### Diffuse Radiation on Sloped Surface

Expand Down Expand Up @@ -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

Expand All @@ -427,9 +419,8 @@ $$
**$\rho$** = albedo

**Reference:**
```{eval-rst}
* :cite:ts:`Maleki.2017` p. 19
```

* {cite:cts}`Maleki.2017` p. 19


### Output
Expand Down
73 changes: 35 additions & 38 deletions docs/readthedocs/models/reference_system.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```


Expand Down
4 changes: 1 addition & 3 deletions docs/readthedocs/models/three_winding_transformer_model.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
25 changes: 9 additions & 16 deletions docs/readthedocs/references.md
Original file line number Diff line number Diff line change
@@ -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:
```

0 comments on commit d4308df

Please sign in to comment.