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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-06 02:04:11 -0700 (Thu, 06 Jul 2006)
New Revision: 3935

Modified:
   long/3D/Gale/trunk/src/PICellerator/
   long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarmW.xml
Log:
 r425 at earth:  boo | 2006-07-06 02:00:49 -0700
  r414 at earth (orig r353):  WendySharples | 2006-07-05 18:36:35 -0700
  updated this to contain picIntegration points
  
  
 



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

Modified: long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarmW.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarmW.xml	2006-07-06 09:04:08 UTC (rev 3934)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarmW.xml	2006-07-06 09:04:11 UTC (rev 3935)
@@ -14,14 +14,24 @@
 			<param name="resolution">10</param>
 			<param name="diagonalNeighbours">true</param>
 		</struct>		
+		<!--
 		<struct name="weights">
+			<param name="Type">ConstantWeights</param>
+		</struct>
+		-->
+		<struct name="weights">
 			<param name="Type">DiscreteVoronoiWeights</param>
 			<param name="DiscreteVoronoi">discreteVoronoi</param>
 		</struct>
+		<!--
+		<struct name="weights">
+			<param name="Type">ConstantWeights</param>
+		</struct>	
+		-->
 		<struct name="localLayout">
 			<param name="Type">MappedParticleLayout</param>
 		</struct>
-		<struct name="materialPoints">
+		<struct name="picIntegrationPoints">
 			<param name="Type">IntegrationPointsSwarm</param>
 			<param name="CellLayout">elementCellLayout</param>
 			<param name="ParticleLayout">localLayout</param>
@@ -32,7 +42,7 @@
 		</struct>
 		<struct name="mapper">
 			<param name="Type">CoincidentMapper</param>
-			<param name="IntegrationPointsSwarm">materialPoints</param>
+			<param name="IntegrationPointsSwarm">picIntegrationPoints</param>
 			<param name="MaterialPointsSwarm">materialSwarm</param>
 		</struct>
 		<struct name="materialSwarmParticleLayout">
@@ -46,16 +56,19 @@
 			<param name="FiniteElement_Mesh">mesh-linear</param>
 
 			<!-- These guys may or may not be created -->
-			<param name="SwarmAdvector">materialPointsAdvector</param>
 			<param name="SplittingRoutine">splittingRoutine</param>
 			<param name="RemovalRoutine">removalRoutine</param>
+			<param name="EscapedRoutine">escapedRoutine</param>
 		</struct>
-		<struct name="materialPointsAdvector">
+		<struct name="materialSwarmAdvector">
 			<param name="Type">SwarmAdvectorW</param>
 			<param name="Swarm">materialSwarm</param>
 			<param name="TimeIntegrator">timeIntegrator</param>
 			<param name="VelocityField">VelocityField</param>
 			<param name="PeriodicBCsManager">periodicBCsManager</param>
+			<!-- For moving mesh or problems involving outflow, need the following
+			enabled -->
+			<param name="allowFallbackToFirstOrder">True</param>
 		</struct>
 	</struct>