Skip to content
Snippets Groups Projects
Commit 5bf2c80e authored by Christoph von Oy's avatar Christoph von Oy
Browse files

Removed dynamic from Topology and all components

parent b420b2a3
No related tags found
No related merge requests found
Subproject commit 132b9b70e260f2e58fbfd27760c1e9cee1953d4b
Subproject commit 49b3fad83c5a0ade778ba785575213a231bbaca8
......@@ -53,8 +53,8 @@ prosumer_json["additional_model_logic"]["charger_2_enable"]["enable"] = input_pr
"bus_2_connected"
].values
prosumer = Prosumer("LaTrielle", prosumer_json, dynamic)
prosumer = Prosumer("LaTrielle", prosumer_json)
prosumer.optimize("sized", ["annuity", "peak_power_cost"])
prosumer.optimize("sized", dynamic, ["annuity", "peak_power_cost"])
prosumer.save_results("output_files")
......@@ -71,8 +71,8 @@ prosumer_json["additional_model_logic"]["HPC_3_bus_2_enable"][
"enable"
] = input_profiles["bus_2_connected_to_hpc_3"].values
prosumer = Prosumer("LaTreille", prosumer_json, dynamic)
prosumer = Prosumer("LaTreille", prosumer_json)
prosumer.optimize("sized", ["annuity", "peak_power_cost"])
prosumer.optimize("sized", dynamic, ["annuity", "peak_power_cost"])
prosumer.save_results("output_files")
......@@ -75,8 +75,8 @@ prosumer_json["components"]["bus_2_motor_inverter"][
"max_capacity"
] = bus_2_moter_inverter_capacity
prosumer = Prosumer("LaTreille", prosumer_json, dynamic)
prosumer = Prosumer("LaTreille", prosumer_json)
prosumer.optimize("sized", ["annuity", "peak_power_cost"])
prosumer.optimize("sized", dynamic, ["annuity", "peak_power_cost"])
prosumer.save_results("output_files")
......@@ -43,8 +43,8 @@ prosumer_json["components"]["consumption"]["consumption"] = profiles[
"electricity_demand"
]
prosumer = Prosumer("my_prosumer", prosumer_json, aggregated_dynamic)
prosumer = Prosumer("my_prosumer", prosumer_json)
prosumer.optimize("sized", ["annuity"])
prosumer.optimize("sized", aggregated_dynamic, ["annuity"])
prosumer.save_results("output_files")
......@@ -47,9 +47,9 @@ prosumer_json["components"]["hot_water_consumption"]["consumption"] = input_prof
"hot_water_demand"
]
prosumer = Prosumer("my_prosumer", prosumer_json, dynamic)
prosumer = Prosumer("my_prosumer", prosumer_json)
prosumer.optimize("sized", ["annuity"])
prosumer.optimize("sized", dynamic, ["annuity"])
prosumer.save_results("output_files")
......
......@@ -48,16 +48,18 @@ for prosumer_name, prosumer_path in prosumer_paths.items():
"electricity_demand"
]
prosumers[prosumer_name] = Prosumer(prosumer_name, prosumer_json, dynamic)
prosumers[prosumer_name] = Prosumer(prosumer_name, prosumer_json)
for prosumer_name, prosumer in prosumers.items():
prosumer.optimize("sized", ["annuity"])
prosumer.optimize("sized", dynamic, ["annuity"])
prosumer.save_results("output_files")
with open("asset.json") as f:
district_asset_json = json.load(f)
district_asset = DistrictAsset("my_asset", district_asset_json)
district_asset = DistrictAsset("my_asset", district_asset_json, dynamic)
with open("district.json") as f:
......@@ -69,9 +71,9 @@ district_json["components"]["grid"]["injection_price"] = input_profiles[
]
district = District(
"my_district", district_json, prosumers, {"my_asset": district_asset}, dynamic
"my_district", district_json, prosumers, {"my_asset": district_asset}
)
district.optimize("sized", ["annuity"])
district.optimize("sized", dynamic, ["annuity"])
district.save_results("output_files")
......@@ -40,8 +40,8 @@ prosumer_json["components"]["consumption"]["consumption"] = input_profiles[
"electricity_demand"
]
prosumer = Prosumer("my_prosumer", prosumer_json, dynamic)
prosumer = Prosumer("my_prosumer", prosumer_json)
prosumer.optimize("sized", ["annuity"])
prosumer.optimize("sized", dynamic, ["annuity"])
prosumer.save_results("output_files")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment