rrfs_ci: Merge ufs-community/develop

modulefiles/tasks/cheyenne/run_vx.local

@@ -1,4 +1,2 @@
 #%Module
 module load pylib_regional_workflow
-module use /glade/p/ral/jntp/MET/MET_releases/modulefiles
-module load met/10.0.0

modulefiles/tasks/gaea/run_vx.local

@@ -3,5 +3,3 @@
 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

modulefiles/tasks/hera/run_vx.local

@@ -3,5 +3,3 @@
 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

modulefiles/tasks/jet/miniconda_regional_workflow

@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
-module load miniconda3
+module use /contrib/miniconda3/modulefiles
+module load miniconda3/4.5.12
 
 setenv SRW_ENV regional_workflow

modulefiles/tasks/jet/run_vx.local

@@ -0,0 +1,5 @@
+#%Module
+
+module use -a /contrib/anaconda/modulefiles
+module load intel/18.0.5.274
+module load anaconda/5.3.1

modulefiles/tasks/wcoss_dell_p3/run_vx.local

@@ -1,6 +1,3 @@
 #%Module
 
 module unload netcdf
-
-module use /gpfs/dell2/emc/verification/noscrub/emc.metplus/modulefiles
-module load met/10.0.0

scripts/exregional_make_grid.sh

@@ -246,7 +246,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 # Set local variables needed in the call to the executable that generates
 # a GFDLgrid-type grid.
 #
-  nx_t6sg=$(( 2*GFDLgrid_RES ))
+  nx_t6sg=$(( 2*GFDLgrid_NUM_CELLS ))
   grid_name="${GRID_GEN_METHOD}"
 #
 # Call the executable that generates the grid file.  Note that this call
@@ -402,8 +402,8 @@ res_equiv=${res_equiv//$'\n'/}
 #-----------------------------------------------------------------------
 #
 if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
-  if [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "TRUE" ]; then
-    CRES="C${GFDLgrid_RES}"
+  if [ "${GFDLgrid_USE_NUM_CELLS_IN_FILENAMES}" = "TRUE" ]; then
+    CRES="C${GFDLgrid_NUM_CELLS}"
   else
     CRES="C${res_equiv}"
   fi

scripts/exregional_make_ics.sh

@@ -142,7 +142,6 @@ case "${CCPP_PHYS_SUITE}" in
     varmap_file="GFSphys_var_map.txt"
     ;;
 #
-  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
   "FV3_HRRR" )
@@ -518,7 +517,6 @@ fi
 #
 settings="
 'config': {
- 'fix_dir_input_grid': ${FIXgsm},
  'fix_dir_target_grid': ${FIXLAM},
  'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc,
  'orog_dir_target_grid': ${FIXLAM},

scripts/exregional_make_lbcs.sh

@@ -140,7 +140,6 @@ case "${CCPP_PHYS_SUITE}" in
     varmap_file="GFSphys_var_map.txt"
     ;;
 #
-  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
   "FV3_HRRR" )
@@ -442,7 +441,6 @@ list file has not specified for this external LBC model (EXTRN_MDL_NAME_LBCS):
 #
 settings="
 'config': {
- 'fix_dir_input_grid': ${FIXgsm},
  'fix_dir_target_grid': ${FIXLAM},
  'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc,
  'orog_dir_target_grid': ${FIXLAM},

scripts/exregional_make_orog.sh

@@ -373,7 +373,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 #
 # Really depends on what EMC wants to do.
 
-  res="${GFDLgrid_RES}"
+  res="${GFDLgrid_NUM_CELLS}"
 #  stretch_fac="${GFDLgrid_STRETCH_FAC}"
   refine_ratio="${GFDLgrid_REFINE_RATIO}"
 

scripts/exregional_run_fcst.sh

@@ -167,8 +167,8 @@ create_symlink_to_file target="$target" symlink="$symlink" \
 #target="${FIXLAM}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc"
 #if [ "${RUN_TASK_MAKE_SFC_CLIMO}" = "TRUE" ] && \
 #   [ "${GRID_GEN_METHOD}" = "GFDLgrid" ] && \
-#   [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "FALSE" ]; then
-#  symlink="C${GFDLgrid_RES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
+#   [ "${GFDLgrid_USE_NUM_CELLS_IN_FILENAMES}" = "FALSE" ]; then
+#  symlink="C${GFDLgrid_NUM_CELLS}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
 #else
 #  symlink="${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
 #fi