[cig-commits] commit: Change Spacefiller layout to MeshParticleLayout because Spacefiller assumes a uniform grid

[Mercurial]

changeset:   171:3555764152a1
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Dec 22 13:30:49 2009 -0800
files:       input/cookbook/multi_material.xml input/cookbook/template.xml input/cookbook/viscous.xml input/cookbook/viscous_extension.xml input/cookbook/viscous_fixed.xml input/cookbook/viscous_inflow.xml input/cookbook/viscous_normal_stress.xml input/cookbook/viscous_split.xml input/cookbook/yielding.xml
description:
Change Spacefiller layout to MeshParticleLayout because Spacefiller assumes a uniform grid


diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/multi_material.xml
--- a/input/cookbook/multi_material.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/multi_material.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/template.xml
--- a/input/cookbook/template.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/template.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/viscous.xml
--- a/input/cookbook/viscous.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/viscous.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/viscous_extension.xml
--- a/input/cookbook/viscous_extension.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/viscous_extension.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/viscous_fixed.xml
--- a/input/cookbook/viscous_fixed.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/viscous_fixed.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/viscous_inflow.xml
--- a/input/cookbook/viscous_inflow.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/viscous_inflow.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/viscous_normal_stress.xml
--- a/input/cookbook/viscous_normal_stress.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/viscous_normal_stress.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/viscous_split.xml
--- a/input/cookbook/viscous_split.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/viscous_split.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>
diff -r cf23a9af4f08 -r 3555764152a1 input/cookbook/yielding.xml
--- a/input/cookbook/yielding.xml	Tue Dec 22 13:21:36 2009 -0800
+++ b/input/cookbook/yielding.xml	Tue Dec 22 13:30:49 2009 -0800
@@ -214,8 +214,9 @@
       <param name="MaterialPointsSwarm">materialSwarm</param>
     </struct>
     <struct name="materialSwarmParticleLayout">
-      <param name="Type">SpaceFillerParticleLayout</param>
-      <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+      <param name="Type">MeshParticleLayout</param>
+      <param name="cellParticleCount">particlesPerCell</param>
+      <param name="mesh">mesh-linear</param>
     </struct>
     <struct name="pMovementHandler">
       <param name="Type">ParticleMovementHandler</param>