Compared local files in NCO implementation directory with release/gfs…

….v16.0.0 branch, changes made by NCO(Jen Yang) in the following files are either accepted or rejected. use EMC's updated version modified: jobs/JGFS_ATMOS_POSTSND Use NCO's updated version modified: jobs/JGLOBAL_FORECAST modified: jobs/JGLOBAL_WAVE_GEMPAK modified: jobs/JGLOBAL_WAVE_POST_BNDPNT modified: jobs/JGLOBAL_WAVE_POST_PNT modified: jobs/JGLOBAL_WAVE_POST_SBS modified: jobs/JGLOBAL_WAVE_PRDGEN_BULLS modified: jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED modified: parm/config/config.base.nco.static Updated by both NCO and EMC modified: parm/config/config.wave Updated gldas tag to gldas_gfsv16_release.v1.12.0 modified: sorc/checkout.sh
jkhender · Nov 20, 2020 · 759cf33 · 759cf33
1 parent f39ea0c
commit 759cf33
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 93 deletions.
diff --git a/jobs/JGFS_ATMOS_POSTSND b/jobs/JGFS_ATMOS_POSTSND
@@ -1,88 +1,120 @@
-#!/bin/sh
+#!/bin/ksh
+set -x
+
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 export PS4='$SECONDS + '
 date
-set -xa
-########################################
-# Runs GFS BUFR SOUNDINGS
-########################################
 
-############################
-export MP_EUIDEVELOP=min
-export KMP_STACKSIZE=2048m
-export MPICH_ALLTOALL_THROTTLE=0
-export MP_SINGLE_THREAD=yes
-export MP_EAGER_LIMIT=65536
-export MP_USE_BULK_XFER=no
-export MP_COLLECTIVE_OFFLOAD=no
-export MP_SHARED_MEMORY=yes
-export MP_MPILIB=mpich2
-export MP_LABELIO=yes
-####################################
-# obtain unique process id (pid) and make temp directories
+#############################
+# Source relevant config files
+#############################
+configs="base postsnd"
+export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
+config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
+for config in $configs; do
+    . $config_path/config.$config
+    status=$?
+    [[ $status -ne 0 ]] && exit $status
+done
+
+
+##########################################
+# Source machine runtime environment
+##########################################
+. $HOMEgfs/env/${machine}.env postsnd
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+
+##############################################
+# Obtain unique process id (pid) and make temp directory
+##############################################
+export pid=${pid:-$$}
+export outid=${outid:-"LL$job"}
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
-mkdir $DATA
-cd $DATA 
+mkdir -p $DATA
+cd $DATA
+
 
-####################################
+##############################################
+# Run setpdy and initialize PDY variables
+##############################################
+export cycle="t${cyc}z"
+setpdy.sh
+. ./PDY
+
+##############################################
 # Determine Job Output Name on System
-####################################
-export outid="LL$job"
+##############################################
 export pgmout="OUTPUT.${pid}"
+export pgmerr=errfile
 
-export cycle=t${cyc}z 
 
-export NET=${NET:-gfs}
-export RUN=${RUN:-gfs}
-export model=${model:-gfs}
-export COMPONENT=${COMPONENT:-atmos}
+##############################################
+# Set variables used in the exglobal script
+##############################################
+export CDATE=${CDATE:-${PDY}${cyc}}
+export CDUMP=${CDUMP:-${RUN:-"gfs"}}
+if [ $RUN_ENVIR = "nco" ]; then
+    export ROTDIR=${COMROOT:?}/$NET/$envir
+fi
 
-export SENDDBN=${SENDDBN:-NO}
-export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
-# JY -  added the following on 10/27, need to verify
-export CDATE=$PDY$cyc
-export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
-. ${EXPDIR}/config.base
-. ${EXPDIR}/config.postsnd
-. ${HOMEgfs}/env/WCOSS_DELL_P3.env postsnd
-export HOMEbufrsnd=$HOMEgfs
+########################################
+# Runs GFS BUFR SOUNDINGS
+########################################
 
