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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c
Log:
 r790 at earth:  boo | 2006-10-11 13:49:37 -0700
  r764 at earth (orig r643):  LukeHodkinson | 2006-09-26 20:37:03 -0700
  Changes to reflect the modified interface to
  the 'element with point' routine.
  
 



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

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.c	2006-10-11 20:50:27 UTC (rev 4903)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.c	2006-10-11 20:50:29 UTC (rev 4904)
@@ -307,6 +307,7 @@
 		unsigned	inds[3];
 		Coord		lCrds[4] = {{-1.0, -1.0, 0.0}, {1.0, -1.0, 0.0}, 
 					    {-1.0, 1.0, 0.0}, {1.0, 1.0, 0.0}};
+		unsigned	gElInd;
 		unsigned	bc_i;
 
 		/* Check first triangle. */
@@ -315,10 +316,10 @@
 		memcpy( crds[2], *(globalNodeCoordPtrsInElement[3]), sizeof(Coord) );
 		memcpy( crds[3], *(globalNodeCoordPtrsInElement[2]), sizeof(Coord) );
 #ifndef NDEBUG
-		if( !_HexaEL_FindTriBarycenter( crds, globalCoord, bc, inds ) )
+		if( !_HexaEL_FindTriBarycenter( crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) )
 			assert( 0 );
 #else
-		_HexaEL_FindTriBarycenter( crds, globalCoord, bc, inds );
+		_HexaEL_FindTriBarycenter( crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 );
 #endif
 
 		/* Interpolate. */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.c	2006-10-11 20:50:27 UTC (rev 4903)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.c	2006-10-11 20:50:29 UTC (rev 4904)
@@ -334,9 +334,9 @@
 		memcpy( crds[6], *(globalNodeCoordPtrsInElement[7]), sizeof(Coord) );
 		memcpy( crds[7], *(globalNodeCoordPtrsInElement[6]), sizeof(Coord) );
 #ifndef NDEBUG
-		assert( _HexaEL_FindTetBarycenter( crds, globalCoord, bc, inds ) );
+		assert( _HexaEL_FindTetBarycenter( crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) );
 #else
-		_HexaEL_FindTetBarycenter( crds, globalCoord, bc, inds );
+		_HexaEL_FindTetBarycenter( crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 );
 #endif
 
 		/* Interpolate. */

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:27 UTC (rev 4903)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c	2006-10-11 20:50:29 UTC (rev 4904)
@@ -179,7 +179,7 @@
 				(const Coord**) globalNodeCoordPtrs, globalCoord, elLocalCoordGeneral );
 
 		if ( context->dim == 2 ) {
-			_BilinearElementType_ConvertGlobalCoordToElLocal( elementType, eLayout,
+			_BilinearElementType_ConvertGlobalCoordToElLocal( elementType, eLayout, 
 					(const Coord**) globalNodeCoordPtrs, globalCoord, elLocalCoord );
 		}
 		else {