Skip to content

Commit ea3cb4d

Browse files
committed
Derive PRICE_COMMODITY from COMMODITY_BALANCE_AUX
1 parent 951f012 commit ea3cb4d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

message_ix/model/MESSAGE/model_solve.gms

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ EMISSION_CONSTRAINT.m(node,type_emission,type_tec,type_year)$(
5050
DEMAND.l(node,commodity,level,year,time) = demand_fixed(node,commodity,level,year,time) ;
5151

5252
* assign auxiliary variables PRICE_COMMODITY and PRICE_EMISSION for reporting
53-
PRICE_COMMODITY.l(node,commodity,level,year,time) =
54-
( COMMODITY_BALANCE_GT.m(node,commodity,level,year,time) + COMMODITY_BALANCE_LT.m(node,commodity,level,year,time) )
55-
/ df_period(year) ;
53+
PRICE_COMMODITY.l(node,commodity,level,year,time) = (
54+
- COMMODITY_BALANCE_AUX.M(node,commodity,level,year,time) / df_period(year)
55+
);
5656

5757
* calculate PRICE_EMISSION based on the marginals of EMISSION_EQUIVALENCE
5858
PRICE_EMISSION.l(node,type_emission,type_tec,year)$( SUM(emission$( cat_emission(type_emission,emission) ),

0 commit comments

Comments
 (0)