modified files

NOAA-EMC · Feb 28, 2025 · 0cfb50b · 0cfb50b
1 parent bb48ed9
commit 0cfb50b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/ush/atmos_extractvars.sh b/ush/atmos_extractvars.sh
@@ -74,8 +74,9 @@ for outtype in "f2d" "f3d"; do
       if [[ -f "${infile}" ]]; then # check if input file exists before extraction
         new_infile="${outdirpre}/$(basename "${infile}")_ext"
         cpfs "${infile}" "${new_infile}"
-        if [[ ! -f "${new_infile}" ]]; then
-          echo "WARNING: ${new_infile} does not exist in ${subdata}. Copying skipped."
+        if [[ $? -ne 0 ]]; then
+          echo "ERROR: Failed to copy ${infile} to ${new_infile}. Skipping."
+          continue
         fi
         # shellcheck disable=SC2312
         ${WGRIB2} "${new_infile}" | grep -F -f "${varlist}" | ${WGRIB2} -i "${new_infile}" -append -grib "${outfile}"
@@ -94,8 +95,9 @@ for outtype in "f2d" "f3d"; do
         if [[ -f "${infile}" ]]; then # check if input file exists before extraction
           new_infile="${outdirpre}/$(basename "${infile}")_ext"
           cpfs "${infile}" "${new_infile}"
-          if [[ ! -f "${new_infile}" ]]; then
-            echo "WARNING: ${new_infile} does not exist in ${subdata}. Copying skipped."
+          if [[ $? -ne 0 ]]; then
+            echo "ERROR: Failed to copy ${infile} to ${new_infile}. Skipping."
+            continue
           fi
           # shellcheck disable=SC2312
           ${WGRIB2} "${new_infile}" | grep -F -f "${varlist_d}" | ${WGRIB2} -i "${new_infile}" -append -grib "${outfile}"

diff --git a/ush/ocnice_extractvars.sh b/ush/ocnice_extractvars.sh
@@ -52,8 +52,9 @@ for (( nh = FHMIN_GFS + fhout_ocnice; nh <= FHMAX_GFS; nh = nh + fhout_ocnice ))
 
   if [[ -f "${infile}" ]]; then #check if input file exists before extraction
     cpfs "${infile}" "${new_infile}" #copy infile to the subdata directory
-    if [[ ! -f "${new_infile}" ]]; then
-    echo "WARNING: ${new_infile} does not exist in ${subdata}. Copying skipped."
+    if [[ $? -ne 0 ]]; then
+      echo "ERROR: Failed to copy ${infile} to ${new_infile}. Skipping."
+      continue
     fi
     varsrequested=$(paste -s "${varlist}")
     varsinfile=$(cdo -showname "${new_infile}")

diff --git a/ush/wave_extractvars.sh b/ush/wave_extractvars.sh
@@ -30,8 +30,9 @@ for (( nh = FHOUT_WAV_EXTRACT; nh <= FHMAX_WAV; nh = nh + FHOUT_WAV_EXTRACT ));
 
   if [[ -f "${infile}" ]]; then # Check if input file exists before extraction
     cpfs "${infile}" "${new_infile}" # Copy infile to the subdata directory
-    if [[ ! -f "${new_infile}" ]]; then
-      echo "WARNING: ${new_infile} does not exist in ${subdata}. Copying skipped."
+    if [[ $? -ne 0 ]]; then
+      echo "ERROR: Failed to copy ${infile} to ${new_infile}. Skipping."
+      continue
     fi
     # shellcheck disable=SC2312
     ${WGRIB2} "${new_infile}" | grep -F -f "${varlist_wav}" | ${WGRIB2} -i "${new_infile}" -append -grib "${outfile}"