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

walter at geodynamics.org walter at geodynamics.org
Fri Jan 5 11:36:05 PST 2007


Author: walter
Date: 2007-01-05 11:35:19 -0800 (Fri, 05 Jan 2007)
New Revision: 5662

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of1.spaceFillerParticleLayout.dat.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of2.spaceFillerParticleLayout.dat.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.1of2.spaceFillerParticleLayout.dat.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of2.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.1of2.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.1of2.expected
Log:
 r3233 at earth (orig r3924):  LukeHodkinson | 2007-01-01 19:47:20 -0800
 Updating some expected files as a result of mesh
 ownership algorithms being modified.
 
 



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:3923
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3924
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of1.spaceFillerParticleLayout.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of1.spaceFillerParticleLayout.dat.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of1.spaceFillerParticleLayout.dat.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,18 +1,18 @@
-SpaceFillerParticleLayout (ptr): 0x806374c:
-	GlobalParticleLayout (ptr): 0x806374c
-	ParticleLayout (ptr): 0x806374c
-	Stg_Class (ptr): 0x806374c
-		sizeOfSelf: 124
+SpaceFillerParticleLayout (ptr): 0x6459a0:
+	GlobalParticleLayout (ptr): 0x6459a0
+	ParticleLayout (ptr): 0x6459a0
+	Stg_Class (ptr): 0x6459a0
+		sizeOfSelf: 272
 		_deleteSelf: Yes
 		type: SpaceFillerParticleLayout
-		_delete (func ptr): 0xb7f80e68
-		_print (func ptr): 0xb7f80ebe
-		_copy (func ptr): 0xb7f80f4d
-		_setInitialCounts (func ptr): 0xb7f793f3
-		_initialiseParticles (func ptr): 0xb7f81151
+		_delete (func ptr): 0x2aaaaaaca404
+		_print (func ptr): 0x2aaaaaaca455
+		_copy (func ptr): 0x2aaaaaaca508
+		_setInitialCounts (func ptr): 0x2aaaaaac078f
+		_initialiseParticles (func ptr): 0x2aaaaaaca742
 		coordSystem: GlobalCoordSystem
 		weightsInitialisedAtStartup : False
-		_initialiseParticle (func ptr): 0xb7f81181
+		_initialiseParticle (func ptr): 0x2aaaaaaca769
 		totalInitialParticles: 160
 		averageInitialParticlesPerCell: 20
 	self->dim = 3
@@ -39,131 +39,131 @@
 		part. InCell  18 (local index    149): ( 20.312,  88.281,  97.266)
 		part. InCell  19 (local index    159): ( 26.562,  66.406,  39.453)
 	Local Cell   1:
-		part. InCell   0 (local index      7): (    125,    62.5,   68.75)
-		part. InCell   1 (local index     13): (    175,    37.5,   81.25)
-		part. InCell   2 (local index     25): (  162.5,   56.25,  59.375)
-		part. InCell   3 (local index     27): (  112.5,   31.25,  96.875)
-		part. InCell   4 (local index     41): ( 131.25,   9.375,  39.062)
-		part. InCell   5 (local index     43): ( 181.25,  84.375,  1.5625)
-		part. InCell   6 (local index     55): ( 168.75,  15.625,  29.688)
-		part. InCell   7 (local index     61): ( 118.75,  90.625,  17.188)
-		part. InCell   8 (local index     63): ( 159.38,  89.062,  80.469)
-		part. InCell   9 (local index     69): ( 109.38,  14.062,  67.969)
-		part. InCell  10 (local index     81): ( 146.88,  82.812,  89.844)
-		part. InCell  11 (local index     83): ( 196.88,  7.8125,  52.344)
-		part. InCell  12 (local index     97): ( 153.12,  35.938,  10.156)
-		part. InCell  13 (local index     99): ( 103.12,  60.938,  47.656)
-		part. InCell  14 (local index    111): ( 140.62,  42.188,  19.531)
-		part. InCell  15 (local index    117): ( 190.62,  67.188,  32.031)
-		part. InCell  16 (local index    137): ( 107.81,  69.531, 0.39062)
-		part. InCell  17 (local index    139): ( 157.81,  44.531,  37.891)
-		part. InCell  18 (local index    151): ( 195.31,  50.781,  16.016)
-		part. InCell  19 (local index    157): ( 145.31,  25.781,  28.516)
+		part. InCell   0 (local index      0): (    200,     100,      50)
+		part. InCell   1 (local index      7): (    125,    62.5,   68.75)
+		part. InCell   2 (local index     13): (    175,    37.5,   81.25)
+		part. InCell   3 (local index     25): (  162.5,   56.25,  59.375)
+		part. InCell   4 (local index     27): (  112.5,   31.25,  96.875)
+		part. InCell   5 (local index     41): ( 131.25,   9.375,  39.062)
+		part. InCell   6 (local index     43): ( 181.25,  84.375,  1.5625)
+		part. InCell   7 (local index     55): ( 168.75,  15.625,  29.688)
+		part. InCell   8 (local index     61): ( 118.75,  90.625,  17.188)
+		part. InCell   9 (local index     63): ( 159.38,  89.062,  80.469)
+		part. InCell  10 (local index     69): ( 109.38,  14.062,  67.969)
+		part. InCell  11 (local index     81): ( 146.88,  82.812,  89.844)
+		part. InCell  12 (local index     83): ( 196.88,  7.8125,  52.344)
+		part. InCell  13 (local index     97): ( 153.12,  35.938,  10.156)
+		part. InCell  14 (local index     99): ( 103.12,  60.938,  47.656)
+		part. InCell  15 (local index    111): ( 140.62,  42.188,  19.531)
+		part. InCell  16 (local index    117): ( 190.62,  67.188,  32.031)
+		part. InCell  17 (local index    137): ( 107.81,  69.531, 0.39062)
+		part. InCell  18 (local index    139): ( 157.81,  44.531,  37.891)
+		part. InCell  19 (local index    151): ( 195.31,  50.781,  16.016)
+		part. InCell  20 (local index    157): ( 145.31,  25.781,  28.516)
 	Local Cell   2:
-		part. InCell   0 (local index     10): (    225,    12.5,   43.75)
-		part. InCell   1 (local index     12): (    275,    87.5,    6.25)
-		part. InCell   2 (local index     24): (  262.5,    6.25,  34.375)
-		part. InCell   3 (local index     30): (  212.5,   81.25,  21.875)
-		part. InCell   4 (local index     40): ( 231.25,  59.375,  64.062)
-		part. InCell   5 (local index     46): ( 281.25,  34.375,  76.562)
-		part. InCell   6 (local index     58): ( 268.75,  65.625,  54.688)
-		part. InCell   7 (local index     60): ( 218.75,  40.625,  92.188)
-		part. InCell   8 (local index     66): ( 259.38,  39.062,  5.4688)
-		part. InCell   9 (local index     68): ( 209.38,  64.062,  42.969)
-		part. InCell  10 (local index     80): ( 246.88,  32.812,  14.844)
-		part. InCell  11 (local index     86): ( 296.88,  57.812,  27.344)
-		part. InCell  12 (local index     96): ( 253.12,  85.938,  85.156)
-		part. InCell  13 (local index    102): ( 203.12,  10.938,  72.656)
-		part. InCell  14 (local index    114): ( 240.62,  92.188,  94.531)
-		part. InCell  15 (local index    116): ( 290.62,  17.188,  57.031)
-		part. InCell  16 (local index    136): ( 207.81,  19.531,  75.391)
-		part. InCell  17 (local index    142): ( 257.81,  94.531,  62.891)
-		part. InCell  18 (local index    154): ( 295.31, 0.78125,  91.016)
-		part. InCell  19 (local index    156): ( 245.31,  75.781,  53.516)
+		part. InCell   0 (local index      2): (    300,      50,      75)
+		part. InCell   1 (local index     10): (    225,    12.5,   43.75)
+		part. InCell   2 (local index     12): (    275,    87.5,    6.25)
+		part. InCell   3 (local index     24): (  262.5,    6.25,  34.375)
+		part. InCell   4 (local index     30): (  212.5,   81.25,  21.875)
+		part. InCell   5 (local index     40): ( 231.25,  59.375,  64.062)
+		part. InCell   6 (local index     46): ( 281.25,  34.375,  76.562)
+		part. InCell   7 (local index     58): ( 268.75,  65.625,  54.688)
+		part. InCell   8 (local index     60): ( 218.75,  40.625,  92.188)
+		part. InCell   9 (local index     66): ( 259.38,  39.062,  5.4688)
+		part. InCell  10 (local index     68): ( 209.38,  64.062,  42.969)
+		part. InCell  11 (local index     80): ( 246.88,  32.812,  14.844)
+		part. InCell  12 (local index     86): ( 296.88,  57.812,  27.344)
+		part. InCell  13 (local index     96): ( 253.12,  85.938,  85.156)
+		part. InCell  14 (local index    102): ( 203.12,  10.938,  72.656)
+		part. InCell  15 (local index    114): ( 240.62,  92.188,  94.531)
+		part. InCell  16 (local index    116): ( 290.62,  17.188,  57.031)
+		part. InCell  17 (local index    136): ( 207.81,  19.531,  75.391)
+		part. InCell  18 (local index    142): ( 257.81,  94.531,  62.891)
+		part. InCell  19 (local index    154): ( 295.31, 0.78125,  91.016)
+		part. InCell  20 (local index    156): ( 245.31,  75.781,  53.516)
 	Local Cell   3:
