diff --git a/Model_Library b/Model_Library index 63dd8424cf069f35f33428e94f50dee3fe2aab39..2a5dc03f968990ce3169bca7ffa73ab173f537d2 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit 63dd8424cf069f35f33428e94f50dee3fe2aab39 +Subproject commit 2a5dc03f968990ce3169bca7ffa73ab173f537d2 diff --git a/runme.py b/runme.py index 1c21b34669b7a48dce08e0acc1a6e5a213d1499c..8000d1684abaf56bfb3395b260380c2c582767ea 100644 --- a/runme.py +++ b/runme.py @@ -58,18 +58,15 @@ print("runme:\t\t\tProfile Processing [s]: \t" + str(after_input_processing_time # 'config_path': path to global configurations like prices, injection prices, emission costs, etc. prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11', 'config_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv', - 'profiles': {'irradiance': 'irradiance_1', - 'air_temperature': 'temperature_1', - 'elec_demand': 'demand_electric_1', - 'therm_demand': 'demand_heat_1', - 'hot_water_demand': 'demand_hot_water_1'}}, + 'profiles': {'pv_roof': ('irradiance_1', 'temperature_1'), + 'elec_cns': 'demand_electric_1', + 'therm_cns': 'demand_heat_1', + 'dhw_dmd': 'demand_hot_water_1'}}, 'SCN0_CAT1_3000_6000': {'topology_path': 'input_files/models/prosumer_models/SCN0_CAT1', 'config_path': 'input_files/models/prosumer_models/SCN0_CAT1/config.csv', - 'profiles': {'irradiance': 'irradiance_2', - 'air_temperature': 'temperature_2', - 'elec_demand': 'demand_electric_2', - 'therm_demand': 'demand_heat_2', - 'hot_water_demand': 'demand_hot_water_2'}}} + 'profiles': {'elec_cns': 'demand_electric_2', + 'therm_cns': 'demand_heat_2', + 'dhw_dmd': 'demand_hot_water_2'}},} prosumer_strategy = ['annuity'] parallel_processing = False @@ -96,11 +93,7 @@ if simulation_scope == SimulationScope.PROSUMER: start_community_time = time.time() community_assets_dict = {'ca_bat': {'topology_path': 'input_files/models/district_models/example_CA', 'config_path': 'input_files/models/district_models/example_CA/config.csv', - 'profiles': {'irradiance': 'irradiance_3', - 'air_temperature': 'temperature_3', - 'elec_demand': 'demand_electric_3', - 'therm_demand': 'demand_heat_3', - 'hot_water_demand': 'demand_hot_water_3'}}} + 'profiles': {'elec_cns_ca_bat': 'demand_electric_3'}}} community_assets_strategy = 'sizing_max_operational_profit' before_community_assets_time = time.time()