From 167b056defe1473dcc83048c9408b0848ec0a03b Mon Sep 17 00:00:00 2001 From: AmosSchledorn Date: Fri, 19 Jul 2024 15:22:50 +0200 Subject: [PATCH] remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating --- rules/build_sector.smk | 20 ++++---------------- scripts/build_cop_profiles.py | 11 +++++------ scripts/prepare_sector_network.py | 4 ++-- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/rules/build_sector.smk b/rules/build_sector.smk index 6614b163..9986bceb 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -220,18 +220,10 @@ rule build_cop_profiles: heat_pump_sink_T=config_provider("sector", "heat_pump_sink_T"), input: temp_soil_total=resources("temp_soil_total_elec_s{simpl}_{clusters}.nc"), - temp_soil_rural=resources("temp_soil_rural_elec_s{simpl}_{clusters}.nc"), - temp_soil_urban=resources("temp_soil_urban_elec_s{simpl}_{clusters}.nc"), temp_air_total=resources("temp_air_total_elec_s{simpl}_{clusters}.nc"), - temp_air_rural=resources("temp_air_rural_elec_s{simpl}_{clusters}.nc"), - temp_air_urban=resources("temp_air_urban_elec_s{simpl}_{clusters}.nc"), output: - cop_soil_total=resources("cop_soil_total_elec_s{simpl}_{clusters}.nc"), - cop_soil_rural=resources("cop_soil_rural_elec_s{simpl}_{clusters}.nc"), - cop_soil_urban=resources("cop_soil_urban_elec_s{simpl}_{clusters}.nc"), - cop_air_total=resources("cop_air_total_elec_s{simpl}_{clusters}.nc"), - cop_air_rural=resources("cop_air_rural_elec_s{simpl}_{clusters}.nc"), - cop_air_urban=resources("cop_air_urban_elec_s{simpl}_{clusters}.nc"), + cop_soil_individual_heating=resources("cop_soil_individual_heating_elec_s{simpl}_{clusters}.nc"), + cop_air_individual_heating=resources("cop_air_individual_heating_elec_s{simpl}_{clusters}.nc"), resources: mem_mb=20000, log: @@ -1029,12 +1021,8 @@ rule prepare_sector_network: temp_air_total=resources("temp_air_total_elec_s{simpl}_{clusters}.nc"), temp_air_rural=resources("temp_air_rural_elec_s{simpl}_{clusters}.nc"), temp_air_urban=resources("temp_air_urban_elec_s{simpl}_{clusters}.nc"), - cop_soil_total=resources("cop_soil_total_elec_s{simpl}_{clusters}.nc"), - cop_soil_rural=resources("cop_soil_rural_elec_s{simpl}_{clusters}.nc"), - cop_soil_urban=resources("cop_soil_urban_elec_s{simpl}_{clusters}.nc"), - cop_air_total=resources("cop_air_total_elec_s{simpl}_{clusters}.nc"), - cop_air_rural=resources("cop_air_rural_elec_s{simpl}_{clusters}.nc"), - cop_air_urban=resources("cop_air_urban_elec_s{simpl}_{clusters}.nc"), + cop_soil_individual_heating=resources("cop_soil_individual_heating_elec_s{simpl}_{clusters}.nc"), + cop_air_individual_heating=resources("cop_air_individual_heating_elec_s{simpl}_{clusters}.nc"), solar_thermal_total=lambda w: ( resources("solar_thermal_total_elec_s{simpl}_{clusters}.nc") if config_provider("sector", "solar_thermal")(w) diff --git a/scripts/build_cop_profiles.py b/scripts/build_cop_profiles.py index 2a47198b..104737b8 100644 --- a/scripts/build_cop_profiles.py +++ b/scripts/build_cop_profiles.py @@ -67,12 +67,11 @@ if __name__ == "__main__": set_scenario_config(snakemake) - for area in ["total", "urban", "rural"]: - for source in ["air", "soil"]: - source_T = xr.open_dataarray(snakemake.input[f"temp_{source}_{area}"]) + for source in ["air", "soil"]: + source_T = xr.open_dataarray(snakemake.input[f"temp_{source}_total"]) - delta_T = snakemake.params.heat_pump_sink_T - source_T + delta_T = snakemake.params.heat_pump_sink_T - source_T - cop = coefficient_of_performance(delta_T, source) + cop = coefficient_of_performance(delta_T, source) - cop.to_netcdf(snakemake.output[f"cop_{source}_{area}"]) + cop.to_netcdf(snakemake.output[f"cop_{source}_individual_heating"]) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 53b811aa..1967bf44 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1824,10 +1824,10 @@ def add_heat(n, costs): ] cop = { - "air": xr.open_dataarray(snakemake.input.cop_air_total) + "air": xr.open_dataarray(snakemake.input.cop_air_individual_heating) .to_pandas() .reindex(index=n.snapshots), - "ground": xr.open_dataarray(snakemake.input.cop_soil_total) + "ground": xr.open_dataarray(snakemake.input.cop_soil_individual_heating) .to_pandas() .reindex(index=n.snapshots), }