Merge branch 'develop' into feature/soca-updates

guillaumevernieres · Feb 1, 2024 · 3749aae · 3749aae
2 parents d103db0 + 6bbe823
commit 3749aae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -820,15 +820,15 @@ case ${step} in
     export npe_cleanup=1
     export npe_node_cleanup=1
     export nth_cleanup=1
-    export memory_cleanu="4096M"
+    export memory_cleanup="4096M"
     ;;
 
   "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 is_exclusive=Tue
+    export is_exclusive=True
     ;;
 
   "atmensanlinit")
@@ -963,7 +963,7 @@ case ${step} in
     export npe_node_esfc=$(( npe_node_max / nth_esfc ))
     export nth_cycle=${nth_esfc}
     export npe_node_cycle=$(( npe_node_max / nth_cycle ))
-    export memory_esfc="8GB"
+    export memory_esfc="80GB"
     ;;
 
   "epos")
@@ -993,15 +993,15 @@ case ${step} in
     export npe_awips=1
     export npe_node_awips=1
     export nth_awips=1
-    export memory_awip="3GB"
+    export memory_awips="3GB"
     ;;
 
   "npoess")
     export wtime_npoess="03:30:00"
     export npe_npoess=1
     export npe_node_npoess=1
     export nth_npoess=1
-    export memory_npoes="3GB"
+    export memory_npoess="3GB"
     ;;
 
   "gempak")
@@ -1022,7 +1022,7 @@ case ${step} in
     export nth_mos_stn_prep=1
     export memory_mos_stn_prep="5GB"
     export NTASK="${npe_mos_stn_prep}"
-    export PTILE="${npe_node_mos_stn_pep}"
+    export PTILE="${npe_node_mos_stn_prep}"
     ;;
 
   "mos_grd_prep")
@@ -1032,7 +1032,7 @@ case ${step} in
     export nth_mos_grd_prep=1
     export memory_mos_grd_prep="16GB"
     export NTASK="${npe_mos_grd_prep}"
-    export PTILE="${npe_node_mos_grd_pep}"
+    export PTILE="${npe_node_mos_grd_prep}"
     ;;
 
   "mos_ext_stn_prep")
@@ -1042,7 +1042,7 @@ case ${step} in
     export nth_mos_ext_stn_prep=1
     export memory_mos_ext_stn_prep="5GB"
     export NTASK="${npe_mos_ext_stn_prep}"
-    export PTILE="${npe_node_mos_ext_stn_pep}"
+    export PTILE="${npe_node_mos_ext_stn_prep}"
     ;;
 
   "mos_ext_grd_prep")
@@ -1052,7 +1052,7 @@ case ${step} in
     export nth_mos_ext_grd_prep=1
     export memory_mos_ext_grd_prep="3GB"
     export NTASK="${npe_mos_ext_grd_prep}"
-    export PTILE="${npe_node_mos_ext_grd_pep}"
+    export PTILE="${npe_node_mos_ext_grd_prep}"
     ;;
 
   "mos_stn_fcst")
@@ -1062,7 +1062,7 @@ case ${step} in
     export nth_mos_stn_fcst=1
     export memory_mos_stn_fcst="40GB"
     export NTASK="${npe_mos_stn_fcst}"
-    export PTILE="${npe_node_mos_stn_fst}"
+    export PTILE="${npe_node_mos_stn_fcst}"
     ;;
 
   "mos_grd_fcst")
@@ -1072,7 +1072,7 @@ case ${step} in
     export nth_mos_grd_fcst=1
     export memory_mos_grd_fcst="50GB"
     export NTASK="${npe_mos_grd_fcst}"
-    export PTILE="${npe_node_mos_grd_fst}"
+    export PTILE="${npe_node_mos_grd_fcst}"
     ;;
 
   "mos_ext_stn_fcst")
@@ -1093,7 +1093,7 @@ case ${step} in
     export nth_mos_ext_grd_fcst=1
     export memory_mos_ext_grd_fcst="50GB"
     export NTASK="${npe_mos_ext_grd_fcst}"
-    export PTILE="${npe_node_mos_ext_grd_fst}"
+    export PTILE="${npe_node_mos_ext_grd_fcst}"
     ;;
 
   "mos_stn_prdgen")
@@ -1115,7 +1115,7 @@ case ${step} in
     export memory_mos_grd_prdgen="20GB"
     export NTASK="${npe_mos_grd_prdgen}"
     export PTILE="${npe_node_mos_grd_prdgen}"
-    export OMP_NUM_THREADS="${nth_mos_grd_prden}"
+    export OMP_NUM_THREADS="${nth_mos_grd_prdgen}"
     ;;
 
   "mos_ext_stn_prdgen")
@@ -1137,7 +1137,7 @@ case ${step} in
     export memory_mos_ext_grd_prdgen="30GB"
     export NTASK="${npe_mos_ext_grd_prdgen}"
     export PTILE="${npe_node_mos_ext_grd_prdgen}"
-    export OMP_NUM_THREADS="${nth_mos_ext_grd_prden}"
+    export OMP_NUM_THREADS="${nth_mos_ext_grd_prdgen}"
     ;;
 
   "mos_wx_prdgen")
@@ -1148,7 +1148,7 @@ case ${step} in
     export memory_mos_wx_prdgen="10GB"
     export NTASK="${npe_mos_wx_prdgen}"
     export PTILE="${npe_node_mos_wx_prdgen}"
-    export OMP_NUM_THREADS="${nth_mos_wx_prden}"
+    export OMP_NUM_THREADS="${nth_mos_wx_prdgen}"
     ;;
 
   "mos_wx_ext_prdgen")

diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
@@ -117,15 +117,10 @@ FV3_predet(){
   FV3_OUTPUT_FH=""
   local fhr=${FHMIN}
   if (( FHOUT_HF > 0 && FHMAX_HF > 0 )); then
-    for (( fh = FHMIN; fh < FHMAX_HF; fh = fh + FHOUT_HF )); do
-      FV3_OUTPUT_FH="${FV3_OUTPUT_FH} ${fh}"
-    done
+    FV3_OUTPUT_FH="${FV3_OUTPUT_FH} $(seq -s ' ' "${FHMIN}" "${FHOUT_HF}" "${FHMAX_HF}")"
     fhr=${FHMAX_HF}
   fi
-  for (( fh = fhr; fh <= FHMAX; fh = fh + FHOUT )); do
-    FV3_OUTPUT_FH="${FV3_OUTPUT_FH} ${fh}"
-  done
-
+  FV3_OUTPUT_FH="${FV3_OUTPUT_FH} $(seq -s ' ' "${fhr}" "${FHOUT}" "${FHMAX}")"
 
   # Model resolution specific parameters
   DELTIM=${DELTIM:-225}