From 2c49b8e3c33edc43da14d5d8cfbd3480c01a1bf1 Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Wed, 2 Dec 2020 11:51:27 +0100 Subject: [PATCH] config: Move heat pump sink temp from script to config.yaml --- config.default.yaml | 4 +++- scripts/build_cop_profiles.py | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 54470178..016913c9 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -99,7 +99,9 @@ sector: 'transport_fuel_cell_efficiency': 0.5 'transport_internal_combustion_efficiency': 0.3 'shipping_average_efficiency' : 0.4 #For conversion of fuel oil to propulsion in 2011 - 'time_dep_hp_cop' : True + 'time_dep_hp_cop' : True #time dependent heat pump coefficient of performance + 'heat_pump_sink_T' : 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py + # conservatively high to cover hot water and space heating in poorly-insulated buildings 'retrofitting' : 'retro_exogen': True # space heat demand savings exogenously 'dE': # reduction of space heat demand (applied before losses in DH) diff --git a/scripts/build_cop_profiles.py b/scripts/build_cop_profiles.py index d469489c..fddd86f6 100644 --- a/scripts/build_cop_profiles.py +++ b/scripts/build_cop_profiles.py @@ -9,16 +9,13 @@ import xarray as xr cop_f = {"air" : lambda d_t: 6.81 -0.121*d_t + 0.000630*d_t**2, "soil" : lambda d_t: 8.77 -0.150*d_t + 0.000734*d_t**2} -sink_T = 55. # Based on DTU / large area radiators - - for area in ["total", "urban", "rural"]: for source in ["air", "soil"]: source_T = xr.open_dataarray(snakemake.input["temp_{}_{}".format(source,area)]) - delta_T = sink_T - source_T + delta_T = snakemake.config['sector']['heat_pump_sink_T'] - source_T cop = cop_f[source](delta_T)