From 7086ddc4bece6fb2a8c1c2e6090800d4293e410e Mon Sep 17 00:00:00 2001
From: AndrewEichmann-NOAA
 <58948505+AndrewEichmann-NOAA@users.noreply.github.com>
Date: Mon, 30 Oct 2023 19:58:43 -0400
Subject: [PATCH] Add ocean analysis files to HPSS archiving task (#1985)

This PR adds the files under `analysis/ocean` (except those in `bump` and `vrfy`) to the
HPSS archiving job, in `gdasocean_analysis.tar`, which were previously not archived.

Resolves NOAA-EMC/GDASApp/issues/693
---
 jobs/JGLOBAL_ARCHIVE        | 1 +
 scripts/exglobal_archive.sh | 2 +-
 ush/hpssarch_gen.sh         | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_ARCHIVE b/jobs/JGLOBAL_ARCHIVE
index 1ea8fdfeef..f2828a9fdd 100755
--- a/jobs/JGLOBAL_ARCHIVE
+++ b/jobs/JGLOBAL_ARCHIVE
@@ -17,6 +17,7 @@ YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMO
   COM_ICE_HISTORY COM_ICE_INPUT COM_ICE_RESTART \
   COM_OBS COM_TOP \
   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
 
 for grid in "0p25" "0p50" "1p00"; do
diff --git a/scripts/exglobal_archive.sh b/scripts/exglobal_archive.sh
index 54323a0dd0..dcc864e223 100755
--- a/scripts/exglobal_archive.sh
+++ b/scripts/exglobal_archive.sh
@@ -238,7 +238,7 @@ if [[ ${HPSSARCH} = "YES" || ${LOCALARCH} = "YES" ]]; then
 
         #gdasocean
         if [ "${DO_OCN}" = "YES" ]; then
-            targrp_list="${targrp_list} gdasocean"
+            targrp_list="${targrp_list} gdasocean gdasocean_analysis"
         fi
 
         #gdasice
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index 138a5ff656..f09c816e93 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -454,6 +454,8 @@ if [[ ${type} == "gdas" ]]; then
     touch gdasocean.txt
     rm -rf gdasocean_restart.txt
     touch gdasocean_restart.txt
+    rm -rf gdasocean_analysis.txt
+    touch gdasocean_analysis.txt
 
     head="gdas.t${cyc}z."
 
@@ -468,6 +470,13 @@ if [[ ${type} == "gdas" ]]; then
       echo "${COM_MED_RESTART/${ROTDIR}\//}/*"
     } >> gdasocean_restart.txt
 
+    {
+      echo "${COM_OCEAN_ANALYSIS/${ROTDIR}\//}/${head}*"
+      echo "${COM_OCEAN_ANALYSIS/${ROTDIR}\//}/gdas.t??z.ocngrid.nc"
+      echo "${COM_OCEAN_ANALYSIS/${ROTDIR}\//}/diags"
+      echo "${COM_OCEAN_ANALYSIS/${ROTDIR}\//}/yaml"
+    } >> gdasocean_analysis.txt
+
   fi
 
   if [[ ${DO_ICE} = "YES" ]]; then