adding initial V2025 information and minor program updates

NOAA-EDAB · Oct 30, 2024 · 0a4b2ef · 0a4b2ef
1 parent 856d5e4
commit 0a4b2ef
Show file tree

Hide file tree

Showing 272 changed files with 171,695 additions and 40 deletions.
diff --git a/IDL_PROGRAMS/soe_main.pro b/IDL_PROGRAMS/soe_main.pro
@@ -86,16 +86,16 @@
   PROJECT = 'SOE_PHYTOPLANKTON'
   DIR_PROJECT = GET_PROJECT_DIR(PROJECT)
 
-  IF ~N_ELEMENTS(VERSION)  THEN VERSION = 'V2024'
+  IF ~N_ELEMENTS(VERSION)  THEN VERSION = 'V2025'
   IF ~N_ELEMENTS(BUFFER)   THEN BUFFER  = 1
   IF ~N_ELEMENTS(VERBSOE) THEN VERBOSE = 0
 
 ; ===> Manually adjust the SOE program steps as needed
   IF ~N_ELEMENTS(MAKE_EPU_MAPS)      THEN MAKE_EPU_MAPS      = ''
   IF ~N_ELEMENTS(MAKE_NETCDFS)       THEN MAKE_NETCDFS       = ''
-  IF ~N_ELEMENTS(DATA_UPDATE)        THEN DATA_UPDATE        = ''
-  IF ~N_ELEMENTS(DATA_EXTRACTS)      THEN DATA_EXTRACTS      = ''
-  IF ~N_ELEMENTS(PP_REQ_EXTRACTS)    THEN PP_REQ_EXTRACTS    = ''
+  IF ~N_ELEMENTS(DATA_UPDATE)        THEN DATA_UPDATE        = 'Y'
+  IF ~N_ELEMENTS(DATA_EXTRACTS)      THEN DATA_EXTRACTS      = 'Y'
+  IF ~N_ELEMENTS(PP_REQ_EXTRACTS)    THEN PP_REQ_EXTRACTS    = 'Y'
   IF ~N_ELEMENTS(PHYSIZE_PLOTS)      THEN PHYSIZE_PLOTS      = 'Y'
   IF ~N_ELEMENTS(PHYSIZE_COMPOSITES) THEN PHYSIZE_COMPOSITES = ''
   IF ~N_ELEMENTS(WEEKLY_PLOTS)       THEN WEEKLY_PLOTS       = 'Y'
@@ -115,17 +115,17 @@
     IF VERSTR.INFO.YEAR GE '2023' THEN BEGIN
 
       IF KEYWORD_SET(DATA_UPDATE) THEN BEGIN
-        BATCH_DATASET, 'MUR',  /NC_2STACKED,/DOWNLOAD_FILES,/DO_STATS
-        BATCH_DATASET, 'GLOBCOLOUR', /NC_2STACKED, /PSC,/PPD, STAT_PRODS=['CHLOR_A-GSM','PPD-VGPM2'],/DO_STATS, /DO_ANOMS, /DOWNLOAD_FILES, DOWNLOAD_DATERANGE=['20231201',DATE_NOW()]
-        BATCH_DATASET, 'OCCCI',/NC_2STACKED, MAPS='L3B4', /PSC, /PPD, STAT_PRODS=['CHLOR_A-CCI','PPD-VGPM2'],/DO_STATS, /DO_ANOMS, /DOWNLOAD_FILES
+        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, 'ACSPO_NRT',/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
       ENDIF
 
       IF KEYWORD_SET(MAKE_NETCDFS)       THEN STOP;SOE_NETCDFS, VER
       IF KEYWORD_SET(DATA_EXTRACTS)      THEN BEGIN & PROJECT_SUBAREA_EXTRACT, VERSTR & SOE_EXTRACTS_2LONGFORM, VERSTR, DIR_DATA=DIR_OUT & ENDIF
       IF KEYWORD_SET(PP_REQ_EXTRACTS)    THEN BEGIN & SOE_PP_REQUIRED, VERSTR & SOE_EXTRACTS_2LONGFORM, VERSTR, DIR_DATA=DIR_OUT,/PPREQUIRED & ENDIF
