Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove FIX* variables for fix subfolders #2337

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gempak/ush/gdas_ecmwf_meta_ver.sh
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ PDY2=$(echo ${PDY} | cut -c3-)
#
# Copy in datatype table to define gdfile type
#
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
export err=$?
if [[ $err -ne 0 ]] ; then
echo " File datatype.tbl does not exist."
2 changes: 1 addition & 1 deletion gempak/ush/gdas_meta_loop.sh
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ export pgm=gdplot2_nc;. prep_step; startmsg
#
# Copy in datatype table to define gdfile type
#
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
export err=$?
if [[ $err -ne 0 ]] ; then
echo " File datatype.tbl does not exist."
2 changes: 1 addition & 1 deletion gempak/ush/gdas_ukmet_meta_ver.sh
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ PDY2=$(echo ${PDY} | cut -c3-)
#
# Copy in datatype table to define gdfile type
#
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

#
# DEFINE 1 CYCLE AGO
2 changes: 1 addition & 1 deletion gempak/ush/gempak_gdas_f000_gif.sh
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@

pixels="1728;1472"

cp $FIXgempak/coltbl.spc coltbl.xwp
cp ${HOMEgfs}/gempak/fix/coltbl.spc coltbl.xwp

#################################################################
# NORTHERN HEMISPHERE ANALYSIS CHARTS #
2 changes: 1 addition & 1 deletion gempak/ush/gempak_gfs_f00_gif.sh
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@

pixels="1728;1472"

cp $FIXgempak/coltbl.spc coltbl.xwp
cp ${HOMEgfs}/gempak/fix/coltbl.spc coltbl.xwp

#################################################################
# ANALYSIS CHARTS #
2 changes: 1 addition & 1 deletion gempak/ush/gempak_gfs_f12_gif.sh
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@

pixels="1728;1472"

cp $FIXgempak/coltbl.spc coltbl.xwp
cp ${HOMEgfs}/gempak/fix/coltbl.spc coltbl.xwp

##########################################################
# 12HR FORECAST CHARTS #
2 changes: 1 addition & 1 deletion gempak/ush/gempak_gfs_f24_gif.sh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@

pixels="1728;1472"

cp $FIXgempak/coltbl.spc coltbl.xwp
cp ${HOMEgfs}/gempak/fix/coltbl.spc coltbl.xwp



2 changes: 1 addition & 1 deletion gempak/ush/gempak_gfs_f36_gif.sh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@

pixels="1728;1472"

cp $FIXgempak/coltbl.spc coltbl.xwp
cp ${HOMEgfs}/gempak/fix/coltbl.spc coltbl.xwp



2 changes: 1 addition & 1 deletion gempak/ush/gempak_gfs_f48_gif.sh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@

pixels="1728;1472"

cp $FIXgempak/coltbl.spc coltbl.xwp
cp ${HOMEgfs}/gempak/fix/coltbl.spc coltbl.xwp



2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_ak.sh
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ set -xa
rm -rf $DATA/ak
mkdir -p -m 775 $DATA/ak
cd $DATA/ak
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

device="nc | gfs.meta.ak"
PDY2=$(echo $PDY | cut -c3-)
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_bwx.sh
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ set -x
export PS4='BWX:$SECONDS + '
mkdir -p -m 775 $DATA/BWX
cd $DATA/BWX
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL="GFS"
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_comp.sh
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ export PS4='COMP:$SECONDS + '
rm -Rf $DATA/COMP $DATA/GEMPAK_META_COMP
mkdir -p -m 775 $DATA/COMP $DATA/GEMPAK_META_COMP
cd $DATA/COMP
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

export COMPONENT=${COMPONENT:-atmos}

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_crb.sh
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ set -x
export PS4='crb:$SECONDS + '
mkdir -p -m 775 $DATA/crb
cd $DATA/crb
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
#
mdl=gfs
MDL=GFS
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_hi.sh
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
set -xa
mkdir -p -m 775 $DATA/mrfhi
cd $DATA/mrfhi
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

device="nc | mrfhi.meta"

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_hur.sh
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ set -x
export PS4='hur:$SECONDS + '
mkdir -p -m 775 $DATA/hur
cd $DATA/hur
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL=GFS
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_mar_atl.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='MAR_ATL:$SECONDS + '
mkdir -p -m 775 $DATA/MAR_ATL
cd $DATA/MAR_ATL
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL="GFS"
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_mar_comp.sh
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ rm -Rf $DATA/GEMPAK_META_MAR
mkdir -p -m 775 $DATA/GEMPAK_META_MAR $DATA/MAR_COMP

cd $DATA/MAR_COMP
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

export COMPONENT=${COMPONENT:-atmos}

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_mar_pac.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='MAR_PAC:$SECONDS + '
mkdir -p -m 775 $DATA/MAR_PAC
cd $DATA/MAR_PAC
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL="GFS"
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_mar_ql.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='MAR_QL_F${fend}:$SECONDS + '
mkdir -p -m 775 $DATA/MAR_QL
cd $DATA/MAR_QL
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL="GFS"
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_mar_skewt.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='MAR_SKEWT:$SECONDS + '
mkdir -p -m 775 $DATA/MAR_SKEWT
cd $DATA/MAR_SKEWT
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL="GFS"
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_mar_ver.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='MAR_VER:$SECONDS + '
mkdir -p -m 775 $DATA/MAR_VER
cd $DATA/MAR_VER
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL="GFS"
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_nhsh.sh
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
set -xa
mkdir -p -m 775 $DATA/mrfnhsh
cd $DATA/mrfnhsh
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

