Skip to content

Commit e18d32f

Browse files
macflo8khaeru
authored andcommitted
Rename share constraint generator function
1 parent 8abe89c commit e18d32f

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

message_ix_models/model/material/build.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
calibrate_for_SSPs,
2929
)
3030
from message_ix_models.model.material.share_constraints import (
31-
add_coal_constraint,
31+
add_industry_coal_shr_constraint,
3232
get_ssp_low_temp_shr_up,
3333
)
3434
from message_ix_models.model.material.util import (
@@ -155,7 +155,6 @@ def calibrate_existing_constraints(
155155
engage_updates._correct_td_co2cc_emissions(scenario)
156156

157157
s_info = ScenarioInfo(scenario)
158-
nodes = s_info.N
159158

160159
# add_coal_lowerbound_2020(scenario)
161160
add_cement_bounds_2020(scenario)
@@ -173,14 +172,12 @@ def calibrate_existing_constraints(
173172
)
174173
calibrate_UE_share_constraints(scenario, s_info)
175174

176-
# # Electricity calibration to avoid zero prices for CHN.
177-
# if "R12_CHN" in nodes:
178-
# add_elec_lowerbound_2020(scenario)
179-
180175
calibrate_for_SSPs(scenario)
176+
181177
# add share constraint for coal_i based on 2020 IEA data
182-
add_coal_constraint(scenario)
178+
add_industry_coal_shr_constraint(scenario)
183179

180+
# update low temp heat share constraint
184181
scenario.check_out()
185182
scenario.add_par(
186183
"share_commodity_up",

message_ix_models/model/material/share_constraints.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ def add_foil_shr_constraint():
400400
)
401401

402402

403-
def add_coal_constraint(scen: "Scenario"):
403+
def add_industry_coal_shr_constraint(scen: "Scenario"):
404404
name = "UE_industry_th_coal"
405405
share_reg_values = pd.read_csv(
406406
package_data_path("material", "other", "coal_i_shares_2020.csv")

0 commit comments

Comments
 (0)