diff --git a/Model_Library b/Model_Library
index dc5c2facdbb74e782cb7b88408551306342ed8f9..ba6678d2f4b50bc525d62221dd99440d03993efe 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit dc5c2facdbb74e782cb7b88408551306342ed8f9
+Subproject commit ba6678d2f4b50bc525d62221dd99440d03993efe
diff --git a/Tooling b/Tooling
index a83e46cf62a9327d5a8e51547feffd788adbea31..f82ba6f7d9f1316a3cd36b8af27c99953803d17d 160000
--- a/Tooling
+++ b/Tooling
@@ -1 +1 @@
-Subproject commit a83e46cf62a9327d5a8e51547feffd788adbea31
+Subproject commit f82ba6f7d9f1316a3cd36b8af27c99953803d17d
diff --git a/input_files/convert_input_files_new_input_format.py b/input_files/convert_input_files_new_input_format.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b48ff4114fd457b2821ed4217ce01ee13611538
--- /dev/null
+++ b/input_files/convert_input_files_new_input_format.py
@@ -0,0 +1,145 @@
+"""
+MIT License
+
+Copyright (c) 2023 RWTH Aachen University
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
+
+"""
+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 !24 New input format.
+"""
+
+import os.path
+import pandas as pd
+import numpy as np
+import json
+
+def parse_component_config(component_name, component_type, config, component_json):
+ possible_keys = dict()
+ if component_type == 'CoolGrid':
+ possible_keys['price'] = component_name + '_price'
+ possible_keys['injection_price'] = component_name + '_injection_price'
+ elif component_type == "ElectricalGrid":
+ possible_keys['price'] = component_name + '_price'
+ possible_keys['injection_price'] = component_name + '_injection_price'
+ possible_keys['emission'] = component_name + '_emission'
+ possible_keys['peak_power_cost'] = component_name + '_peak_power_costs'
+ elif component_type == "GasGrid":
+ possible_keys['price'] = component_name + '_price'
+ possible_keys['injection_price'] = component_name + '_injection_price'
+ possible_keys['peak_power_cost'] = component_name + '_emission'
+ elif component_type == 'HeatGrid':
+ possible_keys['price'] = component_name + '_price'
+ possible_keys['injection_price'] = component_name + '_injection_price'
+ for key, prefixed_key in possible_keys.items():
+ if prefixed_key in config:
+ component_json[key] = config[prefixed_key]
+ del config[prefixed_key]
+
+def np_encoder(object):
+ if isinstance(object, np.generic):
+ return object.item()
+
+changed_topologies = []
+invalid_topologies = []
+for dirpath, dirnames, filenames in os.walk(".\\input_files"):
+ components_here = False
+ config_here = False
+ connections_here = False
+ for filename in filenames:
+ if filename == "components.csv":
+ components_file = filename
+ components_here = True
+ elif filename == "config.csv":
+ config_file = filename
+ config_here = True
+ elif filename == "connections.csv":
+ connections_file = filename
+ connections_here = True
+
+ if components_here and config_here and connections_here:
+ try:
+ print(f"Inspecting topology {dirpath}")
+ components_df = pd.read_csv(os.path.join(dirpath, components_file))
+ components = {}
+ for i in components_df.index:
+ components[components_df["name"][i]] = components_df.loc[i]
+ config_df = pd.read_csv(os.path.join(dirpath, config_file))
+ config_dict = config_df.to_dict(orient='list')
+ for i in config_dict:
+ config_dict[i] = config_dict[i][0]
+ connections = pd.read_csv(os.path.join(dirpath, connections_file))
+ prosumer_json = dict()
+ components_json = dict()
+ for component in components.values():
+ component_json = dict()
+ for i in component.index:
+ if i == 'name' or i == 'current_size' or isinstance(component[i], np.float) and np.isnan(component[i]):
+ continue
+ component_json[i] = component[i]
+ parse_component_config(component['name'], component['type'], config_dict, component_json)
+ components_json[component['name']] = component_json
+ prosumer_json['components'] = components_json
+ connections_json = []
+ for i in connections.index:
+ connection_json = dict()
+ connection_json['from'] = connections['from'][i]
+ connection_json['output'] = connections['output'][i]
+ connection_json['to'] = connections['to'][i]
+ connection_json['input'] = connections['input'][i]
+ connections_json.append(connection_json)
+ prosumer_json['connections'] = connections_json
+ for key, value in config_dict.items():
+ prosumer_json[key] = value
+ changed_topologies.append(dirpath)
+ os.remove(os.path.join(dirpath, "components.csv"))
+ os.remove(os.path.join(dirpath, "config.csv"))
+ os.remove(os.path.join(dirpath, "connections.csv"))
+ with open(os.path.join(dirpath, "prosumer.json"), "w", encoding ="utf-8") as f:
+ json.dump(prosumer_json, f, indent = 4, default = np_encoder)
+ 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!")
+
+changed_models = []
+invalid_models = []
+for dirpath, dirnames, filenames in os.walk(".\\Model_Library\\Component\\data"):
+ for filename in filenames:
+ if filename.endswith(".csv"):
+ try:
+ print(f"Inspecting model {os.path.join(dirpath, filename)}")
+ model = pd.read_csv(os.path.join(dirpath, filename))
+ model_json = dict()
+ for i in model.columns:
+ no_space_name = "_".join(i.split(" "))
+ model_json[no_space_name] = model[i][0]
+ changed_models.append(os.path.join(dirpath, filename))
+ os.remove(os.path.join(dirpath, filename))
+ with open(os.path.join(dirpath, "".join(filename.split(".")[:-1]) + ".json"), "w", encoding ="utf-8") as f:
+ json.dump(model_json, f, indent = 4, default = np_encoder)
+ except:
+ invalid_models.append(os.path.join(dirpath, filename))
+for directory in changed_models:
+ print(f"Modified model {directory}!")
+for file in invalid_models:
+ print(f"Model {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
deleted file mode 100644
index 28ea34b9061bdec4e1f06d4668a57954403666fd..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/example_CA/components.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index afcf4142ab022e22c5621e2e16650419e717bbaf..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/example_CA/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 460b1cd9c2881d454b8a33fe706d01636fd84dff..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/example_CA/connections.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-from,output,to,input
-inv_pv_bat,1,battery,1
-inv_pv_bat,1,grd,1
-inv_pv_bat,1,elec_cns,1
-battery,1,inv_pv_bat,1
-grd,1,inv_pv_bat,1
-grd,1,elec_cns,1
diff --git a/input_files/models/district_models/example_CA/prosumer.json b/input_files/models/district_models/example_CA/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..568e6232da657d99f887ea78d88b23379e3fffe4
--- /dev/null
+++ b/input_files/models/district_models/example_CA/prosumer.json
@@ -0,0 +1,68 @@
+{
+ "components": {
+ "inv_pv_bat": {
+ "type": "DynamicInverter",
+ "model": "STP-7000TL-20",
+ "min_size": 0.0,
+ "max_size": 20.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 0.0,
+ "max_size": 6.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ }
+ },
+ "connections": [
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
deleted file mode 100644
index 37d9f6061ca4764e7bcaa126e41fd261232c7987..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/example_community/components.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 3af15c2884836838c807b7f6f67dd41ad4e14224..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/example_community/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index fced4f72023e4e4bc430aec80753671b0d5480e8..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/example_community/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv_bat,1
-inv_pv_bat,1,battery,1
-inv_pv_bat,1,grd,1
-inv_pv_bat,1,elec_cns,1
-battery,1,inv_pv_bat,1
-grd,1,inv_pv_bat,1
-grd,1,elec_cns,1
diff --git a/input_files/models/district_models/example_community/district.json b/input_files/models/district_models/example_community/district.json
new file mode 100644
index 0000000000000000000000000000000000000000..54b7eadbeeb72d9e00a3aad35f7c93c66fefbdcc
--- /dev/null
+++ b/input_files/models/district_models/example_community/district.json
@@ -0,0 +1,10 @@
+{
+ "network_usage_capacity_fee": 14.79,
+ "network_usage_energy_fee": 0.0506,
+ "levies_int": 0.0276,
+ "levies_ext": 0.0496,
+ "concession": 0.0199,
+ "electricity_tax_int": 0,
+ "electricity_tax_ext": 0.0205,
+ "VAT": 0.19
+}
\ No newline at end of file
diff --git a/input_files/models/district_models/jbr_test_ca/components.csv b/input_files/models/district_models/jbr_test_ca/components.csv
deleted file mode 100644
index 37d9f6061ca4764e7bcaa126e41fd261232c7987..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index afcf4142ab022e22c5621e2e16650419e717bbaf..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/jbr_test_ca/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index fced4f72023e4e4bc430aec80753671b0d5480e8..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/jbr_test_ca/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv_bat,1
-inv_pv_bat,1,battery,1
-inv_pv_bat,1,grd,1
-inv_pv_bat,1,elec_cns,1
-battery,1,inv_pv_bat,1
-grd,1,inv_pv_bat,1
-grd,1,elec_cns,1
diff --git a/input_files/models/district_models/jbr_test_ca/prosumer.json b/input_files/models/district_models/jbr_test_ca/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..b008b3bf1abbe437b5f2e69ddc1a16b71886443d
--- /dev/null
+++ b/input_files/models/district_models/jbr_test_ca/prosumer.json
@@ -0,0 +1,80 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 6.0,
+ "max_size": 6.0
+ },
+ "inv_pv_bat": {
+ "type": "DynamicInverter",
+ "model": "STP-7000TL-20",
+ "min_size": 0.0,
+ "max_size": 20.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 6.0,
+ "max_size": 6.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/district_models/jbr_test_comm/components.csv b/input_files/models/district_models/jbr_test_comm/components.csv
deleted file mode 100644
index 37d9f6061ca4764e7bcaa126e41fd261232c7987..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index afcf4142ab022e22c5621e2e16650419e717bbaf..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/jbr_test_comm/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index fced4f72023e4e4bc430aec80753671b0d5480e8..0000000000000000000000000000000000000000
--- a/input_files/models/district_models/jbr_test_comm/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv_bat,1
-inv_pv_bat,1,battery,1
-inv_pv_bat,1,grd,1
-inv_pv_bat,1,elec_cns,1
-battery,1,inv_pv_bat,1
-grd,1,inv_pv_bat,1
-grd,1,elec_cns,1
diff --git a/input_files/models/district_models/jbr_test_comm/prosumer.json b/input_files/models/district_models/jbr_test_comm/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..b008b3bf1abbe437b5f2e69ddc1a16b71886443d
--- /dev/null
+++ b/input_files/models/district_models/jbr_test_comm/prosumer.json
@@ -0,0 +1,80 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 6.0,
+ "max_size": 6.0
+ },
+ "inv_pv_bat": {
+ "type": "DynamicInverter",
+ "model": "STP-7000TL-20",
+ "min_size": 0.0,
+ "max_size": 20.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 6.0,
+ "max_size": 6.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
deleted file mode 100644
index 2b280bcb25a46edf786631dc5ad0d0f27a1ed221..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN0_CAT1/components.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN0_CAT1/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index dbfe4b050cf08b6c72a40bde54198c026cc687a8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-from,output,to,input
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/prosumer.json b/input_files/models/prosumer_models/SCN0_CAT1/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..49323727479a39feac18fa0b2f9a80a3015f3109
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN0_CAT1/prosumer.json
@@ -0,0 +1,89 @@
+{
+ "components": {
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 100000.0,
+ "max_size": 100000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 100000.0,
+ "max_size": 100000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
deleted file mode 100644
index 89ba5854d920853fd65b5dedcefc8ceaa68bb96e..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 29dd4e9de59d29d5045f4b11602ae54208ad6cfa..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV11/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..8c6792ffbce1fdd4285111a659a275a8cb5e494b
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/prosumer.json
@@ -0,0 +1,119 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 3bc6ffd4d5e474a3cd06e5666ee77c3178d585df..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index e1ac16fb043e46f95c946d86e111b51dfa2e3db1..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,elec_cns,1
-grd,1,inv_bat,1
-inv_bat,1,battery,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..241b9e552292f064d371b5628fe79db6025208e7
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/prosumer.json
@@ -0,0 +1,167 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index adc049d34ca2c07024af58442933121308f35ce8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b868a18efbd476fdfc3e68a7097cc7dcf0156dc8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-inv_bat,1,battery,1
-inv_bat,1,heat_pump,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..2ee166cecc58ad628628183e1110fc60c177753b
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/prosumer.json
@@ -0,0 +1,203 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 9029b25baae027b0647d832fcbd6b366bc223adf..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index ceb46125766b01ae11f0dc18c82ac8034c8b2d9d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a5ab1af7631ecd4cbdeb4e0e9bab81c13bd0372
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/prosumer.json
@@ -0,0 +1,155 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
deleted file mode 100644
index 9583700cc096e077fbe82b9713e3624a46118ad6..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 29dd4e9de59d29d5045f4b11602ae54208ad6cfa..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV31/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..ff64244ec3b09dadd3106e4dd1c250f3ecf4f638
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/prosumer.json
@@ -0,0 +1,119 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 2af6381b45c68135d301b15526c69eed1bb21463..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index c459e9455f4378a562f9176f83648d0324e698c4..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,elec_cns,1
-inv_bat,1,battery,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..18fbf25088e3233be50e42eb78b1916310856a62
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/prosumer.json
@@ -0,0 +1,161 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 445b0bafbb208ee238800315db8d2b1bbad28c3d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b868a18efbd476fdfc3e68a7097cc7dcf0156dc8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-inv_bat,1,battery,1
-inv_bat,1,heat_pump,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..df252f337569ce439a085744cbb390003fdca8d2
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/prosumer.json
@@ -0,0 +1,203 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index cb554db40cc7d0b7e8daa228b2cb82b9e6367876..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index ceb46125766b01ae11f0dc18c82ac8034c8b2d9d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/prosumer.json b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..951ebf9b682daec7899ad495ff572fcf173f5ee6
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/prosumer.json
@@ -0,0 +1,155 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
deleted file mode 100644
index 652da783013e0aa307cdfb1c6792f1f8a00a5518..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1/components.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index dbfe4b050cf08b6c72a40bde54198c026cc687a8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-from,output,to,input
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..dff1daf95944ba779602897c901e957cad0dc1a1
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1/prosumer.json
@@ -0,0 +1,89 @@
+{
+ "components": {
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
deleted file mode 100644
index 89ba5854d920853fd65b5dedcefc8ceaa68bb96e..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 29dd4e9de59d29d5045f4b11602ae54208ad6cfa..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV11/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..8c6792ffbce1fdd4285111a659a275a8cb5e494b
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/prosumer.json
@@ -0,0 +1,119 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 3bc6ffd4d5e474a3cd06e5666ee77c3178d585df..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index e1ac16fb043e46f95c946d86e111b51dfa2e3db1..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,elec_cns,1
-grd,1,inv_bat,1
-inv_bat,1,battery,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..241b9e552292f064d371b5628fe79db6025208e7
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/prosumer.json
@@ -0,0 +1,167 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index adc049d34ca2c07024af58442933121308f35ce8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 7e6ca7c5f888d21cc56e5a39d682ab8a54d26964..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-grd,1,inv_bat,1
-inv_bat,1,battery,1
-inv_bat,1,heat_pump,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a56b4ab68200405df3eaa71ff7b592d031a7468
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/prosumer.json
@@ -0,0 +1,209 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 9029b25baae027b0647d832fcbd6b366bc223adf..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index ceb46125766b01ae11f0dc18c82ac8034c8b2d9d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a5ab1af7631ecd4cbdeb4e0e9bab81c13bd0372
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/prosumer.json
@@ -0,0 +1,155 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
deleted file mode 100644
index 9583700cc096e077fbe82b9713e3624a46118ad6..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 29dd4e9de59d29d5045f4b11602ae54208ad6cfa..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV31/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..ff64244ec3b09dadd3106e4dd1c250f3ecf4f638
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/prosumer.json
@@ -0,0 +1,119 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 2af6381b45c68135d301b15526c69eed1bb21463..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index e1ac16fb043e46f95c946d86e111b51dfa2e3db1..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,elec_cns,1
-grd,1,inv_bat,1
-inv_bat,1,battery,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..015a98998ee535e36afde4cfa0d1257bfa6e87f6
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/prosumer.json
@@ -0,0 +1,167 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index 445b0bafbb208ee238800315db8d2b1bbad28c3d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 7e6ca7c5f888d21cc56e5a39d682ab8a54d26964..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-inv_pv,1,inv_bat,1
-battery,1,inv_bat,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-grd,1,inv_bat,1
-inv_bat,1,battery,1
-inv_bat,1,heat_pump,1
-inv_bat,1,grd,1
-inv_bat,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..064b6d3c6116b7440eea0f5c38575d1f60110820
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/prosumer.json
@@ -0,0 +1,209 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "inv_bat": {
+ "type": "StaticInverter",
+ "model": "INVBAT",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
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
deleted file mode 100644
index cb554db40cc7d0b7e8daa228b2cb82b9e6367876..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 975002f601d6d8a963e9a690004b4c7bdce2af41..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index ceb46125766b01ae11f0dc18c82ac8034c8b2d9d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv,1
-inv_pv,1,heat_pump,1
-inv_pv,1,grd,1
-inv_pv,1,elec_cns,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-gas_grd,1,gas_boi,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-gas_boi,1,water_tes,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
-gas_boi,1,therm_cns,1
-gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/prosumer.json b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..951ebf9b682daec7899ad495ff572fcf173f5ee6
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/prosumer.json
@@ -0,0 +1,155 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "inv_pv": {
+ "type": "StaticInverter",
+ "model": "INVPV",
+ "min_size": 30.0,
+ "max_size": 30.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_boi": {
+ "type": "GasBoiler",
+ "model": "BOI1",
+ "min_size": 10.0,
+ "max_size": 10.0
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 10000.0,
+ "max_size": 10000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 40.0,
+ "max_size": 40.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "gas_boi",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "gas_boi",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
deleted file mode 100644
index 37d9f6061ca4764e7bcaa126e41fd261232c7987..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index afcf4142ab022e22c5621e2e16650419e717bbaf..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/jbr_test/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index fced4f72023e4e4bc430aec80753671b0d5480e8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/jbr_test/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv_bat,1
-inv_pv_bat,1,battery,1
-inv_pv_bat,1,grd,1
-inv_pv_bat,1,elec_cns,1
-battery,1,inv_pv_bat,1
-grd,1,inv_pv_bat,1
-grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/jbr_test/prosumer.json b/input_files/models/prosumer_models/jbr_test/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..b008b3bf1abbe437b5f2e69ddc1a16b71886443d
--- /dev/null
+++ b/input_files/models/prosumer_models/jbr_test/prosumer.json
@@ -0,0 +1,80 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 6.0,
+ "max_size": 6.0
+ },
+ "inv_pv_bat": {
+ "type": "DynamicInverter",
+ "model": "STP-7000TL-20",
+ "min_size": 0.0,
+ "max_size": 20.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 6.0,
+ "max_size": 6.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
deleted file mode 100644
index 5b1f7270a6e56f01e3e92f2bbf9879758f735960..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/mfh_quartal/components.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 798a9d64cea586cdbbb0bd8801dd24113721bbff..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/mfh_quartal/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 0416b8eae930a195328ae32c779d86790430738a..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/mfh_quartal/connections.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-from,output,to,input
-grd,1,ecns1,1
-grd,1,ecns2,1
-grd,1,ecns3,1
-grd,1,ecns4,1
-grd,1,ecns5,1
-grd,1,ecns6,1
-pv,1,grd,1
-pv,1,bat,1
-pv,1,ecns1,1
-pv,1,ecns2,1
-pv,1,ecns3,1
-pv,1,ecns4,1
-pv,1,ecns5,1
-pv,1,ecns6,1
-bat,1,ecns1,1
-bat,1,ecns2,1
-bat,1,ecns3,1
-bat,1,ecns4,1
-bat,1,ecns5,1
-bat,1,ecns6,1
-chp,2,grd,1
-chp,2,ecns1,1
-chp,2,ecns2,1
-chp,2,ecns3,1
-chp,2,ecns4,1
-chp,2,ecns5,1
-chp,2,ecns6,1
-gas_grd,1,chp,1
-chp,1,tcns1,1
-chp,1,tcns2,1
-chp,1,tcns3,1
-chp,1,tcns4,1
-chp,1,tcns5,1
-chp,1,tcns6,1
diff --git a/input_files/models/prosumer_models/mfh_quartal/prosumer.json b/input_files/models/prosumer_models/mfh_quartal/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..2a103c3b721486176fdd72fc34693f2e40f52d5a
--- /dev/null
+++ b/input_files/models/prosumer_models/mfh_quartal/prosumer.json
@@ -0,0 +1,285 @@
+{
+ "components": {
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "pv": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 0.0,
+ "max_size": 30.0
+ },
+ "bat": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 1.0,
+ "max_size": 1.0
+ },
+ "chp": {
+ "type": "CHP",
+ "model": "CHP1",
+ "min_size": 0.0,
+ "max_size": 50.0
+ },
+ "ecns1": {
+ "type": "ElectricalConsumption"
+ },
+ "ecns2": {
+ "type": "ElectricalConsumption"
+ },
+ "ecns3": {
+ "type": "ElectricalConsumption"
+ },
+ "ecns4": {
+ "type": "ElectricalConsumption"
+ },
+ "ecns5": {
+ "type": "ElectricalConsumption"
+ },
+ "ecns6": {
+ "type": "ElectricalConsumption"
+ },
+ "gas_grd": {
+ "type": "GasGrid",
+ "model": "GAS1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "price": 0.0606,
+ "injection_price": 0,
+ "peak_power_cost": 0.21
+ },
+ "tcns1": {
+ "type": "HeatConsumption"
+ },
+ "tcns2": {
+ "type": "HeatConsumption"
+ },
+ "tcns3": {
+ "type": "HeatConsumption"
+ },
+ "tcns4": {
+ "type": "HeatConsumption"
+ },
+ "tcns5": {
+ "type": "HeatConsumption"
+ },
+ "tcns6": {
+ "type": "HeatConsumption"
+ }
+ },
+ "connections": [
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "ecns1",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "ecns2",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "ecns3",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "ecns4",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "ecns5",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "ecns6",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "bat",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "ecns1",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "ecns2",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "ecns3",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "ecns4",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "ecns5",
+ "input": 1
+ },
+ {
+ "from": "pv",
+ "output": 1,
+ "to": "ecns6",
+ "input": 1
+ },
+ {
+ "from": "bat",
+ "output": 1,
+ "to": "ecns1",
+ "input": 1
+ },
+ {
+ "from": "bat",
+ "output": 1,
+ "to": "ecns2",
+ "input": 1
+ },
+ {
+ "from": "bat",
+ "output": 1,
+ "to": "ecns3",
+ "input": 1
+ },
+ {
+ "from": "bat",
+ "output": 1,
+ "to": "ecns4",
+ "input": 1
+ },
+ {
+ "from": "bat",
+ "output": 1,
+ "to": "ecns5",
+ "input": 1
+ },
+ {
+ "from": "bat",
+ "output": 1,
+ "to": "ecns6",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "ecns1",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "ecns2",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "ecns3",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "ecns4",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "ecns5",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 2,
+ "to": "ecns6",
+ "input": 1
+ },
+ {
+ "from": "gas_grd",
+ "output": 1,
+ "to": "chp",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 1,
+ "to": "tcns1",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 1,
+ "to": "tcns2",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 1,
+ "to": "tcns3",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 1,
+ "to": "tcns4",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 1,
+ "to": "tcns5",
+ "input": 1
+ },
+ {
+ "from": "chp",
+ "output": 1,
+ "to": "tcns6",
+ "input": 1
+ }
+ ],
+ "elec_price_low": 0.3046,
+ "elec_price_high": 0.25,
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ 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
deleted file mode 100644
index 56d0504c8089561606e81f7403d429ab8b31fad8..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index afcf4142ab022e22c5621e2e16650419e717bbaf..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/office_pv_heatpump/config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 84ee2b5bdfe592ebadd5f1eba58fb2b8edea8a5d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-from,output,to,input
-pv_roof,1,inv_pv_bat,1
-inv_pv_bat,1,battery,1
-inv_pv_bat,1,heat_pump,1
-inv_pv_bat,1,grd,1
-inv_pv_bat,1,elec_cns,1
-battery,1,inv_pv_bat,1
-grd,1,inv_pv_bat,1
-grd,1,heat_pump,1
-grd,1,elec_cns,1
-heat_pump,1,water_tes,1
-water_tes,1,therm_cns,1
-water_tes,1,dhw_dmd,1
-heat_pump,1,therm_cns,1
-heat_pump,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/prosumer.json b/input_files/models/prosumer_models/office_pv_heatpump/prosumer.json
new file mode 100644
index 0000000000000000000000000000000000000000..938e081786a805e7420e9f0ed86c9e31806beeae
--- /dev/null
+++ b/input_files/models/prosumer_models/office_pv_heatpump/prosumer.json
@@ -0,0 +1,140 @@
+{
+ "components": {
+ "pv_roof": {
+ "type": "PVGenerator",
+ "model": "PV2",
+ "min_size": 0.0,
+ "max_size": 30.0
+ },
+ "inv_pv_bat": {
+ "type": "DynamicInverter",
+ "model": "STP-7000TL-20",
+ "min_size": 0.0,
+ "max_size": 30.0
+ },
+ "battery": {
+ "type": "LiionBattery",
+ "model": "BAT1",
+ "min_size": 0.0,
+ "max_size": 1000.0
+ },
+ "heat_pump": {
+ "type": "HeatPump",
+ "model": "EHP1",
+ "min_size": 2.0,
+ "max_size": 50.0
+ },
+ "grd": {
+ "type": "ElectricalGrid",
+ "model": "GRD1",
+ "min_size": 1000.0,
+ "max_size": 1000.0,
+ "price": 0.3046,
+ "injection_price": 0.0793,
+ "emission": 0.401
+ },
+ "elec_cns": {
+ "type": "ElectricalConsumption"
+ },
+ "therm_cns": {
+ "type": "HeatConsumption"
+ },
+ "dhw_dmd": {
+ "type": "HotWaterConsumption"
+ },
+ "water_tes": {
+ "type": "HotWaterStorage",
+ "model": "TES1",
+ "min_size": 10.0,
+ "max_size": 93.0
+ }
+ },
+ "connections": [
+ {
+ "from": "pv_roof",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "battery",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "grd",
+ "input": 1
+ },
+ {
+ "from": "inv_pv_bat",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "battery",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "inv_pv_bat",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "heat_pump",
+ "input": 1
+ },
+ {
+ "from": "grd",
+ "output": 1,
+ "to": "elec_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "water_tes",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "water_tes",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "therm_cns",
+ "input": 1
+ },
+ {
+ "from": "heat_pump",
+ "output": 1,
+ "to": "dhw_dmd",
+ "input": 1
+ }
+ ],
+ "yearly_interest": 0.03,
+ "planning_horizon": 20
+}
\ No newline at end of file
diff --git a/runme.py b/runme.py
index 528470ada2194b7e0c335c7e3b51c830ddba2819..c0e6c76e1f8b70686654b0c791ec96385b1bedc9 100644
--- a/runme.py
+++ b/runme.py
@@ -27,6 +27,7 @@ import Tooling.input_profile_processor.input_profile_processor
import Model_Library.Prosumer.main as main_prosumer
import Model_Library.District.main as main_district
from enum import Enum
+import json
class SimulationScope(Enum):
PROSUMER = 1
@@ -37,38 +38,42 @@ 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_profile_dict = {'irradiance_1': {'type': 'irradiance', 'file': 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'},
+ 'temperature_1': {'type': 'air_temperature', 'file': 'input_files/data/temperature/temperature.csv'},
+ 'demand_electric_1': {'type': 'elec_demand', 'generate': {'yearly_demand': 3000}},
+ 'demand_heat_1': {'type': 'therm_demand', 'generate': {'yearly_demand': 6000, 'temperature': 'temperature_1'}},
+ 'demand_hot_water_1': {'type': 'hot_water_demand', 'generate': {'yearly_demand': 1500, 'temperature': 'temperature_1'}},
+ 'irradiance_2': {'type': 'irradiance', 'file': 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'},
+ 'temperature_2': {'type': 'air_temperature', 'file': 'input_files/data/temperature/temperature.csv'},
+ 'demand_electric_2': {'type': 'elec_demand', 'generate': {'yearly_demand': 3000}},
+ 'demand_heat_2': {'type': 'therm_demand', 'generate': {'yearly_demand': 6000, 'temperature': 'temperature_2'}},
+ 'demand_hot_water_2': {'type': 'hot_water_demand', 'generate': {'yearly_demand': 1500, 'temperature': 'temperature_2'}},
+ 'irradiance_3': {'type': 'irradiance', 'file': 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'},
+ 'temperature_3': {'type': 'air_temperature', 'file': 'input_files/data/temperature/temperature.csv'},
+ 'demand_electric_3': {'type': 'elec_demand', 'generate': {'yearly_demand': 0}},
+ 'demand_heat_3': {'type': 'therm_demand', 'generate': {'yearly_demand': 0, 'temperature': 'temperature_3'}},
+ 'demand_hot_water_3': {'type': 'hot_water_demand', 'generate': {'yearly_demand': 0, 'temperature': 'temperature_3'}},
+ 'elec_price_1': {'type': 'elec_price', 'file': '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', 'irradiance', 'perfect_foresight'), ('temperature_1', 'temperature', 'perfect_foresight')],
- 'elec_cns': ('demand_electric_1', 'demand_electric', 'perfect_foresight'),
- 'therm_cns': ('demand_heat_1', 'demand_heat', 'perfect_foresight'),
- 'dhw_dmd': ('demand_hot_water_1', 'demand_hot_water', 'perfect_foresight')}},
- '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', 'demand_electric', 'perfect_foresight'),
- 'therm_cns': ('demand_heat_2', 'demand_heat', 'perfect_foresight'),
- 'dhw_dmd': ('demand_hot_water_2', 'demand_hot_water', 'perfect_foresight')}}}
+prosumer_paths = {'SCN2_CAT1_PV11_3000_6000': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/prosumer.json',
+ 'SCN0_CAT1_3000_6000': 'input_files/models/prosumer_models/SCN0_CAT1/prosumer.json'}
+prosumer_profiles = {'SCN2_CAT1_PV11_3000_6000': {'pv_roof': {'irradiance' : 'irradiance_1', 'temperature': 'temperature_1'},
+ 'elec_cns': {'consumption': 'demand_electric_1'},
+ 'therm_cns': {'consumption': 'demand_heat_1'},
+ 'dhw_dmd': {'consumption': 'demand_hot_water_1'}},
+ 'SCN0_CAT1_3000_6000': {'elec_cns': {'consumption': 'demand_electric_2'},
+ 'therm_cns': {'consumption': 'demand_heat_2'},
+ 'dhw_dmd': {'consumption': 'demand_hot_water_2'}}}
+prosumer_dict = dict()
+for prosumer_name, prosumer_path in prosumer_paths.items():
+ with open(prosumer_path) as f:
+ prosumer_json = json.load(f)
+ prosumer_dict[prosumer_name] = prosumer_json
+for prosumer_name, component_profiles in prosumer_profiles.items():
+ for component_name, profiles in component_profiles.items():
+ prosumer_dict[prosumer_name]['components'][component_name].update(profiles)
prosumer_main = main_prosumer.ProsumerMain(prosumer_dict, input_profiles, t_horizon, t_step)
@@ -82,14 +87,28 @@ prosumers = prosumer_main.prosumers
if simulation_scope == SimulationScope.PROSUMER:
exit()
-district_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': ('demand_electric_3', 'demand_electric', 'perfect_foresight')}}}
-
-district_assets = main_prosumer.DistrictAssetMain(district_assets_dict, input_profiles, t_horizon, t_step).district_assets
-
-district_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv',
- 'profiles': {'elec_price': 'elec_price_1'}}}
+district_asset_paths = {'ca_bat': 'input_files/models/district_models/example_CA/prosumer.json'}
+district_asset_profiles = {'ca_bat': {'elec_cns': {'consumption': 'demand_electric_3'}}}
+district_asset_dict = dict()
+for district_asset_name, district_asset_path in district_asset_paths.items():
+ with open(district_asset_path) as f:
+ district_asset_json = json.load(f)
+ district_asset_dict[district_asset_name] = district_asset_json
+for district_asset_name, component_profiles in district_asset_profiles.items():
+ for component_name, profiles in component_profiles.items():
+ district_asset_dict[district_asset_name]['components'][component_name].update(profiles)
+
+district_assets = main_prosumer.DistrictAssetMain(district_asset_dict, input_profiles, t_horizon, t_step).district_assets
+
+district_paths = {'community': 'input_files/models/district_models/example_community/district.json'}
+district_profiles = {'community': {'wholesale_price': 'elec_price_1', 'injection_price': 'elec_price_1'}}
+district_dict = dict()
+for district_name, district_path in district_paths.items():
+ with open(district_path) as f:
+ district_json = json.load(f)
+ district_dict[district_name] = district_json
+for district_name, profiles in district_profiles.items():
+ district_dict[district_name].update(profiles)
district_main = main_district.DistrictMain(district_dict, prosumers, district_assets, input_profiles, t_horizon, t_step)