address pylint errors

Author: lindnemi

scripts/add_existing_baseyear.py

@@ -156,10 +156,13 @@ def add_power_capacities_installed_before_baseyear(
     grouping_years: list[int],
     baseyear: int,
     powerplants_file: str,
+    custom_powerplants_file: str,
     countries: list[str],
     capacity_threshold: float,
     lifetime_values: dict[str, float],
+    lifetime_gas_chp: int,
     renewable_carriers: list[str],
+    options: dict,
 ) -> None:
     """
     Add power generation capacities installed before base year.
@@ -176,23 +179,25 @@ def add_power_capacities_installed_before_baseyear(
         Base year for analysis
     powerplants_file : str
         Path to powerplants CSV file
+    custom_powerplants_file : str
+        Path to custom powerplants CSV file
     countries : list
         List of countries to consider
     capacity_threshold : float
         Minimum capacity threshold
     lifetime_values : dict
         Default values for missing data
-    renewable_carriers: list
+    lifetime_gas_chp: int,
+        Lifetime for gas CHPs if missing
+    renewable_carriers: list[str]
         List of renewable carriers in the network
+    options: dict,
     """
     logger.debug(f"Adding power capacities installed before {baseyear}")
 
     df_agg = pd.read_csv(powerplants_file, index_col=0)
-
-    if snakemake.input.get("custom_powerplants"):
-        df_agg = add_custom_powerplants(
-            df_agg, snakemake.input.custom_powerplants, True
-        )
+    if custom_powerplants_file:
+        df_agg = add_custom_powerplants(df_agg, custom_powerplants_file, True)
 
     rename_fuel = {
         "Hard Coal": "coal",
@@ -258,7 +263,18 @@ def add_power_capacities_installed_before_baseyear(
     )
 
     # add chp plants
-    add_chp_plants(n, grouping_years, costs, baseyear)
+    add_chp_plants(
+        n,
+        grouping_years,
+        costs,
+        baseyear,
+        powerplants_file,
+        custom_powerplants_file,
+        lifetime_values,
+        lifetime_gas_chp,
+        capacity_threshold,
+        options,
+    )
 
     # drop assets which are already phased out / decommissioned
     phased_out = df_agg[df_agg["DateOut"] < baseyear].index
@@ -484,7 +500,18 @@ def add_power_capacities_installed_before_baseyear(
             ]
 
 
-def add_chp_plants(n, grouping_years, costs, baseyear):
+def add_chp_plants(
+    n,
+    grouping_years,
+    costs,
+    baseyear,
+    powerplants_file,
+    custom_powerplants_file,
+    lifetime_values,
+    lifetime_gas_chp,
+    capacity_threshold,
+    options,
+):
     # rename fuel of CHPs - lignite not in DEA database
     rename_fuel = {
         "Hard Coal": "coal",
@@ -495,13 +522,13 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
         "Oil": "oil",
     }
 
-    ppl = pd.read_csv(snakemake.input.powerplants, index_col=0)
+    ppl = pd.read_csv(powerplants_file, index_col=0)
 
-    if snakemake.input.get("custom_powerplants"):
-        if snakemake.input.custom_powerplants.endswith("german_chp_{clusters}.csv"):
+    if custom_powerplants_file:
+        if custom_powerplants_file.endswith("german_chp_{clusters}.csv"):
             logger.info("Supersedeing default German CHPs with custom_powerplants.")
             ppl = ppl.query("~(Set == 'CHP' and Country == 'DE')")
-        ppl = add_custom_powerplants(ppl, snakemake.input.custom_powerplants, True)
+        ppl = add_custom_powerplants(ppl, custom_powerplants_file, True)
 
     # drop assets which are already phased out / decommissioned
     # drop hydro, waste and oil fueltypes for CHP
@@ -519,11 +546,11 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
         grouping_years, np.digitize(chp.DateIn, grouping_years, right=True)
     )
     chp["lifetime"] = (chp.DateOut - chp["grouping_year"] + 1).fillna(
-        snakemake.params.costs["fill_values"]["lifetime"]
+        lifetime_values["lifetime"]
     )
     chp.loc[chp.Fueltype == "gas", "lifetime"] = (
         chp.DateOut - chp["grouping_year"] + 1
-    ).fillna(snakemake.params.existing_capacities["fill_value_gas_chp_lifetime"])
+    ).fillna(lifetime_gas_chp)
 
     chp = chp.loc[
         chp.grouping_year + chp.lifetime > baseyear
@@ -611,7 +638,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
         for grouping_year, generator in mastr_chp_p_nom.index:
             # capacity is the capacity in MW at each node for this
             p_nom = mastr_chp_p_nom.loc[grouping_year, generator]
-            threshold = snakemake.params.existing_capacities["threshold_capacity"]
+            threshold = capacity_threshold
             p_nom = p_nom[p_nom > threshold]
 
             efficiency_power = mastr_chp_efficiency_power.loc[grouping_year, generator]
@@ -701,7 +728,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
     )
     for grouping_year, generator in chp_nodal_p_nom.index:
         p_nom = chp_nodal_p_nom.loc[grouping_year, generator]
-        threshold = snakemake.params.existing_capacities["threshold_capacity"]
+        threshold = capacity_threshold
         p_nom = p_nom[p_nom > threshold]
         lifetime = chp_nodal_lifetime.loc[grouping_year, generator]
 
@@ -1156,10 +1183,15 @@ def add_heating_capacities_installed_before_baseyear(
         grouping_years=grouping_years_power,
         baseyear=baseyear,
         powerplants_file=snakemake.input.powerplants,
+        custom_powerplants_file=snakemake.input.get("custom_powerplants", ""),
         countries=snakemake.config["countries"],
         capacity_threshold=snakemake.params.existing_capacities["threshold_capacity"],
         lifetime_values=snakemake.params.costs["fill_values"],
+        lifetime_gas_chp=snakemake.params.existing_capacities[
+            "fill_value_gas_chp_lifetime"
+        ],
         renewable_carriers=renewable_carriers,
+        options=options,
     )
 
     if options["heating"]:

scripts/prepare_sector_network.py

@@ -2423,6 +2423,7 @@ def add_EVs(
     temperature: pd.DataFrame,
     spatial: SimpleNamespace,
     options: dict,
+    investment_year: int,
 ) -> None:
     """
     Add electric vehicle (EV) infrastructure to the network.
@@ -2463,6 +2464,7 @@ def add_EVs(
         - bev_energy: float
         - bev_dsm_availability: float
         - v2g: bool
+    investment_year: int
 
     Returns
     -------
@@ -2872,6 +2874,7 @@ def add_land_transport(
             temperature,
             spatial,
             options,
+            investment_year,
         )
 
     if shares["fuel_cell"] > 0: