Skip to content

Commit cc656d5

Browse files
Merge branch 'dev' into pp/#875-fix-electricvehicle-documentation
# Conflicts: # CHANGELOG.md
2 parents b620797 + be269cf commit cc656d5

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
- Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)
1616
- Fixed hyperlink in line documentation [#965](https://github.com/ie3-institute/PowerSystemDataModel/issues/965)
1717
- Fixed some tests no failing when they should [#958](https://github.com/ie3-institute/PowerSystemDataModel/issues/958)
18+
- Fixed thermal-house-documentation [#873](https://github.com/ie3-institute/PowerSystemDataModel/issues/873)
1819
- Fixed ElectricVehicle Documentation [#875](https://github.com/ie3-institute/PowerSystemDataModel/issues/875)
1920

2021
### Changed

docs/readthedocs/models/input/participant/thermalhouse.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@ This reflects a simple shoe box with transmission losses
1919
2020
* - uuid
2121
- --
22-
-
22+
-
2323
2424
* - id
2525
- --
2626
- Human readable identifier
27+
28+
* - bus
29+
- --
30+
- Thermal bus, the model is connected to
2731
2832
* - operator
2933
- --
30-
-
34+
-
3135
3236
* - operationTime
3337
- --

docs/readthedocs/models/result/participant/thermalhouse.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This reflects a simple shoe box with transmission losses
3535
3636
* - indoorTemperature
3737
- °C
38-
-
38+
-
3939
4040
```
4141

0 commit comments

Comments
 (0)