Issue #5 - Sync merge branch 'feature/gfsv16b' into port2orion

* feature/gfsv16b: modified: checkout.sh to checkout model tag GFS.v16.0.9 Issue #1: set g2o1_obtype_conus_sfc in config.metp to "ONLYSF ADPUPA" Issue #1: update sorc/checkout.sh to checkout verif_global_v1.9.0 further updated exglobal_fcst_nemsfv3gfs.sh to use restart_wave directory for gdas cycle as well modified: jobs/JGLOBAL_FORECAST parm/config/config.wave scripts/exglobal_fcst_nemsfv3gfs.sh add WW3 break-point restart capability and clean up forecast script. Conflicts: sorc/checkout.sh
NOAA-EMC · Jul 9, 2020 · 01a64ac · 01a64ac
2 parents 5b6ad08 + d57fc02
commit 01a64ac
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 67 deletions.
diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
@@ -70,14 +70,6 @@ if [ $RUN_ENVIR = "nco" ]; then
     export RSTDIR=${GESROOT:?}/$envir
 fi
 
-# Source additional configs
-if [ ${DO_WAVE:-"NO"} = "YES" ]; then
-# WAVE component directory
-  export WAV_MOD_ID=${WAV_MOD_ID:-wave}
-  export COMINWW3=${COMINWW3:-${ROTDIR:?}}
-  export COMOUTWW3=${COMOUTWW3:-${ROTDIR:?}}
-fi
-
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################

diff --git a/parm/config/config.metp b/parm/config/config.metp
@@ -52,7 +52,7 @@ if [ "$CDUMP" = "gfs" ] ; then
         export g2o1_obtype_upper_air="ADPUPA"
         export g2o1_grid_upper_air="G003"
         export g2o1_fhr_out_upper_air="6"
-        export g2o1_obtype_conus_sfc="ONLYSF"
+        export g2o1_obtype_conus_sfc="ONLYSF ADPUPA"
         export g2o1_grid_conus_sfc="G104"
         export g2o1_fhr_out_conus_sfc="3"
         export g2o1_prepbufr_data_runhpss="YES"

diff --git a/parm/config/config.wave b/parm/config/config.wave
@@ -50,12 +50,10 @@ export wavepostGRD='gnh_10m aoc_9km gsh_15m' # Native grids that will be post-pr
 export CDATE=${PDY}${cyc}
 
 # The start time reflects the number of hindcast hours prior to the cycle initial time
-if [ "$CDUMP" = "gdas" ]
-then
+if [ "$CDUMP" = "gdas" ]; then
   export FHMAX_WAV=${FHMAX:-9}
 else
-  FHMAX_GFS="FHMAX_GFS_${cyc}"
-  export FHMAX_WAV=${!FHMAX_GFS}
+  export FHMAX_WAV=$FHMAX_GFS
 fi
 export WAVHINDH=${WAVHINDH:-0}
 export FHMIN_WAV=${FHMIN_WAV:-0}
@@ -72,13 +70,11 @@ export FHINCP_WAV=`expr $DTPNT_WAV / 3600`
 export OUTPARS_WAV="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA"
 
 # Restart file config
-if [ "$CDUMP" = "gdas" ]
-then
+if [ "$CDUMP" = "gdas" ]; then
   WAVNCYC=4
   WAVHCYC=6
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-48} # RTOFS forecasts only out to 8 days
-elif [ ${gfs_cyc} -ne 0 ]
-then 
+elif [ ${gfs_cyc} -ne 0 ]; then 
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-192} # RTOFS forecasts only out to 8 days
   WAVHCYC=`expr 24 / ${gfs_cyc}`
 else

diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh
@@ -148,27 +148,38 @@ if [ ! -d $DATA ]; then
 fi
 cd $DATA || exit 8
 mkdir -p $DATA/INPUT
