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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-11 21:04:19 -0800 (Thu, 11 Jan 2007)
New Revision: 5771

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.c
Log:
 r3281 at earth (orig r3955):  LukeHodkinson | 2007-01-10 13:42:23 -0800
 The space filler layout operates on a global level,
 so it's natural that in parallel there will be
 plenty of particles that are not owned by any one
 processor. There was a loop surrounding the particle
 ownership test that was essentially forcing every
 particle to be owned by every processor, causing
 the swarm to assert when it found there was
 number-of-processors too many global particles.
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3954
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3955
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.c	2007-01-12 05:04:19 UTC (rev 5770)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SpaceFillerParticleLayout.c	2007-01-12 05:04:19 UTC (rev 5771)
@@ -277,17 +277,10 @@
 	coord = particle->coord;
 	memset( coord, 0, sizeof(Coord) );
 
-        /* We have to do a loop here, because the initial mesh might
-           be deformed */
-        do
-          {
-            for ( dim_I = 0; dim_I < self->dim; dim_I++ ) {
-              coord[ dim_I ] = SobolGenerator_GetNextNumber_WithMinMax(
-					self->sobolGenerator[ dim_I ], 
-					minCrd[ dim_I ], 
-					maxCrd[ dim_I ]);
-            }
-          }
-        while(CellLayout_CellOf(swarm->cellLayout, particle)
-              >= swarm->cellLocalCount);
+	for ( dim_I = 0; dim_I < self->dim; dim_I++ ) {
+		coord[ dim_I ] = SobolGenerator_GetNextNumber_WithMinMax(
+			self->sobolGenerator[ dim_I ], 
+			minCrd[ dim_I ], 
+			maxCrd[ dim_I ]);
+	}
 }