[cig-commits] commit: another merge

[Mercurial]

changeset:   361:37a2d171c1a1
branch:      pcu_rejig
parent:      360:ace648aa9faa
parent:      358:ebdb3a951b89
user:        JulianGiordani
date:        Fri Dec 11 12:30:49 2009 +1100
description:
another merge


diff -r ace648aa9faa -r 37a2d171c1a1 Utils/tests/PCDVCSuite.c
--- a/Utils/tests/PCDVCSuite.c	Fri Dec 11 00:19:49 2009 +1100
+++ b/Utils/tests/PCDVCSuite.c	Fri Dec 11 12:30:49 2009 +1100
@@ -321,20 +321,27 @@ void PCDVCSuite_Test( PCDVCSuiteData* da
 
 	pcu_filename_input( "testPCDVC.xml", inputFile );
 
+   /* rejigged this test to clean up after each run */
 	context = _PICelleratorContext_DefaultNew( "context" );
 	cf = stgMainInitFromXML( inputFile, MPI_COMM_WORLD, context );
 	stgMainBuildAndInitialise( cf );
-
 	testElementIntegral_CircleInterface( context, &mean, &standardDeviation );
 	compareAgainstReferenceSolution(context, stream, mean, standardDeviation, "testPCDVC_CircleInterface.expected" );
+	stgMainDestroy( cf );
 
+   context = _PICelleratorContext_DefaultNew( "context" );
+	cf = stgMainInitFromXML( inputFile, MPI_COMM_WORLD, context );
+	stgMainBuildAndInitialise( cf );
 	testElementIntegral_PolynomialFunction( context, &mean, &standardDeviation );
 	compareAgainstReferenceSolution(context, stream, mean, standardDeviation, "testPCDVC_PolynomialFunction.expected" );
+	stgMainDestroy( cf );
 
+   context = _PICelleratorContext_DefaultNew( "context" );
+	cf = stgMainInitFromXML( inputFile, MPI_COMM_WORLD, context );
+	stgMainBuildAndInitialise( cf );
 	testElementIntegral_ExponentialInterface( context, &mean, &standardDeviation );
 	compareAgainstReferenceSolution(context, stream, mean, standardDeviation, "testPCDVC_ExponentialInterface.expected" );
-
-	Stg_ComponentFactory_DestroyComponents( cf, NULL );
+	stgMainDestroy( cf );
 }