Remove unused option from material build command

Author: macflo8

message_ix_models/model/material/cli.py

@@ -39,12 +39,6 @@ def cli(ssp):
 
 
 @cli.command("build")
-@click.option(
-    "--datafile",
-    default="Global_steel_cement_MESSAGE.xlsx",
-    metavar="INPUT",
-    help="File name for external data input",
-)
 @click.option(
     "--iea_data_path",
     default="P:ene.model\\IEA_database\\Florian\\",
@@ -63,7 +57,7 @@ def cli(ssp):
 @common_params("nodes")
 @click.pass_obj
 def build_scen(
-    context, datafile, iea_data_path, tag, mode, scenario_name, old_calib, update_costs
+    context, iea_data_path, tag, mode, scenario_name, old_calib, update_costs
 ):
     """Build a scenario.
 
@@ -99,9 +93,6 @@ def build_scen(
         if type(output_scenario_name).__name__ == "NoneType":
             output_scenario_name = context.scenario_info["scenario"]
 
-        # context.metadata_path = context.metadata_path / "data"
-        context.datafile = datafile
-
         if context.scenario_info["model"] != "CD_Links_SSP2":
             log.warning("WARNING: this code is not tested with this base scenario!")
 
@@ -318,7 +309,7 @@ def run_reporting(context, remove_ts, profile):
             pr = cProfile.Profile()
             pr.enable()
             log.info("Reporting material-specific variables")
-            report(context, scenario)
+            report(scenario)
             log.info("Reporting standard variables")
             reporting(
                 mp,
@@ -343,7 +334,7 @@ def exit():
         else:
             # Remove existing timeseries and add material timeseries
             log.info("Reporting material-specific variables")
-            report(context, scenario)
+            report(scenario)
             log.info("Reporting standard variables")
             reporting(
                 mp,

message_ix_models/model/material/data_cement.py

@@ -171,7 +171,6 @@ def gen_data_cement(
     ssp = get_ssp_from_context(context)
     # Information about scenario, e.g. node, year
     s_info = ScenarioInfo(scenario)
-    context.datafile = "Global_steel_cement_MESSAGE.xlsx"
 
     # Techno-economic assumptions
     # TEMP: now add cement sector as well
@@ -357,9 +356,7 @@ def gen_data_cement(
 
     # Create external demand param
     parname = "demand"
-    df_demand = material_demand_calc.derive_demand(
-        "cement", scenario, old_gdp=False, ssp=ssp
-    )
+    df_demand = material_demand_calc.derive_demand("cement", scenario, ssp=ssp)
     results[parname].append(df_demand)
 
     # Add CCS as addon