[cig-commits] commit: Changing the way the analyticSolution component works. This change had to happen after the mesh changes because the timing of when the memory was initialised had been re-worked.

[Mercurial]

changeset:   10:ee8547c55553
user:        JulianGiordani
date:        Thu May 24 08:30:12 2007 +0000
files:       Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c Apps/RayleighTaylor/tests/makefile MaterialPoints/tests/testAdvection.xml
description:
Changing the way the analyticSolution component works. This change had to happen after the mesh changes because the timing of when the memory was initialised had been re-worked.

Fixing up the testAdvection.xml


diff -r 2bd8ec9f0d26 -r ee8547c55553 Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c
--- a/Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c	Tue May 22 04:27:01 2007 +0000
+++ b/Apps/BuoyancyBenchmark/tests/AnalyticPressure/AnalyticPressure.c	Thu May 24 08:30:12 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: AnalyticPressure.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: AnalyticPressure.c 467 2007-05-24 08:30:12Z JulianGiordani $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -81,6 +81,8 @@ void _AnalyticPressure_Construct( void* 
 
 	/* Create Analytic Fields */
 	self->pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data ); 
+	AnalyticSolution_RegisterFeVariableWithAnalyticFunction( self, self->pressureField, _AnalyticPressure_PressureFunction );
+	
 	
 	self->density  = Stg_ComponentFactory_GetDouble( cf, "layer", "density", 0.0 );
 	self->gravity  = Stg_ComponentFactory_GetRootDictDouble( cf, "gravity", 0 );
@@ -93,9 +95,8 @@ void _AnalyticPressure_Build( void* anal
 
 	assert( self && Stg_CheckType( self, AnalyticPressure ) );
 
-	Build( self->pressureField, data, False );
-	AnalyticSolution_CreateAnalyticField( self, self->pressureField, _AnalyticPressure_PressureFunction );
-
+	AnalyticSolution_BuildAllAnalyticFields( self );
+	
 	_AnalyticSolution_Build( self, data );
 }
 
diff -r 2bd8ec9f0d26 -r ee8547c55553 Apps/RayleighTaylor/tests/makefile
--- a/Apps/RayleighTaylor/tests/makefile	Tue May 22 04:27:01 2007 +0000
+++ b/Apps/RayleighTaylor/tests/makefile	Thu May 24 08:30:12 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: makefile 409 2007-01-17 13:01:26Z SteveQuenette $
+## $Id: makefile 467 2007-05-24 08:30:12Z JulianGiordani $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -48,7 +48,7 @@ PROJ_ROOT := $(shell until test -r ./Mak
 
 include ${PROJ_ROOT}/Makefile.system
 
-subdirs = AnalyticColumn AnalyticBlock
+subdirs = #AnalyticColumn AnalyticBlock
 
 modName = $(shell basename `pwd | sed s/tests//g`)
 
diff -r 2bd8ec9f0d26 -r ee8547c55553 MaterialPoints/tests/testAdvection.xml
--- a/MaterialPoints/tests/testAdvection.xml	Tue May 22 04:27:01 2007 +0000
+++ b/MaterialPoints/tests/testAdvection.xml	Thu May 24 08:30:12 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="particleShape">
 			<param name="Type">Sphere</param>