Update to v4.7.7

Author: Antti-L

Version.log

@@ -2804,4 +2804,27 @@ preshape.gms  : (3)
 solve.stp     : (3)
 prepret.dsc   : (3)
 recurrin.stc  : (3)
-ppm_ext.ecb   : (1)
+ppm_ext.ecb   : (1)
+
+-----------------------------------------------------------------------------------------
+TIMES Version 4.7.7
+-----------------------------------------------------------------------------------------
+Date: 27-Dec-2023 [AL]: Maintenance release
+1) Fixed divide by zero issue in the ECB extension
+2) Performance improvement for EQ_PEAK in large models
+3) Added optional output attribute for process units
+4) Cosmetic improvements
+
+Modified files: (reason)
+initsys.mod   : Increased version number to 4.7.7
+initmty.mod   : (4)
+units.def     : (3)
+setglobs.gms  : (2)
+pp_lvlpk.mod  : (2)
+pp_shapr.mod  : (2)
+pp_reduce.red : (2)
+eqpeak.mod    : (2)
+cal_ire.mod   : (2)
+err_stat.mod  : (4)
+rpt_ext.ecb   : (1)
+solsetv.v3    : (3)

cal_ire.mod

@@ -17,32 +17,27 @@ $IF DEFINED RTP_FFCS $SET MX "(%SHFF%S(R,V,P,C,C%SOW%))*"
 *V0.9 022100 - handle the fact that called 2x for aux
 $SET IE '%3'
 $IF '%IE%'=='' $SET IE "'%1'"
-$IF '%1' == 'EXP'
-$IF '%2' == 'OUT' $GOTO AUXONLY
-$IF '%1' == 'IMP'
-$IF '%2' == 'IN' $GOTO AUXONLY
+$IF '%1%2' == 'EXPOUT' $GOTO AUXONLY
+$IF '%1%2' == 'IMPIN'  $GOTO AUXONLY
 * actual exchange
-*V05c 980923 - check that commodity not just capacity related
 *V05c 981016 - change RTPCS_VARFs to ts
-         SUM((RPC_IRE(%6R,P%7,C,'%1'),RTPCS_VARF(R,T,P,C,TS)),
+         SUM((RPC_IRE(%6R,P%7,C,'%1'),RTPCS_VARF(R,T,P,C,TS))$RS_FR(R,S,TS),
              SUM(RTP_VINTYR(R,V,T,P),
                  (%VAR%_IRE(R,V,T,P,C,TS,'%1'%SOW%)$(NOT RPC_AIRE(R,P,C))+(%VAR%_ACT(R,V,T,P,TS%SOW%)*PRC_ACTFLO(R,V,P,C))$RPC_AIRE(R,P,C)
                  )%4
-             ) *
-             RS_FR(R,S,TS)*(1+RTCS_FR(R,T,C,S,TS))
+             ) * RS_FR(R,S,TS)*(1+RTCS_FR(R,T,C,S,TS))
          ) +
 
 $IF SET IREAUXBAL %IREAUXBAL% %2 %5
 $LABEL AUXONLY
-*V0.5b handle auxillary commodity flows too
-*** NOTE: assumes that attribute at the same level as the variable!!!
+*V0.5b handle auxiliary commodity flows too
+*** NOTE: assumes that attribute at the same level as the variable!!
 *V0.9 022100 - do IN/OUT explicitly
-         SUM((RPC_IRE(%6R,P%7,COM,%IE%),RTPCS_VARF(R,T,P,COM,TS))$IRE_FLOSUM(R,T,P,COM,TS,%IE%,C,'%2'),
+         SUM((RPC_IRE(%6R,P%7,COM,%IE%),RTPCS_VARF(R,T,P,COM,TS))$(IRE_FLOSUM(R,T,P,COM,TS,%IE%,C,'%2')$RS_FR(R,S,TS)),
              IRE_FLOSUM(R,T,P,COM,TS,%IE%,C,'%2') *
              SUM(RTP_VINTYR(R,V,T,P), %MX%
                  (%VAR%_IRE(R,V,T,P,COM,TS,%IE%%SOW%)$(NOT RPC_AIRE(R,P,COM))+(%VAR%_ACT(R,V,T,P,TS%SOW%)*PRC_ACTFLO(R,V,P,COM))$RPC_AIRE(R,P,COM)
                  )%4
-             ) *
-             RS_FR(R,S,TS)*(1+RTCS_FR(R,T,COM,S,TS))
+             ) * RS_FR(R,S,TS)*(1+RTCS_FR(R,T,COM,S,TS))
          ) +
 *$OFFLISTING

