Apply fixes to archiving job. NOAA-EMC#2076

DavidHuber-NOAA · Jan 14, 2024 · 0b0a799 · 0b0a799
1 parent c590476
commit 0b0a799
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/jobs/JGLOBAL_ARCHIVE b/jobs/JGLOBAL_ARCHIVE
@@ -19,7 +19,7 @@ YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMO
   COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_RESTART COM_OCEAN_XSECT COM_OCEAN_2D COM_OCEAN_3D \
   COM_OCEAN_ANALYSIS \
   COM_WAVE_GRID COM_WAVE_HISTORY COM_WAVE_STATION \
-  COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON
+  COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON COM_CONF
 
 for grid in "0p25" "0p50" "1p00"; do
   YMD=${PDY} HH=${cyc} GRID=${grid} generate_com -rx "COM_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL"

diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
@@ -92,7 +92,7 @@ if [[ ${type} = "gfs" ]]; then
   #  This uses the bash extended globbing option
   {
     echo "./logs/${PDY}${cyc}/gfs!(arch).log"
-    echo "${COM_ATMOS_HISTORY/${ROTDIR}\//}/input.nml"
+    echo "${COM_CONF/${ROTDIR}\//}/ufs.input.nml"
 
     if [[ ${MODE} = "cycled" ]]; then
       if [[ -s "${COM_ATMOS_ANALYSIS}/${head}gsistat" ]]; then
@@ -169,7 +169,8 @@ if [[ ${type} = "gfs" ]]; then
     if [[ ${ARCH_GAUSSIAN} = "YES" ]]; then
       {
         echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2"
-        echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2.idx"
+        # TODO Create sflux idx files so they can be archived
+        #echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2.idx"
       } >> "${DATA}/gfs_flux.txt"
 
       {
@@ -368,13 +369,16 @@ if [[ ${type} == "gdas" ]]; then
         echo "./logs/${PDY}${cyc}/gdas${fstep}.log"
       fi
     done
-    echo "./logs/${PDY}${cyc}/gdaspost*.log"
+    echo "./logs/${PDY}${cyc}/gdas*prod*.log"
+    if [[ "${WRITE_DOPOST}" == ".false." ]]; then
+       echo "./logs/${PDY}${cyc}/gdas*upp*.log"
+    fi
 
     fh=0
     while [[ ${fh} -le 9 ]]; do
       fhr=$(printf %03i "${fh}")
       echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2"
-      echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2.idx"
+      #echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2.idx"
       echo "${COM_ATMOS_GRIB_0p25/${ROTDIR}\//}/${head}pgrb2.0p25.f${fhr}"
       echo "${COM_ATMOS_GRIB_0p25/${ROTDIR}\//}/${head}pgrb2.0p25.f${fhr}.idx"
       echo "${COM_ATMOS_GRIB_1p00/${ROTDIR}\//}/${head}pgrb2.1p00.f${fhr}"
@@ -407,10 +411,13 @@ if [[ ${type} == "gdas" ]]; then
         fi
         subtyplist="gome_metop-b omi_aura ompslp_npp ompsnp_n20 ompsnp_npp ompstc8_n20 ompstc8_npp sbuv2_n19"
         for subtype in ${subtyplist}; do
-          echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.${PDY}${cyc}.ieee_d${suffix}"
-          echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.ctl"
-          echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.${PDY}${cyc}.ieee_d${suffix}"
-          echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.ctl"
+          # On occassion, data is not available for some of these satellites.  Check for existence.
+          if [[ -s "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.${PDY}${cyc}.ieee_d${suffix}" ]]; then
+             echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.${PDY}${cyc}.ieee_d${suffix}"
+             echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.ctl"
+             echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.${PDY}${cyc}.ieee_d${suffix}"
+             echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.ctl"
+          fi
         done
         echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/stdout.${type}.tar.gz"
       done
@@ -612,10 +619,19 @@ if [[ ${type} == "enkfgdas" || ${type} == "enkfgfs" ]]; then
         fi
       fi
     done # loop over FHR
-    for fstep in eobs ecen esfc eupd efcs epos ; do
+    for fstep in efcs epos ; do
      echo "logs/${PDY}${cyc}/${RUN}${fstep}*.log"
     done
 
+  # eobs, ecen, esfc, and eupd are not run on the first cycle
+    for fstep in eobs ecen esfc eupd ; do
+       for log in "${ROTDIR}/logs/${PDY}${cyc}/${RUN}${fstep}"*".log"; do
+          if [[ -s "${log}" ]]; then
+             echo "logs/${PDY}${cyc}/${RUN}${fstep}*.log"
+          fi
+       done
+    done
+
   # eomg* are optional jobs
     for log in "${ROTDIR}/logs/${PDY}${cyc}/${RUN}eomg"*".log"; do
        if [[ -s "${log}" ]]; then