Add TH2F tech for bunkers; Bugfix for hydrogen emission calculations;

Author: mmadianos

core/equations.gms

@@ -28,7 +28,6 @@ qDummyObj(allCy,YTIME)$(TIME(YTIME) and runCy(allCy))..
       )$(t01NewShareStockPC(allCy,TTECH,YTIME) >= 0) +
       0.01 * (imMatrFactor(allCy,"PC",TTECH,YTIME) - imMatrFactor(allCy,"PC",TTECH,YTIME-1))
     )
-    
   );
 
 qRestrain(allCy,TTECH,YTIME)$(TIME(YTIME) and runCy(allCy) and (t01NewShareStockPC(allCy,TTECH,YTIME) < 0)).. 

core/input.gms

@@ -600,7 +600,7 @@ elseif %fScenario% eq 4 then
      iCarbValYrExog(allCy,YTIME) = iEnvPolicies(allCy,"exogCV_Calib",YTIME);
 endif;
 *---
-table iPremScrpFacData(allCy,DSBS,TECH,YTIME)     "Parameter that controls premature scrapping"
+table i01PremScrpFac(allCy,DSBS,TECH,YTIME)     "Parameter that controls premature scrapping"
 $ondelim
 $include"./iPremScrpFac.csv"
 $offdelim
@@ -650,8 +650,8 @@ imMatrFactor(runCy,DSBS,"TCHEVGDO",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 0
 $ELSE.calib
 variable imMatrFactor(allCy,DSBS,TECH,YTIME)    "Maturity factor per technology and subsector for all countries (1)";
 imMatrFactor.LO(runCy,DSBS,TECH,YTIME) = 0;                                          
-*imMatrFactor.UP(runCy,DSBS,TECH,YTIME) = 100;
-imMatrFactor.L(runCy,DSBS,TECH,YTIME) = 1; !!iMatrFactorData(runCy,DSBS,TECH,YTIME);     
+imMatrFactor.UP(runCy,DSBS,TECH,YTIME) = 10;
+imMatrFactor.L(runCy,DSBS,TECH,YTIME) = iMatrFactorData(runCy,DSBS,TECH,YTIME);     
 imMatrFactor.FX(runCy,DSBS,TECH,YTIME)$(not sameas(DSBS,"PC") or not SECTTECH(DSBS,TECH)) = iMatrFactorData(runCy,DSBS,TECH,YTIME);                                          
 $ENDIF.calib
 *---
@@ -687,6 +687,8 @@ imUsfEneConvSubTech(runCy,DOMSE,TECH,YTIME) = imDataDomTech(DOMSE,TECH,"USC");
 imFixOMCostTech(runCy,NENSE,TECH,YTIME)= imDataNonEneSec(NENSE,TECH,"FC");
 imVarCostTech(runCy,NENSE,TECH,YTIME) = imDataNonEneSec(NENSE,TECH,"VC");
 imUsfEneConvSubTech(runCy,NENSE,TECH,YTIME) = imDataNonEneSec(NENSE,TECH,"USC");
+imUsfEneConvSubTech(runCy,"BU","TH2F",YTIME) = 0.7;
+imCapCostTech(runCy,"BU","TH2F",YTIME) = 1.5 * imCapCostTech(runCy,"BU","TGDO",YTIME);
 *---
 !!imUsfEneConvSubTech(runCy,INDSE,"THCL",YTIME)$AN(YTIME)  = imDataIndTechnology(INDSE,"THCL","USC") + 0.005 * (ord(YTIME)-11);
 imUsfEneConvSubTech(runCy,INDSE,"THCLCCS",YTIME)$AN(YTIME)  = imDataIndTechnology(INDSE,"THCLCCS","USC") + 0.005 * (ord(YTIME)-11);

core/sets.gms

@@ -863,9 +863,7 @@ PA.(TKRS)
 (IS,BM,CH).(TNGSCCS,THCLCCS)
 (HOU,AG).(THCL,TLPG,TKRS,TGDO,TNGS,TOGS,TBMSWAS,TELC,TSTE)
 SE.(THCL,TLPG,TKRS,TNGS,TOGS,TELC,TSTE)
-
-*BU.(GDO,RFO,OLQ)
-BU.(TGDO,TRFO,TKRS)
+BU.(TGDO,TRFO,TKRS,TH2F)
 (PCH,NEN).(TLGN,THCL,TGDO,TRFO,TLPG,TOLQ,TNGS,TOGS)
 DAC.(HTDAC,H2DAC,LTDAC,EWDAC)
 /

modules/01_Transport/simple/input.gms

@@ -209,6 +209,7 @@ i01TechLft(runCy,DOMSE,ITECH,YTIME) = imDataDomTech(DOMSE,ITECH,"LFT");
 *---
 **  Non Energy Sector and Bunkers
 i01TechLft(runCy,NENSE,ITECH,YTIME) = imDataNonEneSec(NENSE,ITECH,"LFT");
+i01TechLft(runCy,"BU","TH2F",YTIME) = 25;
 *---
 i01GDPperCapita(YTIME,runCy) = i01GDP(YTIME,runCy) / i01Pop(YTIME,runCy);
 *---or not sameas("BGSL", EF) or not sameas("BGDO", EF) "%fBaseY%"
@@ -221,27 +222,18 @@ SUM(EF2$BLENDMAP(EF2,EF),
     )
   )$(sum(EFS$BLENDMAP(EF2,EFS),imFuelConsPerFueSub(runCy,TRANSE,EFS,YTIME)) > 0)
 );
