Add function

Author: forsyth2

zppy/templates/tc_analysis.bash

@@ -29,32 +29,42 @@ first_file=`echo $(ls ${drc_in}/${caseid}.{{ input_files }}.*.nc | head -n 1)`
 echo "first_file=${first_file}"
 topography_file=`echo $(ncks --trd -M -m ${first_file} | grep -E -i "^global attribute [0-9]+: topography_file" | cut -f 11- -d ' ' | sort)`
 echo "topography_file=${topography_file}"
-res={{ res }}
-pg2=false
 filename="${topography_file##*/}"
 echo "filename=${filename}"
-if [[ $filename =~ ne[0-9]+np4pg2+ ]]; then
-    grid="${BASH_REMATCH[0]}"
+
+infer_res_from_grid()
+{
+    # Local to avoid using outer scope res, pg2
+    local res=$1
+    local grid=$2
     echo "grid=${grid}"
     if [[ -z "${res}" ]]; then
         echo "Inferring res from grid"
         if [[ $grid =~ ne([0-9]*) ]]; then
             res=${BASH_REMATCH[1]}
         fi
     fi
+    echo ${res}
+}
+
+res={{ res }}
+pg2=false
+# We set pg2=false unless it appears in this exact part of the filename:
+if [[ $filename =~ ne[0-9]+np4pg2+ ]]; then
+    grid="${BASH_REMATCH[0]}"
+    res=$(infer_res_from_grid "${res}" "${grid}")
     pg2=true
 elif [[ $filename =~ ne[0-9]+np4 ]]; then
     grid="${BASH_REMATCH[0]}"
-    echo "grid=${grid}"
+    res=$(infer_res_from_grid "${res}" "${grid}")
+    # pg2 is default value
+else
     if [[ -z "${res}" ]]; then
-        echo "Inferring res from grid"
-        if [[ $grid =~ ne([0-9]*) ]]; then
-            res=${BASH_REMATCH[1]}
-        fi
+        echo "Could not infer ${res} from ${filename}"
+        exit 1
     fi
-    pg2=false
-else
-    echo "Pattern not found in filename: $filename"
+    # res, in this case, is whatever the user defined it as
+    # pg2 is default value
 fi
 echo "res=${res}"
 echo "pg2=${pg2}"