Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-fl…

…oating
PyPSA · fneum · May 13, 2024 · Oct 29, 2021 · Nov 6, 2023 · Nov 6, 2023
commit da617be27609748fd169e5eee857ba8ef95d3ccf
diff --git a/config/config.default.yaml b/config/config.default.yaml
@@ -698,7 +698,7 @@ industry:
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs
 costs:
   year: 2030
-  version: 1e6e79a
+  version: v0.8.1
   rooftop_share: 0.14  # based on the potentials, assuming  (0.1 kW/m2 and 10 m2/person)
   social_discountrate: 0.02
   fill_values:
@@ -900,7 +900,7 @@ plotting:
     offshore wind (DC): "#74c6f2"
     offshore wind dc: "#74c6f2"
     offwind-float: "#b5e2fa"
-    offshore wind (float): "#b5e2fa"
+    offshore wind (Float): "#b5e2fa"
     offshore wind float: "#b5e2fa"
     # water
     hydro: '#298c81'

diff --git a/doc/configuration.rst b/doc/configuration.rst
@@ -31,7 +31,7 @@ Top-level configuration
 .. _run_cf:
 
 ``run``
-=======
+=============
 
 It is common conduct to analyse energy system optimisation models for **multiple scenarios** for a variety of reasons,
 e.g. assessing their sensitivity towards changing the temporal and/or geographical resolution or investigating how

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -412,9 +412,59 @@ Special thanks for this release to Koen van Greevenbroek (`@koen-vg
 <https://github.com/koen-vg>`__) for various new features, bugfixes and taking
 care of deprecations.
 
-* Updated Global Energy Monitor LNG terminal data to March 2023 version.
 