-		part. InCell   0 (local index      2): (    300,      50,      75)
-		part. InCell   1 (local index      4): (    350,      25,    62.5)
-		part. InCell   2 (local index     16): (  387.5,   68.75,  90.625)
-		part. InCell   3 (local index     22): (  337.5,   43.75,  53.125)
-		part. InCell   4 (local index     32): ( 306.25,  21.875,  7.8125)
-		part. InCell   5 (local index     38): ( 356.25,  96.875,  45.312)
-		part. InCell   6 (local index     50): ( 393.75,   3.125,  23.438)
-		part. InCell   7 (local index     52): ( 343.75,  78.125,  35.938)
-		part. InCell   8 (local index     74): ( 384.38,  76.562,  74.219)
-		part. InCell   9 (local index     76): ( 334.38,  1.5625,  86.719)
-		part. InCell  10 (local index     88): ( 321.88,  95.312,  58.594)
-		part. InCell  11 (local index     94): ( 371.88,  20.312,  96.094)
-		part. InCell  12 (local index    104): ( 378.12,  48.438,  41.406)
-		part. InCell  13 (local index    110): ( 328.12,  73.438,  3.9062)
-		part. InCell  14 (local index    122): ( 315.62,  29.688,  25.781)
-		part. InCell  15 (local index    124): ( 365.62,  54.688,  13.281)
-		part. InCell  16 (local index    128): ( 332.81,  57.031,  44.141)
-		part. InCell  17 (local index    134): ( 382.81,  32.031,  6.6406)
-		part. InCell  18 (local index    146): ( 370.31,  63.281,  34.766)
-		part. InCell  19 (local index    148): ( 320.31,  38.281,  22.266)
+		part. InCell   0 (local index      4): (    350,      25,    62.5)
+		part. InCell   1 (local index     16): (  387.5,   68.75,  90.625)
+		part. InCell   2 (local index     22): (  337.5,   43.75,  53.125)
+		part. InCell   3 (local index     32): ( 306.25,  21.875,  7.8125)
+		part. InCell   4 (local index     38): ( 356.25,  96.875,  45.312)
+		part. InCell   5 (local index     50): ( 393.75,   3.125,  23.438)
+		part. InCell   6 (local index     52): ( 343.75,  78.125,  35.938)
+		part. InCell   7 (local index     74): ( 384.38,  76.562,  74.219)
+		part. InCell   8 (local index     76): ( 334.38,  1.5625,  86.719)
+		part. InCell   9 (local index     88): ( 321.88,  95.312,  58.594)
+		part. InCell  10 (local index     94): ( 371.88,  20.312,  96.094)
+		part. InCell  11 (local index    104): ( 378.12,  48.438,  41.406)
+		part. InCell  12 (local index    110): ( 328.12,  73.438,  3.9062)
+		part. InCell  13 (local index    122): ( 315.62,  29.688,  25.781)
+		part. InCell  14 (local index    124): ( 365.62,  54.688,  13.281)
+		part. InCell  15 (local index    128): ( 332.81,  57.031,  44.141)
+		part. InCell  16 (local index    134): ( 382.81,  32.031,  6.6406)
+		part. InCell  17 (local index    146): ( 370.31,  63.281,  34.766)
+		part. InCell  18 (local index    148): ( 320.31,  38.281,  22.266)
 	Local Cell   4:
-		part. InCell   0 (local index      9): (     25,   112.5,   93.75)
-		part. InCell   1 (local index     11): (     75,   187.5,   56.25)
-		part. InCell   2 (local index     23): (   62.5,  106.25,  84.375)
-		part. InCell   3 (local index     29): (   12.5,  181.25,  71.875)
-		part. InCell   4 (local index     39): (  31.25,  159.38,  14.062)
-		part. InCell   5 (local index     45): (  81.25,  134.38,  26.562)
-		part. InCell   6 (local index     57): (  68.75,  165.62,  4.6875)
-		part. InCell   7 (local index     59): (  18.75,  140.62,  42.188)
-		part. InCell   8 (local index     65): ( 59.375,  139.06,  55.469)
-		part. InCell   9 (local index     67): (  9.375,  164.06,  92.969)
-		part. InCell  10 (local index     79): ( 46.875,  132.81,  64.844)
-		part. InCell  11 (local index     85): ( 96.875,  157.81,  77.344)
-		part. InCell  12 (local index     95): ( 53.125,  185.94,  35.156)
-		part. InCell  13 (local index    101): (  3.125,  110.94,  22.656)
-		part. InCell  14 (local index    113): ( 40.625,  192.19,  44.531)
-		part. InCell  15 (local index    115): ( 90.625,  117.19,  7.0312)
-		part. InCell  16 (local index    135): ( 7.8125,  119.53,  25.391)
-		part. InCell  17 (local index    141): ( 57.812,  194.53,  12.891)
-		part. InCell  18 (local index    153): ( 95.312,  100.78,  41.016)
-		part. InCell  19 (local index    155): ( 45.312,  175.78,  3.5156)
+		part. InCell   0 (local index      1): (    100,     150,      25)
+		part. InCell   1 (local index      9): (     25,   112.5,   93.75)
+		part. InCell   2 (local index     11): (     75,   187.5,   56.25)
+		part. InCell   3 (local index     23): (   62.5,  106.25,  84.375)
+		part. InCell   4 (local index     29): (   12.5,  181.25,  71.875)
+		part. InCell   5 (local index     39): (  31.25,  159.38,  14.062)
+		part. InCell   6 (local index     45): (  81.25,  134.38,  26.562)
+		part. InCell   7 (local index     57): (  68.75,  165.62,  4.6875)
+		part. InCell   8 (local index     59): (  18.75,  140.62,  42.188)
+		part. InCell   9 (local index     65): ( 59.375,  139.06,  55.469)
+		part. InCell  10 (local index     67): (  9.375,  164.06,  92.969)
+		part. InCell  11 (local index     79): ( 46.875,  132.81,  64.844)
+		part. InCell  12 (local index     85): ( 96.875,  157.81,  77.344)
+		part. InCell  13 (local index     95): ( 53.125,  185.94,  35.156)
+		part. InCell  14 (local index    101): (  3.125,  110.94,  22.656)
+		part. InCell  15 (local index    113): ( 40.625,  192.19,  44.531)
+		part. InCell  16 (local index    115): ( 90.625,  117.19,  7.0312)
+		part. InCell  17 (local index    135): ( 7.8125,  119.53,  25.391)
+		part. InCell  18 (local index    141): ( 57.812,  194.53,  12.891)
+		part. InCell  19 (local index    153): ( 95.312,  100.78,  41.016)
+		part. InCell  20 (local index    155): ( 45.312,  175.78,  3.5156)
 	Local Cell   5:
-		part. InCell   0 (local index      1): (    100,     150,      25)
-		part. InCell   1 (local index      3): (    150,     125,    12.5)
-		part. InCell   2 (local index     15): (  187.5,  168.75,  40.625)
-		part. InCell   3 (local index     21): (  137.5,  143.75,   3.125)
-		part. InCell   4 (local index     31): ( 106.25,  121.88,  57.812)
-		part. InCell   5 (local index     37): ( 156.25,  196.88,  95.312)
-		part. InCell   6 (local index     49): ( 193.75,  103.12,  73.438)
-		part. InCell   7 (local index     51): ( 143.75,  178.12,  85.938)
-		part. InCell   8 (local index     73): ( 184.38,  176.56,  24.219)
-		part. InCell   9 (local index     75): ( 134.38,  101.56,  36.719)
-		part. InCell  10 (local index     87): ( 121.88,  195.31,  8.5938)
-		part. InCell  11 (local index     93): ( 171.88,  120.31,  46.094)
-		part. InCell  12 (local index    103): ( 178.12,  148.44,  91.406)
-		part. InCell  13 (local index    109): ( 128.12,  173.44,  53.906)
-		part. InCell  14 (local index    121): ( 115.62,  129.69,  75.781)
-		part. InCell  15 (local index    123): ( 165.62,  154.69,  63.281)
-		part. InCell  16 (local index    127): ( 132.81,  157.03,  94.141)
-		part. InCell  17 (local index    133): ( 182.81,  132.03,  56.641)
-		part. InCell  18 (local index    145): ( 170.31,  163.28,  84.766)
-		part. InCell  19 (local index    147): ( 120.31,  138.28,  72.266)
+		part. InCell   0 (local index      3): (    150,     125,    12.5)
+		part. InCell   1 (local index     15): (  187.5,  168.75,  40.625)
+		part. InCell   2 (local index     21): (  137.5,  143.75,   3.125)
+		part. InCell   3 (local index     31): ( 106.25,  121.88,  57.812)
+		part. InCell   4 (local index     37): ( 156.25,  196.88,  95.312)
+		part. InCell   5 (local index     49): ( 193.75,  103.12,  73.438)
+		part. InCell   6 (local index     51): ( 143.75,  178.12,  85.938)
+		part. InCell   7 (local index     73): ( 184.38,  176.56,  24.219)
+		part. InCell   8 (local index     75): ( 134.38,  101.56,  36.719)
+		part. InCell   9 (local index     87): ( 121.88,  195.31,  8.5938)
+		part. InCell  10 (local index     93): ( 171.88,  120.31,  46.094)
+		part. InCell  11 (local index    103): ( 178.12,  148.44,  91.406)
+		part. InCell  12 (local index    109): ( 128.12,  173.44,  53.906)
+		part. InCell  13 (local index    121): ( 115.62,  129.69,  75.781)
+		part. InCell  14 (local index    123): ( 165.62,  154.69,  63.281)
+		part. InCell  15 (local index    127): ( 132.81,  157.03,  94.141)
+		part. InCell  16 (local index    133): ( 182.81,  132.03,  56.641)
+		part. InCell  17 (local index    145): ( 170.31,  163.28,  84.766)
+		part. InCell  18 (local index    147): ( 120.31,  138.28,  72.266)
 	Local Cell   6:
