Update GEFS resources after last merge

parm/config/gefs/config.resources

@@ -53,28 +53,28 @@ export npe_node_max
 case ${step} in
 
   "stage_ic")
-    export wtime_stage_ic="00:15:00"
-    export npe_stage_ic=1
-    export npe_node_stage_ic=1
-    export nth_stage_ic=1
+    export wtime="00:15:00"
+    export npe=1
+    export npe_node=1
+    export nth=1
     export is_exclusive=True
     ;;
 
   "waveinit")
-    export wtime_waveinit="00:10:00"
-    export npe_waveinit=12
-    export nth_waveinit=1
-    export npe_node_waveinit=$(( npe_node_max / nth_waveinit ))
-    export NTASKS=${npe_waveinit}
-    export memory_waveinit="2GB"
+    export wtime="00:10:00"
+    export npe=12
+    export nth=1
+    export npe_node=$(( npe_node_max / nth ))
+    export NTASKS=${npe}
+    export memory="2GB"
     ;;
 
   "prep_emissions")
-    export wtime_prep_emissions="00:10:00"
-    export npe_prep_emissions=1
-    export nth_prep_emissions=1
-    export npe_node_prep_emissions=$(( npe_node_max / nth_prep_emissions ))
-    export memory_prep_emissions="1GB"
+    export wtime="00:10:00"
+    export npe=1
+    export nth=1
+    export npe_node=$(( npe_node_max / nth ))
+    export memory="1GB"
     ;;
 
   "fcst" | "efcs")
@@ -286,4 +286,19 @@ case ${step} in
 
 esac
 
+# Get machine-specific resources, overriding/extending the above assignments
+if [[ -f "${EXPDIR}/config.resources.${machine}" ]]; then
+   source "${EXPDIR}/config.resources.${machine}"
+fi
+
+# Check for RUN-specific variables and export them
+for resource_var in nth npe npe_node NTASKS memory wtime; do
+   run_resource_var="${resource_var}_${RUN}"
+   if [[ -n "${!run_resource_var+0}" ]]; then
+      declare -x "${resource_var}"="${!run_resource_var}"
+   elif [[ -n "${!resource_var+0}" ]]; then
+      export "${resource_var?}"
+   fi
+done
+
 echo "END: config.resources"