-i01ShareBlend(runCy,TRANSE,EF,YTIME)$(AN(YTIME) and (i01DataShareBlend(runCy,TRANSE,EF,YTIME) = 0)) = i01ShareBlend(runCy,TRANSE,EF,"%fBaseY%");
-i01ShareBlend(runCy,TRANSE,EF,YTIME)$(AN(YTIME) and i01DataShareBlend(runCy,TRANSE,EF,YTIME)) = i01DataShareBlend(runCy,TRANSE,EF,YTIME);
-*---
-$IFTHEN.calib %Calibration% == off
-parameter i01PremScrpFac(allCy,TRANSE,TTECH,YTIME)     "Parameter that controls premature scrapping";
-i01PremScrpFac(runCy,TRANSE,TTECH,YTIME) = iPremScrpFacData(runCy,TRANSE,TTECH,YTIME);
-$ELSE.calib
-
+i01ShareBlend(runCy,TRANSE,EFS,YTIME)$(SECtoEF(TRANSE,EFS) and not SUM(EF2,BLENDMAP(EF2,EFS))) = 1;
+i01ShareBlend(runCy,TRANSE,EF,YTIME)$AN(YTIME) = i01ShareBlend(runCy,TRANSE,EF,"%fBaseY%");
+i01ShareBlend("LAM",ROAD,"BGDO",YTIME) = i01ShareBlend("LAM",ROAD,"BGDO","%fBaseY%") + 0.002 * (ord(YTIME)-11);
+i01ShareBlend("LAM",ROAD,"GDO",YTIME) = i01ShareBlend("LAM",ROAD,"GDO","%fBaseY%") - 0.002 * (ord(YTIME)-11);
+i01ShareBlend("LAM",ROAD,"BGSL",YTIME) = i01ShareBlend("LAM",ROAD,"BGSL","%fBaseY%") + 0.001 * (ord(YTIME)-11);
+i01ShareBlend("LAM",ROAD,"GSL",YTIME) = i01ShareBlend("LAM",ROAD,"GSL","%fBaseY%") - 0.001 * (ord(YTIME)-11);
+*---
+$IFTHEN.calib %Calibration% == MatCalibration
 table t01NewShareStockPC(allCy,TTECH,YTIME)    "Targets for share of new passenger cars"
 $ondelim
 $include "../targets/tNewShareStockPC.csv"
 $offdelim
 ;
-
-variable i01PremScrpFac(allCy,TRANSE,TTECH,YTIME)     "Variable that controls premature scrapping";
-i01PremScrpFac.L(runCy,"PC",TTECH,YTIME) = iPremScrpFacData(runCy,"PC",TTECH,YTIME);                                          
-i01PremScrpFac.LO(runCy,"PC",TTECH,YTIME) = 0;                                         
-i01PremScrpFac.UP(runCy,"PC",TTECH,YTIME) = 20;
-i01PremScrpFac.FX(runCy,TRANSE,TTECH,YTIME)$(not sameas(TRANSE,"PC")) = iPremScrpFacData(runCy,TRANSE,TTECH,YTIME);
-i01PremScrpFac.FX(runCy,TRANSE,TTECH,YTIME)$(not SECTTECH(TRANSE,TTECH)) = 0;
-
 *imMatrFactor.FX(runCy,"PC",TTECH,YTIME)$((t01StockPC(runCy,TTECH,YTIME) < 0) and (t01NewShareStockPC(runCy,TTECH,YTIME) <= 0)) = 100;         
-i01PremScrpFac.FX(runCy,"PC",TTECH,YTIME)$(SECTTECH("PC",TTECH)) = 0.1;
 $ENDIF.calib