-		part. InCell   0 (local index      0): (    200,     100,      50)
-		part. InCell   1 (local index      6): (    250,     175,    87.5)
-		part. InCell   2 (local index     18): (  287.5,  118.75,  65.625)
-		part. InCell   3 (local index     20): (  237.5,  193.75,  78.125)
-		part. InCell   4 (local index     34): ( 206.25,  171.88,  32.812)
-		part. InCell   5 (local index     36): ( 256.25,  146.88,  20.312)
-		part. InCell   6 (local index     48): ( 293.75,  153.12,  48.438)
-		part. InCell   7 (local index     54): ( 243.75,  128.12,  10.938)
-		part. InCell   8 (local index     72): ( 284.38,  126.56,  99.219)
-		part. InCell   9 (local index     78): ( 234.38,  151.56,  61.719)
-		part. InCell  10 (local index     90): ( 221.88,  145.31,  83.594)
-		part. InCell  11 (local index     92): ( 271.88,  170.31,  71.094)
-		part. InCell  12 (local index    106): ( 278.12,  198.44,  16.406)
-		part. InCell  13 (local index    108): ( 228.12,  123.44,  28.906)
-		part. InCell  14 (local index    120): ( 215.62,  179.69, 0.78125)
-		part. InCell  15 (local index    126): ( 265.62,  104.69,  38.281)
-		part. InCell  16 (local index    130): ( 232.81,  107.03,  19.141)
-		part. InCell  17 (local index    132): ( 282.81,  182.03,  31.641)
-		part. InCell  18 (local index    144): ( 270.31,  113.28,  9.7656)
-		part. InCell  19 (local index    150): ( 220.31,  188.28,  47.266)
+		part. InCell   0 (local index      6): (    250,     175,    87.5)
+		part. InCell   1 (local index     18): (  287.5,  118.75,  65.625)
+		part. InCell   2 (local index     20): (  237.5,  193.75,  78.125)
+		part. InCell   3 (local index     34): ( 206.25,  171.88,  32.812)
+		part. InCell   4 (local index     36): ( 256.25,  146.88,  20.312)
+		part. InCell   5 (local index     48): ( 293.75,  153.12,  48.438)
+		part. InCell   6 (local index     54): ( 243.75,  128.12,  10.938)
+		part. InCell   7 (local index     72): ( 284.38,  126.56,  99.219)
+		part. InCell   8 (local index     78): ( 234.38,  151.56,  61.719)
+		part. InCell   9 (local index     90): ( 221.88,  145.31,  83.594)
+		part. InCell  10 (local index     92): ( 271.88,  170.31,  71.094)
+		part. InCell  11 (local index    106): ( 278.12,  198.44,  16.406)
+		part. InCell  12 (local index    108): ( 228.12,  123.44,  28.906)
+		part. InCell  13 (local index    120): ( 215.62,  179.69, 0.78125)
+		part. InCell  14 (local index    126): ( 265.62,  104.69,  38.281)
+		part. InCell  15 (local index    130): ( 232.81,  107.03,  19.141)
+		part. InCell  16 (local index    132): ( 282.81,  182.03,  31.641)
+		part. InCell  17 (local index    144): ( 270.31,  113.28,  9.7656)
+		part. InCell  18 (local index    150): ( 220.31,  188.28,  47.266)
 	Local Cell   7:
 		part. InCell   0 (local index      8): (    325,   162.5,   18.75)
 		part. InCell   1 (local index     14): (    375,   137.5,   31.25)

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of2.spaceFillerParticleLayout.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of2.spaceFillerParticleLayout.dat.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.0of2.spaceFillerParticleLayout.dat.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,103 +1,104 @@
-SpaceFillerParticleLayout (ptr): 0x8064654:
-	GlobalParticleLayout (ptr): 0x8064654
-	ParticleLayout (ptr): 0x8064654
-	Stg_Class (ptr): 0x8064654
-		sizeOfSelf: 124
+SpaceFillerParticleLayout (ptr): 0x6472a0:
+	GlobalParticleLayout (ptr): 0x6472a0
+	ParticleLayout (ptr): 0x6472a0
+	Stg_Class (ptr): 0x6472a0
+		sizeOfSelf: 272
 		_deleteSelf: Yes
 		type: SpaceFillerParticleLayout
-		_delete (func ptr): 0xb7ef9e68
-		_print (func ptr): 0xb7ef9ebe
-		_copy (func ptr): 0xb7ef9f4d
-		_setInitialCounts (func ptr): 0xb7ef23f3
-		_initialiseParticles (func ptr): 0xb7efa151
+		_delete (func ptr): 0x2aaaaaaca404
+		_print (func ptr): 0x2aaaaaaca455
+		_copy (func ptr): 0x2aaaaaaca508
+		_setInitialCounts (func ptr): 0x2aaaaaac078f
+		_initialiseParticles (func ptr): 0x2aaaaaaca742
 		coordSystem: GlobalCoordSystem
 		weightsInitialisedAtStartup : False
-		_initialiseParticle (func ptr): 0xb7efa181
+		_initialiseParticle (func ptr): 0x2aaaaaaca769
 		totalInitialParticles: 160
 		averageInitialParticlesPerCell: 20
 	self->dim = 3
 Printing coords of all local particles, cell-by-cell:
 	Local Cell   0:
-		part. InCell   0 (local index      2): (     50,      75,    37.5)
-		part. InCell   1 (local index      8): (   87.5,   18.75,  15.625)
-		part. InCell   2 (local index      9): (   37.5,   93.75,  28.125)
-		part. InCell   3 (local index     16): (   6.25,  71.875,  82.812)
-		part. InCell   4 (local index     17): (  56.25,  46.875,  70.312)
-		part. InCell   5 (local index     23): (  93.75,  53.125,  98.438)
-		part. InCell   6 (local index     26): (  43.75,  28.125,  60.938)
-		part. InCell   7 (local index     35): ( 84.375,  26.562,  49.219)
-		part. InCell   8 (local index     38): ( 34.375,  51.562,  11.719)
-		part. InCell   9 (local index     44): ( 21.875,  45.312,  33.594)
-		part. InCell  10 (local index     45): ( 71.875,  70.312,  21.094)
-		part. InCell  11 (local index     52): ( 78.125,  98.438,  66.406)
-		part. InCell  12 (local index     53): ( 28.125,  23.438,  78.906)
-		part. InCell  13 (local index     59): ( 15.625,  79.688,  50.781)
-		part. InCell  14 (local index     62): ( 65.625,  4.6875,  88.281)
-		part. InCell  15 (local index     64): ( 32.812,  7.0312,  69.141)
-		part. InCell  16 (local index     65): ( 82.812,  82.031,  81.641)
-		part. InCell  17 (local index     71): ( 70.312,  13.281,  59.766)
-		part. InCell  18 (local index     74): ( 20.312,  88.281,  97.266)
-		part. InCell  19 (local index     79): ( 26.562,  66.406,  39.453)
+		part. InCell   0 (local index      3): (     50,      75,    37.5)
+		part. InCell   1 (local index      9): (   87.5,   18.75,  15.625)
+		part. InCell   2 (local index     10): (   37.5,   93.75,  28.125)
+		part. InCell   3 (local index     17): (   6.25,  71.875,  82.812)
+		part. InCell   4 (local index     18): (  56.25,  46.875,  70.312)
+		part. InCell   5 (local index     24): (  93.75,  53.125,  98.438)
+		part. InCell   6 (local index     27): (  43.75,  28.125,  60.938)
+		part. InCell   7 (local index     36): ( 84.375,  26.562,  49.219)
+		part. InCell   8 (local index     39): ( 34.375,  51.562,  11.719)
+		part. InCell   9 (local index     45): ( 21.875,  45.312,  33.594)
+		part. InCell  10 (local index     46): ( 71.875,  70.312,  21.094)
+		part. InCell  11 (local index     53): ( 78.125,  98.438,  66.406)
+		part. InCell  12 (local index     54): ( 28.125,  23.438,  78.906)
+		part. InCell  13 (local index     60): ( 15.625,  79.688,  50.781)
+		part. InCell  14 (local index     63): ( 65.625,  4.6875,  88.281)
+		part. InCell  15 (local index     65): ( 32.812,  7.0312,  69.141)
+		part. InCell  16 (local index     66): ( 82.812,  82.031,  81.641)
+		part. InCell  17 (local index     72): ( 70.312,  13.281,  59.766)
+		part. InCell  18 (local index     75): ( 20.312,  88.281,  97.266)
+		part. InCell  19 (local index     80): ( 26.562,  66.406,  39.453)
 	Local Cell   1:
