Removed size and models of consumption components

Model_Library @ 6dadedf5

-Subproject commit 6f798f19e4095635839390f04a72e87343657140
+Subproject commit 6dadedf53098caad20ccadebdd8b67aa312cbf62

input_files/convert_input_files_refactoring_part_2.py

@@ -48,6 +48,7 @@ renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption',
                       'StandardGasGrid': 'GasGrid',
                       'StandardPEMElectrolyzer': 'PEMElectrolyzer',
                       'StandardPEMFuelCell': 'PEMFuelCell'}
+consumption_components = ['CoolConsumption', 'ChargingInfrastructure', 'ElectricalConsumption', 'HeatConsumption', 'Radiator', 'HotWaterConsumption']
 for dirpath, dirnames, filenames in os.walk(".\\input_files"):
     topology_here = False
     matrix_files = []
@@ -73,6 +74,11 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
                 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:
+                        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'])

input_files/models/district_models/example_CA/components.csv

@@ -2,4 +2,4 @@ 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,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,

input_files/models/district_models/example_community/components.csv

@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,

input_files/models/district_models/jbr_test_ca/components.csv

@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,

input_files/models/district_models/jbr_test_comm/components.csv

@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,

input_files/models/prosumer_models/SCN0_CAT1/components.csv

 comp_name,comp_type,model,min_size,max_size,current_size
 grd,ElectricalGrid,GRD1,100000,100000,0
-elec_cns,ElectricalConsumption,CNS1,100000,100000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,100000,100000,0
-therm_cns,HeatConsumption,HeatCNS1,100000,100000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,100000,100000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv

+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,30,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,

input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv

+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,grd,elec_cns
+electricity,pv_roof,grd
+electricity,pv_roof,elec_cns
+electricity,grd,elec_cns

input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv

-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv

@@ -2,9 +2,9 @@ comp_name,comp_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
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv

@@ -3,10 +3,10 @@ pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0

input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv

@@ -4,10 +4,10 @@ inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0

input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv

@@ -3,9 +3,9 @@ pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0

input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv

+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,30,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,

input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv

+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,grd,elec_cns
+electricity,pv_roof,grd
+electricity,pv_roof,elec_cns
+electricity,grd,elec_cns

input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv

-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0

input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0

input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv

@@ -2,9 +2,9 @@ comp_name,comp_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
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0