[cig-commits] commit: Merging.

[Mercurial]

changeset:   351:3e5b5d3b6aca
branch:      pcu_rejig
parent:      350:c61a501f5f1c
parent:      347:9f199fcaac05
user:        JericoRevote
date:        Fri Dec 04 17:34:43 2009 +1100
description:
Merging.


diff -r c61a501f5f1c -r 3e5b5d3b6aca MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c	Fri Dec 04 17:10:53 2009 +1100
+++ b/MaterialPoints/src/Material.c	Fri Dec 04 17:34:43 2009 +1100
@@ -140,6 +140,8 @@ void _Material_Delete( void* material ) 
 void _Material_Delete( void* material ) {
 	Material* self = (Material*) material;
 
+   Stg_Class_Delete( self->extensionMgr );
+   
 	_Stg_Component_Delete( material );
 }
 
@@ -186,14 +188,22 @@ void _Material_AssignFromXML( void* mate
 }
 
 
-void _Material_Build( void* material, void* data ) {}
-void _Material_Initialise( void* material, void* data ) {}
+void _Material_Build( void* material, void* data ) {
+	Material*				self = (Material*) material;
+
+   Stg_Component_Build( self->shape, data , False );
+}
+void _Material_Initialise( void* material, void* data ) {
+	Material*				self = (Material*) material;
+
+   Stg_Component_Initialise( self->shape, data , False );
+}
 void _Material_Execute( void* material, void* data ) {}
 
 void _Material_Destroy( void* material, void* data ) {
 	Material* self = (Material*) material;
 
-	Stg_Class_Delete( self->extensionMgr );
+	Stg_Component_Destroy( self->shape, data , False );
 }
 
 
diff -r c61a501f5f1c -r 3e5b5d3b6aca MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Fri Dec 04 17:10:53 2009 +1100
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Fri Dec 04 17:34:43 2009 +1100
@@ -274,6 +274,10 @@ void _MaterialPointsSwarm_Build( void* s
 
 	_Swarm_Build( self, data );
 
+	Stg_Component_Build( self->mesh, data , False );
+	if( self->escapedRoutine != NULL) Stg_Component_Build( self->escapedRoutine, data , False );
+	if( self->material       != NULL) Stg_Component_Build( self->material,       data , False );
+
 	/* Since this swarm is being set up to advect a PICellerator material, it should make sure
 	 * at least one ParticleMovementHandler-type ParticleCommHandler has been added to the base
 	 * Swarm. */
@@ -303,6 +307,10 @@ void _MaterialPointsSwarm_Initialise( vo
 	MaterialPoint*		matPoint=NULL;
 
 	_Swarm_Initialise( self, data );
+
+	Stg_Component_Initialise( self->mesh, data , False );
+	if( self->escapedRoutine != NULL) Stg_Component_Initialise( self->escapedRoutine, data , False );
+	if( self->material       != NULL) Stg_Component_Initialise( self->material,       data , False );
 
 	for( var_I = 0 ; var_I < self->nSwarmVars ; var_I++ ) {
 		Stg_Component_Initialise( self->swarmVars[var_I], data , False );
@@ -458,8 +466,18 @@ void _MaterialPointsSwarm_Execute( void*
 }
 void _MaterialPointsSwarm_Destroy( void* swarm, void* data ) {
 	MaterialPointsSwarm*	self = (MaterialPointsSwarm*)swarm;
+   int var_I;
+
+	_Swarm_Destroy( self, data );
 	
-	_Swarm_Destroy( self, data );
+	Stg_Component_Destroy( self->mesh, data , False );
+	if( self->escapedRoutine != NULL) Stg_Component_Destroy( self->escapedRoutine, data , False );
+	if( self->material       != NULL) Stg_Component_Destroy( self->material,       data , False );
+
+	for( var_I = 0 ; var_I < self->nSwarmVars ; var_I++ ) {
+		Stg_Component_Destroy( self->swarmVars[var_I], data , False );
+	}
+	
 }
 
 void _MaterialPointsSwarm_UpdateHook( void* timeIntegrator, void* swarm ) {
diff -r c61a501f5f1c -r 3e5b5d3b6aca MaterialPoints/src/SwarmAdvectionInAPlane.c
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.c	Fri Dec 04 17:10:53 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.c	Fri Dec 04 17:34:43 2009 +1100
@@ -115,21 +115,6 @@ void _SwarmAdvectionInAPlane_Init( Swarm
 /*------------------------------------------------------------------------------------------------------------------------
 ** Virtual functions
 */
-void _SwarmAdvectionInAPlane_Delete( void* swarmAdvector ) {
-	SwarmAdvectionInAPlane* self = (SwarmAdvectionInAPlane*)swarmAdvector;
-
-	/* Delete parent */
-	_SwarmAdvector_Delete( self );
-}
-
-
-void _SwarmAdvectionInAPlane_Print( void* swarmAdvector, Stream* stream ) {
-	SwarmAdvectionInAPlane* self = (SwarmAdvectionInAPlane*)swarmAdvector;
-	
-	/* Print parent */
-	_SwarmAdvector_Print( self, stream );
-}
-
 
 void* _SwarmAdvectionInAPlane_Copy( void* swarmAdvector, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
 	SwarmAdvectionInAPlane*	self = (SwarmAdvectionInAPlane*)swarmAdvector;
@@ -148,8 +133,8 @@ void* _SwarmAdvectionInAPlane_DefaultNew
 	/* Variables set in this function */
 	SizeT                                               _sizeOfSelf = sizeof(SwarmAdvectionInAPlane);
 	Type                                                       type = SwarmAdvectionInAPlane_Type;
-	Stg_Class_DeleteFunction*                               _delete = _SwarmAdvectionInAPlane_Delete;
-	Stg_Class_PrintFunction*                                 _print = _SwarmAdvectionInAPlane_Print;
+	Stg_Class_DeleteFunction*                               _delete = _SwarmAdvector_Delete;
+	Stg_Class_PrintFunction*                                 _print = _SwarmAdvector_Print;
 	Stg_Class_CopyFunction*                                   _copy = _SwarmAdvectionInAPlane_Copy;
 	Stg_Component_DefaultConstructorFunction*   _defaultConstructor = _SwarmAdvectionInAPlane_DefaultNew;
 	Stg_Component_ConstructFunction*                     _construct = _SwarmAdvectionInAPlane_AssignFromXML;
diff -r c61a501f5f1c -r 3e5b5d3b6aca MaterialPoints/src/SwarmAdvectionInAPlane.h
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.h	Fri Dec 04 17:10:53 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.h	Fri Dec 04 17:34:43 2009 +1100
@@ -95,8 +95,6 @@
 		SwarmAdvectionInAPlane*                             self,
 		int											whichaxis);
 
-	void _SwarmAdvectionInAPlane_Delete( void* materialSwarm );
-	void _SwarmAdvectionInAPlane_Print( void* materialSwarm, Stream* stream );
 	#define SwarmAdvectionInAPlane_Copy( self ) \
 		(SwarmAdvectionInAPlane*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
 	#define SwarmAdvectionInAPlane_DeepCopy( self ) \