-		part. InCell   0 (local index      3): (    125,    62.5,   68.75)
-		part. InCell   1 (local index      6): (    175,    37.5,   81.25)
-		part. InCell   2 (local index     12): (  162.5,   56.25,  59.375)
-		part. InCell   3 (local index     13): (  112.5,   31.25,  96.875)
-		part. InCell   4 (local index     20): ( 131.25,   9.375,  39.062)
-		part. InCell   5 (local index     21): ( 181.25,  84.375,  1.5625)
-		part. InCell   6 (local index     27): ( 168.75,  15.625,  29.688)
-		part. InCell   7 (local index     30): ( 118.75,  90.625,  17.188)
-		part. InCell   8 (local index     31): ( 159.38,  89.062,  80.469)
-		part. InCell   9 (local index     34): ( 109.38,  14.062,  67.969)
-		part. InCell  10 (local index     40): ( 146.88,  82.812,  89.844)
-		part. InCell  11 (local index     41): ( 196.88,  7.8125,  52.344)
-		part. InCell  12 (local index     48): ( 153.12,  35.938,  10.156)
-		part. InCell  13 (local index     49): ( 103.12,  60.938,  47.656)
-		part. InCell  14 (local index     55): ( 140.62,  42.188,  19.531)
-		part. InCell  15 (local index     58): ( 190.62,  67.188,  32.031)
-		part. InCell  16 (local index     68): ( 107.81,  69.531, 0.39062)
-		part. InCell  17 (local index     69): ( 157.81,  44.531,  37.891)
-		part. InCell  18 (local index     75): ( 195.31,  50.781,  16.016)
-		part. InCell  19 (local index     78): ( 145.31,  25.781,  28.516)
+		part. InCell   0 (local index      0): (    200,     100,      50)
+		part. InCell   1 (local index      4): (    125,    62.5,   68.75)
+		part. InCell   2 (local index      7): (    175,    37.5,   81.25)
+		part. InCell   3 (local index     13): (  162.5,   56.25,  59.375)
+		part. InCell   4 (local index     14): (  112.5,   31.25,  96.875)
+		part. InCell   5 (local index     21): ( 131.25,   9.375,  39.062)
+		part. InCell   6 (local index     22): ( 181.25,  84.375,  1.5625)
+		part. InCell   7 (local index     28): ( 168.75,  15.625,  29.688)
+		part. InCell   8 (local index     31): ( 118.75,  90.625,  17.188)
+		part. InCell   9 (local index     32): ( 159.38,  89.062,  80.469)
+		part. InCell  10 (local index     35): ( 109.38,  14.062,  67.969)
+		part. InCell  11 (local index     41): ( 146.88,  82.812,  89.844)
+		part. InCell  12 (local index     42): ( 196.88,  7.8125,  52.344)
+		part. InCell  13 (local index     49): ( 153.12,  35.938,  10.156)
+		part. InCell  14 (local index     50): ( 103.12,  60.938,  47.656)
+		part. InCell  15 (local index     56): ( 140.62,  42.188,  19.531)
+		part. InCell  16 (local index     59): ( 190.62,  67.188,  32.031)
+		part. InCell  17 (local index     69): ( 107.81,  69.531, 0.39062)
+		part. InCell  18 (local index     70): ( 157.81,  44.531,  37.891)
+		part. InCell  19 (local index     76): ( 195.31,  50.781,  16.016)
+		part. InCell  20 (local index     79): ( 145.31,  25.781,  28.516)
 	Local Cell   2:
-		part. InCell   0 (local index      4): (     25,   112.5,   93.75)
-		part. InCell   1 (local index      5): (     75,   187.5,   56.25)
-		part. InCell   2 (local index     11): (   62.5,  106.25,  84.375)
-		part. InCell   3 (local index     14): (   12.5,  181.25,  71.875)
-		part. InCell   4 (local index     19): (  31.25,  159.38,  14.062)
-		part. InCell   5 (local index     22): (  81.25,  134.38,  26.562)
-		part. InCell   6 (local index     28): (  68.75,  165.62,  4.6875)
-		part. InCell   7 (local index     29): (  18.75,  140.62,  42.188)
-		part. InCell   8 (local index     32): ( 59.375,  139.06,  55.469)
-		part. InCell   9 (local index     33): (  9.375,  164.06,  92.969)
-		part. InCell  10 (local index     39): ( 46.875,  132.81,  64.844)
-		part. InCell  11 (local index     42): ( 96.875,  157.81,  77.344)
-		part. InCell  12 (local index     47): ( 53.125,  185.94,  35.156)
-		part. InCell  13 (local index     50): (  3.125,  110.94,  22.656)
-		part. InCell  14 (local index     56): ( 40.625,  192.19,  44.531)
-		part. InCell  15 (local index     57): ( 90.625,  117.19,  7.0312)
-		part. InCell  16 (local index     67): ( 7.8125,  119.53,  25.391)
-		part. InCell  17 (local index     70): ( 57.812,  194.53,  12.891)
-		part. InCell  18 (local index     76): ( 95.312,  100.78,  41.016)
-		part. InCell  19 (local index     77): ( 45.312,  175.78,  3.5156)
+		part. InCell   0 (local index      1): (    100,     150,      25)
+		part. InCell   1 (local index      5): (     25,   112.5,   93.75)
+		part. InCell   2 (local index      6): (     75,   187.5,   56.25)
+		part. InCell   3 (local index     12): (   62.5,  106.25,  84.375)
+		part. InCell   4 (local index     15): (   12.5,  181.25,  71.875)
+		part. InCell   5 (local index     20): (  31.25,  159.38,  14.062)
+		part. InCell   6 (local index     23): (  81.25,  134.38,  26.562)
+		part. InCell   7 (local index     29): (  68.75,  165.62,  4.6875)
+		part. InCell   8 (local index     30): (  18.75,  140.62,  42.188)
+		part. InCell   9 (local index     33): ( 59.375,  139.06,  55.469)
+		part. InCell  10 (local index     34): (  9.375,  164.06,  92.969)
+		part. InCell  11 (local index     40): ( 46.875,  132.81,  64.844)
+		part. InCell  12 (local index     43): ( 96.875,  157.81,  77.344)
+		part. InCell  13 (local index     48): ( 53.125,  185.94,  35.156)
+		part. InCell  14 (local index     51): (  3.125,  110.94,  22.656)
+		part. InCell  15 (local index     57): ( 40.625,  192.19,  44.531)
+		part. InCell  16 (local index     58): ( 90.625,  117.19,  7.0312)
+		part. InCell  17 (local index     68): ( 7.8125,  119.53,  25.391)
+		part. InCell  18 (local index     71): ( 57.812,  194.53,  12.891)
+		part. InCell  19 (local index     77): ( 95.312,  100.78,  41.016)
+		part. InCell  20 (local index     78): ( 45.312,  175.78,  3.5156)
 	Local Cell   3:
-		part. InCell   0 (local index      0): (    100,     150,      25)
-		part. InCell   1 (local index      1): (    150,     125,    12.5)
-		part. InCell   2 (local index      7): (  187.5,  168.75,  40.625)
-		part. InCell   3 (local index     10): (  137.5,  143.75,   3.125)
-		part. InCell   4 (local index     15): ( 106.25,  121.88,  57.812)
-		part. InCell   5 (local index     18): ( 156.25,  196.88,  95.312)
-		part. InCell   6 (local index     24): ( 193.75,  103.12,  73.438)
-		part. InCell   7 (local index     25): ( 143.75,  178.12,  85.938)
-		part. InCell   8 (local index     36): ( 184.38,  176.56,  24.219)
-		part. InCell   9 (local index     37): ( 134.38,  101.56,  36.719)
-		part. InCell  10 (local index     43): ( 121.88,  195.31,  8.5938)
-		part. InCell  11 (local index     46): ( 171.88,  120.31,  46.094)
-		part. InCell  12 (local index     51): ( 178.12,  148.44,  91.406)
-		part. InCell  13 (local index     54): ( 128.12,  173.44,  53.906)
-		part. InCell  14 (local index     60): ( 115.62,  129.69,  75.781)
-		part. InCell  15 (local index     61): ( 165.62,  154.69,  63.281)
-		part. InCell  16 (local index     63): ( 132.81,  157.03,  94.141)
-		part. InCell  17 (local index     66): ( 182.81,  132.03,  56.641)
-		part. InCell  18 (local index     72): ( 170.31,  163.28,  84.766)
-		part. InCell  19 (local index     73): ( 120.31,  138.28,  72.266)
+		part. InCell   0 (local index      2): (    150,     125,    12.5)
+		part. InCell   1 (local index      8): (  187.5,  168.75,  40.625)
+		part. InCell   2 (local index     11): (  137.5,  143.75,   3.125)
+		part. InCell   3 (local index     16): ( 106.25,  121.88,  57.812)
+		part. InCell   4 (local index     19): ( 156.25,  196.88,  95.312)
+		part. InCell   5 (local index     25): ( 193.75,  103.12,  73.438)
+		part. InCell   6 (local index     26): ( 143.75,  178.12,  85.938)
+		part. InCell   7 (local index     37): ( 184.38,  176.56,  24.219)
+		part. InCell   8 (local index     38): ( 134.38,  101.56,  36.719)
+		part. InCell   9 (local index     44): ( 121.88,  195.31,  8.5938)
+		part. InCell  10 (local index     47): ( 171.88,  120.31,  46.094)
+		part. InCell  11 (local index     52): ( 178.12,  148.44,  91.406)
+		part. InCell  12 (local index     55): ( 128.12,  173.44,  53.906)
+		part. InCell  13 (local index     61): ( 115.62,  129.69,  75.781)
+		part. InCell  14 (local index     62): ( 165.62,  154.69,  63.281)
+		part. InCell  15 (local index     64): ( 132.81,  157.03,  94.141)
+		part. InCell  16 (local index     67): ( 182.81,  132.03,  56.641)
+		part. InCell  17 (local index     73): ( 170.31,  163.28,  84.766)
+		part. InCell  18 (local index     74): ( 120.31,  138.28,  72.266)

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.1of2.spaceFillerParticleLayout.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.1of2.spaceFillerParticleLayout.dat.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/expected/testSpaceFillerParticleLayout.1of2.spaceFillerParticleLayout.dat.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,103 +1,102 @@
-SpaceFillerParticleLayout (ptr): 0x80638cc:
-	GlobalParticleLayout (ptr): 0x80638cc
-	ParticleLayout (ptr): 0x80638cc
-	Stg_Class (ptr): 0x80638cc
-		sizeOfSelf: 124
+SpaceFillerParticleLayout (ptr): 0x646b60:
+	GlobalParticleLayout (ptr): 0x646b60
+	ParticleLayout (ptr): 0x646b60
+	Stg_Class (ptr): 0x646b60
+		sizeOfSelf: 272
 		_deleteSelf: Yes
 		type: SpaceFillerParticleLayout
-		_delete (func ptr): 0xb7f43e68
-		_print (func ptr): 0xb7f43ebe
-		_copy (func ptr): 0xb7f43f4d
-		_setInitialCounts (func ptr): 0xb7f3c3f3
-		_initialiseParticles (func ptr): 0xb7f44151
+		_delete (func ptr): 0x2aaaaaaca404
+		_print (func ptr): 0x2aaaaaaca455
+		_copy (func ptr): 0x2aaaaaaca508
+		_setInitialCounts (func ptr): 0x2aaaaaac078f
+		_initialiseParticles (func ptr): 0x2aaaaaaca742
 		coordSystem: GlobalCoordSystem
 		weightsInitialisedAtStartup : False
