From 7bfc07547b11f90dcd98c8789dd41e0c626366eb Mon Sep 17 00:00:00 2001 From: "Kate.Friedman" Date: Thu, 29 Feb 2024 14:02:09 +0000 Subject: [PATCH] Remove EXPDIR exports from JJOB scripts The EXPDIR setting is exported within the jjob_header.sh script. Refs #2332 --- jobs/JGFS_ATMOS_GEMPAK | 12 +++--------- jobs/JGFS_ATMOS_GEMPAK_META | 5 ----- jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF | 9 --------- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 12 +++--------- jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS | 5 ----- 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK b/jobs/JGFS_ATMOS_GEMPAK index 8a7593181e..e71338b6de 100755 --- a/jobs/JGFS_ATMOS_GEMPAK +++ b/jobs/JGFS_ATMOS_GEMPAK @@ -3,15 +3,6 @@ source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak" -c "base gempak" - -################################ -# Set up the HOME directory -################################ -export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} - -# For half-degree P Grib files -export DO_HD_PGRB=${DO_HD_PGRB:-YES} - ############################################ # Set up model and cycle specific variables ############################################ @@ -22,6 +13,9 @@ export GRIB=${GRIB:-pgrb2f} export EXT="" export DBN_ALERT_TYPE=${DBN_ALERT_TYPE:-GFS_GEMPAK} +# For half-degree P Grib files +export DO_HD_PGRB=${DO_HD_PGRB:-YES} + ################################### # Specify NET and RUN Name and model #################################### diff --git a/jobs/JGFS_ATMOS_GEMPAK_META b/jobs/JGFS_ATMOS_GEMPAK_META index b877f760fb..eebc137f30 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_META +++ b/jobs/JGFS_ATMOS_GEMPAK_META @@ -18,11 +18,6 @@ export MP_LABELIO=yes export MP_PULSE=0 export MP_DEBUG_NOTIMEOUT=yes -################################ -# Set up the HOME directory -################################ -export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} - cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl ############################################# diff --git a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF index 6f6fb5aa06..01651ba51e 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF +++ b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF @@ -8,12 +8,6 @@ source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_gif" -c "base" - -################################ -# Set up the HOME directory -################################ -export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} - ###################################### # Set up the GEMPAK directory ####################################### @@ -22,10 +16,7 @@ export HOMEgempak=${HOMEgempak:-${HOMEgfs}/gempak} export MP_PULSE=0 export MP_TIMEOUT=2000 - -# # Set up model and cycle specific variables -# export MODEL=GFS export fend=384 diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index 1b0fbd5c18..d2d4d81f93 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -6,15 +6,6 @@ source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_spec" -c "base" - -################################ -# Set up the HOME directory -################################ -export EXPDIR="${EXPDIR:-${HOMEgfs}/parm/config}" - -# For half-degree P Grib files -#export DO_HD_PGRB=YES - ################################### # Specify NET and RUN Name and model #################################### @@ -23,6 +14,9 @@ export finc=3 export model=gfs export EXT="" +# For half-degree P Grib files +#export DO_HD_PGRB=YES + ############################################## # Define COM directories ############################################## diff --git a/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS b/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS index 7b93e3b0a5..779006ee32 100755 --- a/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS +++ b/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS @@ -10,11 +10,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "npoess" -c "base" export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1} -################################ -# Set up the HOME directory -################################ -export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} - ################################### # Specify NET and RUN Name and model ####################################