Replace WAVECUR_DID variable with "rtofs" (NOAA-EMC#3337)

This PR completes the remaining requested change that resolves bugzilla 1227. Per NCO guidance in bugzilla 1227 discussion, this PR removes the `WAVECUR_DID` variable and replaces it with hardcoded "rtofs". This matches with how the system handles obsproc paths with the hardcoded "obsproc" text. The other aspects of bugzilla 1227 have been remedied through other PRs that removed the old `COMROOTp2` references and renamed `COM` variables. The waveprep job is currently disabled in `develop` so CI is moot. However, a sanity check was done by running the C48_S2SW CI test on Hera. Resolves NOAA-EMC#1246
jiaruidong2017 · Feb 21, 2025 · ba09498 · ba09498
1 parent 586f658
commit ba09498
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/parm/config/gefs/config.wave b/parm/config/gefs/config.wave
@@ -122,7 +122,6 @@ else
   export WAVEICE_FID=glix_10m
 fi
 
-export WAVECUR_DID=rtofs
 if [[ ${DO_OCN} == "YES" ]]; then
   export WW3CURINP='CPL'
   export WAVECUR_FID=

diff --git a/parm/config/gfs/config.com b/parm/config/gfs/config.com
@@ -36,7 +36,7 @@ echo "BEGIN: config.com"
 #
 if [[ "${RUN_ENVIR:-emc}" == "nco" ]]; then
     COM_OBS_TMPL=$(compath.py "${envir}/obsproc/${obsproc_ver}")'/${RUN}.${YMD}/${HH}/atmos'
-    COM_RTOFS_TMPL=$(compath.py "${envir}/${WAVECUR_DID}/${rtofs_ver}")
+    COM_RTOFS_TMPL=$(compath.py "${envir}/rtofs/${rtofs_ver}")
 else
     COM_OBS_TMPL='${ROTDIR}/${RUN}.${YMD}/${HH}/obs'
     COM_RTOFS_TMPL='${DMPDIR}'

diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave
@@ -152,7 +152,6 @@ else
   export WAVEICE_FID=glix_10m
 fi
 
-export WAVECUR_DID=rtofs
 if [[ ${DO_OCN} == "YES" ]]; then
   export WW3CURINP='CPL'
   export WAVECUR_FID=

diff --git a/scripts/exgfs_wave_prep.sh b/scripts/exgfs_wave_prep.sh
@@ -19,7 +19,7 @@
 #                                                                             #
 # COM inputs:                                                                 #
 #  - ${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}                           #
-#  - ${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f#HHH_prog.nc        #
+#  - ${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f#HHH_prog.nc        #
 #                                                                             #
 # COM outputs:                                                                #
 #  - ${COMOUT_WAVE_PREP}/${RUN}wave.${WAVECUR_FID}.$cycle.cur                 #
@@ -329,19 +329,19 @@ source "${USHgfs}/preamble.sh"
       ymdh_rtofs=$ymdh_beg
 
       if [  "$FHMAX_WAV_CUR" -le 72 ]; then 
-        rtofsfile1="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f024_prog.nc"
-        rtofsfile2="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f048_prog.nc"
-        rtofsfile3="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f072_prog.nc"
+        rtofsfile1="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f024_prog.nc"
+        rtofsfile2="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f048_prog.nc"
+        rtofsfile3="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f072_prog.nc"
         if [ ! -f $rtofsfile1 ] || [ ! -f $rtofsfile2 ] || [ ! -f $rtofsfile3 ]; then 
            #Needed current files are not available, so use RTOFS from previous day 
            export RPDY=$($NDATE -24 ${RPDY}00 | cut -c1-8)
         fi 
       else
-        rtofsfile1="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f096_prog.nc"
-        rtofsfile2="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f120_prog.nc"
-        rtofsfile3="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f144_prog.nc"
-        rtofsfile4="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f168_prog.nc"
-        rtofsfile5="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f192_prog.nc"
+        rtofsfile1="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f096_prog.nc"
+        rtofsfile2="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f120_prog.nc"
+        rtofsfile3="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f144_prog.nc"
+        rtofsfile4="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f168_prog.nc"
+        rtofsfile5="${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_f192_prog.nc"
         if [ ! -f $rtofsfile1 ] || [ ! -f $rtofsfile2 ] || [ ! -f $rtofsfile3 ] ||
             [ ! -f $rtofsfile4 ] || [ ! -f $rtofsfile5 ]; then
             #Needed current files are not available, so use RTOFS from previous day 
@@ -367,8 +367,8 @@ source "${USHgfs}/preamble.sh"
         fhr_rtofs=$(${NHOUR} ${ymdh_rtofs} ${RPDY}00)
         fh3_rtofs=$(printf "%03d" "${fhr_rtofs#0}")
 
-        curfile1h=${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
-        curfile3h=${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
+        curfile1h=${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
+        curfile3h=${COMIN_RTOFS}/rtofs.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
 
         if [ -s ${curfile1h} ]  && [ "${FLGHF}" = "T" ] ; then
           curfile=${curfile1h}
@@ -449,7 +449,7 @@ source "${USHgfs}/preamble.sh"
         set_trace
       fi
 
-      files=$(ls ${WAVECUR_DID}.* 2> /dev/null)
+      files=$(ls rtofs.* 2> /dev/null)
 
       if [ -z "$files" ]
       then

diff --git a/ush/wave_prnc_cur.sh b/ush/wave_prnc_cur.sh
@@ -93,6 +93,6 @@ then
   exit 4
 fi
 
-mv -f current.ww3 ${DATA}/${WAVECUR_DID}.${ymdh_rtofs}
+mv -f current.ww3 ${DATA}/rtofs.${ymdh_rtofs}
 
 cd ${DATA}