<p><b>dwj07@fsu.edu</b> 2012-03-20 14:07:55 -0600 (Tue, 20 Mar 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Improving information presented to user.<br>
        Adding information to README.<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 17:24:57 UTC (rev 1687)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/README        2012-03-20 20:07:55 UTC (rev 1688)
@@ -6,13 +6,19 @@
#########################################
This directory is intended to allow some-what automated testing of mpas, using a set of test cases.
+
+
Provided in this directory are:
+----------------------------------------------------------------------------------
        Test cases - in sub-directories
        Template Submit scripts - for each machine type
        A Control script - for automated handling of the test cases.
+
Each of these will be described below.
+
Test cases:
+----------------------------------------------------------------------------------
        Within each default sub-directory there is a script, called makeMeshes.sh.
        This script is intended to set up all of the run directories, and generate
        any meshes that require generation. There is also a getErrors.sh script
@@ -36,16 +42,26 @@
        Batch runs are placed under this "typical use case" directory, within the .batch_runs
        directory.
+
Template submit scripts:
+----------------------------------------------------------------------------------
        These files have the following naming scheme:
                machinename_submit_template.sh
        The existing templates can be used to help generate templates for different machines.
        They are used in the driver script for submitting jobs to a queue.
+
Control script:
+----------------------------------------------------------------------------------
        This script is named:
                oceanTestCases.sh
+        Before using it, several variables need to be set up in the scripts preamble.
+        Two variables with need to be set up are:
+                REPOSITORY_ADDRESS
+                COMPILE_SET
+        but there are other variables that can be configured for use in clusters.
+
        It's usage is as follows:
                ./oceanTestCases.sh [action] [test_case]
        
Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-03-20 17:24:57 UTC (rev 1687)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-03-20 20:07:55 UTC (rev 1688)
@@ -49,9 +49,10 @@
        echo "Checking out ${REPOSITORY_ADDRESS}"
        svn co $REPOSITORY_ADDRESS mpas > /dev/null
        cd mpas
+        svn up > /dev/null
        ## Compile mpas using given compile set
-        echo "Compiling mpas"
+        echo "Compiling mpas using ${COMPILE_SET}"
        make $COMPILE_SET CORE=ocean > /dev/null &> /dev/null
        REV=`svn info | grep "Revision"`
        cd ..
@@ -256,10 +257,12 @@
#}}}
+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
        echo "MPAS is not setup properly yet. Setting up MPAS first."
        setup_mpas
+        MPAS_BUILD_RUN="yes"
fi
## Check to see if pmetis is in path, as it is supposed to be. If not exit
@@ -291,12 +294,27 @@
                fi
        fi
-        ## If case is mpas, action has to be clean
+        ## If case is mpas and action is setup, exit
+        if [ $CASE == "mpas" -a $ACTION == "setup" -a $MPAS_BUILD_RUN == "no" ]; then
+                echo "MPAS was previous setup. Nothing to do."
+                echo "To check the parameters of the build, view .run_info"
+                echo ""
+                exit
+        elif [ $CASE == "mpas" -a $ACTION == "setup" -a $MPAS_BUILD_RUN == "yes" ]; then
+                exit
+        fi
+
+        ## If case is mpas, action has to be clean, or setup
        if [ $CASE == "mpas" -a $ACTION != "clean" ]; then
-                echo "A case of mpas can only have action of clean"
+                echo "A case of mpas can only have action of clean or setup"
                echo ""
                VALID="no"
        fi
+
+        ## If case is mpas, action has to be clean, or setup
+        if [ $CASE == "mpas" -a $ACTION == "clean" ]; then
+                VALID="yes"
+        fi
fi
## Print usage statement
</font>
</pre>