diff --git a/message_ix_models/tools/bilateralize/bare_to_scenario.py b/message_ix_models/tools/bilateralize/bare_to_scenario.py index 3f2e0a0c09..b68233df1c 100644 --- a/message_ix_models/tools/bilateralize/bare_to_scenario.py +++ b/message_ix_models/tools/bilateralize/bare_to_scenario.py @@ -394,7 +394,7 @@ def bare_to_scenario( for c in covered_tec if c not in ["crudeoil_piped", "foil_piped", "loil_piped"] ]: - add_tec = tec_config[tec][tec + "_trade"]["trade_technology"] + "_exp" + add_tec = tec_config[tec][tec + "_trade"]["trade_technology"] hist_tec[tec] = add_tec for tec in hist_tec.keys(): diff --git a/message_ix_models/tools/bilateralize/historical_calibration.py b/message_ix_models/tools/bilateralize/historical_calibration.py index 942ff30287..41876e28a6 100644 --- a/message_ix_models/tools/bilateralize/historical_calibration.py +++ b/message_ix_models/tools/bilateralize/historical_calibration.py @@ -746,6 +746,12 @@ def build_historical_activity( project_name=project_name, config_name=config_name, ) + outdf = ( + outdf.groupby(["node_loc", "technology", "year_act", "mode", "time"])["value"] + .sum() + .reset_index() + ) + outdf["unit"] = "GWa" return outdf.drop_duplicates()