+
+if [ $cplwav = ".true." ]; then 
+    if [ $CDUMP = "gdas" ]; then
+        RSTDIR_WAVE=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/restart
+    else
+        RSTDIR_WAVE=${RSTDIR_WAVE:-$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/restart}
+    fi
+    if [ ! -d $RSTDIR_WAVE ]; then mkdir -p $RSTDIR_WAVE ; fi
+    $NLN $RSTDIR_WAVE restart_wave
+fi
+
 if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 ]; then
-    RSTDIR_TMP=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/RERUN_RESTART
-    if [ ! -d $RSTDIR_TMP ]; then mkdir -p $RSTDIR_TMP ; fi
-    $NLN $RSTDIR_TMP RESTART
+    RSTDIR_ATM=${RSTDIR:-$ROTDIR}/${CDUMP}.${PDY}/${cyc}/RERUN_RESTART
+    if [ ! -d $RSTDIR_ATM ]; then mkdir -p $RSTDIR_ATM ; fi
+    $NLN $RSTDIR_ATM RESTART
 else
     mkdir -p $DATA/RESTART
 fi
 
 #-------------------------------------------------------
 # determine if restart IC exists to continue from a previous forecast
 RERUN="NO"
-filecount=$(find $RSTDIR_TMP -type f | wc -l) 
+filecount=$(find $RSTDIR_ATM -type f | wc -l) 
 if [ $CDUMP = "gfs" -a $rst_invt1 -gt 0 -a $FHMAX -gt $rst_invt1 -a $filecount -gt 10 ]; then
     reverse=$(echo "${restart_interval[@]} " | tac -s ' ')
     for xfh in $reverse ; do
         yfh=$((xfh-(IAU_OFFSET/2)))
         SDATE=$($NDATE +$yfh $CDATE)
         PDYS=$(echo $SDATE | cut -c1-8)
         cycs=$(echo $SDATE | cut -c9-10)
-        flag1=$RSTDIR_TMP/${PDYS}.${cycs}0000.coupler.res
-        flag2=$RSTDIR_TMP/coupler.res
+        flag1=$RSTDIR_ATM/${PDYS}.${cycs}0000.coupler.res
+        flag2=$RSTDIR_ATM/coupler.res
         if [ -s $flag1 ]; then
             CDATE_RST=$SDATE          
             [[ $RERUN = "YES" ]] && break
@@ -311,12 +322,14 @@ EOF
     export warm_start=".true."
     PDYT=$(echo $CDATE_RST | cut -c1-8)
     cyct=$(echo $CDATE_RST | cut -c9-10)
-    for file in $(ls $RSTDIR_TMP/${PDYT}.${cyct}0000.*); do
+    for file in $(ls $RSTDIR_ATM/${PDYT}.${cyct}0000.*); do
       file2=$(echo $(basename $file))
       file2=$(echo $file2 | cut -d. -f3-) 
       $NLN $file $DATA/INPUT/$file2
     done
 
+    hour_rst=`$NHOUR $CDATE_RST $CDATE`
+    IAU_FHROT=$((IAU_OFFSET+hour_rst))         
     if [ $DOIAU = "YES" ]; then
       IAUFHRS=-1         
       IAU_DELTHRS=0
@@ -395,57 +408,61 @@ if [ $IAER -gt 0 ] ; then
   done
 fi
 
-#### Copy over WW3 inputs
+#-------------wavewave----------------------
 if [ $cplwav = ".true." ]; then
-# Link WW3 files
-  for file in $(ls $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/rmp_src_to_dst_conserv_*) ; do
+#-------------wavewave----------------------
+
+  for file in $(ls $ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/rmp_src_to_dst_conserv_*) ; do
     $NLN $file $DATA/
   done
