Finish TIAM-UCL integration

premise/data/consequential/leadtimes.yaml

@@ -12,6 +12,7 @@ Coal PC: 4
 Coal PC CCS: 5
 Coal CHP: 4
 Coal CHP CCS: 5
+Coal USC: 4
 Gas OC: 3
 Gas CC: 3
 Gas CC CCS: 3

premise/data/consequential/lifetimes.yaml

@@ -12,6 +12,7 @@ Coal PC: 40
 Coal PC CCS: 40
 Coal CHP: 40
 Coal CHP CCS: 40
+Coal USC: 40
 Gas OC: 35
 Gas CC: 35
 Gas CC CCS: 35

premise/fuels.py

@@ -4,11 +4,9 @@
 
 import copy
 from functools import lru_cache
-from typing import Union
 
 import xarray as xr
 import yaml
-from numpy import ndarray
 
 from .filesystem_constants import DATA_DIR, VARIABLES_DIR
 from .inventory_imports import get_biosphere_code
@@ -539,9 +537,14 @@ def generate_hydrogen_activities(self) -> None:
                     )
 
                     if initial_energy_use is None or initial_energy_use == 0:
-                        print(
-                            f"Initial energy consumption for {fuel_type} in {region} is None."
-                        )
+                        if "waste" not in fuel_type:
+                            print(
+                                f"Initial energy consumption for {fuel_type} in {region} is None."
+                            )
+                            print(f"List of exchanges:")
+                            for exc in dataset["exchanges"]:
+                                print(exc)
+                            print()
 
                     # add it to "log parameters"
                     if "log parameters" not in dataset:
@@ -2257,14 +2260,21 @@ def generate_regional_fuel_market(
             .interp(year=self.year)
             .sum(dim=["variables"]),
             0,
-            atol=1e-3,
+            rtol=1e-3,
         ):
             if "hydrogen" in dataset["name"].lower():
                 prod_vars = [
                     "hydrogen, from natural gas",
                 ]
 
+            if "natural gas" in dataset["name"].lower():
+                prod_vars = [
+                    "natural gas",
+                ]
+
         sum_share = 0
+        shares = {}
+
         for prod_var in prod_vars:
             if len(prod_vars) > 1:
                 share = fuel_providers[prod_var]["find_share"](
@@ -2281,6 +2291,13 @@ def generate_regional_fuel_market(
             if isinstance(share, np.ndarray):
                 share = share.item(0)
 
+            shares[prod_var] = share
+
+        # normalize shares
+        shares = {k: v / sum_share for k, v in shares.items()}
+
+        for prod_var, share in shares.items():
+
             blacklist = [
                 "petroleum coke",
                 "petroleum gas",
@@ -2335,7 +2352,7 @@ def generate_regional_fuel_market(
                 # so that the overall composition maintains
                 # the same average LHV
                 amount = supplier_share * (
-                    activity["lhv"] / self.fuels_specs[prod_var]["lhv"]
+                        activity["lhv"] / self.fuels_specs[prod_var]["lhv"]
                 )
 
                 lhv = self.fuels_specs[prod_var]["lhv"]
@@ -2358,7 +2375,7 @@ def generate_regional_fuel_market(
                 if text not in string:
                     string += text
 
-        if not np.isclose(sum_share, 1.0, rtol=1e-3):
+        if not np.isclose(sum(e for e in shares.values()), 1.0, rtol=1e-3):
             print(
                 f"WARNING: sum of shares for {dataset['name']} in {region} is {sum_share} instead of 1.0"
             )

premise/iam_variables_mapping/transport_passenger_cars_variables.yaml

@@ -90,7 +90,6 @@
     remind: ES|Transport|VKM|Pass|Road|LDV|Medium|FCEV
     tiam-ucl:
       - Distance|Transport|Car|Hydrogen Fuel Cell|Car Hydrogen
-      - Distance|Transport|Car|Hydrogen Fuel Cell|Electricity
   energy_use_aliases:
     remind: FE|Transport|VKM|Pass|Road|LDV|Medium|FCEV
     tiam-ucl:

premise/transformation.py

@@ -375,9 +375,10 @@ def find_fuel_efficiency(
             )
         )
         if energy_input == 0:
-            print(
-                f"Warning: {dataset['name'], dataset['location']} has no energy input"
-            )
+            if not any(x in dataset["name"] for x in ("waste", "treatment")):
+                print(
+                    f"Warning: {dataset['name'], dataset['location']} has no energy input"
+                )
 
     if energy_input != 0 and float(energy_out) != 0:
         current_efficiency = float(energy_out) / energy_input

tests/test_process_ei310_EN15804.py

@@ -26,6 +26,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -58,11 +59,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )
 

tests/test_process_ei310_conseq.py

@@ -26,6 +26,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -59,11 +60,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )
 

tests/test_process_ei310_cutoff.py

@@ -24,6 +24,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -54,11 +55,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )
 

tests/test_process_ei310_cutoff_datapackage.py

@@ -23,6 +23,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 

tests/test_process_ei310_cutoff_olca.py

@@ -24,6 +24,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 

tests/test_process_ei310_cutoff_simapro.py

@@ -23,6 +23,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 

tests/test_process_ei310_cutoff_super.py

@@ -24,6 +24,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 

tests/test_process_ei38_conseq.py

@@ -26,6 +26,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -59,11 +60,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )
 

tests/test_process_ei38_cutoff.py

@@ -26,6 +26,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -58,11 +59,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )
 

tests/test_process_ei39_conseq.py

@@ -26,6 +26,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -59,11 +60,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )
 

tests/test_process_ei39_cutoff.py

@@ -26,6 +26,7 @@
 scenarios = [
     {"model": "remind", "pathway": "SSP2-Base", "year": 2050},
     {"model": "image", "pathway": "SSP2-RCP19", "year": 2050},
+    {"model": "tiam-ucl", "pathway": "SSP2-RCP19", "year": 2050},
 ]
 
 
@@ -58,11 +59,14 @@ def test_brightway():
         del bw2data.databases["test1"]
     if "test2" in bw2data.databases:
         del bw2data.databases["test2"]
+    if "test3" in bw2data.databases:
+        del bw2data.databases["test3"]
 
     ndb.write_db_to_brightway(
         [
             "test1",
             "test2",
+            "test3"
         ]
     )