Remove FIX* variable settings in JJOBs

Refs NOAA-EMC#2184
KateFriedman-NOAA · Feb 14, 2024 · 39fe579 · 39fe579
1 parent 6ca5eaf
commit 39fe579
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 16 deletions.
diff --git a/jobs/JGDAS_ATMOS_GEMPAK b/jobs/JGDAS_ATMOS_GEMPAK
@@ -11,7 +11,6 @@ export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
 export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
 export PARMwmo=${PARMwmo:-${HOMEgfs}/parm/wmo}
 export PARMproduct=${PARMproduct:-${HOMEgfs}/parm/product}
-export FIXgempak=${FIXgempak:-${HOMEgfs}/gempak/fix}
 export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
 export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
 export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

diff --git a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
@@ -17,7 +17,6 @@ export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
 export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
 export PARMwmo=${PARMwmo:-${HOMEgfs}/parm/wmo}
 export PARMproduct=${PARMproduct:-${HOMEgfs}/parm/product}
-export FIXgempak=${FIXgempak:-${HOMEgfs}/gempak/fix}
 export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
 export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
 export UTILgfs=${UTILgfs:-${HOMEgfs}/util}
@@ -26,7 +25,7 @@ export UTILgfs=${UTILgfs:-${HOMEgfs}/util}
 # Now set up GEMPAK/NTRANS environment
 #
 
-cp ${FIXgempak}/datatype.tbl datatype.tbl
+cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
 
 ###################################
 # Specify NET and RUN Name and model

diff --git a/jobs/JGFS_ATMOS_GEMPAK b/jobs/JGFS_ATMOS_GEMPAK
@@ -10,7 +10,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak" -c "base gempak"
 export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
 export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
 export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
-export FIXgempak=${FIXgempak:-${HOMEgfs}/gempak/fix}
 export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
 export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
 

diff --git a/jobs/JGFS_ATMOS_GEMPAK_META b/jobs/JGFS_ATMOS_GEMPAK_META
@@ -24,11 +24,10 @@ export MP_DEBUG_NOTIMEOUT=yes
 export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
 export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
 export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
-export FIXgempak=${FIXgempak:-${HOMEgfs}/gempak/fix}
 export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
 export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
 
-cp  ${FIXgempak}/datatype.tbl datatype.tbl
+cp  ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
 
 #############################################
 #set the fcst hrs for all the cycles

diff --git a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF
@@ -24,7 +24,6 @@ export UTILgfs=${UTILgfs:-${HOMEgfs}/util}
 # Set up the GEMPAK directory
 #######################################
 export HOMEgempak=${HOMEgempak:-${HOMEgfs}/gempak}
-export FIXgempak=${FIXgempak:-${HOMEgempak}/fix}
 export USHgempak=${USHgempak:-${HOMEgempak}/ush}
 
 export MP_PULSE=0

diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC
@@ -13,7 +13,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_spec" -c "base"
 export EXECgfs="${EXECgfs:-${HOMEgfs}/exec}"
 export PARMgfs="${PARMgfs:-${HOMEgfs}/parm}"
 export EXPDIR="${EXPDIR:-${HOMEgfs}/parm/config}"
-export FIXgempak="${FIXgempak:-${HOMEgfs}/gempak/fix}"
 export USHgempak="${USHgempak:-${HOMEgfs}/gempak/ush}"
 export SRCgfs="${SRCgfs:-${HOMEgfs}/scripts}"
 

diff --git a/jobs/JGFS_ATMOS_POSTSND b/jobs/JGFS_ATMOS_POSTSND
@@ -24,7 +24,6 @@ export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 export HOMEbufrsnd=${HOMEbufrsnd:-${HOMEgfs}}
 export EXECbufrsnd=${EXECbufrsnd:-${HOMEbufrsnd}/exec}
-export FIXbufrsnd=${FIXbufrsnd:-${HOMEbufrsnd}/fix/product}
 export PARMbufrsnd=${PARMbufrsnd:-${HOMEbufrsnd}/parm/product}
 export USHbufrsnd=${USHbufrsnd:-${HOMEbufrsnd}/ush}
 export SCRbufrsnd=${SCRbufrsnd:-${HOMEbufrsnd}/scripts}

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS
@@ -79,7 +79,7 @@ export PREPQCPF="${COM_OBS}/${OPREFIX}prepbufr.acft_profiles"
 # Copy fix file for obsproc  # TODO: Why is this necessary?
 if [[ ${RUN} = "gfs" ]]; then
     mkdir -p ${ROTDIR}/fix
-    cp ${FIXgsi}/prepobs_errtable.global ${ROTDIR}/fix/
+    cp ${FIXgfs}/gsi/prepobs_errtable.global ${ROTDIR}/fix/
 fi
 
 

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
@@ -10,7 +10,6 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -9,7 +9,6 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -13,7 +13,6 @@ export CDATE=${PDY}${cyc}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -9,7 +9,6 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -9,7 +9,6 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}

diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
@@ -17,7 +17,6 @@ export MP_PULSE=0
 export CDO=${CDO_ROOT}/bin/cdo
 
 # Path to HOME Directory
-export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
 export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
 export USHwave=${USHwave:-${HOMEgfs}/ush}
 export EXECwave=${EXECwave:-${HOMEgfs}/exec}