[cig-commits] commit: have added an additional argument to the swarm class constructor to allow initial conditions pointer to be passed in

[Mercurial]

changeset:   39:d7ab407f7264
user:        DavidLee
date:        Thu Aug 16 03:47:04 2007 +0000
files:       MaterialPoints/src/IntegrationPointsSwarm.c MaterialPoints/src/Material.c MaterialPoints/src/MaterialPointsSwarm.c MaterialPoints/tests/testPeriodicBCs.c
description:
have added an additional argument to the swarm class constructor to allow initial conditions pointer to be passed in


diff -r 21e7544649a9 -r d7ab407f7264 MaterialPoints/src/IntegrationPointsSwarm.c
--- a/MaterialPoints/src/IntegrationPointsSwarm.c	Mon Aug 13 01:14:47 2007 +0000
+++ b/MaterialPoints/src/IntegrationPointsSwarm.c	Thu Aug 16 03:47:04 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: IntegrationPointsSwarm.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: IntegrationPointsSwarm.c 506 2007-08-16 03:47:04Z DavidLee $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -203,7 +203,8 @@ IntegrationPointsSwarm* _IntegrationPoin
 		extraParticlesFactor,
 		extensionMgr_Register,
 		swarmVariable_Register,
-		comm );
+		comm,
+	        NULL	);
 
 	if (initFlag) {
 		_IntegrationPointsSwarm_Init( 
diff -r 21e7544649a9 -r d7ab407f7264 MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c	Mon Aug 13 01:14:47 2007 +0000
+++ b/MaterialPoints/src/Material.c	Thu Aug 16 03:47:04 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: Material.c 456 2007-04-27 06:21:01Z LukeHodkinson $
+** $Id: Material.c 506 2007-08-16 03:47:04Z DavidLee $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -241,7 +241,7 @@ void Material_Layout( void* material, Ma
 
 double Material_Volume( void* material, IntegrationPointsSwarm* swarm, Coord centroid ) {
 	Material*            self               = (Material*)material;
-	FeMesh*  feMesh             = swarm->mesh;
+	FeMesh*  	     feMesh             = swarm->mesh;
 	ElementType*         elementType;
 	IntegrationPoint*    particle;
 	Coord                globalCoord;
@@ -312,7 +312,7 @@ void Material_IntegrateField(
 		double*                 result ) 
 {
 	Material*            self               = (Material*)material;
-	FeMesh*  feMesh             = swarm->mesh;
+	FeMesh*  	     feMesh             = swarm->mesh;
 	ElementType*         elementType;
 	IntegrationPoint*    particle;
 	Cell_Index           lCell_I;
diff -r 21e7544649a9 -r d7ab407f7264 MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Mon Aug 13 01:14:47 2007 +0000
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Thu Aug 16 03:47:04 2007 +0000
@@ -91,7 +91,8 @@ MaterialPointsSwarm* MaterialPointsSwarm
 						extraParticlesFactor,
 		 				extensionMgr_Register,
 		  				swarmVariable_Register, 
-						comm);
+						comm,
+						NULL );
 		_MaterialPointsSwarm_Init(	self, 
 									mesh, 
 									removalRoutine, 
@@ -154,7 +155,8 @@ MaterialPointsSwarm* _MaterialPointsSwar
 			extraParticlesFactor,
 			extensionMgr_Register,
 			swarmVariable_Register,
-			comm );
+			comm,
+		        NULL	);
 
 	return self;
 }
diff -r 21e7544649a9 -r d7ab407f7264 MaterialPoints/tests/testPeriodicBCs.c
--- a/MaterialPoints/tests/testPeriodicBCs.c	Mon Aug 13 01:14:47 2007 +0000
+++ b/MaterialPoints/tests/testPeriodicBCs.c	Thu Aug 16 03:47:04 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: testPeriodicBCs.c 503 2007-08-02 08:41:48Z SteveQuenette $
+** $Id: testPeriodicBCs.c 506 2007-08-16 03:47:04Z DavidLee $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -202,7 +202,7 @@ int main( int argc, char* argv[] ) {
 	
 	/* Configure the swarm */
 	swarm = Swarm_New( "testSwarm", elementCellLayout, randomParticleLayout, 3, sizeof(Particle),
-		extensionMgr_Register, NULL, CommWorld );
+		extensionMgr_Register, NULL, CommWorld, NULL );
 	
 	epRegister = EntryPoint_Register_New();