Differentiate aluminum recycling

iiasa · Dec 6, 2024 · 40962fe · 40962fe
1 parent 6f18190
commit 40962fe
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/message_ix_models/data/material/aluminum/LED/aluminum_techno_economic.xlsx b/message_ix_models/data/material/aluminum/LED/aluminum_techno_economic.xlsx
diff --git a/message_ix_models/data/material/aluminum/SSP1/aluminum_techno_economic.xlsx b/message_ix_models/data/material/aluminum/SSP1/aluminum_techno_economic.xlsx
diff --git a/message_ix_models/data/material/aluminum/SSP2/aluminum_techno_economic.xlsx b/message_ix_models/data/material/aluminum/SSP2/aluminum_techno_economic.xlsx
diff --git a/message_ix_models/data/material/aluminum/SSP3/aluminum_techno_economic.xlsx b/message_ix_models/data/material/aluminum/SSP3/aluminum_techno_economic.xlsx
diff --git a/message_ix_models/data/material/aluminum/SSP4/aluminum_techno_economic.xlsx b/message_ix_models/data/material/aluminum/SSP4/aluminum_techno_economic.xlsx
diff --git a/message_ix_models/data/material/aluminum/SSP5/aluminum_techno_economic.xlsx b/message_ix_models/data/material/aluminum/SSP5/aluminum_techno_economic.xlsx
diff --git a/message_ix_models/model/material/data_aluminum.py b/message_ix_models/model/material/data_aluminum.py
@@ -44,6 +44,8 @@ def read_data_aluminum(
     """
 
     # Ensure config is loaded, get the context
+    context = read_config()
+    ssp = get_ssp_from_context(context)
     s_info = ScenarioInfo(scenario)
 
     # Shorter access to sets configuration
@@ -55,16 +57,16 @@ def read_data_aluminum(
 
     # Read the file
     data_alu = pd.read_excel(
-        package_data_path("material", "aluminum", fname), sheet_name=sheet_n
+        package_data_path("material", "aluminum", ssp, fname), sheet_name=sheet_n
     )
 
     # Drop columns that don't contain useful information
     data_alu = data_alu.drop(["Source", "Description"], axis=1)
 
-    data_alu_rel = read_rel(scenario, "aluminum", None, "aluminum_techno_economic.xlsx")
+    data_alu_rel = read_rel(scenario, "aluminum", ssp, "aluminum_techno_economic.xlsx")
 
     data_aluminum_ts = read_timeseries(
-        scenario, "aluminum", None, "aluminum_techno_economic.xlsx"
+        scenario, "aluminum", ssp, "aluminum_techno_economic.xlsx"
     )
 
     # Unit conversion