diff --git a/Model_Library b/Model_Library index bcb9d840108bdc819b5f9f78c82acedfaf32bcc0..314ea7f87c7232da21e67cda2e852a182e3fe930 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit bcb9d840108bdc819b5f9f78c82acedfaf32bcc0 +Subproject commit 314ea7f87c7232da21e67cda2e852a182e3fe930 diff --git a/Tooling b/Tooling index 3297d3d3bc34991d70c52a7ec72bc93424226b84..0c0e53de7c208ec319d660072c45e3e206f801b5 160000 --- a/Tooling +++ b/Tooling @@ -1 +1 @@ -Subproject commit 3297d3d3bc34991d70c52a7ec72bc93424226b84 +Subproject commit 0c0e53de7c208ec319d660072c45e3e206f801b5 diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py new file mode 100644 index 0000000000000000000000000000000000000000..7b4ebc532282934c0467694689536af079ec47c5 --- /dev/null +++ b/input_files/convert_input_files_refactoring_part_2.py @@ -0,0 +1,250 @@ +""" +This script inspects the input files and modifies them such that they adhere to the new input file specification used by the framework after merge of merge request !16 Refactoring Part 2. +""" + +import os.path +import pandas as pd +import math + +def read_matrix(df): + matrix = [] + for i in df.index: + matrix_row = [] + for j in df.index: + matrix_row.append(df[df["name"][j]][i]) + matrix.append(matrix_row) + return matrix + +def read_components(df): + components = {} + for i in df.index: + components[df["name"][i]] = i + return components + +def compare_components(comp_1, comp_2): + different = False + for column in ['name', 'type', 'model', 'min_size', 'max_size', 'current_size']: + if comp_1[column] != comp_2[column]: + if not math.isnan(comp_1[column]) and not math.isnan(comp_2[column]): + different = True + break + return different + +def get_connected_components(matrix, components, comp): + connected_components = [] + for component in components: + if get_connection(matrix, components, comp, component) == 1: + connected_components.append(component) + return connected_components + +def get_connection(matrix, components, comp_from, comp_to): + return matrix[components[comp_from]][components[comp_to]] + +def get_bypasses(component_name, connections): + inputs = [] + outputs = [] + sector = '' + for i in connections.index: + if connections['to'][i] == component_name and connections['from'][i] not in inputs: + inputs.append(connections['from'][i]) + if sector == '': + sector = connections['sector'][i] + else: + if sector != connections['sector'][i]: + raise KeyError + if connections['from'][i] == component_name and connections['to'][i] not in outputs: + outputs.append(connections['to'][i]) + if sector == '': + sector = connections['sector'][i] + else: + if sector != connections['sector'][i]: + raise KeyError + bypasses = [] + for input in inputs: + for output in outputs: + if input != output: + if not ((connections['sector'] == sector) & (connections['from'] == input) & (connections['to'] == output)).any(): + bypasses.append((sector, input, output)) + return bypasses + +def read_config(config_path): + config_df = pd.read_csv(config_path) + config_dict = config_df.to_dict(orient='list') + + for k in config_dict: + config_dict[k] = config_dict[k][0] + return config_dict + +changed_topologies = [] +invalid_topologies = [] +renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption', + 'StandardACGrid': 'ElectricalGrid', + 'StandardPVGenerator': 'PVGenerator', + 'StandardGasGrid': 'GasGrid', + 'StandardPEMElectrolyzer': 'PEMElectrolyzer', + 'StandardPEMFuelCell': 'PEMFuelCell', + 'BasicInverter': 'StaticInverter', + 'Inverter': 'DynamicInverter'} +consumption_components = ['CoolConsumption', 'ChargingInfrastructure', 'ElectricalConsumption', 'HeatConsumption', 'Radiator', 'HotWaterConsumption'] +storage_components = ['LiionBattery', 'HotWaterStorage', 'PressureStorage'] +for dirpath, dirnames, filenames in os.walk(".\\input_files"): + topology_here = False + matrix_files = [] + for filename in filenames: + if filename.find('matrix') and filename.endswith('.csv') and (filename.find('elec') is not -1): + topology_here = True + matrix_files.append((filename, 'electricity')) + if filename.find('matrix') and filename.endswith('.csv') and (filename.find('gas') is not -1): + topology_here = True + matrix_files.append((filename, 'gas')) + if filename.find('matrix') and filename.endswith('.csv') and (filename.find('hydro') is not -1): + topology_here = True + matrix_files.append((filename, 'hydrogen')) + if filename.find('matrix') and filename.endswith('.csv') and (filename.find('therm') is not -1): + topology_here = True + matrix_files.append((filename, 'heat')) + if topology_here: + try: + print(f"Inspecting topology {dirpath}") + file_contents = [] + for matrix_file, sector in matrix_files: + df = pd.read_csv(os.path.join(dirpath, matrix_file)) + df.rename(columns = {'comp_name': 'name', 'comp_type': 'type'}, inplace = True) + for i in df.index: + if df['type'][i] in renamed_components: + df.loc[i, 'type'] = renamed_components[df['type'][i]] + if df['type'][i] in consumption_components: + df.loc[i, 'model'] = '' + df.loc[i, 'min_size'] = '' + df.loc[i, 'max_size'] = '' + df.loc[i, 'current_size'] = '' + file_contents.append((df, read_matrix(df), read_components(df), sector)) + all_components = pd.DataFrame(columns = ['name', 'type', 'model', 'min_size', 'max_size', 'current_size']) + all_connections = pd.DataFrame(columns = ['sector', 'from', 'to']) + for df, matrix, components, sector in file_contents: + for component in components: + if component not in all_components.loc[:]['name']: + all_components.loc[component] = df.loc[components[component]][['name', 'type', 'model', 'min_size', 'max_size', 'current_size']] + else: + if compare_components(all_components.loc[component], df.loc[components[component]][['name', 'type', 'model', 'min_size', 'max_size', 'current_size']]): + raise KeyError + for connected_component in get_connected_components(matrix, components, component): + all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'from': component, 'to': connected_component}).to_frame().T], ignore_index = True) + while True: + number_of_connections_before = len(all_connections) + for i in all_components.index: + if all_components['type'][i] in storage_components: + for sector, from_component, to_component in get_bypasses(all_components['name'][i], all_connections): + all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'from': from_component, 'to': to_component}).to_frame().T], ignore_index = True) + number_of_connections_after = len(all_connections) + if number_of_connections_before == number_of_connections_after: + break + + config = read_config(os.path.join(dirpath, "config.csv")) + changed_topologies.append(dirpath) + new_config = dict() + for name, value in config.items(): + # configs to delete + if name in ['injection/pvpeak', 'elec_price_cap_low', 'elec_price_cap_high']: + pass + # configs to keep + elif name in ['yearly_interest', 'planning_horizon']: + new_config[name] = value + # configs that are handled by other configs + elif name in ['elec_price_variable', 'injection_price_variable', 'gas_price_variable', 'injection_price_gas_variable', 'heat_price_variable', 'injection_price_heat_variable', 'cooling_price_variable', 'injection_price_cooling_variable']: + pass + elif name == 'elec_price': + if config['elec_price_variable'] == 1: + print(f"Config of topology {dirpath} has a variable electricity price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'ElectricalGrid': + new_config[all_components['name'][i] + '_price'] = value + elif name == 'injection_price': + if config['injection_price_variable'] == 1: + print(f"Config of topology {dirpath} has a variable electricity injection price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'ElectricalGrid': + new_config[all_components['name'][i] + '_injection_price'] = value + elif name == 'gas_price': + if config['gas_price_variable'] == 1: + print(f"Config of topology {dirpath} has a variable gas price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'GasGrid': + new_config[all_components['name'][i] + '_price'] = value + elif name == 'injection_price_gas': + if config['injection_price_gas_variable'] == 1: + print(f"Config of topology {dirpath} has a variable gas injection price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'GasGrid': + new_config[all_components['name'][i] + '_injection_price'] = value + elif name == 'heat_price': + if config['heat_price_variable'] == 1: + print(f"Config of topology {dirpath} has a variable heat price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'HeatGrid': + new_config[all_components['name'][i] + '_price'] = value + elif name == 'injection_price_heat': + if config['injection_price_heat_variable'] == 1: + print(f"Config of topology {dirpath} has a variable heat injection price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'HeatGrid': + new_config[all_components['name'][i] + '_injection_price'] = value + elif name == 'cooling_price': + if config['cooling_price_variable'] == 1: + print(f"Config of topology {dirpath} has a variable cooling price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'CoolingGrid': + new_config[all_components['name'][i] + '_price'] = value + elif name == 'injection_price_cooling': + if config['injection_price_cooling_variable'] == 1: + print(f"Config of topology {dirpath} has a variable cooling injection price, so be sure to add a price profile!") + else: + for i in all_components.index: + if all_components['type'][i] == 'CoolingGrid': + new_config[all_components['name'][i] + '_injection_price'] = value + elif name == 'elec_emission': + for i in all_components.index: + if all_components['type'][i] == 'ElectricalGrid': + new_config[all_components['name'][i] + '_emission'] = value + elif name == 'gas_emission': + for i in all_components.index: + if all_components['type'][i] == 'GasGrid': + new_config[all_components['name'][i] + '_emission'] = value + else: + new_config[name] = value + all_components.to_csv(os.path.join(dirpath, "temp.csv"), index = False) + df_str = pd.read_csv(os.path.join(dirpath, "temp.csv"), dtype = str, keep_default_na = False) + for i in all_components.columns: + counter = 0 + for j in all_components.index: + if issubclass(type(all_components[i][j]), float): + if len(df_str[i][counter]) != 0 and df_str[i][counter].endswith(".0"): + df_str[i][counter] = f"{all_components[i][j]:.0f}" + counter += 1 + df_str.to_csv(os.path.join(dirpath, "components.csv"), index = False) + os.remove(os.path.join(dirpath, "temp.csv")) + all_connections.to_csv(os.path.join(dirpath, "connections.csv"), index = False) + for matrix_file, sector in matrix_files: + os.remove(os.path.join(dirpath, matrix_file)) + os.remove(os.path.join(dirpath, "config.csv")) + new_config_df = pd.DataFrame(columns = list(new_config.keys()), index = [0]) + for key, value in new_config.items(): + string = str(value) + if issubclass(type(value), float): + if len(string) != 0 and string.endswith(".0"): + string = f"{value:.0f}" + new_config_df.loc[0, key] = string + new_config_df.to_csv(os.path.join(dirpath, "config.csv"), index = False) + except: + invalid_topologies.append(dirpath) +for directory in changed_topologies: + print(f"Modified topology {directory}!") +for file in invalid_topologies: + print(f"Topology {file} breaks some part of the input file specification!") diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..28ea34b9061bdec4e1f06d4668a57954403666fd --- /dev/null +++ b/input_files/models/district_models/example_CA/components.csv @@ -0,0 +1,5 @@ +name,type,model,min_size,max_size,current_size +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_CA/config.csv b/input_files/models/district_models/example_CA/config.csv index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644 --- a/input_files/models/district_models/example_CA/config.csv +++ b/input_files/models/district_models/example_CA/config.csv @@ -1,2 +1,2 @@ -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 -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 +grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon +0.0793,0.3046,0.401,0.03,20 diff --git a/input_files/models/district_models/example_CA/connections.csv b/input_files/models/district_models/example_CA/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..792c8b1f4fc0c752ba922b7fa195867470bc8ccc --- /dev/null +++ b/input_files/models/district_models/example_CA/connections.csv @@ -0,0 +1,7 @@ +sector,from,to +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 diff --git a/input_files/models/district_models/example_CA/elec_matrix.csv b/input_files/models/district_models/example_CA/elec_matrix.csv deleted file mode 100644 index 2ac712600082b9ce6e4524a08bf81d224af2feab..0000000000000000000000000000000000000000 --- a/input_files/models/district_models/example_CA/elec_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,inv_pv_bat,battery,grd,elec_cns -inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,1,1,1 -battery,LiionBattery,BAT1,0,6,6,1,0,0,0 -grd,StandardACGrid,GRD1,1000,1000,1000,1,0,0,1 -elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0 diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..37d9f6061ca4764e7bcaa126e41fd261232c7987 --- /dev/null +++ b/input_files/models/district_models/example_community/components.csv @@ -0,0 +1,6 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,6,6,6 +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/example_community/config.csv b/input_files/models/district_models/example_community/config.csv index 257dec3a4df29136ccb629c854f34b105c57e8b9..3af15c2884836838c807b7f6f67dd41ad4e14224 100644 --- a/input_files/models/district_models/example_community/config.csv +++ b/input_files/models/district_models/example_community/config.csv @@ -1,2 +1,2 @@ -injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,network_usage_capacity_fee,network_usage_energy_fee,heat_price,levies_int,levies_ext,concession,electricity_tax_int,electricity_tax_ext,VAT,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 -0.0793,0,0.7,0.0606,0,0.3046,0,14.79,0.0506,0,0.0276,0.0496,0.0199,0,0.0205,0.190,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20 +grd_injection_price,grd_price,network_usage_capacity_fee,network_usage_energy_fee,levies_int,levies_ext,concession,electricity_tax_int,electricity_tax_ext,VAT,grd_emission,yearly_interest,planning_horizon +0.0793,0.3046,14.79,0.0506,0.0276,0.0496,0.0199,0,0.0205,0.19,0.401,0.03,20 diff --git a/input_files/models/district_models/example_community/connections.csv b/input_files/models/district_models/example_community/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..d63037e151876506cae26e672ae1687d659d48d7 --- /dev/null +++ b/input_files/models/district_models/example_community/connections.csv @@ -0,0 +1,8 @@ +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 diff --git a/input_files/models/district_models/example_community/elec_matrix.csv b/input_files/models/district_models/example_community/elec_matrix.csv deleted file mode 100644 index f072d2fea74caf87564656c41c00a5bc1b9b9a79..0000000000000000000000000000000000000000 --- a/input_files/models/district_models/example_community/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0 -inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1 -battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0 -grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1 -elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0 diff --git a/input_files/models/district_models/jbr_test_ca/components.csv b/input_files/models/district_models/jbr_test_ca/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..37d9f6061ca4764e7bcaa126e41fd261232c7987 --- /dev/null +++ b/input_files/models/district_models/jbr_test_ca/components.csv @@ -0,0 +1,6 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,6,6,6 +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/config.csv b/input_files/models/district_models/jbr_test_ca/config.csv index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644 --- a/input_files/models/district_models/jbr_test_ca/config.csv +++ b/input_files/models/district_models/jbr_test_ca/config.csv @@ -1,2 +1,2 @@ -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 -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 +grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon +0.0793,0.3046,0.401,0.03,20 diff --git a/input_files/models/district_models/jbr_test_ca/connections.csv b/input_files/models/district_models/jbr_test_ca/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..d63037e151876506cae26e672ae1687d659d48d7 --- /dev/null +++ b/input_files/models/district_models/jbr_test_ca/connections.csv @@ -0,0 +1,8 @@ +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 diff --git a/input_files/models/district_models/jbr_test_ca/elec_matrix.csv b/input_files/models/district_models/jbr_test_ca/elec_matrix.csv deleted file mode 100644 index f072d2fea74caf87564656c41c00a5bc1b9b9a79..0000000000000000000000000000000000000000 --- a/input_files/models/district_models/jbr_test_ca/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0 -inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1 -battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0 -grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1 -elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0 diff --git a/input_files/models/district_models/jbr_test_comm/components.csv b/input_files/models/district_models/jbr_test_comm/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..37d9f6061ca4764e7bcaa126e41fd261232c7987 --- /dev/null +++ b/input_files/models/district_models/jbr_test_comm/components.csv @@ -0,0 +1,6 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,6,6,6 +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/config.csv b/input_files/models/district_models/jbr_test_comm/config.csv index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644 --- a/input_files/models/district_models/jbr_test_comm/config.csv +++ b/input_files/models/district_models/jbr_test_comm/config.csv @@ -1,2 +1,2 @@ -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 -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 +grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon +0.0793,0.3046,0.401,0.03,20 diff --git a/input_files/models/district_models/jbr_test_comm/connections.csv b/input_files/models/district_models/jbr_test_comm/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..d63037e151876506cae26e672ae1687d659d48d7 --- /dev/null +++ b/input_files/models/district_models/jbr_test_comm/connections.csv @@ -0,0 +1,8 @@ +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 diff --git a/input_files/models/district_models/jbr_test_comm/elec_matrix.csv b/input_files/models/district_models/jbr_test_comm/elec_matrix.csv deleted file mode 100644 index f072d2fea74caf87564656c41c00a5bc1b9b9a79..0000000000000000000000000000000000000000 --- a/input_files/models/district_models/jbr_test_comm/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0 -inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1 -battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0 -grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1 -elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..2b280bcb25a46edf786631dc5ad0d0f27a1ed221 --- /dev/null +++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv @@ -0,0 +1,8 @@ +name,type,model,min_size,max_size,current_size +grd,ElectricalGrid,GRD1,100000,100000,0 +elec_cns,ElectricalConsumption,,,, +gas_boi,GasBoiler,BOI1,10,10,0 +gas_grd,GasGrid,GAS1,100000,100000,0 +therm_cns,HeatConsumption,,,, +dhw_dmd,HotWaterConsumption,,,, +water_tes,HotWaterStorage,TES1,40,40,0 diff --git a/input_files/models/prosumer_models/SCN0_CAT1/config.csv b/input_files/models/prosumer_models/SCN0_CAT1/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN0_CAT1/config.csv +++ b/input_files/models/prosumer_models/SCN0_CAT1/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..f911b10874d9f6ebe55ee5525ffe45638bdc258a --- /dev/null +++ b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv @@ -0,0 +1,8 @@ +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 diff --git a/input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv b/input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv deleted file mode 100644 index c396e2e2805bdb3a37a439e430d41a4f963b0781..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN0_CAT1/elec_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv b/input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv deleted file mode 100644 index 66b2202ca865704fb3d1b5878206bc0d46b92868..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN0_CAT1/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv b/input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv deleted file mode 100644 index 7126041844dd308f44cee57628b1b88e152145c9..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN0_CAT1/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..89ba5854d920853fd65b5dedcefc8ceaa68bb96e --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv @@ -0,0 +1,10 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..07be821df10b12425e1874ef03d8cd624fd2f00a --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv @@ -0,0 +1,11 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv deleted file mode 100644 index efb04d08476a896632bd455316cda43550c53926..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/elec_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..3bc6ffd4d5e474a3cd06e5666ee77c3178d585df --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv @@ -0,0 +1,12 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..907c9e7e18816817dd11611659105994e0026cc7 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv @@ -0,0 +1,17 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv deleted file mode 100644 index 36cadbec855dae9c01482d6fb1ac48ff66ae0f84..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/elec_matrix.csv +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..adc049d34ca2c07024af58442933121308f35ce8 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv @@ -0,0 +1,13 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..c82fe1d4ec799d877bb423124caebc1e8dd84053 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv @@ -0,0 +1,22 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv deleted file mode 100644 index 84e2567a8602082070bf85ae2e62e6b38de20cc9..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/elec_matrix.csv +++ /dev/null @@ -1,8 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat -pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0,0 -inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1,1 -battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,0 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0 -inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 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 new file mode 100644 index 0000000000000000000000000000000000000000..9029b25baae027b0647d832fcbd6b366bc223adf --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv @@ -0,0 +1,11 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,,,, +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..4048376f0e1f750128105af3c99da1f68d5c6591 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv @@ -0,0 +1,16 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv deleted file mode 100644 index 793f401113266d7933bf1f20f249ea16eaae76eb..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0 -inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..9583700cc096e077fbe82b9713e3624a46118ad6 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv @@ -0,0 +1,10 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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 +gas_grd,GasGrid,GAS1,10000,10000,0 +therm_cns,HeatConsumption,,,, +dhw_dmd,HotWaterConsumption,,,, +water_tes,HotWaterStorage,TES1,40,40,0 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..07be821df10b12425e1874ef03d8cd624fd2f00a --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv @@ -0,0 +1,11 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv deleted file mode 100644 index a860982ecfcbf8ce7b7abd1f263bd934a762f795..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/elec_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0 -inv_pv,BasicInverter,INVPV,30,30,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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..2af6381b45c68135d301b15526c69eed1bb21463 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv @@ -0,0 +1,12 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..aedf9635c2d6cb19efa6ffae675a58c55a5a7c48 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv @@ -0,0 +1,16 @@ +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,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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv deleted file mode 100644 index 635295d45d00841f3b3194c1b2b7a024004e7417..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/elec_matrix.csv +++ /dev/null @@ -1,7 +0,0 @@ -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,30,30,0,0,1,0,0,0,0 -inv_pv,BasicInverter,INVPV,30,30,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,0 -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..445b0bafbb208ee238800315db8d2b1bbad28c3d --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv @@ -0,0 +1,13 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..c82fe1d4ec799d877bb423124caebc1e8dd84053 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv @@ -0,0 +1,22 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv deleted file mode 100644 index 4e7f785c6275235e6a01954ff7886bfb7acd1ece..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/elec_matrix.csv +++ /dev/null @@ -1,8 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat -pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0,0,0 -inv_pv,BasicInverter,INVPV,30,30,0,0,0,0,1,1,1,1 -battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,0 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0 -inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 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 new file mode 100644 index 0000000000000000000000000000000000000000..cb554db40cc7d0b7e8daa228b2cb82b9e6367876 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv @@ -0,0 +1,11 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,,,, +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..4048376f0e1f750128105af3c99da1f68d5c6591 --- /dev/null +++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv @@ -0,0 +1,16 @@ +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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv deleted file mode 100644 index 1badd2fc33131478f97c395ac67adaef5f44d8bb..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0 -inv_pv,BasicInverter,INVPV,30,30,0,0,0,1,1,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..652da783013e0aa307cdfb1c6792f1f8a00a5518 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv @@ -0,0 +1,8 @@ +name,type,model,min_size,max_size,current_size +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1/config.csv b/input_files/models/prosumer_models/SCN3_CAT1/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..f911b10874d9f6ebe55ee5525ffe45638bdc258a --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv @@ -0,0 +1,8 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv deleted file mode 100644 index c5409f5c5043a13b40e2ca912579837e6e7f988f..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1/elec_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,grd,elec_cns -grd,StandardACGrid,GRD1,10000,10000,0,0,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..89ba5854d920853fd65b5dedcefc8ceaa68bb96e --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv @@ -0,0 +1,10 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..07be821df10b12425e1874ef03d8cd624fd2f00a --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv @@ -0,0 +1,11 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv deleted file mode 100644 index efb04d08476a896632bd455316cda43550c53926..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/elec_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..3bc6ffd4d5e474a3cd06e5666ee77c3178d585df --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv @@ -0,0 +1,12 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..907c9e7e18816817dd11611659105994e0026cc7 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv @@ -0,0 +1,17 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv deleted file mode 100644 index 36cadbec855dae9c01482d6fb1ac48ff66ae0f84..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/elec_matrix.csv +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..adc049d34ca2c07024af58442933121308f35ce8 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv @@ -0,0 +1,13 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..14d304ec74d8ef0f33505e4fef9eafbc0d93b405 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv @@ -0,0 +1,23 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv deleted file mode 100644 index 7a62ea7c9c55b23281c458e64599733dbbf9c060..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/elec_matrix.csv +++ /dev/null @@ -1,8 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat -pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0,0,0 -inv_pv,BasicInverter,INVPV,10,10,0,0,0,0,1,1,1,1 -battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0 -inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 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 new file mode 100644 index 0000000000000000000000000000000000000000..9029b25baae027b0647d832fcbd6b366bc223adf --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv @@ -0,0 +1,11 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,,,, +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..4048376f0e1f750128105af3c99da1f68d5c6591 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv @@ -0,0 +1,16 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv deleted file mode 100644 index 793f401113266d7933bf1f20f249ea16eaae76eb..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,10,10,0,0,1,0,0,0 -inv_pv,BasicInverter,INVPV,10,10,0,0,0,1,1,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..9583700cc096e077fbe82b9713e3624a46118ad6 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv @@ -0,0 +1,10 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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 +gas_grd,GasGrid,GAS1,10000,10000,0 +therm_cns,HeatConsumption,,,, +dhw_dmd,HotWaterConsumption,,,, +water_tes,HotWaterStorage,TES1,40,40,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..07be821df10b12425e1874ef03d8cd624fd2f00a --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv @@ -0,0 +1,11 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv deleted file mode 100644 index a860982ecfcbf8ce7b7abd1f263bd934a762f795..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/elec_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0 -inv_pv,BasicInverter,INVPV,30,30,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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..2af6381b45c68135d301b15526c69eed1bb21463 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv @@ -0,0 +1,12 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..907c9e7e18816817dd11611659105994e0026cc7 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv @@ -0,0 +1,17 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv deleted file mode 100644 index 875add35ff453429b9db08ed5b2247d59aa6681a..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/elec_matrix.csv +++ /dev/null @@ -1,7 +0,0 @@ -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,30,30,0,0,1,0,0,0,0 -inv_pv,BasicInverter,INVPV,30,30,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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv deleted file mode 100644 index 7f469290c513084b129bc19e4949cbfc904091f5..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -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 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 new file mode 100644 index 0000000000000000000000000000000000000000..445b0bafbb208ee238800315db8d2b1bbad28c3d --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv @@ -0,0 +1,13 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..14d304ec74d8ef0f33505e4fef9eafbc0d93b405 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv @@ -0,0 +1,23 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv deleted file mode 100644 index 05392accd4eff7d061af5f5fa903ec318b3f4b88..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/elec_matrix.csv +++ /dev/null @@ -1,8 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,battery,heat_pump,grd,elec_cns,inv_bat -pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0,0,0 -inv_pv,BasicInverter,INVPV,30,30,0,0,0,0,1,1,1,1 -battery,LiionBattery,BAT1,10,10,0,0,0,0,0,0,0,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,0,1,0,1,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0,0,0 -inv_bat,BasicInverter,INVBAT,10,10,0,0,0,1,1,1,1,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 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 new file mode 100644 index 0000000000000000000000000000000000000000..cb554db40cc7d0b7e8daa228b2cb82b9e6367876 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv @@ -0,0 +1,11 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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,,,, +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv @@ -1,2 +1,2 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..4048376f0e1f750128105af3c99da1f68d5c6591 --- /dev/null +++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv @@ -0,0 +1,16 @@ +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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv deleted file mode 100644 index 1badd2fc33131478f97c395ac67adaef5f44d8bb..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv,heat_pump,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0,0 -inv_pv,BasicInverter,INVPV,30,30,0,0,0,1,1,1 -heat_pump,HeatPump,EHP1,10,10,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,10000,10000,0,0,0,1,0,1 -elec_cns,StandardElectricalConsumption,CNS1,10000,10000,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv deleted file mode 100644 index 667ee9e0e31bb4e5ce69169a054f27202adc768e..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv deleted file mode 100644 index d9e02fac5073df08955777b37776ab97affe0472..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/therm_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes,gas_boi -heat_pump,HeatPump,EHP1,,,,0,0,0,1,0 -therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,40,40,0,0,1,1,0,0 -gas_boi,GasBoiler,BOI1,10,10,0,0,0,0,1,0 diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..37d9f6061ca4764e7bcaa126e41fd261232c7987 --- /dev/null +++ b/input_files/models/prosumer_models/jbr_test/components.csv @@ -0,0 +1,6 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,6,6,6 +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/jbr_test/config.csv b/input_files/models/prosumer_models/jbr_test/config.csv index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644 --- a/input_files/models/prosumer_models/jbr_test/config.csv +++ b/input_files/models/prosumer_models/jbr_test/config.csv @@ -1,2 +1,2 @@ -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 -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 +grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon +0.0793,0.3046,0.401,0.03,20 diff --git a/input_files/models/prosumer_models/jbr_test/connections.csv b/input_files/models/prosumer_models/jbr_test/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..d63037e151876506cae26e672ae1687d659d48d7 --- /dev/null +++ b/input_files/models/prosumer_models/jbr_test/connections.csv @@ -0,0 +1,8 @@ +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 diff --git a/input_files/models/prosumer_models/jbr_test/elec_matrix.csv b/input_files/models/prosumer_models/jbr_test/elec_matrix.csv deleted file mode 100644 index f072d2fea74caf87564656c41c00a5bc1b9b9a79..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/jbr_test/elec_matrix.csv +++ /dev/null @@ -1,6 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,6,6,6,0,1,0,0,0 -inv_pv_bat,Inverter,STP-7000TL-20,0,20,0,0,0,1,1,1 -battery,LiionBattery,BAT1,6,6,6,0,1,0,0,0 -grd,StandardACGrid,GRD1,1000,1000,1000,0,1,0,0,1 -elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..5b1f7270a6e56f01e3e92f2bbf9879758f735960 --- /dev/null +++ b/input_files/models/prosumer_models/mfh_quartal/components.csv @@ -0,0 +1,18 @@ +name,type,model,min_size,max_size,current_size +grd,ElectricalGrid,GRD1,1000,1000,0 +pv,PVGenerator,PV2,0,30,0 +bat,LiionBattery,BAT1,1,1,0 +chp,CHP,CHP1,0,50,0 +ecns1,ElectricalConsumption,,,, +ecns2,ElectricalConsumption,,,, +ecns3,ElectricalConsumption,,,, +ecns4,ElectricalConsumption,,,, +ecns5,ElectricalConsumption,,,, +ecns6,ElectricalConsumption,,,, +gas_grd,GasGrid,GAS1,1000,1000,0 +tcns1,HeatConsumption,,,, +tcns2,HeatConsumption,,,, +tcns3,HeatConsumption,,,, +tcns4,HeatConsumption,,,, +tcns5,HeatConsumption,,,, +tcns6,HeatConsumption,,,, diff --git a/input_files/models/prosumer_models/mfh_quartal/config.csv b/input_files/models/prosumer_models/mfh_quartal/config.csv index 74c671d2352ed572bd3ff3c36a1d6d469e6967bd..798a9d64cea586cdbbb0bd8801dd24113721bbff 100644 --- a/input_files/models/prosumer_models/mfh_quartal/config.csv +++ b/input_files/models/prosumer_models/mfh_quartal/config.csv @@ -1,2 +1,2 @@ -injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price_low,elec_price_high,elec_price_cap_low,elec_price_cap_high,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 -0.0793,0,0.7,0.0606,0,0.3046,0.25,50,60,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20 +grd_injection_price,gas_grd_price,elec_price_low,elec_price_high,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon +0.0793,0.0606,0.3046,0.25,0,0.401,0.21,0.03,20 diff --git a/input_files/models/prosumer_models/mfh_quartal/connections.csv b/input_files/models/prosumer_models/mfh_quartal/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..24fbbcbe2b387b1c2e48527a1eed199904fcc49b --- /dev/null +++ b/input_files/models/prosumer_models/mfh_quartal/connections.csv @@ -0,0 +1,35 @@ +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 diff --git a/input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv b/input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv deleted file mode 100644 index 5d84ee4384bb28d6c1b321c0fea05e6a026865ad..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/mfh_quartal/elec_matrix.csv +++ /dev/null @@ -1,11 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,grd,pv,bat,chp,ecns1,ecns2,ecns3,ecns4,ecns5,ecns6 -grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,0,1,1,1,1,1,1 -pv,StandardPVGenerator,PV2,0,30,0,1,0,1,0,1,1,1,1,1,1 -bat,LiionBattery,BAT1,1,1,0,0,0,0,0,1,1,1,1,1,1 -chp,CHP,CHP1,0,50,0,1,0,0,0,1,1,1,1,1,1 -ecns1,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0 -ecns2,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0 -ecns3,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0 -ecns4,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0 -ecns5,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0 -ecns6,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv b/input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv deleted file mode 100644 index 2921720ae575c737d0f205a9f72da183127cff5d..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/mfh_quartal/gas_matrix.csv +++ /dev/null @@ -1,3 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,chp,gas_grd -chp,CHP,CHP1,0,50,0,0,0 -gas_grd,StandardGasGrid,GAS1,1000,1000,0,1,0 diff --git a/input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv b/input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv deleted file mode 100644 index 6d564a0d50ee18c857ea9c3b43f726eb6eb23dee..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/mfh_quartal/therm_matrix.csv +++ /dev/null @@ -1,8 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,chp,tcns1,tcns2,tcns3,tcns4,tcns5,tcns6 -chp,CHP,CHP1,0,50,0,0,1,1,1,1,1,1 -tcns1,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0 -tcns2,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0 -tcns3,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0 -tcns4,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0 -tcns5,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0 -tcns6,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0,0,0,0 \ No newline at end of file diff --git a/input_files/models/prosumer_models/office_pv_heatpump/components.csv b/input_files/models/prosumer_models/office_pv_heatpump/components.csv new file mode 100644 index 0000000000000000000000000000000000000000..56d0504c8089561606e81f7403d429ab8b31fad8 --- /dev/null +++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv @@ -0,0 +1,10 @@ +name,type,model,min_size,max_size,current_size +pv_roof,PVGenerator,PV2,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 +elec_cns,ElectricalConsumption,,,, +therm_cns,HeatConsumption,,,, +dhw_dmd,HotWaterConsumption,,,, +water_tes,HotWaterStorage,TES1,10,93,0 diff --git a/input_files/models/prosumer_models/office_pv_heatpump/config.csv b/input_files/models/prosumer_models/office_pv_heatpump/config.csv index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..afcf4142ab022e22c5621e2e16650419e717bbaf 100644 --- a/input_files/models/prosumer_models/office_pv_heatpump/config.csv +++ b/input_files/models/prosumer_models/office_pv_heatpump/config.csv @@ -1,2 +1,2 @@ -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,grd_price,grd_emission,yearly_interest,planning_horizon +0.0793,0.3046,0.401,0.03,20 diff --git a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv new file mode 100644 index 0000000000000000000000000000000000000000..2648881f72c712482bc13125ef1170dbd0a38ee6 --- /dev/null +++ b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv @@ -0,0 +1,15 @@ +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 diff --git a/input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv b/input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv deleted file mode 100644 index 51d563713936974eda2a41a665fe4485c81d93a9..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/office_pv_heatpump/elec_matrix.csv +++ /dev/null @@ -1,7 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,battery,heat_pump,grd,elec_cns -pv_roof,StandardPVGenerator,PV2,0,30,0,0,1,0,0,0,0 -inv_pv_bat,Inverter,STP-7000TL-20,0,30,0,0,0,1,1,1,1 -battery,LiionBattery,BAT1,0,1000,0,0,1,0,0,0,0 -heat_pump,HeatPump,EHP1,2,50,0,0,0,0,0,0,0 -grd,StandardACGrid,GRD1,1000,1000,0,0,1,0,1,0,1 -elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0,0,0,0 diff --git a/input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv b/input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv deleted file mode 100644 index 3f54f72d2981ba422a521c1bdb61070f66b6d997..0000000000000000000000000000000000000000 --- a/input_files/models/prosumer_models/office_pv_heatpump/therm_matrix.csv +++ /dev/null @@ -1,5 +0,0 @@ -comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,dhw_dmd,water_tes -heat_pump,HeatPump,EHP1,,,,0,0,0,1 -therm_cns,HeatConsumption,HeatCNS1,1000,1000,0,0,0,0,0 -dhw_dmd,HotWaterConsumption,HWCNS1,1000,1000,0,0,0,0,0 -water_tes,HotWaterStorage,TES1,10,93,0,0,1,1,0 diff --git a/runme.py b/runme.py index 04829748986e6671ba8b1be2398d4978676aa69d..a5b7fbeb2c150f0c7524fca0c154cc1c06c5faf4 100644 --- a/runme.py +++ b/runme.py @@ -1,274 +1,78 @@ -""" -The FEN-Tool is an optimization tool for prosumer, district, and interconnected city models. - -Copyright (C) 2022. Mauricio Celi Cortés, Jingyu Gong, Jonas van Ouwerkerk, Felix Wege, Yi Nie, Jonas Brucksch - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public License -as published by the Free Software Foundation; either version 3 of -the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Project host: RWTH Aachen University, Aachen, Germany -Project Website: https://www.fenaachen.net/projekte/fen-ineed-dc -""" - -import time import pandas as pd -import argparse -from tqdm import tqdm +import Tooling.input_profile_processor.input_profile_processor import Model_Library.Prosumer.main as main -from multiprocessing import Pool -import os -from functools import partial -from Model_Library.Prosumer.scripts.results_evaluation.results_evaluation import \ - Plot_savings - - -# from Tooling.results_evaluation.results_evaluation import Plot_savings - -def process_each_prosumer(prosumer_name, prosumer_dict, data_source, commentary, - no_process_bar_rh): - """ - The method XYZ adds ... - :param - XYZ: - :returns - XYZ - """ - try: - # PLEASE CHANGE HERE - # Set the simulation time frame and optional rolling horizon configurations: - # 't_start': start date of simulations, Unit: JJJJ-MM-DD hh:mm:ss - # 't_end': end date of simulations, Unit: JJJJ-MM-DD hh:mm:ss - # 't_step': granularity of optimization model, Unit: hours - # Rolling horizon (RH) can be set by: - # 't_rh_horizon': width of rolling horizon intervals, Unit: hours, MINIMUM VALUE: 2 !!! - # 't_rh_shift': rolling horizon shift between intervals, Unit: hours - # 't_current_value_length': number of values at beginning of rolling horizon interval that are replaced by real values, Unit: hours - # 't_history': number of days before actual simulation interval for the demand generator to be able to make required predictions - if prosumer_dict[prosumer_name]['rolling_horizon']: - t_start = pd.Timestamp("2019-09-01 00:00:00") - t_end = pd.Timestamp("2019-09-01 5:00:00") - t_step = 1 - t_rh_horizon = 3 - t_rh_shift = 1 - t_current_value_length = 2 - t_history = 14 # days - - # PLEASE CHANGE HERE - # Prediction settings - predictions = {'demand_electric': 'DayBefore', - 'demand_heat': 'DayBefore', - 'day_ahead_price': 'DayBefore', - 'intraday_price': 'DayBefore', - 'solar_radiation': 'ActualData', - # currently the method generate_g_t_series takes the same t_start as the prediction -> no historical - # data for the prediction available: easy fix would be to set a minus time delta in the t_start - # argument of generate_g_t_series - 'temperature': 'DayBefore'} - else: - t_start = pd.Timestamp("2019-07-01 00:00:00") - t_end = pd.Timestamp("2019-7-10 23:00:00") + pd.Timedelta(hours=1) - t_step = 1 - t_rh_horizon = (t_end - t_start) / pd.Timedelta(hours=1) - t_rh_shift = t_rh_horizon - 1 - t_current_value_length = t_rh_horizon - t_history = 0 # days - - # PLEASE CHANGE HERE - # Prediction settings - predictions = {'demand_electric': 'ActualData', - 'demand_heat': 'ActualData', - 'day_ahead_price': 'ActualData', - 'intraday_price': 'ActualData', - 'solar_radiation': 'ActualData', - # currently the method generate_g_t_series takes the same t_start as the prediction -> no historical - # data for the prediction available: easy fix would be to set a minus time delta in the t_start - # argument of generate_g_t_series - 'temperature': 'ActualData'} - - # Fixed variables - DO NOT CHANGE - storage_states = {} - interim_results = {} - final_iteration = False - - # Set aggregation options - parser = argparse.ArgumentParser( - description='Start optimization from DB or local data') - parser.add_argument('-a', '--aggregate', action="store_true", - dest="aggregate", - help="activating aggregation of input time series", - default=False) - options = parser.parse_args() - - # Calculate number of rolling horizon intervals and loop through them - for t in tqdm(pd.date_range(t_start, - t_end - pd.Timedelta(hours=t_rh_shift + 1), - freq=str(t_rh_shift) + 'H'), - disable=no_process_bar_rh): - # ToDo: replace first value with perfect value (can be done in runme) - # set end date for current loop - t_end_loop = t + pd.Timedelta(hours=t_rh_horizon) - - # exceptions that occur at global end of simulation horizon - if t_end_loop > t_end: - t_end_loop = t_end - if t_current_value_length > (t_end_loop - t) / pd.Timedelta( - hours=1): - t_current_value_length = (t_end_loop - t) / pd.Timedelta( - hours=1) - - # Set flag for final iteration - if t == t_end - pd.Timedelta(hours=t_rh_shift + 1): - final_iteration = True - - # Start main programme - prosumer = main.Main(data_source, - {prosumer_name: prosumer_dict[prosumer_name]}, - t, t_end_loop, t_step, - predictions, t_current_value_length, t_end, - t_history, commentary, storage_states, - t_rh_shift, aggregation=options.aggregate) - - # Run optimization - prosumer.run_optimization(prosumer.prosumer_name_list) - - # Show results - Results are only plotted after last iteration of rolling horizon - prosumer.show_results(prosumer.prosumer_name_list, interim_results, - final_iteration) - - # Get storage states from this iteration - storage_states = prosumer.charge_status - - # Get interim results of current rolling horizon interval - interim_results = prosumer.interim_results - except ValueError: - print(prosumer_name + " could not be optimized!") - - -# # MAIN PROGRAM ------------------------------------------------------------------------------------------------------- -if __name__ == "__main__": - """ - The method XYZ adds ... - :param - XYZ: - :returns - XYZ - """ - # Initialization scenario path and global variables for the prosumer optimization - # Start timer - start = time.time() - - # PLEASE CHANGE HERE - # Path to local data - this is only used when selecting local mode - # 'topology_path': path to matrices that define the prosumer topology - # 'config_path': path to global configurations like prices, injection prices, emission costs, etc. - # topology_path = 'input_files/scenarios/Study_Base' - # config_path = topology_path + '/config.csv' - # data_path = topology_path + '/data_path.csv' - # prosumer_name = 'office' - # prosumer_dict = {prosumer_name: {'topology_path': topology_path, 'config_path': config_path, 'data_path': data_path}} - # topology_path = ['input_files/models/SCN0_CAT1'] - # prosumer_name = ['SCN0_CAT1'] - # rolling_horizon = [False] - # elec_demand = [1500, 10000] - # therm_demand = [5000, 20000] - # hot_water_demand = 1500 # [1500, 1500] - # step_elec_demand = 500 - # step_therm_demand = 500 - # step_hot_water_demand = 0 - # prosumer_dict = {} - """ for i in range(len(prosumer_name)): - for j in range(elec_demand[0], elec_demand[1], step_elec_demand): - for k in range(therm_demand[0], therm_demand[1], step_therm_demand): - #for l in range(hot_water_demand[0], hot_water_demand[1], step_hot_water_demand): - prosumer_dict[prosumer_name[i]+'_'+str(j)+'_'+str(k)] = {'elec_demand': j, - 'therm_demand': k, - 'hot_water_demand': hot_water_demand, - 'topology_path': topology_path[i], - 'config_path': topology_path[i] + '/config.csv', - 'data_path': topology_path[i] + '/data_path.csv', - 'rolling_horizon': rolling_horizon[i]}""" - - prosumer_dict = { - # 'SCN0_CAT1_2000_6000': {'elec_demand': 2000, 'therm_demand': 6000, 'hot_water_demand': 1500, 'topology_path': 'input_files/models/SCN0_CAT1', 'config_path': 'input_files/models/SCN0_CAT1/config.csv', 'data_path': 'input_files/models/SCN0_CAT1/data_path.csv', 'rolling_horizon': False}, - # 'SCN3_CAT1_3000_6000': {'elec_demand': 3000, 'therm_demand': 6000, 'hot_water_demand': 1500, 'topology_path': 'input_files/models/SCN3_CAT1', 'config_path': 'input_files/models/SCN3_CAT1/config.csv', 'data_path': 'input_files/models/SCN3_CAT1/data_path.csv', 'rolling_horizon': False}, - # 'SCN1_CAT1_3000_6000': {'elec_demand': 3000, 'therm_demand': 6000, 'hot_water_demand': 1500, 'topology_path': 'input_files/models/SCN1_CAT1', 'config_path': 'input_files/models/SCN1_CAT1/config.csv', 'data_path': 'input_files/models/SCN1_CAT1/data_path.csv', 'rolling_horizon': False}, - # 'SCN2_CAT1_PV14_HP_3000_6000': {'elec_demand': 3000, 'therm_demand': 6000, - # 'hot_water_demand': 1500, - # 'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV14_HP', - # 'config_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv', - # 'data_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/data_path.csv', - # 'rolling_horizon': False} - 'office_pv_heatpump': {'elec_demand': 32905, - 'therm_demand': 115154, - 'hot_water_demand': 11882, - 'topology_path': 'input_files/models/prosumer_models/office_pv_heatpump', - 'config_path': 'input_files/models/prosumer_models/office_pv_heatpump/config.csv', - 'data_path': 'input_files/models/prosumer_models/office_pv_heatpump/data_path.csv', - 'rolling_horizon': False} - # 'SCN2_CAT1_PV12_BA_3000_6000': {'elec_demand': 9000, 'therm_demand': 20000, 'hot_water_demand': 1500, 'topology_path': 'input_files/models/SCN2_CAT1_PV12_BA', 'config_path': 'input_files/models/SCN2_CAT1_PV12_BA/config.csv', 'data_path': 'input_files/models/SCN3_CAT1_PV12_BA/data_path.csv', 'rolling_horizon': True}} - - } - # PLEASE CHANGE HERE - # Select data source - # Options: '1': import from database, '2': import from local folder - data_source = 2 - reference_results = {} - commentary = True - no_process_bar_rh = True - parallel_processing = False - - # Timer output - tic = time.time() - # Start program - # Run multiple independent prosumers in parallel on multiple cores - if parallel_processing: - count_processes = len(prosumer_dict.keys()) - pool = Pool(os.cpu_count()) - parallel_func = partial(process_each_prosumer, - prosumer_dict=prosumer_dict, - data_source=data_source, - commentary=commentary, - no_process_bar_rh=no_process_bar_rh) - mapped_values = list( - tqdm(pool.map(parallel_func, list(prosumer_dict.keys())), - total=count_processes)) - # Normal processing, one core only - else: - for prosumer_name in list(prosumer_dict.keys()): - process_each_prosumer(prosumer_name=prosumer_name, - prosumer_dict=prosumer_dict, - data_source=data_source, - commentary=commentary, - no_process_bar_rh=no_process_bar_rh) - - # Timer output - toc = time.time() - - # if reference_results: - # for topology in prosumer_name: - # Plot_savings(reference_results, topology) - - # Timer output - end = time.time() - # Additional console output - if commentary: - print("============ Execution Times =============") - print("Pre-processing [s]: \t" + str(tic - start)) - # print("(Interaction with database [s]:\t" + str(prosumer.connect_with_db) + ")") - print("Optimization [s]: \t" + str(toc - tic)) - print("Post-processing [s]: \t" + str(end - toc)) - print("----------------------------------------") - print("Total [s]: \t" + str((end - toc) + (toc - tic) + (tic - start))) - print("==========================================") +import Model_Library.District.main_district as main_district +from enum import Enum + +class SimulationScope(Enum): + PROSUMER = 1 + COMMUNITY = 2 + +simulation_scope = SimulationScope.COMMUNITY +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 + +input_profile_dict = {'irradiance_1': ['irradiance', 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'], + 'temperature_1': ['air_temperature', 'input_files/data/temperature/temperature.csv'], + 'demand_electric_1': ['elec_demand', 'generate', 3000], + 'demand_heat_1': ['therm_demand', 'generate', 6000, 'temperature_1'], + 'demand_hot_water_1': ['hot_water_demand', 'generate', 1500, 'temperature_1'], + 'irradiance_2': ['irradiance', 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'], + 'temperature_2': ['air_temperature', 'input_files/data/temperature/temperature.csv'], + 'demand_electric_2': ['elec_demand', 'generate', 3000], + 'demand_heat_2': ['therm_demand', 'generate', 6000, 'temperature_2'], + 'demand_hot_water_2': ['hot_water_demand', 'generate', 1500, 'temperature_2'], + 'irradiance_3': ['irradiance', 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'], + 'temperature_3': ['air_temperature', 'input_files/data/temperature/temperature.csv'], + 'demand_electric_3': ['elec_demand', 'generate', 0], + 'demand_heat_3': ['therm_demand', 'generate', 0, 'temperature_3'], + 'demand_hot_water_3': ['hot_water_demand', 'generate', 0, 'temperature_3'], + 'elec_price_1': ['elec_price', 'input_files/data/prices/day-ahead/hourly_price.csv']} + +input_profiles = Tooling.input_profile_processor.input_profile_processor.process_input_profiles(input_profile_dict, t_start, t_horizon, t_step) + +# 'config_path': path to global configurations like prices, injection prices, emission costs, etc. +# 'topology_path': path to directory that contains the matrices that define the prosumer topology +prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'config_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv', + 'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11', + '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': {'config_path': 'input_files/models/prosumer_models/SCN0_CAT1/config.csv', + 'topology_path': 'input_files/models/prosumer_models/SCN0_CAT1', + 'profiles': {'elec_cns': 'demand_electric_2', + 'therm_cns': 'demand_heat_2', + 'dhw_dmd': 'demand_hot_water_2'}}} + +prosumer_main = main.Main(prosumer_dict, input_profiles, t_horizon, t_step) + +prosumer_sizing_strategy = 'annuity' +prosumer_main.optimize_sizing(prosumer_sizing_strategy) + +prosumer_main.save_results() + +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', + 'topology_path': 'input_files/models/district_models/example_CA', + 'profiles': {'elec_cns_ca_bat': 'demand_electric_3'}}} + +community_assets = main.Main_CA(community_assets_dict, input_profiles, t_horizon, t_step).community_assets + +community_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) + +community_sizing_strategy = 'max_operational_profit' +community_main.optimize_sizing(community_sizing_strategy) + +community_operation_strategy = 'max_operational_profit' +community_main.optimize_operation(t_horizon, community_operation_strategy) + +community_main.save_results() diff --git a/runme_community.py b/runme_community.py deleted file mode 100644 index f6ca2cc0a25ae0c1642b039ccc89664cc8a3ffd7..0000000000000000000000000000000000000000 --- a/runme_community.py +++ /dev/null @@ -1,74 +0,0 @@ -import time -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 -from functools import partial -from multiprocessing import Pool -from tqdm import tqdm -import os - -def process_each_prosumer(prosumer_name, prosumer_specification, input_profiles, t_start, t_horizon, t_step, prosumer_strategy): - prosumer = main.Main(prosumer_name, prosumer_specification, input_profiles, t_start, t_horizon, t_step) - - prosumer.run_optimization(prosumer_strategy) - - prosumer.show_results() - - return prosumer.prosumer - -t_start = pd.Timestamp("2019-01-01 00:00:00") # start time of simulation -t_horizon = 365*24 # number of time steps to be simulated -t_step = 0.25 # length of a time step in hours - -input_profile_dict = {'irradiance_1': ['irradiance', 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'], - 'temperature_1': ['air_temperature', 'input_files/data/temperature/temperature.csv'], - 'demand_electric_1': ['elec_demand', 'generate', 3000], - 'demand_heat_1': ['therm_demand', 'generate', 6000, 'temperature_1'], - 'demand_hot_water_1': ['hot_water_demand', 'generate', 1500, 'temperature_1']} - -input_profiles = Tooling.input_profile_processor.input_profile_processor.process_input_profiles(input_profile_dict, t_start, t_horizon, t_step) - -# 'topology_path': path to directory that contains the matrices that define the prosumer topology -# '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'}}} - -prosumer_strategy = ['annuity'] -parallel_processing = False - -# Run multiple independent prosumers in parallel on multiple cores -prosumers = dict.fromkeys(prosumer_dict.keys()) -if parallel_processing: - count_processes = len(prosumer_dict.keys()) - pool = Pool(os.cpu_count()) - parallel_func = partial(process_each_prosumer, input_profiles = input_profiles, t_start = t_start, t_horizon = t_horizon, t_step = t_step, prosumer_strategy = prosumer_strategy) - mapped_values = list(tqdm(pool.map(parallel_func, list(prosumer_dict.keys()), list(prosumer_dict.values())), total = count_processes)) -# Normal processing, one core only -else: - for prosumer_name in list(prosumer_dict.keys()): - prosumers[prosumer_name] = process_each_prosumer(prosumer_name, prosumer_dict[prosumer_name], input_profiles, t_start, t_horizon, t_step, prosumer_strategy) - -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'}}} - -community_assets_strategy = 'sizing_max_operational_profit' - -community_assets = main.Main_CA(community_assets_dict, input_profiles, t_start, t_horizon, t_step) - -community_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv', - 'profiles': {'elec_price': 'elec_price_1'}}} - -community_strategy = ['max_operational_profit'] - -community_main = main_district.MainDistrict(community_dict, prosumers, community_assets, input_profiles, t_start, t_horizon, t_step, community_assets_strategy, community_strategy)