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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.c
Log:
 r797 at earth:  boo | 2006-10-11 13:49:40 -0700
  r771 at earth (orig r650):  KathleenHumble | 2006-10-05 20:43:04 -0700
  adding in an extra cast to the first arg of calls to the function:
  
  _HexaEL_FindTriBarycenter()
  with arg 1 of type Coord* being cast to (const Coord*)
  
  This is to remove some of the warning when calling this function.
  
 



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

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:45 UTC (rev 4910)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.c	2006-10-11 20:50:49 UTC (rev 4911)
@@ -316,7 +316,7 @@
 		memcpy( crds[2], *(globalNodeCoordPtrsInElement[3]), sizeof(Coord) );
 		memcpy( crds[3], *(globalNodeCoordPtrsInElement[2]), sizeof(Coord) );
 #ifndef NDEBUG
-		if( !_HexaEL_FindTriBarycenter( crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) )
+		if( !_HexaEL_FindTriBarycenter( (const Coord*)crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) )
 			assert( 0 );
 #else
 		_HexaEL_FindTriBarycenter( crds, globalCoord, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 );