Skip to content

Commit 4518da5

Browse files
committed
adjust carbon price year, efficiency to price, premature scrapping, etc.
1 parent 078899a commit 4518da5

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

core/input.gms

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ $include "./iElastA.csv"
3737
$offdelim
3838
;
3939
imElastA(runCy,SBS,ETYPES,YTIME) = imElastA("ELL",SBS,ETYPES,YTIME);
40-
imElastA(runCy,DSBS,"b1",YTIME)$(not TRANSE(DSBS)) = imElastA(runCy,DSBS,"b1",YTIME) / 4;
41-
imElastA(runCy,DSBS,"b2",YTIME)$(not TRANSE(DSBS)) = imElastA(runCy,DSBS,"b2",YTIME) / 4;
40+
imElastA(runCy,DSBS,"b1",YTIME)$(not TRANSE(DSBS)) = imElastA(runCy,DSBS,"b1",YTIME) * 0;
41+
imElastA(runCy,DSBS,"b2",YTIME)$(not TRANSE(DSBS)) = imElastA(runCy,DSBS,"b2",YTIME) *0;
4242
$ENDIF.calib
4343
*---
4444
parameter iDiscData(SBS) "Discount rates per subsector ()" /
@@ -614,7 +614,7 @@ parameter imMatrFactor(allCy,DSBS,TECH,YTIME) "Maturity factor per technology
614614
imMatrFactor(runCy,DSBS,TECH,YTIME) = iMatrFactorData(DSBS,TECH,YTIME);
615615
imMatrFactor(runCy,DSBS,TECH,YTIME)$(imMatrFactor(runCy,DSBS,TECH,YTIME)=0) = 0.000001;
616616
imMatrFactor(runCy,DSBS,"TBMSWAS",YTIME) = 0.01;
617-
imMatrFactor(runCy,DSBS,"TELC",YTIME)$(DOMSE(DSBS) ) = 20;
617+
imMatrFactor(runCy,DSBS,"TELC",YTIME)$(INDDOM(DSBS) ) = 40;
618618
* DOMSE(DSBS)
619619
imMatrFactor(runCy,DSBS,"TLGN",YTIME)$(DOMSE(DSBS)) = 0.01;
620620
imMatrFactor(runCy,DSBS,"THCL",YTIME)$(DOMSE(DSBS)) = 0.01;

core/preloop.gms

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ imTransChar(runCy,"RES_MEXTV",YTIME) = 0.04;
3232

3333
*---
3434
VmRenValue.FX(YTIME)$(ord(YTIME)) = 0 ;
35-
VmRenValue.FX(YTIME)$(ord(YTIME)>=20 and ord(YTIME)<50) = (ord(YTIME)-20) * 10;
36-
VmRenValue.FX(YTIME)$(ord(YTIME)>=40) = 750;
35+
VmRenValue.FX(YTIME)$(ord(YTIME)>=20 and ord(YTIME)<50) = (ord(YTIME)-20) * 100;
36+
VmRenValue.FX(YTIME)$(ord(YTIME)>=40) = 2000;
3737
*VmRenValue.FX(YTIME)$(not AN(YTIME)) = 0 ;
3838
*VmRenValue.FX(YTIME)$(AN(YTIME)) = 0 ;
3939
*---

