From 2d8640d041220737094bf20e4a661b87391dd496 Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Tue, 17 Jan 2023 17:05:22 +0100
Subject: [PATCH] New topology specification
---
Model_Library | 2 +-
.../convert_input_files_refactoring_part_2.py | 99 +++++++++++++++++++
.../district_models/example_CA/components.csv | 5 +
.../example_CA/connections.csv | 7 ++
.../example_CA/elec_matrix.csv | 5 -
.../example_community/components.csv | 6 ++
.../example_community/connections.csv | 8 ++
.../example_community/elec_matrix.csv | 6 --
.../jbr_test_ca/components.csv | 6 ++
.../jbr_test_ca/connections.csv | 8 ++
.../jbr_test_ca/elec_matrix.csv | 6 --
.../jbr_test_comm/components.csv | 6 ++
.../jbr_test_comm/connections.csv | 8 ++
.../jbr_test_comm/elec_matrix.csv | 6 --
.../prosumer_models/SCN0_CAT1/components.csv | 8 ++
.../prosumer_models/SCN0_CAT1/connections.csv | 6 ++
.../prosumer_models/SCN0_CAT1/elec_matrix.csv | 3 -
.../prosumer_models/SCN0_CAT1/gas_matrix.csv | 3 -
.../SCN0_CAT1/therm_matrix.csv | 5 -
.../SCN2_CAT1_PV11/components.csv | 10 ++
.../SCN2_CAT1_PV11/connections.csv | 9 ++
.../SCN2_CAT1_PV11/elec_matrix.csv | 5 -
.../SCN2_CAT1_PV11/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV11/therm_matrix.csv | 5 -
.../SCN2_CAT1_PV12_BA/components.csv | 12 +++
.../SCN2_CAT1_PV12_BA/connections.csv | 15 +++
.../SCN2_CAT1_PV12_BA/elec_matrix.csv | 7 --
.../SCN2_CAT1_PV12_BA/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV12_BA/therm_matrix.csv | 5 -
.../SCN2_CAT1_PV13_BA_HP/components.csv | 13 +++
.../SCN2_CAT1_PV13_BA_HP/connections.csv | 18 ++++
.../SCN2_CAT1_PV13_BA_HP/elec_matrix.csv | 8 --
.../SCN2_CAT1_PV13_BA_HP/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV13_BA_HP/therm_matrix.csv | 6 --
.../SCN2_CAT1_PV14_HP/components.csv | 11 +++
.../SCN2_CAT1_PV14_HP/connections.csv | 12 +++
.../SCN2_CAT1_PV14_HP/elec_matrix.csv | 6 --
.../SCN2_CAT1_PV14_HP/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV14_HP/therm_matrix.csv | 6 --
.../SCN2_CAT1_PV31/components.csv | 10 ++
.../SCN2_CAT1_PV31/connections.csv | 9 ++
.../SCN2_CAT1_PV31/elec_matrix.csv | 5 -
.../SCN2_CAT1_PV31/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV31/therm_matrix.csv | 5 -
.../SCN2_CAT1_PV32_BA/components.csv | 12 +++
.../SCN2_CAT1_PV32_BA/connections.csv | 14 +++
.../SCN2_CAT1_PV32_BA/elec_matrix.csv | 7 --
.../SCN2_CAT1_PV32_BA/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV32_BA/therm_matrix.csv | 5 -
.../SCN2_CAT1_PV33_BA_HP/components.csv | 13 +++
.../SCN2_CAT1_PV33_BA_HP/connections.csv | 18 ++++
.../SCN2_CAT1_PV33_BA_HP/elec_matrix.csv | 8 --
.../SCN2_CAT1_PV33_BA_HP/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV33_BA_HP/therm_matrix.csv | 6 --
.../SCN2_CAT1_PV34_HP/components.csv | 11 +++
.../SCN2_CAT1_PV34_HP/connections.csv | 12 +++
.../SCN2_CAT1_PV34_HP/elec_matrix.csv | 6 --
.../SCN2_CAT1_PV34_HP/gas_matrix.csv | 3 -
.../SCN2_CAT1_PV34_HP/therm_matrix.csv | 6 --
.../prosumer_models/SCN3_CAT1/components.csv | 8 ++
.../prosumer_models/SCN3_CAT1/connections.csv | 6 ++
.../prosumer_models/SCN3_CAT1/elec_matrix.csv | 3 -
.../prosumer_models/SCN3_CAT1/gas_matrix.csv | 3 -
.../SCN3_CAT1/therm_matrix.csv | 5 -
.../SCN3_CAT1_PV11/components.csv | 10 ++
.../SCN3_CAT1_PV11/connections.csv | 9 ++
.../SCN3_CAT1_PV11/elec_matrix.csv | 5 -
.../SCN3_CAT1_PV11/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV11/therm_matrix.csv | 5 -
.../SCN3_CAT1_PV12_BA/components.csv | 12 +++
.../SCN3_CAT1_PV12_BA/connections.csv | 15 +++
.../SCN3_CAT1_PV12_BA/elec_matrix.csv | 7 --
.../SCN3_CAT1_PV12_BA/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV12_BA/therm_matrix.csv | 5 -
.../SCN3_CAT1_PV13_BA_HP/components.csv | 13 +++
.../SCN3_CAT1_PV13_BA_HP/connections.csv | 19 ++++
.../SCN3_CAT1_PV13_BA_HP/elec_matrix.csv | 8 --
.../SCN3_CAT1_PV13_BA_HP/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV13_BA_HP/therm_matrix.csv | 6 --
.../SCN3_CAT1_PV14_HP/components.csv | 11 +++
.../SCN3_CAT1_PV14_HP/connections.csv | 12 +++
.../SCN3_CAT1_PV14_HP/elec_matrix.csv | 6 --
.../SCN3_CAT1_PV14_HP/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV14_HP/therm_matrix.csv | 6 --
.../SCN3_CAT1_PV31/components.csv | 10 ++
.../SCN3_CAT1_PV31/connections.csv | 9 ++
.../SCN3_CAT1_PV31/elec_matrix.csv | 5 -
.../SCN3_CAT1_PV31/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV31/therm_matrix.csv | 5 -
.../SCN3_CAT1_PV32_BA/components.csv | 12 +++
.../SCN3_CAT1_PV32_BA/connections.csv | 15 +++
.../SCN3_CAT1_PV32_BA/elec_matrix.csv | 7 --
.../SCN3_CAT1_PV32_BA/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV32_BA/therm_matrix.csv | 5 -
.../SCN3_CAT1_PV33_BA_HP/components.csv | 13 +++
.../SCN3_CAT1_PV33_BA_HP/connections.csv | 19 ++++
.../SCN3_CAT1_PV33_BA_HP/elec_matrix.csv | 8 --
.../SCN3_CAT1_PV33_BA_HP/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV33_BA_HP/therm_matrix.csv | 6 --
.../SCN3_CAT1_PV34_HP/components.csv | 11 +++
.../SCN3_CAT1_PV34_HP/connections.csv | 12 +++
.../SCN3_CAT1_PV34_HP/elec_matrix.csv | 6 --
.../SCN3_CAT1_PV34_HP/gas_matrix.csv | 3 -
.../SCN3_CAT1_PV34_HP/therm_matrix.csv | 6 --
.../prosumer_models/jbr_test/components.csv | 6 ++
.../prosumer_models/jbr_test/connections.csv | 8 ++
.../prosumer_models/jbr_test/elec_matrix.csv | 6 --
.../mfh_quartal/components.csv | 18 ++++
.../mfh_quartal/connections.csv | 35 +++++++
.../mfh_quartal/elec_matrix.csv | 11 ---
.../mfh_quartal/gas_matrix.csv | 3 -
.../mfh_quartal/therm_matrix.csv | 8 --
.../office_pv_heatpump/components.csv | 10 ++
.../office_pv_heatpump/connections.csv | 13 +++
.../office_pv_heatpump/elec_matrix.csv | 7 --
.../office_pv_heatpump/therm_matrix.csv | 5 -
.../swimmingPool/components.csv | 15 +++
.../swimmingPool/connections.csv | 26 +++++
.../swimmingPool/elec_matrix.csv | 10 --
.../swimmingPool/gas_matrix.csv | 4 -
.../swimmingPool/therm_matrix.csv | 8 --
.../swimmingPool_CHP/components.csv | 14 +++
.../swimmingPool_CHP/connections.csv | 21 ++++
.../swimmingPool_CHP/elec_matrix.csv | 9 --
.../swimmingPool_CHP/gas_matrix.csv | 4 -
.../swimmingPool_CHP/therm_matrix.csv | 7 --
.../swimmingPool_HP/components.csv | 14 +++
.../swimmingPool_HP/connections.csv | 21 ++++
.../swimmingPool_HP/elec_matrix.csv | 8 --
.../swimmingPool_HP/gas_matrix.csv | 3 -
.../swimmingPool_HP/therm_matrix.csv | 7 --
131 files changed, 784 insertions(+), 386 deletions(-)
create mode 100644 input_files/convert_input_files_refactoring_part_2.py
create mode 100644 input_files/models/district_models/example_CA/components.csv
create mode 100644 input_files/models/district_models/example_CA/connections.csv
delete mode 100644 input_files/models/district_models/example_CA/elec_matrix.csv
create mode 100644 input_files/models/district_models/example_community/components.csv
create mode 100644 input_files/models/district_models/example_community/connections.csv
delete mode 100644 input_files/models/district_models/example_community/elec_matrix.csv
create mode 100644 input_files/models/district_models/jbr_test_ca/components.csv
create mode 100644 input_files/models/district_models/jbr_test_ca/connections.csv
delete mode 100644 input_files/models/district_models/jbr_test_ca/elec_matrix.csv
create mode 100644 input_files/models/district_models/jbr_test_comm/components.csv
create mode 100644 input_files/models/district_models/jbr_test_comm/connections.csv
delete mode 100644 input_files/models/district_models/jbr_test_comm/elec_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN0_CAT1/components.csv
create mode 100644 input_files/models/prosumer_models/SCN0_CAT1/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
create mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/jbr_test/components.csv
create mode 100644 input_files/models/prosumer_models/jbr_test/connections.csv
delete mode 100644 input_files/models/prosumer_models/jbr_test/elec_matrix.csv
create mode 100644 input_files/models/prosumer_models/mfh_quartal/components.csv
create mode 100644 input_files/models/prosumer_models/mfh_quartal/connections.csv
delete mode 100644 input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/office_pv_heatpump/components.csv
create mode 100644 input_files/models/prosumer_models/office_pv_heatpump/connections.csv
delete mode 100644 input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/swimmingPool/components.csv
create mode 100644 input_files/models/prosumer_models/swimmingPool/connections.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/swimmingPool_CHP/components.csv
create mode 100644 input_files/models/prosumer_models/swimmingPool_CHP/connections.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv
create mode 100644 input_files/models/prosumer_models/swimmingPool_HP/components.csv
create mode 100644 input_files/models/prosumer_models/swimmingPool_HP/connections.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv
delete mode 100644 input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv
diff --git a/Model_Library b/Model_Library
index bb535eb1c0..fe0a9e7983 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit bb535eb1c0d4a227071cc94ed34d7b6f7cf28108
+Subproject commit fe0a9e7983c6dd0a727fec829f981425b99f1c55
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
new file mode 100644
index 0000000000..9222d52901
--- /dev/null
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -0,0 +1,99 @@
+"""
+This script inspects the input files and modifies them such that they adhere to the new input file specification used by the framework after merge of merge request !TODO Refactoring Part 2.
+"""
+
+import os.path
+import pandas as pd
+import math
+
+def read_matrix(df):
+ matrix = []
+ for i in df.index:
+ matrix_row = []
+ for j in df.index:
+ matrix_row.append(df[df["comp_name"][j]][i])
+ matrix.append(matrix_row)
+ return matrix
+
+def read_components(df):
+ components = {}
+ for i in df.index:
+ components[df["comp_name"][i]] = i
+ return components
+
+def compare_components(comp_1, comp_2):
+ different = False
+ for column in ['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size']:
+ if comp_1[column] != comp_2[column]:
+ if not math.isnan(comp_1[column]) and not math.isnan(comp_2[column]):
+ different = True
+ break
+ return different
+
+def get_connected_components(matrix, components, comp):
+ connected_components = []
+ for component in components:
+ if get_connection(matrix, components, comp, component) == 1:
+ connected_components.append(component)
+ return connected_components
+
+def get_connection(matrix, components, comp_from, comp_to):
+ return matrix[components[comp_from]][components[comp_to]]
+
+changed_topologies = []
+invalid_topologies = []
+for dirpath, dirnames, filenames in os.walk(".\\input_files"):
+ topology_here = False
+ matrix_files = []
+ for filename in filenames:
+ if filename.find('matrix') and filename.endswith('.csv') and (filename.find('elec') is not -1):
+ topology_here = True
+ matrix_files.append((filename, 'electricity'))
+ if filename.find('matrix') and filename.endswith('.csv') and (filename.find('gas') is not -1):
+ topology_here = True
+ matrix_files.append((filename, 'gas'))
+ if filename.find('matrix') and filename.endswith('.csv') and (filename.find('hydro') is not -1):
+ topology_here = True
+ matrix_files.append((filename, 'hydrogen'))
+ if filename.find('matrix') and filename.endswith('.csv') and (filename.find('therm') is not -1):
+ topology_here = True
+ matrix_files.append((filename, 'heat'))
+ if topology_here:
+ try:
+ print(f"Inspecting topology {dirpath}")
+ file_contents = []
+ for matrix_file, sector in matrix_files:
+ df = pd.read_csv(os.path.join(dirpath, matrix_file))
+ file_contents.append((df, read_matrix(df), read_components(df), sector))
+ all_components = pd.DataFrame(columns = ['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size'])
+ all_connections = pd.DataFrame(columns = ['sector', 'comp_from', 'comp_to'])
+ for df, matrix, components, sector in file_contents:
+ for component in components:
+ if component not in all_components.loc[:]['comp_name']:
+ all_components.loc[component] = df.loc[components[component]][['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size']]
+ else:
+ if compare_components(all_components.loc[component], df.loc[components[component]][['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size']]):
+ raise KeyError
+ for connected_component in get_connected_components(matrix, components, component):
+ all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'comp_from': component, 'comp_to': connected_component}).to_frame().T], ignore_index = True)
+ changed_topologies.append(dirpath)
+ all_components.to_csv(os.path.join(dirpath, "temp.csv"), index = False)
+ df_str = pd.read_csv(os.path.join(dirpath, "temp.csv"), dtype = str, keep_default_na = False)
+ for i in all_components.columns:
+ counter = 0
+ for j in all_components.index:
+ if issubclass(type(all_components[i][j]), float):
+ if len(df_str[i][counter]) != 0 and df_str[i][counter].endswith(".0"):
+ df_str[i][counter] = f"{all_components[i][j]:.0f}"
+ counter += 1
+ df_str.to_csv(os.path.join(dirpath, "components.csv"), index = False)
+ os.remove(os.path.join(dirpath, "temp.csv"))
+ all_connections.to_csv(os.path.join(dirpath, "connections.csv"), index = False)
+ for matrix_file, sector in matrix_files:
+ os.remove(os.path.join(dirpath, matrix_file))
+ except KeyError:
+ invalid_topologies.append(dirpath)
+for directory in changed_topologies:
+ print(f"Modified topology {directory}!")
+for file in invalid_topologies:
+ print(f"Topology {file} breaks some part of the input file specification!")
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
new file mode 100644
index 0000000000..a37e648d27
--- /dev/null
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+battery,LiionBattery,BAT1,0,6,6
+grd,StandardACGrid,GRD1,1000,1000,1000
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/example_CA/connections.csv b/input_files/models/district_models/example_CA/connections.csv
new file mode 100644
index 0000000000..d13d507156
--- /dev/null
+++ b/input_files/models/district_models/example_CA/connections.csv
@@ -0,0 +1,7 @@
+sector,comp_from,comp_to
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,elec_cns
diff --git a/input_files/models/district_models/example_CA/elec_matrix.csv b/input_files/models/district_models/example_CA/elec_matrix.csv
deleted file mode 100644
index 2ac7126000..0000000000
--- a/input_files/models/district_models/example_CA/elec_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,inv_pv_bat,battery,grd,elec_cns
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,1,1,1
-battery,LiionBattery,BAT1,0,6,6,1,0,0,0
-grd,StandardACGrid,GRD1,1000,1000,1000,1,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
new file mode 100644
index 0000000000..a0c503a3b1
--- /dev/null
+++ b/input_files/models/district_models/example_community/components.csv
@@ -0,0 +1,6 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,6,6,6
+inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+battery,LiionBattery,BAT1,6,6,6
+grd,StandardACGrid,GRD1,1000,1000,1000
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/example_community/connections.csv b/input_files/models/district_models/example_community/connections.csv
new file mode 100644
index 0000000000..e451eec732
--- /dev/null
+++ b/input_files/models/district_models/example_community/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,elec_cns
diff --git a/input_files/models/district_models/example_community/elec_matrix.csv b/input_files/models/district_models/example_community/elec_matrix.csv
deleted file mode 100644
index f072d2fea7..0000000000
--- a/input_files/models/district_models/example_community/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1
-battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0
-grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0
diff --git a/input_files/models/district_models/jbr_test_ca/components.csv b/input_files/models/district_models/jbr_test_ca/components.csv
new file mode 100644
index 0000000000..a0c503a3b1
--- /dev/null
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -0,0 +1,6 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,6,6,6
+inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+battery,LiionBattery,BAT1,6,6,6
+grd,StandardACGrid,GRD1,1000,1000,1000
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/jbr_test_ca/connections.csv b/input_files/models/district_models/jbr_test_ca/connections.csv
new file mode 100644
index 0000000000..e451eec732
--- /dev/null
+++ b/input_files/models/district_models/jbr_test_ca/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,elec_cns
diff --git a/input_files/models/district_models/jbr_test_ca/elec_matrix.csv b/input_files/models/district_models/jbr_test_ca/elec_matrix.csv
deleted file mode 100644
index f072d2fea7..0000000000
--- a/input_files/models/district_models/jbr_test_ca/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1
-battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0
-grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0
diff --git a/input_files/models/district_models/jbr_test_comm/components.csv b/input_files/models/district_models/jbr_test_comm/components.csv
new file mode 100644
index 0000000000..a0c503a3b1
--- /dev/null
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -0,0 +1,6 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,6,6,6
+inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+battery,LiionBattery,BAT1,6,6,6
+grd,StandardACGrid,GRD1,1000,1000,1000
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/jbr_test_comm/connections.csv b/input_files/models/district_models/jbr_test_comm/connections.csv
new file mode 100644
index 0000000000..e451eec732
--- /dev/null
+++ b/input_files/models/district_models/jbr_test_comm/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,elec_cns
diff --git a/input_files/models/district_models/jbr_test_comm/elec_matrix.csv b/input_files/models/district_models/jbr_test_comm/elec_matrix.csv
deleted file mode 100644
index f072d2fea7..0000000000
--- a/input_files/models/district_models/jbr_test_comm/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1
-battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0
-grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
new file mode 100644
index 0000000000..37add28451
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
@@ -0,0 +1,8 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+grd,StandardACGrid,GRD1,100000,100000,0
+elec_cns,StandardElectricalConsumption,CNS1,100000,100000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,100000,100000,0
+therm_cns,HeatConsumption,HeatCNS1,100000,100000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,100000,100000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
new file mode 100644
index 0000000000..0e2d493c2b
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
@@ -0,0 +1,6 @@
+sector,comp_from,comp_to
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv b/input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv
deleted file mode 100644
index c396e2e280..0000000000
--- a/input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,grd,elec_cns
-grd,StandardACGrid,GRD1,100000,100000,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,100000,100000,0,0,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv b/input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv
deleted file mode 100644
index 66b2202ca8..0000000000
--- a/input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,100000,100000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv b/input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv
deleted file mode 100644
index 7126041844..0000000000
--- a/input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,100000,100000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,100000,100000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
new file mode 100644
index 0000000000..324121ea32
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -0,0 +1,10 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
new file mode 100644
index 0000000000..42d01f84dc
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
@@ -0,0 +1,9 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv
deleted file mode 100644
index efb04d0847..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
new file mode 100644
index 0000000000..833ddde472
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
@@ -0,0 +1,12 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+battery,LiionBattery,BAT1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
new file mode 100644
index 0000000000..b61eb9ccb5
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
@@ -0,0 +1,15 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,elec_cns
+electricity,grd,inv_bat
+electricity,inv_bat,battery
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv
deleted file mode 100644
index 36cadbec85..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,0,1,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
new file mode 100644
index 0000000000..4115b191e2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
@@ -0,0 +1,13 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+battery,LiionBattery,BAT1,10,10,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
new file mode 100644
index 0000000000..da42e7d5fa
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
@@ -0,0 +1,18 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+electricity,inv_bat,battery
+electricity,inv_bat,heat_pump
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv
deleted file mode 100644
index 84e2567a86..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
new file mode 100644
index 0000000000..3c8eaceb6e
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
@@ -0,0 +1,11 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
new file mode 100644
index 0000000000..98920735b2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
@@ -0,0 +1,12 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv
deleted file mode 100644
index 793f401113..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
new file mode 100644
index 0000000000..88894d4b12
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -0,0 +1,10 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
new file mode 100644
index 0000000000..42d01f84dc
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
@@ -0,0 +1,9 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv
deleted file mode 100644
index a860982ecf..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
new file mode 100644
index 0000000000..e5d63dd846
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
@@ -0,0 +1,12 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+battery,LiionBattery,BAT1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
new file mode 100644
index 0000000000..b0145baced
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
@@ -0,0 +1,14 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,elec_cns
+electricity,inv_bat,battery
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv
deleted file mode 100644
index 635295d45d..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,0,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,0,1,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
new file mode 100644
index 0000000000..fd87492d6c
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
@@ -0,0 +1,13 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+battery,LiionBattery,BAT1,10,10,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
new file mode 100644
index 0000000000..da42e7d5fa
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
@@ -0,0 +1,18 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+electricity,inv_bat,battery
+electricity,inv_bat,heat_pump
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv
deleted file mode 100644
index 4e7f785c62..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,0,1,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
new file mode 100644
index 0000000000..8313995585
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
@@ -0,0 +1,11 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
new file mode 100644
index 0000000000..98920735b2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
@@ -0,0 +1,12 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv
deleted file mode 100644
index 1badd2fc33..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,1,1,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
new file mode 100644
index 0000000000..d29b5218d5
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
@@ -0,0 +1,8 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
new file mode 100644
index 0000000000..0e2d493c2b
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
@@ -0,0 +1,6 @@
+sector,comp_from,comp_to
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv
deleted file mode 100644
index c5409f5c50..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,grd,elec_cns
-grd,StandardACGrid,GRD1,10000,10000,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
new file mode 100644
index 0000000000..324121ea32
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -0,0 +1,10 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
new file mode 100644
index 0000000000..42d01f84dc
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
@@ -0,0 +1,9 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv
deleted file mode 100644
index efb04d0847..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
new file mode 100644
index 0000000000..833ddde472
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
@@ -0,0 +1,12 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+battery,LiionBattery,BAT1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
new file mode 100644
index 0000000000..b61eb9ccb5
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
@@ -0,0 +1,15 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,elec_cns
+electricity,grd,inv_bat
+electricity,inv_bat,battery
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv
deleted file mode 100644
index 36cadbec85..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,0,1,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
new file mode 100644
index 0000000000..4115b191e2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
@@ -0,0 +1,13 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+battery,LiionBattery,BAT1,10,10,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
new file mode 100644
index 0000000000..6d228b6aeb
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
@@ -0,0 +1,19 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+electricity,grd,inv_bat
+electricity,inv_bat,battery
+electricity,inv_bat,heat_pump
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv
deleted file mode 100644
index 7a62ea7c9c..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
new file mode 100644
index 0000000000..3c8eaceb6e
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
@@ -0,0 +1,11 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,10,10,0
+inv_pv,BasicInverter,INVPV,10,10,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
new file mode 100644
index 0000000000..98920735b2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
@@ -0,0 +1,12 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv
deleted file mode 100644
index 793f401113..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
new file mode 100644
index 0000000000..88894d4b12
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -0,0 +1,10 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
new file mode 100644
index 0000000000..42d01f84dc
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
@@ -0,0 +1,9 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv
deleted file mode 100644
index a860982ecf..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
new file mode 100644
index 0000000000..e5d63dd846
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
@@ -0,0 +1,12 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+battery,LiionBattery,BAT1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
new file mode 100644
index 0000000000..b61eb9ccb5
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
@@ -0,0 +1,15 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,elec_cns
+electricity,grd,inv_bat
+electricity,inv_bat,battery
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv
deleted file mode 100644
index 875add35ff..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,0,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,0,1,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv
deleted file mode 100644
index 7f469290c5..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
new file mode 100644
index 0000000000..fd87492d6c
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
@@ -0,0 +1,13 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+battery,LiionBattery,BAT1,10,10,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+inv_bat,BasicInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
new file mode 100644
index 0000000000..6d228b6aeb
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
@@ -0,0 +1,19 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+electricity,grd,inv_bat
+electricity,inv_bat,battery
+electricity,inv_bat,heat_pump
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv
deleted file mode 100644
index 05392accd4..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,0,1,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
new file mode 100644
index 0000000000..8313995585
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
@@ -0,0 +1,11 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,30,30,0
+inv_pv,BasicInverter,INVPV,30,30,0
+heat_pump,HeatPump,EHP1,10,10,0
+grd,StandardACGrid,GRD1,10000,10000,0
+elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,StandardGasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
new file mode 100644
index 0000000000..98920735b2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
@@ -0,0 +1,12 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv
deleted file mode 100644
index 1badd2fc33..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0
-inv_pv,BasicInverter,INVPV,30,30,0,0,0,1,1,1
-heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv
deleted file mode 100644
index 667ee9e0e3..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv
deleted file mode 100644
index d9e02fac50..0000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi
-heat_pump,HeatPump,EHP1,,,,0,0,0,1,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
new file mode 100644
index 0000000000..a0c503a3b1
--- /dev/null
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -0,0 +1,6 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,6,6,6
+inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+battery,LiionBattery,BAT1,6,6,6
+grd,StandardACGrid,GRD1,1000,1000,1000
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/jbr_test/connections.csv b/input_files/models/prosumer_models/jbr_test/connections.csv
new file mode 100644
index 0000000000..e451eec732
--- /dev/null
+++ b/input_files/models/prosumer_models/jbr_test/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/jbr_test/elec_matrix.csv b/input_files/models/prosumer_models/jbr_test/elec_matrix.csv
deleted file mode 100644
index f072d2fea7..0000000000
--- a/input_files/models/prosumer_models/jbr_test/elec_matrix.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1
-battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0
-grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
new file mode 100644
index 0000000000..652eeb73c5
--- /dev/null
+++ b/input_files/models/prosumer_models/mfh_quartal/components.csv
@@ -0,0 +1,18 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+grd,StandardACGrid,GRD1,1000,1000,0
+pv,StandardPVGenerator,PV2,0,30,0
+bat,LiionBattery,BAT1,1,1,0
+chp,CHP,CHP1,0,50,0
+ecns1,StandardElectricalConsumption,CNS1,1000,1000,0
+ecns2,StandardElectricalConsumption,CNS1,1000,1000,0
+ecns3,StandardElectricalConsumption,CNS1,1000,1000,0
+ecns4,StandardElectricalConsumption,CNS1,1000,1000,0
+ecns5,StandardElectricalConsumption,CNS1,1000,1000,0
+ecns6,StandardElectricalConsumption,CNS1,1000,1000,0
+gas_grd,StandardGasGrid,GAS1,1000,1000,0
+tcns1,HeatConsumption,HeatCNS1,1000,1000,0
+tcns2,HeatConsumption,HeatCNS1,1000,1000,0
+tcns3,HeatConsumption,HeatCNS1,1000,1000,0
+tcns4,HeatConsumption,HeatCNS1,1000,1000,0
+tcns5,HeatConsumption,HeatCNS1,1000,1000,0
+tcns6,HeatConsumption,HeatCNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/connections.csv b/input_files/models/prosumer_models/mfh_quartal/connections.csv
new file mode 100644
index 0000000000..ec97f639b9
--- /dev/null
+++ b/input_files/models/prosumer_models/mfh_quartal/connections.csv
@@ -0,0 +1,35 @@
+sector,comp_from,comp_to
+electricity,grd,ecns1
+electricity,grd,ecns2
+electricity,grd,ecns3
+electricity,grd,ecns4
+electricity,grd,ecns5
+electricity,grd,ecns6
+electricity,pv,grd
+electricity,pv,bat
+electricity,pv,ecns1
+electricity,pv,ecns2
+electricity,pv,ecns3
+electricity,pv,ecns4
+electricity,pv,ecns5
+electricity,pv,ecns6
+electricity,bat,ecns1
+electricity,bat,ecns2
+electricity,bat,ecns3
+electricity,bat,ecns4
+electricity,bat,ecns5
+electricity,bat,ecns6
+electricity,chp,grd
+electricity,chp,ecns1
+electricity,chp,ecns2
+electricity,chp,ecns3
+electricity,chp,ecns4
+electricity,chp,ecns5
+electricity,chp,ecns6
+gas,gas_grd,chp
+heat,chp,tcns1
+heat,chp,tcns2
+heat,chp,tcns3
+heat,chp,tcns4
+heat,chp,tcns5
+heat,chp,tcns6
diff --git a/input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv b/input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv
deleted file mode 100644
index 5d84ee4384..0000000000
--- a/input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,grd,pv,bat,chp,ecns1,ecns2,ecns3,ecns4,ecns5,ecns6
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,0,1,1,1,1,1,1
-pv,StandardPVGenerator,PV2,0,30,0,1,0,1,0,1,1,1,1,1,1
-bat,LiionBattery,BAT1,1,1,0,0,0,0,0,1,1,1,1,1,1
-chp,CHP,CHP1,0,50,0,1,0,0,0,1,1,1,1,1,1
-ecns1,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0
-ecns2,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0
-ecns3,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0
-ecns4,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0
-ecns5,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0
-ecns6,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv b/input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv
deleted file mode 100644
index 2921720ae5..0000000000
--- a/input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,chp,gas_grd
-chp,CHP,CHP1,0,50,0,0,0
-gas_grd,StandardGasGrid,GAS1,1000,1000,0,1,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv b/input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv
deleted file mode 100644
index 6d564a0d50..0000000000
--- a/input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,chp,tcns1,tcns2,tcns3,tcns4,tcns5,tcns6
-chp,CHP,CHP1,0,50,0,0,1,1,1,1,1,1
-tcns1,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0
-tcns2,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0
-tcns3,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0
-tcns4,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0
-tcns5,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0
-tcns6,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/components.csv b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
new file mode 100644
index 0000000000..ad450a1781
--- /dev/null
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -0,0 +1,10 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,StandardPVGenerator,PV2,0,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,30,0
+battery,LiionBattery,BAT1,0,1000,0
+heat_pump,HeatPump,EHP1,2,50,0
+grd,StandardACGrid,GRD1,1000,1000,0
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0
+therm_cns,HeatConsumption,HeatCNS1,1000,1000,0
+dhw_dmd,HotWaterConsumption,HWCNS1,1000,1000,0
+water_tes,HotWaterStorage,TES1,10,93,0
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
new file mode 100644
index 0000000000..9fb0451f88
--- /dev/null
+++ b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
@@ -0,0 +1,13 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,heat_pump
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv b/input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv
deleted file mode 100644
index 51d5637139..0000000000
--- a/input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,heat_pump,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,0,30,0,0,1,0,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,30,0,0,0,1,1,1,1
-battery,LiionBattery,BAT1,0,1000,0,0,1,0,0,0,0
-heat_pump,HeatPump,EHP1,2,50,0,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,1000,1000,0,0,1,0,1,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv b/input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv
deleted file mode 100644
index 3f54f72d29..0000000000
--- a/input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes
-heat_pump,HeatPump,EHP1,,,,0,0,0,1
-therm_cns,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,1000,1000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,10,93,0,0,1,1,0
diff --git a/input_files/models/prosumer_models/swimmingPool/components.csv b/input_files/models/prosumer_models/swimmingPool/components.csv
new file mode 100644
index 0000000000..c6eef40a6f
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool/components.csv
@@ -0,0 +1,15 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
+battery,LiionBattery,BAT1,0,800,0
+grd,StandardACGrid,GRD1,0,800,0
+elec_cns,StandardElectricalConsumption,CNS1,0,800,0
+bhkw,BHKW,VTB200,0,800,0
+pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0
+heat_pump,HeatPump,EHP1,0,800,0
+gas_grd,StandardGasGrid,GAS1,0,800,0
+gas_boiler,GasBoiler,BOI1,,,
+therm_cns,HeatConsumption,HeatCNS1,0,800,0
+water_tes,HotWaterStorage,TES1,0,800,0
+heat_grid,HeatGrid,HG1,0,800,0
+solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool/connections.csv b/input_files/models/prosumer_models/swimmingPool/connections.csv
new file mode 100644
index 0000000000..c67046ecf5
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool/connections.csv
@@ -0,0 +1,26 @@
+sector,comp_from,comp_to
+electricity,pv_roof1,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,inv_pv_bat,heat_pump
+electricity,battery,inv_pv_bat
+electricity,grd,elec_cns
+electricity,grd,heat_pump
+electricity,bhkw,inv_pv_bat
+electricity,bhkw,grd
+electricity,bhkw,elec_cns
+electricity,bhkw,heat_pump
+electricity,pv_roof2,inv_pv_bat
+gas,gas_grd,bhkw
+gas,gas_grd,gas_boiler
+heat,water_tes,therm_cns
+heat,heat_grid,therm_cns
+heat,bhkw,therm_cns
+heat,bhkw,water_tes
+heat,solar_therm_ge,therm_cns
+heat,solar_therm_ge,water_tes
+heat,gas_boiler,therm_cns
+heat,gas_boiler,water_tes
+heat,heat_pump,therm_cns
+heat,heat_pump,water_tes
diff --git a/input_files/models/prosumer_models/swimmingPool/elec_matrix.csv b/input_files/models/prosumer_models/swimmingPool/elec_matrix.csv
deleted file mode 100644
index 2952f88880..0000000000
--- a/input_files/models/prosumer_models/swimmingPool/elec_matrix.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof1,inv_pv_bat,battery,grd,elec_cns,bhkw,pv_roof2,heat_pump
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,800,0,0,0,1,1,1,0,0,1
-battery,LiionBattery,BAT1,0,800,0,0,1,0,0,0,0,0,0
-grd,StandardACGrid,GRD1,0,800,0,0,0,0,0,1,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,800,0,0,0,0,0,0,0,0,0
-bhkw,BHKW,VTB200,0,800,0,0,1,0,1,1,0,0,1
-pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0,0,1,0,0,0,0,0,0
-heat_pump,HeatPump,EHP1,0,800,0,0,0,0,0,0,0,0,0
-
diff --git a/input_files/models/prosumer_models/swimmingPool/gas_matrix.csv b/input_files/models/prosumer_models/swimmingPool/gas_matrix.csv
deleted file mode 100644
index b8624eeae6..0000000000
--- a/input_files/models/prosumer_models/swimmingPool/gas_matrix.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,bhkw,gas_grd,gas_boiler
-bhkw,BHKW,VTB200,,,,0,0,0
-gas_grd,StandardGasGrid,GAS1,0,800,0,1,0,1
-gas_boiler,GasBoiler,BOI1,,,,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool/therm_matrix.csv b/input_files/models/prosumer_models/swimmingPool/therm_matrix.csv
deleted file mode 100644
index 7b918b07df..0000000000
--- a/input_files/models/prosumer_models/swimmingPool/therm_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,water_tes,heat_grid,bhkw,solar_therm_ge,gas_boiler,heat_pump
-therm_cns,HeatConsumption,HeatCNS1,0,800,0,0,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,0,800,0,1,0,0,0,0,0,0
-heat_grid,HeatGrid,HG1,0,800,0,1,0,0,0,0,0,0
-bhkw,BHKW,VTB200,,,,1,1,0,0,0,0,0
-solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0,1,1,0,0,0,0,0
-gas_boiler,GasBoiler,BOI1,0,800,0,1,1,0,0,0,0,0
-heat_pump,HeatPump,EHP1,,,,1,1,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
new file mode 100644
index 0000000000..291e8a1d9f
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
@@ -0,0 +1,14 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
+battery,LiionBattery,BAT1,0,800,0
+grd,StandardACGrid,GRD1,0,800,0
+elec_cns,StandardElectricalConsumption,CNS1,0,800,0
+bhkw,BHKW,VTB200,0,800,0
+pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0
+gas_grd,StandardGasGrid,GAS1,0,800,0
+gas_boild,GasBoiler,BOI1,,,
+therm_cns,HeatConsumption,HeatCNS1,0,800,0
+water_tes,HotWaterStorage,TES1,0,800,0
+heat_grid,HeatGrid,HG1,0,800,0
+solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/connections.csv b/input_files/models/prosumer_models/swimmingPool_CHP/connections.csv
new file mode 100644
index 0000000000..217b727aa5
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/connections.csv
@@ -0,0 +1,21 @@
+sector,comp_from,comp_to
+electricity,pv_roof1,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,battery,inv_pv_bat
+electricity,grd,elec_cns
+electricity,bhkw,inv_pv_bat
+electricity,bhkw,grd
+electricity,bhkw,elec_cns
+electricity,pv_roof2,inv_pv_bat
+gas,gas_grd,bhkw
+gas,gas_grd,gas_boild
+heat,water_tes,therm_cns
+heat,heat_grid,therm_cns
+heat,bhkw,therm_cns
+heat,bhkw,water_tes
+heat,solar_therm_ge,therm_cns
+heat,solar_therm_ge,water_tes
+heat,gas_boild,therm_cns
+heat,gas_boild,water_tes
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv b/input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv
deleted file mode 100644
index fe14ce1af6..0000000000
--- a/input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof1,inv_pv_bat,battery,grd,elec_cns,bhkw,pv_roof2
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,800,0.0,0,0,1,1,1,0,0
-battery,LiionBattery,BAT1,0,800,0,0,1,0,0,0,0,0
-grd,StandardACGrid,GRD1,0,800,0,0,0,0,0,1,0,0
-elec_cns,StandardElectricalConsumption,CNS1,0,800,0,0,0,0,0,0,0,0
-bhkw,BHKW,VTB200,0,800,0,0,1,0,1,1,0,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0,0,1,0,0,0,0,0
-
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv b/input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv
deleted file mode 100644
index eda9a94d54..0000000000
--- a/input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,bhkw,gas_grd,gas_boild
-bhkw,BHKW,VTB200,,,,0,0,0
-gas_grd,StandardGasGrid,GAS1,0,800,0,1,0,1
-gas_boild,GasBoiler,BOI1,,,,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv b/input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv
deleted file mode 100644
index 0ba297c669..0000000000
--- a/input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,water_tes,heat_grid,bhkw,solar_therm_ge,gas_boild
-therm_cns,HeatConsumption,HeatCNS1,0,800,0,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,0,800,0,1,0,0,0,0,0
-heat_grid,HeatGrid,HG1,0,800,0,1,0,0,0,0,0
-bhkw,BHKW,VTB200,,,,1,1,0,0,0,0
-solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0,1,1,0,0,0,0
-gas_boild,GasBoiler,BOI1,0,800,0,1,1,0,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/components.csv b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
new file mode 100644
index 0000000000..1d70f9b7d2
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
@@ -0,0 +1,14 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
+battery,LiionBattery,BAT1,0,800,0
+grd,StandardACGrid,GRD1,0,800,0
+elec_cns,StandardElectricalConsumption,CNS1,0,800,0
+heat_pump,HeatPump,EHP1,0,800,0
+pv_roof2,StandardPVGenerator,Vitovolt300,0,800,0
+gas_boild,GasBoiler,BOI1,,,
+gas_grd,StandardGasGrid,GAS1,0,800,0
+therm_cns,HeatConsumption,HeatCNS1,0,800,0
+water_tes,HotWaterStorage,TES1,0,800,0
+solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
+heat_grid,HeatGrid,HG1,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/connections.csv b/input_files/models/prosumer_models/swimmingPool_HP/connections.csv
new file mode 100644
index 0000000000..bac3587636
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_HP/connections.csv
@@ -0,0 +1,21 @@
+sector,comp_from,comp_to
+electricity,pv_roof1,inv_pv_bat
+electricity,inv_pv_bat,battery
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,inv_pv_bat,heat_pump
+electricity,battery,inv_pv_bat
+electricity,grd,inv_pv_bat
+electricity,grd,elec_cns
+electricity,grd,heat_pump
+electricity,pv_roof2,inv_pv_bat
+gas,gas_grd,gas_boild
+heat,heat_pump,therm_cns
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,gas_boild,therm_cns
+heat,gas_boild,water_tes
+heat,solar_therm_ge,therm_cns
+heat,solar_therm_ge,water_tes
+heat,heat_grid,therm_cns
+heat,heat_grid,water_tes
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv b/input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv
deleted file mode 100644
index 1d6cd4fa6c..0000000000
--- a/input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof1,inv_pv_bat,battery,grd,elec_cns,heat_pump,pv_roof2
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,800,0,0,0,1,1,1,1,0
-battery,LiionBattery,BAT1,0,800,0,0,1,0,0,0,0,0
-grd,StandardACGrid,GRD1,0,800,0,0,1,0,0,1,1,0
-elec_cns,StandardElectricalConsumption,CNS1,0,800,0,0,0,0,0,0,0,0
-heat_pump,HeatPump,EHP1,0,800,0,0,0,0,0,0,0,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv b/input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv
deleted file mode 100644
index bf5cf12bad..0000000000
--- a/input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,gas_boild,gas_grd
-gas_boild,GasBoiler,BOI1,,,,0,0
-gas_grd,StandardGasGrid,GAS1,0,800,0,1,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv b/input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv
deleted file mode 100644
index aebab52b97..0000000000
--- a/input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,water_tes,gas_boild,solar_therm_ge,heat_grid
-heat_pump,HeatPump,EHP1,,,,0,1,1,0,0,0
-therm_cns,HeatConsumption,HeatCNS1,0.0,800,0,0,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,0,800,0,0,1,0,0,0,0
-gas_boild,GasBoiler,BOI1,0,800,0,0,1,1,0,0,0
-solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0,0,1,1,0,0,0
-heat_grid,HeatGrid,HG1,0,800,0,0,1,1,0,0,0
--
GitLab