<p><b>dwj07@fsu.edu</b> 2012-02-28 09:52:30 -0700 (Tue, 28 Feb 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Updating oceanTestCases scripts to be compatibile with the new Makefile version.<br>
        It still works with the old version as well, so any branch (or the trunk) should work.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-02-28 15:44:31 UTC (rev 1541)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-02-28 16:52:30 UTC (rev 1542)
@@ -18,7 +18,7 @@
MACHINE_PPN="16"
SUBMISSION_CMD=msub
PROC_LIST="2 4 8 16 32 64 128 256 512 1024 2048 4096"
-PROC_LIST="2 4"
+PROC_LIST="2 4 8"
########################
## Script starts here ##
@@ -57,12 +57,16 @@
        cd ..
        ## Make a variable containing the make options used to build mpas
-        MAKE_OPTS=`grep "$COMPILE_SET:" mpas/Makefile -A 11 | tail -n 11 | grep "[a-zA-Z]"`
+        MAKE_OPTS=`sed -n "/${COMPILE_SET}:/,/:/p" mpas/Makefile | head -n -2 \
+                 | grep "_PARALLEL" -v | grep "_DEBUG" -v | sed "s/FC_SERIAL/SFC/g" \
+                 | sed "s/CC_SERIAL/SCC/g" | sed "s/_OPT//g" | grep "SERIAL" -v \
+                 | grep "DEBUG" -v | grep "USE_PAPI" -v | tail -n +2`
        ## Create the run_info file, which will be used later to identify what
        ## revision the run was performed from
        echo "Compile flags:" >> .run_info
-        grep "$COMPILE_SET:" mpas/Makefile -A 11 | grep "[a-zA-Z]" >> .run_info
+        echo "$COMPILE_SET:" >> .run_info
+        sed -n "/${COMPILE_SET}:/,/:/p" mpas/Makefile | head -n -2 | tail -n +2 >> .run_info
        echo "" >> .run_info
        echo "Checkout path:" >> .run_info
        echo "$REPOSITORY_ADDRESS" >> .run_info
</font>
</pre>