Update to v4.8.6

Author: Antti-L

Version.log

@@ -3023,4 +3023,19 @@ prep_ext.dsc  : (2)
 equ_ext.dsc   : (2)
 mod_ext.dsc   : (2)
 ppm_ext.dsc   : (2)
-_times.g00    : (1)
+_times.g00    : (1)
+
+-----------------------------------------------------------------------------------------
+TIMES Version 4.8.6
+-----------------------------------------------------------------------------------------
+Date: 25-Jan-2025 [AL]: Maintenance release
+1) Fixed bug related to zero SHAPE with NCAP_AFX
+2) Fixed bug related to retiring capacities with zero CAP_BND
+3) Added option for including PASTI within horizon in Cap_New reporting
+
+Modified files: (reason)
+initsys.mod   : Increased version number to 4.8.6
+ppmain.mod    : (2)
+coef_cpt.mod  : (1)
+pp_shapr.mod  : (1)
+rpt_obj.rpt   : (3)

coef_cpt.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2025 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).
 *=============================================================================*
@@ -45,7 +45,7 @@ $IF '%VALIDATE%'==YES COEF_CPT(RTP_CPTYR(R,T,T,P)) = 1;
   TRACKP(RP)$RP_UPL(RP,'FX') = NO;
   TRACKP(PRC_CAP(PRC_VINT)) = YES;
   NCAP_AFBX(RTP(R,V,P),BD)$(RP_AFB(R,P,BD)>0) $= NCAP_AFX(RTP);
-$ BATINCLUDE pp_shapr.%1 NCAP_AF (R,V,P,S,BD) "TRACKP(R,P)*PRC_TS(R,P,S)" COEF_AF(RTP_CPTYR(R,V,T,P),S,BD) NCAP_AFM(R,V,P) B
+$ BATINCLUDE pp_shapr.%1 NCAP_AF (R,V,P,S,BD) "TRACKP(R,P)*RP_AFB(R,P,BD)*PRC_TS(R,P,S)" COEF_AF(RTP_CPTYR(R,V,T,P),S,BD) NCAP_AFM(R,V,P) B
 
   TRACKP(PRC_CAP(R,P)) = (NOT TRACKP(R,P));
   COEF_AF(RTP_CPTYR(R,V,T,P),S,BD)$(PRC_TS(R,P,S)$TRACKP(R,P)) $= NCAP_AF(R,T,P,S,BD);

initsys.mod

@@ -1,10 +1,10 @@
-$TITLE  TIMES -- VERSION 4.8.5
+$TITLE  TIMES -- VERSION 4.8.6
 *==========================================================================================*
 * INITSYS.MOD has all the fixed system declarations for ETSAP TIMES                        *
 *==========================================================================================*
 $ onlisting ontext
 *===========================================================================================
-*  Copyright (C) 2000-2024 IEA Energy Technology Systems Analysis Programme (IEA-ETSAP).
+*  Copyright (C) 2000-2025 IEA Energy Technology Systems Analysis Programme (IEA-ETSAP).
 *  This software (ETSAP TIMES) is open source: you can redistribute it and/or modify it
 *  under the terms of the GNU General Public License v3.0 (see file NOTICE-GPLv3.txt).
 *  For further information, visit: <https://www.gnu.org/licenses/gpl-3.0.html>.

pp_shapr.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2025 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).
 *=============================================================================*
@@ -34,7 +34,7 @@ $ IF %3=='' $SETLOCAL PASS YES
   LOOP(SAMEAS(AGE,'1'),
 * Calculate average SHAPE for plants still operating in each period:
     %4$((%PASS%)$RTP_ISHPR(R,V,P)) = %1%2 *
-       SUM(RTP_SHAPI(R,V,P,BD,J,JJ,LL,YEAR), MULTI(JJ,T) *
+       SUM(RTP_SHAPI(R,V,P,BD,J,JJ,LL,YEAR), EPS+MULTI(JJ,T) *
          SUM(PERIODYR(T,EOHYEARS)$(YEARVAL(EOHYEARS) LE MAX(B(T),YEARVAL(YEAR))),
              SHAPE(J,AGE+(MIN(YEARVAL(EOHYEARS),YEARVAL(YEAR))-YEARVAL(LL)))) /
          (MAX(1,MIN(E(T),YEARVAL(YEAR))-MAX(B(T),YEARVAL(LL))+1))));

ppmain.mod

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2024 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2025 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).
 *=============================================================================*
@@ -533,7 +533,7 @@ $    BATINCLUDE pp_qaput.mod PUTOUT PUTGRP IFQ 'Inconsistent CAP_BND(UP/FX) defi
    RVP(RTP)$((CAP_BND(RTP,'UP')=0)$CAP_BND(RTP,'UP')) = YES;
    LOOP(T, NCAP_BND(R,TT,P,'UP')$(RTP_CPTYR(R,TT,T,P)$RVP(R,T,P)) = EPS);
    RVP(RTP_VARP)=NO; CAP_BND(RVP,BD) = 0;
-   CAP_BND(RTP,BD)$MAPVAL(CAP_BND(RTP,BD)) = 0;
+   CAP_BND(RTP,BDLOX)$MAPVAL(CAP_BND(RTP,BDLOX)) = 0;
 * Check whether both UP and LO bounds (then it pays to have VAR_CAP)
    RTP_VARP(RTP(R,T,P))$(CAP_BND(RTP,'UP')*CAP_BND(RTP,'LO')) = YES;
    PUTGRP=0;
