<p><b>dwj07@fsu.edu</b> 2012-10-19 14:39:30 -0600 (Fri, 19 Oct 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Clean-up before trunk merge.<br>
This removes non-bit reproducible versions.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_mpas_core.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_mpas_core.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -702,7 +702,7 @@
do iCell = 1,nCells
! Check if abs(ssh)>2m. If so, print warning.
if (abs(sum(h(1:maxLevelCell(iCell),iCell))-bottomDepth(iCell))>2.0) then
- write (0,'a') ' Warning: abs(sum(h)-bottomDepth)>2m. Most likely, initial h does not match bottomDepth.'
+ write (0,'(a)') ' Warning: abs(sum(h)-bottomDepth)>2m. Most likely, initial h does not match bottomDepth.'
write (0,*) ' iCell, K=maxLevelCell(iCell), bottomDepth(iCell),sum(h),bottomDepth,hZLevel(K),h(K): ', &
iCell, maxLevelCell(iCell), bottomDepth(iCell),sum(h(1:maxLevelCell(iCell),iCell)),bottomDepth(iCell), &
hZLevel(maxLevelCell(iCell)), h(maxLevelCell(iCell),iCell)
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tendency.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tendency.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -582,7 +582,6 @@
divergence(:,:) = 0.0
ke(:,:) = 0.0
v(:,:) = 0.0
- ! DWJ 10/05/12 Bit Reproducible Versions
do iVertex = 1, nVertices
invAreaTri1 = 1.0 / areaTriangle(iVertex)
do i = 1, vertexDegree
@@ -609,41 +608,7 @@
end do
end do
- ! DWJ 10/05/12 Non Bit Reproducible Version
do iEdge=1,nEdges
-! vertex1 = verticesOnEdge(1,iEdge)
-! vertex2 = verticesOnEdge(2,iEdge)
-
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-
-! invAreaTri1 = 1.0 / areaTriangle(vertex1)
-! invAreaTri2 = 1.0 / areaTriangle(vertex2)
-
-! !dwj: 02/23/12 arraCell(nCells+1) is still 0, this is a temporary fix
-! invAreaCell1 = 1.0 / max(areaCell(cell1), 1.0)
-! invAreaCell2 = 1.0 / max(areaCell(cell2), 1.0)
-
-! do k=1,maxLevelEdgeBot(iEdge)
-! ! Compute circulation and relative vorticity at each vertex
-! r_tmp = dcEdge(iEdge) * u(k,iEdge)
-! circulation(k,vertex1) = circulation(k,vertex1) - r_tmp
-! circulation(k,vertex2) = circulation(k,vertex2) + r_tmp
-
-! vorticity(k, vertex1) = vorticity(k, vertex1) - r_tmp * invAreaTri1
-! vorticity(k, vertex2) = vorticity(k, vertex2) + r_tmp * invAreaTri2
-
-! ! Compute the divergence at each cell center
-! r_tmp = dvEdge(iEdge) * u(k, iEdge)
-! divergence(k,cell1) = divergence(k,cell1) + r_tmp * invAreaCell1
-! divergence(k,cell2) = divergence(k,cell2) - r_tmp * invAreaCell2
-
-! ! Compute kinetic energy in each cell
-! r_tmp = r_tmp * dcEdge(iEdge) * u(k,iEdge)
-! ke(k,cell1) = ke(k,cell1) + 0.25 * r_tmp * invAreaCell1
-! ke(k,cell2) = ke(k,cell2) + 0.25 * r_tmp * invAreaCell2
-! end do
-
! Compute v (tangential) velocities
do i=1,nEdgesOnEdge(iEdge)
eoe = edgesOnEdge(i,iEdge)
@@ -659,7 +624,6 @@
!
! Compute kinetic energy in each vertex
!
- !DWJ 09/19/12 Bit Reproducible Version
kev(:,:) = 0.0; kevc(:,:) = 0.0
do iVertex = 1, nVertices*ke_vertex_flag
do i = 1, vertexDegree
@@ -682,30 +646,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges*ke_vertex_flag
-! do k=1,nVertLevels
-! r_tmp = dcEdge(iEdge) * dvEdge(iEdge) * u(k, iEdge)**2
-! kev(k,verticesOnEdge(1,iEdge)) = kev(k,verticesOnEdge(1,iEdge)) + r_tmp
-! kev(k,verticesOnEdge(2,iEdge)) = kev(k,verticesOnEdge(2,iEdge)) + r_tmp
-! end do
-! end do
-! do iVertex = 1,nVertices*ke_vertex_flag
-! do k=1,nVertLevels
-! kev(k,iVertex) = kev(k,iVertex) / areaTriangle(iVertex) * 0.25
-! enddo
-! enddo
-! do iVertex = 1, nVertices*ke_vertex_flag
-! do i=1,grid % vertexDegree
-! iCell = cellsOnVertex(i,iVertex)
-! !dwj: 02/23/12 arraCell(nCells+1) is still 0, this is a temporary fix
-! invAreaCell1 = 1.0 / max(areaCell(iCell), 1.0)
-! do k=1,nVertLevels
-! kevc(k,iCell) = kevc(k,iCell) + kiteAreasOnVertex(i, iVertex) * kev(k, iVertex) * invAreaCell1
-! enddo
-! enddo
-! enddo
-
!
! Compute kinetic energy in each cell by blending ke and kevc
!
@@ -747,7 +687,6 @@
Vor_cell(:,:) = 0.0
Vor_edge(:,:) = 0.0
- !DWJ 09/19/12 Bit Reproducible Version
do iEdge = 1, nEdges
vertex1 = verticesOnEdge(1, iEdge)
vertex2 = verticesOnEdge(2, iEdge)
@@ -768,32 +707,6 @@
end do
end do
-
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iVertex = 1,nVertices
-! do i=1,vertexDegree
-! iCell = cellsOnVertex(i,iVertex)
-! iEdge = edgesOnVertex(i,iVertex)
-
-! !dwj: 02/23/12 arraCell(nCells+1) is still 0, this is a temporary fix
-! invAreaCell1 = 1.0 / max(areaCell(iCell), 1.0)
-
-! ! Compute pv at cell centers
-! ! ( this computes Vor_cell for all real cells and distance-1 ghost cells )
-! do k = 1,maxLevelCell(iCell)
-! Vor_cell(k,iCell) = Vor_cell(k,iCell) + kiteAreasOnVertex(i, iVertex) * Vor_vertex(k, iVertex) * invAreaCell1
-! enddo
-
-! ! Compute pv at the edges
-! ! ( this computes Vor_edge at all edges bounding real cells )
-! do k=1,maxLevelEdgeBot(iEdge)
-! Vor_edge(k,iEdge) = Vor_edge(k,iEdge) + 0.5 * Vor_vertex(k,iVertex)
-! enddo
-! enddo
-! enddo
-
-! gradVor_n(:,:) = 0.0
-! gradVor_t(:,:) = 0.0
do iEdge = 1,nEdges
cell1 = cellsOnEdge(1, iEdge)
cell2 = cellsOnEdge(2, iEdge)
@@ -994,7 +907,6 @@
!
div_hu(:,:) = 0.0_RKIND
- !DWJ 09/19/12 Bit Reproducible Version
do iCell=1,nCells
invAreaCell = 1.0_RKIND / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -1007,21 +919,9 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-! do k=1,maxLevelEdgeBot(iEdge)
-! flux = uTransport(k,iEdge) * dvEdge(iEdge) * h_edge(k,iEdge)
-! div_hu(k,cell1) = div_hu(k,cell1) + flux
-! div_hu(k,cell2) = div_hu(k,cell2) - flux
-! end do
-! end do
-
do iCell=1,nCells
div_hu_btr(iCell) = 0.0_RKIND
do k=1,maxLevelCell(iCell)
-! div_hu(k,iCell) = div_hu(k,iCell) / areaCell(iCell)
div_hu_btr(iCell) = div_hu_btr(iCell) + div_hu(k,iCell)
end do
end do
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_thick_hadv.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_thick_hadv.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_thick_hadv.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -134,7 +134,6 @@
edgesOnCell => grid % edgesOnCell % array
edgeSignOnCell => grid % edgeSignOnCell % array
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell = 1.0 / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -146,22 +145,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-! do k=1,maxLevelEdgeBot(iEdge)
-! flux = u(k,iEdge) * dvEdge(iEdge) * h_edge(k,iEdge)
-! tend(k,cell1) = tend(k,cell1) - flux
-! tend(k,cell2) = tend(k,cell2) + flux
-! end do
-! end do
-! do iCell=1,nCells
-! do k=1,maxLevelCell(iCell)
-! tend(k,iCell) = tend(k,iCell) / areaCell(iCell)
-! end do
-! end do
-
!--------------------------------------------------------------------
end subroutine ocn_thick_hadv_tend!}}}
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_time_integration_split.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_time_integration_split.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -409,7 +409,6 @@
! config_btr_gam1_uWt1= 0 flux = uBtrOld*H
! mrp 120201 efficiency: could we combine the following edge and cell loops?
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, block % mesh % nCells
do i = 1, block % mesh % nEdgesOnCell % array(iCell)
iEdge = block % mesh % edgesOnCell % array(i, iCell)
@@ -443,7 +442,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
do iEdge=1,block % mesh % nEdges
cell1 = block % mesh % cellsOnEdge % array(1,iEdge)
cell2 = block % mesh % cellsOnEdge % array(2,iEdge)
@@ -467,9 +465,6 @@
+ config_btr_gam1_uWt1 * block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(iEdge)) &
* hSum
-! block % tend % ssh % array(cell1) = block % tend % ssh % array(cell1) - flux * block % mesh % dvEdge % array(iEdge)
-! block % tend % ssh % array(cell2) = block % tend % ssh % array(cell2) + flux * block % mesh % dvEdge % array(iEdge)
-
block % state % time_levs(1) % state % FBtr % array(iEdge) = block % state % time_levs(1) % state % FBtr % array(iEdge) &
+ FBtr_coeff*flux
end do
@@ -554,7 +549,6 @@
! config_btr_gam3_uWt2= 0 flux = uBtrOld*H
! mrp 120201 efficiency: could we combine the following edge and cell loops?
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, block % mesh % nCells
do i = 1, block % mesh % nEdgesOnCell % array(iCell)
iEdge = block % mesh % edgesOnCell % array(i, iCell)
@@ -593,7 +587,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
do iEdge=1,block % mesh % nEdges
cell1 = block % mesh % cellsOnEdge % array(1,iEdge)
cell2 = block % mesh % cellsOnEdge % array(2,iEdge)
@@ -621,9 +614,6 @@
+ config_btr_gam3_uWt2 * block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(iEdge)) &
* hSum
-! block % tend % ssh % array(cell1) = block % tend % ssh % array(cell1) - flux * block % mesh % dvEdge % array(iEdge)
-! block % tend % ssh % array(cell2) = block % tend % ssh % array(cell2) + flux * block % mesh % dvEdge % array(iEdge)
-
block % state % time_levs(1) % state % FBtr % array(iEdge) = block % state % time_levs(1) % state % FBtr % array(iEdge) + flux
end do
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_advection_mono.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_advection_mono.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_advection_mono.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -241,7 +241,6 @@
! Remove low order flux from the high order flux
! Store left over high order flux in high_order_horiz_flux array
! Upwind fluxes are accumulated in upwind_tendency
- !DWJ 09/19/12 Bit Reproducible Version
do iEdge = 1, nEdges
cell1 = cellsOnEdge(1,iEdge)
cell2 = cellsOnEdge(2,iEdge)
@@ -255,7 +254,6 @@
end do ! k loop
end do ! iEdge loop
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell1 = 1.0 / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -274,30 +272,6 @@
end do
end do
-
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge = 1, nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-
-! invAreaCell1 = 1.0 / areaCell(cell1)
-! invAreaCell2 = 1.0 / areaCell(cell2)
-
-! do k = 1, maxLevelEdgeTop(iEdge)
-! flux_upwind = dvEdge(iEdge) * (max(0.,uh(k,iEdge))*tracer_cur(k,cell1) + min(0.,uh(k,iEdge))*tracer_cur(k,cell2))
-! high_order_horiz_flux(k,iEdge) = high_order_horiz_flux(k,iEdge) - flux_upwind
-
-! upwind_tendency(k,cell1) = upwind_tendency(k,cell1) - flux_upwind * invAreaCell1
-! upwind_tendency(k,cell2) = upwind_tendency(k,cell2) + flux_upwind * invAreaCell2
-
-! ! Accumulate remaining high order fluxes
-! flux_outgoing(k,cell1) = flux_outgoing(k,cell1) - max(0.,high_order_horiz_flux(k,iEdge)) * invAreaCell1
-! flux_incoming (k,cell1) = flux_incoming (k,cell1) - min(0.,high_order_horiz_flux(k,iEdge)) * invAreaCell1
-! flux_outgoing(k,cell2) = flux_outgoing(k,cell2) + min(0.,high_order_horiz_flux(k,iEdge)) * invAreaCell2
-! flux_incoming (k,cell2) = flux_incoming (k,cell2) + max(0.,high_order_horiz_flux(k,iEdge)) * invAreaCell2
-! end do ! k loop
-! end do ! iEdge loop
-
! Build the factors for the FCT
! Computed using the bounds that were computed previously, and the bounds on the newly updated value
! Factors are placed in the flux_incoming and flux_outgoing arrays
@@ -341,7 +315,6 @@
end do ! iCell loop
! Accumulate the scaled high order horizontal tendencies
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell1 = 1.0 / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -356,25 +329,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge = 1, nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-
-! invAreaCell1 = 1.0 / areaCell(cell1)
-! invAreaCell2 = 1.0 / areaCell(cell2)
-! do k=1,maxLevelEdgeTop(iEdge)
-! tend(iTracer, k, cell1) = tend(iTracer, k, cell1) - high_order_horiz_flux(k, iEdge) * invAreaCell1
-! tend(iTracer, k, cell2) = tend(iTracer, k, cell2) + high_order_horiz_flux(k, iEdge) * invAreaCell2
-
-! if (config_check_monotonicity) then
-! !tracer_new holds a tendency for now.
-! tracer_new(k, cell1) = tracer_new(k, cell1) - high_order_horiz_flux(k, iEdge) * invAreaCell1
-! tracer_new(k, cell2) = tracer_new(k, cell2) + high_order_horiz_flux(k, iEdge) * invAreaCell2
-! end if
-! end do ! k loop
-! end do ! iEdge loop
-
! Accumulate the scaled high order vertical tendencies, and the upwind tendencies
do iCell = 1, nCellsSolve
do k = 1,maxLevelCell(iCell)
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del2.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del2.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del2.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -153,7 +153,6 @@
!
! compute a boundary mask to enforce insulating boundary conditions in the horizontal
!
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell1 = 1.0 / areaCell(iCell)
do i = 1, nEdgesOncell(iCell)
@@ -178,29 +177,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-! invAreaCell1 = 1.0/areaCell(cell1)
-! invAreaCell2 = 1.0/areaCell(cell2)
-
-! r_tmp = meshScalingDel2(iEdge) * eddyDiff2 * dvEdge(iEdge) / dcEdge(iEdge)
-
-! do k=1,maxLevelEdgeTop(iEdge)
-! do iTracer=1,num_tracers
-! ! \kappa_2 </font>
<font color="red">abla \phi on edge
-! tracer_turb_flux = tracers(iTracer,k,cell2) - tracers(iTracer,k,cell1)
-
-! ! div(h \kappa_2 </font>
<font color="gray">abla \phi) at cell center
-! flux = h_edge(k,iEdge) * tracer_turb_flux * edgeMask(k, iEdge) * r_tmp
-
-! tend(iTracer,k,cell1) = tend(iTracer,k,cell1) + flux * invAreaCell1
-! tend(iTracer,k,cell2) = tend(iTracer,k,cell2) - flux * invAreaCell2
-! end do
-! end do
-
-! end do
!--------------------------------------------------------------------
end subroutine ocn_tracer_hmix_del2_tend!}}}
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del4.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del4.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del4.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -157,7 +157,6 @@
delsq_tracer(:,:,:) = 0.0
! first del2: div(h </font>
<font color="gray">abla \phi) at cell center
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell1 = 1.0 / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -178,32 +177,7 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-
-! invdcEdge = 1.0 / dcEdge(iEdge)
-
-! invAreaCell1 = 1.0 / areaCell(cell1)
-! invAreaCell2 = 1.0 / areaCell(cell2)
-
-! do k=1,maxLevelEdgeTop(iEdge)
-! do iTracer=1,num_tracers * edgeMask(k, iEdge)
-
-! r_tmp1 = dvEdge(iEdge) * h_edge(k,iEdge) * invdcEdge
-
-! r_tmp2 = r_tmp1 * tracers(iTracer,k,cell2)
-! r_tmp1 = r_tmp1 * tracers(iTracer,k,cell1)
-
-! delsq_tracer(iTracer,k,cell1) = delsq_tracer(iTracer,k,cell1) + (r_tmp2 - r_tmp1) * invAreaCell1
-! delsq_tracer(iTracer,k,cell2) = delsq_tracer(iTracer,k,cell2) - (r_tmp2 - r_tmp1) * invAreaCell2
-! end do
-! end do
-! end do
-
! second del2: div(h </font>
<font color="gray">abla [delsq_tracer]) at cell center
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell1 = 1.0 / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -225,30 +199,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,grid % nEdges
-! cell1 = grid % cellsOnEdge % array(1,iEdge)
-! cell2 = grid % cellsOnEdge % array(2,iEdge)
-
-! invAreaCell1 = 1.0 / areaCell(cell1)
-! invAreaCell2 = 1.0 / areaCell(cell2)
-
-! invdcEdge = 1.0 / dcEdge(iEdge)
-
-! do k=1,maxLevelEdgeTop(iEdge)
-! do iTracer=1,num_tracers * edgeMask(k,iEdge)
-! tracer_turb_flux = meshScalingDel4(iEdge) * eddyDiff4 &
-! * (delsq_tracer(iTracer,k,cell2) - delsq_tracer(iTracer,k,cell1)) &
-! * invdcEdge
-
-! flux = dvEdge (iEdge) * tracer_turb_flux
-
-! tend(iTracer,k,cell1) = tend(iTracer,k,cell1) - flux * invAreaCell1
-! tend(iTracer,k,cell2) = tend(iTracer,k,cell2) + flux * invAreaCell2
-! enddo
-! enddo
-! end do
-
deallocate(delsq_tracer)
!--------------------------------------------------------------------
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_vel_hmix_del4.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_vel_hmix_del4.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_vel_hmix_del4.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -165,7 +165,6 @@
delsq_vorticity(:,:) = 0.0
delsq_divergence(:,:) = 0.0
- ! DWJ 10/19/12 Bit Reproducible Version
!Compute delsq_u
do iEdge = 1, nEdges
cell1 = cellsOnEdge(1,iEdge)
@@ -206,40 +205,6 @@
end do
end do
-! ! DWJ 10/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-
-! vertex1 = verticesOnEdge(1,iEdge)
-! vertex2 = verticesOnEdge(2,iEdge)
-
-! invAreaTri1 = 1.0 / areaTriangle(vertex1)
-! invAreaTri2 = 1.0 / areaTriangle(vertex2)
-
-! invAreaCell1 = 1.0 / areaCell(cell1)
-! invAreaCell2 = 1.0 / areaCell(cell2)
-
-! invDcEdge = 1.0 / dcEdge(iEdge)
-! invDvEdge = 1.0 / dvEdge(iEdge)
-
-! do k=1,maxLevelEdgeTop(iEdge)
-! ! Compute </font>
<font color="black">abla^2 u = </font>
<font color="black">abla divergence + k \times </font>
<font color="red">abla vorticity
-! delsq_u(k, iEdge) = ( divergence(k,cell2) - divergence(k,cell1) ) * invDcEdge &
-! -viscVortCoef *( vorticity(k,vertex2) - vorticity(k,vertex1)) * invDcEdge * sqrt(3.0) ! TDR
-
-! ! vorticity using </font>
<font color="red">abla^2 u
-! r_tmp = dcEdge(iEdge) * delsq_u(k, iEdge)
-! delsq_vorticity(k,vertex1) = delsq_vorticity(k,vertex1) - r_tmp * invAreaTri1
-! delsq_vorticity(k,vertex2) = delsq_vorticity(k,vertex2) + r_tmp * invAreaTri2
-
-! ! Divergence using </font>
<font color="red">abla^2 u
-! r_tmp = dvEdge(iEdge) * delsq_u(k, iEdge)
-! delsq_divergence(k, cell1) = delsq_divergence(k,cell1) + r_tmp * invAreaCell1
-! delsq_divergence(k, cell2) = delsq_divergence(k,cell2) - r_tmp * invAreaCell2
-! end do
-! end do
-
! Compute - \kappa </font>
<font color="black">abla^4 u
! as </font>
<font color="black">abla div(</font>
<font color="black">abla^2 u) + k \times </font>
<font color="black">abla ( k \cross curl(</font>
<font color="gray">abla^2 u) )
do iEdge=1,nEdgesSolve
Modified: branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_vmix_coefs_rich.F 2012-10-19 19:42:08 UTC (rev 2229)
+++ branches/ocean_projects/option3_b4b_test/src/core_ocean/mpas_ocn_vmix_coefs_rich.F 2012-10-19 20:39:30 UTC (rev 2230)
@@ -501,7 +501,6 @@
! interpolate du2TopOfEdge to du2TopOfCell
du2TopOfCell = 0.0
- !DWJ 09/19/12 Bit Reproducible Version
do iCell = 1, nCells
invAreaCell = 1.0 / areaCell(iCell)
do i = 1, nEdgesOnCell(iCell)
@@ -513,23 +512,6 @@
end do
end do
- !DWJ 09/19/12 Non Bit Reproducible Version
-! do iEdge=1,nEdges
-! cell1 = cellsOnEdge(1,iEdge)
-! cell2 = cellsOnEdge(2,iEdge)
-! do k=2,maxLevelEdgeBot(iEdge)
-! du2TopOfCell(k,cell1) = du2TopOfCell(k,cell1) &
-! + 0.5 * dcEdge(iEdge) * dvEdge(iEdge) * du2TopOfEdge(k,iEdge)
-! du2TopOfCell(k,cell2) = du2TopOfCell(k,cell2) &
-! + 0.5 * dcEdge(iEdge) * dvEdge(iEdge) * du2TopOfEdge(k,iEdge)
-! end do
-! end do
-! do iCell = 1,nCells
-! do k = 2,maxLevelCell(iCell)
-! du2TopOfCell(k,iCell) = du2TopOfCell(k,iCell) / areaCell(iCell)
-! end do
-! end do
-
! compute RiTopOfEdge using drhoTopOfEdge and du2TopOfEdge
! coef = -g/rho_0/2
RiTopOfEdge = 0.0
</font>
</pre>