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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-20 20:04:33 -0700 (Thu, 20 Jul 2006)
New Revision: 4046

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c
Log:
 r2532 at earth:  boo | 2006-07-20 20:01:38 -0700
  r2508 at earth (orig r3676):  LukeHodkinson | 2006-07-13 00:23:10 -0700
  Changing the element searching methods to use the faster
  mesh based algorithm.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2531
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3675
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2532
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3676

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c	2006-07-21 03:04:04 UTC (rev 4045)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ElementCellLayout.c	2006-07-21 03:04:33 UTC (rev 4046)
@@ -352,8 +352,7 @@
 				/* Check the lot. */
 				/* Use exclusive upper boundaries, since we want a unique answer across the processors as to
 				   which proc owns a certain particle in its local space */
-				element_I = eLayout->elementWithPoint( eLayout, self->mesh->layout->decomp, particle->coord,
-								       EXCLUSIVE_UPPER_BOUNDARY, 0, NULL );
+				element_I = Mesh_ElementWithPoint( self->mesh, particle->coord, EXCLUSIVE_UPPER_BOUNDARY );
 			}
 		}
 	}
@@ -361,8 +360,7 @@
 		/* Check the lot. */
 		/* Use exclusive upper boundaries, since we want a unique answer across the processors as to
 		   which proc owns a certain particle in its local space */
-		element_I = eLayout->elementWithPoint( eLayout, self->mesh->layout->decomp, particle->coord,
-						       EXCLUSIVE_UPPER_BOUNDARY, 0, NULL );
+		element_I = Mesh_ElementWithPoint( self->mesh, particle->coord, EXCLUSIVE_UPPER_BOUNDARY );
 	}
 
 	return element_I == cellIndex ? True : False;
@@ -397,8 +395,7 @@
 				/* Check the lot. */
 				/* Use exclusive upper boundaries, since we want a unique answer across the processors as to
 				   which proc owns a certain particle in its local space */
-				element_I = eLayout->elementWithPoint( eLayout, self->mesh->layout->decomp, particle->coord,
-								       EXCLUSIVE_UPPER_BOUNDARY, 0, NULL );
+				element_I = Mesh_ElementWithPoint( self->mesh, particle->coord, EXCLUSIVE_UPPER_BOUNDARY );
 			}
 		}
 	}
@@ -406,8 +403,7 @@
 		/* Check the lot. */
 		/* Use exclusive upper boundaries, since we want a unique answer across the processors as to
 		   which proc owns a certain particle in its local space */
-		element_I = eLayout->elementWithPoint( eLayout, self->mesh->layout->decomp, particle->coord,
-						       EXCLUSIVE_UPPER_BOUNDARY, 0, NULL );
+		element_I = Mesh_ElementWithPoint( self->mesh, particle->coord, EXCLUSIVE_UPPER_BOUNDARY );
 	}
 
 	return element_I;