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

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

Snakefile

@@ -358,9 +358,7 @@ rule prepare_district_heating_subnodes:
         baseyear=config_provider("scenario", "planning_horizons", 0),
     input:
         heating_technologies_nuts3=resources("heating_technologies_nuts3.geojson"),
-        regions_onshore=resources(
-            "regions_onshore_base_s_{clusters}.geojson"
-        ),
+        regions_onshore=resources("regions_onshore_base_s_{clusters}.geojson"),
         fernwaermeatlas="data/fernwaermeatlas/fernwaermeatlas.xlsx",
         cities="data/fernwaermeatlas/cities_geolocations.geojson",
         lau_regions="data/lau_regions.zip",
@@ -375,8 +373,8 @@ rule prepare_district_heating_subnodes:
         natura=ancient("data/bundle/natura/natura.tiff"),
         groundwater_depth=storage(
             "http://thredds-gfnl.usc.es/thredds/fileServer/GLOBALWTDFTP/annualmeans/EURASIA_WTD_annualmean.nc",
-            keep_local=True
-            ),
+            keep_local=True,
+        ),
     output:
         district_heating_subnodes=resources(
             "district_heating_subnodes_base_s_{clusters}.geojson"
@@ -387,52 +385,51 @@ rule prepare_district_heating_subnodes:
         regions_onshore_restricted=resources(
             "regions_onshore_base-restricted_s_{clusters}.geojson"
         ),
-
     resources:
         mem_mb=20000,
     script:
         "scripts/pypsa-de/prepare_district_heating_subnodes.py"
 
+
 baseyear_value = config["scenario"]["planning_horizons"][0]
 
+
 rule add_district_heating_subnodes:
     params:
         district_heating=config_provider("sector", "district_heating"),
         baseyear=config_provider("scenario", "planning_horizons", 0),
         sector=config_provider("sector"),
-        heat_pump_sources=config_provider("sector", "heat_pump_sources", "urban central"),
+        heat_pump_sources=config_provider(
+            "sector", "heat_pump_sources", "urban central"
+        ),
         heat_utilisation_potentials=config_provider(
-        "sector", "district_heating", "heat_utilisation_potentials"
+            "sector", "district_heating", "heat_utilisation_potentials"
         ),
         direct_utilisation_heat_sources=config_provider(
             "sector", "district_heating", "direct_utilisation_heat_sources"
         ),
-        adjustments=config_provider( "adjustments", "sector"),
+        adjustments=config_provider("adjustments", "sector"),
     input:
         unpack(input_heat_source_power),
         network=resources(
-        "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
-    ),
-        subnodes=resources(
-            "district_heating_subnodes_base_s_{clusters}.geojson"
+            "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
         ),
+        subnodes=resources("district_heating_subnodes_base_s_{clusters}.geojson"),
         nuts3=resources("nuts3_shapes.geojson"),
-        regions_onshore=resources(
-            "regions_onshore_base_s_{clusters}.geojson"
-        ),
+        regions_onshore=resources("regions_onshore_base_s_{clusters}.geojson"),
         fernwaermeatlas="data/fernwaermeatlas/fernwaermeatlas.xlsx",
         cities="data/fernwaermeatlas/cities_geolocations.geojson",
         cop_profiles=resources("cop_profiles_base_s_{clusters}_{planning_horizons}.nc"),
         direct_heat_source_utilisation_profiles=resources(
-        "direct_heat_source_utilisation_profiles_base_s_{clusters}_{planning_horizons}.nc"
+            "direct_heat_source_utilisation_profiles_base_s_{clusters}_{planning_horizons}.nc"
         ),
         existing_heating_distribution=resources(
             f"existing_heating_distribution_base_s_{{clusters}}_{baseyear_value}.csv"
         ),
         lau_regions="data/lau_regions.zip",
     output:
         network=resources(
-        "networks/base-extended_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
+            "networks/base-extended_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
         ),
         district_heating_subnodes=resources(
             "district_heating_subnodes_base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.geojson"
@@ -600,16 +597,12 @@ rule build_existing_chp_de:
         ),
         regions=resources("regions_onshore_base_s_{clusters}.geojson"),
         district_heating_subnodes=(
-            resources(
-                "district_heating_subnodes_base_s_{clusters}.geojson"
-            )
+            resources("district_heating_subnodes_base_s_{clusters}.geojson")
             if config["sector"]["district_heating"].get("add_subnodes", True)
             else []
         ),
     output:
-        german_chp=resources(
-            "german_chp_base_s_{clusters}.csv"
-        ),
+        german_chp=resources("german_chp_base_s_{clusters}.csv"),
     log:
         logs("build_existing_chp_de_{clusters}.log"),
     script:

rules/build_sector.smk

@@ -199,9 +199,11 @@ rule build_temperature_profiles:
         drop_leap_day=config_provider("enable", "drop_leap_day"),
     input:
         pop_layout=resources("pop_layout_total.nc"),
-        regions_onshore=resources("regions_onshore_base-extended_s_{clusters}.geojson") if  config["sector"][
-        "district_heating"
-        ].get("add_subnodes", True) else resources("regions_onshore_base_s_{clusters}.geojson"),
+        regions_onshore=(
+            resources("regions_onshore_base-extended_s_{clusters}.geojson")
+            if config["sector"]["district_heating"].get("add_subnodes", True)
+            else resources("regions_onshore_base_s_{clusters}.geojson")
+        ),
         cutout=lambda w: input_cutout(
             w, config_provider("sector", "heat_demand_cutout")(w)
         ),
@@ -270,9 +272,11 @@ rule build_central_heating_temperature_profiles:
         energy_totals_year=config_provider("energy", "energy_totals_year"),
     input:
         temp_air_total=resources("temp_air_total_base_s_{clusters}.nc"),
-        regions_onshore=resources("regions_onshore_base-extended_s_{clusters}.geojson") if  config["sector"][
-    "district_heating"
-].get("add_subnodes", True) else resources("regions_onshore_base_s_{clusters}.geojson"),
+        regions_onshore=(
+            resources("regions_onshore_base-extended_s_{clusters}.geojson")
+            if config["sector"]["district_heating"].get("add_subnodes", True)
+            else resources("regions_onshore_base_s_{clusters}.geojson")
+        ),
     output:
         central_heating_forward_temperature_profiles=resources(
             "central_heating_forward_temperature_profiles_base_s_{clusters}_{planning_horizons}.nc"
@@ -316,9 +320,11 @@ rule build_geothermal_heat_potential:
         ),
     input:
         isi_heat_potentials="data/isi_heat_utilisation_potentials.xlsx",
-        regions_onshore=resources("regions_onshore_base-restricted_s_{clusters}.geojson")
-        if config["sector"]["district_heating"].get("add_subnodes", True)
-        else resources("regions_onshore_base_s_{clusters}.geojson"),
+        regions_onshore=(
+            resources("regions_onshore_base-restricted_s_{clusters}.geojson")
+            if config["sector"]["district_heating"].get("add_subnodes", True)
+            else resources("regions_onshore_base_s_{clusters}.geojson")
+        ),
         lau_regions="data/lau_regions.zip",
     output:
         heat_source_power=resources(
@@ -361,9 +367,11 @@ rule build_cop_profiles:
         ),
         temp_soil_total=resources("temp_soil_total_base_s_{clusters}.nc"),
         temp_air_total=resources("temp_air_total_base_s_{clusters}.nc"),
-        regions_onshore=resources("regions_onshore_base-extended_s_{clusters}.geojson") if  config["sector"][
-    "district_heating"
-].get("add_subnodes", True) else resources("regions_onshore_base_s_{clusters}.geojson"),
+        regions_onshore=(
+            resources("regions_onshore_base-extended_s_{clusters}.geojson")
+            if config["sector"]["district_heating"].get("add_subnodes", True)
+            else resources("regions_onshore_base_s_{clusters}.geojson")
+        ),
     output:
         cop_profiles=resources("cop_profiles_base_s_{clusters}_{planning_horizons}.nc"),
     resources:

rules/solve_myopic.smk

@@ -15,11 +15,14 @@ rule add_existing_baseyear:
             "sector", "district_heating", "add_subnodes"
         ),
     input:
