[cig-commits] commit: Updating a couple of clear problems with upgrading to the new version in PICellerator:
Mercurial
hg at geodynamics.org
Mon Nov 24 11:30:22 PST 2008
changeset: 19:184656f71e76
user: PatrickSunter
date: Thu Jun 28 02:16:03 2007 +0000
files: Apps/BuoyancyBenchmark/BuoyancyExample.xml Apps/PIC_Components/MaterialPointSwarm-flip1.xml Apps/PIC_Components/MaterialPointSwarm-test1.xml MaterialPoints/tests/testAdvection.xml MaterialPoints/tests/testMaterialFeVariable.xml PopulationControl/tests/testPopulationControl.xml Utils/tests/testElementIntegral.xml Voronoi/tests/testDiscreteVoronoi.xml Weights/tests/testElementIntegral.xml
description:
Updating a couple of clear problems with upgrading to the new version in PICellerator:
* Expunging outdated "ElementLayout.xml" references
* Upaditing mesh-linear -> linearMesh
diff -r 62ed03078406 -r 184656f71e76 Apps/BuoyancyBenchmark/BuoyancyExample.xml
--- a/Apps/BuoyancyBenchmark/BuoyancyExample.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/Apps/BuoyancyBenchmark/BuoyancyExample.xml Thu Jun 28 02:16:03 2007 +0000
@@ -49,7 +49,7 @@
</struct>
<struct name="compressible">
<param name="Type">Compressible</param>
- <param name="GeometryMesh">mesh-linear</param>
+ <param name="GeometryMesh">linearMesh</param>
<param name="StiffnessMatrix">c_matrix</param>
<param name="Swarm">picIntegrationPoints</param>
<param name="oneOnLambda">10.0</param>
diff -r 62ed03078406 -r 184656f71e76 Apps/PIC_Components/MaterialPointSwarm-flip1.xml
--- a/Apps/PIC_Components/MaterialPointSwarm-flip1.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/Apps/PIC_Components/MaterialPointSwarm-flip1.xml Thu Jun 28 02:16:03 2007 +0000
@@ -7,7 +7,7 @@
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="discreteVoronoi">
<param name="Type">CellularAutomataVoronoi</param>
@@ -17,7 +17,7 @@
<struct name="weights">
<param name="Type">VolumeWeights</param>
<param name="Shape">ball</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
<!--
<param name="Type">DiscreteVoronoiWeights</param>
<param name="DiscreteVoronoi">discreteVoronoi</param>
@@ -30,7 +30,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -49,7 +49,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">picIntegrationPointsParticleLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<!-- These guys may or may not be created -->
<param name="SwarmAdvector">materialSwarmAdvector</param>
@@ -67,7 +67,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">backgroundMapper</param>
</struct>
@@ -83,7 +83,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">backgroundLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<param name="Material">denseMaterial</param>
</struct>
diff -r 62ed03078406 -r 184656f71e76 Apps/PIC_Components/MaterialPointSwarm-test1.xml
--- a/Apps/PIC_Components/MaterialPointSwarm-test1.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/Apps/PIC_Components/MaterialPointSwarm-test1.xml Thu Jun 28 02:16:03 2007 +0000
@@ -7,7 +7,7 @@
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="discreteVoronoi">
<param name="Type">CellularAutomataVoronoi</param>
@@ -17,7 +17,7 @@
<struct name="weights">
<param name="Type">VolumeWeights</param>
<param name="Shape">ball</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
<!--
<param name="Type">DiscreteVoronoiWeights</param>
<param name="DiscreteVoronoi">discreteVoronoi</param>
@@ -30,7 +30,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -50,7 +50,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">picIntegrationPointsParticleLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<!-- These guys may or may not be created -->
<param name="SwarmAdvector">materialSwarmAdvector</param>
@@ -68,7 +68,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">backgroundMapper</param>
</struct>
@@ -84,7 +84,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">backgroundLayout</param>
- <param name="FeMesh">mesh-linear</param>
+ <param name="FeMesh">linearMesh</param>
<param name="Material">lightMaterial</param>
</struct>
diff -r 62ed03078406 -r 184656f71e76 MaterialPoints/tests/testAdvection.xml
--- a/MaterialPoints/tests/testAdvection.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/MaterialPoints/tests/testAdvection.xml Thu Jun 28 02:16:03 2007 +0000
@@ -33,7 +33,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
</struct>
diff -r 62ed03078406 -r 184656f71e76 MaterialPoints/tests/testMaterialFeVariable.xml
--- a/MaterialPoints/tests/testMaterialFeVariable.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/MaterialPoints/tests/testMaterialFeVariable.xml Thu Jun 28 02:16:03 2007 +0000
@@ -5,14 +5,13 @@
<include>StgFEM/LinearMesh.xml</include>
<include>StgFEM/GaussSwarm.xml</include>
- <include>StgFEM/ElementLayout.xml</include>
<include>StgFEM/VelocityField.xml</include>
<include>StgFEM/TimeIntegrator.xml</include>
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="everywhereShape">
<param name="Type">Everywhere</param>
@@ -44,7 +43,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -58,7 +57,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">picIntegrationPointsParticleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
</struct>
@@ -75,7 +74,7 @@
<param name="Swarm">picIntegrationPoints</param>
<param name="Material">material</param>
<param name="Context">context</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
</struct>
diff -r 62ed03078406 -r 184656f71e76 PopulationControl/tests/testPopulationControl.xml
--- a/PopulationControl/tests/testPopulationControl.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/PopulationControl/tests/testPopulationControl.xml Thu Jun 28 02:16:03 2007 +0000
@@ -4,12 +4,11 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<include>StgFEM/LinearMesh.xml</include>
- <include>StgFEM/ElementLayout.xml</include>
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="particleLayout">
<param name="Type">RandomParticleLayout</param>
diff -r 62ed03078406 -r 184656f71e76 Utils/tests/testElementIntegral.xml
--- a/Utils/tests/testElementIntegral.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/Utils/tests/testElementIntegral.xml Thu Jun 28 02:16:03 2007 +0000
@@ -4,14 +4,13 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<include>StgFEM/LinearMesh.xml</include>
- <include>StgFEM/ElementLayout.xml</include>
<include>StgFEM/VelocityField.xml</include>
<include>StgFEM/TimeIntegrator.xml</include>
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -20,7 +19,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -40,7 +39,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
</struct>
</struct>
diff -r 62ed03078406 -r 184656f71e76 Voronoi/tests/testDiscreteVoronoi.xml
--- a/Voronoi/tests/testDiscreteVoronoi.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/Voronoi/tests/testDiscreteVoronoi.xml Thu Jun 28 02:16:03 2007 +0000
@@ -4,7 +4,6 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<include>StgFEM/LinearMesh.xml</include>
- <include>StgFEM/ElementLayout.xml</include>
<include>StgFEM/VelocityField.xml</include>
<include>StgFEM/TimeIntegrator.xml</include>
@@ -13,7 +12,7 @@
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="particleLayout">
<param name="Type">RandomParticleLayout</param>
diff -r 62ed03078406 -r 184656f71e76 Weights/tests/testElementIntegral.xml
--- a/Weights/tests/testElementIntegral.xml Wed Jun 27 00:32:30 2007 +0000
+++ b/Weights/tests/testElementIntegral.xml Thu Jun 28 02:16:03 2007 +0000
@@ -4,14 +4,13 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<include>StgFEM/LinearMesh.xml</include>
- <include>StgFEM/ElementLayout.xml</include>
<include>StgFEM/VelocityField.xml</include>
<include>StgFEM/TimeIntegrator.xml</include>
<struct name="components" mergeType="merge">
<struct name="elementCellLayout">
<param name="Type">ElementCellLayout</param>
- <param name="Mesh">mesh-linear</param>
+ <param name="Mesh">linearMesh</param>
</struct>
<struct name="localLayout">
<param name="Type">MappedParticleLayout</param>
@@ -20,7 +19,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -40,7 +39,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FiniteElement_Mesh">linearMesh</param>
</struct>
</struct>
More information about the CIG-COMMITS
mailing list