From 9b039e11127e6e13d8b17993f3d5f312c7b15e5d Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Tue, 31 Jan 2023 09:41:05 +0100
Subject: [PATCH] Removed comp_ from identifiers
---
Model_Library | 2 +-
.../convert_input_files_refactoring_part_2.py | 65 ++++++++++---------
.../district_models/example_CA/components.csv | 2 +-
.../example_CA/connections.csv | 2 +-
.../example_community/components.csv | 2 +-
.../example_community/connections.csv | 2 +-
.../jbr_test_ca/components.csv | 2 +-
.../jbr_test_ca/connections.csv | 2 +-
.../jbr_test_comm/components.csv | 2 +-
.../jbr_test_comm/connections.csv | 2 +-
.../prosumer_models/SCN0_CAT1/components.csv | 2 +-
.../prosumer_models/SCN0_CAT1/connections.csv | 2 +-
.../SCN2_CAT1_PV11/components.csv | 2 +-
.../SCN2_CAT1_PV11/connections.csv | 2 +-
.../SCN2_CAT1_PV12_BA/components.csv | 2 +-
.../SCN2_CAT1_PV12_BA/connections.csv | 2 +-
.../SCN2_CAT1_PV13_BA_HP/components.csv | 2 +-
.../SCN2_CAT1_PV13_BA_HP/connections.csv | 2 +-
.../SCN2_CAT1_PV14_HP/components.csv | 2 +-
.../SCN2_CAT1_PV14_HP/connections.csv | 2 +-
.../SCN2_CAT1_PV31/components.csv | 2 +-
.../SCN2_CAT1_PV31/connections.csv | 2 +-
.../SCN2_CAT1_PV32_BA/components.csv | 2 +-
.../SCN2_CAT1_PV32_BA/connections.csv | 2 +-
.../SCN2_CAT1_PV33_BA_HP/components.csv | 2 +-
.../SCN2_CAT1_PV33_BA_HP/connections.csv | 2 +-
.../SCN2_CAT1_PV34_HP/components.csv | 2 +-
.../SCN2_CAT1_PV34_HP/connections.csv | 2 +-
.../prosumer_models/SCN3_CAT1/components.csv | 2 +-
.../prosumer_models/SCN3_CAT1/connections.csv | 2 +-
.../SCN3_CAT1_PV11/components.csv | 2 +-
.../SCN3_CAT1_PV11/connections.csv | 2 +-
.../SCN3_CAT1_PV12_BA/components.csv | 2 +-
.../SCN3_CAT1_PV12_BA/connections.csv | 2 +-
.../SCN3_CAT1_PV13_BA_HP/components.csv | 2 +-
.../SCN3_CAT1_PV13_BA_HP/connections.csv | 2 +-
.../SCN3_CAT1_PV14_HP/components.csv | 2 +-
.../SCN3_CAT1_PV14_HP/connections.csv | 2 +-
.../SCN3_CAT1_PV31/components.csv | 2 +-
.../SCN3_CAT1_PV31/connections.csv | 2 +-
.../SCN3_CAT1_PV32_BA/components.csv | 2 +-
.../SCN3_CAT1_PV32_BA/connections.csv | 2 +-
.../SCN3_CAT1_PV33_BA_HP/components.csv | 2 +-
.../SCN3_CAT1_PV33_BA_HP/connections.csv | 2 +-
.../SCN3_CAT1_PV34_HP/components.csv | 2 +-
.../SCN3_CAT1_PV34_HP/connections.csv | 2 +-
.../prosumer_models/jbr_test/components.csv | 2 +-
.../prosumer_models/jbr_test/connections.csv | 2 +-
.../mfh_quartal/components.csv | 2 +-
.../mfh_quartal/connections.csv | 2 +-
.../office_pv_heatpump/components.csv | 2 +-
.../office_pv_heatpump/connections.csv | 2 +-
52 files changed, 84 insertions(+), 83 deletions(-)
diff --git a/Model_Library b/Model_Library
index 3519ec06ea..18fddbcb6b 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 3519ec06eade34bf29da5f46877a3c7057e56edc
+Subproject commit 18fddbcb6b99b9af1559c918f403c75e8b71801e
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index e0cacbd8a6..04945a1d20 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -11,19 +11,19 @@ def read_matrix(df):
for i in df.index:
matrix_row = []
for j in df.index:
- matrix_row.append(df[df["comp_name"][j]][i])
+ matrix_row.append(df[df["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
+ components[df["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']:
+ for column in ['name', '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
@@ -79,26 +79,27 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
file_contents = []
for matrix_file, sector in matrix_files:
df = pd.read_csv(os.path.join(dirpath, matrix_file))
+ df.rename(columns = {'comp_name': 'name', 'comp_type': 'type'}, inplace = True)
for i in df.index:
- if df['comp_type'][i] in renamed_components:
- df.loc[i, 'comp_type'] = renamed_components[df['comp_type'][i]]
- if df['comp_type'][i] in consumption_components:
+ if df['type'][i] in renamed_components:
+ df.loc[i, 'type'] = renamed_components[df['type'][i]]
+ if df['type'][i] in consumption_components:
df.loc[i, 'model'] = ''
df.loc[i, 'min_size'] = ''
df.loc[i, 'max_size'] = ''
df.loc[i, 'current_size'] = ''
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'])
+ all_components = pd.DataFrame(columns = ['name', 'type', 'model', 'min_size', 'max_size', 'current_size'])
+ all_connections = pd.DataFrame(columns = ['sector', 'from', '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']]
+ if component not in all_components.loc[:]['name']:
+ all_components.loc[component] = df.loc[components[component]][['name', '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']]):
+ if compare_components(all_components.loc[component], df.loc[components[component]][['name', '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)
+ all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'from': component, 'to': connected_component}).to_frame().T], ignore_index = True)
config = read_config(os.path.join(dirpath, "config.csv"))
changed_topologies.append(dirpath)
new_config = dict()
@@ -117,65 +118,65 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
print(f"Config of topology {dirpath} has a variable electricity price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'ElectricalGrid':
- new_config[all_components['comp_name'][i] + '_price'] = value
+ if all_components['type'][i] == 'ElectricalGrid':
+ new_config[all_components['name'][i] + '_price'] = value
elif name == 'injection_price':
if config['injection_price_variable'] == 1:
print(f"Config of topology {dirpath} has a variable electricity injection price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'ElectricalGrid':
- new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ if all_components['type'][i] == 'ElectricalGrid':
+ new_config[all_components['name'][i] + '_injection_price'] = value
elif name == 'gas_price':
if config['gas_price_variable'] == 1:
print(f"Config of topology {dirpath} has a variable gas price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'GasGrid':
- new_config[all_components['comp_name'][i] + '_price'] = value
+ if all_components['type'][i] == 'GasGrid':
+ new_config[all_components['name'][i] + '_price'] = value
elif name == 'injection_price_gas':
if config['injection_price_gas_variable'] == 1:
print(f"Config of topology {dirpath} has a variable gas injection price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'GasGrid':
- new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ if all_components['type'][i] == 'GasGrid':
+ new_config[all_components['name'][i] + '_injection_price'] = value
elif name == 'heat_price':
if config['heat_price_variable'] == 1:
print(f"Config of topology {dirpath} has a variable heat price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'HeatGrid':
- new_config[all_components['comp_name'][i] + '_price'] = value
+ if all_components['type'][i] == 'HeatGrid':
+ new_config[all_components['name'][i] + '_price'] = value
elif name == 'injection_price_heat':
if config['injection_price_heat_variable'] == 1:
print(f"Config of topology {dirpath} has a variable heat injection price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'HeatGrid':
- new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ if all_components['type'][i] == 'HeatGrid':
+ new_config[all_components['name'][i] + '_injection_price'] = value
elif name == 'cooling_price':
if config['cooling_price_variable'] == 1:
print(f"Config of topology {dirpath} has a variable cooling price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'CoolingGrid':
- new_config[all_components['comp_name'][i] + '_price'] = value
+ if all_components['type'][i] == 'CoolingGrid':
+ new_config[all_components['name'][i] + '_price'] = value
elif name == 'injection_price_cooling':
if config['injection_price_cooling_variable'] == 1:
print(f"Config of topology {dirpath} has a variable cooling injection price, so be sure to add a price profile!")
else:
for i in all_components.index:
- if all_components['comp_type'][i] == 'CoolingGrid':
- new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ if all_components['type'][i] == 'CoolingGrid':
+ new_config[all_components['name'][i] + '_injection_price'] = value
elif name == 'elec_emission':
for i in all_components.index:
- if all_components['comp_type'][i] == 'ElectricalGrid':
- new_config[all_components['comp_name'][i] + '_emission'] = value
+ if all_components['type'][i] == 'ElectricalGrid':
+ new_config[all_components['name'][i] + '_emission'] = value
elif name == 'gas_emission':
for i in all_components.index:
- if all_components['comp_type'][i] == 'GasGrid':
- new_config[all_components['comp_name'][i] + '_emission'] = value
+ if all_components['type'][i] == 'GasGrid':
+ new_config[all_components['name'][i] + '_emission'] = value
else:
new_config[name] = value
all_components.to_csv(os.path.join(dirpath, "temp.csv"), index = False)
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
index 9fe473ac89..671c3e165f 100644
--- a/input_files/models/district_models/example_CA/components.csv
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,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,ElectricalGrid,GRD1,1000,1000,1000
diff --git a/input_files/models/district_models/example_CA/connections.csv b/input_files/models/district_models/example_CA/connections.csv
index d13d507156..792c8b1f4f 100644
--- a/input_files/models/district_models/example_CA/connections.csv
+++ b/input_files/models/district_models/example_CA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,inv_pv_bat,battery
electricity,inv_pv_bat,grd
electricity,inv_pv_bat,elec_cns
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
index 096d2a289d..84edca4c2e 100644
--- a/input_files/models/district_models/example_community/components.csv
+++ b/input_files/models/district_models/example_community/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,6,6,6
inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/district_models/example_community/connections.csv b/input_files/models/district_models/example_community/connections.csv
index e451eec732..d63037e151 100644
--- a/input_files/models/district_models/example_community/connections.csv
+++ b/input_files/models/district_models/example_community/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv_bat
electricity,inv_pv_bat,battery
electricity,inv_pv_bat,grd
diff --git a/input_files/models/district_models/jbr_test_ca/components.csv b/input_files/models/district_models/jbr_test_ca/components.csv
index 096d2a289d..84edca4c2e 100644
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,6,6,6
inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/district_models/jbr_test_ca/connections.csv b/input_files/models/district_models/jbr_test_ca/connections.csv
index e451eec732..d63037e151 100644
--- a/input_files/models/district_models/jbr_test_ca/connections.csv
+++ b/input_files/models/district_models/jbr_test_ca/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv_bat
electricity,inv_pv_bat,battery
electricity,inv_pv_bat,grd
diff --git a/input_files/models/district_models/jbr_test_comm/components.csv b/input_files/models/district_models/jbr_test_comm/components.csv
index 096d2a289d..84edca4c2e 100644
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,6,6,6
inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/district_models/jbr_test_comm/connections.csv b/input_files/models/district_models/jbr_test_comm/connections.csv
index e451eec732..d63037e151 100644
--- a/input_files/models/district_models/jbr_test_comm/connections.csv
+++ b/input_files/models/district_models/jbr_test_comm/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv_bat
electricity,inv_pv_bat,battery
electricity,inv_pv_bat,grd
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
index 414d23a3d2..2b280bcb25 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
grd,ElectricalGrid,GRD1,100000,100000,0
elec_cns,ElectricalConsumption,,,,
gas_boi,GasBoiler,BOI1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
index 0e2d493c2b..3e485ceed8 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,grd,elec_cns
gas,gas_grd,gas_boi
heat,water_tes,therm_cns
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
index 848c34e1cb..c37533c172 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
grd,ElectricalGrid,GRD1,10000,10000,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
index 42d01f84dc..43a54d1318 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 35107aae58..ef3503325d 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
battery,LiionBattery,BAT1,10,10,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
index b61eb9ccb5..83a66459d5 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 7899fb7b2d..3de8e7db96 100644
--- 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
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
battery,LiionBattery,BAT1,10,10,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
index da42e7d5fa..b6e01aecd8 100644
--- 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
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
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
index aa296a9117..70b9518425 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
heat_pump,HeatPump,EHP1,10,10,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
index 98920735b2..97283663a5 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
index e7979a690d..55511dd6cb 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
grd,ElectricalGrid,GRD1,10000,10000,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
index 42d01f84dc..43a54d1318 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 31d8fe9d70..86be551e1b 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
battery,LiionBattery,BAT1,10,10,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
index b0145baced..fb91ba92c0 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 5081af0d49..68d9cb21b3 100644
--- 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
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
battery,LiionBattery,BAT1,10,10,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
index da42e7d5fa..b6e01aecd8 100644
--- 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
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
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
index aabb7a8e8e..c2bfab8aee 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
heat_pump,HeatPump,EHP1,10,10,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
index 98920735b2..97283663a5 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
index 6afe7f3681..652da78301 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
grd,ElectricalGrid,GRD1,10000,10000,0
elec_cns,ElectricalConsumption,,,,
gas_boi,GasBoiler,BOI1,10,10,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
index 0e2d493c2b..3e485ceed8 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,grd,elec_cns
gas,gas_grd,gas_boi
heat,water_tes,therm_cns
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
index 848c34e1cb..c37533c172 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
grd,ElectricalGrid,GRD1,10000,10000,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
index 42d01f84dc..43a54d1318 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 35107aae58..ef3503325d 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
battery,LiionBattery,BAT1,10,10,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
index b61eb9ccb5..83a66459d5 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 7899fb7b2d..3de8e7db96 100644
--- 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
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
battery,LiionBattery,BAT1,10,10,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
index 6d228b6aeb..1ce26af83c 100644
--- 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
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
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
index aa296a9117..70b9518425 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
heat_pump,HeatPump,EHP1,10,10,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
index 98920735b2..97283663a5 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
index e7979a690d..55511dd6cb 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
grd,ElectricalGrid,GRD1,10000,10000,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
index 42d01f84dc..43a54d1318 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 31d8fe9d70..86be551e1b 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
battery,LiionBattery,BAT1,10,10,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
index b61eb9ccb5..83a66459d5 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,grd
electricity,inv_pv,elec_cns
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
index 5081af0d49..68d9cb21b3 100644
--- 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
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
battery,LiionBattery,BAT1,10,10,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
index 6d228b6aeb..1ce26af83c 100644
--- 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
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
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
index aabb7a8e8e..c2bfab8aee 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
heat_pump,HeatPump,EHP1,10,10,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
index 98920735b2..97283663a5 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv
electricity,inv_pv,heat_pump
electricity,inv_pv,grd
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
index 096d2a289d..84edca4c2e 100644
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,6,6,6
inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
battery,LiionBattery,BAT1,6,6,6
diff --git a/input_files/models/prosumer_models/jbr_test/connections.csv b/input_files/models/prosumer_models/jbr_test/connections.csv
index e451eec732..d63037e151 100644
--- a/input_files/models/prosumer_models/jbr_test/connections.csv
+++ b/input_files/models/prosumer_models/jbr_test/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv_bat
electricity,inv_pv_bat,battery
electricity,inv_pv_bat,grd
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
index 1697b9bb1b..5b1f7270a6 100644
--- a/input_files/models/prosumer_models/mfh_quartal/components.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
grd,ElectricalGrid,GRD1,1000,1000,0
pv,PVGenerator,PV2,0,30,0
bat,LiionBattery,BAT1,1,1,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/connections.csv b/input_files/models/prosumer_models/mfh_quartal/connections.csv
index ec97f639b9..24fbbcbe2b 100644
--- a/input_files/models/prosumer_models/mfh_quartal/connections.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,grd,ecns1
electricity,grd,ecns2
electricity,grd,ecns3
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/components.csv b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
index 8b68ad82cf..c80d58e8f2 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -1,4 +1,4 @@
-comp_name,comp_type,model,min_size,max_size,current_size
+name,type,model,min_size,max_size,current_size
pv_roof,PVGenerator,PV2,0,30,0
inv_pv_bat,Inverter,STP-7000TL-20,0,30,0
battery,LiionBattery,BAT1,0,1000,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
index 9fb0451f88..f05079cf72 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
@@ -1,4 +1,4 @@
-sector,comp_from,comp_to
+sector,from,to
electricity,pv_roof,inv_pv_bat
electricity,inv_pv_bat,battery
electricity,inv_pv_bat,heat_pump
--
GitLab