PDY2=$(echo $PDY | cut -c3-)

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_opc_na_ver
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='OPC_NA_VER_F${fend}:$SECONDS + '
mkdir -p -m 775 $DATA/OPC_NA_VER_F${fend}
cd $DATA/OPC_NA_VER_F${fend}
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

export COMPONENT=${COMPONENT:-atmos}

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_opc_np_ver
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ set -x
export PS4='OPC_NP_VER_F${fend}:$SECONDS + '
mkdir -p -m 775 $DATA/OPC_NP_VER_F${fend}
cd $DATA/OPC_NP_VER_F${fend}
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl
#
export COMPONENT=${COMPONENT:-atmos}

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_precip.sh
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ set -x
export PS4='qpf:$SECONDS + '
mkdir -p -m 775 $DATA/precip
cd $DATA/precip
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

#
# Set model and metafile naming conventions
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_qpf.sh
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ set -x
export PS4='qpf:$SECONDS + '
mkdir -p -m 775 $DATA/qpf
cd $DATA/qpf
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL=GFS
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_sa.sh
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ set -x
export PS4='SA:$SECONDS + '
mkdir -p -m 775 $DATA/SA
cd $DATA/SA
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL=GFS
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_sa2.sh
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ set -x
echo " start with ukmet_gfs_meta_sa2.sh"

export PS4='SA2:$SECONDS + '
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

export COMPONENT=${COMPONENT:-atmos}

2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_trop.sh
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ set -x
export PS4='TROP:$SECONDS + '
mkdir -p -m 775 $DATA/TROP
cd $DATA/TROP
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

mdl=gfs
MDL=GFS
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_us.sh
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ set -xa
rm -rf $DATA/us
mkdir -p -m 775 $DATA/us
cd $DATA/us
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

device="nc | gfs.meta"
PDY2=$(echo $PDY | cut -c3-)
6 changes: 3 additions & 3 deletions gempak/ush/gfs_meta_usext.sh
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@
set -xa
mkdir -p -m 775 $DATA/mrfus
cd $DATA/mrfus
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

device="nc | mrf.meta"

#XXW cp $FIXgempak/model/gfs/ak_sfstns.tbl alaska.tbl
cp $FIXgempak/ak_sfstns.tbl alaska.tbl
#XXW cp ${HOMEgfs}/gempak/fix/model/gfs/ak_sfstns.tbl alaska.tbl
cp ${HOMEgfs}/gempak/fix/ak_sfstns.tbl alaska.tbl

month=$(echo $PDY | cut -c5,6)
if [ $month -ge 5 -a $month -le 9 ] ; then
2 changes: 1 addition & 1 deletion gempak/ush/gfs_meta_ver.sh
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ set -x
export PS4='VER:$SECONDS + '
mkdir -p -m 775 $DATA/VER
cd $DATA/VER
cp $FIXgempak/datatype.tbl datatype.tbl
cp ${HOMEgfs}/gempak/fix/datatype.tbl datatype.tbl

export COMPONENT=${COMPONENT:-atmos}

1 change: 0 additions & 1 deletion jobs/JGDAS_ATMOS_GEMPAK
Original file line number Diff line number Diff line change
@@ -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}
3 changes: 1 addition & 2 deletions jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export PARMwmo=${PARMwmo:-${HOMEgfs}/parm/wmo}
export PARMproduct=${PARMproduct:-${HOMEgfs}/parm/product}
export FIXgfs=${FIXgfs:-${HOMEgfs}/fix}

###################################
# Specify NET and RUN Name and model
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_AWIPS_G2
Original file line number Diff line number Diff line change
@@ -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 FIXgfs=${FIXgfs:-${HOMEgfs}/fix}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

###################################
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_FBWIND
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export PARMwmo=${PARMwmo:-${HOMEgfs}/parm/wmo}
export PARMproduct=${PARMproduct:-${HOMEgfs}/parm/product}
export FIXgfs=${FIXgfs:-${HOMEgfs}/fix}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}

###################################
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_GEMPAK
Original file line number Diff line number Diff line change
@@ -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}

3 changes: 1 addition & 2 deletions jobs/JGFS_ATMOS_GEMPAK_META
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_gif" -c "base"
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
export FIXgfs=${FIXgfs:-${HOMEgfs}/gempak/fix}
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
export UTILgfs=${UTILgfs:-${HOMEgfs}/util}
@@ -24,7 +23,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
1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC
Original file line number Diff line number Diff line change
@@ -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}"

1 change: 0 additions & 1 deletion jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@ export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
export PARMwmo=${PARMwmo:-${HOMEgfs}/parm/wmo}
export PARMproduct=${PARMproduct:-${HOMEgfs}/parm/product}
export FIXgfs=${FIXgfs:-${HOMEgfs}/fix}

###################################
# Specify NET and RUN Name and model
Loading