Remove non-gfs PARM* variables from ush scripts

Replace non-gfs PARM* variables with their respective PARMgfs/type alternatives. Refs NOAA-EMC#2332
KateFriedman-NOAA · Feb 26, 2024 · e1e7027 · e1e7027
1 parent bfdba46
commit e1e7027
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 26 deletions.
diff --git a/ush/gfs_bufr.sh b/ush/gfs_bufr.sh
@@ -76,9 +76,9 @@ for (( hr = 10#${FSTART}; hr <= 10#${FEND}; hr = hr + 10#${FINT} )); do
 done
 
 #  define input BUFR table file.
-ln -sf "${PARMbufrsnd}/bufr_gfs_${CLASS}.tbl" fort.1
-ln -sf "${STNLIST:-${PARMbufrsnd}/bufr_stalist.meteo.gfs}" fort.8
-ln -sf "${PARMbufrsnd}/bufr_ij13km.txt" fort.7
+ln -sf "${PARMgfs}/product/bufr_gfs_${CLASS}.tbl" fort.1
+ln -sf "${STNLIST:-${PARMgfs}/product/bufr_stalist.meteo.gfs}" fort.8
+ln -sf "${PARMgfs}/product/bufr_ij13km.txt" fort.7
 
 ${APRUN_POSTSND} "${EXECbufrsnd}/${pgm}" < gfsparm > "out_gfs_bufr_${FEND}"
 export err=$?

diff --git a/ush/gfs_bufr_netcdf.sh b/ush/gfs_bufr_netcdf.sh
@@ -105,9 +105,9 @@ do
 done  
 
 #  define input BUFR table file.
-ln -sf $PARMbufrsnd/bufr_gfs_${CLASS}.tbl fort.1
-ln -sf ${STNLIST:-$PARMbufrsnd/bufr_stalist.meteo.gfs} fort.8
-ln -sf $PARMbufrsnd/bufr_ij13km.txt fort.7
+ln -sf ${PARMgfs}/product/bufr_gfs_${CLASS}.tbl fort.1
+ln -sf ${STNLIST:-${PARMgfs}/product/bufr_stalist.meteo.gfs} fort.8
+ln -sf ${PARMgfs}/product/bufr_ij13km.txt fort.7
 
 ${APRUN_POSTSND} "${EXECbufrsnd}/${pgm}" < gfsparm > "out_gfs_bufr_${FEND}"
 export err=$?

diff --git a/ush/parsing_namelists_WW3.sh b/ush/parsing_namelists_WW3.sh
@@ -79,17 +79,17 @@ WW3_namelists(){
 
   if [ $waveMULTIGRID = ".true." ]; then
     # ww3_multi template
-    if [ -f $PARMwave/ww3_multi.inp.tmpl ]; then
-      cp $PARMwave/ww3_multi.inp.tmpl ww3_multi.inp.tmpl
+    if [ -f ${PARMgfs}/wave/ww3_multi.inp.tmpl ]; then
+      cp ${PARMgfs}/wave/ww3_multi.inp.tmpl ww3_multi.inp.tmpl
     fi
     if [ ! -f ww3_multi.inp.tmpl ]; then
       echo "ABNORMAL EXIT: NO TEMPLATE FOR WW3 MULTI INPUT FILE" 
       exit 11 
     fi
   else 
     # ww3_multi template
-    if [ -f $PARMwave/ww3_shel.inp.tmpl ]; then
-      cp $PARMwave/ww3_shel.inp.tmpl ww3_shel.inp.tmpl
+    if [ -f ${PARMgfs}/wave/ww3_shel.inp.tmpl ]; then
+      cp ${PARMgfs}/wave/ww3_shel.inp.tmpl ww3_shel.inp.tmpl
     fi
     if [ ! -f ww3_shel.inp.tmpl ]; then
       echo "ABNORMAL EXIT: NO TEMPLATE FOR WW3 SHEL INPUT FILE" 
@@ -99,18 +99,18 @@ WW3_namelists(){
 
 # Buoy location file
 
-  if [ -f $PARMwave/wave_${NET}.buoys ]
+  if [ -f ${PARMgfs}/wave/wave_${NET}.buoys ]
   then
-    cp $PARMwave/wave_${NET}.buoys buoy.loc
+    cp ${PARMgfs}/wave/wave_${NET}.buoys buoy.loc
   fi
 
   if [ -f buoy.loc ]
   then
     set +x
-    echo "   buoy.loc copied ($PARMwave/wave_${NET}.buoys)."
+    echo "   buoy.loc copied (${PARMgfs}/wave/wave_${NET}.buoys)."
     set_trace
   else
-    echo " FATAL ERROR : buoy.loc ($PARMwave/wave_${NET}.buoys) NOT FOUND"
+    echo " FATAL ERROR : buoy.loc (${PARMgfs}/wave/wave_${NET}.buoys) NOT FOUND"
     exit 12 
   fi
 

diff --git a/ush/radmon_verf_angle.sh b/ush/radmon_verf_angle.sh
@@ -29,8 +29,6 @@ source "${HOMEgfs}/ush/preamble.sh"
 #   Imported Shell Variables:
 #     RADMON_SUFFIX     data source suffix
 #                       defauls to opr
-#     EXECgfs           executable directory
-#     PARMmonitor       parm directory
 #     RAD_AREA          global or regional flag
 #                       defaults to global
 #     TANKverf_rad      data repository
@@ -100,7 +98,7 @@ fi
 
 err=0
 angle_exec=radmon_angle.x
-shared_scaninfo="${shared_scaninfo:-${PARMmonitor}/gdas_radmon_scaninfo.txt}"
+shared_scaninfo="${shared_scaninfo:-${PARMgfs}/monitor/gdas_radmon_scaninfo.txt}"
 scaninfo=scaninfo.txt
 
 #--------------------------------------------------------------------

diff --git a/ush/radmon_verf_time.sh b/ush/radmon_verf_time.sh
@@ -33,8 +33,6 @@ source "${HOMEgfs}/ush/preamble.sh"
 #                       defaults to 1 (on)
 #     RADMON_SUFFIX	data source suffix
 #                       defauls to opr
-#     EXECgfs           executable directory
-#     PARMmonitor       parm data directory
 #     RAD_AREA          global or regional flag
 #                       defaults to global
 #     TANKverf_rad	data repository
@@ -77,7 +75,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 # File names
 
 radmon_err_rpt=${radmon_err_rpt:-${USHgfs}/radmon_err_rpt.sh}
-base_file=${base_file:-${PARMmonitor}/gdas_radmon_base.tar}
+base_file=${base_file:-${PARMgfs}/monitor/gdas_radmon_base.tar}
 report=report.txt
 disclaimer=disclaimer.txt
 

diff --git a/ush/syndat_qctropcy.sh b/ush/syndat_qctropcy.sh
@@ -44,7 +44,6 @@
 #   COMSP  - path to both output jtwc-fnoc file and output tcvitals file (this
 #             tcvitals file is read by subsequent relocation processing and/or
 #             subsequent program SYNDAT_SYNDATA)
-#   PARMSYND  - path to syndat parm field directory
 #   EXECSYND  - path to syndat executable directory
 #   USHSYND   - path to syndat ush directory
 
@@ -75,7 +74,6 @@ TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}/us007003}
 
 USHSYND=${USHSYND:-$HOMEgfs/ush}
 EXECSYND=${EXECSYND:-$HOMEgfs/exec}
-PARMSYND=${PARMSYND:-$HOMEgfs/parm/relo}
 
 slmask=${slmask:-${FIXgfs}/am/syndat_slmask.t126.gaussian}
 copy_back=${copy_back:-YES}
@@ -186,7 +184,7 @@ if [ -n "$files_override" ]; then  # for testing, typically want FILES=F
 fi
 
 echo " &INPUT  RUNID = '${net}_${tmmark}_${cyc}', FILES = $files " > vitchk.inp
-cat $PARMSYND/syndat_qctropcy.${RUN}.parm >> vitchk.inp
+cat ${PARMgfs}/relo/syndat_qctropcy.${RUN}.parm >> vitchk.inp
 
 #  Copy the fixed fields
 

diff --git a/ush/wave_grid_interp_sbs.sh b/ush/wave_grid_interp_sbs.sh
@@ -85,7 +85,7 @@ source "$HOMEgfs/ush/preamble.sh"
   rm -f ${DATA}/output_${ymdh}0000/out_grd.$grdID
 
   if [ ! -f ${DATA}/${grdID}_interp.inp.tmpl ]; then
-    cp $PARMwave/${grdID}_interp.inp.tmpl ${DATA}
+    cp ${PARMgfs}/wave/${grdID}_interp.inp.tmpl ${DATA}
   fi
   ln -sf ${DATA}/${grdID}_interp.inp.tmpl .
 

diff --git a/ush/wave_prnc_cur.sh b/ush/wave_prnc_cur.sh
@@ -65,9 +65,9 @@ rm -f cur_temp[123].nc cur_5min_??.nc "cur_glo_uv_${PDY}_${fext}${fh3}.nc weight
 
 if [ ${flagfirst}  = "T" ]
 then
-  sed -e "s/HDRFL/T/g" ${PARMwave}/ww3_prnc.cur.${WAVECUR_FID}.inp.tmpl > ww3_prnc.inp
+  sed -e "s/HDRFL/T/g" ${PARMgfs}/wave/ww3_prnc.cur.${WAVECUR_FID}.inp.tmpl > ww3_prnc.inp
 else
-  sed -e "s/HDRFL/F/g" ${PARMwave}/ww3_prnc.cur.${WAVECUR_FID}.inp.tmpl > ww3_prnc.inp
+  sed -e "s/HDRFL/F/g" ${PARMgfs}/wave/ww3_prnc.cur.${WAVECUR_FID}.inp.tmpl > ww3_prnc.inp
 fi
 
 rm -f cur.nc