modules/02_Industry/technology/equations.gms

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Q02VarCostTech(allCy,DSBS,ITECH,YTIME)$(TIME(YTIME) $(not TRANSE(DSBS) and not s
119119
VmPriceFuelSubsecCarVal(allCy,DSBS,EF,YTIME) +
120120
imCO2CaptRateIndustry(allCy,ITECH,YTIME) * VmCstCO2SeqCsts(allCy,YTIME-1) * 1e-3 * imCo2EmiFac(allCy,DSBS,EF,YTIME-1) +
121121
(1-imCO2CaptRateIndustry(allCy,ITECH,YTIME)) * 1e-3 * imCo2EmiFac(allCy,DSBS,EF,YTIME-1) *
122-
(sum(NAP$NAPtoALLSBS(NAP,"PG"), VmCarVal(allCy,NAP,YTIME-1))) +
122+
(sum(NAP$NAPtoALLSBS(NAP,"PG"), VmCarVal(allCy,NAP,YTIME))) +
123123
(VmRenValue(YTIME)/1000)$(not RENEF(ITECH) and not NENSE(DSBS)) !! needs change of units
124124
) +
125125
imVarCostTech(allCy,DSBS,ITECH,YTIME) / sUnitToKUnit

modules/02_Industry/technology/input.gms

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $ENDIF.calib
4949
i02ElaSub(runCy,DSBS) = imElaSubData(DSBS);
5050
i02ElaSub(runCy,DSBS) = 2; !!
5151
*---
52-
i02ScaleEndogScrap(DSBS)$(not TRANSE(DSBS) and not sameas("DAC",DSBS)) = 6./SUM(ITECH$SECTTECH(DSBS,ITECH),1);
52+
i02ScaleEndogScrap(DSBS)$(not TRANSE(DSBS) and not sameas("DAC",DSBS)) = 1.5/SUM(ITECH$SECTTECH(DSBS,ITECH),1);
5353
*---
5454
imCO2CaptRateIndustry(runCy,CCSTECH,YTIME) = 0.9;
5555

modules/04_PowerGeneration/simple/equations.gms

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ Q04IndxEndogScrap(allCy,PGALL,YTIME)$(TIME(YTIME) $(not PGSCRN(PGALL)) $runCy(al
146146
V04CostVarTech(allCy,PGALL,YTIME)**(-2) /
147147
(
148148
V04CostVarTech(allCy,PGALL,YTIME)**(-2) +
149-
0 *(
149+
(
150150
i04ScaleEndogScrap *
151151
sum(PGALL2$(not sameas(PGALL,PGALL2)),
152-
!!i04AvailRate(allCy,PGALL2,YTIME) / i04AvailRate(allCy,PGALL,YTIME) *
152+
i04AvailRate(allCy,PGALL2,YTIME) / i04AvailRate(allCy,PGALL,YTIME) *
153153
V04CostHourProdInvDec(allCy,PGALL2,YTIME)
154154
!!+
155155
!!(1-i04AvailRate(allCy,PGALL2,YTIME) / i04AvailRate(allCy,PGALL,YTIME)) *
@@ -358,7 +358,7 @@ Q04CCSRetroFit(allCy,PGALL,YTIME)$(TIME(YTIME)$(runCy(allCy))$(NOCCS(PGALL)))..
358358
V04CostVarTech(allCy,PGALL,YTIME) ** (-2) /
359359
(
360360
V04CostVarTech(allCy,PGALL,YTIME) ** (-2) +
361-
0.005 *
361+
0.05 *
362362
SUM(PGALL2$CCS_NOCCS(PGALL2,PGALL),
363363
(
364364
V04CostCapTech(allCy,PGALL2,YTIME) -

modules/09_Heat/heat/input.gms

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ i09EffSteThrm(TDHP,YTIME) * (i03OutDHPTransfProcess("CHA","STE","2020") + 1e-6)
179179
(1e-6 - SUM((TDHP2,STEAMEF)$(TSTEAMTOEF(TDHP2,STEAMEF) and (not sameas("TSTE2GEO",TDHP))),imDataChpPowGen(TDHP2,"effThrm","2020") *i03InpDHPTransfProcess("CHA",STEAMEF,"2020")));
180180
$offtext
181181
i09EffSteElc(TSTEAM,YTIME) = imDataChpPowGen(TSTEAM,"effElc",YTIME);
182-
i09EffSteThrm(TSTEAM,YTIME) = imDataChpPowGen(TSTEAM,"effThrm",YTIME) / 2.5;
182+
i09EffSteThrm(TSTEAM,YTIME) = imDataChpPowGen(TSTEAM,"effThrm",YTIME) / 4;
183183
*---
184184
i09AvailRateSteProd(TSTEAM,YTIME) = imDataChpPowGen(TSTEAM,"AVAIL",YTIME);
185185
!!FIXME : What is the difference between imDataChpPowGen vs imDataIndTechnologyCHP?

0 commit comments

Comments
 (0)