Issue NOAA-EMC#94 adding waves-prdgen to gfsv16

RobertoPadilla-NOAA · Aug 19, 2020 · 1e76093 · 1e76093
1 parent c7a708f
commit 1e76093
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/jobs/JWAVE_GEMPAK b/jobs/JWAVE_GEMPAK
@@ -32,10 +32,10 @@ export SENDCOM=${SENDCOM:-YES}
 export SENDDBN=${SENDDBN:-YES}
 export SENDECF=${SENDECF:-YES}
 
-export COMINwave=${COMINwave:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/gempak}
-#export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
-#export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
+#export COMINwave=${COMINwave:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}}
+#export COMOUTwave=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/gempak}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
 
 if [ ! -f $COMOUT ] ; then
   mkdir -p -m 775 $COMOUT

diff --git a/jobs/JWAVE_PRDGEN_BULLS b/jobs/JWAVE_PRDGEN_BULLS
@@ -43,8 +43,8 @@ module load modulefile_gfswave_prdgen.wcoss_dell_p3
 ###################################
 # Set COM Paths and GETGES environment
 ###################################
-export COMINwave=${COMINwave:-${COMROOT:?}/${COMPONENT}/${envir}}
-export COMOUTwave=${COMOUTwave:-${COMROOT:?}/${COMPONENT}/${envir}}
+#export COMINwave=${COMINwave:-${COMROOT:?}/${COMPONENT}/${envir}}
+#export COMOUTwave=${COMOUTwave:-${COMROOT:?}/${COMPONENT}/${envir}}
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
 export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
 export PCOM=${PCOM:-${COMOUT}/wmo}

diff --git a/jobs/JWAVE_PRDGEN_GRIDDED b/jobs/JWAVE_PRDGEN_GRIDDED
@@ -53,10 +53,10 @@ module load modulefile_gfswave_prdgen.wcoss_dell_p3
 ###################################
 # Set COM Paths and GETGES environment
 ###################################
-export COMINwave=${COMINwave:-${COMROOT:?}/${COMPONENT}/${envir}}
-export COMOUTwave=${COMOUTwave:-${COMROOT:?}/${COMPONENT}/${envir}}
-#export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
-#export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
+#export COMINwave=${COMINwave:-${COMROOT:?}/${COMPONENT}/${envir}}
+#export COMOUTwave=${COMOUTwave:-${COMROOT:?}/${COMPONENT}/${envir}}
+export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
 export PCOM=${PCOM:-${COMOUT}/wmo}
 
 if [ $SENDCOM = YES ]; then

diff --git a/scripts/exwave_nawips.sh.ecf b/scripts/exwave_nawips.sh.ecf
@@ -49,7 +49,7 @@ while [ $fhcnt -le $FHMAX_WAV ]; do
       *)       gridIDin= 
                grdIDout= ;;
     esac
-    GRIBIN=$COMINwave/$RUNwave.$cycle.$grdIDin.f${fhr}.grib2
+    GRIBIN=$COMIN/$RUNwave.$cycle.$grdIDin.f${fhr}.grib2
     GRIBIN_chk=$GRIBIN.idx
     if [ "$grdIDin" = "global.0p25" ]; then
       #cp $GRIBIN  tempgf.$grdID.f${fhr}

diff --git a/scripts/exwave_prdgen_bulls.sh.ecf b/scripts/exwave_prdgen_bulls.sh.ecf
@@ -48,11 +48,11 @@
 
 # 1.  Get necessary files
  set +x
- echo "   Copying bulletins from $COMINwave"
+ echo "   Copying bulletins from $COMIN"
  [[ "$LOUD" = YES ]] && set -x
 
 # 1.a Link the input file and untar it
- BullIn=$COMINwave/${RUNwave}.$cycle.cbull_tar
+ BullIn=$COMIN/${RUNwave}.$cycle.cbull_tar
  if [ -f $BullIn ]; then
    cp $BullIn cbull.tar
  else

diff --git a/scripts/exwave_prdgen_gridded.sh.ecf b/scripts/exwave_prdgen_gridded.sh.ecf
@@ -72,7 +72,7 @@
        glo_30m) grdID='global.0p25' ;;
        *)       grdID= ;;
      esac
-     GRIBIN=$COMINwave/$RUNwave.$cycle.$grdID.f${fhr}.grib2
+     GRIBIN=$COMIN/$RUNwave.$cycle.$grdID.f${fhr}.grib2
      GRIBIN_chk=$GRIBIN.idx
 
      icnt=1