Added support of the NSSL CCPP suite - WoFS_v0 and WE2E tests

modulefiles/tasks/gaea/make_grid.local

@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow

modulefiles/tasks/gaea/make_ics.local

@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow

modulefiles/tasks/gaea/make_lbcs.local

@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow

modulefiles/tasks/gaea/run_fcst.local

@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow

modulefiles/tasks/gaea/run_vx.local

@@ -0,0 +1,7 @@
+#%Module
+
+module use -a /contrib/anaconda/modulefiles
+module load intel/18.0.5.274
+module load anaconda/latest
+module use -a /contrib/met/modulefiles/
+module load met/10.0.0

scripts/exregional_get_extrn_mdl_files.sh

@@ -108,7 +108,7 @@ elif [ "${ICS_OR_LBCS}" = "LBCS" ]; then
   input_file_path=${EXTRN_MDL_SOURCE_BASEDIR_LBCS:-$EXTRN_MDL_SYSBASEDIR_LBCS}
 fi
 
-data_stores="hpss aws"
+data_stores="${EXTRN_MDL_DATA_STORES}"
 
 yyyymmddhh=${extrn_mdl_cdate:0:10}
 yyyy=${yyyymmddhh:0:4}
@@ -141,7 +141,7 @@ if [ -n "${file_names:-}" ] ; then
 fi
 
 if [ -n "${input_file_path:-}" ] ; then
-  data_stores="disk hpss aws"
+  data_stores="disk $data_stores"
   additional_flags="$additional_flags \
   --input_file_path ${input_file_path}"
 fi

scripts/exregional_make_grid.sh

@@ -410,7 +410,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then
   CRES="C${res_equiv}"
 fi
-set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "\"$CRES\""
+set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "'$CRES'"
 #
 #-----------------------------------------------------------------------
 #

scripts/exregional_make_ics.sh

@@ -145,7 +145,8 @@ case "${CCPP_PHYS_SUITE}" in
   "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
-  "FV3_HRRR" )
+  "FV3_HRRR" | \
+  "FV3_WoFS_v0" )
     if [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then
       varmap_file="GSDphys_var_map.txt"
@@ -177,7 +178,7 @@ esac
 # needed to generate the ICs.
 #
 # fn_atm:
-# Name (not including path) of the nemsio or netcdf file generated by the 
+# Name (not including path) of the nemsio or netcdf file generated by the
 # external model that contains the atmospheric fields.  Currently used for
 # GSMGFS and FV3GFS external model data.
 #
@@ -299,12 +300,12 @@ convert_nst=""
 # (LSM) -- which currently includes all valid external models except the
 # HRRR and the RAP -- then we set the number of soil levels to include
 # in the output NetCDF file that chgres_cube generates (nsoill_out; this
-# is a variable in the namelist that chgres_cube reads in) to 4.  This 
+# is a variable in the namelist that chgres_cube reads in) to 4.  This
 # is because FV3 can handle this regardless of the LSM that it is using
-# (which is specified in the suite definition file, or SDF), as follows.  
-# If the SDF does not use the RUC LSM (i.e. it uses the Noah or Noah MP 
-# LSM), then it will expect to see 4 soil layers; and if the SDF uses 
-# the RUC LSM, then the RUC LSM itself has the capability to regrid from 
+# (which is specified in the suite definition file, or SDF), as follows.
+# If the SDF does not use the RUC LSM (i.e. it uses the Noah or Noah MP
+# LSM), then it will expect to see 4 soil layers; and if the SDF uses
+# the RUC LSM, then the RUC LSM itself has the capability to regrid from
 # 4 soil layers to the 9 layers that it uses.
 #
 # On the other hand, if the external model is one that uses the RUC LSM
@@ -318,7 +319,7 @@ convert_nst=""
 # output from chgres_cube must contain 4 soil levels because that is what
 # these LSMs expect, and the code in FV3 does not have the capability to
 # regrid from the 9 levels in the external model to the 4 levels expected
-# by Noah/Noah MP.  In this case, chgres_cube does the regridding from 
+# by Noah/Noah MP.  In this case, chgres_cube does the regridding from
 # 9 to 4 levels.
 #
 # In summary, we can set nsoill_out to 4 unless the external model is
@@ -336,11 +337,11 @@ fi
 #-----------------------------------------------------------------------
 #
 # If the external model for ICs is one that does not provide the aerosol
-# fields needed by Thompson microphysics (currently only the HRRR and 
-# RAP provide aerosol data) and if the physics suite uses Thompson 
-# microphysics, set the variable thomp_mp_climo_file in the chgres_cube 
-# namelist to the full path of the file containing aerosol climatology 
-# data.  In this case, this file will be used to generate approximate 
+# fields needed by Thompson microphysics (currently only the HRRR and
+# RAP provide aerosol data) and if the physics suite uses Thompson
+# microphysics, set the variable thomp_mp_climo_file in the chgres_cube
+# namelist to the full path of the file containing aerosol climatology
+# data.  In this case, this file will be used to generate approximate
 # aerosol fields in the ICs that Thompson MP can use.  Otherwise, set
 # thomp_mp_climo_file to a null string.
 #

scripts/exregional_make_lbcs.sh

@@ -142,6 +142,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" | \
+  "FV3_WoFS_v0" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
   "FV3_HRRR" )
     if [ "${EXTRN_MDL_NAME_LBCS}" = "RAP" ] || \