-* For industry distribution, use EPRTR as fallback if ETS data is not available.
+PyPSA-Eur 0.9.0 (5th January 2024)
+==================================
+
+**New Features**
+
+* Add option to specify losses for bidirectional links, e.g. pipelines or HVDC
+  links, in configuration file under ``sector: transmission_efficiency:``. Users
+  can specify static or length-dependent values as well as a length-dependent
+  electricity demand for compression, which is implemented as a multi-link to
+  the local electricity buses. The bidirectional links will then be split into
+  two unidirectional links with linked capacities (https://github.com/PyPSA/pypsa-eur/pull/739).
+
+* Merged option to extend geographical scope to Ukraine and Moldova. These
+  countries are excluded by default and is currently constrained to power-sector
+  only parts of the workflow. A special config file
+  `config/config.entsoe-all.yaml` was added as an example to run the workflow
+  with all ENTSO-E member countries (including observer members like Ukraine and
+  Moldova). Moldova can currently only be included in conjunction with Ukraine
+  due to the absence of demand data. The Crimean power system is manually
+  reconnected to the main Ukrainian grid with the configuration option
+  `reconnect_crimea` (https://github.com/PyPSA/pypsa-eur/pull/321).
+
+* New experimental support for multi-decade optimisation with perfect foresight
+  (``foresight: perfect``). Maximum growth rates for carriers, global carbon
+  budget constraints and emission constraints for particular investment periods.
+
+* Add option to reference an additional source file where users can specify
+  custom ``extra_functionality`` constraints in the configuration file. The
+  default setting points to an empty hull at
+  ``data/custom_extra_functionality.py`` (https://github.com/PyPSA/pypsa-eur/pull/824).
+
+* Add locations, capacities and costs of existing gas storage using Global
+  Energy Monitor's `Europe Gas Tracker
+  <https://globalenergymonitor.org/projects/europe-gas-tracker>`__
+  (https://github.com/PyPSA/pypsa-eur/pull/835).
+
+* Add option to use `LUISA Base Map
+  <https://publications.jrc.ec.europa.eu/repository/handle/JRC124621>`__ 50m land
+  coverage dataset for land eligibility analysis in
+  :mod:`build_renewable_profiles`. Settings are analogous to the CORINE dataset
+  but with the key ``luisa:`` in the configuration file. To leverage the
+  dataset's full advantages, set the excluder resolution to 50m
+  (``excluder_resolution: 50``). For land category codes, see `Annex 1 of the
+  technical documentation
+  <https://publications.jrc.ec.europa.eu/repository/bitstream/JRC124621/technical_report_luisa_basemap_2018_v7_final.pdf>`__
+  (https://github.com/PyPSA/pypsa-eur/pull/842).
+
+* Add option to capture CO2 contained in biogas when upgrading (``sector:
+  biogas_to_gas_cc``) (https://github.com/PyPSA/pypsa-eur/pull/615).
+
+* If load shedding is activated, it is now applied to all carriers, not only
+  electricity (https://github.com/PyPSA/pypsa-eur/pull/784).
 
 * Add option for heat vents in district heating (``sector:
   central_heat_vent:``). The combination of must-run conditions for some

diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk
@@ -270,8 +270,8 @@ rule build_renewable_profiles:
             lambda w: (
                 "data/bundle/GEBCO_2014_2D.nc"
                 if (
-                    config["renewable"][w.technology].get("max_depth")
-                    or config["renewable"][w.technology].get("min_depth")
+                    config_provider("renewable", w.technology)(w).get("max_depth")
+                    or config_provider("renewable", w.technology)(w).get("min_depth")
                 )
                 else []
             )

diff --git a/rules/build_sector.smk b/rules/build_sector.smk
@@ -859,7 +859,7 @@ rule build_existing_heating_distribution:
 def input_profile_offwind(w):
     return {
         f"profile_{tech}": resources(f"profile_{tech}.nc")
-        for tech in ["offwind-ac", "offwind-dc"]
+        for tech in ["offwind-ac", "offwind-dc", "offwind-float"]
         if (tech in config_provider("electricity", "renewable_carriers")(w))
     }
 
@@ -926,53 +926,62 @@ rule prepare_sector_network:
         dsm_profile=resources("dsm_profile_s{simpl}_{clusters}.csv"),
         co2_totals_name=resources("co2_totals.csv"),
         co2="data/bundle-sector/eea/UNFCCC_v23.csv",
-        biomass_potentials=RESOURCES
-        + "biomass_potentials_s{simpl}_{clusters}_"
-        + "{}.csv".format(config["biomass"]["year"])
-        if config["foresight"] == "overnight"
-        else RESOURCES
-        + "biomass_potentials_s{simpl}_{clusters}_{planning_horizons}.csv",
-        heat_profile="data/heat_load_profile_BDEW.csv",
-        costs="data/costs_{}.csv".format(config["costs"]["year"])
-        if config["foresight"] == "overnight"
-        else "data/costs_{planning_horizons}.csv",
-        profile_offwind_ac=RESOURCES + "profile_offwind-ac.nc",
-        profile_offwind_dc=RESOURCES + "profile_offwind-dc.nc",
-        profile_offwind_float=RESOURCES + "profile_offwind-float.nc",
-        h2_cavern=RESOURCES + "salt_cavern_potentials_s{simpl}_{clusters}.csv",
-        busmap_s=RESOURCES + "busmap_elec_s{simpl}.csv",
-        busmap=RESOURCES + "busmap_elec_s{simpl}_{clusters}.csv",
-        clustered_pop_layout=RESOURCES + "pop_layout_elec_s{simpl}_{clusters}.csv",
-        simplified_pop_layout=RESOURCES + "pop_layout_elec_s{simpl}.csv",
-        industrial_demand=RESOURCES
-        + "industrial_energy_demand_elec_s{simpl}_{clusters}_{planning_horizons}.csv",
-        heat_demand_urban=RESOURCES + "heat_demand_urban_elec_s{simpl}_{clusters}.nc",
-        heat_demand_rural=RESOURCES + "heat_demand_rural_elec_s{simpl}_{clusters}.nc",
-        heat_demand_total=RESOURCES + "heat_demand_total_elec_s{simpl}_{clusters}.nc",
-        temp_soil_total=RESOURCES + "temp_soil_total_elec_s{simpl}_{clusters}.nc",
-        temp_soil_rural=RESOURCES + "temp_soil_rural_elec_s{simpl}_{clusters}.nc",
-        temp_soil_urban=RESOURCES + "temp_soil_urban_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_urban=RESOURCES + "temp_air_urban_elec_s{simpl}_{clusters}.nc",
-        cop_soil_total=RESOURCES + "cop_soil_total_elec_s{simpl}_{clusters}.nc",
-        cop_soil_rural=RESOURCES + "cop_soil_rural_elec_s{simpl}_{clusters}.nc",
-        cop_soil_urban=RESOURCES + "cop_soil_urban_elec_s{simpl}_{clusters}.nc",
-        cop_air_total=RESOURCES + "cop_air_total_elec_s{simpl}_{clusters}.nc",
-        cop_air_rural=RESOURCES + "cop_air_rural_elec_s{simpl}_{clusters}.nc",
-        cop_air_urban=RESOURCES + "cop_air_urban_elec_s{simpl}_{clusters}.nc",
-        solar_thermal_total=RESOURCES
-        + "solar_thermal_total_elec_s{simpl}_{clusters}.nc"
-        if config["sector"]["solar_thermal"]
-        else [],
-        solar_thermal_urban=RESOURCES
-        + "solar_thermal_urban_elec_s{simpl}_{clusters}.nc"
-        if config["sector"]["solar_thermal"]
-        else [],
-        solar_thermal_rural=RESOURCES
-        + "solar_thermal_rural_elec_s{simpl}_{clusters}.nc"
-        if config["sector"]["solar_thermal"]
-        else [],
+        biomass_potentials=lambda w: (
+            resources(
+                "biomass_potentials_s{simpl}_{clusters}_"
+                + "{}.csv".format(config_provider("biomass", "year")(w))
+            )
+            if config_provider("foresight")(w) == "overnight"
+            else resources(
+                "biomass_potentials_s{simpl}_{clusters}_{planning_horizons}.csv"
+            )
+        ),
+        costs=lambda w: (
+            resources("costs_{}.csv".format(config_provider("costs", "year")(w)))
+            if config_provider("foresight")(w) == "overnight"
+            else resources("costs_{planning_horizons}.csv")
+        ),
+        h2_cavern=resources("salt_cavern_potentials_s{simpl}_{clusters}.csv"),
+        busmap_s=resources("busmap_elec_s{simpl}.csv"),
+        busmap=resources("busmap_elec_s{simpl}_{clusters}.csv"),
+        clustered_pop_layout=resources("pop_layout_elec_s{simpl}_{clusters}.csv"),
+        simplified_pop_layout=resources("pop_layout_elec_s{simpl}.csv"),
+        industrial_demand=resources(
+            "industrial_energy_demand_elec_s{simpl}_{clusters}_{planning_horizons}.csv"
+        ),
+        hourly_heat_demand_total=resources(
+            "hourly_heat_demand_total_elec_s{simpl}_{clusters}.nc"
+        ),
+        district_heat_share=resources(
+            "district_heat_share_elec_s{simpl}_{clusters}_{planning_horizons}.csv"
+        ),
+        temp_soil_total=resources("temp_soil_total_elec_s{simpl}_{clusters}.nc"),
+        temp_soil_rural=resources("temp_soil_rural_elec_s{simpl}_{clusters}.nc"),
+        temp_soil_urban=resources("temp_soil_urban_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_urban=resources("temp_air_urban_elec_s{simpl}_{clusters}.nc"),
+        cop_soil_total=resources("cop_soil_total_elec_s{simpl}_{clusters}.nc"),
+        cop_soil_rural=resources("cop_soil_rural_elec_s{simpl}_{clusters}.nc"),
+        cop_soil_urban=resources("cop_soil_urban_elec_s{simpl}_{clusters}.nc"),
+        cop_air_total=resources("cop_air_total_elec_s{simpl}_{clusters}.nc"),
+        cop_air_rural=resources("cop_air_rural_elec_s{simpl}_{clusters}.nc"),
+        cop_air_urban=resources("cop_air_urban_elec_s{simpl}_{clusters}.nc"),
+        solar_thermal_total=lambda w: (
+            resources("solar_thermal_total_elec_s{simpl}_{clusters}.nc")
+            if config_provider("sector", "solar_thermal")(w)
+            else []
+        ),
+        solar_thermal_urban=lambda w: (
+            resources("solar_thermal_urban_elec_s{simpl}_{clusters}.nc")
+            if config_provider("sector", "solar_thermal")(w)
+            else []
+        ),
+        solar_thermal_rural=lambda w: (
+            resources("solar_thermal_rural_elec_s{simpl}_{clusters}.nc")
+            if config_provider("sector", "solar_thermal")(w)
+            else []
+        ),
     output:
         RESULTS
         + "prenetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",

diff --git a/scripts/solve_network.py b/scripts/solve_network.py
@@ -159,6 +159,9 @@ def _add_land_use_constraint_m(n, planning_horizons, config):
     current_horizon = snakemake.wildcards.planning_horizons
 
     for carrier in ["solar", "onwind", "offwind-ac", "offwind-dc", "offwind-float"]:
+        extendable_i = (n.generators.carrier == carrier) & n.generators.p_nom_extendable
+        n.generators.loc[extendable_i, "p_nom_min"] = 0
+
         existing = n.generators.loc[n.generators.carrier == carrier, "p_nom"]
         ind = list(
             {i.split(sep=" ")[0] + " " + i.split(sep=" ")[1] for i in existing.index}