<p><b>dwj07@fsu.edu</b> 2012-03-20 14:50:43 -0600 (Tue, 20 Mar 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Improving test case driver script and readme file.<br>
<br>
        Now it allows compile_set to be input on the command line, and provides an example use<br>
        in the usage statement.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/README
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/README        2012-03-20 20:07:55 UTC (rev 1688)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/README        2012-03-20 20:50:43 UTC (rev 1689)
@@ -63,7 +63,7 @@
        but there are other variables that can be configured for use in clusters.
        It's usage is as follows:
-                ./oceanTestCases.sh [action] [test_case]
+                ./oceanTestCases.sh [action] [test_case] [compile_set]
        
        Action can be any of the following:
                setup
@@ -74,6 +74,8 @@
        Case can be any sub-directory. This script assumes it was set up properly (as the existing test_cases are).
        The only exception is that case can also be mpas. A case of mpas can only be used when the action is clean.
+        Compile_Set can be any valid compile set in MPAS' Makefile. It is only used if MPAS needs to be setup.
+
        The actions are described below:
                setup:
                        This is meant to create and initialize all of the run directories for a given
Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-03-20 20:07:55 UTC (rev 1688)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-03-20 20:50:43 UTC (rev 1689)
@@ -24,6 +24,7 @@
## Script starts here ##
########################
+
CUR_DIR=`pwd`
ACTION=$1
@@ -260,8 +261,21 @@
MPAS_BUILD_RUN="no"
## Check to see if mpas has already been built, if not set it up
if [ ! -e mpas/src/ocean_model.exe -a $ACTION != "clean" ]; then
+        if [ $# -ge 3 ]; then
+                echo ""
+                echo "Overriding COMPILE_SET with $3"
+                echo ""
+                COMPILE_SET=$3
+        fi
        echo "MPAS is not setup properly yet. Setting up MPAS first."
        setup_mpas
+
+        if [ ! -e mpas/src/ocean_model.exe ]; then
+                echo ""
+                echo "MPAS was not successfully built. Please ensure your compiler set is correct."
+                echo "${COMPILE_SET} was used this time."
+                echo ""
+        fi
        MPAS_BUILD_RUN="yes"
fi
@@ -275,6 +289,7 @@
        echo "pmetis is not found."
        echo "pmetis must be in your path."
        echo "exiting."
+        echo ""
        exit
fi
@@ -296,6 +311,7 @@
        ## If case is mpas and action is setup, exit
        if [ $CASE == "mpas" -a $ACTION == "setup" -a $MPAS_BUILD_RUN == "no" ]; then
+                echo ""
                echo "MPAS was previous setup. Nothing to do."
                echo "To check the parameters of the build, view .run_info"
                echo ""
@@ -320,12 +336,24 @@
## Print usage statement
if [ $VALID == "no" ]; then
        echo "Invalid usage."
-        echo "./oceanTestCases.sh [action] [case]"
+        echo "./oceanTestCases.sh [action] [case] [compile_set]"
        echo ""
        echo "[action] = setup submit postprocess clean"
        echo ""
        echo "[case] = lock_exchange baroclinic_channel"
-        echo "[case] = mpas (only for action = clean)"
+        echo "[case] = mpas (only for actions = setup or clean)"
+        echo ""
+        echo "[compile_set] = a valid compile set for MPAS' Makefile"
+        echo "[compile_set] is only used when MPAS has not been setup previously"
+        echo ""
+        echo ""
+        echo "Example use:"
+        echo "svn update"
+        echo "oceanTestCases.sh clean mpas"
+        echo "oceanTestCases.sh clean [case]"
+        echo "oceanTestCases.sh setup mpas [compile_set]"
+        echo "oceanTestCases.sh setup [case]"
+        echo ""
        exit
fi
</font>
</pre>