eqpeak.mod

@@ -15,14 +15,14 @@
     %EQ%_PEAK(%R_T%,CG2,RTS(SL)%SWT%)$(SUM(COM_GMAP(R,CG2,C)$RTC(R,T,C),1)$COM_PKTS(R,CG2,SL)) ..
 
      SUM((COM_GMAP(R,CG2,C),COM_TS(R,C,S))$RS_FR(R,SL,S),
-      RS_FR(R,SL,S) *
+       RS_FR(R,SL,S) *
+* Apply maximum reserve among CG2 and C
+       (1/(1+MAX(SUM(COM(CG2),COM_PKRSV(R,T,COM)),COM_PKRSV(R,T,C))))*COM_IE(R,T,C,S)*
 
-      (1/(1+MAX(SMAX(COM(CG2),COM_PKRSV(R,T,COM)),COM_PKRSV(R,T,C))))*COM_IE(R,T,C,S)*
-
-      (SUM(RPC_PKC(PRC_CAP(R,P),C), G_YRFR(R,S) * PRC_CAPACT(R,P) *
+       (SUM(RPC_PKC(R,P,C), G_YRFR(R,S) * PRC_CAPACT(R,P) *
            SUM(V$COEF_CPT(R,V,T,P),COEF_CPT(R,V,T,P)*PRC_ACTFLO(R,V,P,C)*NCAP_PKCNT(R,V,P,S)*
                (%VARV%_NCAP(R,V,P %SWS%)$MILESTONYR(V)+NCAP_PASTI(R,V,P)$PASTYEAR(V) %RCAPSUB%))
-          ) +
+           ) +
 
 *
 * production
@@ -34,9 +34,8 @@ $      BATINCLUDE cal_ire.%1 EXP IN IE '*(-NCAP_PKCNT(R,V,P,S)/COM_IE(R,T,C,S))$
            (
 
 *GG*PK no multiplier
-*[UR] 25.04.2003 added NCAP_PKCNT multiplier to turn off contribution by setting NCAP_PKCNT to zero
-*[AL] 25.01.2007 allow using PKNO to switch process to production-based peak contribution
-*[AL] When PKNO=YES no default PKCNT is assigned -> process contributes only if PKCNT set by user
+* [UR] 25.04.2003 added NCAP_PKCNT multiplier to turn off contribution by setting NCAP_PKCNT to zero
+* allow using PKNO to switch process to production-based peak contribution (contributes only if PKCNT set by user)
 
 *   storage
 $            BATINCLUDE cal_stgn.%1 OUT IN '*STG_EFF(R,V,P)' '' "(NOT PRC_NSTTS(R,P,TS))" '*(NCAP_PKCNT(R,V,P,S)**RPC_PKF(R,P,C))$RPC_PKF(R,P,C)'
@@ -54,27 +53,26 @@ $IF SET PEAKCHP $BATINCLUDE %PEAKCHP%
 
      SUM((COM_GMAP(R,CG2,C),COM_TS(R,C,S))$RS_FR(R,SL,S),
          RS_FR(R,SL,S) *
-* Apply the maximum of flexibilities among CG2 an C
+* Apply maximum flexibility among CG2 and C
          (1+MAX(SUM(COM(CG2),COM_PKFLX(R,T,COM,SL)),COM_PKFLX(R,T,C,S)))*
          (
-              (
 *
 * consumption
 *
 *GG*PK pass TS as timeslice
 
 *   individual flows
-$              BATINCLUDE cal_fflo.%1 IN I  '*FLO_PKCOI(R,T,P,C,TS)'
+$          BATINCLUDE cal_fflo.%1 IN I  '*FLO_PKCOI(R,T,P,C,TS)'
 
 *   inter-regional trade from region
-$              BATINCLUDE cal_ire.%1 EXP IN IE '*FLO_PKCOI(R,T,P,C,TS)' -
+$          BATINCLUDE cal_ire.%1 EXP IN IE '*FLO_PKCOI(R,T,P,C,TS)' -
 
 * capacity related commodity flows
 *   fixed commodity associated with installed capacity or investment
-$              BATINCLUDE cal_cap.%1 IN I '1$(NOT PRC_PKNO(R,P))*'
-              ) +
+$          BATINCLUDE cal_cap.%1 IN I '1$(NOT PRC_PKNO(R,P))*'
+           +
 *   storage
-$          BATINCLUDE cal_stgn.%1 IN OUT '' 'STG_EFF(R,V,P)*(NCAP_PKCNT(R,V,P,S)**RPC_PKF(R,P,C))*' "((NOT PRC_MAP(R,'NST',P))+PRC_NSTTS(R,P,TS))" "$(NOT RPC_PKC(R,P,C)*PRC_CAP(R,P))"
+$          BATINCLUDE cal_stgn.%1 IN OUT '' 'STG_EFF(R,V,P)*(NCAP_PKCNT(R,V,P,S)**RPC_PKF(R,P,C))*' "((NOT PRC_MAP(R,'NST',P))+PRC_NSTTS(R,P,TS))" "$(NOT RPC_PKC(R,P,C))"
 
 *   blending
            SUM(BLE_OPR(R,BLE,OPR)$(BLE_INP(R,BLE,C)*BLE_TP(R,T,BLE)),G_YRFR(R,S)*(1+RTCS_FR(R,T,C,S,'ANNUAL'))*BL_INP(R,BLE,C)*PEAKDA_BL(R,BLE,T)*%VAR%_BLND(R,T,BLE,OPR %SOW%)) +

err_stat.mod

@@ -29,8 +29,15 @@ SET SOLVESTAT(J) /
   8 "Integer solution"
   9 "Intermediate non-integer"
  10 "Integer infeasible"
+ 11 "Lic problem"
  12 "Error unknown"
  13 "Error no solution"
+ 14 "No solution returned"
+ 15 "Solved unique"
+ 16 "Solved locally unique"
+ 17 "Solved singular"
+ 18 "Unbnd no solution"
+ 19 "Infes no solution"
 /;
 FILE SCREEN / '' /;
 FILE END_GAMS / %TMP% /;
@@ -46,7 +53,7 @@ $IF NOT ERRORFREE $ECHO %3%5 > %TMP%
 $GOTO DONE
 
 $LABEL SOLVE
- Z = MIN(14,%MODEL_NAME%.MODELSTAT)-1; IF(Z > 12, Z=11);
+ Z = MIN(14,%MODEL_NAME%.MODELSTAT)-1; IF(Z > 18, Z=11);
  IF(Z>=0,PUT SCREEN /"--- TIMES Solve status: ";
    LOOP(SAMEAS(J,'1'), PUT SOLVESTAT.TE(J+Z));
    PUTCLOSE;

initmty.mod

@@ -13,7 +13,7 @@
 *   - consider PRC_MAP(PRC_GRP,PRC_SUBGRP,PRC) where PRC_SUBGRP = PRC_RSOURC + any user-provided sub-groupings
 *   - SOW/COM/PRC/CUR master sets (merged) == entire list, that is not REG
 *   - lists (eg, DEM_SECT) for _MAP sets not REG (but individual mappings are)
-*   - HAVE THE USER *.SET/DD files OMIT the declarations to ease maintenance changes
+*   - HAVE THE USER *.DD files OMIT the declarations to ease maintenance changes
 *-----------------------------------------------------------------------------
 * Version control
 $IF NOT FUNTYPE rpower $ABORT TIMES Version 4.0 and above Requires GAMS 22.0 or above!
@@ -23,6 +23,7 @@ $IF gamsversion 230 $SETGLOBAL OBMAC YES
 $IF gamsversion 236 $SETGLOBAL G2X6 YES
 $LABEL DECL
 $ONEMPTY
+
 *-----------------------------------------------------------------------------
 * SET SECTION
 *-----------------------------------------------------------------------------
@@ -455,7 +456,7 @@ $IF %PGPRIM%==ACT  $SETGLOBAL RETIRE 'YES' SETGLOBAL DSCAUTO Yes
 $IFI %DSC%==YES    $KILL RCAP_BLK
 
 * Initialize list of standard extensions to be loaded
-$SETGLOBAL EXTEND
+$SET VDA 'YES' SETGLOBAL EXTEND
 
 * Add recognized extensions if defined
 $IFI '%ECB%'==YES   $SETGLOBAL EXTEND '%EXTEND% ECB'
@@ -473,7 +474,7 @@ $IFI '%MCA%' == YES $SETGLOBAL EXTEND '%EXTEND% MCA'
 $SETGLOBAL EXTEND %EXTEND% %1 %2 %3 %4 %5 %6
 
 * Load all extension declarations
-$IF NOT '%EXTEND%' == '' $BATINCLUDE main_ext.mod initmty %EXTEND%
+$BATINCLUDE main_ext.mod initmty %EXTEND%
 
 $IF ERRORFREE
 $BATINCLUDE err_stat.mod '$IF NOT ERRORFREE' ABORT 'Errors in Compile' 'VARIABLE OBJz' ': Required _TIMES.g00 Restart File Missing'

initsys.mod

@@ -1,4 +1,4 @@
-$TITLE  TIMES -- VERSION 4.7.6
+$TITLE  TIMES -- VERSION 4.7.7
 *==========================================================================================*
 * INITSYS.MOD has all the fixed system declarations for ETSAP TIMES                        *
 *==========================================================================================*

pp_lvlpk.mod

@@ -9,25 +9,27 @@
 * Questions/Comments:
 *  -
 *-----------------------------------------------------------------------------
-SET RPC_PKC(R,P,C);
-PARAMETER RPC_PKF(R,P,C) //;
+  SET RPC_PKC(R,P,C);
+  PARAMETER RPC_PKF(R,P,C) //;
 *-----------------------------------------------------------------------------
 * Collect PKTS for all COM_PEAK commodities
-LOOP(COM_PKTS(R,CG,S), RCS(COM_TS(R,C,TS))$(RS_TREE(R,S,TS)$COM_GMAP(R,CG,C)) = YES);
-TRACKC(R,C) $= SUM(RCS(R,C,S),1);
+  LOOP(COM_PKTS(R,CG,S), RCS(COM_TS(R,C,TS))$(RS_TREE(R,S,TS)$COM_GMAP(R,CG,C)) = YES);
+  TRACKC(R,C) $= SUM(RCS(R,C,S),1);
 *-----------------------------------------------------------------------------
 * Levelization of NCAP_PKCNT
-LOOP((RTP(R,V,P),S)$NCAP_PKCNT(R,V,P,S),
-  RTP_GRP(R,V,P,C,IO('OUT'))$(SUM(RCS(R,C,TS)$(NOT NCAP_PKCNT(R,V,P,TS)),1)$RPC(R,P,C)) = YES);
+  OPTION RTP_ISHPR < NCAP_PKCNT;
+  TRACKPC(RPC(R,P,C))$((TOP(RPC,'OUT')+RPC_IRE(RPC,'IMP')+PRC_PKNO(R,P))$TRACKC(R,C)) = YES;
+  RTP_GRP(RTP_ISHPR(RTP(R,V,P)),C,IO('OUT'))$(SUM(RCS(R,C,S)$(NOT NCAP_PKCNT(R,V,P,S)),1)$TRACKPC(R,P,C)) = YES;
+  FLO_PKCOI(RTP(R,T,P),C,S)$(TRACKPC(R,P,C)$PRC_PKNO(R,P)) = 0;
 *-----------------------------------------------------------------------------
 * Aggregation/inheritance to target timeslices
 *-----------------------------------------------------------------------------
-LOOP(RTP_GRP(R,V,P,C,IO), TS_ARRAY(S) = NCAP_PKCNT(R,V,P,S);
- IF((NOT SUM(RS_BELOW(R,'ANNUAL',S)$TS_ARRAY(S),1))$TS_ARRAY('ANNUAL'),
-   NCAP_PKCNT(R,V,P,S)$RCS(R,C,S) = TS_ARRAY('ANNUAL');
- ELSE
+ LOOP(RTP_GRP(R,V,P,C,IO), TS_ARRAY(S) = NCAP_PKCNT(R,V,P,S);
+  F = TS_ARRAY('ANNUAL');
+  IF((NOT SUM(RS_BELOW(R,ANNUAL,S)$TS_ARRAY(S),1))$F,NCAP_PKCNT(R,V,P,S)$RCS(R,C,S) = F;
+  ELSE
 * Set leveling default = %1;
-  TS_ARRAY('ANNUAL')$(NOT TS_ARRAY('ANNUAL')) = %1;
+   IF(NOT F,TS_ARRAY(ANNUAL) = %1);
 * Simultaneous inheritance/aggregation; but only if target level value is not present
    LOOP(RCS(R,C,TS)$(NOT TS_ARRAY(TS)),
      NCAP_PKCNT(R,V,P,TS) $=
@@ -36,7 +38,6 @@ LOOP(RTP_GRP(R,V,P,C,IO), TS_ARRAY(S) = NCAP_PKCNT(R,V,P,S);
                   TS_ARRAY(ALL_TS)))))));
 *-----------------------------------------------------------------------------
 * Peak contribution
- TRACKPC(R,P,C)$((TOP(R,P,C,'OUT')+RPC_IRE(R,P,C,'IMP'))$TRACKC(R,C)) = YES;
 * If PRC_PKAF, apply PKCNT only for capacity
  TRACKP(PRC_PKAF(RP))=NOT PRC_PKNO(RP); RPC_PKF(TRACKPC(RP,C))=EPS**1$TRACKP(RP);
  TRACKPC(PRC_PKNO(RP),C)=NO;
@@ -50,4 +51,4 @@ LOOP(RTP_GRP(R,V,P,C,IO), TS_ARRAY(S) = NCAP_PKCNT(R,V,P,S);
  TRACKPC(RP,C)$(NOT RPC_PG(RP,C)*RP_FLO(RP))=NO;
  RPC_PKC(TRACKPC(RP_PGACT(RP),C))$(RP_PG(RP,C)+TRACKP(RP))=YES;
  LOOP(NRG_TMAP(R,'ELC',C)$TRACKC(R,C),RPC_PKC(TRACKPC(TRACKP(R,P),C))=YES;TRACKP(R,P)$TRACKPC(R,P,C)=NO);
- OPTION CLEAR=TRACKP,CLEAR=TRACKC,CLEAR=TRACKPC,CLEAR=RTP_GRP,CLEAR=RCS,CLEAR=PRC_TS2;
+ OPTION CLEAR=TRACKP,CLEAR=TRACKC,CLEAR=TRACKPC,CLEAR=RTP_GRP,CLEAR=RCS,CLEAR=RTP_ISHPR,CLEAR=PRC_TS2;

pp_reduce.red

@@ -177,7 +177,8 @@ $LABEL REDDONE
   LOOP(FS_EMIS(R,P,CG,C,COM), RPCC_FFUNC(R,P,CG,COM) = YES);
   OPTION CLEAR=TRACKPC,CLEAR=FSCK;
   PRC_TS2(PRC_TS(RP_PGACT(RP_STD),S)) = YES;
-  RPC_PKF(RPC_PKC(PRC_CAP,C)) = 0;
+  RPC_PKC(RP,C)$(NOT PRC_CAP(RP)) = NO;
+  RPC_PKF(RPC_PKC) = 0;
 
 * Remove timeslices turned off if DYNTS enabled
 $IF NOT %RTS%==S $BATINCLUDE dynslite.vda REDUCE

pp_shapr.mod

@@ -12,26 +12,24 @@
 *=============================================================================*
 *AL Comments:
 *-----------------------------------------------------------------------------
+  SET RTP_SHAPI(REG,ALLYEAR,PRC,BD,J,J,LL,LL);
+$ SETLOCAL PASS %3
+$ IF %3=='' $SETLOCAL PASS YES
 
-SET RTP_SHAPI(REG,ALLYEAR,PRC,BD,J,J,LL,LL);
-SET RTP_ISHPR(REG,ALLYEAR,PRC) //;
-$SETLOCAL PASS %3
-$IF %3 == '' $SETLOCAL PASS YES
-
-LOOP(BD,RTP_ISHPR(RTP(R,V,P))$((%1%6X(RTP,BD) GE 1.5)$%1%6X(RTP,BD)) = YES);
-RTP_ISHPR(RTP(R,V,P))$((%5 GE 1.5)$%5) = YES;
+  LOOP(BD,RTP_ISHPR(RTP(R,V,P))$((%1%6X(RTP,BD) GE 1.5)$%1%6X(RTP,BD)) = YES);
+  RTP_ISHPR(RTP(R,V,P))$((%5 GE 1.5)$%5) = YES;
 
 * Prepare for start and end years
-OPTION CLEAR=FIL2; FIL2(V) = B(V)-YEARVAL(V);
-PASTSUM(RTP_ISHPR(R,V,P)) = FIL2(V)+NCAP_ILED(R,V,P)+NCAP_TLIFE(R,V,P)-1;
+  OPTION CLEAR=FIL2; FIL2(V) = B(V)-YEARVAL(V);
+  PASTSUM(RTP_ISHPR(R,V,P)) = FIL2(V)+NCAP_ILED(R,V,P)+NCAP_TLIFE(R,V,P)-1;
 
 * Shape attributes only for processes around for > 1 period
-%1%6X(RTP_ISHPR(R,V,P),BD)$(PASTSUM(R,V,P)-FIL2(V)+1 < D(V)) = 0;
+  %1%6X(RTP_ISHPR(R,V,P),BD)$(PASTSUM(R,V,P)-FIL2(V)+1 < D(V)) = 0;
 
 * Get hold of the shape and multi index J,JJ for each RVP, as well as start and end years
-LOOP(SAMEAS(J,'1'),
- RTP_SHAPI(RTP_ISHPR(R,V(LL),P),BD,J+MAX(0,%1%6X(R,V,P,BD)-1),J+MAX(0,%5-1),LL+(FIL2(V)+NCAP_ILED(R,V,P)),LL+PASTSUM(R,V,P)) = YES;
-);
+  LOOP(SAMEAS(J,'1'),
+   RTP_SHAPI(RTP_ISHPR(R,V(LL),P),BD,J+MAX(0,%1%6X(R,V,P,BD)-1),J+MAX(0,%5-1),LL+(FIL2(V)+NCAP_ILED(R,V,P)),LL+PASTSUM(R,V,P)) = YES;
+  );
 
   LOOP(SAMEAS(AGE,'1'),
 * Calculate average SHAPE for plants still operating in each period:
@@ -41,8 +39,8 @@ LOOP(SAMEAS(J,'1'),
              SHAPE(J,AGE+(MIN(YEARVAL(EOHYEARS),YEARVAL(YEAR))-YEARVAL(LL)))) /
          (MAX(1,MIN(E(T),YEARVAL(YEAR))-MAX(B(T),YEARVAL(LL))+1))));
 
-* If no shape index is pecified, set the BASE value for the attribute
-RTP_ISHPR(RTP(R,V,P)) = (NOT RTP_ISHPR(R,V,P));
-%4$(RTP_ISHPR(R,V,P)$(%PASS%)) = %1%2;
+* If no shape index is specified, set the BASE value for the attribute
+  RTP_ISHPR(RTP(R,V,P)) = (NOT RTP_ISHPR(RTP));
+  %4$(RTP_ISHPR(R,V,P)$(%PASS%)) = %1%2;
 * Clear the temporary sets
-OPTION CLEAR=RTP_SHAPI,CLEAR=RTP_ISHPR,CLEAR=PASTSUM;
+  OPTION CLEAR=RTP_SHAPI,CLEAR=RTP_ISHPR,CLEAR=PASTSUM;

rpt_ext.ecb

@@ -18,6 +18,7 @@ $ IF NOT DEFINED RTC_MS $EXIT
   PASTSUM(NCAP_YES(RVP(R,V,P))) =
     (SUM(RTP_CPTYR(R,V,T,P),COEF_PVT(R,T)*SUM(RPCS_VAR(RPC_PG(R,P,C),S),PAR_FLO(R,V,T,P,C,S))) / SUM(RTP_CPTYR(R,V,T,P),COEF_PVT(R,T)*VAR_NCAP.L(RVP)*COEF_CPT(R,V,T,P)*PRC_CAPACT(R,P)))$PRC_VINT(R,P) +
     (SUM(RTP_CPTYR(R,V,T,P)$PASTSUM(R,T,P),COEF_PVT(R,T)*COEF_CPT(R,V,T,P)/PASTSUM(R,T,P)*SUM(RPCS_VAR(RPC_PG(R,P,C),S),PAR_FLO(R,T,T,P,C,S))) / SUM(RTP_CPTYR(R,V,T,P),COEF_PVT(R,T)*COEF_CPT(R,V,T,P)))$(NOT PRC_VINT(R,P));
+  PASTSUM(RVP)$((PASTSUM(RVP)=0)$PASTSUM(RVP)) = 0;
 * Calculate INV unit cost annuity and intangibles
   COEF_RTP(RVP(R,T,P)) =
     SUM(OBJ_ICUR(RVP,CUR),SUM(OBJ_SUMII(RVP,LIFE,K_EOH,JOT),%CAPJD% OBJ_CRF(RVP,CUR) / OBJ_DIVI(RVP) * SUM(INVSPRED(K_EOH,JOT,Y,K),OBJ_ICOST(R,K,P,CUR))));
@@ -41,7 +42,7 @@ $ IF NOT DEFINED RTC_MS $EXIT
 * Adjust shares, normalize, and get sum over cutoff
       PRC_YMIN(R,P)$((PRC_YMIN(R,P)>.05)$PRC_YMIN(R,P)) = MAX(PRC_YMIN(R,P),PAR_TOP(R,T,P,C,'OUT')/MY_F*F);
       F = SUM(P$PRC_YMIN(R,P),PRC_YMIN(R,P));
-      PRC_YMIN(R,P)$PRC_YMIN(R,P)=(PRC_YMIN(R,P)/F)$(PRC_YMIN(R,P)/F>.01);
+      PRC_YMIN(R,P)$PRC_YMIN(R,P)=(PRC_YMIN(R,P)/F)$(PRC_YMIN(R,P)/F>.005);
       F = SUM(P$PRC_YMIN(R,P),PRC_YMIN(R,P))*.9999;
 * Get MY_F = Max share, and Z = sum of differences from max
       MY_F = SMAX(P$PRC_YMIN(R,P),PRC_YMIN(R,P)); Z = SUM(P$PRC_YMIN(R,P),MY_F-PRC_YMIN(R,P));

setglobs.gms

@@ -77,7 +77,7 @@ $ LABEL SYSD
   SET RPC_MARKET(R,P,C,IE)      'Market exchange process indicator'      //;
   SET RPC_PG(R,P,C)             'Commodities in the primary group'       //;
   SET RPC_SPG(R,P,C)            'Commodities in the shadow primary group'//;
-  SET RPCS_VAR(R,P,C,ALL_TS)    'The timeslices at which VAR_FLOs are to be created'//;
+  SET RPCS_VAR(R,P,C,ALL_TS)    'Timeslices at which VAR_FLOs are to be created'//;
   SET RPS_S1(R,P,ALL_TS)        'All timeslices at the PRC_TSL/COM_TSLspg'//;
   SET RPS_S2(R,P,ALL_TS)        'All timeslices at/above PRC_TSL/COM_TSLspg'//;
   SET RPS_PRCTS(R,P,ALL_TS)     'All timeslices at/above the PRC_TSL'    //;
@@ -91,10 +91,11 @@ $ LABEL SYSD
   SET RTPCS_VARF(ALL_REG,ALLYEAR,P,C,ALL_TS) 'The VAR_FLOs control set'  //;
   SET RTP_VARA(R,ALLYEAR,P)     'The VAR_ACT control set'                //;
   SET RTP_VARP(R,T,P)           'RTPs that have a VAR_CAP'               //;
-  SET RTP_VINTYR(ALL_REG,ALLYEAR,ALLYEAR,PRC) 'v/t years when vintaging involved'//;
+  SET RTP_VINTYR(REG,ALLYEAR,ALLYEAR,PRC) 'v/t years according to vintaging'//;
   SET RTP_TT(R,YEAR,T,PRC)      'Retrofit control periods'               //;
   SET RVP(R,ALLYEAR,P)          'ALIAS(RTP) for Process/time'            //;
   SET RTP_CAPYR(R,YEAR,YEAR,P)  'Capacity vintage years'                 //;
+  SET RTP_ISHPR(REG,ALLYEAR,PRC)'Attribute existence indicator'         //;
   SET RTP_CGC(REG,YEAR,P,CG,CG) 'Multi-purpose work set'                //;
   SET RTPS_BD(R,ALLYEAR,P,S,BD) 'Multi-purpose work set'                //;
   SET CG_GRP(REG,PRC,CG,CG)     'Multi-purpose work set'                //;

solsetv.v3

@@ -173,7 +173,17 @@ SETS
   REG_ACT(NONSET,%PGPRIM%) = YES;
   OTHCOM(CG) $= SUM(COM_PEAK(R,CG),1);
   OTHCOM(CUR) $= SUM(RDCUR(R,CUR),1);
-
+*---------------------------------------------------------------------
+$ IFI NOT %PUNITS%==YES $EXIT
+  SET PRC_UNITS(R,P,UC_GRPTYPE,UNITS);
+* Add default capacity unit and conversion if missing
+  G_UNCA(UNITS_ACT,UNITS_ACT)$(NOT SUM(UNITS$(G_UNCA(UNITS,UNITS_ACT)=1),1)) = 1;
+  PRC_UNITS(RP,'ACT',UNITS_ACT)$SUM(PRC_ACTUNT(RP,CG,UNITS_ACT),1) = YES;
+  LOOP(UNITS_ACT,
+    PRC_UNITS(PRC_CAP(RP),'CAP',UNITS)$((ABS(G_UNCA(UNITS,UNITS_ACT)-PRC_CAPACT(RP))<PRC_CAPACT(RP)/1280)$G_UNCA(UNITS,UNITS_ACT)$PRC_UNITS(RP,'ACT',UNITS_ACT)) = YES);
+  TRACKP(PRC_CAP(RP))$PROD(PRC_UNITS(RP,'CAP',UNITS),SUM(PRC_CAPUNT(RP,CG,UNITS_CAP),1)$PRC_UNITS(RP,'ACT',UNITS)) = YES;
+  PRC_UNITS(TRACKP(RP),'CAP',UNITS) = SUM(PRC_CAPUNT(RP,CG,UNITS_CAP(UNITS)),1);
+  OPTION CLEAR=TRACKP;
 $ EXIT
 *---------------------------------------------------------------------
 $ LABEL FINISHUP