Adding last 3 months of data

NOAA-EDAB · Nov 21, 2024 · a9143d1 · a9143d1
1 parent 88d893b
commit a9143d1
Show file tree

Hide file tree

Showing 1,115 changed files with 57,507 additions and 3,890 deletions.
diff --git a/IDL_PROGRAMS/soe_extracts_2longform.pro b/IDL_PROGRAMS/soe_extracts_2longform.pro
@@ -205,8 +205,8 @@
     PFILE, SOEFILE
     STRUCT_2CSV, SOEFILE, MERGED
 
-    IF F EQ 0 THEN ALLDATA = MERGED ELSE ALLDATA = [ALLDATA,MERGED]
+    IF ALLDATA EQ [] THEN ALLDATA = MERGED ELSE ALLDATA = [ALLDATA,MERGED]
   ENDFOR ; FILES
   PFILE, ALLFILE
-  STRUCT_2CSV, ALLFILE, ALLDATA
+  IF ALLDATA NE [] THEN STRUCT_2CSV, ALLFILE, ALLDATA
 END ; ***************** End of SOE_EXTRACTS_2LONGFORM *****************
diff --git a/IDL_PROGRAMS/soe_main.pro b/IDL_PROGRAMS/soe_main.pro
@@ -115,11 +115,11 @@
     IF VERSTR.INFO.YEAR GE '2023' THEN BEGIN
 
       IF KEYWORD_SET(DATA_UPDATE) THEN BEGIN
-        BATCH_DATASET, 'OCCCI',/NC_2STACKED, MAPS='L3B4', /DO_PSC, /DO_PPD, STAT_PRODS=['CHLOR_A-CCI'],/DO_STATS, /DO_ANOMS;, /DOWNLOAD_FILES
-        BATCH_DATASET, 'GLOBCOLOUR', /NC_2STACKED, /DO_PSC,/DO_PPD, STAT_PRODS=['CHLOR_A-GSM','PPD-VGPM2'],/DO_STATS, /DO_ANOMS, /DOWNLOAD_FILES, DOWNLOAD_DATERANGE=['20231201',DATE_NOW()]
-        BATCH_DATASET, 'ACSPO',/DOWNLOAD_FILES, /NC_2STACKED, /DO_STATS, /DO_ANOMS
-        BATCH_DATASET, 'ACSPONRT',/DOWNLOAD_FILES, /NC_2STACKED, /DO_STATS, /DO_ANOMS
-        BATCH_DATASET, 'MUR',  /NC_2STACKED,/DOWNLOAD_FILES,/DO_STATS
+        BATCH_DATASET, 'OCCCI',/NC_2STACKED, MAPS='L3B4', /DO_PSC, /DO_PPD, STAT_PRODS=['CHLOR_A-CCI'],/DO_STATS, /DO_ANOMS, STAT_PERIODS=VERSTR.INFO.STAT_PERIODS, ANOM_PERIODS=VERSTR.INFO.ANOM_PERIODS;,/DOWNLOAD_FILES
+        BATCH_DATASET, 'GLOBCOLOUR', /NC_2STACKED, /DO_PSC,/DO_PPD, STAT_PRODS=['CHLOR_A-GSM','PPD-VGPM2'],/DO_STATS, /DO_ANOMS, /DOWNLOAD_FILES, DOWNLOAD_DATERANGE=['20231201',DATE_NOW()],STAT_PERIODS=VERSTR.INFO.STAT_PERIODS, ANOM_PERIODS=VERSTR.INFO.ANOM_PERIODS
+        BATCH_DATASET, 'ACSPO',/DOWNLOAD_FILES, /NC_2STACKED, /DO_STATS, /DO_ANOMS, STAT_PERIODS=VERSTR.INFO.STAT_PERIODS, ANOM_PERIODS=VERSTR.INFO.ANOM_PERIODS
+        BATCH_DATASET, 'ACSPONRT',/DOWNLOAD_FILES, /NC_2STACKED, /DO_STATS, /DO_ANOMS, STAT_PERIODS=VERSTR.INFO.STAT_PERIODS, ANOM_PERIODS=VERSTR.INFO.ANOM_PERIODS
+        BATCH_DATASET, 'MUR',  /NC_2STACKED,/DOWNLOAD_FILES,/DO_STATS, STAT_PERIODS=VERSTR.INFO.STAT_PERIODS, ANOM_PERIODS=VERSTR.INFO.ANOM_PERIODS
       ENDIF
 
       IF KEYWORD_SET(MAKE_NETCDFS)       THEN STOP;SOE_NETCDFS, VER
@@ -145,8 +145,10 @@
       IF KEYWORD_SET(SST_PNGS)           THEN SOE_SST,VER, BUFFER=BUFFER
     ENDELSE
 
+    SOE_TIMESERIES_ANIMATION, VERSTR, PRODS=['CHLOR_A','PPD','SST'], BUFFER=1
+
     ; Annual plots