+export model=${model:-gfs}
+export SENDCOM=${SENDCOM:-YES}
+export SENDDBN=${SENDDBN:-YES}
+export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 ###################################
-# Set up the UTILITIES
+# Set up the source directories
 ###################################
 
-export HOMEbufrsnd=${HOMEbufrsnd:-$NWROOT/gfs.${gfs_ver}}
+export HOMEbufrsnd=${HOMEbufrsnd:-$HOMEgfs}
 export EXECbufrsnd=${EXECbufrsnd:-$HOMEbufrsnd/exec}
 export FIXbufrsnd=${FIXbufrsnd:-$HOMEbufrsnd/fix/product}
 export PARMbufrsnd=${PARMbufrsnd:-$HOMEbufrsnd/parm/product}
 export USHbufrsnd=${USHbufrsnd:-$HOMEbufrsnd/ush}
 export SCRbufrsnd=${SCRbufrsnd:-$HOMEbufrsnd/scripts}
 
-# Run setpdy and initialize PDY variables
-setpdy.sh
-. ./PDY
-
 ##############################
 # Define COM Directories
 ##############################
-export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
-export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
+export COMIN=${COMIN:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos}
+export COMOUT=${COMOUT:-$ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos}
 export pcom=${pcom:-${COMOUT}/wmo}
 export COMAWP=${COMAWP:-${COMOUT}/gempak}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
-mkdir -p $COMOUT $pcom $COMAWP
+[[ ! -d $COMOUT ]] && mkdir -p $COMOUT
+[[ ! -d $pcom ]] && mkdir -p $pcom
+[[ ! -d $COMAWP ]] && mkdir -p $COMAWP
+
 env
 
 ########################################################
 # Execute the script.
 $SCRbufrsnd/exgfs_atmos_postsnd.sh
-########################################################
+status=$?
+[[ $status -ne 0 ]] && exit $status
 
+
+##############################################
+# End JOB SPECIFIC work
+##############################################
+
+##############################################
+# Final processing
+##############################################
 if [ -e "$pgmout" ] ; then
   cat $pgmout
 fi
 
+msg="ENDED NORMALLY."
+postmsg "$jlogfile" "$msg"
+
 ##########################################
 # Remove the Temporary working directory
 ##########################################
@@ -91,3 +123,4 @@ cd $DATAROOT
 
 date
 exit 0
+
diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
@@ -5,36 +5,6 @@ export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 export PS4='$SECONDS + '
 date
 
-# JY 10/27/20, move down the block as ROTDIR and PDY is not defined before the config.base (ROTDIR) or config.wave (PDY) is sourced
-##############################
-## Source relevant config files
-##############################
-#configs="base fcst"
-#export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
-#config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
-#for config in $configs; do
-#    . $config_path/config.$config
-#    status=$?
-#    [[ $status -ne 0 ]] && exit $status
-#done
-## Source additional configs
-#if [ ${DO_WAVE:-"NO"} = "YES" ]; then
-#  configs="wave"
-#  for config in $configs; do
-#    . $config_path/config.$config
-#    status=$?
-#    [[ $status -ne 0 ]] && exit $status
-#  done
-#fi
-
-###########################################
-## Source machine runtime environment
-###########################################
-#. $HOMEgfs/env/${machine}.env fcst
-#status=$?
-#[[ $status -ne 0 ]] && exit $status
-#
-
 ##############################################
 # Obtain unique process id (pid) and make temp directory
 ##############################################
@@ -71,7 +41,6 @@ if [ $RUN_ENVIR = "nco" ]; then
     export RSTDIR=${GESROOT:?}/$envir
 fi
 
-#  JY 10/27/20, move down here ROTDIR and PDY is not defined before the config.base (ROTDIR) or config.wave (PDY) is sourcedin the front
 
 #############################
 # Source relevant config files
@@ -94,14 +63,15 @@ if [ ${DO_WAVE:-"NO"} = "YES" ]; then
   done
 fi
 
