[cig-commits] commit: Fixed broken tests

[Mercurial]

changeset:   52:96647aa606e0
user:        BelindaMay
date:        Thu Nov 08 03:08:50 2007 +0000
files:       Weights/tests/plugins/testElementIntegral.c Weights/tests/testDVCWeights.0of1.expected Weights/tests/testElementIntegral.xml
description:
Fixed broken tests


diff -r b73bb7ad550b -r 96647aa606e0 Weights/tests/plugins/testElementIntegral.c
--- a/Weights/tests/plugins/testElementIntegral.c	Thu Nov 08 01:51:06 2007 +0000
+++ b/Weights/tests/plugins/testElementIntegral.c	Thu Nov 08 03:08:50 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 518 2007-10-11 08:07:50Z SteveQuenette $
+** $Id: testElementIntegral.c 522 2007-11-08 03:08:50Z BelindaMay $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -150,7 +150,7 @@ void PICellerator_testElementIntegral( D
 	Swarm*              integrationSwarm = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, 
 										  "integrationSwarm" );
 	Swarm*              materialSwarm    = (Swarm*)LiveComponentRegister_Get( context->CF->LCRegister, 
-										  "materialSwarm" );
+										  "materialPoints" );
 	FeMesh* mesh             = (FeMesh*) LiveComponentRegister_Get( context->CF->LCRegister, "linearMesh" );
 	WeightsCalculator*  weights          = (WeightsCalculator*) LiveComponentRegister_Get( context->CF->LCRegister, "weights" );
 	FeVariable*         feVariable;
diff -r b73bb7ad550b -r 96647aa606e0 Weights/tests/testDVCWeights.0of1.expected
--- a/Weights/tests/testDVCWeights.0of1.expected	Thu Nov 08 01:51:06 2007 +0000
+++ b/Weights/tests/testDVCWeights.0of1.expected	Thu Nov 08 03:08:50 2007 +0000
@@ -1,5 +1,5 @@ StGermain Framework revision 3947. Copyr
 StGermain Framework revision 3947. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library revision 3947. Copyright (C) 2003-2005 VPAC.
+StGermain Domain Library revision 3947. Copyright (C) 2003-2007 VPAC.
 StGermain Finite Element Framework revision 695. Copyright (C) 2003-2005 VPAC.
 StGermain FEM Discretisation Framework revision 695. Copyright (C) 2003-2005 VPAC.
 StGermain SLE Library revision 695. Copyright (C) 2003-2005 VPAC.
diff -r b73bb7ad550b -r 96647aa606e0 Weights/tests/testElementIntegral.xml
--- a/Weights/tests/testElementIntegral.xml	Thu Nov 08 01:51:06 2007 +0000
+++ b/Weights/tests/testElementIntegral.xml	Thu Nov 08 03:08:50 2007 +0000
@@ -29,7 +29,7 @@
 		<struct name="mapper">
 			<param name="Type">CoincidentMapper</param>
 			<param name="IntegrationPointsSwarm">integrationSwarm</param>
-			<param name="MaterialPointsSwarm">materialSwarm</param>
+			<param name="MaterialPointsSwarm">materialPoints</param>
 		</struct>
 		<struct name="particleLayout">
 			<param name="Type">RandomParticleLayout</param>
@@ -38,7 +38,7 @@
 		<struct name="pMovementHandler"> 
 			<param name="Type">ParticleMovementHandler</param>
 		</struct>
-		<struct name="materialSwarm">
+		<struct name="materialPoints">
 			<param name="Type">MaterialPointsSwarm</param>
 			<param name="CellLayout">elementCellLayout</param>
 			<param name="ParticleLayout">particleLayout</param>