Merge branch 'NOAA-EMC:master' into master

CMakeLists.txt

@@ -175,8 +175,8 @@ project(GSI)
     find_package( LAPACK )
   endif()
 # build the WRF I/O libraries
-  if(DEFINED ENV{GSIWRF_LIB})
-    set(wrflib "$ENV{GSIWRF_LIB}" CACHE INTERNAL "WRFIO library" )
+  if(DEFINED ENV{GSIWRFIO_LIB})
+    set(wrflib "$ENV{GSIWRFIO_LIB}" CACHE INTERNAL "WRFIO library" )
   elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libsrc/wrflib)
     add_subdirectory(libsrc/wrflib)
   else()

cmake/Modules/FindBUFR.cmake

@@ -11,8 +11,8 @@ endif()
 
 set( NO_DEFAULT_PATH )
 if(NOT BUILD_BUFR )
-  if(DEFINED ENV{BUFR_LIBd} )
-    set(BUFR_LIBRARY $ENV{BUFR_LIBd} )
+  if(DEFINED ENV{BUFR_LIBd_DA} )
+    set(BUFR_LIBRARY $ENV{BUFR_LIBd_DA} )
     message("BUFR library ${BUFR_LIBRARY} set via Environment variable")
   else()
   find_library( BUFR_LIBRARY 

cmake/Modules/FindCORELIBS.cmake

@@ -102,8 +102,8 @@ else()
     set( w3nco "w3nco${libsuffix}")
 endif()
 if(NOT  BUILD_BUFR  )
-  if(DEFINED ENV{BUFR_LIBd} )
-    set(BUFR_LIBRARY $ENV{BUFR_LIBd} )
+  if(DEFINED ENV{BUFR_LIBd_DA} )
+    set(BUFR_LIBRARY $ENV{BUFR_LIBd_DA} )
   else()
   find_library( BUFR_LIBRARY 
     NAMES libbufr.a libbufr_d_64.a libbufr_i4r8.a libbufr_v${BUFR_VER}_d_64.a

cmake/Modules/platforms/Generic.cmake

@@ -20,5 +20,6 @@ macro (setGeneric)
   set(BUILD_SP "OFF" CACHE INTERNAL "Build the SP library" )
   set(BUILD_CRTM "OFF" CACHE INTERNAL "Build the CRTM library" )
   set(BUILD_W3EMC "OFF" CACHE INTERNAL "Build the EMC library" )
+  set(BUILD_W3NCO "OFF" CACHE INTERNAL "Build the EMC library" )
   set(BUILD_NCO "OFF" CACHE INTERNAL "Build the NCO library" )
 endmacro()

cmake/Modules/setHOST.cmake

@@ -33,8 +33,7 @@ macro( setHOST )
   string(REGEX MATCH "discover" HOST-Discover ${HOSTNAME} )
   string(REGEX MATCH "cheyenne" HOST-Cheyenne ${HOSTNAME}  )
   message("done figuring out host--${HOSTNAME}")
-  if ( BUILD_CORELIBS )
-    MESSAGE(STATUS "BUILD_CORELIBS manually-specified as ON")
+  if ( COMGSI )
     set( host "GENERIC"  )
     set( HOST-Generic "TRUE"  )
     setGeneric()

jobs/JGDAS_EFSOI

@@ -0,0 +1,133 @@
+#!/bin/ksh
+set -x
+
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
+export PS4='$SECONDS + '
+date
+
+
+#############################
+# Source relevant config files
+#############################
+export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
+
+configs="base anal efsoi"
+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 efsoi
+
+
+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 -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 pgmout="OUTPUT.${pid}"
+export pgmerr=errfile
+
+
+##############################################
+# Set variables used in the exglobal script
+##############################################
+export CDATE=${CDATE:-${PDY}${cyc}}
+export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
+if [ $RUN_ENVIR = "nco" ]; then
+    export ROTDIR=${COMROOT:?}/$NET/$envir
+fi
+
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+GDATE=$($NDATE -$assim_freq $CDATE)
+gPDY=$(echo $GDATE | cut -c1-8)
+export gcyc=$(echo $GDATE | cut -c9-10) # needed in namelist
+
+VDATE=$($NDATE 24 $CDATE)
+vPDY=$(echo $VDATE | cut -c1-8)
+vcyc=$(echo $VDATE | cut -c9-10)
+
+export APREFIX="${CDUMP}.t${cyc}z."
+export GPREFIX="gdas.t${gcyc}z."
+export ASUFFIX=${ASUFFIX:-$SUFFIX}
+export GSUFFIX=${GSUFFIX:-$SUFFIX}
+
+
+
+# COMIN_GES_ENS and COMOUT_ANL_ENS are used in script
+export COMIN_GES_ENS="$ROTDIR/efsoigdas.$gPDY/$gcyc/$COMPONENT"
+export COMOUT_ANL_ENS="$ROTDIR/enkf$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_ANL="$ROTDIR/$CDUMP.$vPDY/$vcyc/$COMPONENT"
+export COMOUT_ANL_ENSFSOI="$ROTDIR/efsoi$CDUMP.$PDY/$cyc/$COMPONENT"
+export OSENSE_SAVE_DIR="$ROTDIR/osense"
+mkdir -p $OSENSE_SAVE_DIR
+# ========================================================
+
+###############################################################
+# Run relevant exglobal script
+env
+msg="HAS BEGUN on `hostname`"
+postmsg "$jlogfile" "$msg"
+$LOGSCRIPT
+
+${EFSOIUPDSH:-$SCRgfs/exgdas_efsoi.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
+##########################################
+cd $DATAROOT
+
+[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
+
+date
+exit 0

jobs/JGDAS_EFSOI_ECEN

@@ -0,0 +1,143 @@
+#!/bin/ksh
+set -x
+
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
+export PS4='$SECONDS + '
+date
+
+
+#############################
+# Source relevant config files
+#############################
+export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
+configs="base ecenfsoi"
+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 ecenfsoi
+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 -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 pgmout="OUTPUT.${pid}"
+export pgmerr=errfile
+
+
+##############################################
+# Set variables used in the script
+##############################################
+export CDATE=${CDATE:-${PDY}${cyc}}
+export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export COMPONENT=${COMPONENT:-atmos}
+if [ $RUN_ENVIR = "nco" ]; then
+    export ROTDIR=${COMROOT:?}/$NET/$envir
+fi
+
+
+##############################################
+# Begin JOB SPECIFIC work
+##############################################
+
+GDATE=$($NDATE -$assim_freq $CDATE)
+gPDY=$(echo $GDATE | cut -c1-8)
+gcyc=$(echo $GDATE | cut -c9-10)
+GDUMP=${GDUMP:-"gdas"}
+
+export CASE=$CASE_ENKF
+
+
+EUPD_CYC=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z)
+if [ $EUPD_CYC = "GFS" ]; then
+    CDUMP_ENKF="gfs"
+else
+    CDUMP_ENKF=$CDUMP
+fi
+
+export OPREFIX="${CDUMP}.t${cyc}z."
+export APREFIX="${CDUMP}.t${cyc}z."
+export APREFIX_ENKF="${CDUMP_ENKF}.t${cyc}z."
+export GPREFIX="${CDUMP}.t${gcyc}z."
+export GSUFFIX=${GSUFFIX:-$SUFFIX}
+export ASUFFIX=${ASUFFIX:-$SUFFIX}
+
+if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
+    export COMIN_OBS=${COMIN_OBS:-$ROTDIR/$RUN.$PDY/$cyc/$COMPONENT}
+    export COMIN_GES_OBS=${COMIN_GES_OBS:-$ROTDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT}
+else
+    export COMIN_OBS="$DMPDIR/$CDATE/$CDUMP"
+    export COMIN_GES_OBS="$DMPDIR/$GDATE/$GDUMP"
+fi
+
+# COMIN, COMIN_ENS and COMIN_GES_ENS are used in script
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_ENS="$ROTDIR/efsoi$CDUMP_ENKF.$PDY/$cyc/$COMPONENT" 
+export COMOUT_ENS="$ROTDIR/efsoi$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc/$COMPONENT"
+
+
+###############################################################
+# Run relevant script
+env
+msg="HAS BEGUN on `hostname`"
+postmsg "$jlogfile" "$msg"
+$LOGSCRIPT
+
+
+${ENKFRECENSH:-$SCRgfs/exgdas_enkf_ecen.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
+##########################################
+cd $DATAROOT
+[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
+
+date
+exit 0