Start integration of TIAM-UCL new variables

Add correction factors for Swiss hydropower water evaporation.

premise/data/renewables/hydropower.yaml

@@ -0,0 +1,15 @@
+# this file provides correction regarding water evaporation
+# and discharge for some hydropower electricity datasets
+---
+
+electricity production, hydro, reservoir, alpine region:
+  - name: Water
+    categories: water
+    unit: cubic meter
+    amount: 0.80825
+    type: biosphere
+  - name: Water
+    categories: air
+    unit: cubic meter
+    amount: 0.00175
+    type: biosphere

premise/electricity.py

@@ -30,7 +30,7 @@
     uuid,
     ws,
 )
-from .utils import get_efficiency_solar_photovoltaics, rescale_exchanges
+from .utils import get_efficiency_solar_photovoltaics, rescale_exchanges, get_water_consumption_factors
 from .validation import ElectricityValidation
 
 POWERPLANT_TECHS = VARIABLES_DIR / "electricity_variables.yaml"
@@ -244,6 +244,7 @@ def _update_electricity(
     electricity.create_missing_power_plant_datasets()
     electricity.adjust_coal_power_plant_emissions()
     electricity.update_efficiency_of_solar_pv()
+    electricity.correct_hydropower_water_emissions()
     electricity.create_region_specific_power_plants()
 
     if scenario["year"] >= 2020:
@@ -1384,6 +1385,37 @@ def generate_world_market(
 
         return dataset
 
+    def correct_hydropower_water_emissions(self) -> None:
+        """
+        Correct the emissions of water for hydropower plants.
+        In Swiss datasets, water evaoporation is too high.
+        We use a new factor from Flury and Frischknecht (2021) to correct this.
+        https://treeze.ch/fileadmin/user_upload/downloads/Publications/Case_Studies/Energy/flury-2012-hydroelectric-power-generation.pdf
+        """
+
+        water_factor = get_water_consumption_factors()
+
+        hydropower_datasets = ws.get_many(
+            self.database,
+            *[
+                ws.contains("name", "electricity production, hydro, reservoir"),
+                ws.equals("location", "CH"),
+                ws.equals("unit", "kilowatt hour"),
+            ],
+        )
+
+        for name, flows in water_factor.items():
+            for dataset in hydropower_datasets:
+                if name in dataset["name"]:
+                    for flow in flows:
+                        for exc in ws.biosphere(
+                            dataset,
+                            ws.equals("name", flow["name"]),
+                            ws.equals("unit", flow["unit"]),
+                            ws.equals("categories", (flow["categories"],)),
+                        ):
+                            exc["amount"] = flow["amount"]
+
     def update_efficiency_of_solar_pv(self) -> None:
         """
         Update the efficiency of solar PV modules.

premise/iam_variables_mapping/electricity_variables.yaml

@@ -10,7 +10,7 @@ Biogas CHP:
   eff_aliases:
     tiam-ucl: Efficiency|Electricity|Biogas|w/o CCS
   iam_aliases:
-    tiam-ucl: Electricity|Biogas|w/o CCS
+    tiam-ucl: Secondary Energy|Electricity|Biogas|w/o CCS
   max_efficiency: 0.6
 Biomass CHP:
   ecoinvent_aliases:
@@ -32,7 +32,7 @@ Biomass CHP:
   iam_aliases:
     image: Secondary Energy|Electricity|Biomass|w/o CCS|3
     remind: SE|Electricity|Biomass|++|Combined Heat and Power w/o CC
-    tiam-ucl: Electricity|Biomass CHP|w/o CCS
+    tiam-ucl: Secondary Energy|Electricity|Biomass CHP|w/o CCS
   max_efficiency: 0.3
 Biomass CHP (existing):
   ecoinvent_aliases:

premise/iam_variables_mapping/fuels_variables.yaml

@@ -202,7 +202,7 @@ biomethane:
   co2: 0.06
   biogenic_share: 1
   iam_aliases:
-    # tiam-ucl: Secondary Energy|Liquids|Biomass|Biomethane
+    tiam-ucl: Secondary Energy|Liquids|Biomass|Biomethane|Biogas
     remind: SE|Gases|+|Biomass
   eff_aliases:
     remind: Tech|Gases|Biomass|w/o CC|Efficiency
@@ -394,7 +394,7 @@ diesel, synthetic, from coal:
     tiam-ucl: Efficiency|Liquids|Coal|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS
     gcam: Efficiency|Coal to Liquids|w/oCCS
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Coal|FT Diesel|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Coal|FT|Diesel|w/o CCS
     gcam: Secondary Energy|Production|Coal to Liquids|w/oCCS
     remind: SE|Liquids|Fossil|Coal|+|w/o CC
   ecoinvent_aliases:
@@ -410,7 +410,7 @@ diesel, synthetic, from coal, with CCS:
     tiam-ucl: Efficiency|Liquids|Coal|FT fuel mix (diesel, kerosene, naptha, ELC)|w CCS
     gcam: Efficiency|Coal to Liquids|w/CCS
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Coal|FT Diesel|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Coal|FT|Diesel|w CCS
     gcam: Secondary Energy|Production|Coal to Liquids|w/CCS
     remind: SE|Liquids|Fossil|Coal|+|w/ CC
   ecoinvent_aliases:
@@ -423,7 +423,7 @@ diesel, synthetic, from wood:
   co2: 0.0732
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Biomass residues|FT Diesel|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Diesel|w/o CCS
     gcam: Secondary Energy|Production|Refined Liquids|Biomass|FT Biofuels|w/oCCS
     remind: SE|Liquids|Biomass|BioFTR|w/o CC
     image: Secondary Energy|Consumption|Liquids|Biomass|FT Diesel|Woody|w/oCCS
@@ -440,7 +440,7 @@ diesel, synthetic, from wood, with CCS:
   co2: 0.0732
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Biomass residues|FT Diesel|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Diesel|w CCS
     gcam: Secondary Energy|Production|Refined Liquids|Biomass|FT Biofuels|w/CCS
     remind: SE|Liquids|Biomass|BioFTR|w/ CC
     image: Secondary Energy|Consumption|Liquids|Biomass|FT Diesel|Woody|w/CCS
@@ -485,7 +485,7 @@ diesel, synthetic, from natural gas:
   co2: 0.0732
   biogenic_share: 0
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT Diesel|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT|Diesel|w/o CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Natural gas|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS
   ecoinvent_aliases:
@@ -497,7 +497,7 @@ diesel, synthetic, from natural gas, with CCS:
   co2: 0.0732
   biogenic_share: 0
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT Diesel|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT|Diesel|w CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Natural gas|FT fuel mix (diesel, kerosene, naptha, ELC)|w CCS
   ecoinvent_aliases:
@@ -1039,14 +1039,14 @@ liquefied petroleum gas:
       - liquefied petroleum gas production, petroleum refinery operation
       - market for liquefied petroleum gas
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Oil|LPG
+    tiam-ucl: Secondary Energy|Liquids|Oil|Liquid Petroleum Gas
 
 liquefied petroleum gas, synthetic, from natural gas:
   lhv: 45.5
   co2: 0.0631
   biogenic_share: 0
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT LPG|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT|Liquid Petroleum Gas|w/o CCS
   ecoinvent_aliases:
     fltr:
       - liquefied petroleum gas production, synthetic, Fischer Tropsch process, from natural gas, energy allocation
@@ -1058,7 +1058,7 @@ liquefied petroleum gas, synthetic, from natural gas, with CCS:
   co2: 0.0631
   biogenic_share: 0
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT LPG|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT|Liquid Petroleum Gas|w CCS
   ecoinvent_aliases:
     fltr:
       - liquefied petroleum gas production, synthetic, Fischer Tropsch process, from natural gas, energy allocation, with carbon capture and storage
@@ -1070,7 +1070,7 @@ liquefied petroleum gas, synthetic, from biomass:
   co2: 0.0631
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Biomass|FT LPG|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Liquid Petroleum Gas|w/o CCS
   ecoinvent_aliases:
     fltr:
       - liquefied petroleum gas production, synthetic, Fischer Tropsch process, hydrogen from wood gasification, energy allocation
@@ -1082,7 +1082,7 @@ liquefied petroleum gas, synthetic, from biomass, with CCS:
   co2: 0.0631
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Biomass|FT LPG|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Liquid Petroleum Gas|w CCS
   ecoinvent_aliases:
     fltr:
       - liquefied petroleum gas production, synthetic, Fischer Tropsch process, hydrogen from wood gasification, energy allocation, with carbon capture and storage
@@ -1098,7 +1098,7 @@ liquefied petroleum gas, synthetic, from coal:
       name: synthetic fuel production, from coal, high temperature Fisher-Tropsch operations
       reference product: liquefied petroleum gas
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Coal|FT LPG|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Coal|FT|Liquid Petroleum Gas|w/o CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Coal|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS
 
@@ -1108,7 +1108,7 @@ liquefied petroleum gas, synthetic, from coal, with CCS:
   co2: 0.0631
   biogenic_share: 0
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Coal|FT LPG|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Coal|FT|Liquid Petroleum Gas|w CCS
   ecoinvent_aliases:
     fltr:
       - liquefied petroleum gas production, synthetic, Fischer Tropsch process, from coal, energy allocation, with carbon capture and storage
@@ -1310,7 +1310,7 @@ kerosene, synthetic, from coal, energy allocation:
     fltr:
       - kerosene production, synthetic, Fischer Tropsch process, hydrogen from coal gasification, energy allocation
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Coal|FT Kerosene|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Coal|FT|Kerosene|w/o CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Coal|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS
 
@@ -1330,7 +1330,7 @@ kerosene, synthetic, from coal, energy allocation, with CCS:
     fltr:
       - kerosene production, synthetic, Fischer Tropsch process, hydrogen from coal gasification, with CCS, energy allocation
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Coal|FT Kerosene|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Coal|FT|Kerosene|w CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Coal|FT fuel mix (diesel, kerosene, naptha, ELC)|w CCS
 
@@ -1348,7 +1348,7 @@ kerosene, synthetic, from biomass, energy allocation:
   co2: 0.0715
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Biomass|FT Kerosene|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Kerosene|w/o CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Biomass|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS
   ecoinvent_aliases:
@@ -1360,7 +1360,7 @@ kerosene, synthetic, from biomass, energy allocation, with CCS:
   co2: 0.0715
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Biomass|FT Kerosene|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Kerosene|w CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Biomass|FT fuel mix (diesel, kerosene, naptha, ELC)|w CCS
   ecoinvent_aliases:
@@ -1372,7 +1372,7 @@ kerosene, synthetic, from natural gas, energy allocation:
   co2: 0.0715
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT Kerosene|w/o CCS
+    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT|Kerosene|w/o CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Natural gas|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS
   ecoinvent_aliases:
@@ -1384,7 +1384,7 @@ kerosene, synthetic, from natural gas, energy allocation, with CCS:
   co2: 0.0715
   biogenic_share: 1
   iam_aliases:
-    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT Kerosene|w CCS
+    tiam-ucl: Secondary Energy|Liquids|Natural Gas|FT|Kerosene|w CCS
   eff_aliases:
     tiam-ucl: Efficiency|Liquids|Natural gas|FT fuel mix (diesel, kerosene, naptha, ELC)|w CCS
   ecoinvent_aliases: