Thu Mar 8 12:36:57 PST 2007

Author: walter
Date: 2007-03-08 12:36:54 -0800 (Thu, 08 Mar 2007)
New Revision: 6201

Added:
   long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/SConscript
Removed:
   long/3D/Gale/trunk/src/Gale/Utils/makefile
   long/3D/Gale/trunk/src/Gale/Utils/src/makefile
   long/3D/Gale/trunk/src/Gale/libGale/makefile
   long/3D/Gale/trunk/src/PICellerator/Utils/tests/makefile
   long/3D/Gale/trunk/src/PICellerator/libPICellerator/tests/makefile
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/tests/makefile
   long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/makefile
   long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/plugins/makefile
   long/3D/Gale/trunk/src/Underworld/libUnderworld/tests/makefile
   long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/makefile
   long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/makefile
Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/PICellerator/Utils/src/SConscript
   long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c
   long/3D/Gale/trunk/src/StGermain/libStGermain/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
   long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript
   long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c
   long/3D/Gale/trunk/src/Underworld/plugins/SConscript
Log:
 r1671 at earth:  boo | 2007-03-08 12:35:40 -0800
 Fixes to make everything compile



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1661
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1671

Deleted: long/3D/Gale/trunk/src/Gale/Utils/makefile
===================================================================

--- long/3D/Gale/trunk/src/Gale/Utils/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Gale/Utils/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,9 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src
-
-include ${PROJ_ROOT}/Makefile.vmake

Deleted: long/3D/Gale/trunk/src/Gale/Utils/src/makefile
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,21 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-# External Libraries and Headers
-packages = UNDERWORLD PICELLERATOR STGFEM STGERMAIN PETSC MPI XML PYTHON
-
-# Work out name to call library
-lib = ${PROJECT}$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake

