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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-20 20:06:02 -0700 (Thu, 20 Jul 2006)
New Revision: 4052

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
Log:
 r700 at earth:  boo | 2006-07-20 20:02:59 -0700
  r693 at earth (orig r611):  LukeHodkinson | 2006-07-16 23:49:54 -0700
  Forgot to commit this small change: swap to using the
  mesh based element searching algorithm in FeVariable.
  
 



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

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-07-21 03:05:35 UTC (rev 4051)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-07-21 03:06:02 UTC (rev 4052)
@@ -894,6 +894,8 @@
 	
 	/* locate which mesh element given coord is in : use inclusive upper boundaries to save
 		the need to use shadow space if possible */
+	(*elementCoordInPtr) = Mesh_ElementWithPoint( self->feMesh, globalCoord, INCLUSIVE_UPPER_BOUNDARY );
+#if 0
 	if( eLayout->type == ParallelPipedHexaEL_Type ) {
 		(*elementCoordInPtr) = eLayout->elementWithPoint( eLayout, mLayout->decomp, globalCoord,
 							    INCLUSIVE_UPPER_BOUNDARY, 0, NULL );
@@ -915,6 +917,7 @@
 								    INCLUSIVE_UPPER_BOUNDARY, 0, NULL );
 		}
 	}
+#endif
 
 	if ( (*elementCoordInPtr) >= self->feMesh->elementDomainCount ) {
 		Bool			outsideGlobal = False;