-        network=resources(
-            "networks/base-extended_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
-        ) if config["sector"]["district_heating"].get("add_subnodes", True)
+        network=(
+            resources(
+                "networks/base-extended_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
+            )
+            if config["sector"]["district_heating"].get("add_subnodes", True)
             else resources(
-            "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
+                "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
+            )
         ),
         powerplants=resources("powerplants_s_{clusters}.csv"),
         busmap_s=resources("busmap_base_s.csv"),
@@ -41,9 +44,7 @@ rule add_existing_baseyear:
             )
         ),
         heating_efficiencies=resources("heating_efficiencies.csv"),
-        custom_powerplants=resources(
-            "german_chp_base_s_{clusters}.csv"
-        ),
+        custom_powerplants=resources("german_chp_base_s_{clusters}.csv"),
     output:
         resources(
             "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}_brownfield.nc"
@@ -97,12 +98,15 @@ rule add_brownfield:
         unpack(input_profile_tech_brownfield),
         simplify_busmap=resources("busmap_base_s.csv"),
         cluster_busmap=resources("busmap_base_s_{clusters}.csv"),
-        network=resources(
-        "networks/base-extended_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
-        ) if config["sector"]["district_heating"].get("add_subnodes", True)
+        network=(
+            resources(
+                "networks/base-extended_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
+            )
+            if config["sector"]["district_heating"].get("add_subnodes", True)
             else resources(
                 "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc"
-                ),
+            )
+        ),
         network_p=solved_previous_horizon,  #solved network at previous time step
         costs=resources("costs_{planning_horizons}.csv"),
         cop_profiles=resources("cop_profiles_base_s_{clusters}_{planning_horizons}.nc"),