-		_initialiseParticle (func ptr): 0xb7f44181
+		_initialiseParticle (func ptr): 0x2aaaaaaca769
 		totalInitialParticles: 160
 		averageInitialParticlesPerCell: 20
 	self->dim = 3
 Printing coords of all local particles, cell-by-cell:
 	Local Cell   0:
-		part. InCell   0 (local index      5): (    225,    12.5,   43.75)
-		part. InCell   1 (local index      6): (    275,    87.5,    6.25)
-		part. InCell   2 (local index     12): (  262.5,    6.25,  34.375)
-		part. InCell   3 (local index     15): (  212.5,   81.25,  21.875)
-		part. InCell   4 (local index     20): ( 231.25,  59.375,  64.062)
-		part. InCell   5 (local index     23): ( 281.25,  34.375,  76.562)
-		part. InCell   6 (local index     29): ( 268.75,  65.625,  54.688)
-		part. InCell   7 (local index     30): ( 218.75,  40.625,  92.188)
-		part. InCell   8 (local index     33): ( 259.38,  39.062,  5.4688)
-		part. InCell   9 (local index     34): ( 209.38,  64.062,  42.969)
-		part. InCell  10 (local index     40): ( 246.88,  32.812,  14.844)
-		part. InCell  11 (local index     43): ( 296.88,  57.812,  27.344)
-		part. InCell  12 (local index     48): ( 253.12,  85.938,  85.156)
-		part. InCell  13 (local index     51): ( 203.12,  10.938,  72.656)
-		part. InCell  14 (local index     57): ( 240.62,  92.188,  94.531)
-		part. InCell  15 (local index     58): ( 290.62,  17.188,  57.031)
-		part. InCell  16 (local index     68): ( 207.81,  19.531,  75.391)
-		part. InCell  17 (local index     71): ( 257.81,  94.531,  62.891)
-		part. InCell  18 (local index     77): ( 295.31, 0.78125,  91.016)
-		part. InCell  19 (local index     78): ( 245.31,  75.781,  53.516)
+		part. InCell   0 (local index      0): (    300,      50,      75)
+		part. InCell   1 (local index      4): (    225,    12.5,   43.75)
+		part. InCell   2 (local index      5): (    275,    87.5,    6.25)
+		part. InCell   3 (local index     11): (  262.5,    6.25,  34.375)
+		part. InCell   4 (local index     14): (  212.5,   81.25,  21.875)
+		part. InCell   5 (local index     19): ( 231.25,  59.375,  64.062)
+		part. InCell   6 (local index     22): ( 281.25,  34.375,  76.562)
+		part. InCell   7 (local index     28): ( 268.75,  65.625,  54.688)
+		part. InCell   8 (local index     29): ( 218.75,  40.625,  92.188)
+		part. InCell   9 (local index     32): ( 259.38,  39.062,  5.4688)
+		part. InCell  10 (local index     33): ( 209.38,  64.062,  42.969)
+		part. InCell  11 (local index     39): ( 246.88,  32.812,  14.844)
+		part. InCell  12 (local index     42): ( 296.88,  57.812,  27.344)
+		part. InCell  13 (local index     47): ( 253.12,  85.938,  85.156)
+		part. InCell  14 (local index     50): ( 203.12,  10.938,  72.656)
+		part. InCell  15 (local index     56): ( 240.62,  92.188,  94.531)
+		part. InCell  16 (local index     57): ( 290.62,  17.188,  57.031)
+		part. InCell  17 (local index     67): ( 207.81,  19.531,  75.391)
+		part. InCell  18 (local index     70): ( 257.81,  94.531,  62.891)
+		part. InCell  19 (local index     76): ( 295.31, 0.78125,  91.016)
+		part. InCell  20 (local index     77): ( 245.31,  75.781,  53.516)
 	Local Cell   1:
-		part. InCell   0 (local index      1): (    300,      50,      75)
-		part. InCell   1 (local index      2): (    350,      25,    62.5)
-		part. InCell   2 (local index      8): (  387.5,   68.75,  90.625)
-		part. InCell   3 (local index     11): (  337.5,   43.75,  53.125)
-		part. InCell   4 (local index     16): ( 306.25,  21.875,  7.8125)
-		part. InCell   5 (local index     19): ( 356.25,  96.875,  45.312)
-		part. InCell   6 (local index     25): ( 393.75,   3.125,  23.438)
-		part. InCell   7 (local index     26): ( 343.75,  78.125,  35.938)
-		part. InCell   8 (local index     37): ( 384.38,  76.562,  74.219)
-		part. InCell   9 (local index     38): ( 334.38,  1.5625,  86.719)
-		part. InCell  10 (local index     44): ( 321.88,  95.312,  58.594)
-		part. InCell  11 (local index     47): ( 371.88,  20.312,  96.094)
-		part. InCell  12 (local index     52): ( 378.12,  48.438,  41.406)
-		part. InCell  13 (local index     55): ( 328.12,  73.438,  3.9062)
-		part. InCell  14 (local index     61): ( 315.62,  29.688,  25.781)
-		part. InCell  15 (local index     62): ( 365.62,  54.688,  13.281)
-		part. InCell  16 (local index     64): ( 332.81,  57.031,  44.141)
-		part. InCell  17 (local index     67): ( 382.81,  32.031,  6.6406)
-		part. InCell  18 (local index     73): ( 370.31,  63.281,  34.766)
-		part. InCell  19 (local index     74): ( 320.31,  38.281,  22.266)
+		part. InCell   0 (local index      1): (    350,      25,    62.5)
+		part. InCell   1 (local index      7): (  387.5,   68.75,  90.625)
+		part. InCell   2 (local index     10): (  337.5,   43.75,  53.125)
+		part. InCell   3 (local index     15): ( 306.25,  21.875,  7.8125)
+		part. InCell   4 (local index     18): ( 356.25,  96.875,  45.312)
+		part. InCell   5 (local index     24): ( 393.75,   3.125,  23.438)
+		part. InCell   6 (local index     25): ( 343.75,  78.125,  35.938)
+		part. InCell   7 (local index     36): ( 384.38,  76.562,  74.219)
+		part. InCell   8 (local index     37): ( 334.38,  1.5625,  86.719)
+		part. InCell   9 (local index     43): ( 321.88,  95.312,  58.594)
+		part. InCell  10 (local index     46): ( 371.88,  20.312,  96.094)
+		part. InCell  11 (local index     51): ( 378.12,  48.438,  41.406)
+		part. InCell  12 (local index     54): ( 328.12,  73.438,  3.9062)
+		part. InCell  13 (local index     60): ( 315.62,  29.688,  25.781)
+		part. InCell  14 (local index     61): ( 365.62,  54.688,  13.281)
+		part. InCell  15 (local index     63): ( 332.81,  57.031,  44.141)
+		part. InCell  16 (local index     66): ( 382.81,  32.031,  6.6406)
+		part. InCell  17 (local index     72): ( 370.31,  63.281,  34.766)
+		part. InCell  18 (local index     73): ( 320.31,  38.281,  22.266)
 	Local Cell   2:
-		part. InCell   0 (local index      0): (    200,     100,      50)
-		part. InCell   1 (local index      3): (    250,     175,    87.5)
-		part. InCell   2 (local index      9): (  287.5,  118.75,  65.625)
-		part. InCell   3 (local index     10): (  237.5,  193.75,  78.125)
-		part. InCell   4 (local index     17): ( 206.25,  171.88,  32.812)
-		part. InCell   5 (local index     18): ( 256.25,  146.88,  20.312)
-		part. InCell   6 (local index     24): ( 293.75,  153.12,  48.438)
-		part. InCell   7 (local index     27): ( 243.75,  128.12,  10.938)
-		part. InCell   8 (local index     36): ( 284.38,  126.56,  99.219)
-		part. InCell   9 (local index     39): ( 234.38,  151.56,  61.719)
-		part. InCell  10 (local index     45): ( 221.88,  145.31,  83.594)
-		part. InCell  11 (local index     46): ( 271.88,  170.31,  71.094)
-		part. InCell  12 (local index     53): ( 278.12,  198.44,  16.406)
-		part. InCell  13 (local index     54): ( 228.12,  123.44,  28.906)
-		part. InCell  14 (local index     60): ( 215.62,  179.69, 0.78125)
-		part. InCell  15 (local index     63): ( 265.62,  104.69,  38.281)
-		part. InCell  16 (local index     65): ( 232.81,  107.03,  19.141)
-		part. InCell  17 (local index     66): ( 282.81,  182.03,  31.641)
-		part. InCell  18 (local index     72): ( 270.31,  113.28,  9.7656)
-		part. InCell  19 (local index     75): ( 220.31,  188.28,  47.266)
+		part. InCell   0 (local index      2): (    250,     175,    87.5)
+		part. InCell   1 (local index      8): (  287.5,  118.75,  65.625)
+		part. InCell   2 (local index      9): (  237.5,  193.75,  78.125)
+		part. InCell   3 (local index     16): ( 206.25,  171.88,  32.812)
+		part. InCell   4 (local index     17): ( 256.25,  146.88,  20.312)
+		part. InCell   5 (local index     23): ( 293.75,  153.12,  48.438)
+		part. InCell   6 (local index     26): ( 243.75,  128.12,  10.938)
+		part. InCell   7 (local index     35): ( 284.38,  126.56,  99.219)
+		part. InCell   8 (local index     38): ( 234.38,  151.56,  61.719)
+		part. InCell   9 (local index     44): ( 221.88,  145.31,  83.594)
+		part. InCell  10 (local index     45): ( 271.88,  170.31,  71.094)
+		part. InCell  11 (local index     52): ( 278.12,  198.44,  16.406)
+		part. InCell  12 (local index     53): ( 228.12,  123.44,  28.906)
+		part. InCell  13 (local index     59): ( 215.62,  179.69, 0.78125)
+		part. InCell  14 (local index     62): ( 265.62,  104.69,  38.281)
+		part. InCell  15 (local index     64): ( 232.81,  107.03,  19.141)
+		part. InCell  16 (local index     65): ( 282.81,  182.03,  31.641)
+		part. InCell  17 (local index     71): ( 270.31,  113.28,  9.7656)
+		part. InCell  18 (local index     74): ( 220.31,  188.28,  47.266)
 	Local Cell   3:
