Update to v4.7.9

Author: Antti-L

Version.log

@@ -2846,4 +2846,24 @@ eqpeak.mod    : (3)
 cal_fflo.mod  : (3)
 pp_qack.mod   : (1)
 init_ext.vda  : (2)
-pp_prelv.vda  : (3)
+pp_prelv.vda  : (3)
+
+-----------------------------------------------------------------------------------------
+TIMES Version 4.7.9
+-----------------------------------------------------------------------------------------
+Date: 25-Feb-2024 [AL]: Maintenance QA release
+1) Added support for shaping NCAP_OCOM based on COEF_CPT
+2) Fixed performance bug within IRE_FLO levelizing
+3) Improved QA checks for ACT_EFF default shadow group
+4) Cosmetic improvements
+
+Modified files: (reason)
+initsys.mod   : Increased version number to 4.7.9
+ppmain.mod    : (1)
+setglobs.gms  : (1)
+preshape.gms  : (4)
+pp_lvlif.mod  : (2)
+pp_reduce.red : (4)
+coef_nio.mod  : (1)
+coef_shp.mod  : (1)
+ppm_ext.vda   : (3)

coef_nio.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
 * This file is part of the IEA-ETSAP TIMES model generator, licensed
 * under the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *=============================================================================*
@@ -11,8 +11,7 @@
 *[AL] Corrected bugs in the end of commodity flows in the OCOM case
 *-----------------------------------------------------------------------------
 * commodity flows tied to new capacity
-*V0.5b 980828 re-adjust v,t handling to capture enclosed periods & condition to
-*             handle period of length 1
+*V0.5b 980828 re-adjust v,t handling to capture enclosed periods & condition to handle period of length 1
      RPC_CAPFLO(R,V,P,C)$(NOT RTP(R,V,P)) = 0;
      FIL(V) = YEARVAL(V) GE MIYR_V1;
 *V05c 980923 - use the capacity flow control set
@@ -33,26 +32,24 @@
      );
 
 * commodity flows tied to decommissioning of capacity
