<p><b>duda</b> 2009-08-12 15:15:59 -0600 (Wed, 12 Aug 2009)</p><p>Shorten some lines longer than 132 characters.<br>
<br>
M module_io_input.F<br>
M module_test_cases.F<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/swmodel/module_io_input.F
===================================================================
--- trunk/swmodel/module_io_input.F 2009-08-12 19:54:30 UTC (rev 25)
+++ trunk/swmodel/module_io_input.F 2009-08-12 21:15:59 UTC (rev 26)
@@ -138,7 +138,7 @@
input_obj % filename = 'grid.nc'
call io_input_init(input_obj, domain % dminfo)
-
+
!
! Read global number of cells/edges/vertices
!
@@ -394,10 +394,10 @@
!
! Get a list of which edges and vertices are adjacent to cells in block
!
- call block_decomp_all_edges_in_block(maxEdges, block_graph_2Halo % nVerticesTotal, block_graph_2Halo % nAdjacent, edgesOnCell_2Halo, &
- nlocal_edges, local_edge_list)
- call block_decomp_all_edges_in_block(maxEdges, block_graph_2Halo % nVerticesTotal, block_graph_2Halo % nAdjacent, verticesOnCell_2Halo, &
- nlocal_vertices, local_vertex_list)
+ call block_decomp_all_edges_in_block(maxEdges, block_graph_2Halo % nVerticesTotal, block_graph_2Halo % nAdjacent, &
+ edgesOnCell_2Halo, nlocal_edges, local_edge_list)
+ call block_decomp_all_edges_in_block(maxEdges, block_graph_2Halo % nVerticesTotal, block_graph_2Halo % nAdjacent, &
+ verticesOnCell_2Halo, nlocal_vertices, local_vertex_list)
call dmpar_get_owner_list(domain % dminfo, &
size(indexToEdgeIDField % array), nlocal_edges, &
@@ -426,9 +426,11 @@
sendVertexList, recvVertexList)
- call block_decomp_partitioned_edge_list(block_graph_2Halo % nVertices, block_graph_2Halo % vertexID(1:block_graph_2Halo % nVertices), &
+ call block_decomp_partitioned_edge_list(block_graph_2Halo % nVertices, &
+ block_graph_2Halo % vertexID(1:block_graph_2Halo % nVertices), &
2, nlocal_edges, cellsOnEdge_2Halo, local_edge_list, ghostEdgeStart)
- call block_decomp_partitioned_edge_list(block_graph_2Halo % nVertices, block_graph_2Halo % vertexID(1:block_graph_2Halo % nVertices), &
+ call block_decomp_partitioned_edge_list(block_graph_2Halo % nVertices, &
+ block_graph_2Halo % vertexID(1:block_graph_2Halo % nVertices), &
3, nlocal_vertices, cellsOnVertex_2Halo, local_vertex_list, ghostVertexStart)
@@ -457,7 +459,8 @@
! Read and distribute all fields given ownership lists and exchange lists (maybe already in block?)
!
allocate(domain % blocklist)
- call allocate_block(domain % blocklist, domain, block_graph_2Halo % nVerticesTotal, nlocal_edges, nlocal_vertices, maxEdges, nVertLevels, nTracers)
+ call allocate_block(domain % blocklist, domain, block_graph_2Halo % nVerticesTotal, nlocal_edges, nlocal_vertices, &
+ maxEdges, nVertLevels, nTracers)
call read_and_distribute_fields(domain % dminfo, input_obj, domain % blocklist, &
readCellStart, nReadCells, readEdgeStart, nReadEdges, readVertexStart, nReadVertices, &
sendCellList, recvCellList, sendEdgeList, recvEdgeList, sendVertexList, recvVertexList)
@@ -494,21 +497,24 @@
do i=1,domain % blocklist % mesh % nCells
do j=1,domain % blocklist % mesh % nEdgesOnCell % array(i)
- k = binary_search(cellIDSorted, 2, 1, domain % blocklist % mesh % nCells, domain % blocklist % mesh % cellsOnCell % array(j,i))
+ k = binary_search(cellIDSorted, 2, 1, domain % blocklist % mesh % nCells, &
+ domain % blocklist % mesh % cellsOnCell % array(j,i))
if (k <= domain % blocklist % mesh % nCells) then
domain % blocklist % mesh % cellsOnCell % array(j,i) = cellIDSorted(2,k)
else
domain % blocklist % mesh % cellsOnCell % array(j,i) = 0
end if
- k = binary_search(edgeIDSorted, 2, 1, domain % blocklist % mesh % nEdges, domain % blocklist % mesh % edgesOnCell % array(j,i))
+ k = binary_search(edgeIDSorted, 2, 1, domain % blocklist % mesh % nEdges, &
+ domain % blocklist % mesh % edgesOnCell % array(j,i))
if (k <= domain % blocklist % mesh % nEdges) then
domain % blocklist % mesh % edgesOnCell % array(j,i) = edgeIDSorted(2,k)
else
domain % blocklist % mesh % edgesOnCell % array(j,i) = 0
end if
- k = binary_search(vertexIDSorted, 2, 1, domain % blocklist % mesh % nVertices, domain % blocklist % mesh % verticesOnCell % array(j,i))
+ k = binary_search(vertexIDSorted, 2, 1, domain % blocklist % mesh % nVertices, &
+ domain % blocklist % mesh % verticesOnCell % array(j,i))
if (k <= domain % blocklist % mesh % nVertices) then
domain % blocklist % mesh % verticesOnCell % array(j,i) = vertexIDSorted(2,k)
else
@@ -521,14 +527,16 @@
do i=1,domain % blocklist % mesh % nEdges
do j=1,2
- k = binary_search(cellIDSorted, 2, 1, domain % blocklist % mesh % nCells, domain % blocklist % mesh % cellsOnEdge % array(j,i))
+ k = binary_search(cellIDSorted, 2, 1, domain % blocklist % mesh % nCells, &
+ domain % blocklist % mesh % cellsOnEdge % array(j,i))
if (k <= domain % blocklist % mesh % nCells) then
domain % blocklist % mesh % cellsOnEdge % array(j,i) = cellIDSorted(2,k)
else
domain % blocklist % mesh % cellsOnEdge % array(j,i) = 0
end if
- k = binary_search(vertexIDSorted, 2, 1, domain % blocklist % mesh % nVertices, domain % blocklist % mesh % verticesOnEdge % array(j,i))
+ k = binary_search(vertexIDSorted, 2, 1, domain % blocklist % mesh % nVertices, &
+ domain % blocklist % mesh % verticesOnEdge % array(j,i))
if (k <= domain % blocklist % mesh % nVertices) then
domain % blocklist % mesh % verticesOnEdge % array(j,i) = vertexIDSorted(2,k)
else
@@ -539,7 +547,8 @@
do j=1,domain % blocklist % mesh % nEdgesOnEdge % array(i)
- k = binary_search(edgeIDSorted, 2, 1, domain % blocklist % mesh % nEdges, domain % blocklist % mesh % edgesOnEdge % array(j,i))
+ k = binary_search(edgeIDSorted, 2, 1, domain % blocklist % mesh % nEdges, &
+ domain % blocklist % mesh % edgesOnEdge % array(j,i))
if (k <= domain % blocklist % mesh % nEdges) then
domain % blocklist % mesh % edgesOnEdge % array(j,i) = edgeIDSorted(2,k)
else
@@ -552,14 +561,16 @@
do i=1,domain % blocklist % mesh % nVertices
do j=1,3
- k = binary_search(cellIDSorted, 2, 1, domain % blocklist % mesh % nCells, domain % blocklist % mesh % cellsOnVertex % array(j,i))
+ k = binary_search(cellIDSorted, 2, 1, domain % blocklist % mesh % nCells, &
+ domain % blocklist % mesh % cellsOnVertex % array(j,i))
if (k <= domain % blocklist % mesh % nCells) then
domain % blocklist % mesh % cellsOnVertex % array(j,i) = cellIDSorted(2,k)
else
domain % blocklist % mesh % cellsOnVertex % array(j,i) = 0
end if
- k = binary_search(edgeIDSorted, 2, 1, domain % blocklist % mesh % nEdges, domain % blocklist % mesh % edgesOnVertex % array(j,i))
+ k = binary_search(edgeIDSorted, 2, 1, domain % blocklist % mesh % nEdges, &
+ domain % blocklist % mesh % edgesOnVertex % array(j,i))
if (k <= domain % blocklist % mesh % nEdges) then
domain % blocklist % mesh % edgesOnVertex % array(j,i) = edgeIDSorted(2,k)
else
@@ -607,8 +618,8 @@
subroutine read_and_distribute_fields(dminfo, input_obj, block, &
- readCellStart, readCellCount, readEdgeStart, readEdgeCount, readVertexStart, readVertexCount, &
- sendCellList, recvCellList, sendEdgeList, recvEdgeList, sendVertexList, recvVertexList)
+ readCellStart, readCellCount, readEdgeStart, readEdgeCount, readVertexStart, readVertexCount, &
+ sendCellList, recvCellList, sendEdgeList, recvEdgeList, sendVertexList, recvVertexList)
implicit none
Modified: trunk/swmodel/module_test_cases.F
===================================================================
--- trunk/swmodel/module_test_cases.F 2009-08-12 19:54:30 UTC (rev 25)
+++ trunk/swmodel/module_test_cases.F 2009-08-12 21:15:59 UTC (rev 26)
@@ -422,7 +422,8 @@
allocate(psiVertex(grid % nVertices))
do iVtx=1,grid % nVertices
psiVertex(iVtx) = -a * a * w * sin(grid%latVertex%array(iVtx)) + &
- a *a * K * (cos(grid%latVertex%array(iVtx))**R) * sin(grid%latVertex%array(iVtx)) * cos(R * grid%lonVertex%array(iVtx))
+ a *a * K * (cos(grid%latVertex%array(iVtx))**R) * &
+ sin(grid%latVertex%array(iVtx)) * cos(R * grid%lonVertex%array(iVtx))
end do
do iEdge=1,grid % nEdges
state % u % array(1,iEdge) = -1.0 * ( &
</font>
</pre>