-		part. InCell   0 (local index      4): (    325,   162.5,   18.75)
-		part. InCell   1 (local index      7): (    375,   137.5,   31.25)
-		part. InCell   2 (local index     13): (  362.5,  156.25,   9.375)
-		part. InCell   3 (local index     14): (  312.5,  131.25,  46.875)
-		part. InCell   4 (local index     21): ( 331.25,  109.38,  89.062)
-		part. InCell   5 (local index     22): ( 381.25,  184.38,  51.562)
-		part. InCell   6 (local index     28): ( 368.75,  115.62,  79.688)
-		part. InCell   7 (local index     31): ( 318.75,  190.62,  67.188)
-		part. InCell   8 (local index     32): ( 359.38,  189.06,  30.469)
-		part. InCell   9 (local index     35): ( 309.38,  114.06,  17.969)
-		part. InCell  10 (local index     41): ( 346.88,  182.81,  39.844)
-		part. InCell  11 (local index     42): ( 396.88,  107.81,  2.3438)
-		part. InCell  12 (local index     49): ( 353.12,  135.94,  60.156)
-		part. InCell  13 (local index     50): ( 303.12,  160.94,  97.656)
-		part. InCell  14 (local index     56): ( 340.62,  142.19,  69.531)
-		part. InCell  15 (local index     59): ( 390.62,  167.19,  82.031)
-		part. InCell  16 (local index     69): ( 307.81,  169.53,  50.391)
-		part. InCell  17 (local index     70): ( 357.81,  144.53,  87.891)
-		part. InCell  18 (local index     76): ( 395.31,  150.78,  66.016)
-		part. InCell  19 (local index     79): ( 345.31,  125.78,  78.516)
+		part. InCell   0 (local index      3): (    325,   162.5,   18.75)
+		part. InCell   1 (local index      6): (    375,   137.5,   31.25)
+		part. InCell   2 (local index     12): (  362.5,  156.25,   9.375)
+		part. InCell   3 (local index     13): (  312.5,  131.25,  46.875)
+		part. InCell   4 (local index     20): ( 331.25,  109.38,  89.062)
+		part. InCell   5 (local index     21): ( 381.25,  184.38,  51.562)
+		part. InCell   6 (local index     27): ( 368.75,  115.62,  79.688)
+		part. InCell   7 (local index     30): ( 318.75,  190.62,  67.188)
+		part. InCell   8 (local index     31): ( 359.38,  189.06,  30.469)
+		part. InCell   9 (local index     34): ( 309.38,  114.06,  17.969)
+		part. InCell  10 (local index     40): ( 346.88,  182.81,  39.844)
+		part. InCell  11 (local index     41): ( 396.88,  107.81,  2.3438)
+		part. InCell  12 (local index     48): ( 353.12,  135.94,  60.156)
+		part. InCell  13 (local index     49): ( 303.12,  160.94,  97.656)
+		part. InCell  14 (local index     55): ( 340.62,  142.19,  69.531)
+		part. InCell  15 (local index     58): ( 390.62,  167.19,  82.031)
+		part. InCell  16 (local index     68): ( 307.81,  169.53,  50.391)
+		part. InCell  17 (local index     69): ( 357.81,  144.53,  87.891)
+		part. InCell  18 (local index     75): ( 395.31,  150.78,  66.016)
+		part. InCell  19 (local index     78): ( 345.31,  125.78,  78.516)

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of1.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,23 +1,23 @@
-StGermain Framework revision 3900. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0
-Swarm (ptr): 0x132a378
-Stg_Component (ptr): 0x132a378
-Stg_Object (ptr): 0x132a378
-	Stg_Class (ptr): 0x132a378
-		sizeOfSelf: 220
+Swarm (ptr): 0x649950
+Stg_Component (ptr): 0x649950
+Stg_Object (ptr): 0x649950
+	Stg_Class (ptr): 0x649950
+		sizeOfSelf: 384
 		_deleteSelf: Yes
 		type: Swarm
-		_delete (func ptr): 0x215b1c
-		_print (func ptr): 0x215c58
-		_copy (func ptr): 0x2162b4
+		_delete (func ptr): 0x2aaaaaacae49
+		_print (func ptr): 0x2aaaaaacaf56
+		_copy (func ptr): 0x2aaaaaacb549
 	name: testSwarm
 	nameAllocationType: NON_GLOBAL
-	_defaultConstructor (func ptr): 0x216c00
-	_construct (func ptr): 0x216d04
-	_build (func ptr): 0x217010
-	_initialise (func ptr): 0x217100
-	_execute (func ptr): 0x21719c
-	_destroy (func ptr): 0x2171bc
+	_defaultConstructor (func ptr): 0x2aaaaaacbf22
+	_construct (func ptr): 0x2aaaaaacbffb
+	_build (func ptr): 0x2aaaaaacc273
+	_initialise (func ptr): 0x2aaaaaacc360
+	_execute (func ptr): 0x2aaaaaacc3d1
+	_destroy (func ptr): 0x2aaaaaacc3df
 	isConstructed: True
 	isBuilt: True
 	isInitialised: True
@@ -28,27 +28,27 @@
 	initialise function name: testSwarm-Initialise
 	execute function name: testSwarm-Execute
 	destroy function name: testSwarm-Destroy
-ElementCellLayout (ptr): 0x131d878
-CellLayout (ptr): 0x131d878
-Stg_Component (ptr): 0x131d878
-Stg_Object (ptr): 0x131d878
-	Stg_Class (ptr): 0x131d878
-		sizeOfSelf: 152
+ElementCellLayout (ptr): 0x6342a0
+CellLayout (ptr): 0x6342a0
+Stg_Component (ptr): 0x6342a0
+Stg_Object (ptr): 0x6342a0
+	Stg_Class (ptr): 0x6342a0
+		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ElementCellLayout
-		_delete (func ptr): 0x207224
-		_print (func ptr): 0x207260
-		_copy (func ptr): 0x2072e4
+		_delete (func ptr): 0x2aaaaaabe5bf
+		_print (func ptr): 0x2aaaaaabe5de
+		_copy (func ptr): 0x2aaaaaabe646
 	name: elementCellLayout
 	nameAllocationType: NON_GLOBAL
-	_defaultConstructor (func ptr): 0x206cfc
-	_construct (func ptr): 0x2073e4
-	_build (func ptr): 0x20748c
-	_initialise (func ptr): 0x207560
-	_execute (func ptr): 0x207580
-	_destroy (func ptr): 0x2075a0
+	_defaultConstructor (func ptr): 0x2aaaaaabe11c
+	_construct (func ptr): 0x2aaaaaabe717
+	_build (func ptr): 0x2aaaaaabe787
+	_initialise (func ptr): 0x2aaaaaabe824
+	_execute (func ptr): 0x2aaaaaabe832
+	_destroy (func ptr): 0x2aaaaaabe840
 	isConstructed: True
-	isBuilt: False
+	isBuilt: True
 	isInitialised: False
 	hasExecuted: False
 	isDestroyed: False
@@ -57,39 +57,39 @@
 	initialise function name: elementCellLayout-Initialise
 	execute function name: elementCellLayout-Execute
 	destroy function name: elementCellLayout-Destroy
-	_cellLocalCount (func ptr): 0x2075c0
-	_cellShadowCount (func ptr): 0x207624
-	_pointCount (func ptr): 0x207688
-	_initialisePoints (func ptr): 0x207708
-	_mapElementIdToCellId (func ptr): 0x2077f4
-	_isInCell (func ptr): 0x20781c
-	_cellOf (func ptr): 0x2078e0
-	_getShadowInfo (func ptr): 0x207b0c
-	mesh (ptr): 0x131dcc8
-RandomParticleLayout (ptr): 0x132a038:
-PerCellParticleLayout (ptr): 0x132a038
-ParticleLayout (ptr): 0x132a038
-Stg_Class (ptr): 0x132a038
-	sizeOfSelf: 132
+	_cellLocalCount (func ptr): 0x2aaaaaabe84e
+	_cellShadowCount (func ptr): 0x2aaaaaabe886
+	_pointCount (func ptr): 0x2aaaaaabe8be
+	_initialisePoints (func ptr): 0x2aaaaaabe919
+	_mapElementIdToCellId (func ptr): 0x2aaaaaabe9d5
+	_isInCell (func ptr): 0x2aaaaaabe9e5
+	_cellOf (func ptr): 0x2aaaaaabea63
+	_getShadowInfo (func ptr): 0x2aaaaaabebf5
+	mesh (ptr): 0x634e30
+RandomParticleLayout (ptr): 0x649360:
+PerCellParticleLayout (ptr): 0x649360
+ParticleLayout (ptr): 0x649360
+Stg_Class (ptr): 0x649360
+	sizeOfSelf: 240
 	_deleteSelf: Yes
 	type: RandomParticleLayout
-	_delete (func ptr): 0x21338c
-	_print (func ptr): 0x2133c8
-	_copy (func ptr): 0x213468
-	_setInitialCounts (func ptr): 0x212390
-	_initialiseParticles (func ptr): 0x21256c
+	_delete (func ptr): 0x2aaaaaac8e22
+	_print (func ptr): 0x2aaaaaac8e41
+	_copy (func ptr): 0x2aaaaaac8ec7
+	_setInitialCounts (func ptr): 0x2aaaaaac816d
+	_initialiseParticles (func ptr): 0x2aaaaaac8324
 	coordSystem: GlobalCoordSystem
 	weightsInitialisedAtStartup : False
