Merge pull request #4 from KateFriedman-NOAA/feature/gfsv16b-splitwav…

…epost

Sync with feature/gfsv16b and small updates to split wave post changes

Externals.cfg

@@ -43,7 +43,7 @@ protocol = git
 required = True
 
 [EMC_gfs_wafs]
-tag = gfs_wafs.v6.0.3
+tag = gfs_wafs.v6.0.4
 local_path = sorc/gfs_wafs.fd
 repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git
 protocol = git

env/HERA.env

@@ -38,7 +38,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK="NO"
     export sys_tp="HERA"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt"]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
     export mpmd="--multi-prog"
     export CFP_MP="YES"
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi

env/JET.env

@@ -37,7 +37,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK=${BACK:-"YES"}
     export sys_tp="Cray-CS400"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt"]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
 
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}

env/WCOSS_C.env

@@ -37,7 +37,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export POE=${POE:-"YES"}
     export sys_tp="Cray-XC40"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt"]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd}

env/WCOSS_DELL_P3.env

@@ -45,7 +45,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK=${BACK:-"YES"}
     export sys_tp="Dell-p3"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt"]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
 
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}

gempak/fix/g2varswmo2.tbl

@@ -428,7 +428,7 @@
 010 001 002 000 u-component of current           m s-1                URELC            0  -9999.00
 010 001 003 000 v-component of current           m s-1                VRELC            0  -9999.00
 !
-010 002 000 000 Ice cover                        Proportion           ICE              0  -9999.00
+010 002 000 000 Ice cover                        Proportion           ICEC             0  -9999.00
 010 002 001 000 Ice thickness                    m                    ICET             0  -9999.00
 010 002 002 000 Direction of ice drift           Degree true          DRCTI            0  -9999.00
 010 002 003 000 Speed of ice drift               m s-1                SPEDI            0  -9999.00

jobs/rocoto/anal.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ANALYSIS
+$HOMEgfs/jobs/JGLOBAL_ATMOS_ANALYSIS
 status=$?
 exit $status

jobs/rocoto/analcalc.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ANALCALC
+$HOMEgfs/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
 status=$?
 exit $status

jobs/rocoto/analdiag.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ANALDIAG
+$HOMEgfs/jobs/JGDAS_ATMOS_ANALYSIS_DIAG
 status=$?
 exit $status

jobs/rocoto/ecen.sh

@@ -16,7 +16,7 @@ for fhr in $fhrlst; do
     export FHOUT_ECEN=$fhr
     export job=ecen${fhr}
 
-    $HOMEgfs/jobs/JGDAS_ENKF_RECENTER
+    $HOMEgfs/jobs/JGDAS_ENKF_ECEN
     status=$?
     [[ $status -ne 0 ]] && exit $status
 

jobs/rocoto/echgres.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGDAS_CHGRES_FORENKF
+$HOMEgfs/jobs/JGDAS_ATMOS_CHGRES_FORENKF
 status=$?
 exit $status

jobs/rocoto/ediag.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ENKF_ANALDIAG
+$HOMEgfs/jobs/JGDAS_ENKF_DIAG
 status=$?
 exit $status

jobs/rocoto/eobs.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ENKF_SELECT_OBS
+$HOMEgfs/jobs/JGDAS_ENKF_SELECT_OBS
 status=$?
 exit $status

jobs/rocoto/eomg.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ENKF_INNOVATE_OBS
+$HOMEgfs/jobs/JGDAS_ENKF_INNOVATE_OBS
 status=$?
 exit $status

jobs/rocoto/esfc.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGDAS_ENKF_SURFACE
+$HOMEgfs/jobs/JGDAS_ENKF_SFC
 status=$?
 exit $status

jobs/rocoto/eupd.sh

@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_ENKF_UPDATE
+$HOMEgfs/jobs/JGDAS_ENKF_UPDATE
 status=$?
 exit $status

parm/config/config.fcst

@@ -241,6 +241,10 @@ elif [[ "$CDUMP" == "gfs" ]] ; then # GFS cycle specific parameters
     # Write each restart file in 16 small files to save time
     export io_layout="4,4"
 
