From f680f21f28945ed656c9422a1f745876826f7f38 Mon Sep 17 00:00:00 2001 From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de> Date: Wed, 1 Feb 2023 17:19:17 +0100 Subject: [PATCH] Properly classified converter/inverter components --- Model_Library | 2 +- input_files/convert_input_files_refactoring_part_2.py | 4 +++- input_files/models/district_models/example_CA/components.csv | 2 +- .../models/district_models/example_community/components.csv | 2 +- input_files/models/district_models/jbr_test_ca/components.csv | 2 +- .../models/district_models/jbr_test_comm/components.csv | 2 +- .../models/prosumer_models/SCN2_CAT1_PV11/components.csv | 2 +- .../models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv | 4 ++-- .../prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv | 4 ++-- .../models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv | 2 +- .../models/prosumer_models/SCN2_CAT1_PV31/components.csv | 2 +- .../models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv | 4 ++-- .../prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv | 4 ++-- .../models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv | 2 +- .../models/prosumer_models/SCN3_CAT1_PV11/components.csv | 2 +- .../models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv | 4 ++-- .../prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv | 4 ++-- .../models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv | 2 +- .../models/prosumer_models/SCN3_CAT1_PV31/components.csv | 2 +- .../models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv | 4 ++-- .../prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv | 4 ++-- .../models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv | 2 +- input_files/models/prosumer_models/jbr_test/components.csv | 2 +- .../models/prosumer_models/office_pv_heatpump/components.csv | 2 +- 24 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Model_Library b/Model_Library index 81281690d2..09f026c22c 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit 81281690d25e4c8d8e3eca55cb9bcb63edd76a7b +Subproject commit 09f026c22cca6060b606e9cd33483bea01ba59d3 diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py index 04945a1d20..14959bbf79 100644 --- a/input_files/convert_input_files_refactoring_part_2.py +++ b/input_files/convert_input_files_refactoring_part_2.py @@ -55,7 +55,9 @@ renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption', 'StandardPVGenerator': 'PVGenerator', 'StandardGasGrid': 'GasGrid', 'StandardPEMElectrolyzer': 'PEMElectrolyzer', - 'StandardPEMFuelCell': 'PEMFuelCell'} + 'StandardPEMFuelCell': 'PEMFuelCell', + 'BasicInverter': 'StaticInverter', + 'Inverter': 'DynamicInverter'} consumption_components = ['CoolConsumption', 'ChargingInfrastructure', 'ElectricalConsumption', 'HeatConsumption', 'Radiator', 'HotWaterConsumption'] for dirpath, dirnames, filenames in os.walk(".\\input_files"): topology_here = False diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv index 671c3e165f..28ea34b906 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 @@ name,type,model,min_size,max_size,current_size -inv_pv_bat,Inverter,STP-7000TL-20,0,20,0 +inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0 battery,LiionBattery,BAT1,0,6,6 grd,ElectricalGrid,GRD1,1000,1000,1000 elec_cns,ElectricalConsumption,,,, diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv index 84edca4c2e..37d9f6061c 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 @@ 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 +inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0 battery,LiionBattery,BAT1,6,6,6 grd,ElectricalGrid,GRD1,1000,1000,1000 elec_cns,ElectricalConsumption,,,, 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 84edca4c2e..37d9f6061c 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 @@ 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 +inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0 battery,LiionBattery,BAT1,6,6,6 grd,ElectricalGrid,GRD1,1000,1000,1000 elec_cns,ElectricalConsumption,,,, 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 84edca4c2e..37d9f6061c 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 @@ 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 +inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0 battery,LiionBattery,BAT1,6,6,6 grd,ElectricalGrid,GRD1,1000,1000,1000 elec_cns,ElectricalConsumption,,,, 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 c37533c172..89ba5854d9 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv @@ -1,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,INVPV,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, gas_boi,GasBoiler,BOI1,10,10,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 ef3503325d..3bc6ffd4d5 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,10 +1,10 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,INVPV,10,10,0 battery,LiionBattery,BAT1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 3de8e7db96..adc049d34c 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,11 +1,11 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,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,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 70b9518425..9029b25baa 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,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,INVPV,10,10,0 heat_pump,HeatPump,EHP1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, 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 55511dd6cb..9583700cc0 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv @@ -1,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, gas_boi,GasBoiler,BOI1,10,10,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 86be551e1b..2af6381b45 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,10 +1,10 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 battery,LiionBattery,BAT1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 68d9cb21b3..445b0bafbb 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,11 +1,11 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 battery,LiionBattery,BAT1,10,10,0 heat_pump,HeatPump,EHP1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 c2bfab8aee..cb554db40c 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,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 heat_pump,HeatPump,EHP1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, 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 c37533c172..89ba5854d9 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv @@ -1,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,INVPV,10,10,0 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_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv index ef3503325d..3bc6ffd4d5 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,10 +1,10 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,INVPV,10,10,0 battery,LiionBattery,BAT1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 3de8e7db96..adc049d34c 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,11 +1,11 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,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,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 70b9518425..9029b25baa 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,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,10,10,0 -inv_pv,BasicInverter,INVPV,10,10,0 +inv_pv,StaticInverter,INVPV,10,10,0 heat_pump,HeatPump,EHP1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, 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 55511dd6cb..9583700cc0 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv @@ -1,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 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_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv index 86be551e1b..2af6381b45 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,10 +1,10 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 battery,LiionBattery,BAT1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 68d9cb21b3..445b0bafbb 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,11 +1,11 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 battery,LiionBattery,BAT1,10,10,0 heat_pump,HeatPump,EHP1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, -inv_bat,BasicInverter,INVBAT,10,10,0 +inv_bat,StaticInverter,INVBAT,10,10,0 gas_boi,GasBoiler,BOI1,10,10,0 gas_grd,GasGrid,GAS1,10000,10000,0 therm_cns,HeatConsumption,,,, 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 c2bfab8aee..cb554db40c 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,6 +1,6 @@ name,type,model,min_size,max_size,current_size pv_roof,PVGenerator,PV2,30,30,0 -inv_pv,BasicInverter,INVPV,30,30,0 +inv_pv,StaticInverter,INVPV,30,30,0 heat_pump,HeatPump,EHP1,10,10,0 grd,ElectricalGrid,GRD1,10000,10000,0 elec_cns,ElectricalConsumption,,,, diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv index 84edca4c2e..37d9f6061c 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 @@ 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 +inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0 battery,LiionBattery,BAT1,6,6,6 grd,ElectricalGrid,GRD1,1000,1000,1000 elec_cns,ElectricalConsumption,,,, 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 c80d58e8f2..56d0504c80 100644 --- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv +++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv @@ -1,6 +1,6 @@ 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 +inv_pv_bat,DynamicInverter,STP-7000TL-20,0,30,0 battery,LiionBattery,BAT1,0,1000,0 heat_pump,HeatPump,EHP1,2,50,0 grd,ElectricalGrid,GRD1,1000,1000,0 -- GitLab