Reworked component library

Unified component names
Unified component library structure
Deleted unimplemented components
Deleted models of unimplemented components
Created CoolConsumption component

Model_Library @ 6f798f19

-Subproject commit fe0a9e7983c6dd0a727fec829f981425b99f1c55
+Subproject commit 6f798f19e4095635839390f04a72e87343657140

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'])

input_files/models/district_models/example_CA/components.csv

 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

input_files/models/district_models/example_community/components.csv

 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

input_files/models/district_models/jbr_test_ca/components.csv

 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

input_files/models/district_models/jbr_test_comm/components.csv

 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

input_files/models/prosumer_models/SCN0_CAT1/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv

 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

input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv

 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

input_files/models/prosumer_models/SCN3_CAT1/components.csv

 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

input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv

 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

input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv

 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

input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv

 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

input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv

 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