<p><b>mperego@fsu.edu</b> 2012-05-29 10:00:15 -0600 (Tue, 29 May 2012)</p><p>BRANCH COMMIT<br>
land_ice: pass to lifev also the area of triangles.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_lifev.F
===================================================================
--- branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_lifev.F        2012-05-25 21:17:42 UTC (rev 1942)
+++ branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_lifev.F        2012-05-29 16:00:15 UTC (rev 1943)
@@ -219,7 +219,7 @@
integer, dimension(:,:), pointer :: cellsOnEdge, cellsOnVertex, verticesOnCell, verticesOnEdge
- real (kind=RKIND), dimension(:), pointer :: xCell, yCell, zCell
+ real (kind=RKIND), dimension(:), pointer :: xCell, yCell, zCell, areaTriangle
! halo exchange arrays
integer, dimension(:), pointer :: sendCellsArray, &
@@ -254,7 +254,9 @@
yCell => block % mesh % yCell % array
zCell => block % mesh % zCell % array
+ areaTriangle => block % mesh % areaTriangle % array
+
!build send and receive arrays using exchange_list
call array_from_exchange_list(block % parinfo % verticesToSend, sendVerticesArray)
call array_from_exchange_list(block % parinfo % verticesToRecv, recvVerticesArray)
@@ -270,7 +272,7 @@
!nVertLevels should be equal to nVertLevelsSolve (no split the domain in the vertical direction)
call mpas_timer_start("velocity_solver_set_grid_data")
call velocity_solver_set_grid_data(nCells, nEdges, nVertices, nVertLevels, nCellsSolve, nEdgesSolve, nVerticesSolve, &
-        cellsOnEdge, cellsOnVertex, verticesOnCell, verticesOnEdge, xCell, yCell, zCell, &
+        cellsOnEdge, cellsOnVertex, verticesOnCell, verticesOnEdge, xCell, yCell, zCell, areaTriangle, &
        sendCellsArray, recvCellsArray, sendEdgesArray, recvEdgesArray, sendVerticesArray, recvVerticesArray)
call mpas_timer_stop("velocity_solver_set_grid_data")
#else
@@ -367,7 +369,8 @@
select case (config_dycore)
case ('L1L2')
call mpas_timer_start("velocity_solver_init_L1L2")
- call velocity_solver_init_L1L2(LayerThicknessFractions)
+         !call velocity_solver_extrude_3d_grid(LayerThicknessFractions, lowerSurface, thickness)
+         call velocity_solver_init_L1L2(LayerThicknessFractions)
call mpas_timer_stop("velocity_solver_init_L1L2")
case ('FO')
call mpas_timer_start("velocity_solver_extrude_3d_grid")
@@ -408,7 +411,8 @@
call velocity_solver_solve_FO(lowerSurface, thickness, beta, tracers(index_temperature,:,:), normalVelocity)
call mpas_timer_stop("velocity_solver_solve_FO")
call mpas_timer_start("velocity_solver export")
- !call velocity_solver_export_2d_data(lowerSurface, thickness, beta)
+!         call velocity_solver_init_L1L2(LayerThicknessFractions)
+!         call velocity_solver_export_2d_data(lowerSurface, thickness, beta)
call velocity_solver_export_FO_velocity()
call mpas_timer_stop("velocity_solver export")
case ('Stokes')
</font>
</pre>