From 8e25dc3248029735afc423823257afdd25ed0d20 Mon Sep 17 00:00:00 2001
From: "Walter.Kolczynski" <Walter.Kolczynski@noaa.gov>
Date: Tue, 27 Jun 2023 22:31:38 -0500
Subject: [PATCH 1/2] Fix daily file location in archive job

During the COM refactor, a location for the ocn/ice daily files was
defined within the products directory. However, the daily files are
output directly by the model and land in the history directory. The
archive job was looking in the otherwise unused daily product
directory for the files and not finding them. This update now:
- Removes the COM variable for the daily files
- Updates the archive job to pull the daily files from history

Fixes #1709
---
 jobs/JGLOBAL_ARCHIVE       | 2 +-
 parm/config/gfs/config.com | 1 -
 ush/hpssarch_gen.sh        | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jobs/JGLOBAL_ARCHIVE b/jobs/JGLOBAL_ARCHIVE
index 3bb8b414d4..32788f5efb 100755
--- a/jobs/JGLOBAL_ARCHIVE
+++ b/jobs/JGLOBAL_ARCHIVE
@@ -15,7 +15,7 @@ YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMO
   COM_CHEM_HISTORY \
   COM_ICE_HISTORY COM_ICE_INPUT \
   COM_OBS COM_TOP \
-  COM_OCEAN_DAILY COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_XSECT \
+  COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_XSECT \
   COM_WAVE_GRID COM_WAVE_HISTORY COM_WAVE_STATION
 
 for grid in "0p25" "0p50" "1p00"; do
diff --git a/parm/config/gfs/config.com b/parm/config/gfs/config.com
index 5e6aa9c65f..788a672a3d 100644
--- a/parm/config/gfs/config.com
+++ b/parm/config/gfs/config.com
@@ -78,7 +78,6 @@ declare -rx COM_OCEAN_INPUT_TMPL=${COM_BASE}'/model_data/ocean/input'
 declare -rx COM_OCEAN_ANALYSIS_TMPL=${COM_BASE}'/analysis/ocean'
 declare -rx COM_OCEAN_2D_TMPL=${COM_BASE}'/products/ocean/2D'
 declare -rx COM_OCEAN_3D_TMPL=${COM_BASE}'/products/ocean/3D'
-declare -rx COM_OCEAN_DAILY_TMPL=${COM_BASE}'/products/ocean/daily'
 declare -rx COM_OCEAN_XSECT_TMPL=${COM_BASE}'/products/ocean/xsect'
 declare -rx COM_OCEAN_GRIB_TMPL=${COM_BASE}'/products/ocean/grib2/${GRID}'
 
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index 7edf91e2b9..01a7b2e532 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -261,8 +261,8 @@ if [[ ${type} = "gfs" ]]; then
     echo "${COM_OCEAN_INPUT/${ROTDIR}\//}/MOM_input" >> ocn_2D.txt
     echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_2D*" >> ocn_2D.txt
     echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_3D*" >> ocn_3D.txt
+    echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_daily*" >> ocn_daily.txt
     echo "${COM_OCEAN_XSECT/${ROTDIR}\//}/ocn*EQ*" >> ocn_xsect.txt
-    echo "${COM_OCEAN_DAILY/${ROTDIR}\//}/ocn_daily*" >> ocn_daily.txt
     echo "${COM_OCEAN_GRIB_0p50/${ROTDIR}\//}/ocn_ice*0p5x0p5.grb2" >> ocn_ice_grib2_0p5.txt
     echo "${COM_OCEAN_GRIB_0p25/${ROTDIR}\//}/ocn_ice*0p25x0p25.grb2" >> ocn_ice_grib2_0p25.txt
 

From 9e71080bd87d1d0d697173364e43185b44b04eed Mon Sep 17 00:00:00 2001
From: "Walter.Kolczynski" <Walter.Kolczynski@noaa.gov>
Date: Wed, 28 Jun 2023 01:14:48 -0500
Subject: [PATCH 2/2] Fix 2D and 3D ocean product archival

---
 jobs/JGLOBAL_ARCHIVE | 2 +-
 ush/hpssarch_gen.sh  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jobs/JGLOBAL_ARCHIVE b/jobs/JGLOBAL_ARCHIVE
index 32788f5efb..e8fae44330 100755
--- a/jobs/JGLOBAL_ARCHIVE
+++ b/jobs/JGLOBAL_ARCHIVE
@@ -15,7 +15,7 @@ YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMO
   COM_CHEM_HISTORY \
   COM_ICE_HISTORY COM_ICE_INPUT \
   COM_OBS COM_TOP \
-  COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_XSECT \
+  COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_XSECT COM_OCEAN_2D COM_OCEAN_3D \
   COM_WAVE_GRID COM_WAVE_HISTORY COM_WAVE_STATION
 
 for grid in "0p25" "0p50" "1p00"; do
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index 01a7b2e532..0086fd9c19 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -259,10 +259,10 @@ if [[ ${type} = "gfs" ]]; then
     touch ocn_xsect.txt
     touch ocn_daily.txt
     echo "${COM_OCEAN_INPUT/${ROTDIR}\//}/MOM_input" >> ocn_2D.txt
-    echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_2D*" >> ocn_2D.txt
-    echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_3D*" >> ocn_3D.txt
-    echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_daily*" >> ocn_daily.txt
+    echo "${COM_OCEAN_2D/${ROTDIR}\//}/ocn_2D*" >> ocn_2D.txt
+    echo "${COM_OCEAN_3D/${ROTDIR}\//}/ocn_3D*" >> ocn_3D.txt
     echo "${COM_OCEAN_XSECT/${ROTDIR}\//}/ocn*EQ*" >> ocn_xsect.txt
+    echo "${COM_OCEAN_HISTORY/${ROTDIR}\//}/ocn_daily*" >> ocn_daily.txt
     echo "${COM_OCEAN_GRIB_0p50/${ROTDIR}\//}/ocn_ice*0p5x0p5.grb2" >> ocn_ice_grib2_0p5.txt
     echo "${COM_OCEAN_GRIB_0p25/${ROTDIR}\//}/ocn_ice*0p25x0p25.grb2" >> ocn_ice_grib2_0p25.txt