[cig-commits] commit: Fixed up some mangled names.

[Mercurial]

changeset:   32:c7722312414a
user:        LukeHodkinson
date:        Thu Jul 05 04:49:37 2007 +0000
files:       Weights/tests/plugins/testElementIntegral.c Weights/tests/testElementIntegral.xml
description:
Fixed up some mangled names.


diff -r 61b6ea00db4a -r c7722312414a Weights/tests/plugins/testElementIntegral.c
--- a/Weights/tests/plugins/testElementIntegral.c	Fri Jun 29 06:59:36 2007 +0000
+++ b/Weights/tests/plugins/testElementIntegral.c	Thu Jul 05 04:49:37 2007 +0000
@@ -38,7 +38,7 @@
 **  License along with this library; if not, write to the Free Software
 **  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** $Id: testElementIntegral.c 485 2007-06-28 05:59:08Z PatrickSunter $
+** $Id: testElementIntegral.c 490 2007-07-05 04:49:37Z LukeHodkinson $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -146,8 +146,10 @@ void testElementIntegral_CompareAgainstR
 
 
 void PICellerator_testElementIntegral( DiscretisationContext* context ) {
-	Swarm*              integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "integrationSwarm" );
-	Swarm*              materialSwarm    = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, "materialPoints" );
+	Swarm*              integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, 
+										  "integrationSwarm" );
+	Swarm*              materialSwarm    = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, 
+										  "materialSwarm" );
 	FeMesh* mesh             = (FeMesh*) LiveComponentRegister_Get( context->CF->LCRegister, "linearMesh" );
 	WeightsCalculator*  weights          = (WeightsCalculator*) LiveComponentRegister_Get( context->CF->LCRegister, "weights" );
 	FeVariable*         feVariable;
diff -r 61b6ea00db4a -r c7722312414a Weights/tests/testElementIntegral.xml
--- a/Weights/tests/testElementIntegral.xml	Fri Jun 29 06:59:36 2007 +0000
+++ b/Weights/tests/testElementIntegral.xml	Thu Jul 05 04:49:37 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>
@@ -28,18 +28,24 @@
 		</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">materialSwarm</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="materialSwarm">
 			<param name="Type">MaterialPointsSwarm</param>
 			<param name="CellLayout">elementCellLayout</param>
 			<param name="ParticleLayout">particleLayout</param>
 			<param name="FeMesh">linearMesh</param>
+			<list name="ParticleCommHandlers">
+				<param>pMovementHandler</param>
+			</list>
 		</struct>
 							  
 	</struct>