-*V05c 980921 - include the PASTInvestments, was looping over MILESTONYR
-*V05c 980923 - use the capacity flow control set
+*V05c 980923 - use the capacity flow control set, including PASTInvestments
      LOOP(RPC_CAPFLO(R,V,P,C)$NCAP_OCOM(R,V,P,C),
-       F = NCAP_ILED(R,V,P); MY_F = NCAP_TLIFE(R,V,P);
+       F = NCAP_ILED(R,V,P)+NCAP_DLAG(R,V,P); MY_F = NCAP_TLIFE(R,V,P);
        Z = MAX(1,NCAP_DLIFE(R,V,P)); DFUNC = COEF_RPTI(R,V,P);
        IF(DFUNC GT 1,
          FOR(CNT = 1 TO CEIL(DFUNC),
            COEF_OCOM(R,V,T,P,C)$(YEARVAL(T) >= YEARVAL(V)) =
                                  COEF_OCOM(R,V,T,P,C) + MIN(1,DFUNC-CNT+1) *
-                                 (MAX(0,(MIN(B(V)+F+(CNT*MY_F)+NCAP_DLAG(R,V,P)+Z,E(T)+1) -
-                                         MAX(B(V)+F+(CNT*MY_F)+NCAP_DLAG(R,V,P),B(T))
+                                 MAX(0,(MIN(B(V)+F+(CNT*MY_F)+Z,E(T)+1) -
+                                        MAX(B(V)+F+(CNT*MY_F),B(T))
                                         ) / FPD(T)
-                                     ) * (NCAP_OCOM(R,V,P,C) / Z)
-                                 )
+                                    ) * (NCAP_OCOM(R,V,P,C) / Z)
             )
        ELSE
           COEF_OCOM(R,V,T,P,C)$(YEARVAL(T) >= YEARVAL(V)) =
 * some part of release in T
-            MAX(0,(MIN(B(V)+F+MY_F+NCAP_DLAG(R,V,P)+Z,E(T)+1) -
-                   MAX(B(V)+F+MY_F+NCAP_DLAG(R,V,P),B(T))
+            MAX(0,(MIN(B(V)+F+MY_F+Z,E(T)+1) -
+                   MAX(B(V)+F+MY_F,B(T))
                   ) / FPD(T)
                ) * (NCAP_OCOM(R,V,P,C) / Z)
        );

coef_shp.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
 * This file is part of the IEA-ETSAP TIMES model generator, licensed
 * under the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *=============================================================================*
@@ -43,7 +43,7 @@
   RTP_FFCX(RTP_CAPYR,'CAPFLO',CG) = 0;
 * Option for non-vintaged FLO_FUNC multipliers
   RTP_FFCX(RTP_VINTYR(R,V,T,P),CG,CG2)$((FLO_FUNC(R,V,P,CG,CG2,'ANNUAL')>0)$RTP_CGC(R,V,P,CG,CG2))=FLO_FUNC(R,T,P,CG,CG2,'ANNUAL')/FLO_FUNC(R,V,P,CG,CG2,'ANNUAL')-1;
-  OPTION CLEAR=RTP_CGC,CLEAR=TRACKP,CLEAR=RVPRL,CLEAR=RP_GRP;
+  OPTION CLEAR=TRACKP,CLEAR=RVPRL,CLEAR=RP_GRP;
 *------------------------------------------------------------------------------
 * Shaping of COEF_CPT
 *------------------------------------------------------------------------------
@@ -72,4 +72,11 @@
   );
   OPTION RTP_CPX <= COEF_CAP;
   COEF_CPT(R,V,T,P)$COEF_CAP(R,V,T,P) = COEF_CPT(R,V,T,P)*(COEF_CAP(R,V,T,P)+1);
-  OPTION CLEAR=PRC_YMIN,CLEAR=PRC_YMAX,CLEAR=TRACKP,CLEAR=COEF_CAP,CLEAR=RVPRL;
+
+* Override COEF_OCOM if conditions met for using capacity transfer
+  RTP_CGC(RTP(R,V,P),CG('CAPFLO'),C)$((MAX(NCAP_ILED(RTP),NCAP_DLIFE(RTP),NCAP_DLAG(RTP))<=0)$(FLO_FUNCX(R,'0',P,CG,C)=2)$NCAP_OCOM(RTP,C))=YES;
+  OPTION TRACKPG <= RTP_CGC;
+  LOOP(TRACKPG(R,P,CG('CAPFLO')),
+    COEF_OCOM(R,VNT(V,T),P,C)$RTP_CGC(R,V,P,CG,C) = (MAX(0,1-COEF_CPT(R,V,T,P))*NCAP_OCOM(R,V,P,C)/FPD(T))$VNT(T,V);
+    COEF_OCOM(R,V,TT(T+1),P,C)$(RTP_CPTYR(R,V,T,P)$NCAP_OCOM(R,V,P,C)$RTP_CGC(R,V,P,CG,C))=MAX(0,COEF_CPT(R,V,T,P)-COEF_CPT(R,V,TT,P))*NCAP_OCOM(R,V,P,C)/FPD(TT));
+  OPTION CLEAR=PRC_YMIN,CLEAR=PRC_YMAX,CLEAR=TRACKP,CLEAR=TRACKPG,CLEAR=RTP_CGC,CLEAR=COEF_CAP,CLEAR=RVPRL;

initsys.mod

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

pp_lvlif.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
 * This file is part of the IEA-ETSAP TIMES model generator, licensed
 * under the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *=============================================================================*
@@ -14,32 +14,26 @@
   OPTION CLEAR=UNCD7; PUTGRP = 0;
 *-----------------------------------------------------------------------------
   LOOP((REG,V,P,COM,R,C,S)$IRE_FLO(REG,V,P,COM,R,C,S),
-    IF(NOT RPCS_VAR(R,P,C,S),
-     IF(NOT UNCD7(REG,P,COM,R,C,'0','0'), UNCD7(REG,P,COM,R,C,'0','0') = YES;
-       IF(NOT RPC_IRE(R,P,C,'IMP'),
-$        BATINCLUDE pp_qaput.%1 PUTOUT PUTGRP 02 'IRE_FLO import commodity not in TOP_IRE'
-         PUT QLOG ' WARNING        -    R=',%RL%,' P=',%PL%,' C=',C.TL ;
-       );
-       IF((NOT SUM((RS_BELOW(R,S,TS),MODLYEAR),IRE_FLO(REG,MODLYEAR,P,COM,R,C,S)))$SAMEAS('ANNUAL',S),
-* No values below an ANNUAL level value: inherit value down
-            UNCD7(REG,P,COM,R,C,S,'') = YES;
-       ELSE UNCD7(REG,P,COM,R,C,TS,'')$RPCS_VAR(R,P,C,TS) = YES;))));
+    IF((NOT RPCS_VAR(R,P,C,S))$STOA(S),
+      IF(NOT UNCD7(REG,V,P,COM,R,C,'N'),
+        IF(NOT RPC_IRE(R,P,C,'IMP'),TRACKPC(R,P,C)=YES;
+        ELSE UNCD7(REG,V,P,COM,R,C,'N') = YES))));
+  LOOP(TRACKPC(R,P,C),
+$    BATINCLUDE pp_qaput.%1 PUTOUT PUTGRP 02 'IRE_FLO import commodity not in TOP_IRE'
+     PUT QLOG ' WARNING        -    R=',%RL%,' P=',%PL%,' C=',C.TL );
 *-----------------------------------------------------------------------------
 * Aggregation/inheritance to target timeslices
 *-----------------------------------------------------------------------------
-  LOOP(UNCD7(REG,P,COM,R,C,TS,''),
-    IF(RPCS_VAR(R,P,C,TS),
-* Leveling by simultaneous aggregation/inheritance; but only if target level value is not present
-     LOOP(RTP(REG,V,P), TS_ARRAY(S) = IRE_FLO(REG,V,P,COM,R,C,S);
-       IRE_FLO(REG,V,P,COM,R,C,TS)$(NOT TS_ARRAY(TS)) $=
+  LOOP(UNCD7(REG,V,P,COM,R,C,L),
+* Leveling by simultaneous aggregation/inheritance; but only if target level value not present
+     TS_ARRAY(S) = IRE_FLO(REG,V,P,COM,R,C,S);
+     IRE_FLO(REG,V,P,COM,R,C,TS)$((NOT TS_ARRAY(TS))$PRC_TS(R,P,TS)) $=
          SUM(RS_TREE(FINEST(R,S),TS), G_YRFR(R,S) * (TS_ARRAY(S) +
            SUM(RS_BELOW(R,ALL_TS,S)$((NOT SUM(TS_MAP(R,SL,S)$RS_BELOW(R,ALL_TS,SL),TS_ARRAY(SL)))$TS_ARRAY(ALL_TS)),
              TS_ARRAY(ALL_TS))))/G_YRFR(R,TS));
-    ELSE MY_ARRAY(V) = IRE_FLO(REG,V,P,COM,R,C,TS);
-* Simple direct inheritance down
-     IRE_FLO(RTP(REG,V,P),COM,R,C,S)$(RS_BELOW(R,TS,S)$RPCS_VAR(R,P,C,S)) $= MY_ARRAY(V);));
 *-----------------------------------------------------------------------------
-OPTION CLEAR=UNCD7;
+* Simple direct inheritance down
+  IRE_FLO(RTP(REG,V,P),COM,R,C,S)$((NOT IRE_FLO(REG,V,P,COM,R,C,S))$PRC_TS(R,P,S)) $= IRE_FLO(REG,V,P,COM,R,C,'ANNUAL');
+  OPTION CLEAR=TRACKPC, CLEAR=UNCD7;
 
 *$OFFLISTING
-

pp_reduce.red

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
 * This file is part of the IEA-ETSAP TIMES model generator, licensed
 * under the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *-----------------------------------------------------------------------------
@@ -19,6 +19,7 @@ $IF %REDUCE% == NO $GOTO REDDONE
 *-----------------------------------------------------------------------------
 * determining processes that need capacity variables
   PRC_CAP(RP) = NO;
+$IF DEFINED PRC_DSCNCAP PRC_CAP(PRC_DSCNCAP) = YES;
   LOOP((R,UC_N,P)$UC_GMAP_P(R,UC_N,'CAP',P),  PRC_CAP(R,P) = YES);
   LOOP((R,UC_N,P)$UC_GMAP_P(R,UC_N,'NCAP',P), PRC_CAP(R,P) = YES);
   LOOP((RTP(R,PYR,P))$NCAP_PASTI(R,PYR,P),    PRC_CAP(R,P) = YES);

ppm_ext.vda

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
 * This file is part of the IEA-ETSAP TIMES model generator, licensed
 * under the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *=============================================================================*
@@ -82,7 +82,11 @@ $IF NOT DEFINED RP_FFSGG $GOTO DONEFUNC
 $LABEL DONEFUNC
 *-----------------------------------------------------------------------------
 * Add singleton ACT_EFFs to RPC_FFUNC
-  OPTION TRACKPC < RPG_1ACE; RPC_NOFLO(TRACKPC) = NO;
+  OPTION TRACKPC < RPG_1ACE; RPC_NOFLO(TRACKPC) = NO; PUTGRP=0;
+  LOOP(TRACKPC(KEEP_FLOF(R,P,C)),
+   IF(RPC_FFUNC(R,P,C)+TRACKPG(R,P,C),RPG_1ACE(R,P,CG,C) = NO; ELSE
+$   BATINCLUDE pp_qaput.mod PUTOUT PUTGRP 01 'ACT_EFF shadow group contains only an auxiliary flow'
+    PUT ' WARNING       - ACT_EFF is applied to the auxiliary flow: R.P.C= 'TRACKPC.TE(TRACKPC)));
   TRACKPC(KEEP_FLOF) = NO; PUTGRP=0;
   LOOP(RPC_FFUNC(TRACKPC),
 $   BATINCLUDE pp_qaput.mod PUTOUT PUTGRP 09 'Inconsistent/spurious process transformation parameters'

ppmain.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
 * This file is part of the IEA-ETSAP TIMES model generator, licensed
 * under the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *=============================================================================*

preshape.gms

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2023 IEA-ETSAP.  Licensed under GPLv3 (see file NOTICE-GPLv3.txt).
+* Copyright (C) 2024 IEA-ETSAP.  Licensed under GPLv3 (see file NOTICE-GPLv3.txt).
 *******************************************************************************
 * PRESHAPE : Prepare SHAPE parameters for preprocessing
 * Description: Interpolation of X parameter on user request
@@ -42,7 +42,7 @@ LOOP(%6(%2,'%DFLBL%'%TAIL%%4),
      DFUNC=DFUNC-10);
    IF(DFUNC GE 2,
 * Do back/forward extrapolate
-     IF(DFUNC=4, Z = INF; ELSEIF DFUNC=5, F = 0);
+     IF(DFUNC=4, Z = INF; ELSEIF DFUNC=5, F = 0; ELSEIF DFUNC=(2-F), LAST_VAL=EPS; Z=0);
      %1(%2,%5%TAIL%)$%7 $= FIRST_VAL$(YEARVAL(%5)<F) + LAST_VAL$(YEARVAL(%5)>Z);
    );
   );

setglobs.gms

@@ -96,7 +96,7 @@ $ LABEL SYSD
   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 RTP_CGC(R,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'                //;
   SET FSCK(REG,PRC,CG,C,CG)     'Multi-purpose work set'                //;