Rename share constraint generator function

Author: macflo8

message_ix_models/model/material/build.py

@@ -28,7 +28,7 @@
     calibrate_for_SSPs,
 )
 from message_ix_models.model.material.share_constraints import (
-    add_coal_constraint,
+    add_industry_coal_shr_constraint,
     get_ssp_low_temp_shr_up,
 )
 from message_ix_models.model.material.util import (
@@ -155,7 +155,6 @@ def calibrate_existing_constraints(
         engage_updates._correct_td_co2cc_emissions(scenario)
 
     s_info = ScenarioInfo(scenario)
-    nodes = s_info.N
 
     # add_coal_lowerbound_2020(scenario)
     add_cement_bounds_2020(scenario)
@@ -173,14 +172,12 @@ def calibrate_existing_constraints(
     )
     calibrate_UE_share_constraints(scenario, s_info)
 
-    # # Electricity calibration to avoid zero prices for CHN.
-    # if "R12_CHN" in nodes:
-    #     add_elec_lowerbound_2020(scenario)
-
     calibrate_for_SSPs(scenario)
+
     # add share constraint for coal_i based on 2020 IEA data
-    add_coal_constraint(scenario)
+    add_industry_coal_shr_constraint(scenario)
 
+    # update low temp heat share constraint
     scenario.check_out()
     scenario.add_par(
         "share_commodity_up",

message_ix_models/model/material/share_constraints.py

@@ -400,7 +400,7 @@ def add_foil_shr_constraint():
         )
 
 
-def add_coal_constraint(scen: "Scenario"):
+def add_industry_coal_shr_constraint(scen: "Scenario"):
     name = "UE_industry_th_coal"
     share_reg_values = pd.read_csv(
         package_data_path("material", "other", "coal_i_shares_2020.csv")