Add Period's start datetime to Publsihed Price reports

ElectricityAuthority · Nov 29, 2023 · 446da43 · 446da43
1 parent 5ca51ff
commit 446da43
Show file tree

Hide file tree

Showing 8 changed files with 1,089 additions and 354 deletions.
diff --git a/Programs/vSPDfileList.inc b/Programs/vSPDfileList.inc
@@ -1,3 +1,3 @@
 /
-'Pricing_20221105'
+'Pricing_20231128'
 /
diff --git a/Programs/vSPDmodel.g00 b/Programs/vSPDmodel.g00
diff --git a/Programs/vSPDmodel.gms b/Programs/vSPDmodel.gms
@@ -239,6 +239,7 @@ Scalars
 Sets
 * Global
   case2dt(ca,dt)                         'mapping caseID-DateTime pair'
+  tp2dt(tp,dt)                           'mapping period to first datetime in a period '
   t(ca,dt)                               'Current trading interval to solve'
 
 * Node/bus

diff --git a/Programs/vSPDoverrides.gms b/Programs/vSPDoverrides.gms
diff --git a/Programs/vSPDreport.gms b/Programs/vSPDreport.gms
@@ -84,17 +84,17 @@ File PublishedEnergyPrices_TP  /"%outputPath%\%runName%\%runName%_PublishedEnerg
 PublishedEnergyPrices_TP.pc = 5; PublishedEnergyPrices_TP.lw = 0; PublishedEnergyPrices_TP.pw = 9999;
 PublishedEnergyPrices_TP.ap = 1; PublishedEnergyPrices_TP.nd = 5; PublishedEnergyPrices_TP.nw = 20;
 put PublishedEnergyPrices_TP ;
-loop( (tp,n),
-    put tp.tl, n.tl, o_PublisedPrice_TP(tp,n) / ;
+loop( (dt,tp,n) $ tp2dt(tp,dt) ,
+    put dt.tl,tp.tl, n.tl, o_PublisedPrice_TP(tp,n) / ;
 ) ;
 
 * Published reserve prices
 File PublishedReservePrices_TP  /"%outputPath%\%runName%\%runName%_PublishedReservePrices_TP.csv"/;
 PublishedReservePrices_TP.pc = 5; PublishedReservePrices_TP.lw = 0; PublishedReservePrices_TP.pw = 9999;
 PublishedReservePrices_TP.ap = 1; PublishedReservePrices_TP.nd = 5; PublishedReservePrices_TP.nw = 20;
 put PublishedReservePrices_TP ;
-loop( (tp,isl),
-    put tp.tl, isl.tl, o_PublisedFIRPrice_TP(tp,isl), o_PublisedSIRPrice_TP(tp,isl) / ;
+loop( (dt,tp,isl) $ tp2dt(tp,dt) ,
+    put dt.tl, tp.tl, isl.tl, o_PublisedFIRPrice_TP(tp,isl), o_PublisedSIRPrice_TP(tp,isl) / ;
 ) ;
 
 * Trading period offer result
@@ -439,6 +439,6 @@ loop( (ca,dt,tp) $ case2dt2tp(ca,dt,tp),
 execute_unload '%outputPath%\%runName%\%GDXname%_AllData.gdx' ;
 $endif.AuditReport
 *===============================================================================
-execute_unload '%outputPath%\%runName%\%GDXname%_AllData.gdx' ;
+*execute_unload '%outputPath%\%runName%\%GDXname%_AllData.gdx' ;
 
 
diff --git a/Programs/vSPDreportSetup.gms b/Programs/vSPDreportSetup.gms
@@ -39,11 +39,11 @@ put nodeResults_TP 'CaseID','DateTime','Period', 'Node','Generation (MW)','Load
 
 File PublishedEnergyPrices_TP /"%outputPath%\%runName%\%runName%_PublishedEnergyPrices_TP.csv"/;
 PublishedEnergyPrices_TP.pc = 5 ; PublishedEnergyPrices_TP.lw = 0 ; PublishedEnergyPrices_TP.pw = 9999 ;
-put PublishedEnergyPrices_TP 'TradingPeriod','Pnodename','vSPDDollarsPerMegawattHour';
+put PublishedEnergyPrices_TP 'DateTime','TradingPeriod','Pnodename','vSPDDollarsPerMegawattHour';
 
 File PublishedReservePrices_TP /"%outputPath%\%runName%\%runName%_PublishedReservePrices_TP.csv"/;
 PublishedReservePrices_TP.pc = 5 ; PublishedReservePrices_TP.lw = 0 ; PublishedReservePrices_TP.pw = 9999 ;
-put PublishedReservePrices_TP 'TradingPeriod','Island','vSPDFIRDollarsPerMegawattHour','vSPDSIRDollarsPerMegawattHour';
+put PublishedReservePrices_TP 'DateTime','TradingPeriod','Island','vSPDFIRDollarsPerMegawattHour','vSPDSIRDollarsPerMegawattHour';
 
 File offerResults_TP     / "%outputPath%\%runName%\%runName%_OfferResults_TP.csv" /;
 offerResults_TP.pc = 5; offerResults_TP.lw = 0; offerResults_TP.pw = 9999;

diff --git a/Programs/vSPDsettings.inc b/Programs/vSPDsettings.inc
@@ -3,7 +3,7 @@ $inlinecom ## ##
 $eolcom !
 
 *+++ Paths +++
-$setglobal runName                       daily_202221105_0140_RTD
+$setglobal runName                       Testing
 
 $setglobal programPath                   '%system.fp%' 
 $setglobal inputPath                     '%system.fp%..\Input\'
@@ -14,7 +14,7 @@ $setglobal vSPDinputOvrdData             ''   !Name of override file
 
 *+++ Model +++
 Scalar sequentialSolve                   / 0 / ;   ! Vectorisation: Yes <-> i_SequentialSolve: 0
-Scalar dailymode                         / 0 / ;   ! Solving quickly by using RTD pre-calculated demand or PRSS solved initial MW
+Scalar dailymode                         / 1 / ;   ! Solving quickly by using RTD pre-calculated demand or PRSS solved initial MW
 
 *+++ Network +++
 Scalar useACLossModel                    / 1 /    ;
@@ -44,4 +44,4 @@ $setglobal licenseMode                     1
 
 
 *+++ Various switches +++
-$setglobal opMode                          SPD      ! DWH for data warehouse; AUD for audit; FTR for FTR Rental; SPD for normal SPD run; PVT for pivot analysis; DPS for demand~price sensitivity analysis
+$setglobal opMode                          SPD      ! SPD for normal SPD run;
diff --git a/Programs/vSPDsolve.gms b/Programs/vSPDsolve.gms
@@ -387,6 +387,7 @@ $if exist "%ovrdPath%%vSPDinputOvrdData%.gdx"  $include vSPDoverrides.gms
 studyMode(ca,dt)        = runMode(ca,'studyMode');
 IntervalDuration(ca,dt) = runMode(ca,'intervalLength');
 case2dt(ca,dt)          = yes $ sum[ tp $ case2dt2tp(ca,dt,tp), 1] ;
+tp2dt(tp,dt) = yes $ [ord(dt) = smin[case2dt2tp(ca,dt1,tp), ord(dt1)] ];
 
 * Nodal data
 node(ca,dt,n) = yes $ sum[ b $ nodeBus(ca,dt,n,b), 1 ] ;