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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2024-08-05 09:42:42 +00:00
parent 7bd0c16ddd
commit 61bb225a34
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/add_existing_baseyear.py
View File

@ -453,12 +453,16 @@ def add_heating_capacities_installed_before_baseyear(
n.buses.location[n.buses.index.str.contains(f"{heat_system} heat")] n.buses.location[n.buses.index.str.contains(f"{heat_system} heat")]
) )
if (not heat_system == HeatSystem.URBAN_CENTRAL) and options["electricity_distribution_grid"]: if (not heat_system == HeatSystem.URBAN_CENTRAL) and options[
"electricity_distribution_grid"
]:
nodes_elec = nodes + " low voltage" nodes_elec = nodes + " low voltage"
else: else:
nodes_elec = nodes nodes_elec = nodes
too_large_grouping_years = [gy for gy in grouping_years if gy >= int(baseyear)] too_large_grouping_years = [
gy for gy in grouping_years if gy >= int(baseyear)
]
if too_large_grouping_years: if too_large_grouping_years:
logger.warning( logger.warning(
f"Grouping years >= baseyear are ignored. Dropping {too_large_grouping_years}." f"Grouping years >= baseyear are ignored. Dropping {too_large_grouping_years}."
@ -483,11 +487,17 @@ def add_heating_capacities_installed_before_baseyear(
for ratio, grouping_year in zip(ratios, valid_grouping_years): for ratio, grouping_year in zip(ratios, valid_grouping_years):
# Add heat pumps # Add heat pumps
for heat_source in snakemake.params.heat_pump_sources[heat_system.system_type.value]: for heat_source in snakemake.params.heat_pump_sources[
heat_system.system_type.value
]:
costs_name = heat_system.heat_pump_costs_name(heat_source) costs_name = heat_system.heat_pump_costs_name(heat_source)
efficiency = ( efficiency = (
cop.sel(heat_system=heat_system.system_type.value, heat_source=heat_source, name=nodes) cop.sel(
heat_system=heat_system.system_type.value,
heat_source=heat_source,
name=nodes,
)
.to_pandas() .to_pandas()
.reindex(index=n.snapshots) .reindex(index=n.snapshots)
if options["time_dep_hp_cop"] if options["time_dep_hp_cop"]
@ -521,7 +531,9 @@ def add_heating_capacities_installed_before_baseyear(
bus0=nodes_elec, bus0=nodes_elec,
bus1=nodes + " " + heat_system.value + " heat", bus1=nodes + " " + heat_system.value + " heat",
carrier=heat_system.value + " resistive heater", carrier=heat_system.value + " resistive heater",
efficiency=costs.at[heat_system.resistive_heater_costs_name, "efficiency"], efficiency=costs.at[
heat_system.resistive_heater_costs_name, "efficiency"
],
capital_cost=( capital_cost=(
costs.at[heat_system.resistive_heater_costs_name, "efficiency"] costs.at[heat_system.resistive_heater_costs_name, "efficiency"]
* costs.at[heat_system.resistive_heater_costs_name, "fixed"] * costs.at[heat_system.resistive_heater_costs_name, "fixed"]
@ -576,7 +588,9 @@ def add_heating_capacities_installed_before_baseyear(
/ costs.at[heat_system.oil_boiler_costs_name, "efficiency"] / costs.at[heat_system.oil_boiler_costs_name, "efficiency"]
), ),
build_year=int(grouping_year), build_year=int(grouping_year),
lifetime=costs.at[f"{heat_system.central_or_decentral} gas boiler", "lifetime"], lifetime=costs.at[
f"{heat_system.central_or_decentral} gas boiler", "lifetime"
],
) )
# delete links with p_nom=nan corresponding to extra nodes in country # delete links with p_nom=nan corresponding to extra nodes in country

8
scripts/enums/HeatSystem.py
View File

@ -210,7 +210,8 @@ class HeatSystem(Enum):
def heat_pump_costs_name(self, heat_source: str) -> str: def heat_pump_costs_name(self, heat_source: str) -> str:
""" """
Generates the name for the heat pump costs based on the heat source and system. Generates the name for the heat pump costs based on the heat source and
system.
Parameters Parameters
---------- ----------
@ -227,7 +228,8 @@ class HeatSystem(Enum):
@property @property
def resistive_heater_costs_name(self) -> str: def resistive_heater_costs_name(self) -> str:
""" """
Generates the name for the resistive heater costs based on the heat system. Generates the name for the resistive heater costs based on the heat
system.
Returns Returns
------- -------
@ -259,5 +261,3 @@ class HeatSystem(Enum):
The name for the oil boiler costs. The name for the oil boiler costs.
""" """
return "decentral oil boiler" return "decentral oil boiler"