-      IF KEYWORD_SET(PHYSIZE_PLOTS)      THEN SOE_PHYTOSIZE_PLOT, VER, BUFFER=1
+      IF KEYWORD_SET(PHYSIZE_PLOTS)      THEN SOE_PHYTOSIZE_PLOT, VERSTR, BUFFER=1
       IF KEYWORD_SET(PHYSIZE_COMPOSITES) THEN STOP ;SOE_PHYTOSIZE_COMPOSITES, VER, BUFFER=1
       IF KEYWORD_SET(WEEKLY_PLOTS)       THEN SOE_WEEKLY_PLOTS, VER, BUFFER=BUFFER
       IF KEYWORD_SET(STACKED_TIMESERIES) THEN SOE_STACKED_TIMESERIES_PLOT, VERSTR, BUFFER=1

diff --git a/IDL_PROGRAMS/soe_phytosize_plot.pro b/IDL_PROGRAMS/soe_phytosize_plot.pro
@@ -1,5 +1,5 @@
 ; $ID:	SOE_PHYTOSIZE_PLOT.PRO,	2023-09-19-09,	USER-KJWH	$
-  PRO SOE_PHYTOSIZE_PLOT, VERSION, DIR_PLOTS=DIR_PLOTS, DATFILE=DATFILE, BUFFER=BUFFER
+  PRO SOE_PHYTOSIZE_PLOT, VERSION_STRUCT, DIR_PLOTS=DIR_PLOTS, DATFILE=DATFILE, BUFFER=BUFFER
 
 ;+
 ; NAME:
@@ -61,35 +61,38 @@
   COMPILE_OPT IDL2
   SL = PATH_SEP()
 
-  IF ~N_ELEMENTS(VERSION) THEN MESSAGE, 'ERROR: Must provide the SOE VERSION'
+  IF ~N_ELEMENTS(VERSION_STRUCT) THEN MESSAGE, 'ERROR: Must provide the SOE VERSION'
   IF ~N_ELEMENTS(BUFFER) THEN BUFFER=0
 
+  VERSTR = VERSION_STRUCT
+  VER = VERSTR.INFO.PROJECT_VERSION
+
   CLRS = LIST([217,241,253],[193,232,251],[0,173,238],[0,83,159],[37,64,143],[255,255,255])
   CLRS  = LIST([0,70,127],[147,213,0],[255,131,0],[0,147,208],[30,202,211],[127,127,255],[0,121,52],[76,156,35])
   CLRS = ['BLACK','MEDIUM_SEA_GREEN','CORAL','DEEP_SKY_BLUE']
 
