<p><b>dwj07@fsu.edu</b> 2012-03-16 10:37:59 -0600 (Fri, 16 Mar 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Adding a non-divergent flow field to advective transport test case.<br>
</p><hr noshade><pre><font color="gray">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 15:08:09 UTC (rev 1658)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/basin_src/basin-template.F 2012-03-16 16:37:59 UTC (rev 1659)
@@ -289,7 +289,7 @@
implicit none
real :: halfwidth, dtr, pi, p(3), q(3), xin, yin, zin, ulon, ulat, stress, n1, n2, distance, r, temp_t, temp_s, d
real :: dotProd, xmin, xmax, xmid, ymin, ymax, ymid
-real :: r0, delta
+real :: r0, delta, umax
real, dimension(:), allocatable :: psiVertex
integer :: iTracer, ix, iy, ndata, i, j, k, ixt, iyt, ncull, jcount, iNoData, kdata(nVertLevelsMod)
logical :: flag_lat
@@ -363,8 +363,9 @@
d = 75
allocate(psiVertex(nVerticesNew))
r0 = 1.0*140.0
- delta = 0.10
+ 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)
do iVertex = 1, nVerticesNew
xin = xVertexNew(iVertex) - xmid
@@ -372,8 +373,6 @@
r = sqrt(xin**2 + yin**2)
-! psiVertex(iVertex) = (tanh( (r - pi * d) / d) + 1.0) /2.0
-! psiVertex(iVertex) = -cos(r * 2.0 * pi / 250.0)
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)))
end do
@@ -398,26 +397,9 @@
r = sqrt( (xEdgeNew(iEdge) - xmid)**2 + (yEdgeNew(iEdge) - ymid)**2)
-! uNew(1, :, iEdge) = -1.0 * (psiVertex(verticesOnEdgeNew(2, iEdge)) - psiVertex(verticesOnEdgeNew(1, iEdge))) / dvEdgeNew(iEdge)
-
- if(r .le. 140.0) then
- uNew(1,:,iEdge) = dotProd * u0 * r
- else if(r .le. 210.0) then
- uNew(1,:,iEdge) = 2.0 * dotProd * u0 * (210.0 - r)
- else
- uNew(1,:,iEdge) = 0.0
- end if
-
+ uNew(1, :, iEdge) = -u0 * (psiVertex(verticesOnEdgeNew(2, iEdge)) - psiVertex(verticesOnEdgeNew(1, iEdge))) / (r0 * dvEdgeNew(iEdge))
end do
- xmin = minval(xCellNew)
- xmax = maxval(xCellNew)
- xmid = (xmax + xmin)/2.0
-
- ymin = minval(yCellNew)
- ymax = maxval(yCellNew)
- ymid = (ymax + ymin)/2.0
-
do iCell = 1, nCellsNew
r = sqrt( (xCellNew(iCell) - xmid)**2 + (yCellNew(iCell) - (ymid + 50.0 ))**2)
if((yCellNew(iCell) > (ymid +50.0 ) .or. xCellNew(iCell) .ge. (xmid+5.0) .or. xCellNew(iCell) .le. (xmid-5.0)) .and. r < 25.0) then
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 15:08:09 UTC (rev 1658)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/makeMeshes.sh 2012-03-16 16:37:59 UTC (rev 1659)
@@ -5,7 +5,7 @@
## To start, grids are periodic in the x direction. This may change later ##
########################################################################################
SPACINGS="1 2 4 8 16"
-VERTLEVS="10"
+VERTLEVS="5"
TCNAME="advective_transport"
###############################################################
@@ -127,8 +127,7 @@
NUM_LINES=`echo ${NUM_LINES}-1 | bc`
sed -n "/_model/,/\//p" MPAS-namelist.input.temporary | head -n ${NUM_LINES} > namelist.top
-echo " config_prescribe_velocity = .true." >> namelist.top
-echo " config_prescribe_thickness = .true." >> namelist.top
+echo " config_prescribe_velocity = .true." >> namelist.top
echo '/' >> namelist.top
echo '' >> namelist.top
sed '/_model/,/\//d' MPAS-namelist.input.temporary > namelist.bottom
Deleted: branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/periodic_hex/Makefile.front
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/periodic_hex/Makefile.front 2012-03-16 15:08:09 UTC (rev 1658)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/periodic_hex/Makefile.front 2012-03-16 16:37:59 UTC (rev 1659)
@@ -1,11 +0,0 @@
-gfortran:
- ( make all \
- "FC = mpif90" \
- "CC = mpicc" \
- "SFC = gfortran" \
- "SCC = gcc" \
- "FFLAGS = -O3 -m64 -ffree-line-length-none -fdefault-real-8 -fconvert=big-endian -ffree-form" \
- "CFLAGS = -O3 -m64" \
- "LDFLAGS = -O3 -m64" \
- "CORE = $(CORE)" \
- "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
Deleted: branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/periodic_hex/namelist.input
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/periodic_hex/namelist.input 2012-03-16 15:08:09 UTC (rev 1658)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/advective_transport/periodic_hex/namelist.input 2012-03-16 16:37:59 UTC (rev 1659)
@@ -1,8 +0,0 @@
-&periodic_grid
- nx = 300,
- ny = 302,
- dc = 2.0,
- nVertLevels = 1,
- nTracers = 1,
- nproc = 1
-/
</font>
</pre>