From 1b353c24b04a18ce74e649d237905d9deaae13d9 Mon Sep 17 00:00:00 2001 From: Lennart Zimmermann <lennartzimmermann@outlook.de> Date: Mon, 27 Jan 2025 11:01:46 +0100 Subject: [PATCH] Updated version of method for multiple_links + outcommend part using ch4_h2-table --- etrago/appl.py | 20 +++++++++++++++----- etrago/network.py | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/etrago/appl.py b/etrago/appl.py index 3bd3bc26..fa104d10 100644 --- a/etrago/appl.py +++ b/etrago/appl.py @@ -49,7 +49,7 @@ args = { # Setup and Configuration: - "db": "egon-data", # database session + "db": "eGon100_2025", # database session "gridversion": None, # None for model_draft or Version number "method": { # Choose method and settings for optimization "type": "lopf", # type of optimization, 'lopf' or 'sclopf' @@ -72,7 +72,7 @@ "q_allocation": "p_nom", # allocate reactive power via 'p_nom' or 'p' }, "start_snapshot": 1, - "end_snapshot": 168, + "end_snapshot": 4, "solver": "gurobi", # glpk, cplex or gurobi "solver_options": { "BarConvTol": 1.0e-5, @@ -83,7 +83,7 @@ "threads": 4, }, "model_formulation": "kirchhoff", # angles or kirchhoff - "scn_name": "eGon2035", # scenario: eGon2035, eGon100RE or status2019 + "scn_name": "eGon100RE", # scenario: eGon2035, eGon100RE or status2019 # Scenario variations: "scn_extension": None, # None or array of extension scenarios "scn_decommissioning": None, # None or decommissioning scenario @@ -677,7 +677,7 @@ def run_etrago(args, json_path): <https://www.pypsa.org/doc/components.html#network>`_ """ - etrago = Etrago(args, json_path=json_path) + etrago = Etrago(args, json_path=None) # import network from database etrago.build_network_from_db() @@ -729,7 +729,15 @@ def adjust_PtH2_model(): e_cyclic=False, standing_loss=1 ) + etrago.network.stores.loc[str(new_store_id), "scn_name"] = args["scn_name"] + etrago.network.buses.loc[str(new_bus_id), "scn_name"] = args["scn_name"] + etrago.network.buses.loc[str(new_bus_id), "country"] = 'DE' + + #set coordinates for new bus for the clustering method + bus0_index = etrago.network.links.loc[power_to_h2_links, "bus0"] + etrago.network.buses.loc[str(new_bus_id), "x"] = etrago.network.buses.loc[bus0_index, "x"].values[0] + etrago.network.buses.loc[str(new_bus_id), "y"] = etrago.network.buses.loc[bus0_index, "y"].values[0] #Connect multiple link with new heat/o2-bus etrago.network.links.loc[power_to_h2_links, f"bus{idx}"] = str(new_bus_id) @@ -739,8 +747,8 @@ def adjust_PtH2_model(): for link in links: etrago.network.links.loc[link, "bus0"] = str(new_bus_id) + - adjust_PtH2_model() # adjust network regarding eTraGo setting etrago.adjust_network() @@ -752,6 +760,8 @@ def adjust_PtH2_model(): etrago.spatial_clustering() etrago.spatial_clustering_gas() + adjust_PtH2_model() + print('PtH2_model adjusted') # snapshot clustering etrago.snapshot_clustering() diff --git a/etrago/network.py b/etrago/network.py index c69d0e0b..62ab772e 100644 --- a/etrago/network.py +++ b/etrago/network.py @@ -398,8 +398,8 @@ def build_network_from_db(self): self.decommissioning() - if "H2_grid" in self.network.buses.carrier.unique(): - self.add_ch4_h2_correspondence() + #if "H2_grid" in self.network.buses.carrier.unique(): + # self.add_ch4_h2_correspondence() logger.info("Imported network from db")