Deleted: long/3D/Gale/trunk/src/Gale/libGale/makefile
===================================================================
--- long/3D/Gale/trunk/src/Gale/libGale/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Gale/libGale/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,9 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src 
-
-include ${PROJ_ROOT}/Makefile.vmake

Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/SConscript	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/SConscript	2007-03-08 20:36:54 UTC (rev 6201)
@@ -20,6 +20,7 @@
 local_env=env.Copy()
 
 header_groups['PICellerator/Utils']=Split("""BuoyancyForceTerm.h
+BuoyancyForceTermThermoChem.h
 Finalise.h
 Init.h
 MaterialSwarmVariable.h
@@ -30,6 +31,7 @@
 
 
 c_files=Split("""BuoyancyForceTerm.c
+BuoyancyForceTermThermoChem.c
 Finalise.c
 Init.c
 PCDVC.c
@@ -38,6 +40,7 @@
 
 
 meta_files=Split("""BuoyancyForceTerm.meta
+BuoyancyForceTermThermoChem.meta
 PCDVC.meta
 StressBC.meta
 MaterialSwarmVariable.meta""")

Deleted: long/3D/Gale/trunk/src/PICellerator/Utils/tests/makefile
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/tests/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/tests/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,62 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-##	Melbourne, 3053, Australia.
-## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
-##	Victoria, 3800, Australia
-##
-## Primary Contributing Organisations:
-##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
-##	Monash Cluster Computing - http://www.mcc.monash.edu.au
-##
-## Contributors:
-##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-##	Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##	David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
-##	Wendy Sharples, PhD Student, Monash University (wendy.sharples at sci.monash.edu.au)
-##
-##  This library is free software; you can redistribute it and/or
-##  modify it under the terms of the GNU Lesser General Public
-##  License as published by the Free Software Foundation; either
-##  version 2.1 of the License, or (at your option) any later version.
-##
-##  This library is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-##  Lesser General Public License for more details.
-##
-##  You should have received a copy of the GNU Lesser General Public
-##  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 422 2007-02-12 04:15:13Z KathleenHumble $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-
-# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS}
-EXTERNAL_LIBS = ${STGERMAIN_FEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
-
-#packages
-packages = STGFEM STGERMAIN PETSC MPI XML MATH
-
-checks = $(wildcard *.sh)
-
-tests = libPICelleratorUtils
-
-include ${PROJ_ROOT}/Makefile.vmake

Modified: long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c	2007-03-08 20:36:54 UTC (rev 6201)
@@ -54,7 +54,6 @@
 such as streams etc */
 Bool PICellerator_Init( int* argc, char** argv[] ) {
 	int tmp;
-	char* directory;
 
 	PICellerator_Voronoi_Init( argc, argv );
 	PICellerator_PopulationControl_Init( argc, argv );
@@ -71,14 +70,5 @@
 	Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 
-	/* Add the PICellerator path to the global xml path dictionary */
-	directory = Memory_Alloc_Array( char, 200, "xmlDirectory" ) ;
-	sprintf(directory, "%s%s", LIB_DIR, "/StGermain" );
-	XML_IO_Handler_AddDirectory( "PICellerator", directory );
-	Memory_Free(directory);
-	
-	/* Add the plugin path to the global plugin list */
-	PluginsManager_AddDirectory( "PICellerator", LIB_DIR );
-
 	return True;
 }

Deleted: long/3D/Gale/trunk/src/PICellerator/libPICellerator/tests/makefile
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/libPICellerator/tests/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/PICellerator/libPICellerator/tests/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,61 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-##      Melbourne, 3053, Australia.
-## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
-##      Victoria, 3800, Australia
-##
-## Primary Contributing Organisations:
-##      Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-##      Australian Computational Earth Systems Simulator - http://www.access.edu.au
-##      Monash Cluster Computing - http://www.mcc.monash.edu.au
-##
-## Contributors:
-##      Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-##      Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
-##      Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##      Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##      David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-##      Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-##      Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-##      Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-##      Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##      Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##      David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
-##      Wendy Sharples, PhD Student, Monash University (wendy.sharples at sci.monash.edu.au)
-##
-##  This library is free software; you can redistribute it and/or
-##  modify it under the terms of the GNU Lesser General Public
-##  License as published by the Free Software Foundation; either
-##  version 2.1 of the License, or (at your option) any later version.
-##
-##  This library is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-##  Lesser General Public License for more details.
-##
-##  You should have received a copy of the GNU Lesser General Public
-##  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 422 2007-02-12 04:15:13Z KathleenHumble $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-SHELL := /bin/bash
-# obtain defaults for required variables according to system and project location, and then run the build.
-ifndef PROJ_ROOT
-	PROJ_ROOT=../..
-endif
-include ${PROJ_ROOT}/Makefile.system
-
-tests = lib${PROJECT}
-
-checks = $(wildcard *.sh)
-
-SRCS = $(wildcard *.c)
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} ${STGFEM_INCLUDES} ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS} -DLIB_DIR=\"${LIB_DIR}\"
-EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -l${PROJECT} ${STGFEM_LIBS} ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS}
-
-packages = STGFEM STGERMAIN MPI XML MATH
-
-include ${PROJ_ROOT}/Makefile.vmake

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/src/Init.c	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/src/Init.c	2007-03-08 20:36:54 UTC (rev 6201)
@@ -43,15 +43,6 @@
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	Discretisation_Init( argc, argv );
-
-	/* Add the StGermain path to the global xml path dictionary */
-	directory = Memory_Alloc_Array( char, 200, "xmlDirectory" ) ;
-	sprintf(directory, "%s%s", LIB_DIR, "/StGermain" );
-	XML_IO_Handler_AddDirectory( "StGermain", directory  );
-	Memory_Free(directory);
-	/* Add the plugin path to the global plugin list */
-	PluginsManager_AddDirectory( "StGermain", LIB_DIR );
-
 	
 	return True;
 }

Deleted: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/tests/makefile
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/tests/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/tests/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,63 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-##	Melbourne, 3053, Australia.
-##
-## Primary Contributing Organisations:
-##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
-##	Monash Cluster Computing - http://www.mcc.monash.edu.au
-##	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
-##
-## Contributors:
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-##
-##  This library is free software; you can redistribute it and/or
-##  modify it under the terms of the GNU Lesser General Public
-##  License as published by the Free Software Foundation; either
-##  version 2.1 of the License, or (at your option) any later version.
-##
-##  This library is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-##  Lesser General Public License for more details.
-##
-##  You should have received a copy of the GNU Lesser General Public
-##  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 676 2006-12-22 01:44:03Z LukeHodkinson $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-NAME = $(shell basename `pwd | sed s/tests//g`)
-
-tests = lib${PROJECT}_SLE_LinearAlgebra
-checks = $(wildcard *.sh)
-SRCS = $(wildcard *.c)
-
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT}
-EXTERNAL_LIBS= -L${LIB_DIR} -l${PROJECT}_SLE_LinearAlgebra -l${PROJECT}_Discretisation
-
-packages = STGERMAIN MPI XML MATH DL HYPRE
-
-ifeq (true,$(shell if test -r $(PETSC_INCDIR)/petsc.h; then echo true; fi ))
-	USER_CFLAGS += -DHAVE_PETSC
-	packages += PETSC
-endif
-
-include ${PROJ_ROOT}/Makefile.vmake

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2007-03-08 20:36:54 UTC (rev 6201)
@@ -246,13 +246,14 @@
 
 	/* Find vector from centre to node */
 	StGermain_VectorSubtraction( vector, coord, centre, 2 );
-
 	
 	if ((vector[ I_AXIS ]*vector[ I_AXIS ]+vector[ J_AXIS ]*vector[ J_AXIS ])<=size*size)
 		*result =  omega * vector[ I_AXIS ];
 	else 
 		*result = 0.0;
 }
+
+
 void StgFEM_StandardConditionFunctions_TaperedRotationX( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
@@ -760,7 +761,7 @@
 		*result = 1.0;
 	else if ( *result < 0.0 ) 
 		*result = 0.0;
-	
+#endif
 }
 
 void StgFEM_StandardConditionFunctions_EdgeDriveConvectionIC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) 
@@ -846,6 +847,7 @@
 	}
 }
 
+
 void StG_FEM_StandardConditionFunctions_StepFunctionProduct1( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	FiniteElementContext *	context            = (FiniteElementContext*)_context;
 	FeVariable*             feVariable         = NULL;
@@ -1020,3 +1022,32 @@
 
 	*result = ( 1 - y ) + ( cos( M_PI * x ) * sin( M_PI * y ) ) / 100 ;
 }
+
+void StgFEM_StandardConditionFunctions_ConstantVelocity( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+	DiscretisationContext*	context            = (DiscretisationContext*)_context;
+	Dictionary*             dictionary         = context->dictionary;
+	FeVariable*             feVariable         = NULL;
+	FeMesh*			mesh               = NULL;
+	double*                 result             = (double*) _result;
+	double                  velocity[3];
+	
+	feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
+	mesh       = feVariable->feMesh;
+
+	velocity[ I_AXIS ] = Dictionary_GetDouble_WithDefault( dictionary, "ConstantVelocity_Vx", 0.0 );
+	velocity[ J_AXIS ] = Dictionary_GetDouble_WithDefault( dictionary, "ConstantVelocity_Vy", 1.0 );
+	velocity[ K_AXIS ] = Dictionary_GetDouble_WithDefault( dictionary, "ConstantVelocity_Vz", 0.0 );
+
+	result[ I_AXIS ] = velocity[ I_AXIS ];
+	result[ J_AXIS ] = velocity[ J_AXIS ];
+	if( feVariable->dim == 3 )
+		result[ K_AXIS ] = velocity[ K_AXIS ];
+}
+
+
+Bool StgFEM_StandardConditionFunctions_Init( int* argc, char** argv[] ) {
+  Stg_ComponentRegister* componentsRegister = Stg_ComponentRegister_Get_ComponentRegister();
+  Stg_ComponentRegister_Add(componentsRegister,
+                            StgFEM_StandardConditionFunctions_Type, "0",
+                            _StgFEM_StandardConditionFunctions_DefaultNew );
+}

Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/makefile
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,22 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-
-subdirs := plugins
-
-scibenchmark_checks = testThermoChemBenchmark-test1.0of1.sh 
-
-# These tests only work on 32 bit machines since that's where we generated the 
-#	checkpoint "benchmark" files, and as yet the Swarm checkpoint files are
-#	binary & not portable between architectures
-	
-ifeq (${SYSTEM_64},0)
-	scibenchmark_checks += 
-
-endif
-
-
-include ${PROJ_ROOT}/Makefile.vmake

Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/plugins/makefile
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/plugins/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/ScienceBenchmarkTests/plugins/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,22 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-# What to call the plugin
-modName := $(shell basename `pwd`)
-mod = ${PROJECT}_${modName}
-
-# Where to put header files
-includes = ${PROJECT}/${modName}
-
-# External Libraries and Headers
-packages = PICELLERATOR STGFEM STGERMAIN PETSC MPI XML PYTHON
-
-include ${PROJ_ROOT}/Makefile.vmake

Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript	2007-03-08 20:36:54 UTC (rev 6201)
@@ -27,6 +27,7 @@
 RadiogenicHeatingTerm.h
 StressField.h
 types.h
+Underworld_SwarmOutput.h
 Utils.h
 ViscosityField.h""")
 
@@ -38,6 +39,7 @@
 PressureTemperatureOutput.c
 RadiogenicHeatingTerm.c
 StressField.c
+Underworld_SwarmOutput.c
 ViscosityField.c""")
 
 
@@ -46,6 +48,7 @@
 PressureTemperatureOutput.meta
 RadiogenicHeatingTerm.meta
 StressField.meta
+Underworld_SwarmOutput.meta
 ViscosityField.meta""")
 
 c_files+=[local_env.Meta(meta_files)]

Modified: long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c	2007-03-08 20:36:54 UTC (rev 6201)
@@ -69,7 +69,6 @@
 	int arg_I;
 	int tmp;
 	Bool useSignalHandler = False;
-	char* directory;
 
 	for ( arg_I = 0; argc && arg_I < *argc; arg_I++ ) {
 		argString = (*argv)[arg_I];
@@ -100,20 +99,7 @@
 	Underworld_Debug  = Journal_Register( Debug_Type, "Context" );
 	Underworld_Info   = Journal_Register( Info_Type,  "Context" );
 	Underworld_Error  = Journal_Register( Error_Type, "Context" );
-	
-	/* Add the Underworld path to the global xml path dictionary */
-	directory = Memory_Alloc_Array( char, 400, "xmlDirectory" ) ;
-	sprintf(directory, "%s%s", LIB_DIR, "/StGermain" );
-	XML_IO_Handler_AddDirectory( "Underworld", directory );
-	Memory_Free(directory);
 
-	/* Add the plugin path to the global plugin list */
-	#ifdef GLUCIFER_LIBDIR
-		PluginsManager_AddDirectory( "gLucifer", GLUCIFER_LIBDIR );
-	#endif
-	
-	PluginsManager_AddDirectory( "Underworld", LIB_DIR );
-
 	return True;
 }
 

Deleted: long/3D/Gale/trunk/src/Underworld/libUnderworld/tests/makefile
===================================================================
--- long/3D/Gale/trunk/src/Underworld/libUnderworld/tests/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/libUnderworld/tests/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,44 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.rules 2746 2005-03-06 00:29:00Z SteveQuenette $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-includes = ${PROJECT}
-
-tests = lib${PROJECT}
-
-checks = $(wildcard *.sh)
-
-SRCS = $(wildcard *.c)
-
-
-EXTERNAL_LIBS = -L${LIB_DIR} -l${PROJECT} 
-
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} -I${PICELLERATOR_INCDIR}  -DLIB_DIR=\"${LIB_DIR}\"
-
-packages = UNDERWORLD PICELLERATOR STGFEM STGERMAIN MPI XML MATH
-
-include ${PROJ_ROOT}/Makefile.vmake

Added: long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/SConscript	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/SConscript	2007-03-08 20:36:54 UTC (rev 6201)
@@ -0,0 +1,36 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','shared_lib_objects','Underworld_static_objects','header_groups')
+
+local_env=env.Copy()
+
+header_groups['Underworld/plugins/ExtractPetscObjects']=Split("""
+ExtractPetscObjects.h
+""")
+
+
+c_files=Split("""ExtractPetscObjects.c""")
+
+shared_lib_objects+=[local_env.SharedLibrary('Underworld_ExtractPetscObjectsmodule',c_files,SHLIBPREFIX='')]
+Underworld_static_objects+=local_env.StaticObject(c_files)
+
+# For some reason, I have to have this export.  Otherwise, none of the
+# plugins get added to the list of library objects.  I think this is a
+# bug in SCons
+Export('Underworld_static_objects')
+

Deleted: long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/makefile
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/plugins/ExtractPetscObjects/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,18 +0,0 @@
-SHELL := $(shell which bash)
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-
-include ${PROJ_ROOT}/Makefile.system
-
-#subdirs = tests
-
-modName := $(shell basename `pwd` )
-mod = ${PROJECT}_${modName}
-includes = ${PROJECT}/${modName}
-
-SRCS = $(wildcard *.c)
-HDRS = $(wildcard *.h)
-
-packages = PICELLERATOR STGFEM STGERMAIN PETSC MPI XML PYTHON
-
-# obtain defaults for required variables according to system and project location, and then run the build.
-include ${PROJ_ROOT}/Makefile.vmake

Deleted: long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/makefile
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/makefile	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/makefile	2007-03-08 20:36:54 UTC (rev 6201)
@@ -1,24 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := $(shell find * -type d -prune ! -name .svn ) 
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-# What to call the plugin
-modName := $(shell basename `pwd`)
-mod = ${PROJECT}_${modName}
-
-# Where to put header files
-includes = ${PROJECT}/${modName}
-
-# External Libraries and Headers
-packages = PICELLERATOR STGFEM STGERMAIN PETSC MPI XML PYTHON
-
-include ${PROJ_ROOT}/Makefile.vmake

Modified: long/3D/Gale/trunk/src/Underworld/plugins/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/SConscript	2007-03-08 19:56:19 UTC (rev 6200)
+++ long/3D/Gale/trunk/src/Underworld/plugins/SConscript	2007-03-08 20:36:54 UTC (rev 6201)
@@ -16,6 +16,7 @@
 # USA
 
 SConscript('EulerDeform/SConscript')
+SConscript('ExtractPetscObjectsSConscript')
 SConscript('IncompressibleExtensionBC/SConscript')
 SConscript('MaterialThermalDiffusivity/SConscript')
 SConscript('MovingMesh/SConscript')

