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 new file mode 100644 index 000000000..a0560e712 --- /dev/null +++ b/message_ix_models/data/material/aluminum/LED/aluminum_techno_economic.xlsx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17604127e3b8dbed3e458124ff6ca821a3134fd90d6067349ffc4533f3578574 +size 55620 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 new file mode 100644 index 000000000..fed2d30db --- /dev/null +++ b/message_ix_models/data/material/aluminum/SSP1/aluminum_techno_economic.xlsx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2addde11ba367a5386fc5c640d7fcadcfba49134e39554be4b7f4fa0e0bd94f5 +size 55620 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 new file mode 100644 index 000000000..66e808110 --- /dev/null +++ b/message_ix_models/data/material/aluminum/SSP2/aluminum_techno_economic.xlsx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d233db0cf9b464350ad5d46d7d7ee683b4bf1776f52b535e9187bc51b210b8ab +size 55589 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 new file mode 100644 index 000000000..bc9fb2e2d --- /dev/null +++ b/message_ix_models/data/material/aluminum/SSP3/aluminum_techno_economic.xlsx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81244e9f336f2e6ed66c08e71575185f773f9b9886acea7da91d5460e6b9ce2b +size 55615 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 new file mode 100644 index 000000000..58ae61b90 --- /dev/null +++ b/message_ix_models/data/material/aluminum/SSP4/aluminum_techno_economic.xlsx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74cebb999a607a094663b27783c18c2ade4d49fffece9bcd3d744e91c30fa91e +size 55585 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 new file mode 100644 index 000000000..df0a232c7 --- /dev/null +++ b/message_ix_models/data/material/aluminum/SSP5/aluminum_techno_economic.xlsx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8ee08cf1107d96f762769d002a112141c317e2052adb4f9ce50f9aa4a558021 +size 55610 diff --git a/message_ix_models/model/material/data_aluminum.py b/message_ix_models/model/material/data_aluminum.py index 783b2da2d..b274826ea 100644 --- 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