-  FOR V=0, N_ELEMENTS(VERSION)-1 DO BEGIN
-    VER = VERSION[V]
-    VERSTR = SOE_VERSION_INFO(VER)
-    IF VERSTR.INFO.SOE_YEAR GE '2022'THEN FMICRO_TAG = 'PSC_MICRO' ELSE FMICRO_TAG = 'MICRO_PERCENTAGE'
-    IF VERSTR.INFO.SOE_YEAR GE '2022'THEN FNANO_TAG  = 'PSC_NANO'  ELSE FNANO_TAG  = 'NANO_PERCENTAGE'
-    IF VERSTR.INFO.SOE_YEAR GE '2022'THEN FPICO_TAG  = 'PSC_PICO'  ELSE FPICO_TAG  = 'PICO_PERCENTAGE'
-
-    IF ~N_ELEMENTS(DATFILE) THEN DATFILE = VERSTR.INFO.DATAFILE
-    STRUCT = IDL_RESTORE(DATFILE)
-    IF ~N_ELEMENTS(DIR_PLOTS) THEN DIR_PLT = VERSTR.DIRS.DIR_PLOTS+'PSC'+SL ELSE DIR_PLT = DIR_PLOTS & DIR_TEST, DIR_PLT
-    NAMES = VERSTR.INFO.SUBAREA_NAMES
-    TITLES = VERSTR.INFO.SUBAREA_TITLES
-    MP = VERSTR.INFO.MAP_OUT
-    STRUCT[WHERE(STRUCT.MATH EQ 'STACKED_STATS',/NULL)].MATH = 'STATS'
-
-    CASE VER OF
-      'V2021': BEGIN & COMP_PERIOD=['ANNUAL'] & PLOT_PERIOD=['WEEK','MONTH'] & MOV_PERIOD = ['WEEK','MONTH'] & END
-      'V2022': BEGIN & COMP_PERIOD=['ANNUAL'] & PLOT_PERIOD=['WEEK','W','M'] & MOV_PERIOD = ['WEEK','MONTH'] & END
-      'V2023': BEGIN & COMP_PERIOD=['ANNUAL'] & PLOT_PERIOD=['WEEK','W','M'] & MOV_PERIOD = ['WEEK','MONTH'] & END
-      'V2024': BEGIN & COMP_PERIOD=['ANNUAL'] & PLOT_PERIOD=['W','M','WEEK'] & MOV_PERIOD = ['WEEK','MONTH'] & END
-    ENDCASE
+  IF VERSTR.INFO.YEAR GE '2022'THEN FMICRO_TAG = 'PSC_MICRO' ELSE FMICRO_TAG = 'MICRO_PERCENTAGE'
+  IF VERSTR.INFO.YEAR GE '2022'THEN FNANO_TAG  = 'PSC_NANO'  ELSE FNANO_TAG  = 'NANO_PERCENTAGE'
+  IF VERSTR.INFO.YEAR GE '2022'THEN FPICO_TAG  = 'PSC_PICO'  ELSE FPICO_TAG  = 'PICO_PERCENTAGE'
 
+  IF ~N_ELEMENTS(DATFILE) THEN DATFILE = VERSTR.INFO.DATAFILE
+  STRUCT = IDL_RESTORE(DATFILE)
+  IF ~N_ELEMENTS(DIR_PLOTS) THEN DIR_PLT = VERSTR.DIRS.DIR_PLOTS+'PSC'+SL ELSE DIR_PLT = DIR_PLOTS & DIR_TEST, DIR_PLT
+  MP = VERSTR.INFO.MAP_OUT
+  STRUCT[WHERE(STRUCT.MATH EQ 'STACKED_STATS',/NULL)].MATH = 'STATS'
+
+  CASE VER OF
+    'V2021': BEGIN & COMP_PERIOD=['ANNUAL'] & PLOT_PERIOD=['WEEK','MONTH'] & MOV_PERIOD = ['WEEK','MONTH'] & END
+    ELSE: BEGIN & COMP_PERIOD=['ANNUAL'] & PLOT_PERIOD=['WEEK','W','M'] & MOV_PERIOD = ['WEEK','MONTH'] & END
+
+  ENDCASE
+
+  SHAPES = VERSTR.SHAPEFILES
+  FOR H=0, N_ELEMENTS(SHAPES)-1 DO BEGIN ; Shapefile loop
+    SHAPE = VERSTR.SHAPEFILES.(H)
+    NAMES = SHAPE.SUBAREA_NAMES
+    TITLES = SHAPE.SUBAREA_TITLES
+
     FOR R=0, N_ELEMENTS(PLOT_PERIOD)-1 DO BEGIN
       PER = PLOT_PERIOD[R]
       DR = VERSTR.INFO.DATERANGE
@@ -99,7 +102,7 @@
         'W':     BEGIN & NDATES = 52 & CLIM = 0 & CLIM_STRUCT=STRUCT[WHERE(STRUCT.PERIOD_CODE EQ 'WEEK' AND STRUCT.MATH EQ 'STATS',/NULL)] & END
         'M':     BEGIN & NDATES = 12 & CLIM = 0 & CLIM_STRUCT=STRUCT[WHERE(STRUCT.PERIOD_CODE EQ 'MONTH' AND STRUCT.MATH EQ 'STATS',/NULL)] & END
       ENDCASE
