[cig-commits] commit:

[Mercurial]

changeset:   3:2134b3bf9e06
user:        SteveQuenette
date:        Thu Oct 11 08:01:40 2007 +0000
files:       Swarm/src/SwarmClass.c Swarm/src/SwarmShapeVC.c libStgDomain/src/Init.c libStgDomain/tests/testLibDiscretisation.0of1.expected makefile
description:
* Updated to ignore output files
* Updated to latest ver of StGermain/Discretisation (4191) before its removal
* Copyright message change


diff -r 5667007f4799 -r 2134b3bf9e06 Swarm/src/SwarmClass.c
--- a/Swarm/src/SwarmClass.c	Wed Oct 10 07:21:38 2007 +0000
+++ b/Swarm/src/SwarmClass.c	Thu Oct 11 08:01:40 2007 +0000
@@ -24,7 +24,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: SwarmClass.c 4184 2007-09-25 07:54:17Z LukeHodkinson $
+** $Id: SwarmClass.c 4191 2007-10-05 06:23:59Z DavidLee $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -1219,12 +1219,9 @@ Particle_Index Swarm_FindClosestParticle
 	closestParticle_I = swarm->cellParticleTbl[ lCell_I ][ cParticle_I ];
 
 	/* Find neighbours to this cell - TODO This Assumes ElementCellLayout */
-	/*Mesh_GetIncidence( ((ElementCellLayout*)swarm->cellLayout)->mesh, dim, lCell_I, dim, 
-			   &neighbourCount, &neighbourList );*/
-	Mesh_GetIncidence( ((ElementCellLayout*)swarm->cellLayout)->mesh, dim, lCell_I, MT_VERTEX, /* dave - 05.09.07 */
-			   ((ElementCellLayout*)swarm)->incArray );
-	neighbourCount = IArray_GetSize( ((ElementCellLayout*)swarm)->incArray );
-	neighbourList = IArray_GetPtr( ((ElementCellLayout*)swarm)->incArray );
+	Mesh_GetIncidence( ((ElementCellLayout*)swarm->cellLayout)->mesh, dim, lCell_I, MT_VERTEX, swarm->incArray );
+	neighbourCount = IArray_GetSize( swarm->incArray );
+	neighbourList = IArray_GetPtr( swarm->incArray );
 
 	/* Loop over neighbours */
 	for ( neighbour_I = 0 ; neighbour_I < neighbourCount ; neighbour_I++ ) {
diff -r 5667007f4799 -r 2134b3bf9e06 Swarm/src/SwarmShapeVC.c
--- a/Swarm/src/SwarmShapeVC.c	Wed Oct 10 07:21:38 2007 +0000
+++ b/Swarm/src/SwarmShapeVC.c	Thu Oct 11 08:01:40 2007 +0000
@@ -342,10 +342,10 @@ void _SwarmShapeVC_Build(  void* variabl
 	
 	assert( context && Stg_Class_IsInstance( context, AbstractContext_Type ) );
 
-	self->_swarm =  Stg_ComponentFactory_ConstructByKey(  context->CF, self->name, "Swarm", Swarm,  True, 0  ) ; /* 08.08.07 */
+	self->_swarm = Stg_ComponentFactory_ConstructByKey(  context->CF, self->name, "Swarm", Swarm,  True, 0  ) ; 
 	assert( self->_swarm );
 	
-	self->_shape =  Stg_ComponentFactory_ConstructByKey(  context->CF, self->name, "Shape", Stg_Shape,  True, 0 /* dummy */  ) ;
+	self->_shape = Stg_ComponentFactory_ConstructByKey(  context->CF, self->name, "Shape", Stg_Shape,  True, 0 /* dummy */  ) ;
 	assert( self->_shape );
 
 	_VariableCondition_Build( self, data );
@@ -403,7 +403,6 @@ void _SwarmShapeVC_ReadDictionary( void*
 		Dictionary_Entry_Value_InitFromStruct(vcDictVal, dictionary);
 	}
 
-	/* i think this vcDictVal is nonsense?? */	
 	if (vcDictVal) {
 		/* Get Name of Shape from dictionary - Grab pointer to shape later on */
 		self->shapeName = StG_Strdup( 
diff -r 5667007f4799 -r 2134b3bf9e06 libStgDomain/src/Init.c
--- a/libStgDomain/src/Init.c	Wed Oct 10 07:21:38 2007 +0000
+++ b/libStgDomain/src/Init.c	Thu Oct 11 08:01:40 2007 +0000
@@ -49,7 +49,7 @@ Bool StgDomain_Init( int* argc, char** a
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
 	Journal_Printf( /* DO NOT CHANGE OR REMOVE */
 		Journal_Register( InfoStream_Type, "Context" ), 
-		"StGermain Discretisation Library revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
+		"StGermain Domain Library revision %s. Copyright (C) 2003-2007 VPAC.\n", VERSION );
 	Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 	
diff -r 5667007f4799 -r 2134b3bf9e06 libStgDomain/tests/testLibDiscretisation.0of1.expected
--- a/libStgDomain/tests/testLibDiscretisation.0of1.expected	Wed Oct 10 07:21:38 2007 +0000
+++ b/libStgDomain/tests/testLibDiscretisation.0of1.expected	Thu Oct 11 08:01:40 2007 +0000
@@ -1,3 +1,3 @@ StGermain Framework. Copyright (C) 2003-
 StGermain Framework. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
+StGermain Domain Library. Copyright (C) 2003-2007 VPAC.
 Watching rank: 0
diff -r 5667007f4799 -r 2134b3bf9e06 makefile
--- a/makefile	Wed Oct 10 07:21:38 2007 +0000
+++ b/makefile	Thu Oct 11 08:01:40 2007 +0000
@@ -29,9 +29,7 @@
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # obtain defaults for required variables according to system and project location, and then run the build.
-ifndef PROJ_ROOT
-	PROJ_ROOT=..
-endif
+override PROJ_ROOT=.
 include ${PROJ_ROOT}/Makefile.system
 
 subdirs = Geometry Shape Mesh Utils Swarm libStgDomain