Merge branch 'dev_cvo_refactoring' into 'main'

Refactoring part 2

See merge request ineed-dc/ineed-dc-framework!16

input_files/models/prosumer_models/SCN0_CAT1/config.csv

-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20

input_files/models/prosumer_models/SCN0_CAT1/connections.csv

+sector,from,to
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
+heat,gas_boi,therm_cns
+heat,gas_boi,dhw_dmd

input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,grd,elec_cns
-grd,StandardACGrid,GRD1,100000,100000,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,100000,100000,0,0,0

input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,100000,100000,0,1,0

input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,100000,100000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,100000,100000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv

+name,type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,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
+gas_grd,GasGrid,GAS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
+water_tes,HotWaterStorage,TES1,40,40,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv

-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20

input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv

+sector,from,to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,grd,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
+heat,gas_boi,therm_cns
+heat,gas_boi,dhw_dmd

input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0

input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv

+name,type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,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,StaticInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,GasGrid,GAS1,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/config.csv

-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv

+sector,from,to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,elec_cns
+electricity,grd,inv_bat
+electricity,inv_bat,battery
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
+heat,gas_boi,therm_cns
+heat,gas_boi,dhw_dmd

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,grd,elec_cns,inv_bat
-pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0
-inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1
-battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,1
-grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,0,1,1
-elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0
-inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,0

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,gas_boi,gas_grd
-gas_boi,GasBoiler,BOI1,10,10,0,0,0
-gas_grd,StandardGasGrid,GAS1,10000,10000,0,1,0

input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv

-comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,dhw_dmd,water_tes,gas_boi
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0,0,0,0,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0
-water_tes,HotWaterStorage,TES1,40,40,0,1,1,0,0
-gas_boi,GasBoiler,BOI1,10,10,0,0,0,1,0

input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv

+name,type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,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,StaticInverter,INVBAT,10,10,0
+gas_boi,GasBoiler,BOI1,10,10,0
+gas_grd,GasGrid,GAS1,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/config.csv

-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20

input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv

+sector,from,to
+electricity,pv_roof,inv_pv
+electricity,inv_pv,heat_pump
+electricity,inv_pv,grd
+electricity,inv_pv,elec_cns
+electricity,inv_pv,inv_bat
+electricity,battery,inv_bat
+electricity,grd,heat_pump
+electricity,grd,elec_cns
+electricity,inv_bat,battery
+electricity,inv_bat,heat_pump
+electricity,inv_bat,grd
+electricity,inv_bat,elec_cns
+gas,gas_grd,gas_boi
+heat,heat_pump,water_tes
+heat,water_tes,therm_cns
+heat,water_tes,dhw_dmd
+heat,gas_boi,water_tes
+heat,heat_pump,therm_cns
+heat,heat_pump,dhw_dmd
+heat,gas_boi,therm_cns
+heat,gas_boi,dhw_dmd