-  $NLN $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/ww3_multi.${COMPONENTwave}${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp
-        # Check for expected wave grids for this run
+  $NLN $ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/ww3_multi.${CDUMP}wave${WAV_MEMBER}.${cycle}.inp $DATA/ww3_multi.inp
+
   array=($WAVECUR_FID $WAVEICE_FID $WAVEWND_FID $waveuoutpGRD $waveGRD $waveesmfGRD $wavesbsGRD $wavepostGRD $waveinterpGRD)
   grdALL=`printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' '`
   for wavGRD in ${grdALL}; do
-    # Wave IC (restart) file must exist for warm start on this cycle, if not wave model starts from flat ocean
-    # For IAU needs to use sPDY for adding IAU backup of 3h
-    $NLN $COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.mod_def.$wavGRD $DATA/mod_def.$wavGRD
+    $NLN $ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/${CDUMP}wave.mod_def.$wavGRD $DATA/mod_def.$wavGRD
   done
-  # Wave IC (restart) interval assumes 4 daily cycles (restarts only written by gdas cycle) 
-  # WAVHCYC needs to be consistent with restart write interval in ww3_multi.inp or will FAIL
+
   WAVHCYC=${WAVHCYC:-6}
   WRDATE=`$NDATE -${WAVHCYC} $CDATE`
   WRPDY=`echo $WRDATE | cut -c1-8`
   WRcyc=`echo $WRDATE | cut -c9-10`
-  WRDIR=$COMINWW3/${COMPONENTRSTwave}.${WRPDY}/${WRcyc}/restart
-  datwave=$COMOUTWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/
-  wavprfx=${COMPONENTwave}${WAV_MEMBER}
+  WRDIR=$ROTDIR/gdaswave.${WRPDY}/${WRcyc}/restart
+  datwave=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/
+  wavprfx=${CDUMP}wave${WAV_MEMBER}
+
   for wavGRD in $waveGRD ; do
-    # Link wave IC for current cycle
-    $NLN ${WRDIR}/${sPDY}.${scyc}0000.restart.${wavGRD} $DATA/restart.${wavGRD}
+    if [ $RERUN = "NO" ]; then
+      $NLN ${WRDIR}/${sPDY}.${scyc}0000.restart.${wavGRD} $DATA/restart.${wavGRD}
+    else
+      $NLN ${RSTDIR_WAVE}/${PDYT}.${cyct}0000.restart.${wavGRD} $DATA/restart.${wavGRD}
+    fi
     eval $NLN $datwave/${wavprfx}.log.${wavGRD}.${PDY}${cyc} log.${wavGRD}
   done
+
   if [ "$WW3ICEINP" = "YES" ]; then
-    wavicefile=$COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.${WAVEICE_FID}.${cycle}.ice
+    wavicefile=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/${CDUMP}wave.${WAVEICE_FID}.${cycle}.ice
     if [ ! -f $wavicefile ]; then
       echo "ERROR: WW3ICEINP = ${WW3ICEINP}, but missing ice file"
       echo "Abort!"
       exit 1
     fi
     $NLN ${wavicefile} $DATA/ice.${WAVEICE_FID}
   fi
+
   if [ "$WW3CURINP" = "YES" ]; then
-    wavcurfile=$COMINWW3/${COMPONENTwave}.${PDY}/${cyc}/rundata/${COMPONENTwave}.${WAVECUR_FID}.${cycle}.cur
+    wavcurfile=$ROTDIR/${CDUMP}wave.${PDY}/${cyc}/rundata/${CDUMP}wave.${WAVECUR_FID}.${cycle}.cur
     if [ ! -f $wavcurfile ]; then
       echo "ERROR: WW3CURINP = ${WW3CURINP}, but missing current file"
       echo "Abort!"
       exit 1
     fi
     $NLN $wavcurfile $DATA/current.${WAVECUR_FID}
   fi
-# Link output files
+
+  # Link output files
   cd $DATA
   eval $NLN $datwave/${wavprfx}.log.mww3.${PDY}${cyc} log.mww3
-# Loop for gridded output (uses FHINC)
   fhr=$FHMIN_WAV
   while [ $fhr -le $FHMAX_WAV ]; do
     YMDH=`$NDATE $fhr $CDATE`
@@ -460,7 +477,8 @@ if [ $cplwav = ".true." ]; then
       fi
     fhr=$((fhr+FHINC))
   done
-# Loop for point output (uses DTPNT)
+
+  # Loop for point output (uses DTPNT)
   fhr=$FHMIN_WAV
   while [ $fhr -le $FHMAX_WAV ]; do
     YMDH=`$NDATE $fhr $CDATE`
@@ -470,7 +488,11 @@ if [ $cplwav = ".true." ]; then
       FHINC=$FHINCP_WAV
     fhr=$((fhr+FHINC))
   done
+
+#-------------wavewave----------------------
 fi
+#-------------wavewave----------------------
+
 
 # inline post fix files
 if [ $WRITE_DOPOST = ".true." ]; then
@@ -1294,7 +1316,6 @@ if [ $SEND = "YES" ]; then
   if [ $CDUMP = "gdas" -a $rst_invt1 -gt 0 ]; then
     cd $DATA/RESTART
     mkdir -p $memdir/RESTART
-
     for rst_int in $restart_interval ; do
      if [ $rst_int -ge 0 ]; then
        RDATE=$($NDATE +$rst_int $CDATE)
@@ -1303,14 +1324,6 @@ if [ $SEND = "YES" ]; then
        for file in $(ls ${rPDY}.${rcyc}0000.*) ; do
          $NCP $file $memdir/RESTART/$file
        done
-       if [ $cplwav = ".true." ]; then
-         WRDIR=$COMOUTWW3/${COMPONENTRSTwave}.${PDY}/${cyc}/restart
-         mkdir -p ${WRDIR}
-         for wavGRD in $waveGRD ; do
-         # Copy wave IC for the next cycle
-           $NCP $DATA/${rPDY}.${rcyc}0000.restart.${wavGRD} ${WRDIR}
-         done
-       fi
      fi
     done
     if [ $DOIAU = "YES" ] || [ $DOIAU_coldstart = "YES" ]; then
@@ -1325,18 +1338,8 @@ if [ $SEND = "YES" ]; then
       for file in $(ls ${rPDY}.${rcyc}0000.*) ; do
          $NCP $file $memdir/RESTART/$file
       done
-      if [ $cplwav = ".true." ]; then
-        WRDIR=$COMOUTWW3/${COMPONENTRSTwave}.${PDY}/${cyc}/restart/
-        mkdir -p ${WRDIR}
-        for wavGRD in $waveGRD ; do
-        # Copy wave IC for the next cycle
-           $NCP $DATA/${rPDY}.${rcyc}0000.restart.${wavGRD} ${WRDIR}
-        done
-      fi
     fi
-
   fi
-
 fi
 
 #------------------------------------------------------------------

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -7,10 +7,9 @@ echo $topdir
 echo fv3gfs checkout ...
 if [[ ! -d fv3gfs.fd ]] ; then
     rm -f ${topdir}/checkout-fv3gfs.log
-    #git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
-    git clone https://github.com/DusanJovic-NOAA/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
+    git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
     cd fv3gfs.fd
-    git checkout orion_gfs.v16
+    git checkout  GFS.v16.0.9
     git submodule update --init --recursive
     cd ${topdir}
 else
@@ -81,7 +80,7 @@ if [[ ! -d verif-global.fd ]] ; then
     rm -f ${topdir}/checkout-verif-global.log
     git clone --recursive https://github.com/NOAA-EMC/EMC_verif-global.git verif-global.fd >> ${topdir}/checkout-verif-global.log 2>&1
     cd verif-global.fd
-    git checkout verif_global_v1.8.1
+    git checkout verif_global_v1.9.0
     cd ${topdir}
 else
     echo 'Skip. Directory verif-global.fd already exist.'