From d2c5a65c0f254f4c058c3c8a37b18b402afec4d8 Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Thu, 29 Feb 2024 19:38:30 +0000
Subject: [PATCH] Clean out additional unneeded HOMEgfs settings

Refs #2332
---
 jobs/JGDAS_ATMOS_GEMPAK_META_NCDC   | 7 -------
 jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG   | 5 -----
 jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF | 5 -----
 jobs/JGFS_ATMOS_POSTSND             | 7 -------
 jobs/JGLOBAL_ATMOS_POST_MANAGER     | 5 -----
 ush/fv3gfs_remap.sh                 | 7 ++-----
 6 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
index ba2b2a8296..a6c54b8337 100755
--- a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
+++ b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
@@ -9,14 +9,7 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_meta" -c "base gempak"
 
-################################
-# Set up the HOME directory
-################################
-export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver}}
-
-#
 # Now set up GEMPAK/NTRANS environment
-#
 
 cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
 
diff --git a/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG b/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG
index 1c1d00e50e..80b6ad5e38 100755
--- a/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG
+++ b/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG
@@ -5,11 +5,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "awips" -c "base awips"
 
 export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1}
 
-################################
-# Set up the HOME directory
-################################
-export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver}}
-
 ###################################
 # Specify NET and RUN Name and model
 ####################################
diff --git a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF
index 01651ba51e..0f83594e72 100755
--- a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF
+++ b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF
@@ -8,11 +8,6 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_gif" -c "base"
 
-######################################
-# Set up the GEMPAK directory
-#######################################
-export HOMEgempak=${HOMEgempak:-${HOMEgfs}/gempak}
-
 export MP_PULSE=0
 export MP_TIMEOUT=2000
 
diff --git a/jobs/JGFS_ATMOS_POSTSND b/jobs/JGFS_ATMOS_POSTSND
index 2d9cf0c2c6..e6411709fa 100755
--- a/jobs/JGFS_ATMOS_POSTSND
+++ b/jobs/JGFS_ATMOS_POSTSND
@@ -9,7 +9,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "postsnd" -c "base postsnd"
 ##############################################
 export CDUMP=${RUN/enkf}
 
-
 ########################################
 # Runs GFS BUFR SOUNDINGS
 ########################################
@@ -18,12 +17,6 @@ export model=${model:-gfs}
 export SENDDBN=${SENDDBN:-YES}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
-###################################
-# Set up the source directories
-###################################
-
-export HOMEbufrsnd=${HOMEbufrsnd:-${HOMEgfs}}
-
 ##############################
 # Define COM Directories
 ##############################
diff --git a/jobs/JGLOBAL_ATMOS_POST_MANAGER b/jobs/JGLOBAL_ATMOS_POST_MANAGER
index ba4fcce1f5..a287ea84bd 100755
--- a/jobs/JGLOBAL_ATMOS_POST_MANAGER
+++ b/jobs/JGLOBAL_ATMOS_POST_MANAGER
@@ -12,11 +12,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "post" -c "base post"
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 
-####################################
-# Specify Execution Areas
-####################################
-export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver}}
-
 ###########################
 # Set up EXT variable
 ###########################
diff --git a/ush/fv3gfs_remap.sh b/ush/fv3gfs_remap.sh
index eaf2c64a01..b1c7845d01 100755
--- a/ush/fv3gfs_remap.sh
+++ b/ush/fv3gfs_remap.sh
@@ -5,16 +5,13 @@
 #-- Fanglin Yang, October 2016
 #--------------------------------------
 
-source "$HOMEgfs/ush/preamble.sh"
+source "${HOMEgfs}/ush/preamble.sh"
 
 export CDATE=${CDATE:-"2016100300"}
 export CASE=${CASE:-"C192"}           # C48 C96 C192 C384 C768 C1152 C3072
 export GG=${master_grid:-"0p25deg"}   # 1deg 0p5deg 0p25deg 0p125deg
 
-pwd=$(pwd)
-export DATA=${DATA:-$pwd}
-export HOMEgfs=${HOMEgfs:-$PACKAGEROOT}
-export REMAPEXE=${REMAPEXE:-$HOMEgfs/exec/fregrid_parallel}
+export REMAPEXE=${REMAPEXE:-${EXECgfs}/fregrid_parallel}
 export IPD4=${IPD4:-"YES"}
 
 cycn=$(echo $CDATE | cut -c 9-10)