@@ -175,7 +176,7 @@ esac
 # needed to generate the LBCs.
 #
 # fn_atm:
-# Name (not including path) of the nemsio or netcdf file generated by the 
+# Name (not including path) of the nemsio or netcdf file generated by the
 # external model that contains the atmospheric fields.  Currently used for
 # GSMGFS and FV3GFS external model data.
 #

scripts/exregional_run_ensgridvx.sh

@@ -133,6 +133,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export NUM_ENS_MEMBERS 
 export NUM_PAD
 export LOG_SUFFIX

scripts/exregional_run_ensgridvx_mean.sh

@@ -143,6 +143,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export INPUT_BASE
 export LOG_SUFFIX
 

scripts/exregional_run_ensgridvx_prob.sh

@@ -144,6 +144,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export LOG_SUFFIX
 
 #

scripts/exregional_run_enspointvx.sh

@@ -135,6 +135,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export NUM_ENS_MEMBERS
 
 ${METPLUS_PATH}/ush/run_metplus.py \

scripts/exregional_run_enspointvx_mean.sh

@@ -137,6 +137,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

scripts/exregional_run_enspointvx_prob.sh

@@ -137,6 +137,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

scripts/exregional_run_fcst.sh

@@ -514,7 +514,6 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then
   yyyymmdd=${cdate:0:8}
   hh=${cdate:8:2}
   cyc=$hh
-  tmmark="tm00"
   fmn="00"
 
   if [ "${RUN_ENVIR}" = "nco" ]; then
@@ -539,15 +538,15 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then
     post_mn=${post_time:10:2}
     post_mn_or_null=""
     post_fn_suffix="GrbF${fhr_d}"
-    post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${tmmark}.grib2"
+    post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${POST_OUTPUT_DOMAIN_NAME}.grib2"
 
     basetime=$( $DATE_UTIL --date "$yyyymmdd $hh" +%y%j%H%M )
     symlink_suffix="_${basetime}f${fhr}${post_mn}"
     fids=( "prslev" "natlev" )
     for fid in "${fids[@]}"; do
       FID=$(echo_uppercase $fid)
       post_orig_fn="${FID}.${post_fn_suffix}"
-      post_renamed_fn="${NET}.t${cyc}z.${fid}${post_renamed_fn_suffix}"
+      post_renamed_fn="${NET}.t${cyc}z.${fid}.${post_renamed_fn_suffix}"
       mv_vrfy ${run_dir}/${post_orig_fn} ${post_renamed_fn}
       ln_vrfy -fs ${post_renamed_fn} ${FID}${symlink_suffix}
     done

scripts/exregional_run_gridstatvx.sh

@@ -150,6 +150,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 #
 #-----------------------------------------------------------------------

scripts/exregional_run_pointstatvx.sh

@@ -140,6 +140,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

scripts/exregional_run_post.sh

@@ -172,17 +172,6 @@ cyc=$hh
 #
 #-----------------------------------------------------------------------
 #
-# The tmmark is a reference value used in real-time, DA-enabled NCEP models.
-# It represents the delay between the onset of the DA cycle and the free
-# forecast.  With no DA in the SRW App at the moment, it is hard-wired to
-# tm00 for now. 
-#
-#-----------------------------------------------------------------------
-#
-tmmark="tm00"
-#
-#-----------------------------------------------------------------------
-#
 # Create the namelist file (itag) containing arguments to pass to the post-
 # processor's executable.
 #
@@ -300,7 +289,7 @@ if [ "${post_mn}" != "00" ]; then
 fi
 
 post_fn_suffix="GrbF${post_fhr}${dot_post_mn_or_null}"
-post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${tmmark}.grib2"
+post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${POST_OUTPUT_DOMAIN_NAME}.grib2"
 #
 # For convenience, change location to postprd_dir (where the final output
 # from UPP will be located).  Then loop through the two files that UPP
@@ -314,7 +303,7 @@ fids=( "prslev" "natlev" )
 for fid in "${fids[@]}"; do
   FID=$(echo_uppercase $fid)
   post_orig_fn="${FID}.${post_fn_suffix}"
-  post_renamed_fn="${NET}.t${cyc}z.${fid}${post_renamed_fn_suffix}"
+  post_renamed_fn="${NET}.t${cyc}z.${fid}.${post_renamed_fn_suffix}"
   mv_vrfy ${tmp_dir}/${post_orig_fn} ${post_renamed_fn}
   create_symlink_to_file target="${post_renamed_fn}" \
                          symlink="${FID}${symlink_suffix}" \