[cig-commits] r4906 - in long/3D/Gale/trunk/src/StgFEM: . Discretisation/src Discretisation/tests

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:50:34 -0700 (Wed, 11 Oct 2006)
New Revision: 4906

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c
Log:
 r792 at earth:  boo | 2006-10-11 13:49:38 -0700
  r766 at earth (orig r645):  LukeHodkinson | 2006-09-26 23:57:15 -0700
  Modifications as a result of previous commit.
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:791
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:644
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:792
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:645

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-10-11 20:50:32 UTC (rev 4905)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-10-11 20:50:34 UTC (rev 4906)
@@ -1860,7 +1860,7 @@
 	/* Find Elements which plane cuts through */
 	memcpy( planeCoord, Mesh_CoordAt( feMesh, 0 ), sizeof( Coord ) );
 	planeCoord[ planeAxis ] = planeHeight;
-	lElement_I = elementLayout->elementWithPoint( elementLayout, meshDecomp, planeCoord,
+	lElement_I = elementLayout->elementWithPoint( elementLayout, meshDecomp, planeCoord, feMesh, 
 						      EXCLUSIVE_UPPER_BOUNDARY, 0, NULL );
 
 	if ( lElement_I < elementLocalCount ) {

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c	2006-10-11 20:50:32 UTC (rev 4905)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c	2006-10-11 20:50:34 UTC (rev 4906)
@@ -168,7 +168,7 @@
 		globalCoord[ I_AXIS ] = drand48();
 		globalCoord[ J_AXIS ] = drand48();
 		globalCoord[ K_AXIS ] = drand48();
-		elementCoordIn = eLayout->elementWithPoint( eLayout, meshLayout->decomp, globalCoord,
+		elementCoordIn = eLayout->elementWithPoint( eLayout, meshLayout->decomp, globalCoord, NULL, 
 							    INCLUSIVE_UPPER_BOUNDARY, 0, NULL );
 		currElementNodeCount = feMesh->elementNodeCountTbl[elementCoordIn];
 		globalNodeCoordPtrs = Memory_Alloc_Array( Coord*, currElementNodeCount, "globalNodeCoordPtrs" );