Merge branch 'master' into update-district-heating-cops

config/config.default.yaml

@@ -1063,7 +1063,7 @@ plotting:
     V2G: '#e5ffa8'
     land transport EV: '#baf238'
     land transport demand: '#38baf2'
-    Li ion: '#baf238'
+    EV battery: '#baf238'
     # hot water storage
     water tanks: '#e69487'
     residential rural water tanks: '#f7b7a3'

doc/release_notes.rst

@@ -12,6 +12,8 @@ Upcoming Release
 
 * Changed heat pump COP approximation for central heating to be based on Jensen et al. 2018 and a default forward temperature of 90C. This is more realistic for district heating than the previously used approximation method.
 
+* Renamed the carrier of batteries in BEVs from `battery storage` to `EV battery` and the corresponding bus carrier from `Li ion` to `EV battery`. This is to avoid confusion with stationary battery storage.
+
 * Changed default assumptions about waste heat usage from PtX and fuel cells in district heating.
   The default value for the link efficiency scaling factor was changed from 100% to 25%.
   It can be set to other values in the configuration ``sector: use_TECHNOLOGY_waste_heat``.

scripts/add_brownfield.py

@@ -89,10 +89,6 @@ def add_brownfield(n, n_p, year):
     # deal with gas network
     pipe_carrier = ["gas pipeline"]
     if snakemake.params.H2_retrofit:
-        # drop capacities of previous year to avoid duplicating
-        to_drop = n.links.carrier.isin(pipe_carrier) & (n.links.build_year != year)
-        n.mremove("Link", n.links.loc[to_drop].index)
-
         # subtract the already retrofitted from today's gas grid capacity
         h2_retrofitted_fixed_i = n.links[
             (n.links.carrier == "H2 pipeline retrofitted")
@@ -115,10 +111,6 @@ def add_brownfield(n, n_p, year):
             index=pipe_capacity.index
         ).fillna(0)
         n.links.loc[gas_pipes_i, "p_nom"] = remaining_capacity
-    else:
-        new_pipes = n.links.carrier.isin(pipe_carrier) & (n.links.build_year == year)
-        n.links.loc[new_pipes, "p_nom"] = 0.0
-        n.links.loc[new_pipes, "p_nom_min"] = 0.0
 
 
 def disable_grid_expansion_if_limit_hit(n):

scripts/prepare_perfect_foresight.py

@@ -250,7 +250,7 @@ def adjust_stores(n):
     n.stores.loc[cyclic_i, "e_cyclic_per_period"] = True
     n.stores.loc[cyclic_i, "e_cyclic"] = False
     # non cyclic store assumptions
-    non_cyclic_store = ["co2", "co2 stored", "solid biomass", "biogas", "Li ion"]
+    non_cyclic_store = ["co2", "co2 stored", "solid biomass", "biogas", "EV battery"]
     co2_i = n.stores[n.stores.carrier.isin(non_cyclic_store)].index
     n.stores.loc[co2_i, "e_cyclic_per_period"] = False
     n.stores.loc[co2_i, "e_cyclic"] = False

scripts/prepare_sector_network.py

@@ -1238,12 +1238,14 @@ def add_storage_and_grids(n, costs):
             gas_pipes["p_nom_min"] = 0.0
             # 0.1 EUR/MWkm/a to prefer decommissioning to address degeneracy
             gas_pipes["capital_cost"] = 0.1 * gas_pipes.length
+            gas_pipes["p_nom_extendable"] = True
         else:
             gas_pipes["p_nom_max"] = np.inf
             gas_pipes["p_nom_min"] = gas_pipes.p_nom
             gas_pipes["capital_cost"] = (
                 gas_pipes.length * costs.at["CH4 (g) pipeline", "fixed"]
             )
+            gas_pipes["p_nom_extendable"] = False
 
         n.madd(
             "Link",
@@ -1252,14 +1254,14 @@ def add_storage_and_grids(n, costs):
             bus1=gas_pipes.bus1 + " gas",
             p_min_pu=gas_pipes.p_min_pu,
             p_nom=gas_pipes.p_nom,
-            p_nom_extendable=True,
+            p_nom_extendable=gas_pipes.p_nom_extendable,
             p_nom_max=gas_pipes.p_nom_max,
             p_nom_min=gas_pipes.p_nom_min,
             length=gas_pipes.length,
             capital_cost=gas_pipes.capital_cost,
             tags=gas_pipes.name,
             carrier="gas pipeline",
-            lifetime=costs.at["CH4 (g) pipeline", "lifetime"],
+            lifetime=np.inf,
         )
 
         # remove fossil generators where there is neither
@@ -1541,14 +1543,14 @@ def add_EVs(
     temperature,
 ):
 
-    n.add("Carrier", "Li ion")
+    n.add("Carrier", "EV battery")
 
     n.madd(
         "Bus",
         spatial.nodes,
         suffix=" EV battery",
         location=spatial.nodes,
-        carrier="Li ion",
+        carrier="EV battery",
         unit="MWh_el",
     )
 
@@ -1621,9 +1623,9 @@ def add_EVs(
         n.madd(
             "Store",
             spatial.nodes,
-            suffix=" battery storage",
+            suffix=" EV battery",
             bus=spatial.nodes + " EV battery",
-            carrier="battery storage",
+            carrier="EV battery",
             e_cyclic=True,
             e_nom=e_nom,
             e_max_pu=1,