From 2269a5965c9fc5cdca0fa09f584770409ae212a8 Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Wed, 18 Jan 2023 10:34:01 +0100
Subject: [PATCH] Reworked component library
Unified component names
Unified component library structure
Deleted unimplemented components
Deleted models of unimplemented components
Created CoolConsumption component
---
Model_Library | 2 +-
.../convert_input_files_refactoring_part_2.py | 9 +++++++++
.../district_models/example_CA/components.csv | 4 ++--
.../example_community/components.csv | 6 +++---
.../district_models/jbr_test_ca/components.csv | 6 +++---
.../jbr_test_comm/components.csv | 6 +++---
.../prosumer_models/SCN0_CAT1/components.csv | 6 +++---
.../SCN2_CAT1_PV11/components.csv | 8 ++++----
.../SCN2_CAT1_PV12_BA/components.csv | 8 ++++----
.../SCN2_CAT1_PV13_BA_HP/components.csv | 8 ++++----
.../SCN2_CAT1_PV14_HP/components.csv | 8 ++++----
.../SCN2_CAT1_PV31/components.csv | 8 ++++----
.../SCN2_CAT1_PV32_BA/components.csv | 8 ++++----
.../SCN2_CAT1_PV33_BA_HP/components.csv | 8 ++++----
.../SCN2_CAT1_PV34_HP/components.csv | 8 ++++----
.../prosumer_models/SCN3_CAT1/components.csv | 6 +++---
.../SCN3_CAT1_PV11/components.csv | 8 ++++----
.../SCN3_CAT1_PV12_BA/components.csv | 8 ++++----
.../SCN3_CAT1_PV13_BA_HP/components.csv | 8 ++++----
.../SCN3_CAT1_PV14_HP/components.csv | 8 ++++----
.../SCN3_CAT1_PV31/components.csv | 8 ++++----
.../SCN3_CAT1_PV32_BA/components.csv | 8 ++++----
.../SCN3_CAT1_PV33_BA_HP/components.csv | 8 ++++----
.../SCN3_CAT1_PV34_HP/components.csv | 8 ++++----
.../prosumer_models/jbr_test/components.csv | 6 +++---
.../prosumer_models/mfh_quartal/components.csv | 18 +++++++++---------
.../office_pv_heatpump/components.csv | 6 +++---
.../swimmingPool/components.csv | 10 +++++-----
.../swimmingPool_CHP/components.csv | 10 +++++-----
.../swimmingPool_HP/components.csv | 10 +++++-----
30 files changed, 121 insertions(+), 112 deletions(-)
diff --git a/Model_Library b/Model_Library
index fe0a9e7983..6f798f19e4 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit fe0a9e7983c6dd0a727fec829f981425b99f1c55
+Subproject commit 6f798f19e4095635839390f04a72e87343657140
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index 9222d52901..b503d4fec0 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -42,6 +42,12 @@ def get_connection(matrix, components, comp_from, comp_to):
changed_topologies = []
invalid_topologies = []
+renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption',
+ 'StandardACGrid': 'ElectricalGrid',
+ 'StandardPVGenerator': 'PVGenerator',
+ 'StandardGasGrid': 'GasGrid',
+ 'StandardPEMElectrolyzer': 'PEMElectrolyzer',
+ 'StandardPEMFuelCell': 'PEMFuelCell'}
for dirpath, dirnames, filenames in os.walk(".\\input_files"):
topology_here = False
matrix_files = []
@@ -64,6 +70,9 @@ 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))
+ for i in df.index:
+ if df['comp_type'][i] in renamed_components:
+ df.loc[i, 'comp_type'] = renamed_components[df['comp_type'][i]]
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'])
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
index a37e648d27..f2359fffa8 100644
--- a/input_files/models/district_models/example_CA/components.csv
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -1,5 +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
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
index a0c503a3b1..2d1c6e8aad 100644
--- a/input_files/models/district_models/example_community/components.csv
+++ b/input_files/models/district_models/example_community/components.csv
@@ -1,6 +1,6 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,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
index a0c503a3b1..2d1c6e8aad 100644
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -1,6 +1,6 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,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
index a0c503a3b1..2d1c6e8aad 100644
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -1,6 +1,6 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
index 37add28451..1c030fff8a 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
@@ -1,8 +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
+grd,ElectricalGrid,GRD1,100000,100000,0
+elec_cns,ElectricalConsumption,CNS1,100000,100000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,100000,100000,0
+gas_grd,GasGrid,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/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
index 324121ea32..f095bd6247 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -1,10 +1,10 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
index 833ddde472..8c0f5b5cf1 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,12 +1,12 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
index 4115b191e2..1df0ef85a0 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,13 +1,13 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
index 3c8eaceb6e..f034df2406 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,11 +1,11 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
index 88894d4b12..6049ee2dee 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -1,10 +1,10 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
index e5d63dd846..c2a219964d 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,12 +1,12 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
index fd87492d6c..8c18d77851 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,13 +1,13 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
index 8313995585..aa67ccf8aa 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,11 +1,11 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
index d29b5218d5..218cb0b169 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
@@ -1,8 +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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
index 324121ea32..f095bd6247 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -1,10 +1,10 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,PV2,10,10,0
inv_pv,BasicInverter,INVPV,10,10,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
index 833ddde472..8c0f5b5cf1 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,12 +1,12 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
index 4115b191e2..1df0ef85a0 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,13 +1,13 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
index 3c8eaceb6e..f034df2406 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,11 +1,11 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,10,10,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
index 88894d4b12..6049ee2dee 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -1,10 +1,10 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,PV2,30,30,0
inv_pv,BasicInverter,INVPV,30,30,0
-grd,StandardACGrid,GRD1,10000,10000,0
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
index e5d63dd846..c2a219964d 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,12 +1,12 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
index fd87492d6c..8c18d77851 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,13 +1,13 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,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
+gas_grd,GasGrid,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/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
index 8313995585..aa67ccf8aa 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,11 +1,11 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,30,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,10000,10000,0
+elec_cns,ElectricalConsumption,CNS1,10000,10000,0
gas_boi,GasBoiler,BOI1,10,10,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0
+gas_grd,GasGrid,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/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
index a0c503a3b1..2d1c6e8aad 100644
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -1,6 +1,6 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,6,6,6
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,1000,1000,1000
+elec_cns,ElectricalConsumption,CNS1,1000,1000,0
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
index 652eeb73c5..b30751744e 100644
--- a/input_files/models/prosumer_models/mfh_quartal/components.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/components.csv
@@ -1,15 +1,15 @@
comp_name,comp_type,model,min_size,max_size,current_size
-grd,StandardACGrid,GRD1,1000,1000,0
-pv,StandardPVGenerator,PV2,0,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+pv,PVGenerator,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
+ecns1,ElectricalConsumption,CNS1,1000,1000,0
+ecns2,ElectricalConsumption,CNS1,1000,1000,0
+ecns3,ElectricalConsumption,CNS1,1000,1000,0
+ecns4,ElectricalConsumption,CNS1,1000,1000,0
+ecns5,ElectricalConsumption,CNS1,1000,1000,0
+ecns6,ElectricalConsumption,CNS1,1000,1000,0
+gas_grd,GasGrid,GAS1,1000,1000,0
tcns1,HeatConsumption,HeatCNS1,1000,1000,0
tcns2,HeatConsumption,HeatCNS1,1000,1000,0
tcns3,HeatConsumption,HeatCNS1,1000,1000,0
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 ad450a1781..4d63c58da5 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -1,10 +1,10 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,StandardPVGenerator,PV2,0,30,0
+pv_roof,PVGenerator,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
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,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/swimmingPool/components.csv b/input_files/models/prosumer_models/swimmingPool/components.csv
index c6eef40a6f..7b5fde2aa2 100644
--- a/input_files/models/prosumer_models/swimmingPool/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool/components.csv
@@ -1,13 +1,13 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof1,PVGenerator,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
+grd,ElectricalGrid,GRD1,0,800,0
+elec_cns,ElectricalConsumption,CNS1,0,800,0
bhkw,BHKW,VTB200,0,800,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0
+pv_roof2,PVGenerator,Vitovolt300,0,30,0
heat_pump,HeatPump,EHP1,0,800,0
-gas_grd,StandardGasGrid,GAS1,0,800,0
+gas_grd,GasGrid,GAS1,0,800,0
gas_boiler,GasBoiler,BOI1,,,
therm_cns,HeatConsumption,HeatCNS1,0,800,0
water_tes,HotWaterStorage,TES1,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
index 291e8a1d9f..58c753ea68 100644
--- a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
@@ -1,12 +1,12 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof1,PVGenerator,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
+grd,ElectricalGrid,GRD1,0,800,0
+elec_cns,ElectricalConsumption,CNS1,0,800,0
bhkw,BHKW,VTB200,0,800,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0
-gas_grd,StandardGasGrid,GAS1,0,800,0
+pv_roof2,PVGenerator,Vitovolt300,0,30,0
+gas_grd,GasGrid,GAS1,0,800,0
gas_boild,GasBoiler,BOI1,,,
therm_cns,HeatConsumption,HeatCNS1,0,800,0
water_tes,HotWaterStorage,TES1,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/components.csv b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
index 1d70f9b7d2..bb76935686 100644
--- a/input_files/models/prosumer_models/swimmingPool_HP/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
@@ -1,13 +1,13 @@
comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof1,PVGenerator,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
+grd,ElectricalGrid,GRD1,0,800,0
+elec_cns,ElectricalConsumption,CNS1,0,800,0
heat_pump,HeatPump,EHP1,0,800,0
-pv_roof2,StandardPVGenerator,Vitovolt300,0,800,0
+pv_roof2,PVGenerator,Vitovolt300,0,800,0
gas_boild,GasBoiler,BOI1,,,
-gas_grd,StandardGasGrid,GAS1,0,800,0
+gas_grd,GasGrid,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
--
GitLab