Update

polca · Nov 3, 2023 · 9e1a131 · 9e1a131
1 parent bad7f5a
commit 9e1a131
Show file tree

Hide file tree

Showing 6 changed files with 344 additions and 827 deletions.
diff --git a/premise/activity_maps.py b/premise/activity_maps.py
@@ -14,15 +14,15 @@
 
 POWERPLANT_TECHS = VARIABLES_DIR / "electricity_variables.yaml"
 FUELS_TECHS = VARIABLES_DIR / "fuels_variables.yaml"
-MATERIALS_TECHS = DATA_DIR / "utils" / "materials_vars.yml"
+MATERIALS_TECHS = DATA_DIR / "metals" / "activities_mapping.yml"
 DAC_TECHS = VARIABLES_DIR / "direct_air_capture_variables.yaml"
 CARBON_STORAGE_TECHS = VARIABLES_DIR / "carbon_storage_variables.yaml"
 CEMENT_TECHS = VARIABLES_DIR / "cement_variables.yaml"
 GAINS_MAPPING = (
     DATA_DIR / "GAINS_emission_factors" / "gains_ecoinvent_sectoral_mapping.yaml"
 )
 ACTIVITIES_METALS_MAPPING = DATA_DIR / "metals" / "activities_mapping.yml"
-METALS_MAPPING = DATA_DIR / "metals" / "metals_mapping.yml"
+# METALS_MAPPING = DATA_DIR / "metals" / "metals_mapping.yml"
 
 
 def get_mapping(filepath: Path, var: str, model: str = None) -> dict:
@@ -159,9 +159,9 @@ def __init__(
         self.activity_metals_filters = get_mapping(
             filepath=ACTIVITIES_METALS_MAPPING, var="ecoinvent_aliases"
         )
-        self.metals_filters = get_mapping(
-            filepath=METALS_MAPPING, var="ecoinvent_aliases"
-        )
+        # self.metals_filters = get_mapping(
+        #     filepath=METALS_MAPPING, var="ecoinvent_aliases"
+        # )
 
     def generate_activities_using_metals_map(self) -> dict:
         """

diff --git a/premise/data/metals/activities_mapping.yml b/premise/data/metals/activities_mapping.yml
@@ -213,10 +213,10 @@ CdTe:
       - photovoltaic laminate, CdTe
     mask:
       - market
-pv_perovskite:
-  ecoinvent_aliases:
-    fltr:
-      - photovoltaic panel, perovskite-Si-tandem, at plant
+#pv_perovskite:
+#  ecoinvent_aliases:
+#    fltr:
+#      - photovoltaic panel, perovskite-Si-tandem, at plant
 Parabolic Trough - SF:
   ecoinvent_aliases:
     fltr:

diff --git a/premise/data/metals/metals_db.csv b/premise/data/metals/metals_db.csv
@@ -323,7 +323,7 @@ Manganese,kg/kWh,2020.0,,,0,0,LTO
 Nickel,kg/kWh,2020.0,0.07633587786259542,0.07633587786259542,0.07633587786259542,0.07633587786259542,LTO
 Phosphorus,kg/kWh,2020.0,0.7467302798982189,0.7467302798982188,0.17666666666666667,1.3167938931297711,LTO
 Titanium,kg/kWh,2020.0,3.466066666666667,3.466066666666667,1.6033333333333335,5.3288,LTO
-Pb,kg/kWh,2020.0,14,14,14,14,Lead-Acid
+Pb,kg/kWh,2020.0,14,14,14,14,Lead_Acid
 Vanadium,kg/kWh,2020.0,0.3,0.3,0.3,0.3,NiMH
 Cobalt,kg/kWh,2020.0,0.19433333333333336,0.17,0.088,0.325,NiMH
 Nickel,kg/kWh,2020.0,4.083333333333334,4.15,3.7,4.4,NiMH