Add calibration for PB,GU

mmadianos · mmadianos · commit 982525d3f30a · 2026-02-06T17:20:48.000+02:00
diff --git a/core/declarations.gms b/core/declarations.gms
@@ -74,7 +74,7 @@ VmElecConsHeatPla(allCy,DSBS,YTIME)                        "Electricity consumed
 Positive Variables
 VmCarVal(allCy,NAP,YTIME)                                  "Carbon prices for all countries (US$2015/tn CO2)"
 VmRenValue(YTIME)                                          "Renewable value (US$2015/KWh)"
-common(allCy,YTIME)
+common(allCy,TRANSE,YTIME)
 ;
 
 Scalars
diff --git a/core/equations.gms b/core/equations.gms
@@ -20,19 +20,19 @@ qDummyObj(allCy,YTIME)$(TIME(YTIME) and runCy(allCy))..
       t04SharePowPlaNewEq(allCy,PGALL,YTIME)
     )
   ) +
-  SUM(TTECH$SECTTECH("PC",TTECH),
+  SUM((TRANSE,TTECH)$(SECTTECH("PC",TTECH) and (sameas("PC",TRANSE) or sameas("PB",TRANSE) or sameas("GU",TRANSE))),
     SQR(
       (
-        V01ShareTechTr(allCy,"PC",TTECH,YTIME) -
-        t01NewShareStockPC(allCy,TTECH,YTIME)
-      )$(t01NewShareStockPC(allCy,TTECH,YTIME) >= 0) +
-      0.01 * (imMatrFactor(allCy,"PC",TTECH,YTIME) - imMatrFactor(allCy,"PC",TTECH,YTIME-1))
+        V01ShareTechTr(allCy,TRANSE,TTECH,YTIME) -
+        t01NewShareStockPC(allCy,TRANSE,TTECH,YTIME)
+      )$(t01NewShareStockPC(allCy,TRANSE,TTECH,YTIME) >= 0) +
+      0.01 * (imMatrFactor(allCy,TRANSE,TTECH,YTIME) - imMatrFactor(allCy,TRANSE,TTECH,YTIME-1))
     )
   );
 
-qRestrain(allCy,TTECH,YTIME)$(TIME(YTIME) and runCy(allCy) and (t01NewShareStockPC(allCy,TTECH,YTIME) < 0)).. 
-  imMatrFactor(allCy,"PC",TTECH,YTIME)
+qRestrain(allCy,TRANSE,TTECH,YTIME)$(TIME(YTIME) and runCy(allCy) and (t01NewShareStockPC(allCy,TRANSE,TTECH,YTIME) < 0)).. 
+  imMatrFactor(allCy,TRANSE,TTECH,YTIME)
     =e=
-  common(allCy,YTIME);
+  common(allCy,TRANSE,YTIME);
 $ELSE.calib qDummyObj.. vDummyObj =e= 1;
 $ENDIF.calib
diff --git a/core/input.gms b/core/input.gms
@@ -616,6 +616,7 @@ $IFTHEN.calib %Calibration% == off
 parameter imMatrFactor(allCy,DSBS,TECH,YTIME)   "Maturity factor per technology and subsector for all countries (1)";
 imMatrFactor(runCy,DSBS,TECH,YTIME) = iMatrFactorData(runCy,DSBS,TECH,YTIME);                                          
 
+imMatrFactor(runCy,DSBS,"TBMSWAS",YTIME) = 0.01;
 $ontext
 imMatrFactor(runCy,DSBS,"TGDO",YTIME)$((ord(YTIME) > 11) and TRANSE(DSBS)) = 0.5;
 imMatrFactor(runCy,DSBS,"TGSL",YTIME)$((ord(YTIME) > 11) and TRANSE(DSBS)) = 0.5;
