Fix checking of nems configure template

NOAA-EMC · Nov 15, 2023 · c5494f0 · c5494f0
1 parent 1e86209
commit c5494f0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs
@@ -474,22 +474,22 @@ fi
 # Set the name of the UFS (previously nems) configure template to use
 case "${model_list}" in
   atm)
-    export ufs_configure_template="nems.configure.atm.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.atm.IN"
     ;;
   atm.aero)
-    export ufs_configure_template="nems.configure.atm_aero.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.atm_aero.IN"
     ;;
   atm.wave)
-    export ufs_configure_template="nems.configure.leapfrog_atm_wav.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.leapfrog_atm_wav.IN"
     ;;
   atm.ocean.ice)
-    export ufs_configure_template="nems.configure.cpld.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.cpld.IN"
     ;;
   atm.ocean.ice.aero)
-    export ufs_configure_template="nems.configure.cpld_aero.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.cpld_aero.IN"
     ;;
   atm.ocean.ice.wave.aero)
-    export ufs_configure_template="nems.configure.cpld_aero_outerwave.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.cpld_aero_outerwave.IN"
     ;;
   *)
     echo "FATAL ERROR: Unable to determine appropriate UFS configure template for ${model_list}"

diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
@@ -484,22 +484,22 @@ fi
 # Set the name of the UFS (previously nems) configure template to use
 case "${model_list}" in
   atm)
-    export ufs_configure_template="nems.configure.atm.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.atm.IN"
     ;;
   atm.aero)
-    export ufs_configure_template="nems.configure.atm_aero.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.atm_aero.IN"
     ;;
   atm.wave)
-    export ufs_configure_template="nems.configure.leapfrog_atm_wav.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.leapfrog_atm_wav.IN"
     ;;
   atm.ocean.ice)
-    export ufs_configure_template="nems.configure.cpld.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.cpld.IN"
     ;;
   atm.ocean.ice.aero)
-    export ufs_configure_template="nems.configure.cpld_aero.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.cpld_aero.IN"
     ;;
   atm.ocean.ice.wave.aero)
-    export ufs_configure_template="nems.configure.cpld_aero_outerwave.IN"
+    export ufs_configure_template="${HOMEgfs}/parm/ufs/nems.configure.cpld_aero_outerwave.IN"
     ;;
   *)
     echo "FATAL ERROR: Unable to determine appropriate UFS configure template for ${model_list}"

diff --git a/ush/nems_configure.sh b/ush/nems_configure.sh
@@ -89,15 +89,14 @@ if [[ "${cplchm}" = ".true." ]]; then
 fi
 
 # Ensure the template exists
-template="${HOMEgfs}/parm/ufs/${ufs_configure_template}"
-if [[ ! -f ${template} ]]; then
-  echo "FATAL ERROR: template '${template}' does not exist, ABORT!"
+if [[ ! -r "${ufs_configure_template}" ]]; then
+  echo "FATAL ERROR: template '${ufs_configure_template}' does not exist, ABORT!"
   exit 1
 fi
 
 source "${HOMEgfs}/ush/atparse.bash"
 rm -f "${DATA}/nems.configure"
-atparse < "${template}" >> "${DATA}/nems.configure"
+atparse < "${ufs_configure_template}" >> "${DATA}/nems.configure"
 echo "Rendered nems.configure:"
 cat nems.configure