Merge remote-tracking branch 'eur/master' into merge-july

Author: lkstrp

config/test/config.myopic.yaml

@@ -40,6 +40,15 @@ sector:
       supplemental_heating:
         enable: true
         booster_heat_pump: true
+    heat_pump_sources:
+      urban central:
+      - air
+      - geothermal
+      urban decentral:
+      - air
+      rural:
+      - air
+      - ground
   hydrogen_turbine: false
   regional_oil_demand: false
   regional_co2_sequestration_potential:

config/test/config.overnight.yaml

@@ -68,6 +68,15 @@ sector:
         booster_heat_pump: true
     ates:
       enable: true
+    heat_pump_sources:
+      urban central:
+      - air
+      - geothermal
+      urban decentral:
+      - air
+      rural:
+      - air
+      - ground
   hydrogen_turbine: false
   regional_oil_demand: false
   regional_co2_sequestration_potential:

config/test/config.perfect.yaml

@@ -51,6 +51,15 @@ sector:
         booster_heat_pump: true
     ates:
       enable: true
+    heat_pump_sources:
+      urban central:
+      - air
+      - geothermal
+      urban decentral:
+      - air
+      rural:
+      - air
+      - ground
     hydrogen_turbine: false
   regional_oil_demand: false
   regional_co2_sequestration_potential:

scripts/build_industrial_production_per_country_tomorrow.py

@@ -87,7 +87,7 @@
 
     al_primary_fraction = get(params["Al_primary_fraction"], investment_year)
     fraction_persistent_primary = (
-        al_primary_fraction * total_aluminium.sum() / production[key_pri].sum()
+        al_primary_fraction * total_aluminium.sum() / (production[key_pri].sum() or 1)
     )
 
     production[key_pri] = fraction_persistent_primary * production[key_pri]

scripts/definitions/heat_system.py

@@ -223,7 +223,7 @@ def heat_pump_costs_name(self, heat_source: str) -> str:
         str
             The name for the heat pump costs.
         """
-        if heat_source in ["ptes"]:
+        if heat_source in ["ptes", "geothermal"]:
             return f"{self.central_or_decentral} excess-heat-sourced heat pump"
         else:
             return f"{self.central_or_decentral} {heat_source}-sourced heat pump"

scripts/prepare_network.py

@@ -29,16 +29,23 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from pypsa.common import expand_series
 
 from scripts._helpers import (
+    PYPSA_V1,
     configure_logging,
     get,
     set_scenario_config,
     update_config_from_wildcards,
 )
 from scripts.add_electricity import load_costs, set_transmission_costs
 
+# Allow for PyPSA versions <0.35
+if PYPSA_V1:
+    from pypsa.common import expand_series
+else:
+    from pypsa.descriptors import expand_series
+
+
 idx = pd.IndexSlice
 
 logger = logging.getLogger(__name__)

scripts/prepare_perfect_foresight.py

@@ -10,10 +10,10 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from pypsa.common import expand_series
 from six import iterkeys
 
 from scripts._helpers import (
+    PYPSA_V1,
     configure_logging,
     sanitize_custom_columns,
     set_scenario_config,
@@ -22,6 +22,12 @@
 from scripts.add_electricity import sanitize_carriers
 from scripts.add_existing_baseyear import add_build_year_to_new_assets
 
+# Allow for PyPSA versions <0.35
+if PYPSA_V1:
+    from pypsa.common import expand_series
+else:
+    from pypsa.descriptors import expand_series
+
 logger = logging.getLogger(__name__)
 
 

scripts/prepare_sector_network.py

@@ -3382,6 +3382,7 @@ def add_heat(
                 n.add(
                     "Bus",
                     nodes,
+                    location=nodes,
                     suffix=f" {heat_carrier}",
                     carrier=heat_carrier,
                 )

scripts/solve_network.py

@@ -54,7 +54,12 @@
 )
 
 logger = logging.getLogger(__name__)
-pypsa.network.power_flow.logger.setLevel(logging.WARNING)
+
+# Allow for PyPSA versions <0.35
+if PYPSA_V1:
+    pypsa.network.power_flow.logger.setLevel(logging.WARNING)
+else:
+    pypsa.pf.logger.setLevel(logging.WARNING)
 
 
 class ObjectiveValueError(Exception):