@@ -601,7 +601,7 @@ $IF DEFINED PRC_SIMV LOOP(T,NO_RVP(R,TT-1,P)$(RTP_CPTYR(R,TT,T,P)$PRC_SIMV(R,P))
 *-----------------------------------------------------------------------------
 * establishment PRC_CAPACT/ACTFLO from PRC_CAPUNT/ACTUNT/COM_UNIT & determine INOUT(r,p)
 *-----------------------------------------------------------------------------
-   PRC_CAPACT(RP(R,P))$(NOT PRC_CAPACT(R,P)) = 1;
+   PRC_CAPACT(RP)$(NOT PRC_CAPACT(RP)) = 1;
 * Copy PRC_ACTFLO from PG to individual commodities in PG, allowing reserved word %PGPRIM%
    PRC_ACTFLO(RTP(R,V,P),C)$((NOT PRC_ACTFLO(RTP,C))$RPC_PG(R,P,C)) $= SUM(RP_PG(R,P,CG),PRC_ACTFLO(R,V,P,CG));
    PRC_ACTFLO(RTP(R,V,P),C)$((NOT PRC_ACTFLO(RTP,C))$RPC_PG(R,P,C)) $= PRC_ACTFLO(RTP,%PGPRIM%);

rpt_obj.rpt

@@ -1,5 +1,5 @@
 *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-* Copyright (C) 2000-2023 Energy Technology Systems Analysis Programme (ETSAP)
+* Copyright (C) 2000-2025 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).
 *=============================================================================*
@@ -24,19 +24,22 @@ $IFI '%STAGES%'==YES PASTSUM(NCAP_YES(R,T,P)) = SUM(SW_TSW(SOW,T,WW),OBJ_SIC(R,T
 * Lump-sum investment costs
 *------------------------------------------------------------------------------
 $SET P1 "'%SYSPREFIX%INSTCAP'"
-  %1CAP_NEW(%2RVPT(NCAP_YES(R,T,P),TT),%P1%) = VAR_NCAP.L(R,T,P);
-  %1CAP_NEW(%2NCAP_YES(R,T,P),T,%P1%)$(NOT OBJ_2A(R,T,P)) = COEF_RPTI(R,T,P)*VAR_NCAP.L(R,T,P);
+  F = RPT_OPT('NCAP','7')>0;
+  COEF_RTP(RTP(R,T,P))$PRC_CAP(R,P) = VAR_NCAP.L(RTP)$NCAP_YES(RTP) +
+    SUM(PERIODYR(T,Y_EOH)$NCAP_PASTI(R,Y_EOH,P),NCAP_PASTI(R,Y_EOH,P)*POWER(COEF_RPTI(RTP),1$T(Y_EOH)-1))$F;
+  %1CAP_NEW(%2RVPT(R,T,P,TT),%P1%) $= COEF_RTP(R,T,P);
+  %1CAP_NEW(%2RTP(R,T,P),T,%P1%)$((NOT OBJ_2A(RTP))$COEF_RTP(RTP)) = COEF_RPTI(RTP)*COEF_RTP(RTP);
   OPTION CLEAR=UNCD1; UNCD1(J)$(ORD(J)<3)=YES;
   RTP_OBJ(JJ(UNCD1(J)),OBJ_ICUR(NCAP_YES(R,T(V),P),CUR))=
 $IF '%ETL%'==YES (VAR_IC.L(R,T,P)*COR_SALVI(R,T,P,CUR))$SEG(R,P) +
     SUM((OBJ_SUMII(R,T,P,LIFE,K_EOH,JOT),INVSPRED(K_EOH,JOT,Y,K)),
         (OBJ_ICOST(R,K,P,CUR)%SIC%$(ORD(J)=2)+(OBJ_ITAX(R,K,P,CUR)-OBJ_ISUB(R,K,P,CUR))$(ORD(J)=1))) *
-    VAR_NCAP.L(R,T,P) * COR_SALVI(R,T,P,CUR) / OBJ_DIVI(R,T,P) /
+    COEF_RTP(R,T,P) * COR_SALVI(R,T,P,CUR) / OBJ_DIVI(R,T,P) /
     (1+G_DRATE(R,T,CUR))**(%DISCSHIFT%$(NOT NCAP_ILED(R,T,P)));
   SYSPLIT(SYSUC)=1-SUM(SYSUCMAP(SYSUC,ITEM),1);
   LOOP(UNCD1(J),%1CAP_NEW(%2R,T,P,TT,SYSUC)$(%1CAP_NEW(%2R,T,P,TT,%P1%)$SUCMAP(J,SYSUC))=SUM(RDCUR(R,CUR),RTP_OBJ(J,R,T,P,CUR)*ABS(SYSPLIT(SYSUC)-COEF_CRF(R,T,P,CUR)))
     IF(NOT MY_F,OPTION CLEAR=COEF_CRF));
-  OPTION CLEAR=RTP_OBJ;
+  OPTION CLEAR=COEF_RTP,CLEAR=RTP_OBJ;
 *-----------------------------------------------------------------------------
 * Objective function by component
 *-----------------------------------------------------------------------------