Merge pull request #148 from NOAA-EMC/feature/gfsv16b_updates

Updates to optimize wave post jobs
NOAA-EMC · Oct 5, 2020 · 6197bc6 · 6197bc6
2 parents 451669a + cd86b0e
commit 6197bc6
Show file tree

Hide file tree

Showing 21 changed files with 841 additions and 554 deletions.
diff --git a/jobs/rocoto/waveinit.sh b/jobs/rocoto/waveinit.sh
@@ -13,7 +13,7 @@ echo "=============== START TO RUN WAVE INIT ==============="
 # Execute the JJOB
 $HOMEgfs/jobs/JGLOBAL_WAVE_INIT
 status=$?
-exit $status
+[[ $status -ne 0 ]] && exit $status
 
 ###############################################################
 # Force Exit out cleanly

diff --git a/jobs/rocoto/wavepostbndpnt.sh b/jobs/rocoto/wavepostbndpnt.sh
@@ -13,7 +13,7 @@ echo "=============== START TO RUN WAVE_POST_BNDPNT ==============="
 # Execute the JJOB
 $HOMEgfs/jobs/JGLOBAL_WAVE_POST_BNDPNT
 status=$?
-exit $status
+[[ $status -ne 0 ]] && exit $status
 
 ###############################################################
 # Force Exit out cleanly

diff --git a/jobs/rocoto/wavepostpnt.sh b/jobs/rocoto/wavepostpnt.sh
@@ -13,7 +13,7 @@ echo "=============== START TO RUN WAVE_POST_PNT ==============="
 # Execute the JJOB
 $HOMEgfs/jobs/JGLOBAL_WAVE_POST_PNT
 status=$?
-exit $status
+[[ $status -ne 0 ]] && exit $status
 
 ###############################################################
 # Force Exit out cleanly

diff --git a/jobs/rocoto/wavepostsbs.sh b/jobs/rocoto/wavepostsbs.sh
@@ -13,7 +13,7 @@ echo "=============== START TO RUN WAVE POST_SBS ==============="
 # Execute the JJOB
 $HOMEgfs/jobs/JGLOBAL_WAVE_POST_SBS
 status=$?
-exit $status
+[[ $status -ne 0 ]] && exit $status
 
 ###############################################################
 # Force Exit out cleanly

diff --git a/jobs/rocoto/waveprep.sh b/jobs/rocoto/waveprep.sh
@@ -13,7 +13,7 @@ echo "=============== START TO RUN WAVE PREP ==============="
 # Execute the JJOB
 $HOMEgfs/jobs/JGLOBAL_WAVE_PREP
 status=$?
-exit $status
+[[ $status -ne 0 ]] && exit $status
 
 ###############################################################
 # Force Exit out cleanly

diff --git a/parm/config/config.resources b/parm/config/config.resources
@@ -68,16 +68,16 @@ elif [ $step = "wavepostsbs" ]; then
 
 elif [ $step = "wavepostbndpnt" ]; then
 
-    export wtime_wavepostbndpnt="03:00:00"
-    export npe_wavepostbndpnt=56
+    export wtime_wavepostbndpnt="01:00:00"
+    export npe_wavepostbndpnt=280
     export nth_wavepostbndpnt=1
     export npe_node_wavepostbndpnt=$(echo "$npe_node_max / $nth_wavepostbndpnt" | bc)
     export NTASKS=${npe_wavepostbndpnt}
 
 elif [ $step = "wavepostpnt" ]; then
 
-    export wtime_wavepostpnt="03:00:00"
-    export npe_wavepostpnt=56
+    export wtime_wavepostpnt="01:30:00"
+    export npe_wavepostpnt=280
     export nth_wavepostpnt=1
     export npe_node_wavepostpnt=$(echo "$npe_node_max / $nth_wavepostpnt" | bc)
     export NTASKS=${npe_wavepostpnt}

diff --git a/scripts/exgfs_wave_init.sh b/scripts/exgfs_wave_init.sh
@@ -182,9 +182,9 @@
     then
       set +x
       echo ' '
-      echo '********************************************'
-      echo '*** POE FAILURE DURING RAW DATA COPYING ***'
-      echo '********************************************'
+      echo '********************************************************'
+      echo '*** FATAL ERROR: POE FAILURE DURING RAW DATA COPYING ***'
+      echo '********************************************************'
       echo '     See Details Below '
       echo ' '
       [[ "$LOUD" = YES ]] && set -x