From d297f84ea7e3ff9f19d4a2da627c0d3f25192d34 Mon Sep 17 00:00:00 2001 From: AmosSchledorn Date: Thu, 25 Jul 2024 14:50:27 +0200 Subject: [PATCH] update inputs for add_existing_baseyear --- rules/solve_myopic.smk | 14 ++++++++++++-- rules/solve_perfect.smk | 14 ++++++++++++-- scripts/add_existing_baseyear.py | 4 ++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/rules/solve_myopic.smk b/rules/solve_myopic.smk index 21fb7169..8d3230ad 100644 --- a/rules/solve_myopic.smk +++ b/rules/solve_myopic.smk @@ -21,8 +21,18 @@ rule add_existing_baseyear: config_provider("scenario", "planning_horizons", 0)(w) ) ), - cop_soil_total=resources("cop_soil_total_elec_s{simpl}_{clusters}.nc"), - cop_air_total=resources("cop_air_total_elec_s{simpl}_{clusters}.nc"), + cop_soil_decentral_heating=resources( + "cop_soil_decentral_heating_elec_s{simpl}_{clusters}.nc" + ), + cop_air_decentral_heating=resources( + "cop_air_decentral_heating_elec_s{simpl}_{clusters}.nc" + ), + cop_air_central_heating=resources( + "cop_air_central_heating_elec_s{simpl}_{clusters}.nc" + ), + cop_soil_central_heating=resources( + "cop_soil_central_heating_elec_s{simpl}_{clusters}.nc" + ), existing_heating_distribution=resources( "existing_heating_distribution_elec_s{simpl}_{clusters}_{planning_horizons}.csv" ), diff --git a/rules/solve_perfect.smk b/rules/solve_perfect.smk index 51cb3920..d2ea1a16 100644 --- a/rules/solve_perfect.smk +++ b/rules/solve_perfect.smk @@ -19,8 +19,18 @@ rule add_existing_baseyear: config_provider("scenario", "planning_horizons", 0)(w) ) ), - cop_soil_total=resources("cop_soil_total_elec_s{simpl}_{clusters}.nc"), - cop_air_total=resources("cop_air_total_elec_s{simpl}_{clusters}.nc"), + cop_soil_decentral_heating=resources( + "cop_soil_decentral_heating_elec_s{simpl}_{clusters}.nc" + ), + cop_air_decentral_heating=resources( + "cop_air_decentral_heating_elec_s{simpl}_{clusters}.nc" + ), + cop_air_central_heating=resources( + "cop_air_central_heating_elec_s{simpl}_{clusters}.nc" + ), + cop_soil_central_heating=resources( + "cop_soil_central_heating_elec_s{simpl}_{clusters}.nc" + ), existing_heating_distribution=resources( "existing_heating_distribution_elec_s{simpl}_{clusters}_{planning_horizons}.csv" ), diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index cc82295d..9770e6ce 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -436,7 +436,7 @@ def add_heating_capacities_installed_before_baseyear( services proportional to heating load in both 50% capacities in rural buses 50% in urban buses cop: dict - Dictionary with time-dependent coefficients of perforamnce (COPs) for air and ground heat pumps as values and keys "air decentral", "ground decentral", "air central", "ground central" + Dictionary with time-dependent coefficients of performance (COPs) for air and ground heat pumps as values and keys "air decentral", "ground decentral", "air central", "ground central" time_dep_hp_cop: bool If True, time-dependent (dynamic) COPs are used for heat pumps """ @@ -459,7 +459,7 @@ def add_heating_capacities_installed_before_baseyear( efficiency = ( cop[f"{heat_pump_type} {name_type}"][nodes] - if options["time_dep_hp_cop"] + if time_dep_hp_cop else costs.at[costs_name, "efficiency"] )