From 367329465896afef615b3d93e844ba7e5c7878ac Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Tue, 16 Apr 2024 15:15:18 +0200
Subject: [PATCH] Split heat commodity
---
Model_Library | 2 +-
...t_water_storage.json => heat_storage.json} | 0
examples/complex_prosumer/prosumer.json | 38 ++++++++++++-------
examples/complex_prosumer/radiator.json | 4 ++
4 files changed, 30 insertions(+), 14 deletions(-)
rename examples/complex_prosumer/{hot_water_storage.json => heat_storage.json} (100%)
create mode 100644 examples/complex_prosumer/radiator.json
diff --git a/Model_Library b/Model_Library
index 1fa50b4e69..0bf4252b3f 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 1fa50b4e69db372a7f274a21e1aedb876cc7c5e2
+Subproject commit 0bf4252b3f666e1ada519a9f63f213eb604ac4e0
diff --git a/examples/complex_prosumer/hot_water_storage.json b/examples/complex_prosumer/heat_storage.json
similarity index 100%
rename from examples/complex_prosumer/hot_water_storage.json
rename to examples/complex_prosumer/heat_storage.json
diff --git a/examples/complex_prosumer/prosumer.json b/examples/complex_prosumer/prosumer.json
index 9590f883e0..0cd6801adb 100644
--- a/examples/complex_prosumer/prosumer.json
+++ b/examples/complex_prosumer/prosumer.json
@@ -50,17 +50,23 @@
"min_capacity": 10.0,
"max_capacity": 10.0
},
- "how_water_storage": {
- "type": "HotWaterStorage",
- "model": "hot_water_storage.json",
+ "heat_storage": {
+ "type": "HeatStorage",
+ "model": "heat_storage.json",
"min_capacity": 40.0,
"max_capacity": 40.0
},
- "heat_consumption": {
- "type": "HeatConsumption"
- },
"hot_water_consumption": {
"type": "HotWaterConsumption"
+ },
+ "radiator": {
+ "type": "Radiator",
+ "model": "radiator.json",
+ "min_capacity": 10.0,
+ "max_capacity": 10.0
+ },
+ "heat_consumption": {
+ "type": "HeatConsumption"
}
},
"connections": [
@@ -145,13 +151,13 @@
{
"from": "heat_pump",
"output": 1,
- "to": "how_water_storage",
+ "to": "heat_storage",
"input": 1
},
{
"from": "heat_pump",
"output": 1,
- "to": "heat_consumption",
+ "to": "radiator",
"input": 1
},
{
@@ -169,13 +175,13 @@
{
"from": "gas_boiler",
"output": 1,
- "to": "how_water_storage",
+ "to": "heat_storage",
"input": 1
},
{
"from": "gas_boiler",
"output": 1,
- "to": "heat_consumption",
+ "to": "radiator",
"input": 1
},
{
@@ -185,16 +191,22 @@
"input": 1
},
{
- "from": "how_water_storage",
+ "from": "heat_storage",
"output": 1,
- "to": "heat_consumption",
+ "to": "radiator",
"input": 1
},
{
- "from": "how_water_storage",
+ "from": "heat_storage",
"output": 1,
"to": "hot_water_consumption",
"input": 1
+ },
+ {
+ "from": "radiator",
+ "output": 1,
+ "to": "heat_consumption",
+ "input": 1
}
],
"planning_horizon": 20,
diff --git a/examples/complex_prosumer/radiator.json b/examples/complex_prosumer/radiator.json
new file mode 100644
index 0000000000..ace5668eb3
--- /dev/null
+++ b/examples/complex_prosumer/radiator.json
@@ -0,0 +1,4 @@
+{
+ "specific_capital_expenditure": 0,
+ "efficiency": 1
+}
\ No newline at end of file
--
GitLab