modules/01_Transport/simple/preloop.gms

@@ -5,11 +5,13 @@
 
 V01RateScrPcTot.UP(runCy,TTECH,YTIME) = 1;
 V01PcOwnPcLevl.UP(runCy,YTIME) = 2*i01PassCarsMarkSat(runCy);
-V01PremScrp.UP(runCy,TRANSE,TTECH,YTIME) = 1;
+*---
 V01RateScrPc.UP(runCy,TTECH,YTIME) = 1;
-
 V01RateScrPc.LO(runCy,TTECH,YTIME) = 0;
+*---
+V01PremScrp.UP(runCy,TRANSE,TTECH,YTIME) = 1;
 V01PremScrp.LO(runCy,TRANSE,TTECH,YTIME) = 0;
+V01PremScrp.FX(runCy,TRANSE,TTECH,YTIME)$(not SECTTECH(TRANSE,TTECH)) = 0;
 *---
 V01StockPcYearly.L(runCy,YTIME) = 0.1;
 V01StockPcYearly.FX(runCy,YTIME)$(not An(YTIME)) = imActv(YTIME,runCy,"PC");
@@ -50,6 +52,7 @@ V01ConsTechTranspSectoral.FX(runCy,TRANSE,TTECH,EF,YTIME)$(SECTTECH(TRANSE,TTECH
 V01ConsTechTranspSectoral.FX(runCy,TRANSE,TTECH,EF,YTIME)$(SECTTECH(TRANSE,TTECH) and PLUGIN(TTECH) and DATAY(YTIME)) = 0;
 V01ConsTechTranspSectoral.FX(runCy,TRANSE,TTECH,EF,YTIME)$(SECTTECH(TRANSE,TTECH) and CHYBV(TTECH) and DATAY(YTIME)) = 0;
 *---
+VmDemFinEneTranspPerFuel.L(runCy,TRANSE,EF,YTIME) = 1;
 VmDemFinEneTranspPerFuel.FX(runCy,TRANSE,EF,YTIME) $(SECtoEF(TRANSE,EF) $(not An(YTIME))) = imFuelConsPerFueSub(runCy,TRANSE,EF,YTIME);
 VmDemFinEneTranspPerFuel.FX(runCy,TRANSE,EF,YTIME)$(not SECtoEF(TRANSE,EF)) = 0;
 *---

modules/01_Transport/simple/sets.gms

@@ -9,4 +9,6 @@ GSL.(GSL,BGSL)
 GDO.(GDO,BGDO,RFO,OLQ)
 KRS.(KRS,BKRS)
 NGS.(NGS,OGS)
-/
+/
+
+ROAD(TRANSE)    /PC,PB,GU/

modules/02_Industry/technology/postsolve.gms

@@ -22,5 +22,4 @@ V02PremScrpIndu.FX(runCyL,DSBS,ITECH,YTIME)$TIME(YTIME) = V02PremScrpIndu.L(runC
 
 $ifthen.calib %Calibration% == MatCalibration
 imMatrFactor.FX(runCyL,DSBS,TECH,YTIME)$TIME(YTIME) = imMatrFactor.L(runCyL,DSBS,TECH,YTIME)$TIME(YTIME);
-i01PremScrpFac.FX(runCyL,TRANSE,TTECH,YTIME)$TIME(YTIME) = i01PremScrpFac.L(runCyL,TRANSE,TTECH,YTIME)$TIME(YTIME);
 $endif.calib

modules/03_RestOfEnergy/legacy/equations.gms

@@ -189,8 +189,7 @@ Q03InpTotTransf(allCy,SSBS,EFS,YTIME)$(TIME(YTIME)$(runCy(allCy))$SECtoEF(SSBS,E
     VmConsFuelSteProd(allCy,"DHP",EFS,YTIME)$sameas("STEAMP",SSBS) +
     V03InputTransfRef(allCy,EFS,YTIME)$sameas("LQD",SSBS) + 
     V03InputTransfSolids(allCy,EFS,YTIME)$sameas("SLD",SSBS) +
-    V03InputTransfGasses(allCy,EFS,YTIME)$sameas("GAS",SSBS) + 
-    VmConsFuelH2Prod(allCy,EFS,YTIME)$sameas("H2P",SSBS);            
+    V03InputTransfGasses(allCy,EFS,YTIME)$sameas("GAS",SSBS);            
 
 *' The equation calculates the total transformation output for a specific energy branch in a given scenario and year.
 *' The result is obtained by summing the transformation outputs from different sources, including thermal power stations, District Heating Plants,
@@ -367,4 +366,5 @@ Q03ConsFiEneSec(allCy,SSBS,EFS,YTIME)$(TIME(YTIME)$(runCy(allCy))$SECtoEF(SSBS,E
     SUM(EFS2$SECtoEFPROD(SSBS,EFS2), 
       V03OutTotTransf(allCy,SSBS,EFS2,YTIME) +
       V03ProdPrimary(allCy,EFS2,YTIME)$(not PGRENEF(EFS2))
-    );                               
+    ) +
+    VmConsFuelH2Prod(allCy,EFS,YTIME)$sameas("H2P",SSBS);                               

modules/05_Hydrogen/legacy/preloop.gms

@@ -13,18 +13,16 @@ V05GapShareH2Tech1.UP(runCy,H2TECH,YTIME) = 1;
 V05GapShareH2Tech1.LO(runCy,H2TECH,YTIME) = 0;
 *---
 V05DemGapH2.LO(runCy,YTIME) = 0;
-V05DemGapH2.L(runCy,YTIME) = 2;
+V05DemGapH2.L(runCy,YTIME) = 10;
 V05DemGapH2.FX(runCy,YTIME)$(not An(YTIME)) = 0;
-
 *---
-VmProdH2.L(runCy,H2TECH, YTIME) = 0.5;
-VmProdH2.LO(runCy,H2TECH, YTIME) = 0;
-VmProdH2.FX(runCy,H2TECH, YTIME)$(not An(YTIME)) = 0;
-display VmProdH2.L;
+VmDemTotH2.LO(runCy,YTIME) = 0;
+VmDemTotH2.L(runCy,YTIME) = SUM(SSBS$SECtoEF(SSBS,"H2F"),i03DataOwnConsEne(runCy,SSBS,"H2F",YTIME)) + SUM(DSBS, imFuelConsPerFueSub(runCy,DSBS,"H2F",YTIME)) + 1;
+VmDemTotH2.FX(runCy,YTIME)$DATAY(YTIME) = SUM(SSBS$SECtoEF(SSBS,"H2F"),i03DataOwnConsEne(runCy,SSBS,"H2F",YTIME)) + SUM(DSBS, imFuelConsPerFueSub(runCy,DSBS,"H2F",YTIME));
 *---
-VmDemTotH2.L(runCy,YTIME) = 2;
-VmDemTotH2.FX(runCy,YTIME)$(not An(YTIME)) = sum(H2TECH, VmProdH2.L(runCy,H2TECH,YTIME));
-display VmDemTotH2.L;
+VmProdH2.LO(runCy,H2TECH, YTIME) = 0;
+VmProdH2.L(runCy,H2TECH, YTIME) = 0.5;
+VmProdH2.FX(runCy,H2TECH, YTIME)$DATAY(YTIME) = 0;
 *---
 *VmConsFuelTechH2Prod.L(runCy,H2TECH,EF,YTIME)$(not An(YTIME)$H2TECHEFtoEF(H2TECH,EF)) = 0;
 VmConsFuelTechH2Prod.FX(runCy,H2TECH,EF,"%fBaseY%")$(H2TECHEFtoEF(H2TECH,EF)) = (VmProdH2.L(runCy,H2TECH,"%fBaseY%")/i05EffH2Prod(runCy,H2TECH,"%fBaseY%"));
@@ -66,7 +64,7 @@ V05CostProdCCSNoCCSH2Prod.LO(runCy,H2TECH,YTIME) = epsilon6;
 V05CostProdCCSNoCCSH2Prod.L(runCy,H2TECH,YTIME) = 2;
 *---
 VmCostAvgProdH2.LO(runCy,YTIME) = 0;
-VmCostAvgProdH2.L(runCy,YTIME) = 2;
+VmCostAvgProdH2.L(runCy,YTIME) = 1;
 VmCostAvgProdH2.FX(runCy,YTIME)$DATAY(YTIME) = 
 sum(H2TECH, 
   (VmProdH2.L(runCy,H2TECH,YTIME) + 1e-6) *

modules/09_Heat/heat/equations.gms

@@ -48,7 +48,7 @@ Q09DemGapSte(allCy,YTIME)$(TIME(YTIME)$(runCy(allCy)))..
         VmProdSte(allCy,TSTEAM,YTIME-1)
       )
   ))
-  )/2;
+  )/2 + 1e-6;
 
 Q09CostVarProdSte(allCy,TSTEAM,YTIME)$(TIME(YTIME)$(runCy(allCy)))..
     V09CostVarProdSte(allCy,TSTEAM,YTIME)