-	_initialCount (func ptr): 0x213710
-	_initialiseParticlesOfCell (func ptr): 0x213748
+	_initialCount (func ptr): 0x2aaaaaac90ac
+	_initialiseParticlesOfCell (func ptr): 0x2aaaaaac90cf
 	cellParticleCount: 4
 	seed: 13
 	cellLocalCount: 12
 	cellDomainCount: 12
 	cellShadowCount: 0
-	cellPointCountTbl (ptr): 0x132afa8
+	cellPointCountTbl (ptr): 0x64b7d0
 	cellPointCountTbl[0-12]: 008 008 008 008 008 008 008 008 008 008 008 008 
-	cellPointTbl (ptr): 0x132b788
+	cellPointTbl (ptr): 0x64b820
 	cellPointTbl[0-12]: {
 	cellPointTbl[0][0-8]: {0 0 0} {150 0 0} {0 4 0} {150 4 0} {0 0 150} {150 0 150} {0 4 150} {150 4 150} 
 	cellPointTbl[1][0-8]: {150 0 0} {300 0 0} {150 4 0} {300 4 0} {150 0 150} {300 0 150} {150 4 150} {300 4 150} 
@@ -105,11 +105,11 @@
 	cellPointTbl[11][0-8]: {150 8 150} {300 8 150} {150 12 150} {300 12 150} {150 8 300} {300 8 300} {150 12 300} {300 12 300} 
 }
 
-	cellParticleCountTbl (ptr): 0x132b948
+	cellParticleCountTbl (ptr): 0x64bba0
 	cellParticleCountTbl[0-12]: 004 004 004 004 004 004 004 004 004 004 004 004 
-	cellParticleSizeTbl (ptr): 0x132b988
+	cellParticleSizeTbl (ptr): 0x64bbf0
 	cellParticleSizeTbl[0-12]: 004 004 004 004 004 004 004 004 004 004 004 004 