-
+  
       PER_STRUCT = STRUCT[WHERE(STRUCT.PERIOD_CODE EQ PER AND STRUCT.MATH EQ 'STATS',/NULL)]
       DP = PERIOD_2STRUCT(PER_STRUCT.PERIOD)
 
@@ -109,12 +112,12 @@
 
         FOR I=0, 1 DO BEGIN ; Make 2 plots for each year
 
-          IF KEYWORD_SET(CLIM) THEN PNGFILE = DIR_PLT + PER + '-' + VERSTR.INFO.SHAPEFILE + '-' + 'PHYTOSIZE-CLIMATOLOGY.png' $
-                               ELSE PNGFILE = DIR_PLT + PER + '_' + YR + '-' + VERSTR.INFO.SHAPEFILE + '-' + 'PHYTOSIZE.png'
+          IF KEYWORD_SET(CLIM) THEN PNGFILE = DIR_PLT + PER + '-' + SHAPE.SHAPEFILE + '-' + 'PHYTOSIZE-CLIMATOLOGY.png' $
+                               ELSE PNGFILE = DIR_PLT + PER + '_' + YR + '-' + SHAPE.SHAPEFILE + '-' + 'PHYTOSIZE.png'
 
           IF I EQ 1 THEN BEGIN
             IF I EQ 1 AND KEYWORD_SET(CLIM) THEN CONTINUE
-            PNGFILE = DIR_PLT + PER + '_' + YR + '-' + VERSTR.INFO.SHAPEFILE + '-' + 'PHYTOSIZE-CLIMATOLOGY.png'
+            PNGFILE = DIR_PLT + PER + '_' + YR + '-' + SHAPE.SHAPEFILE + '-' + 'PHYTOSIZE-CLIMATOLOGY.png'
             AXIS_STYLE=2
             TRANS = 70
           ENDIF ELSE BEGIN
@@ -149,7 +152,7 @@
           FOR N=0, N_ELEMENTS(NAMES)-1 DO BEGIN ; Subareas
             ANAME = NAMES[N]
             TITLE = TITLES[N]        
-
+  
             MST = YSET[WHERE(YSET.PROD EQ FMICRO_TAG AND YSET.SUBAREA EQ ANAME,/NULL)] & OMST=OSET[WHERE(OSET.PROD EQ FMICRO_TAG AND OSET.SUBAREA EQ ANAME,/NULL)]
             NST = YSET[WHERE(YSET.PROD EQ FNANO_TAG  AND YSET.SUBAREA EQ ANAME,/NULL)] & ONST=OSET[WHERE(OSET.PROD EQ FNANO_TAG  AND OSET.SUBAREA EQ ANAME,/NULL)]
             PST = YSET[WHERE(YSET.PROD EQ FPICO_TAG  AND YSET.SUBAREA EQ ANAME,/NULL)] & OPST=OSET[WHERE(OSET.PROD EQ FPICO_TAG  AND OSET.SUBAREA EQ ANAME,/NULL)]
@@ -174,7 +177,6 @@
             YMICRO = MST.MED/YTOT & MICRO = OMST.MED/TOT
             YNANO = NST.MED/YTOT  & NANO = ONST.MED/TOT
             YPICO = PST.MED/YTOT  & PICO = OPST.MED/TOT
- if n eq 2 and i eq 1 then p, ymicro[0:5]           
             BOT = REPLICATE(0.0,N_ELEMENTS(MDT))
             MY = [BOT,REVERSE(YMICRO)]
             NY = [YMICRO,REVERSE(YMICRO+YNANO)]
@@ -212,7 +214,7 @@
           W.CLOSE
         ENDFOR  
       ENDFOR ; YEARS
-    ENDFOR ; PLOT_PERIOD     
-  ENDFOR ; VERSION    
+    ENDFOR ; PLOT_PERIOD   
+  ENDFOR ; SHAPEFILES    
 
 END ; ***************** End of SOE_PHYTOSIZE_PLOT *****************