Clean up scripts and remove commented sections

Author: measrainsey

message_ix_models/project/ssp/script/scenarios/low.py

@@ -12,7 +12,6 @@
 # selections
 sel_scen = "SSP1"
 scen_suffix = ""
-# scen_vers = 1
 rem_bof_steel = True
 mod_growth_steel = True
 mod_initial_steel = True
@@ -38,28 +37,31 @@
 model_orig = "SSP_" + sel_scen + "_v1.0"
 scenario_orig = snames[sel_scen]
 
-# add scen_suffic depending on remove_bof_steel, modify_lc_steel,
-# steel_scalar, and add_steel_target
 if rem_bof_steel:
     scen_suffix += "_bof"
 if mod_growth_steel:
-    scen_suffix += "_growth"  # + str(steel_growth)
+    scen_suffix += "_growth"
 if mod_initial_steel:
-    scen_suffix += "_initial"  # + str(steel_inital)
+    scen_suffix += "_initial"
 if add_steel_target:
     scen_suffix += "_nzsteel"
 
+# target scenario
 model_target = "MM_ScenarioMIP"
 scenario_target = "Low_" + sel_scen + scen_suffix  # + "_v" + str(scen_vers)
 
+# connect to database
 mp = ixmp.Platform("ixmp_dev")
+
+# load scenario
 s_orig = message_ix.Scenario(
     mp, model=model_orig, scenario=scenario_orig, version=svers[sel_scen]
 )
+
+# clone scenario
 s_tar = s_orig.clone(model_target, scenario_target, keep_solution=False)
 s_tar.set_as_default()
 
-
 # modify steel sector
 if rem_bof_steel:
     remove_bof_steel_lower(s_tar, steel_years)
@@ -86,15 +88,6 @@
 # add balance equality
 add_balance_equality(s_tar)
 
-# solve parameters
-# message_ix.models.DEFAULT_CPLEX_OPTIONS = {
-#     "advind": 0,
-#     "lpmethod": 4,
-#     "threads": 4,
-#     "epopt": 1e-6,
-#     "scaind": -1,
-# }
-
 solve_typ = "MESSAGE-MACRO"
 solve_args = dict(model=solve_typ)
 s_tar.solve(**solve_args)

message_ix_models/project/ssp/script/scenarios/very_low.py

@@ -20,7 +20,6 @@
 # selections
 sel_scen = "LED"
 scen_suffix = "g05_e9"
-# scen_vers = 1
 rem_bof_steel = True
 mod_growth_steel = True
 mod_initial_steel = True
@@ -41,36 +40,41 @@
     0,
 ]
 
-# model and scenario names
-path_ue = package_data_path("ue-shares")
-path_ue_file = os.path.join(path_ue, file_ue)
+# scenario names
 snames = {"SSP1": "SSP1 - Very Low Emissions", "LED": "SSP2 - Very Low Emissions"}
 svers = {"SSP1": 1, "LED": 2}
 model_orig = "SSP_" + sel_scen + "_v1.0"
 scenario_orig = snames[sel_scen]
 
-# add scen_suffic depending on remove_bof_steel, modify_lc_steel,
-# steel_scalar, and add_steel_target
 if rem_bof_steel:
     scen_suffix += "_bof"
 if mod_growth_steel:
-    scen_suffix += "_growth"  # + str(steel_growth)
+    scen_suffix += "_growth"
 if mod_initial_steel:
-    scen_suffix += "_initial"  # + str(steel_inital)
+    scen_suffix += "_initial"
 if add_steel_target:
     scen_suffix += "_nzsteel"
 
+# read UE share file
+path_ue = package_data_path("ue-shares")
+path_ue_file = os.path.join(path_ue, file_ue)
+
+# target scenario
 model_target = "MM_ScenarioMIP"
-scenario_target = "VL_" + sel_scen + "_" + scen_suffix  # + "_v" + str(scen_vers)
+scenario_target = "VL_" + sel_scen + "_" + scen_suffix
 
+# connect to database
 mp = ixmp.Platform("ixmp_dev")
+
+# load scenario
 s_orig = message_ix.Scenario(
     mp, model=model_orig, scenario=scenario_orig, version=svers[sel_scen]
 )
+
+# clone scenario
 s_tar = s_orig.clone(model_target, scenario_target, keep_solution=False)
 s_tar.set_as_default()
 
-
 # modify bounds for some fuels in residential and commercial sector
 modify_rc_bounds(s_orig, s_tar, rc_years)
 
@@ -114,15 +118,7 @@
 # add balance equality
 add_balance_equality(s_tar)
 
-# solve parameters
-# message_ix.models.DEFAULT_CPLEX_OPTIONS = {
-#     "advind": 0,
-#     "lpmethod": 4,
-#     "threads": 4,
-#     "epopt": 1e-6,
-#     "scaind": -1,
-# }
-
+# solve
 solve_typ = "MESSAGE-MACRO"
 solve_args = dict(model=solve_typ)
 s_tar.solve(**solve_args)