scripts/build_existing_heating_distribution.py

@@ -145,9 +145,9 @@ def build_existing_heating():
         )
         nodal_heat_name_tech[(f"{sector} urban decentral", "ground heat pump")] = 0.0
 
-        nodal_heat_name_tech[
-            (f"{sector} urban decentral", "air heat pump")
-        ] += nodal_heat_name_tech[(f"{sector} rural", "air heat pump")]
+        nodal_heat_name_tech[(f"{sector} urban decentral", "air heat pump")] += (
+            nodal_heat_name_tech[(f"{sector} rural", "air heat pump")]
+        )
         nodal_heat_name_tech[(f"{sector} rural", "air heat pump")] = 0.0
 
     # add large-scale heat pump sources as columns for district heating with 0 capacity

scripts/prepare_sector_network.py

@@ -3031,9 +3031,7 @@ def add_heat(
         # 1e3 converts from W/m^2 to MW/(1000m^2) = kW/m^2
         solar_thermal = options["solar_cf_correction"] * solar_thermal / 1e3
 
-    for (
-        heat_system
-    ) in (
+    for heat_system in (
         HeatSystem
     ):  # this loops through all heat systems defined in _entities.HeatSystem
         overdim_factor = options["overdimension_heat_generators"][
@@ -6013,9 +6011,9 @@ def add_enhanced_geothermal(
         * Nyears
     )
 
-    assert (
-        egs_potentials["capital_cost"] > 0
-    ).all(), "Error in EGS cost, negative values found."
+    assert (egs_potentials["capital_cost"] > 0).all(), (
+        "Error in EGS cost, negative values found."
+    )
 
     orc_annuity = calculate_annuity(costs.at["organic rankine cycle", "lifetime"], dr)
     orc_capital_cost = (orc_annuity + FOM / (1 + FOM)) * orc_capex * Nyears

scripts/pypsa-de/add_district_heating_subnodes.py

@@ -1,25 +1,24 @@
-# -*- coding: utf-8 -*-
 import logging
 
 logger = logging.getLogger(__name__)
 
+import os
+import sys
+from typing import Union
+
 import geopandas as gpd
 import pandas as pd
 import pypsa
 import xarray as xr
-from typing import Union
-
-import os
-import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from scripts.prepare_network import maybe_adjust_costs_and_potentials
 from scripts._helpers import (
     configure_logging,
     set_scenario_config,
     update_config_from_wildcards,
 )
+from scripts.prepare_network import maybe_adjust_costs_and_potentials
 
 
 def add_subnodes(
@@ -36,6 +35,7 @@ def add_subnodes(
      - the heat demand profiles taken from the mother node,
      - the district heating investment options (stores, storage units, links, generators) from the mother node,
     The district heating loads in the mother nodes are reduced accordingly.
+
     Parameters
     ----------
     n : pypsa.Network
@@ -46,6 +46,7 @@ def add_subnodes(
         COPs for heat pumps.
     direct_heat_source_utilisation_profile : xr.DataArray
         Direct heat source utilisation profiles.
+
     Returns
     -------
     None
@@ -67,7 +68,7 @@ def add_subnodes(
 
     # Add subnodes to network
     for _, subnode in subnodes_head.iterrows():
-        name = f'{subnode["cluster"]} {subnode["Stadt"]} urban central'
+        name = f"{subnode['cluster']} {subnode['Stadt']} urban central"
         location = f"{subnode['cluster']} {subnode['Stadt']}"
 
         # Add buses
@@ -160,10 +161,10 @@ def add_subnodes(
         )
 
         # Adjust loads of cluster buses
-        n.loads_t.p_set.loc[:, f'{subnode["cluster"]} urban central heat'] -= uch_load
+        n.loads_t.p_set.loc[:, f"{subnode['cluster']} urban central heat"] -= uch_load
 
         n.loads.loc[
-            f'{subnode["cluster"]} low-temperature heat for industry', "p_set"
+            f"{subnode['cluster']} low-temperature heat for industry", "p_set"
         ] -= lti_load
 
         if lost_load > 0:
@@ -211,7 +212,7 @@ def add_subnodes(
         if storage_units.carrier.str.contains("pits$").any():
             storage_units.loc[
                 storage_units.carrier.str.contains("pits$"), "p_nom_max"
-            ] = (subnode["ptes_pot_mwh"] / storage_units["max_hours"])
+            ] = subnode["ptes_pot_mwh"] / storage_units["max_hours"]
         n.add("StorageUnit", storage_units.index, **storage_units)
 
         # restrict PTES capacity in mother nodes
@@ -365,6 +366,7 @@ def extend_heating_distribution(
         DataFrame containing the existing heating distribution.
     subnodes : gpd.GeoDataFrame
         GeoDataFrame containing information about district heating subnodes.
+
     Returns
     -------
     pd.DataFrame
@@ -409,7 +411,6 @@ def extend_heating_distribution(
 
 if __name__ == "__main__":
     if "snakemake" not in globals():
-
         from scripts._helpers import mock_snakemake
 
         # Change directory to this script directory

scripts/pypsa-de/build_existing_chp_de.py

@@ -212,6 +212,7 @@ def assign_subnode(
 ) -> pd.DataFrame:
     """
     Assign subnodes to the CHP plants based on their location.
+
     Parameters
     ----------
     CHP_de : pd.DataFrame
@@ -220,6 +221,7 @@ def assign_subnode(
         GeoDataFrame containing subnode data with geometries.
     head : Union[bool, int]
         If int, select the largest N subnodes. If True, use all subnodes.
+
     Returns
     -------
     pd.DataFrame