+    # Set number of layers from the top over 
+    # which two delta-Z filter is applied
+    export n_sponge=42
+
     # Debug load balancing 
     #export KEEPDATA="YES"
     #export ESMF_RUNTIME_PROFILE=ON

parm/config/config.resources

@@ -68,15 +68,15 @@ elif [ $step = "wavepostsbs" ]; then
 
 elif [ $step = "wavepostbndpnt" ]; then
 
-    export wtime_wavepostbndpnt="02:00:00"
+    export wtime_wavepostbndpnt="03:00:00"
     export npe_wavepostbndpnt=56
     export nth_wavepostbndpnt=1
     export npe_node_wavepostbndpnt=$(echo "$npe_node_max / $nth_wavepostbndpnt" | bc)
     export NTASKS=${npe_wavepostbndpnt}
 
 elif [ $step = "wavepostpnt" ]; then
 
-    export wtime_wavepostpnt="02:00:00"
+    export wtime_wavepostpnt="03:00:00"
     export npe_wavepostpnt=56
     export nth_wavepostpnt=1
     export npe_node_wavepostpnt=$(echo "$npe_node_max / $nth_wavepostpnt" | bc)

parm/config/config.vrfy

@@ -103,7 +103,7 @@ if [ $VRFYRAD = "YES" -o $VRFYMINMON = "YES" -o $VRFYOZN = "YES" ]; then
 
         export RADMON_SUFFIX=$PSLOT
         export TANKverf="$NOSCRUB/monitor/radmon"
-        export VRFYRADSH="$HOMEgfs/jobs/JGDAS_VERFRAD"
+        export VRFYRADSH="$HOMEgfs/jobs/JGDAS_ATMOS_VERFRAD"
 
     fi
 
@@ -113,9 +113,9 @@ if [ $VRFYRAD = "YES" -o $VRFYMINMON = "YES" -o $VRFYOZN = "YES" ]; then
         export MINMON_SUFFIX=$PSLOT
         export M_TANKverf="$NOSCRUB/monitor/minmon"
         if [[ "$CDUMP" = "gdas" ]] ; then
-            export VRFYMINSH="$HOMEgfs/jobs/JGDAS_VMINMON"
+            export VRFYMINSH="$HOMEgfs/jobs/JGDAS_ATMOS_VMINMON"
         elif [[ "$CDUMP" = "gfs" ]] ; then
-            export VRFYMINSH="$HOMEgfs/jobs/JGFS_VMINMON"
+            export VRFYMINSH="$HOMEgfs/jobs/JGFS_ATMOS_VMINMON"
         fi
 
     fi
@@ -126,7 +126,7 @@ if [ $VRFYRAD = "YES" -o $VRFYMINMON = "YES" -o $VRFYOZN = "YES" ]; then
         export HOMEgfs_ozn="$HOMEgfs"
         export OZNMON_SUFFIX=$PSLOT
         export TANKverf_ozn="$NOSCRUB/monitor/oznmon"
-        export VRFYOZNSH="$HOMEgfs/jobs/JGDAS_VERFOZN"
+        export VRFYOZNSH="$HOMEgfs/jobs/JGDAS_ATMOS_VERFOZN"
 
     fi
 

parm/config/config.wafsblending0p25

@@ -11,6 +11,4 @@ export COMIN=$COMINatmos
 export COMOUT=$COMOUTatmos
 export SENDCOM="YES"
 
-export HOURLY="NO"
-
 echo "END: config.wafsblending0p25"

parm/config/config.wafsgrib20p25

@@ -11,6 +11,4 @@ export COMIN=$COMINatmos
 export COMOUT=$COMOUTatmos
 export SENDCOM="YES"
 
-export HOURLY="NO"
-
 echo "END: config.wafsgrib20p25"

scripts/exgfs_wave_nawips.sh

@@ -30,6 +30,7 @@ if [ ! -d $DATA ];then
 fi
 
 cd $DATA
+cp $GEMwave/fix/g2varswmo2.tbl .
 
 cpyfil=gds
 garea=dset