-# JY, move this block down as well, as the machine is defined in the config file
+
 ##########################################
 # Source machine runtime environment
 ##########################################
 . $HOMEgfs/env/${machine}.env fcst
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+
 # Set wave variables
 if [ ${DO_WAVE:-"NO"} = "YES" ]; then
   # WAVE component directory

diff --git a/jobs/JGLOBAL_WAVE_GEMPAK b/jobs/JGLOBAL_WAVE_GEMPAK
@@ -5,7 +5,6 @@ date
 set -xa
 export PS4='$SECONDS + ' 
 
-# JY - 10/29, move the block in the front, otherwise PDY is not defined for COMIN
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -47,7 +47,6 @@ export cycle=${cycle:-t${cyc}z}
 setpdy.sh
 . PDY
 
-# JY - 10/28 added the CDATE, cleaned up from ecflow script
 export CDATE=$PDY$cyc
 
 export pgmout=OUTPUT.$$

diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -47,7 +47,6 @@ export cycle=${cycle:-t${cyc}z}
 setpdy.sh
 . ./PDY
 
-# JY - 10/28 added the CDATE, cleaned up from ecflow script
 export CDATE=$PDY$cyc
 
 export pgmout=OUTPUT.$$

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -47,7 +47,6 @@ export cycle=${cycle:-t${cyc}z}
 setpdy.sh
 . ./PDY
 
-# JY - 10/28 added the CDATE, cleaned up from ecflow script
 export CDATE=$PDY$cyc
 
 export pgmout=OUTPUT.$$

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -4,7 +4,6 @@ date
 export PS4=' $SECONDS + '
 set -xa
 
-# JY - 10/29. move up here, otherwise the COMIN does not work.
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -4,8 +4,6 @@ date
 export PS4=' $SECONDS + '
 set -xa
 
-# JY - 10/27/20 move this part to the front so that the PDY is set in front of COMIN...
-
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA

diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static
@@ -106,7 +106,6 @@ export COMOUTatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
 export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
 export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
 
-export jlogfile="${EXPDIR}/logs/jlogfile"
 export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'}
 export LOGSCRIPT=${LOGSCRIPT:-""}
 #export ERRSCRIPT=${ERRSCRIPT:-"err_chk"}

diff --git a/parm/config/config.wave b/parm/config/config.wave
@@ -43,9 +43,6 @@ export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m ak_10m glo_30m' # Grids tha
 export wavesbsGRD=''  # side-by-side grids generated as wave model runs, writes to com
 export wavepostGRD='gnh_10m aoc_9km gsh_15m' # Native grids that will be post-processed (grib2)
 
-# JY - turn off, as setpdy call is after the source of config file. 10/27/20
-## CDATE
-#export CDATE=${PDY}${cyc}
 
 # The start time reflects the number of hindcast hours prior to the cycle initial time
 if [ "$CDUMP" = "gdas" ]; then
@@ -70,11 +67,11 @@ export OUTPARS_WAV="WND HS FP DP PHS PTP PDIR"
 # Restart file config
 if [ "$CDUMP" = "gdas" ]; then
   WAVNCYC=4
-  WAVHCYC=6
+  WAVHCYC=${assim_freq:-6}
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-48} # RTOFS forecasts only out to 8 days
 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}`
+  WAVHCYC=${assim_freq:-6}
 else
   WAVHCYC=0
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-192} # RTOFS forecasts only out to 8 days

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -50,7 +50,7 @@ if [[ ! -d gldas.fd ]] ; then
     rm -f ${topdir}/checkout-gldas.log
     git clone https://github.com/NOAA-EMC/GLDAS  gldas.fd >> ${topdir}/checkout-gldas.fd.log 2>&1
     cd gldas.fd
-    git checkout gldas_gfsv16_release.v1.11.0
+    git checkout gldas_gfsv16_release.v1.12.0
     cd ${topdir}
 else
     echo 'Skip.  Directory gldas.fd already exists.'