[cig-commits] r5664 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Mesh/src

[walter at geodynamics.org]

Author: walter
Date: 2007-01-05 11:36:17 -0800 (Fri, 05 Jan 2007)
New Revision: 5664

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.c
Log:
 r3235 at earth (orig r3927):  LukeHodkinson | 2007-01-02 15:50:53 -0800
 Fixed a broken mesh-point ownership algorithm.
 
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3925
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3927
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.c	2007-01-05 19:36:15 UTC (rev 5663)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.c	2007-01-05 19:36:17 UTC (rev 5664)
@@ -219,12 +219,12 @@
 			nLocalEls = Mesh_GetLocalSize( mesh, nDims );
 			Mesh_GetIncidence( mesh, dim, ind, nDims, &nInc, &inc );
 
-			global = (unsigned)-1;
+			lowest = (unsigned)-1;
 			if( ind < Mesh_GetLocalSize( mesh, dim ) ) {
 				/* Find the local element with lowest global index. */
 				for( inc_i = 0; inc_i < nInc; inc_i++ ) {
 					if( inc[inc_i] < nLocalEls ) {
-						global = Mesh_DomainToGlobal( mesh, MT_VERTEX, inc[inc_i] );
+						global = Mesh_DomainToGlobal( mesh, nDims, inc[inc_i] );
 						if( global < lowest )
 							lowest = global;
 					}
@@ -240,15 +240,15 @@
 					if( inc[inc_i] >= nLocalEls && 
 					    Mesh_GetOwner( mesh, nDims, inc[inc_i] ) == owner )
 					{
-						global = Mesh_DomainToGlobal( mesh, MT_VERTEX, inc[inc_i] );
+						global = Mesh_DomainToGlobal( mesh, nDims, inc[inc_i] );
 						if( global < lowest )
 							lowest = global;
 					}
 				}
 			}
 
-			assert( global != (unsigned)-1 );
-			insist( Mesh_GlobalToDomain( mesh, nDims, global, elInd) );
+			assert( lowest != (unsigned)-1 );
+			insist( Mesh_GlobalToDomain( mesh, nDims, lowest, elInd) );
 		}
 		else
 			*elInd = ind;