[develop] Update weather model hash and remove "_vrfy" from bash comm…

…ands (ufs-community#1074) The weather model hash has been updated to 4f32a4b (April 15). Additionally, _vrfy has been removed from the cd, cp, ln, mkdir, mv, and rm bash commands in jobs, scripts, ush, and ush/bash_utils. The modified commands don't function as intended (issue ufs-community#861) and aren't accepted by NCO (issue ufs-community#1021).
gsketefian · Apr 30, 2024 · eea4c29 · eea4c29
1 parent 08537b0
commit eea4c29
Show file tree

Hide file tree

Showing 32 changed files with 134 additions and 430 deletions.
diff --git a/.cicd/scripts/srw_metric.sh b/.cicd/scripts/srw_metric.sh
@@ -58,7 +58,7 @@ fi
 # Test directories
 we2e_experiment_base_dir="${we2e_experiment_base_dir:=${workspace}/../expt_dirs/metric_test}"
 we2e_test_dir="${we2e_test_dir:=${workspace}/tests/WE2E}"
-we2e_test_name="${test_type:=grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0}"
+we2e_test_name="grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0"
 
 pwd
 

diff --git a/Externals.cfg b/Externals.cfg
@@ -12,7 +12,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 1411b90
+hash = 4f32a4b
 local_path = sorc/ufs-weather-model
 required = True
 

diff --git a/jobs/JREGIONAL_CHECK_POST_OUTPUT b/jobs/JREGIONAL_CHECK_POST_OUTPUT
@@ -78,7 +78,7 @@ Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #
 ensmem_name="mem${ENSMEM_INDX}"
 cycle_dir="$EXPTDIR/$CDATE"
-mkdir_vrfy -p "${cycle_dir}"
+mkdir -p "${cycle_dir}"
 touch "${cycle_dir}/post_files_exist_${ensmem_name}.txt"
 #
 #-----------------------------------------------------------------------

diff --git a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES
@@ -222,8 +222,8 @@ if [ $RUN_ENVIR = "nco" ]; then
     export EXTRN_MDL_STAGING_DIR="${EXTRN_MDL_STAGING_DIR:-${DATA}}"
 else
     export EXTRN_MDL_STAGING_DIR="${COMIN}/${EXTRN_MDL_NAME}/for_${ICS_OR_LBCS}"
-    mkdir_vrfy -p "${EXTRN_MDL_STAGING_DIR}"
-    cd_vrfy "${EXTRN_MDL_STAGING_DIR}"
+    mkdir -p "${EXTRN_MDL_STAGING_DIR}"
+    cd "${EXTRN_MDL_STAGING_DIR}"
 fi
 #
 #-----------------------------------------------------------------------

diff --git a/jobs/JREGIONAL_MAKE_GRID b/jobs/JREGIONAL_MAKE_GRID
@@ -153,7 +153,7 @@ This is the J-job script for the task that generates grid files.
 #-----------------------------------------------------------------------
 #
 check_for_preexist_dir_file "${GRID_DIR}" "${PREEXISTING_DIR_METHOD}"
-mkdir_vrfy -p "${GRID_DIR}"
+mkdir -p "${GRID_DIR}"
 #
 #-----------------------------------------------------------------------
 #
@@ -162,7 +162,7 @@ mkdir_vrfy -p "${GRID_DIR}"
 #-----------------------------------------------------------------------
 #
 DATA="${DATA:-${GRID_DIR}/tmp}"
-mkdir_vrfy -p "$DATA"
+mkdir -p "$DATA"
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS
@@ -60,7 +60,7 @@ if [ $RUN_ENVIR = "nco" ]; then
 else
   export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
 fi
-mkdir_vrfy -p "${INPUT_DATA}"
+mkdir -p "${INPUT_DATA}"
 #
 #
 #-----------------------------------------------------------------------
@@ -72,8 +72,8 @@ mkdir_vrfy -p "${INPUT_DATA}"
 if [ $RUN_ENVIR = "community" ]; then
   DATA="${DATA:-${COMIN}${SLASH_ENSMEM_SUBDIR}/tmp_MAKE_ICS}"
   check_for_preexist_dir_file "$DATA" "delete"
-  mkdir_vrfy -p $DATA
-  cd_vrfy $DATA
+  mkdir -p $DATA
+  cd $DATA
 fi
 #
 #-----------------------------------------------------------------------

diff --git a/jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBCS
@@ -60,7 +60,7 @@ if [ $RUN_ENVIR = "nco" ]; then
 else
   export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
 fi
-mkdir_vrfy -p "${INPUT_DATA}"
+mkdir -p "${INPUT_DATA}"
 #
 #-----------------------------------------------------------------------
 #
@@ -71,8 +71,8 @@ mkdir_vrfy -p "${INPUT_DATA}"
 if [ "${RUN_ENVIR}" = "community" ]; then
   DATA="${DATA:-${COMIN}${SLASH_ENSMEM_SUBDIR}/tmp_MAKE_LBCS}"
   check_for_preexist_dir_file "$DATA" "delete"
-  mkdir_vrfy -p $DATA
-  cd_vrfy $DATA
+  mkdir -p $DATA
+  cd $DATA
 fi
 #
 #-----------------------------------------------------------------------

diff --git a/jobs/JREGIONAL_MAKE_SFC_CLIMO b/jobs/JREGIONAL_MAKE_SFC_CLIMO
@@ -55,7 +55,7 @@ climatology.
 #-----------------------------------------------------------------------
 #
 check_for_preexist_dir_file "${SFC_CLIMO_DIR}" "${PREEXISTING_DIR_METHOD}"
-mkdir_vrfy -p "${SFC_CLIMO_DIR}"
+mkdir -p "${SFC_CLIMO_DIR}"
 #
 #-----------------------------------------------------------------------
 #
@@ -66,7 +66,7 @@ mkdir_vrfy -p "${SFC_CLIMO_DIR}"
 DATA="${DATA:-${SFC_CLIMO_DIR}/tmp}"
 if [ $RUN_ENVIR != "nco" ]; then
     check_for_preexist_dir_file "$DATA" "delete"
-    mkdir_vrfy $DATA
+    mkdir $DATA
 fi
 #
 #-----------------------------------------------------------------------

diff --git a/jobs/JREGIONAL_RUN_FCST b/jobs/JREGIONAL_RUN_FCST
@@ -76,8 +76,8 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-mkdir_vrfy -p ${DATA}/INPUT
-mkdir_vrfy -p ${DATA}/RESTART
+mkdir -p ${DATA}/INPUT
+mkdir -p ${DATA}/RESTART
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JREGIONAL_RUN_POST b/jobs/JREGIONAL_RUN_POST
@@ -85,7 +85,7 @@ fi
 if [ "${RUN_ENVIR}" = "community" ]; then
   DATA="${DATA:-${COMIN}${SLASH_ENSMEM_SUBDIR}}"
   export COMOUT="${DATA}/postprd"
-  mkdir_vrfy -p "${COMOUT}"
+  mkdir -p "${COMOUT}"
 fi
 
 if [ "${SUB_HOURLY_POST}" = "TRUE" ]; then
@@ -94,9 +94,9 @@ else
   export DATA_FHR="${DATA:-$COMOUT}/$fhr"
 fi
 check_for_preexist_dir_file "${DATA_FHR}" "delete"
-mkdir_vrfy -p "${DATA_FHR}"
+mkdir -p "${DATA_FHR}"
 
-cd_vrfy "${DATA_FHR}"
+cd "${DATA_FHR}"
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JREGIONAL_RUN_PRDGEN b/jobs/JREGIONAL_RUN_PRDGEN
@@ -84,7 +84,7 @@ DATA="${DATA:-${COMIN}${SLASH_ENSMEM_SUBDIR}}"
 if [ "${RUN_ENVIR}" = "community" ]; then
   export COMOUT="${DATA}/postprd"
 fi
-mkdir_vrfy -p "${COMOUT}"
+mkdir -p "${COMOUT}"
 
 # subhourly post
 if [ "${SUB_HOURLY_POST}" = "TRUE" ]; then
@@ -93,9 +93,9 @@ else
   export DATA_FHR="${DATA:-$COMOUT}/$fhr"
 fi
 check_for_preexist_dir_file "${DATA_FHR}" "delete"
-mkdir_vrfy -p "${DATA_FHR}"
+mkdir -p "${DATA_FHR}"
 
-cd_vrfy "${DATA_FHR}"
+cd "${DATA_FHR}"
 #
 #-----------------------------------------------------------------------
 #

diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
@@ -196,7 +196,7 @@ fi
 #
 # Change location to the temporary (work) directory.
 #
-cd_vrfy "$DATA"
+cd "$DATA"
 
 print_info_msg "$VERBOSE" "
 Starting grid file generation..."
@@ -313,7 +313,7 @@ fi
 # to the original directory.
 #
 grid_fp="$DATA/${grid_fn}"
-cd_vrfy -
+cd -
 
 print_info_msg "$VERBOSE" "
 Grid file generation completed successfully."
@@ -392,7 +392,7 @@ set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "'$CRES'"
 grid_fp_orig="${grid_fp}"
 grid_fn="${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NHW}.nc"
 grid_fp="${GRID_DIR}/${grid_fn}"
-mv_vrfy "${grid_fp_orig}" "${grid_fp}"
+mv "${grid_fp_orig}" "${grid_fp}"
 #
 #-----------------------------------------------------------------------
 #
@@ -449,7 +449,7 @@ unshaved_fp="${grid_fp}"
 # Once it is complete, we will move the resultant file from DATA to
 # GRID_DIR.
 #
-cd_vrfy "$DATA"
+cd "$DATA"
 #
 # Create an input namelist file for the shave executable to generate a
 # grid file with a 3-cell-wide halo from the one with a wide halo.  Then
@@ -477,7 +477,7 @@ The namelist file (nml_fn) used in this call is in directory DATA:
   nml_fn = \"${nml_fn}\"
   DATA = \"${DATA}\""
 POST_STEP
-mv_vrfy ${shaved_fp} ${GRID_DIR}
+mv ${shaved_fp} ${GRID_DIR}
 #
 # Create an input namelist file for the shave executable to generate a
 # grid file with a 4-cell-wide halo from the one with a wide halo.  Then
@@ -505,7 +505,7 @@ The namelist file (nml_fn) used in this call is in directory DATA:
   nml_fn = \"${nml_fn}\"
   DATA = \"${DATA}\""
 POST_STEP
-mv_vrfy ${shaved_fp} ${GRID_DIR}
+mv ${shaved_fp} ${GRID_DIR}
 #
 # Create an input namelist file for the shave executable to generate a
 # grid file without halo from the one with a wide halo.  Then
@@ -532,11 +532,11 @@ The namelist file (nml_fn) used in this call is in directory DATA:
   nml_fn = \"${nml_fn}\"
   DATA = \"${DATA}\""
 POST_STEP
-mv_vrfy ${shaved_fp} ${GRID_DIR}
+mv ${shaved_fp} ${GRID_DIR}
 #
 # Change location to the original directory.
 #
-cd_vrfy -
+cd -
 #
 #-----------------------------------------------------------------------
 #

diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -655,10 +655,10 @@ if [ "${CPL_AQM}" = "TRUE" ]; then
   cp -p gfs_ctrl.nc "${COMOUT}/${NET}.${cycle}${dot_ensmem}.gfs_ctrl.nc"
   cp -p gfs.bndy.nc "${DATA_SHARE}/${NET}.${cycle}${dot_ensmem}.gfs_bndy.tile${TILE_RGNL}.f000.nc"
 else
-  mv_vrfy out.atm.tile${TILE_RGNL}.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
-  mv_vrfy out.sfc.tile${TILE_RGNL}.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
-  mv_vrfy gfs_ctrl.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_ctrl.nc
-  mv_vrfy gfs.bndy.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_bndy.tile${TILE_RGNL}.f000.nc
+  mv out.atm.tile${TILE_RGNL}.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
+  mv out.sfc.tile${TILE_RGNL}.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
+  mv gfs_ctrl.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_ctrl.nc
+  mv gfs.bndy.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_bndy.tile${TILE_RGNL}.f000.nc
 fi
 #
 #-----------------------------------------------------------------------
@@ -684,7 +684,7 @@ Please ensure that you've built this executable."
       print_err_msg_exit "${message_txt}"
     fi
   fi
-  cp_vrfy ${fvcom_exec_fp} ${INPUT_DATA}/.
+  cp ${fvcom_exec_fp} ${INPUT_DATA}/.
   fvcom_data_fp="${FVCOM_DIR}/${FVCOM_FILE}"
   if [ ! -f "${fvcom_data_fp}" ]; then
     message_txt="The file or path (fvcom_data_fp) does not exist:
@@ -699,8 +699,8 @@ Please check the following user defined variables:
     fi
   fi
 
-  cp_vrfy ${fvcom_data_fp} ${INPUT_DATA}/fvcom.nc
-  cd_vrfy ${INPUT_DATA}
+  cp ${fvcom_data_fp} ${INPUT_DATA}/fvcom.nc
+  cd ${INPUT_DATA}
   PREP_STEP
   eval ${RUN_CMD_UTILS} ${fvcom_exec_fn} \
        ${NET}.${cycle}${dot_ensmem}.sfc_data.tile${TILE_RGNL}.halo${NH0}.nc fvcom.nc ${FVCOM_WCSTART} ${fvcom_time} \

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -562,7 +562,7 @@ located in the following directory:
   if [ "${CPL_AQM}" = "TRUE" ]; then
     cp -p gfs.bndy.nc ${DATA_SHARE}/${NET}.${cycle}${dot_ensmem}.gfs_bndy.tile7.f${fcst_hhh_FV3LAM}.nc
   else
-    mv_vrfy gfs.bndy.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_bndy.tile7.f${fcst_hhh_FV3LAM}.nc
+    mv gfs.bndy.nc ${INPUT_DATA}/${NET}.${cycle}${dot_ensmem}.gfs_bndy.tile7.f${fcst_hhh_FV3LAM}.nc
   fi
 
   fi