@@ -628,7 +629,7 @@ imMatrFactor(runCy,DSBS,"TELC",YTIME)$(ord(YTIME) > 50 and TRANSE(DSBS)) = 15;
 imMatrFactor(runCy,DSBS,"TELC",YTIME)$(ord(YTIME) > 50 and TRANSE(DSBS)) = 15;
 imMatrFactor(runCy,DSBS,"TELC",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 11;
 imMatrFactor(runCy,DSBS,"TELC",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 11;
-$offtext
+
 imMatrFactor(runCy,DSBS,"TNGSCCS",YTIME)$((ord(YTIME) > 11) and INDSE(DSBS)) = 1;
 imMatrFactor(runCy,DSBS,"THCLCCS",YTIME)$((ord(YTIME) > 11) and INDSE(DSBS)) = 1;
 imMatrFactor(runCy,DSBS,"TELC",YTIME)$(ord(YTIME) > 11 and DOMSE(DSBS)) = 20;
@@ -646,13 +647,14 @@ imMatrFactor(runCy,DSBS,"TPHEVGSL",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 0
 imMatrFactor(runCy,DSBS,"TPHEVGDO",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 0.001;
 imMatrFactor(runCy,DSBS,"TCHEVGSL",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 0.001;
 imMatrFactor(runCy,DSBS,"TCHEVGDO",YTIME)$(ord(YTIME) > 40 and TRANSE(DSBS)) = 0.001;
+$offtext
 
 $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) = 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);                                          
+imMatrFactor.UP(runCy,DSBS,TECH,YTIME) = 20;
+imMatrFactor.L(runCy,DSBS,TECH,YTIME) = 1;!!iMatrFactorData(runCy,DSBS,TECH,YTIME);     
+imMatrFactor.FX(runCy,DSBS,TECH,YTIME)$(not (sameas(DSBS,"PC") or sameas(DSBS,"PB") or sameas(DSBS,"GU")) or not SECTTECH(DSBS,TECH)) = iMatrFactorData(runCy,DSBS,TECH,YTIME);                                          
 $ENDIF.calib
 *---
 parameters
diff --git a/core/postsolve.gms b/core/postsolve.gms
@@ -15,5 +15,4 @@ $if %WriteGDX% == on execute_unload "blabla.gdx";
 $ifthen.calib %Calibration% == MatCalibration
 execute 'gdxdump outputCalib.gdx output=iMatFacPlaAvailCap.csv symb=i04MatFacPlaAvailCap cDim=y format=csv';
 execute 'gdxdump outputCalib.gdx output=iMatrFactorData.csv symb=imMatrFactor cDim=y format=csv';
-execute 'gdxdump outputCalib.gdx output=iPremScrpFac.csv symb=i01PremScrpFac cDim=y format=csv';
 $endif.calib
diff --git a/modules/01_Transport/simple/input.gms b/modules/01_Transport/simple/input.gms
@@ -233,7 +233,7 @@ i01ShareBlend("LAM",ROAD,"BGSL",YTIME) = i01ShareBlend("LAM",ROAD,"BGSL","%fBase
 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"
+table t01NewShareStockPC(allCy,TRANSE,TTECH,YTIME)    "Targets for share of new passenger cars"
 $ondelim
 $include "../targets/tNewShareStockPC.csv"
 $offdelim
diff --git a/modules/01_Transport/simple/preloop.gms b/modules/01_Transport/simple/preloop.gms
@@ -30,6 +30,7 @@ V01RateScrPcTot.FX(runCy,TTECH,YTIME)$DATAY(YTIME) = V01RateScrPc.L(runCy,TTECH,
 *---
 V01StockPcYearlyTech.L(runCy,TTECH,YTIME) = i01StockPC(runCy,TTECH,"%fBaseY%");
 V01StockPcYearlyTech.FX(runCy,TTECH,YTIME)$DATAY(YTIME) = i01StockPC(runCy,TTECH,YTIME);
+V01StockPcYearlyTech.FX(runCy,TTECH,YTIME)$(not SECTTECH("PC",TTECH)) = 0;
 *---
 V01NumPcScrap.FX(runCy,YTIME)$sameas(YTIME,"%fBaseY%") = SUM(TTECH,V01RateScrPcTot.L(runCy,TTECH,YTIME) * V01StockPcYearlyTech.L(runCy,TTECH,YTIME)); 
 *---
@@ -39,7 +40,7 @@ V01ActivGoodsTransp.FX(runCy,TRANSE,YTIME)$(not TRANG(TRANSE)) = 0;
 *---
 V01PcOwnPcLevl.FX(runCy,YTIME)$(not An(YTIME)) = V01StockPcYearly.L(runCy,YTIME) / (i01Pop(YTIME,runCy) * 1000) ;
 *---
-i01Sigma(runCy,"S2") = 0.5;
+i01Sigma(runCy,"S2") = 0.4;
 i01Sigma(runCy,"S1") = -log(V01PcOwnPcLevl.L(runCy,"%fBaseY%") / i01PassCarsMarkSat(runCy)) * EXP(i01Sigma(runCy,"S2") * i01GDPperCapita("%fBaseY%",runCy) / 10000);
 *---
 V01GapTranspActiv.LO(runCy,TRANSE,YTIME) = 0;
diff --git a/modules/11_Economy/economy/equations.gms b/modules/11_Economy/economy/equations.gms
@@ -80,7 +80,7 @@ Q11SubsiDemTech(allCy,DSBS,TECH,YTIME)$(TIME(YTIME)$(runCy(allCy))$SECTTECH(DSBS
         VmSubsiDemTechAvail(allCy,DSBS,TECH,YTIME) * 1e3 / (V01NewRegPcTechYearly(allCy,TTECH,YTIME-1) * 1e6)
         - (1 - imCapCostTechMin(allCy,DSBS,TECH,YTIME)) * imCapCostTech(allCy,DSBS,TECH,YTIME)))
       ) / 2
-    )$((ord(YTIME) > 12 and TRANSE(DSBS) and sameas(DSBS,"PC")))
+    )$(ord(YTIME) > 12 and TRANSE(DSBS) and sameas(DSBS,"PC") and sameas(TECH,"TELC"))
     +
     sum(ITECH$(sameas(TECH,ITECH)), !! Industry
       VmSubsiDemITech(allCy,DSBS,ITECH,YTIME)
diff --git a/modules/11_Economy/economy/preloop.gms b/modules/11_Economy/economy/preloop.gms
@@ -12,4 +12,6 @@ VmSubsiDemITech.FX(runCy,DSBS,ITECH,YTIME)$(DATAY(YTIME) or TFIRST(YTIME) or not
 *---
 VmSubsiCapCostTech.FX(runCy,DSBS,TECH,YTIME)$(not SECTTECH(DSBS,TECH)) = 0;
 *---
-VmNetSubsiTax.FX(runCy,YTIME)$(DATAY(YTIME)) = 0;
+VmNetSubsiTax.FX(runCy,YTIME)$(DATAY(YTIME)) = 0;
+*---
+VmSubsiDemTech.LO(runCy,DSBS,TECH,YTIME) = 0;
diff --git a/start.R b/start.R
@@ -286,7 +286,7 @@ if (task == 0) {
   }
   
   # Verify calibration output files exist
-  CalibratedParams <- c("iMatFacPlaAvailCap.csv", "iMatrFactorData.csv", "iPremScrpFac.csv")
+  CalibratedParams <- c("iMatFacPlaAvailCap.csv", "iMatrFactorData.csv")
   missing_files <- CalibratedParams[!file.exists(CalibratedParams)]
   if (length(missing_files) > 0) {
     cat("ERROR: Calibrated parameter files missing:", paste(missing_files, collapse = ", "), "\n")
@@ -349,7 +349,7 @@ if (task == 0) {
 
   if (withRunFolder && withSync) syncRun()
 
-  CalibratedParams <- c("iMatFacPlaAvailCap.csv", "iMatrFactorData.csv", "iPremScrpFac.csv")
+  CalibratedParams <- c("iMatFacPlaAvailCap.csv", "iMatrFactorData.csv")
   CalibratedParamsPath <- file.path(getwd(), CalibratedParams)
   newPath <- file.path(dirname(dirname(getwd())), "data", CalibratedParams)
   file.rename(CalibratedParamsPath, newPath)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ VmElecConsHeatPla(allCy,DSBS,YTIME) "Electricity consumed`
`74`	`74`	`Positive Variables`
`75`	`75`	`VmCarVal(allCy,NAP,YTIME) "Carbon prices for all countries (US$2015/tn CO2)"`
`76`	`76`	`VmRenValue(YTIME) "Renewable value (US$2015/KWh)"`
`77`		`-common(allCy,YTIME)`
	`77`	`+common(allCy,TRANSE,YTIME)`
`78`	`78`	`;`
`79`	`79`
`80`	`80`	`Scalars`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ Q11SubsiDemTech(allCy,DSBS,TECH,YTIME)$(TIME(YTIME)$(runCy(allCy))$SECTTECH(DSBS`
`80`	`80`	`VmSubsiDemTechAvail(allCy,DSBS,TECH,YTIME) * 1e3 / (V01NewRegPcTechYearly(allCy,TTECH,YTIME-1) * 1e6)`
`81`	`81`	`- (1 - imCapCostTechMin(allCy,DSBS,TECH,YTIME)) * imCapCostTech(allCy,DSBS,TECH,YTIME)))`
`82`	`82`	`) / 2`
`83`		`- )$((ord(YTIME) > 12 and TRANSE(DSBS) and sameas(DSBS,"PC")))`
	`83`	`+ )$(ord(YTIME) > 12 and TRANSE(DSBS) and sameas(DSBS,"PC") and sameas(TECH,"TELC"))`
`84`	`84`	`+`
`85`	`85`	`sum(ITECH$(sameas(TECH,ITECH)), !! Industry`
`86`	`86`	`VmSubsiDemITech(allCy,DSBS,ITECH,YTIME)`