Skip to content

Commit

Permalink
Remove USH* variables from JJOB scripts
Browse files Browse the repository at this point in the history 
Replace with HOMEgfs relative path if needed.
Clean out some PARMgfs exports left behind.

Refs NOAA-EMC#2332
  • Loading branch information
@KateFriedman-NOAA
KateFriedman-NOAA committed Feb 27, 2024
1 parent ddd8329 commit 04d741a
Show file tree
Hide file tree
Showing 18 changed files with 4 additions and 28 deletions.
1 change: 0 additions & 1 deletion jobs/JGDAS_ATMOS_GEMPAK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak" -c "base gempak"
################################
# Set up the HOME directory
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

Expand Down
9 changes: 4 additions & 5 deletions jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_meta" -c "base gempak"
################################
export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver}}
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

Expand Down Expand Up @@ -64,10 +63,10 @@ export pgmout=OUTPUT.$$

########################################################
# Execute the script.
${USHgempak}/gdas_meta_na.sh
${USHgempak}/gdas_ecmwf_meta_ver.sh
${USHgempak}/gdas_meta_loop.sh
${USHgempak}/gdas_ukmet_meta_ver.sh
${HOMEgfs}/gempak/ush/gdas_meta_na.sh
${HOMEgfs}/gempak/ush/gdas_ecmwf_meta_ver.sh
${HOMEgfs}/gempak/ush/gdas_meta_loop.sh
${HOMEgfs}/gempak/ush/gdas_ukmet_meta_ver.sh
export err=$?; err_chk
########################################################

Expand Down
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1}
# Set up the HOME directory
################################
export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver}}
export USHgfs=${USHgfs:-${HOMEgfs}/ush}
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}

###################################
Expand Down
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_AWIPS_G2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1}
################################
# Set up the HOME directory
################################
export USHgfs=${USHgfs:-${HOMEgfs}/ush}
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

Expand Down
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_FBWIND
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "fbwind" -c "base"
################################
# Set up the HOME directory
################################
export USHgfs=${USHgfs:-${HOMEgfs}/ush}
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

Expand Down
2 changes: 0 additions & 2 deletions jobs/JGFS_ATMOS_GEMPAK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak" -c "base gempak"
# Set up the HOME directory
################################
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}

# For half-degree P Grib files
Expand Down
2 changes: 0 additions & 2 deletions jobs/JGFS_ATMOS_GEMPAK_META
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ export MP_DEBUG_NOTIMEOUT=yes
# Set up the HOME directory
################################
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}

cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
Expand Down
3 changes: 0 additions & 3 deletions jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_gif" -c "base"
# Set up the HOME directory
################################
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

######################################
# Set up the GEMPAK directory
#######################################
export HOMEgempak=${HOMEgempak:-${HOMEgfs}/gempak}
export USHgempak=${USHgempak:-${HOMEgempak}/ush}

export MP_PULSE=0
export MP_TIMEOUT=2000
Expand Down
2 changes: 0 additions & 2 deletions jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_spec" -c "base"
# Set up the HOME directory
################################
export EXECgfs="${EXECgfs:-${HOMEgfs}/exec}"
export PARMgfs="${PARMgfs:-${HOMEgfs}/parm}"
export EXPDIR="${EXPDIR:-${HOMEgfs}/parm/config}"
export USHgempak="${USHgempak:-${HOMEgfs}/gempak/ush}"
export SRCgfs="${SRCgfs:-${HOMEgfs}/scripts}"

# For half-degree P Grib files
Expand Down
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1}
################################
# Set up the HOME directory
################################
export USHgfs=${USHgfs:-${HOMEgfs}/ush}
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}

Expand Down
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_POSTSND
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}

export HOMEbufrsnd=${HOMEbufrsnd:-${HOMEgfs}}
export EXECbufrsnd=${EXECbufrsnd:-${HOMEbufrsnd}/exec}
export USHbufrsnd=${USHbufrsnd:-${HOMEbufrsnd}/ush}
export SCRbufrsnd=${SCRbufrsnd:-${HOMEbufrsnd}/scripts}

##############################
Expand Down
2 changes: 0 additions & 2 deletions jobs/JGLOBAL_ATMOS_POST_MANAGER
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ export RUN=${RUN:-gfs}
####################################
export HOMEgfs=${HOMEgfs:-${PACKAGEROOT}/gfs.${gfs_ver}}
export EXECgfs=${HOMEgfs:-${HOMEgfs}/exec}
export PARMgfs=${HOMEgfs:-${HOMEgfs}/parm}
export USHgfs=${HOMEgfs:-${HOMEgfs}/ush}

###########################
# Set up EXT variable
Expand Down
1 change: 0 additions & 1 deletion jobs/JGLOBAL_WAVE_INIT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export errchk=${errchk:-err_chk}
export MP_PULSE=0

# Path to HOME Directory
export USHwave=${USHwave:-${HOMEgfs}/ush}
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

# Set COM Paths
Expand Down
1 change: 0 additions & 1 deletion jobs/JGLOBAL_WAVE_POST_BNDPNT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export errchk=${errchk:-err_chk}
export MP_PULSE=0

# Path to HOME Directory
export USHwave=${USHwave:-${HOMEgfs}/ush}
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

# Set COM Paths and GETGES environment
Expand Down
1 change: 0 additions & 1 deletion jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export CDATE=${PDY}${cyc}
export MP_PULSE=0

# Path to HOME Directory
export USHwave=${USHwave:-${HOMEgfs}/ush}
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

# Set COM Paths and GETGES environment
Expand Down
1 change: 0 additions & 1 deletion jobs/JGLOBAL_WAVE_POST_PNT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export errchk=${errchk:-err_chk}
export MP_PULSE=0

# Path to HOME Directory
export USHwave=${USHwave:-${HOMEgfs}/ush}
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

# Set COM Paths and GETGES environment
Expand Down
1 change: 0 additions & 1 deletion jobs/JGLOBAL_WAVE_POST_SBS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export errchk=${errchk:-err_chk}
export MP_PULSE=0

# Path to HOME Directory
export USHwave=${USHwave:-${HOMEgfs}/ush}
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

# Set COM Paths and GETGES environment
Expand Down
1 change: 0 additions & 1 deletion jobs/JGLOBAL_WAVE_PREP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export MP_PULSE=0
export CDO=${CDO_ROOT}/bin/cdo

# Path to HOME Directory
export USHwave=${USHwave:-${HOMEgfs}/ush}
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

# Set COM Paths and GETGES environment
Expand Down

0 comments on commit 04d741a

Please sign in to comment.