Merge branch 'main' of git-ce.rwth-aachen.de:ineed-dc/ineed-dc-framework

input_files/models/prosumer_models/SCN3_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,grd,inv_bat
-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
+from,output,to,input
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,heat_pump,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1

input_files/models/prosumer_models/SCN3_CAT1_PV14_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,grd,heat_pump
-electricity,grd,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
+from,output,to,input
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1

input_files/models/prosumer_models/SCN3_CAT1_PV31/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
+from,output,to,input
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1

input_files/models/prosumer_models/SCN3_CAT1_PV32_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
+from,output,to,input
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1

input_files/models/prosumer_models/SCN3_CAT1_PV33_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,grd,inv_bat
-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
+from,output,to,input
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,heat_pump,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1

input_files/models/prosumer_models/SCN3_CAT1_PV34_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,grd,heat_pump
-electricity,grd,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
+from,output,to,input
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1

input_files/models/prosumer_models/jbr_test/connections.csv

-sector,from,to
-electricity,pv_roof,inv_pv_bat
-electricity,inv_pv_bat,battery
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,battery,inv_pv_bat
-electricity,grd,inv_pv_bat
-electricity,grd,elec_cns
+from,output,to,input
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,elec_cns,1

input_files/models/prosumer_models/mfh_quartal/connections.csv

-sector,from,to
-electricity,grd,ecns1
-electricity,grd,ecns2
-electricity,grd,ecns3
-electricity,grd,ecns4
-electricity,grd,ecns5
-electricity,grd,ecns6
-electricity,pv,grd
-electricity,pv,bat
-electricity,pv,ecns1
-electricity,pv,ecns2
-electricity,pv,ecns3
-electricity,pv,ecns4
-electricity,pv,ecns5
-electricity,pv,ecns6
-electricity,bat,ecns1
-electricity,bat,ecns2
-electricity,bat,ecns3
-electricity,bat,ecns4
-electricity,bat,ecns5
-electricity,bat,ecns6
-electricity,chp,grd
-electricity,chp,ecns1
-electricity,chp,ecns2
-electricity,chp,ecns3
-electricity,chp,ecns4
-electricity,chp,ecns5
-electricity,chp,ecns6
-gas,gas_grd,chp
-heat,chp,tcns1
-heat,chp,tcns2
-heat,chp,tcns3
-heat,chp,tcns4
-heat,chp,tcns5
-heat,chp,tcns6
+from,output,to,input
+grd,1,ecns1,1
+grd,1,ecns2,1
+grd,1,ecns3,1
+grd,1,ecns4,1
+grd,1,ecns5,1
+grd,1,ecns6,1
+pv,1,grd,1
+pv,1,bat,1
+pv,1,ecns1,1
+pv,1,ecns2,1
+pv,1,ecns3,1
+pv,1,ecns4,1
+pv,1,ecns5,1
+pv,1,ecns6,1
+bat,1,ecns1,1
+bat,1,ecns2,1
+bat,1,ecns3,1
+bat,1,ecns4,1
+bat,1,ecns5,1
+bat,1,ecns6,1
+chp,2,grd,1
+chp,2,ecns1,1
+chp,2,ecns2,1
+chp,2,ecns3,1
+chp,2,ecns4,1
+chp,2,ecns5,1
+chp,2,ecns6,1
+gas_grd,1,chp,1
+chp,1,tcns1,1
+chp,1,tcns2,1
+chp,1,tcns3,1
+chp,1,tcns4,1
+chp,1,tcns5,1
+chp,1,tcns6,1

input_files/models/prosumer_models/office_pv_heatpump/connections.csv

-sector,from,to
-electricity,pv_roof,inv_pv_bat
-electricity,inv_pv_bat,battery
-electricity,inv_pv_bat,heat_pump
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,battery,inv_pv_bat
-electricity,grd,inv_pv_bat
-electricity,grd,heat_pump
-electricity,grd,elec_cns
-heat,heat_pump,water_tes
-heat,water_tes,therm_cns
-heat,water_tes,dhw_dmd
-heat,heat_pump,therm_cns
-heat,heat_pump,dhw_dmd
+from,output,to,input
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,heat_pump,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1

runme.py

 import pandas as pd
 import Tooling.input_profile_processor.input_profile_processor
-import Model_Library.Prosumer.main as main
-import Model_Library.District.main_district as main_district
+import Model_Library.Prosumer.main as main_prosumer
+import Model_Library.District.main as main_district
 from enum import Enum
 
 class SimulationScope(Enum):
     PROSUMER = 1
-    COMMUNITY = 2
+    DISTRICT = 2
 
-simulation_scope = SimulationScope.COMMUNITY
+simulation_scope = SimulationScope.DISTRICT
 t_start = pd.Timestamp("2019-05-10 00:00:00") # start time of simulation
 t_horizon = 240 # number of time steps to be simulated
 t_step = 1 # length of a time step in hours
@@ -46,7 +46,7 @@ prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'config_path': 'input_files/models/
                                                       'therm_cns': 'demand_heat_2',
                                                       'dhw_dmd': 'demand_hot_water_2'}}}
 
-prosumer_main = main.Main(prosumer_dict, input_profiles, t_horizon, t_step)
+prosumer_main = main_prosumer.ProsumerMain(prosumer_dict, input_profiles, t_horizon, t_step)
 
 prosumer_sizing_strategy = 'annuity'
 prosumer_main.optimize_sizing(prosumer_sizing_strategy)
@@ -58,21 +58,21 @@ prosumers = prosumer_main.prosumers
 if simulation_scope == SimulationScope.PROSUMER:
     exit()
 
-community_assets_dict = {'ca_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
+district_assets_dict = {'da_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
                                    'topology_path': 'input_files/models/district_models/example_CA',
                                    'profiles': {'elec_cns': 'demand_electric_3'}}}
 
-community_assets = main.Main_CA(community_assets_dict, input_profiles, t_horizon, t_step).community_assets
+district_assets = main_prosumer.DistrictAssetMain(district_assets_dict, input_profiles, t_horizon, t_step).district_assets
 
-community_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv',
+district_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv',
                                'profiles': {'elec_price': 'elec_price_1'}}}
 
-community_main = main_district.MainDistrict(community_dict, prosumers, community_assets, input_profiles, t_horizon, t_step)
+district_main = main_district.DistrictMain(district_dict, prosumers, district_assets, input_profiles, t_horizon, t_step)
 
-community_sizing_strategy = 'max_operational_profit'
-community_main.optimize_sizing(community_sizing_strategy)
+district_sizing_strategy = 'max_operational_profit'
+district_main.optimize_sizing(district_sizing_strategy)
 
-community_operation_strategy = 'max_operational_profit'
-community_main.optimize_operation(t_horizon, community_operation_strategy)
+district_operation_strategy = 'max_operational_profit'
+district_main.optimize_operation(district_operation_strategy)
 
-community_main.save_results()
+district_main.save_results()