-    SOE_ANNUAL_TIMESERIES, VERSTR, PRODS=['CHLOR_A','PPD'], BUFFER=0
+    SOE_ANNUAL_TIMESERIES, VERSTR, PRODS=['CHLOR_A','PPD'], BUFFER=1
   stop  
     ; CHL bloom
     MP = 'NES'

diff --git a/IDL_PROGRAMS/soe_timeseries_animation.pro b/IDL_PROGRAMS/soe_timeseries_animation.pro
@@ -98,7 +98,6 @@
   FULLSTRUCT[WHERE(FULLSTRUCT.MATH EQ 'STACKED_ANOMS')].MATH = 'ANOM'
   STRUCT = FULLSTRUCT[WHERE(FULLSTRUCT.MATH EQ 'STATS',/NULL)]
   ASTRUCT = FULLSTRUCT[WHERE(FULLSTRUCT.MATH EQ 'ANOM',/NULL)]
-
 
   FOR S=0, N_ELEMENTS(PRODS)-1 DO BEGIN
     APROD = PRODS[S]
@@ -108,9 +107,9 @@
     TSET = PSTR.TEMP_DATASET
 
     CASE VALIDS('PRODS',APROD) OF
-      'SST':     BEGIN & YTITLE=UNITS('TEMP')     & SRNG=[0,30]    & PSTATS='AMEAN' & ARNG=[-5,5]  & AMID=0 & ASTATS='AMEAN' & END
-      'CHLOR_A': BEGIN & YTITLE=UNITS('CHLOR_A')  & SRNG=[0.0,1.6] & PSTATS='MED'   & ARNG=[0.5,2] & AMID=1 & ASTATS='AMEAN' & END
-      'PPD':     BEGIN & YTITLE=UNITS('PPD')      & SRNG=[0.0,2.2] & PSTATS='MED'   & ARNG=[0.5,2] & AMID=1 & ASTATS='AMEAN' & END
+      'SST':     BEGIN & SYTITLE=UNITS('TEMP')    & SRNG=[0,30]    & AYTITLE=UNITS('TEMP',/NO_UNIT)+' Anomaly ' + UNITS('TEMP',/NO_NAME) & PSTATS='AMEAN' & ARNG=[-5,5]  & ALG=0 & AMID=0 & ASTATS='AMEAN' & AYTICKS=[] & END
+      'CHLOR_A': BEGIN & SYTITLE=UNITS('CHLOR_A') & SRNG=[0.0,3.0] & AYTITLE=UNITS('CHLOR_A',/NO_UNIT) + ' Ratio Anomaly'                & PSTATS='MED'   & ARNG=[0.2,6] & ALG=1 & AMID=1 & ASTATS='AMEAN' & AYTICKS=[0.33,1,3.33] & END
+      'PPD':     BEGIN & SYTITLE=UNITS('PPD')     & SRNG=[0.0,2.2] & AYTITLE=UNITS('PPD',/NO_UNIT) + ' Ratio Anomaly'                    & PSTATS='MED'   & ARNG=[0.3,3] & ALG=1 & AMID=1 & ASTATS='AMEAN' & AYTICKS=[] & END
     ENDCASE
 
     FOR H=0, N_ELEMENTS(SHAPES)-1 DO BEGIN
@@ -128,7 +127,7 @@
         ENDCASE
         PSTR = STRUCT[WHERE(STRUCT.PROD EQ APROD AND STRUCT.SUBAREA EQ ANAME,/NULL)]
         ASTR = ASTRUCT[WHERE(ASTRUCT.PROD EQ APROD AND ASTRUCT.SUBAREA EQ ANAME,/NULL)]
-        IF PSTR EQ [] THEN STOP
+        IF PSTR EQ [] THEN CONTINUE ; STOP
 
         FOR R=0, N_ELEMENTS(PERIODS)-1 DO BEGIN
           PER = PERIODS[R]
@@ -150,20 +149,20 @@
 
             CDATE = DATE_2JD(YDOY_2DATE('2100',DATE_2DOY(PERIOD_2DATE(CSTR.PERIOD))))
             CASE ATYP OF
-              'STATS': BEGIN & CDATA = GET_TAG(CSTR,PSTATS) & YRNG=SRNG & END
-              'ANOMS': BEGIN & CDATA = REPLICATE(AMID,N_ELEMENTS(CSTR)) & YRNG=ARNG & END
+              'STATS': BEGIN & CDATA = GET_TAG(CSTR,PSTATS) & YRNG=SRNG & YTLE=SYTITLE & YLG=0 & YTICKNAMES=[] & YTICKS=[] & END
+              'ANOMS': BEGIN & CDATA = REPLICATE(AMID,N_ELEMENTS(CSTR)) & YTLE=AYTITLE & YRNG=ARNG & YLG=ALG & IF AYTICKS NE [] THEN YTICKNAMES=NUM2STR(AYTICKS,DECIMALS=1) ELSE YTICKNAMES=[] & YTICKS=AYTICKS & END
             ENDCASE
 
             DIMS = [1000,600]
             THICK = 3
             FONT_SIZE = 12
