Skip to content
Snippets Groups Projects
Commit 36732946 authored by Christoph von Oy's avatar Christoph von Oy
Browse files

Split heat commodity

parent 56847447
No related branches found
No related tags found
No related merge requests found
Subproject commit 1fa50b4e69db372a7f274a21e1aedb876cc7c5e2
Subproject commit 0bf4252b3f666e1ada519a9f63f213eb604ac4e0
......@@ -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,
......
{
"specific_capital_expenditure": 0,
"efficiency": 1
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment