Fix LCIs

polca · Jul 31, 2024 · 490c7c3 · 490c7c3
1 parent f613063
commit 490c7c3
Show file tree

Hide file tree

Showing 11 changed files with 250 additions and 8 deletions.
diff --git a/premise/data/additional_inventories/lci-PGM.xlsx b/premise/data/additional_inventories/lci-PGM.xlsx
diff --git a/premise/data/additional_inventories/lci-PV-GaAs.xlsx b/premise/data/additional_inventories/lci-PV-GaAs.xlsx
diff --git a/premise/data/additional_inventories/lci-PV-perovskite.xlsx b/premise/data/additional_inventories/lci-PV-perovskite.xlsx
diff --git a/premise/data/additional_inventories/lci-PV.xlsx b/premise/data/additional_inventories/lci-PV.xlsx
diff --git a/premise/data/additional_inventories/lci-graphite.xlsx b/premise/data/additional_inventories/lci-graphite.xlsx
diff --git a/premise/data/additional_inventories/lci-rail-freight.xlsx b/premise/data/additional_inventories/lci-rail-freight.xlsx
diff --git a/premise/data/additional_inventories/lci-vanadium.xlsx b/premise/data/additional_inventories/lci-vanadium.xlsx
diff --git a/premise/data/utils/export/simapro_categories.csv b/premise/data/utils/export/simapro_categories.csv
diff --git a/premise/electricity.py b/premise/electricity.py
@@ -1402,6 +1402,8 @@ def update_efficiency_of_solar_pv(self) -> None:
             "CIGS",
             "CIS",
             "CdTe",
+            "perovskite",
+            "GaAs",
         ]
 
         # TODO: check if IAM data provides efficiencies for PV panels and use them instead
@@ -1423,7 +1425,12 @@ def update_efficiency_of_solar_pv(self) -> None:
         )
 
         for dataset in datasets:
-            power = float(re.findall(r"[-+]?\d*\.\d+|\d+", dataset["name"])[0])
+            numbers = re.findall(r"[-+]?\d*\.\d+|\d+", dataset["name"])
+            if not numbers:
+                print(f"No numerical value found in dataset name: {dataset['name']}")
+                continue
+
+            power = float(numbers[0])
 
             if "mwp" in dataset["name"].lower():
                 power *= 1000

diff --git a/premise/export.py b/premise/export.py
@@ -171,10 +171,10 @@ def create_index_of_A_matrix(database):
     """
     return {
         (
-            database[i]["name"],
-            database[i]["reference product"],
-            database[i]["unit"],
-            database[i]["location"],
+            database[i]["name"].strip(),
+            database[i]["reference product"].strip(),
+            database[i]["unit"].strip(),
+            database[i]["location"].strip(),
         ): i
         for i in range(0, len(database))
     }
@@ -1523,7 +1523,7 @@ def export_db_to_simapro(self, olca_compartments=False):
                     if item == "System description":
                         writer.writerow(["Ecoinvent v3"])
                     if item == "Infrastructure":
-                        writer.writerow(["Yes"])
+                        writer.writerow(["No"])
                     if item == "External documents":
                         writer.writerow(
                             [
@@ -1798,7 +1798,11 @@ def export_db_to_simapro(self, olca_compartments=False):
             print(x)
 
         if len(self.unmatched_category_flows) > 0:
-            print(f"{len(self.unmatched_category_flows)} unmatched flow categories.")
+            print(f"{len(self.unmatched_category_flows)} unmatched flow categories. Check unlinked.log.")
+            # save the list of unmatched flow to unlinked.log
+            with open("unlinked.log", "a") as f:
+                for item in self.unmatched_category_flows:
+                    f.write(f"{item}\n")
 
         print(f"Simapro CSV file saved in {self.filepath}.")
 

diff --git a/premise/new_database.py b/premise/new_database.py
@@ -180,6 +180,8 @@
 FILEPATH_BUSES = INVENTORY_DIR / "lci-buses.xlsx"
 FILEPATH_PASS_CARS = INVENTORY_DIR / "lci-pass_cars.xlsx"
 FILEPATH_RAIL_FREIGHT = INVENTORY_DIR / "lci-rail-freight.xlsx"
+FILEPATH_PV_GAAS = INVENTORY_DIR / "lci-PV-GaAs.xlsx"
+FILEPATH_PV_PEROVSKITE = INVENTORY_DIR / "lci-PV-perovskite.xlsx"
 
 config = load_constants()
 
@@ -780,6 +782,8 @@ def __import_inventories(self) -> List[dict]:
             (FILEPATH_BUSES, "3.7"),
             (FILEPATH_PASS_CARS, "3.7"),
             (FILEPATH_RAIL_FREIGHT, "3.9"),
+            (FILEPATH_PV_GAAS, "3.10"),
+            (FILEPATH_PV_PEROVSKITE, "3.10"),
         ]
         for filepath in filepaths:
             # make an exception for FILEPATH_OIL_GAS_INVENTORIES