-            PC = PLOT(CDATE,CDATA,THICK=THICK,FONT_SIZE=FONT_SIZE,TITLE=PLT_TITLE,$
-              XRANGE=AX.JD,YRANGE=YRNG,XTICKNAME=AX.TICKNAME,XTICKVALUES=AX.TICKV,XMINOR=0,XSTYLE=1,YMAJOR=YMAJOR,YTICKV=YTICKS,YTITLE=YTITLE,DIMENSIONS=DIMS,MARGIN=[0.08,0.08,0.08,0.08])
-
-            PC.SAVE, CPNGFILE 
 
-            OUTFILES = CPNGFILE
+            OUTFILES = []
             FOR Y=0, N_ELEMENTS(YEARS)-1 DO BEGIN
+              PCLT = PLOT(CDATE,CDATA,THICK=THICK,FONT_SIZE=FONT_SIZE,TITLE=PLT_TITLE,YLOG=YLG,BUFFER=BUFFER,$
+                XRANGE=AX.JD,YRANGE=YRNG,XTICKNAME=AX.TICKNAME,XTICKVALUES=AX.TICKV,XMINOR=0,XSTYLE=1,YMAJOR=YMAJOR,YTICKNAME=YTICKNAMES,YTICKV=YTICKS,YTITLE=YTLE,DIMENSIONS=DIMS,MARGIN=[0.08,0.08,0.08,0.08])
+              IF Y EQ 0 and ATYP EQ 'STATS' THEN PCLT.SAVE, CPNGFILE
+
               YR = YEARS[Y]
               PNGFILE = PNGFILES[Y]
 
@@ -180,8 +179,7 @@
 
               YDATE = DATE_2JD(YDOY_2DATE('2100',DATE_2DOY(PERIOD_2DATE(YSTR.PERIOD))))
               YDATA = GET_TAG(YSTR,GET_STAT)
-
-
+
               IF N_ELEMENTS(YDATE) GT 1 THEN PY = PLOT(YDATE,YDATA,COLOR='RED',/CURRENT,/OVERPLOT,THICK=THICK);,XRANGE=AX.JD,YRANGE=[MR1(P),MR2(P)],XTICKNAME=AX.TICKNAME,XTICKVALUES=AX.TICKV,XMINOR=0,XSTYLE=1)
               IF TSTR NE [] THEN BEGIN
                 TDATE = DATE_2JD(YDOY_2DATE('2100',DATE_2DOY(PERIOD_2DATE(TSTR.PERIOD))))
@@ -190,18 +188,23 @@
               ENDIF
               TN = TEXT(0.85,0.85,YR,TARGET=PY,FONT_SIZE=14,FONT_COLOR='RED',FONT_STYLE='BOLD')
 
+              FOR YRS=0, N_ELEMENTS(YEARS)-1 DO BEGIN
+                AYR = YEARS[YRS]
+                IF AYR EQ YR THEN CONTINUE
+
+                YSTR = ISTR[WHERE(ISTR.PERIOD_CODE EQ PER AND DATE_2YEAR(PERIOD_2DATE(ISTR.PERIOD)) EQ AYR AND ISTR.SENSOR EQ DSET,/NULL)]
+                IF YSTR EQ [] THEN CONTINUE
+                YDATE = DATE_2JD(YDOY_2DATE('2100',DATE_2DOY(PERIOD_2DATE(YSTR.PERIOD))))
+                YDATA = GET_TAG(YSTR,GET_STAT)
+                IF N_ELEMENTS(YDATE) GT 1 THEN PY = PLOT(YDATE,YDATA,COLOR='LIGHT_GREY',/CURRENT,/OVERPLOT,THICK=1);,XRANGE=AX.JD,YRANGE=[MR1(P),MR2(P)],XTICKNAME=AX.TICKNAME,XTICKVALUES=AX.TICKV,XMINOR=0,XSTYLE=1)
+              ENDFOR ; YRS
+
               PY.SAVE, PNGFILE
+              PY.CLOSE
               OUTFILES = [OUTFILES,PNGFILE]
 
-              PY.COLOR = 'LIGHT_GREY'
-              PY.THICK = 1
-              IF TSTR NE [] THEN PT.COLOR = 'LIGHT_GREY'
-              IF TSTR NE [] THEN PT.THICK = 1
-              TN.FONT_COLOR = 'WHITE'
-              PY = PLOT(CDATE,CDATA,COLOR='BLACK',/CURRENT,/OVERPLOT,THICK=THICK);,XRANGE=AX.JD,YRANGE=[MR1(P),MR2(P)],XTICKNAME=AX.TICKNAME,XTICKVALUES=AX.TICKV,XMINOR=0,XSTYLE=1)
-
             ENDFOR ; YEARS
-            PY.CLOSE
+
 
             MAKEMOVIE:
             FPS = 3