From f5ef5834bb11b867c29771fb17dc79db57008d9c Mon Sep 17 00:00:00 2001
From: Rahul Mahajan <aerorahul@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:44:48 -0500
Subject: [PATCH] reduce threads for C48 to 1.  Move repeated logic for wrttask
 to after the case block

---
 parm/config/config.fv3 | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/parm/config/config.fv3 b/parm/config/config.fv3
index 27d24e9edb..ce39807d11 100755
--- a/parm/config/config.fv3
+++ b/parm/config/config.fv3
@@ -50,15 +50,13 @@ case ${case_in} in
         export layout_y=2
         export layout_x_gfs=3
         export layout_y_gfs=2
-        export nth_fv3=2
-        export nth_fv3_gfs=2
+        export nth_fv3=1
+        export nth_fv3_gfs=1
         export cdmbgwd="0.071,2.1,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP=64
-	if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
         export WRITE_GROUP_GFS=1
         export WRTTASK_PER_GROUP_GFS=64
-        if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
         export WRTIOBUF="1M"
         ;;
     "C96")
@@ -72,10 +70,8 @@ case ${case_in} in
         export cdmbgwd="0.14,1.8,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP=64
-	if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
         export WRITE_GROUP_GFS=1
         export WRTTASK_PER_GROUP_GFS=64
-	if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
         export WRTIOBUF="4M"
         export n_split=6
         ;;
@@ -90,10 +86,8 @@ case ${case_in} in
         export cdmbgwd="0.23,1.5,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP=64
-	if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
         export WRITE_GROUP_GFS=2
         export WRTTASK_PER_GROUP_GFS=64
-	if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
         export WRTIOBUF="8M"
         ;;
     "C384")
@@ -107,10 +101,8 @@ case ${case_in} in
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP=64
-	if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
         export WRITE_GROUP_GFS=${WRITE_GROUP_GFS:-2}
         export WRTTASK_PER_GROUP_GFS=${WRTTASK_PER_GROUP_GFS:-64}
-	if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
         export WRTIOBUF=${WRTIOBUF:-"16M"}
         ;;
     "C768")
@@ -124,10 +116,8 @@ case ${case_in} in
         export cdmbgwd="4.0,0.15,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP=64
-	if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
         export WRITE_GROUP_GFS=4
         export WRTTASK_PER_GROUP_GFS=64
-	if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
         export WRTIOBUF="32M"
         ;;
     "C1152")
@@ -166,6 +156,9 @@ case ${case_in} in
         ;;
 esac
 
+if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
+if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
+
 # Calculate chunksize based on resolution
 export RESTILE=$(echo ${case_in} |cut -c2-)
 export ichunk2d=$((4*RESTILE))