bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change naming from individual/district heating to denctral/central heating

Browse Source
This commit is contained in:
AmosSchledorn 2024-07-19 15:57:53 +02:00
parent f3c898f43d
commit 052394fa88
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rules/build_sector.smk
View File

@ -217,19 +217,19 @@ rule build_temperature_profiles:
rule build_cop_profiles: rule build_cop_profiles:
params: params:
heat_pump_sink_T_individual_heating=config_provider("sector", "heat_pump_sink_T_individual_heating"), heat_pump_sink_T_decentral_heating=config_provider("sector", "heat_pump_sink_T_individual_heating"),
forward_temperature_district_heating=config_provider("sector", "district_heating", "forward_temperature"), forward_temperature_central_heating=config_provider("sector", "district_heating", "forward_temperature"),
return_temperature_district_heating=config_provider("sector", "district_heating", "return_temperature"), return_temperature_central_heating=config_provider("sector", "district_heating", "return_temperature"),
heat_source_cooling_district_heating=config_provider("sector", "district_heating", "heat_source_cooling"), heat_source_cooling_central_heating=config_provider("sector", "district_heating", "heat_source_cooling"),
heat_pump_cop_approximation=config_provider("sector", "district_heating", "heat_pump_cop_approximation"), heat_pump_cop_approximation_central_heating=config_provider("sector", "district_heating", "heat_pump_cop_approximation"),
input: input:
temp_soil_total=resources("temp_soil_total_elec_s{simpl}_{clusters}.nc"), temp_soil_total=resources("temp_soil_total_elec_s{simpl}_{clusters}.nc"),
temp_air_total=resources("temp_air_total_elec_s{simpl}_{clusters}.nc"), temp_air_total=resources("temp_air_total_elec_s{simpl}_{clusters}.nc"),
output: output:
cop_soil_individual_heating=resources("cop_soil_individual_heating_elec_s{simpl}_{clusters}.nc"), cop_air_decentral_heating=resources("cop_air_decentral_elec_s{simpl}_{clusters}.nc"),
cop_air_individual_heating=resources("cop_air_individual_heating_elec_s{simpl}_{clusters}.nc"), cop_soil_decentral_heating=resources("cop_soil_decentral_elec_s{simpl}_{clusters}.nc"),
cop_air_district_heating=resources("cop_air_district_heating_elec_s{simpl}_{clusters}.nc"), cop_air_central_heating=resources("cop_air_central_heating_elec_s{simpl}_{clusters}.nc"),
cop_soil_district_heating=resources("cop_soil_district_heating_elec_s{simpl}_{clusters}.nc"), cop_soil_central_heating=resources("cop_soil_central_heating_elec_s{simpl}_{clusters}.nc"),
resources: resources:
mem_mb=20000, mem_mb=20000,
log: log:
@ -1027,10 +1027,10 @@ rule prepare_sector_network:
temp_air_total=resources("temp_air_total_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_rural=resources("temp_air_rural_elec_s{simpl}_{clusters}.nc"),
temp_air_urban=resources("temp_air_urban_elec_s{simpl}_{clusters}.nc"), temp_air_urban=resources("temp_air_urban_elec_s{simpl}_{clusters}.nc"),
cop_soil_individual_heating=resources("cop_soil_individual_heating_elec_s{simpl}_{clusters}.nc"), cop_soil_decentral_heating=resources("cop_soil_decentral_heating_elec_s{simpl}_{clusters}.nc"),
cop_air_individual_heating=resources("cop_air_individual_heating_elec_s{simpl}_{clusters}.nc"), cop_air_decentral_heating=resources("cop_air_decentral_heating_elec_s{simpl}_{clusters}.nc"),
cop_air_district_heating=resources("cop_air_district_heating_elec_s{simpl}_{clusters}.nc"), cop_air_central_heating=resources("cop_air_central_heating_elec_s{simpl}_{clusters}.nc"),
cop_soil_district_heating=resources("cop_soil_district_heating_elec_s{simpl}_{clusters}.nc"), cop_soil_central_heating=resources("cop_soil_central_heating_elec_s{simpl}_{clusters}.nc"),
solar_thermal_total=lambda w: ( solar_thermal_total=lambda w: (
resources("solar_thermal_total_elec_s{simpl}_{clusters}.nc") resources("solar_thermal_total_elec_s{simpl}_{clusters}.nc")
if config_provider("sector", "solar_thermal")(w) if config_provider("sector", "solar_thermal")(w)

4
scripts/build_cop_profiles.py
View File

@ -371,7 +371,7 @@ if __name__ == "__main__":
delta_T = snakemake.params.heat_pump_sink_T_individual_heating - source_T delta_T = snakemake.params.heat_pump_sink_T_individual_heating - source_T
cop_individual_heating = coefficient_of_performance_individual_heating(delta_T, source) cop_individual_heating = coefficient_of_performance_individual_heating(delta_T, source)
cop_individual_heating.to_netcdf(snakemake.output[f"cop_{source}_individual_heating"]) cop_individual_heating.to_netcdf(snakemake.output[f"cop_{source}_decentral_heating"])
cop_district_heating = CopDistrictHeating( cop_district_heating = CopDistrictHeating(
forward_temperature_celsius=snakemake.params.forward_temperature_district_heating, forward_temperature_celsius=snakemake.params.forward_temperature_district_heating,
@ -380,6 +380,6 @@ if __name__ == "__main__":
source_outlet_temperature_celsius=source_T - snakemake.params.heat_source_cooling_district_heating, source_outlet_temperature_celsius=source_T - snakemake.params.heat_source_cooling_district_heating,
).cop() ).cop()
cop_district_heating.to_netcdf(snakemake.output[f"cop_{source}_district_heating"]) cop_district_heating.to_netcdf(snakemake.output[f"cop_{source}_central_heating"])

4
scripts/prepare_sector_network.py
View File

@ -1824,10 +1824,10 @@ def add_heat(n, costs):
] ]
cop = { cop = {
"air": xr.open_dataarray(snakemake.input.cop_air_individual_heating) "air": xr.open_dataarray(snakemake.input.cop_air_decentral_heating)
.to_pandas() .to_pandas()
.reindex(index=n.snapshots), .reindex(index=n.snapshots),
"ground": xr.open_dataarray(snakemake.input.cop_soil_individual_heating) "ground": xr.open_dataarray(snakemake.input.cop_soil_decentral_heating)
.to_pandas() .to_pandas()
.reindex(index=n.snapshots), .reindex(index=n.snapshots),
} }