<p><b>mmwolf@sandia.gov</b> 2010-01-07 14:40:10 -0700 (Thu, 07 Jan 2010)</p><p>Fixed bug in vertex and edge ordering<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/swmodel/src/module_io_input.F
===================================================================
--- trunk/swmodel/src/module_io_input.F        2010-01-07 00:14:40 UTC (rev 109)
+++ trunk/swmodel/src/module_io_input.F        2010-01-07 21:40:10 UTC (rev 110)
@@ -637,6 +637,35 @@
call zoltanOrderLocHSFC_Verts(ghostVertexStart-1,local_vertex_list,3,xVertex,yVertex,zVertex)
!!!!!!!!!!!!!!!!!!
+
+ !! MMW Not sure about this part
+
+ deallocate(sendEdgeList % list)
+ deallocate(sendEdgeList)
+ deallocate(recvEdgeList % list)
+ deallocate(recvEdgeList)
+
+ deallocate(sendVertexList % list)
+ deallocate(sendVertexList)
+ deallocate(recvVertexList % list)
+ deallocate(recvVertexList)
+
+ !
+ ! Knowing which edges/vertices are owned by this block and which are actually read
+ ! from the input or restart file, we can build exchange lists to perform
+ ! all-to-all field exchanges from process that reads a field to the processes that
+ ! need them
+ !
+ call dmpar_get_owner_list(domain % dminfo, &
+ size(indexToEdgeIDField % array), nlocal_edges, &
+ indexToEdgeIDField % array, local_edge_list, &
+ sendEdgeList, recvEdgeList)
+
+ call dmpar_get_owner_list(domain % dminfo, &
+ size(indexToVertexIDField % array), nlocal_vertices, &
+ indexToVertexIDField % array, local_vertex_list, &
+ sendVertexList, recvVertexList)
+
#endif
#endif
Modified: trunk/swmodel/src/module_zoltan_interface.F
===================================================================
--- trunk/swmodel/src/module_zoltan_interface.F        2010-01-07 00:14:40 UTC (rev 109)
+++ trunk/swmodel/src/module_zoltan_interface.F        2010-01-07 21:40:10 UTC (rev 110)
@@ -206,7 +206,6 @@
integer(ZOLTAN_INT) :: ierr
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! MMW should set to geomDim
zqfGeomDim = geomDim
ierr = ZOLTAN_OK
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -316,10 +315,6 @@
permZs(i) = edgeCoordZ(permIndices(i)+1)
end do
- !!do i=1,numEdges
- !! write(*,*) global_ids(i), permGIDs(i)
- !!end do
-
!!!!!!!!!!!!!!!!!!!!!!!!!!
!! Actually change the ordering of the edges
!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -411,17 +406,6 @@
end subroutine zqfGetEdgeGeom
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
-
-
-
-
-
-
-
-
-
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
subroutine zoltanOrderLocHSFC_Verts(in_numverts,in_vertIDs,in_geomDim,in_vertX, &
</font>
</pre>