-	cellParticleTbl (ptr): 0x132b9c8
+	cellParticleTbl (ptr): 0x64bc40
 	cellParticleTbl [0-12]: {
 		cellParticleTbl[0][0-4]:
 			(part. index) 0

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of2.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.0of2.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,23 +1,23 @@
-StGermain Framework revision 3900. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0
-Swarm (ptr): 0x132e598
-Stg_Component (ptr): 0x132e598
-Stg_Object (ptr): 0x132e598
-	Stg_Class (ptr): 0x132e598
-		sizeOfSelf: 220
+Swarm (ptr): 0x64ec10
+Stg_Component (ptr): 0x64ec10
+Stg_Object (ptr): 0x64ec10
+	Stg_Class (ptr): 0x64ec10
+		sizeOfSelf: 384
 		_deleteSelf: Yes
 		type: Swarm
-		_delete (func ptr): 0x215b1c
-		_print (func ptr): 0x215c58
-		_copy (func ptr): 0x2162b4
+		_delete (func ptr): 0x2aaaaaacae49
+		_print (func ptr): 0x2aaaaaacaf56
+		_copy (func ptr): 0x2aaaaaacb549
 	name: testSwarm
 	nameAllocationType: NON_GLOBAL
-	_defaultConstructor (func ptr): 0x216c00
-	_construct (func ptr): 0x216d04
-	_build (func ptr): 0x217010
-	_initialise (func ptr): 0x217100
-	_execute (func ptr): 0x21719c
-	_destroy (func ptr): 0x2171bc
+	_defaultConstructor (func ptr): 0x2aaaaaacbf22
+	_construct (func ptr): 0x2aaaaaacbffb
+	_build (func ptr): 0x2aaaaaacc273
+	_initialise (func ptr): 0x2aaaaaacc360
+	_execute (func ptr): 0x2aaaaaacc3d1
+	_destroy (func ptr): 0x2aaaaaacc3df
 	isConstructed: True
 	isBuilt: True
 	isInitialised: True
@@ -28,27 +28,27 @@
 	initialise function name: testSwarm-Initialise
 	execute function name: testSwarm-Execute
 	destroy function name: testSwarm-Destroy
-ElementCellLayout (ptr): 0x131ed38
-CellLayout (ptr): 0x131ed38
-Stg_Component (ptr): 0x131ed38
-Stg_Object (ptr): 0x131ed38
-	Stg_Class (ptr): 0x131ed38
-		sizeOfSelf: 152
+ElementCellLayout (ptr): 0x634610
+CellLayout (ptr): 0x634610
+Stg_Component (ptr): 0x634610
+Stg_Object (ptr): 0x634610
+	Stg_Class (ptr): 0x634610
+		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ElementCellLayout
-		_delete (func ptr): 0x207224
-		_print (func ptr): 0x207260
-		_copy (func ptr): 0x2072e4
+		_delete (func ptr): 0x2aaaaaabe5bf
+		_print (func ptr): 0x2aaaaaabe5de
+		_copy (func ptr): 0x2aaaaaabe646
 	name: elementCellLayout
 	nameAllocationType: NON_GLOBAL
-	_defaultConstructor (func ptr): 0x206cfc
-	_construct (func ptr): 0x2073e4
-	_build (func ptr): 0x20748c
-	_initialise (func ptr): 0x207560
-	_execute (func ptr): 0x207580
-	_destroy (func ptr): 0x2075a0
+	_defaultConstructor (func ptr): 0x2aaaaaabe11c
+	_construct (func ptr): 0x2aaaaaabe717
+	_build (func ptr): 0x2aaaaaabe787
+	_initialise (func ptr): 0x2aaaaaabe824
+	_execute (func ptr): 0x2aaaaaabe832
+	_destroy (func ptr): 0x2aaaaaabe840
 	isConstructed: True
-	isBuilt: False
+	isBuilt: True
 	isInitialised: False
 	hasExecuted: False
 	isDestroyed: False
@@ -57,39 +57,39 @@
 	initialise function name: elementCellLayout-Initialise
 	execute function name: elementCellLayout-Execute
 	destroy function name: elementCellLayout-Destroy
-	_cellLocalCount (func ptr): 0x2075c0
-	_cellShadowCount (func ptr): 0x207624
-	_pointCount (func ptr): 0x207688
-	_initialisePoints (func ptr): 0x207708
-	_mapElementIdToCellId (func ptr): 0x2077f4
-	_isInCell (func ptr): 0x20781c
-	_cellOf (func ptr): 0x2078e0
-	_getShadowInfo (func ptr): 0x207b0c
-	mesh (ptr): 0x131f1a8
-RandomParticleLayout (ptr): 0x132e228:
-PerCellParticleLayout (ptr): 0x132e228
-ParticleLayout (ptr): 0x132e228
-Stg_Class (ptr): 0x132e228
-	sizeOfSelf: 132
+	_cellLocalCount (func ptr): 0x2aaaaaabe84e
+	_cellShadowCount (func ptr): 0x2aaaaaabe886
+	_pointCount (func ptr): 0x2aaaaaabe8be
+	_initialisePoints (func ptr): 0x2aaaaaabe919
+	_mapElementIdToCellId (func ptr): 0x2aaaaaabe9d5
+	_isInCell (func ptr): 0x2aaaaaabe9e5
+	_cellOf (func ptr): 0x2aaaaaabea63
+	_getShadowInfo (func ptr): 0x2aaaaaabebf5
+	mesh (ptr): 0x6351c0
+RandomParticleLayout (ptr): 0x64e620:
+PerCellParticleLayout (ptr): 0x64e620
+ParticleLayout (ptr): 0x64e620
+Stg_Class (ptr): 0x64e620
+	sizeOfSelf: 240
 	_deleteSelf: Yes
 	type: RandomParticleLayout
-	_delete (func ptr): 0x21338c
-	_print (func ptr): 0x2133c8
-	_copy (func ptr): 0x213468
-	_setInitialCounts (func ptr): 0x212390
-	_initialiseParticles (func ptr): 0x21256c
+	_delete (func ptr): 0x2aaaaaac8e22
+	_print (func ptr): 0x2aaaaaac8e41
+	_copy (func ptr): 0x2aaaaaac8ec7
+	_setInitialCounts (func ptr): 0x2aaaaaac816d
+	_initialiseParticles (func ptr): 0x2aaaaaac8324
 	coordSystem: GlobalCoordSystem
 	weightsInitialisedAtStartup : False
-	_initialCount (func ptr): 0x213710
-	_initialiseParticlesOfCell (func ptr): 0x213748
+	_initialCount (func ptr): 0x2aaaaaac90ac
+	_initialiseParticlesOfCell (func ptr): 0x2aaaaaac90cf
 	cellParticleCount: 4
 	seed: 13
 	cellLocalCount: 8
 	cellDomainCount: 12
 	cellShadowCount: 4
-	cellPointCountTbl (ptr): 0x132f238
+	cellPointCountTbl (ptr): 0x650b80
 	cellPointCountTbl[0-12]: 008 008 008 008 008 008 008 008 008 008 008 008 
-	cellPointTbl (ptr): 0x132fa78
+	cellPointTbl (ptr): 0x650bd0
 	cellPointTbl[0-12]: {
 	cellPointTbl[0][0-8]: {0 0 0} {150 0 0} {0 4 0} {150 4 0} {0 0 150} {150 0 150} {0 4 150} {150 4 150} 
 	cellPointTbl[1][0-8]: {150 0 0} {300 0 0} {150 4 0} {300 4 0} {150 0 150} {300 0 150} {150 4 150} {300 4 150} 
@@ -105,11 +105,11 @@
 	cellPointTbl[11][0-8]: {150 8 150} {300 8 150} {150 12 150} {300 12 150} {150 8 300} {300 8 300} {150 12 300} {300 12 300} 
 }
 
-	cellParticleCountTbl (ptr): 0x132fc38
+	cellParticleCountTbl (ptr): 0x650f50
 	cellParticleCountTbl[0-12]: 004 004 004 004 004 004 004 004 000 000 000 000 
-	cellParticleSizeTbl (ptr): 0x132fc78
+	cellParticleSizeTbl (ptr): 0x650fa0
 	cellParticleSizeTbl[0-12]: 004 004 004 004 004 004 004 004 000 000 000 000 
-	cellParticleTbl (ptr): 0x132fcb8
+	cellParticleTbl (ptr): 0x650ff0
 	cellParticleTbl [0-12]: {
 		cellParticleTbl[0][0-4]:
 			(part. index) 0

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.1of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.1of2.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarm.1of2.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,23 +1,23 @@
-StGermain Framework revision 3900. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
 Watching rank: 1
-Swarm (ptr): 0x132b268
-Stg_Component (ptr): 0x132b268
-Stg_Object (ptr): 0x132b268
-	Stg_Class (ptr): 0x132b268
-		sizeOfSelf: 220
+Swarm (ptr): 0x6497e0
+Stg_Component (ptr): 0x6497e0
+Stg_Object (ptr): 0x6497e0
+	Stg_Class (ptr): 0x6497e0
+		sizeOfSelf: 384
 		_deleteSelf: Yes
 		type: Swarm
-		_delete (func ptr): 0x215b1c
-		_print (func ptr): 0x215c58
-		_copy (func ptr): 0x2162b4
+		_delete (func ptr): 0x2aaaaaacae49
+		_print (func ptr): 0x2aaaaaacaf56
+		_copy (func ptr): 0x2aaaaaacb549
 	name: testSwarm
 	nameAllocationType: NON_GLOBAL
-	_defaultConstructor (func ptr): 0x216c00
-	_construct (func ptr): 0x216d04
-	_build (func ptr): 0x217010
-	_initialise (func ptr): 0x217100
-	_execute (func ptr): 0x21719c
-	_destroy (func ptr): 0x2171bc
+	_defaultConstructor (func ptr): 0x2aaaaaacbf22
+	_construct (func ptr): 0x2aaaaaacbffb
+	_build (func ptr): 0x2aaaaaacc273
+	_initialise (func ptr): 0x2aaaaaacc360
+	_execute (func ptr): 0x2aaaaaacc3d1
+	_destroy (func ptr): 0x2aaaaaacc3df
 	isConstructed: True
 	isBuilt: True
 	isInitialised: True
@@ -28,27 +28,27 @@
 	initialise function name: testSwarm-Initialise
 	execute function name: testSwarm-Execute
 	destroy function name: testSwarm-Destroy
-ElementCellLayout (ptr): 0x131ed38
-CellLayout (ptr): 0x131ed38
-Stg_Component (ptr): 0x131ed38
-Stg_Object (ptr): 0x131ed38
-	Stg_Class (ptr): 0x131ed38
-		sizeOfSelf: 152
+ElementCellLayout (ptr): 0x6344a0
+CellLayout (ptr): 0x6344a0
+Stg_Component (ptr): 0x6344a0
+Stg_Object (ptr): 0x6344a0
+	Stg_Class (ptr): 0x6344a0
+		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ElementCellLayout
-		_delete (func ptr): 0x207224
-		_print (func ptr): 0x207260
-		_copy (func ptr): 0x2072e4
+		_delete (func ptr): 0x2aaaaaabe5bf
+		_print (func ptr): 0x2aaaaaabe5de
+		_copy (func ptr): 0x2aaaaaabe646
 	name: elementCellLayout
 	nameAllocationType: NON_GLOBAL
-	_defaultConstructor (func ptr): 0x206cfc
-	_construct (func ptr): 0x2073e4
-	_build (func ptr): 0x20748c
-	_initialise (func ptr): 0x207560
-	_execute (func ptr): 0x207580
-	_destroy (func ptr): 0x2075a0
+	_defaultConstructor (func ptr): 0x2aaaaaabe11c
+	_construct (func ptr): 0x2aaaaaabe717
+	_build (func ptr): 0x2aaaaaabe787
+	_initialise (func ptr): 0x2aaaaaabe824
+	_execute (func ptr): 0x2aaaaaabe832
+	_destroy (func ptr): 0x2aaaaaabe840
 	isConstructed: True
-	isBuilt: False
+	isBuilt: True
 	isInitialised: False
 	hasExecuted: False
 	isDestroyed: False
@@ -57,39 +57,39 @@
 	initialise function name: elementCellLayout-Initialise
 	execute function name: elementCellLayout-Execute
 	destroy function name: elementCellLayout-Destroy
-	_cellLocalCount (func ptr): 0x2075c0
-	_cellShadowCount (func ptr): 0x207624
-	_pointCount (func ptr): 0x207688
-	_initialisePoints (func ptr): 0x207708
-	_mapElementIdToCellId (func ptr): 0x2077f4
-	_isInCell (func ptr): 0x20781c
-	_cellOf (func ptr): 0x2078e0
-	_getShadowInfo (func ptr): 0x207b0c
-	mesh (ptr): 0x131f1a8
-RandomParticleLayout (ptr): 0x132aef8:
-PerCellParticleLayout (ptr): 0x132aef8
-ParticleLayout (ptr): 0x132aef8
-Stg_Class (ptr): 0x132aef8
-	sizeOfSelf: 132
+	_cellLocalCount (func ptr): 0x2aaaaaabe84e
+	_cellShadowCount (func ptr): 0x2aaaaaabe886
+	_pointCount (func ptr): 0x2aaaaaabe8be
+	_initialisePoints (func ptr): 0x2aaaaaabe919
+	_mapElementIdToCellId (func ptr): 0x2aaaaaabe9d5
+	_isInCell (func ptr): 0x2aaaaaabe9e5
+	_cellOf (func ptr): 0x2aaaaaabea63
+	_getShadowInfo (func ptr): 0x2aaaaaabebf5
+	mesh (ptr): 0x635050
+RandomParticleLayout (ptr): 0x6491f0:
+PerCellParticleLayout (ptr): 0x6491f0
+ParticleLayout (ptr): 0x6491f0
+Stg_Class (ptr): 0x6491f0
+	sizeOfSelf: 240
 	_deleteSelf: Yes
 	type: RandomParticleLayout
-	_delete (func ptr): 0x21338c
-	_print (func ptr): 0x2133c8
-	_copy (func ptr): 0x213468
-	_setInitialCounts (func ptr): 0x212390
-	_initialiseParticles (func ptr): 0x21256c
+	_delete (func ptr): 0x2aaaaaac8e22
+	_print (func ptr): 0x2aaaaaac8e41
+	_copy (func ptr): 0x2aaaaaac8ec7
+	_setInitialCounts (func ptr): 0x2aaaaaac816d
+	_initialiseParticles (func ptr): 0x2aaaaaac8324
 	coordSystem: GlobalCoordSystem
 	weightsInitialisedAtStartup : False
-	_initialCount (func ptr): 0x213710
-	_initialiseParticlesOfCell (func ptr): 0x213748
+	_initialCount (func ptr): 0x2aaaaaac90ac
+	_initialiseParticlesOfCell (func ptr): 0x2aaaaaac90cf
 	cellParticleCount: 4
 	seed: 13
 	cellLocalCount: 4
 	cellDomainCount: 8
 	cellShadowCount: 4
-	cellPointCountTbl (ptr): 0x132bf18
+	cellPointCountTbl (ptr): 0x64b290
 	cellPointCountTbl[0-8]: 008 008 008 008 008 008 008 008 
-	cellPointTbl (ptr): 0x132c758
+	cellPointTbl (ptr): 0x64b790
 	cellPointTbl[0-8]: {
 	cellPointTbl[0][0-8]: {0 8 0} {150 8 0} {0 12 0} {150 12 0} {0 8 150} {150 8 150} {0 12 150} {150 12 150} 
 	cellPointTbl[1][0-8]: {150 8 0} {300 8 0} {150 12 0} {300 12 0} {150 8 150} {300 8 150} {150 12 150} {300 12 150} 
@@ -101,11 +101,11 @@
 	cellPointTbl[7][0-8]: {150 4 150} {300 4 150} {150 8 150} {300 8 150} {150 4 300} {300 4 300} {150 8 300} {300 8 300} 
 }
 
-	cellParticleCountTbl (ptr): 0x132bf48
+	cellParticleCountTbl (ptr): 0x634d70
 	cellParticleCountTbl[0-8]: 004 004 004 004 000 000 000 000 
-	cellParticleSizeTbl (ptr): 0x132c888
+	cellParticleSizeTbl (ptr): 0x64b9f0
 	cellParticleSizeTbl[0-8]: 004 004 004 004 000 000 000 000 
-	cellParticleTbl (ptr): 0x132c8b8
+	cellParticleTbl (ptr): 0x64ba30
 	cellParticleTbl [0-8]: {
 		cellParticleTbl[0][0-4]:
 			(part. index) 0

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.0of2.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,3 +1,4 @@
+StGermain Framework revision 3585. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0
 Calculated attractor point is at (0.333333,0.333333,0.333333):
 
@@ -5,5 +6,5 @@
 
 Starting timestep 2:
 
-Comparing the 23197 local Particles between old and new swarms:
+Comparing the 23203 local Particles between old and new swarms:
 	Passed: swarms are identical.

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.1of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.1of2.expected	2007-01-05 19:35:17 UTC (rev 5661)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmDumpAndLoad.1of2.expected	2007-01-05 19:35:19 UTC (rev 5662)
@@ -1,4 +1,4 @@
-StGermain Framework revision 3585. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3913. Copyright (C) 2003-2005 VPAC.
 Watching rank: 1
 Calculated attractor point is at (0.333333,0.333333,0.333333):
 
@@ -6,5 +6,5 @@
 
 Starting timestep 2:
 
-Comparing the 9571 local Particles between old and new swarms:
+Comparing the 9565 local Particles between old and new swarms:
 	Passed: swarms are identical.



More information about the cig-commits mailing list