fixes for scenario submission

Author: aelalex

core/input.gms

@@ -613,7 +613,14 @@ $IFTHEN.calib %MatFacCalibration% == off
 parameter imMatrFactor(allCy,DSBS,TECH,YTIME)   "Maturity factor per technology and subsector for all countries (1)";
 imMatrFactor(runCy,DSBS,TECH,YTIME) = iMatrFactorData(DSBS,TECH,YTIME);                                          
 imMatrFactor(runCy,DSBS,TECH,YTIME)$(imMatrFactor(runCy,DSBS,TECH,YTIME)=0) = 0.000001;
-
+imMatrFactor(runCy,DSBS,"TBMSWAS",YTIME) = 0.01;
+imMatrFactor(runCy,DSBS,"TELC",YTIME)$(DOMSE(DSBS) ) = 20; 
+* DOMSE(DSBS)
+imMatrFactor(runCy,DSBS,"TLGN",YTIME)$(DOMSE(DSBS)) = 0.01;
+imMatrFactor(runCy,DSBS,"THCL",YTIME)$(DOMSE(DSBS)) = 0.01;
+imMatrFactor(runCy,DSBS,"TOGS",YTIME)$(DOMSE(DSBS)) = 0.01;
+imMatrFactor(runCy,DSBS,"TKRS",YTIME)$(DOMSE(DSBS)) = 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;
 imMatrFactor(runCy,DSBS,"TELC",YTIME)$((ord(YTIME) > 11) and TRANSE(DSBS)) = 3;
@@ -642,7 +649,7 @@ 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.L(runCy,DSBS,TECH,YTIME) = iMatrFactorData(DSBS,TECH,YTIME) + 1e-6;                                          

core/preloop.gms

@@ -31,9 +31,9 @@ imTransChar(runCy,"RES_MEXTV",YTIME) = 0.04;
 *'                **Interdependent Variables**
 
 *---
-VmRenValue.FX(YTIME)$(ord(YTIME)<20) = 0 ;
-VmRenValue.FX(YTIME)$(ord(YTIME)>=20 and ord(YTIME)<50) = (ord(YTIME)-20) * 100;
-VmRenValue.FX(YTIME)$(ord(YTIME)>=40) = 2000;
+VmRenValue.FX(YTIME)$(ord(YTIME)) = 0 ;
+VmRenValue.FX(YTIME)$(ord(YTIME)>=20 and ord(YTIME)<50) = (ord(YTIME)-20) * 10;
+VmRenValue.FX(YTIME)$(ord(YTIME)>=40) = 750;
 *VmRenValue.FX(YTIME)$(not AN(YTIME)) = 0 ;
 *VmRenValue.FX(YTIME)$(AN(YTIME)) = 0 ;
 *---