<p><b>dwj07@fsu.edu</b> 2012-03-18 10:49:17 -0600 (Sun, 18 Mar 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Updating advective transport test case.<br>
<br>
        Adding getErrors.sh to oceanTestCases call.<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-16 20:50:36 UTC (rev 1665)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/README        2012-03-18 16:49:17 UTC (rev 1666)
@@ -15,7 +15,8 @@
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.
+        any meshes that require generation. There is also a getErrors.sh script
+        which can be used to compute the errors from a test case.
        The existing directories can be used as a template for setting up new test cases.
@@ -73,6 +74,10 @@
                        timing_results_[case].txt
                        timing_results2_[case].txt
                        timing_results3_[case].txt
+
+                        If a getErrors.sh script is present in the test case directory, it is run to compute errors.
+                        The names of the error files are different for each test case, but they should end with .erorrs
+                        to allow the clean action to remove them from the test case directory.
                clean:
                        This action cleans the [case] directory as if it was cleanly checked out.
Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/basin_src/basin-template.F
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/basin_src/basin-template.F        2012-03-16 20:50:36 UTC (rev 1665)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/basin_src/basin-template.F        2012-03-18 16:49:17 UTC (rev 1666)
@@ -294,7 +294,7 @@
integer :: iTracer, ix, iy, ndata, i, j, k, ixt, iyt, ncull, jcount, iNoData, kdata(nVertLevelsMod)
logical :: flag_lat
-real :: a, u0, gh0
+real :: a, omega0, gh0
pi = 4.0*atan(1.0)
dtr = pi/180.0
@@ -362,18 +362,17 @@
d = 75
allocate(psiVertex(nVerticesNew))
- r0 = 1.0*140.0
+ r0 = 140.0
delta = 0.05
- u0 = 2.0 * pi / (2.0 * 60.0 * 60.0) ! one revolution of a circle in 2 hours
- u0 = 2.0 * pi * r0 / (2.0 * 60.0 * 60.0)
+ omega0 = 2.0 * r0* pi / (2.0 * 60.0 * 60.0) ! one revolution of a circle in 2 hours
do iVertex = 1, nVerticesNew
xin = xVertexNew(iVertex) - xmid
yin = yVertexNew(iVertex) - ymid
- r = sqrt(xin**2 + yin**2)
+ r = sqrt(xin**2 + yin**2)/r0 ! nondimensional radial distance
- psiVertex(iVertex) = 1.0/4.0*(r**2 - (r + r0)*sqrt((r-r0)**2 + delta**2) + delta**2*log((r - r0) + sqrt((r-r0)**2 + delta**2)))
+ psiVertex(iVertex) = -omega0*r0/4.0*(r**2 - (r + 1)*sqrt((r-1)**2 + delta**2) + delta**2*log((r - 1) + sqrt((r-1)**2 + delta**2)))
end do
do iEdge = 1, nEdgesNew
@@ -397,7 +396,7 @@
r = sqrt( (xEdgeNew(iEdge) - xmid)**2 + (yEdgeNew(iEdge) - ymid)**2)
- uNew(1, :, iEdge) = -u0 * (psiVertex(verticesOnEdgeNew(2, iEdge)) - psiVertex(verticesOnEdgeNew(1, iEdge))) / (r0 * dvEdgeNew(iEdge))
+ uNew(1, :, iEdge) = (psiVertex(verticesOnEdgeNew(2, iEdge)) - psiVertex(verticesOnEdgeNew(1, iEdge))) / (dvEdgeNew(iEdge))
end do
do iCell = 1, nCellsNew
Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/makeMeshes.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/makeMeshes.sh        2012-03-16 20:50:36 UTC (rev 1665)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/makeMeshes.sh        2012-03-18 16:49:17 UTC (rev 1666)
@@ -11,7 +11,7 @@
###############################################################
## Change reference spacing, time_step, and viscosities here ##
###############################################################
-REF_TIME_STEP="20"
+REF_TIME_STEP="10"
REF_VISC_H="0.0"
REF_VISC_V="0.0"
REF_SPACING="10.0"
@@ -35,7 +35,7 @@
#######################################################
ADVECTION_ROUTINES="std2 std3 std4 fct2 fct3 fct4"
TIME_STEPPERS="rk4"
-TIME_STEPS="20"
+TIME_STEPS="10"
############################################################
## Setup Default namelist keys and values to update later ##
Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-03-16 20:50:36 UTC (rev 1665)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/oceanTestCases.sh        2012-03-18 16:49:17 UTC (rev 1666)
@@ -221,6 +221,13 @@
        cat timing_results3_back >> timing_results3_${CASE}.txt
        rm -f first second third fourth timing_results3_front timing_results3_back
+
+        cd ${CASE}
+        if [ -e getErrors.sh ]; then
+                echo "Computing Errors"
+                ./getErrors.sh > /dev/null
+        fi
+        cd ${CUR_DIR}
} #}}}
## Clean up mpas directory
@@ -238,6 +245,7 @@
        rm -rf *m_*levs* submits
        rm -f run_paths
        rm -f MPAS-namelist.input.repo
+        rm -f *.errors
        cd ${CUR_DIR}
        rm -f *${CASE}.sh
</font>
</pre>