From cbab86c4bcf2227aaa34f9dfd198e62a6e0d2c27 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Mon, 1 Aug 2022 18:15:35 +0200 Subject: [PATCH] add heat buses clustering to myopic --- scripts/add_existing_baseyear.py | 5 ++++- scripts/prepare_sector_network.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 11b8d49b..1cf532a3 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -12,7 +12,7 @@ import xarray as xr import pypsa import yaml -from prepare_sector_network import prepare_costs, define_spatial +from prepare_sector_network import prepare_costs, define_spatial, cluster_heat_buses from helper import override_component_attrs, update_config_with_sector_opts from types import SimpleNamespace @@ -495,4 +495,7 @@ if __name__ == "__main__": default_lifetime = snakemake.config['costs']['lifetime'] add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years, ashp_cop, gshp_cop, time_dep_hp_cop, costs, default_lifetime) + if options["cluster_heat_buses"]: + cluster_heat_buses(n) + n.export_to_netcdf(snakemake.output[0]) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 1eabc37d..c3b518e2 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2564,6 +2564,10 @@ if __name__ == "__main__": if options['electricity_grid_connection']: add_electricity_grid_connection(n, costs) - if options["cluster_heat_buses"]: + first_year_myopic = ((snakemake.config["foresight"] == 'myopic') and + (snakemake.config["scenario"]["planning_horizons"][0]==investment_year)) + + if options["cluster_heat_buses"] and not first_year_myopic: cluster_heat_buses(n) + n.export_to_netcdf(snakemake.output[0])