[cig-commits] r6427 - in long/3D/Gale/trunk: . input/cookbook
walter at geodynamics.org
walter at geodynamics.org
Tue Mar 27 04:03:06 PDT 2007
Author: walter
Date: 2007-03-27 04:03:06 -0700 (Tue, 27 Mar 2007)
New Revision: 6427
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/cookbook/multi_material.xml
long/3D/Gale/trunk/input/cookbook/template.xml
long/3D/Gale/trunk/input/cookbook/viscous.xml
long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml
long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml
long/3D/Gale/trunk/input/cookbook/viscous_split.xml
long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml
long/3D/Gale/trunk/input/cookbook/yielding.xml
Log:
r1768 at earth: boo | 2007-03-27 04:01:23 -0700
Make the cookbook examples use PCDVC
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1767
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1768
Modified: long/3D/Gale/trunk/input/cookbook/multi_material.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/multi_material.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/multi_material.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/template.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/template.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/template.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/viscous.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_extension.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/viscous_extension.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,16 +213,10 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
<param name="originalParticleShape">leftBoundaryShape</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_split.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_split.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/viscous_split.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
Modified: long/3D/Gale/trunk/input/cookbook/yielding.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/yielding.xml 2007-03-27 11:03:01 UTC (rev 6426)
+++ long/3D/Gale/trunk/input/cookbook/yielding.xml 2007-03-27 11:03:06 UTC (rev 6427)
@@ -163,14 +163,16 @@
<param name="Type">ElementCellLayout</param>
<param name="Mesh">mesh-linear</param>
</struct>
- <struct name="discreteVoronoi">
- <param name="Type">CellularAutomataVoronoi</param>
- <param name="resolution">10</param>
- <param name="diagonalNeighbours">true</param>
- </struct>
<struct name="weights">
- <param name="Type">DiscreteVoronoiWeights</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
+ <param name="Type">PCDVC</param>
+ <param name="resolutionX">10</param>
+ <param name="resolutionY">10</param>
+ <param name="resolutionZ">10</param>
+ <param name="lowerT">0.6</param>
+ <param name="upperT">25</param>
+ <param name="maxDeletions">3</param>
+ <param name="maxSplits">3</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -211,15 +213,9 @@
<param name="PeriodicBCsManager">periodicBCsManager</param>
<param name="allowFallbackToFirstOrder">True</param>
</struct>
- <struct name="removalRoutine">
- <param name="Type">DiscreteVoronoiRemove</param>
- <param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
- </struct>
<struct name="splittingRoutine">
<param name="Type">ReseedSplitting</param>
<param name="idealParticleCount">particlesPerCell</param>
- <param name="DiscreteVoronoi">discreteVoronoi</param>
</struct>
<struct name="solutionVelocity">
<param name="Type">SolutionVector</param>
More information about the cig-commits
mailing list