Remove S4-specific optimizations. NOAA-EMC#138

modulefiles/module_base.s4.lua

@@ -1,5 +1,5 @@
 help([[
-Load environment to run GFS on Hera
+Load environment to run GFS on S4
 ]])
 
 load("license_intel")

parm/config/config.fv3

@@ -65,11 +65,6 @@ case $case_in in
         export layout_y_gfs=4
         export nth_fv3=1
         export nth_fv3_gfs=1
-        #S4 is throttled to improve cycle runtime
-        if [[ $machine = "S4" && "${CASE_ENKF:-N/A}" == "C96" ]]; then
-           export layout_x=4
-           export layout_y=4
-        fi
         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=$npe_node_max
@@ -86,12 +81,6 @@ case $case_in in
         export layout_y_gfs=6
         export nth_fv3=2
         export nth_fv3_gfs=2
-        #S4 is throttled to improve cycle runtime
-        if [[ $machine = "S4" && "${CASE_ENKF:-N/A}" = "C192" ]]; then
-            export layout_x=4
-            export layout_y=4
-            export nth_fv3=1
-        fi
         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=$npe_node_max
@@ -107,15 +96,6 @@ case $case_in in
         export layout_y_gfs=${layout_y_gfs:-12}
         export nth_fv3=2
         export nth_fv3_gfs=${nth_fv3_gfs:-2}
-        #S4 is throttled to allow multiple user to run at once and improve cycle times
-        if [[ "$machine" == "S4" ]]; then
-           export layout_x=8
-           export layout_y=8
-           export layout_x_gfs=8
-           export layout_y_gfs=8
-           export nth_fv3=1
-           export nth_fv3_gfs=1
-        fi
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP=$npe_node_max

parm/config/config.resources

@@ -281,10 +281,6 @@ elif [ ${step} = "gldas" ]; then
 elif [ ${step} = "fcst" ]; then
 
     export wtime_fcst="00:30:00"
-    #Increase walltimes on S4 to accomodate smaller core counts
-    if [[ ${machine} == "S4" ]]; then
-       export wtime_fcst="01:00:00"
-    fi
     if [ ${CASE} = "C768" ]; then
       export wtime_fcst_gfs="06:00:00"
     elif [ ${CASE} = "C384" ]; then
@@ -392,17 +388,6 @@ elif [ ${step} = "post" ]; then
     export nth_post=1
     export npe_node_post=12
     export npe_node_dwn=${npe_node_max}
-    if [[ ${machine} == "S4" ]]; then
-       #Limit post jobs to 1 node on S4/s4 and 2 nodes on S4/ivy
-       #Note that wgrib2 is called with -ncpu=1
-       if [[ ${PARTITION_BATCH} = "s4" ]]; then
-          export npe_post=32
-          export npe_node_post=32
-       elif [[ ${PARTITION_BATCH} = "ivy" ]]; then
-          export npe_post=40
-          export npe_node_post=20
-       fi
-    fi
 
 elif [ ${step} = "wafs" ]; then
 
@@ -635,11 +620,6 @@ elif [ ${step} = "epos" ]; then
     export wtime_epos="00:15:00"
     export npe_epos=80
     export nth_epos=6
-    if [[ ${machine} = "S4" ]]; then
-       #Limit epos jobs to 1 thread on S4 to improve cycle times
-       export nth_epos=1
-       export wtime_epos="00:30:00"
-    fi
     export npe_node_epos=$(echo "${npe_node_max} / ${nth_epos}" | bc)
 
 elif [ ${step} = "postsnd" ]; then