From dbb536c3bd3c6b46cb04aef6f41792c6c8b3dcc8 Mon Sep 17 00:00:00 2001
From: Mingshi Chen <Mingshi.Chen@noaa.gov>
Date: Fri, 14 Feb 2025 15:19:16 -0600
Subject: [PATCH 1/3] chang COM_TOP into COMIN_TOP

---
 jobs/JGDAS_ENKF_ARCHIVE_TARS | 3 ++-
 jobs/JGDAS_ENKF_ARCHIVE_VRFY | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jobs/JGDAS_ENKF_ARCHIVE_TARS b/jobs/JGDAS_ENKF_ARCHIVE_TARS
index 04fe8e3141d..71f5a4f8392 100755
--- a/jobs/JGDAS_ENKF_ARCHIVE_TARS
+++ b/jobs/JGDAS_ENKF_ARCHIVE_TARS
@@ -7,7 +7,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_tars" -c "base earc_tars"
 ##############################################
 # Set variables used in the script
 ##############################################
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_TOP
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+  COMIN_TOP:COM_TOP_TMPL
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
   COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
   COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
diff --git a/jobs/JGDAS_ENKF_ARCHIVE_VRFY b/jobs/JGDAS_ENKF_ARCHIVE_VRFY
index 00944019871..a5c67a31bb5 100755
--- a/jobs/JGDAS_ENKF_ARCHIVE_VRFY
+++ b/jobs/JGDAS_ENKF_ARCHIVE_VRFY
@@ -7,7 +7,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_vrfy" -c "base earc_vrfy"
 ##############################################
 # Set variables used in the script
 ##############################################
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_TOP
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+  COMIN_TOP:COM_TOP_TMPL
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
   COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
   COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \

From 1ab221f3f3f39f91ebdb0bc9cef43ad9f43b24d7 Mon Sep 17 00:00:00 2001
From: Mingshi Chen <Mingshi.Chen@noaa.gov>
Date: Fri, 14 Feb 2025 15:24:09 -0600
Subject: [PATCH 2/3] update exgdas_enkf_earc_tars.py &
 exgdas_enkf_earc_vrfy.py

---
 scripts/exgdas_enkf_earc_tars.py | 2 +-
 scripts/exgdas_enkf_earc_vrfy.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/exgdas_enkf_earc_tars.py b/scripts/exgdas_enkf_earc_tars.py
index 63c978d6a8f..3195fb41e5b 100755
--- a/scripts/exgdas_enkf_earc_tars.py
+++ b/scripts/exgdas_enkf_earc_tars.py
@@ -38,7 +38,7 @@ def main():
 
     # Also import all COMIN* directory and template variables
     for key in archive.task_config.keys():
-        if key.startswith("COM"):
+        if key.startswith("COMIN"):
             archive_dict[key] = archive.task_config[key]
 
     cwd = os.getcwd()
diff --git a/scripts/exgdas_enkf_earc_vrfy.py b/scripts/exgdas_enkf_earc_vrfy.py
index b7dd33a89a2..39478856731 100755
--- a/scripts/exgdas_enkf_earc_vrfy.py
+++ b/scripts/exgdas_enkf_earc_vrfy.py
@@ -31,7 +31,7 @@ def main():
 
     # Also import all COMIN* directory and template variables
     for key in archive.task_config.keys():
-        if key.startswith("COM"):
+        if key.startswith("COMIN"):
             archive_dict[key] = archive.task_config[key]
 
     cwd = os.getcwd()

From 5b0aaeb33678da31c3e8265f16e0218360ab6ae4 Mon Sep 17 00:00:00 2001
From: Mingshi Chen <Mingshi.Chen@noaa.gov>
Date: Wed, 26 Feb 2025 21:00:47 -0600
Subject: [PATCH 3/3] remove COM_TOP variables

---
 jobs/JGDAS_ENKF_ARCHIVE_TARS | 2 --
 jobs/JGDAS_ENKF_ARCHIVE_VRFY | 2 --
 2 files changed, 4 deletions(-)

diff --git a/jobs/JGDAS_ENKF_ARCHIVE_TARS b/jobs/JGDAS_ENKF_ARCHIVE_TARS
index 71f5a4f8392..eec053bfa9b 100755
--- a/jobs/JGDAS_ENKF_ARCHIVE_TARS
+++ b/jobs/JGDAS_ENKF_ARCHIVE_TARS
@@ -7,8 +7,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_tars" -c "base earc_tars"
 ##############################################
 # Set variables used in the script
 ##############################################
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-  COMIN_TOP:COM_TOP_TMPL
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
   COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
   COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \
diff --git a/jobs/JGDAS_ENKF_ARCHIVE_VRFY b/jobs/JGDAS_ENKF_ARCHIVE_VRFY
index a5c67a31bb5..e6e4f8d2d06 100755
--- a/jobs/JGDAS_ENKF_ARCHIVE_VRFY
+++ b/jobs/JGDAS_ENKF_ARCHIVE_VRFY
@@ -7,8 +7,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_vrfy" -c "base earc_vrfy"
 ##############################################
 # Set variables used in the script
 ##############################################
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-  COMIN_TOP:COM_TOP_TMPL
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
   COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \
   COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \