[cig-commits] r5499 - in long/3D/Gale/trunk/src/PICellerator: . Apps/PIC_Components

[walter at geodynamics.org]

Author: walter
Date: 2006-12-07 14:13:06 -0800 (Thu, 07 Dec 2006)
New Revision: 5499

Modified:
   long/3D/Gale/trunk/src/PICellerator/
   long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm.xml
Log:
 r522 at earth:  boo | 2006-12-07 14:12:24 -0800
  r519 at earth (orig r379):  KathleenHumble | 2006-11-21 23:34:47 -0800
  Commented out the old discreteVoronoi weighting scheme.
  Implemented the default to be DVCWeights function instead.
  
  This may break smaller tests with a low number of particlesPerCell.
  
 



Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
   - 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:377
aee11096-cf10-0410-a191-eea5772ba81f:/cig:517
   + 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:379
aee11096-cf10-0410-a191-eea5772ba81f:/cig:522

Modified: long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm.xml	2006-12-07 22:12:21 UTC (rev 5498)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm.xml	2006-12-07 22:13:06 UTC (rev 5499)
@@ -9,25 +9,30 @@
 			<param name="Type">ElementCellLayout</param>
 			<param name="Mesh">mesh-linear</param>
 		</struct>
-		<struct name="discreteVoronoi">
+		<!--struct name="discreteVoronoi">
 			<param name="Type">CellularAutomataVoronoi</param>
 			<param name="resolution">10</param>
 			<param name="diagonalNeighbours">true</param>
-		</struct>		
+		</struct-->		
 		<!--
 		<struct name="weights">
 			<param name="Type">ConstantWeights</param>
 		</struct>
 		-->
-		<struct name="weights">
+		<!--struct name="weights">
 			<param name="Type">DiscreteVoronoiWeights</param>
 			<param name="DiscreteVoronoi">discreteVoronoi</param>
-		</struct>
+		</struct-->
 		<!--
 		<struct name="weights">
 			<param name="Type">ConstantWeights</param>
 		</struct>	
 		-->
+		<struct name="weights">
+  			<param name="Type">DVCWeights</param>
+ 			 <param name="resolution">10</param>
+		</struct>
+		
 		<struct name="localLayout">
 			<param name="Type">MappedParticleLayout</param>
 		</struct>