[cig-commits] commit: Fixed up the tests of PCDVC so they all pass, once I commit the revised

[Mercurial]

changeset:   25:d3fdf5323504
user:        PatrickSunter
date:        Thu Jun 28 05:53:03 2007 +0000
files:       Utils/tests/testElementIntegral.xml Utils/tests/testPCDVC.xml
description:
Fixed up the tests of PCDVC so they all pass, once I commit the revised
weights test plugin.


diff -r 2bddd20a1b7e -r d3fdf5323504 Utils/tests/testElementIntegral.xml
--- a/Utils/tests/testElementIntegral.xml	Thu Jun 28 05:31:25 2007 +0000
+++ b/Utils/tests/testElementIntegral.xml	Thu Jun 28 05:53:03 2007 +0000
@@ -15,7 +15,7 @@
 		<struct name="localLayout">
 			<param name="Type">MappedParticleLayout</param>
 		</struct>
-		<struct name="swarm">
+		<struct name="integrationSwarm">
 			<param name="Type">IntegrationPointsSwarm</param>
 			<param name="CellLayout">elementCellLayout</param>
 			<param name="ParticleLayout">localLayout</param>
@@ -23,23 +23,29 @@
 			<param name="WeightsCalculator">weights</param>
 			<param name="TimeIntegrator">timeIntegrator</param>
 			<param name="IntegrationPointMapper">mapper</param>
-			
-			<param name="VelocityField">VelocityField</param>
 		</struct>
 		<struct name="mapper">
 			<param name="Type">CoincidentMapper</param>
-			<param name="IntegrationPointsSwarm">swarm</param>
-			<param name="MaterialPointsSwarm">picIntegrationPoints</param>
+			<param name="IntegrationPointsSwarm">integrationSwarm</param>
+			<param name="MaterialPointsSwarm">materialPoints</param>
 		</struct>
 		<struct name="particleLayout">
 			<param name="Type">RandomParticleLayout</param>
 			<param name="cellParticleCount">particleCount</param>
 		</struct>
-		<struct name="picIntegrationPoints">
+		<struct name="pMovementHandler"> 
+			<param name="Type">ParticleMovementHandler</param>
+		</struct>
+		<struct name="materialPoints">
 			<param name="Type">MaterialPointsSwarm</param>
 			<param name="CellLayout">elementCellLayout</param>
 			<param name="ParticleLayout">particleLayout</param>
 			<param name="FeMesh">linearMesh</param>
+			<param name="WeightsCalculator">weights</param>
+			<param name="TimeIntegrator">timeIntegrator</param>
+			<list name="ParticleCommHandlers">
+				<param>pMovementHandler</param>
+			</list>
 		</struct>
 							  
 	</struct>
diff -r 2bddd20a1b7e -r d3fdf5323504 Utils/tests/testPCDVC.xml
--- a/Utils/tests/testPCDVC.xml	Thu Jun 28 05:31:25 2007 +0000
+++ b/Utils/tests/testPCDVC.xml	Thu Jun 28 05:53:03 2007 +0000
@@ -17,7 +17,7 @@
 			<param name="upperT">25</param>
 			<param name="maxDeletions">3</param>
 			<param name="maxSplits">3</param>
-			<param name="MaterialPointsSwarm">picIntegrationPoints</param>
+			<param name="MaterialPointsSwarm">materialPoints</param>
 		</struct>
 	</struct>