@@ -59,20 +60,37 @@ while [ $fhcnt -le $FHMAX_WAV ]; do
                grdIDout='gfswavewc10m' ;;
       glo_30m) grdIDin='global.0p25'
                grdIDout='gfswavegl30m' ;;
-#      ao_9km)  grdIDin='arctic.9km'
-#               grdIDout='gfswavea9k' ;;
-      glo_10m) grdIDin='global.0p25'   
-               grdIDout='gfswaveg16k' ;;
-      gso_15m) grdIDin='gsouth.0p25' 
-               grdIDout='gfswaves25k' ;;
       *)       gridIDin= 
                grdIDout= ;;
     esac
     GRIBIN=$COMIN/gridded/$RUNwave.$cycle.$grdIDin.f${fhr}.grib2
     GRIBIN_chk=$GRIBIN.idx
-    if [ "$grdIDin" = "global.0p25" ] && [ "$grid" = "glo_30m" ]; then
-      #cp $GRIBIN  tempgf.$grdID.f${fhr}
-      #cp $GRIBIN tempgf.$grdIDin.f${fhr}
+
+    icnt=1
+    while [ $icnt -lt 1000 ]; do
+      if [ -r $GRIBIN_chk ] ; then
+        break
+      else
+        let "icnt=icnt+1"
+        sleep 20
+      fi
+      if [ $icnt -ge $maxtries ]; then
+        msg="ABORTING after 5 minutes of waiting for $GRIBIN."
+        postmsg "$jlogfile" "$msg"
+        echo ' '
+        echo '**************************** '
+        echo '*** ERROR : NO GRIB FILE *** '
+        echo '**************************** '
+        echo ' '
+        echo $msg
+        [[ "$LOUD" = YES ]] && set -x
+        echo "$RUNwave $grdID ${fhr} prdgen $date $cycle : GRIB file missing." >> $wavelog
+        err=1;export err;${errchk} || exit ${err}
+      fi
+    done
+
+    #if [ "$grdIDin" = "global.0p25" && "$grid" = "glo_30m" ]; then
+    if [ "$grdIDin" = "global.0p25" ]; then
       $WGRIB2 -lola 0:720:0.5 -90:361:0.5 gribfile.$grdIDout.f${fhr}  grib \
                                           $GRIBIN 1> out 2>&1
       OK=$?
@@ -97,28 +115,7 @@ while [ $fhcnt -le $FHMAX_WAV ]; do
     echo $GRIBIN  
 
     GEMGRD=${grdIDout}_${PDY}${cyc}f${fhr}
-    icnt=1
-    while [ $icnt -lt 1000 ]; do
-      if [ -r $GRIBIN_chk ] ; then
-        break
-      else
-        let "icnt=icnt+1"
-        sleep 20
-      fi
-      if [ $icnt -ge $maxtries ]; then
-        msg="ABORTING after 5 minutes of waiting for $GRIBIN."
-        postmsg "$jlogfile" "$msg"
-        echo ' '
-        echo '**************************** '
-        echo '*** ERROR : NO GRIB FILE *** '
-        echo '**************************** '
-        echo ' '
-        echo $msg
-        [[ "$LOUD" = YES ]] && set -x
-        echo "$RUNwave $grdID ${fhr} prdgen $date $cycle : GRIB file missing." >> $wavelog
-        err=1;export err;${errchk} || exit ${err}
-      fi
-    done
+
     cp $GRIBIN grib_$grid
 
     startmsg

sorc/checkout.sh

@@ -95,7 +95,7 @@ if [[ ! -d gfs_wafs.fd ]] ; then
     rm -f ${topdir}/checkout-gfs_wafs.log
     git clone --recursive https://github.com/NOAA-EMC/EMC_gfs_wafs.git gfs_wafs.fd >> ${topdir}/checkout-gfs_wafs.log 2>&1
     cd gfs_wafs.fd
-    git checkout gfs_wafs.v6.0.3
+    git checkout gfs_wafs.v6.0.4
     cd ${topdir}
 else
     echo 'Skip.  Directory gfs_wafs.fd already exists.'