[cig-commits] commit: rejiggin
Mercurial
hg at geodynamics.org
Mon Feb 1 15:30:56 PST 2010
changeset: 332:f3e6336672d7
branch: pcu_rejig
user: John Mansour <john.mansour at maths.monash.edu.au>
date: Fri Nov 27 13:36:25 2009 +1100
files: MaterialPoints/src/IntegrationPointMapper.c MaterialPoints/src/IntegrationPointsSwarm.c MaterialPoints/src/ManyToOneMapper.c
description:
rejiggin
diff -r dc1607e804f1 -r f3e6336672d7 MaterialPoints/src/IntegrationPointMapper.c
--- a/MaterialPoints/src/IntegrationPointMapper.c Thu Nov 26 16:18:55 2009 +1100
+++ b/MaterialPoints/src/IntegrationPointMapper.c Fri Nov 27 13:36:25 2009 +1100
@@ -127,9 +127,13 @@ void _IntegrationPointMapper_AssignFromX
}
void _IntegrationPointMapper_Build( void* mapper, void* data ) {
+ IntegrationPointMapper* self = (IntegrationPointMapper*)mapper;
+ Stg_Component_Build( self->integrationSwarm, data, False );
}
void _IntegrationPointMapper_Initialise( void* mapper, void* data ) {
+ IntegrationPointMapper* self = (IntegrationPointMapper*)mapper;
+ Stg_Component_Initialise( self->integrationSwarm, data, False );
}
void _IntegrationPointMapper_Execute( void* mapper, void* data ) {
@@ -137,6 +141,7 @@ void _IntegrationPointMapper_Execute( vo
void _IntegrationPointMapper_Destroy( void* mapper, void* data ) {
IntegrationPointMapper* self = (IntegrationPointMapper*)mapper;
+ Stg_Component_Destroy( self->integrationSwarm, data, False );
}
void IntegrationPointMapper_Map( void* mapper ) {
diff -r dc1607e804f1 -r f3e6336672d7 MaterialPoints/src/IntegrationPointsSwarm.c
--- a/MaterialPoints/src/IntegrationPointsSwarm.c Thu Nov 26 16:18:55 2009 +1100
+++ b/MaterialPoints/src/IntegrationPointsSwarm.c Fri Nov 27 13:36:25 2009 +1100
@@ -396,6 +396,12 @@ void _IntegrationPointsSwarm_Build( void
Stg_Component_Build( self->localCoordVariable, data, False );
Stg_Component_Build( self->weightVariable, data, False );
Stg_Component_Build( self->mapper, data, False );
+ Stg_Component_Build( self->mesh, data, False );
+ Stg_Component_Build( self->timeIntegrator, data, False );
+ if ( self->weights != NULL ) {
+ Stg_Component_Build( self->weights, data, False );
+ }
+
}
void _IntegrationPointsSwarm_Initialise( void* integrationPoints, void* data ) {
IntegrationPointsSwarm* self = (IntegrationPointsSwarm*) integrationPoints;
@@ -409,6 +415,8 @@ void _IntegrationPointsSwarm_Initialise(
Stg_Component_Initialise( self->localCoordVariable, data, False );
Stg_Component_Initialise( self->weightVariable, data, False );
Stg_Component_Initialise( self->mapper, data, False );
+ Stg_Component_Initialise( self->mesh, data, False );
+ Stg_Component_Initialise( self->timeIntegrator, data, False );
if ( self->weights != NULL ) {
Stg_Component_Initialise( self->weights, data, False );
@@ -429,6 +437,15 @@ void _IntegrationPointsSwarm_Execute( vo
}
void _IntegrationPointsSwarm_Destroy( void* integrationPoints, void* data ) {
IntegrationPointsSwarm* self = (IntegrationPointsSwarm*)integrationPoints;
+
+ Stg_Component_Destroy( self->localCoordVariable, data, False );
+ Stg_Component_Destroy( self->weightVariable, data, False );
+ Stg_Component_Destroy( self->mapper, data, False );
+ Stg_Component_Destroy( self->mesh, data, False );
+ Stg_Component_Destroy( self->timeIntegrator, data, False );
+ if ( self->weights != NULL ) {
+ Stg_Component_Destroy( self->weights, data, False );
+ }
_Swarm_Destroy( self, data );
}
diff -r dc1607e804f1 -r f3e6336672d7 MaterialPoints/src/ManyToOneMapper.c
--- a/MaterialPoints/src/ManyToOneMapper.c Thu Nov 26 16:18:55 2009 +1100
+++ b/MaterialPoints/src/ManyToOneMapper.c Fri Nov 27 13:36:25 2009 +1100
@@ -173,8 +173,14 @@ void _ManyToOneMapper_Execute( void* map
void _ManyToOneMapper_Destroy( void* mapper, void* data ) {
ManyToOneMapper* self = (ManyToOneMapper*)mapper;
+ int i;
+
+ for ( i = 0; i < self->materialSwarmCount; ++i ) {
+ Stg_Component_Destroy( self->materialSwarms[i], data, False );
+ }
_IntegrationPointMapper_Destroy( self, data );
+
}
MaterialPointsSwarm** ManyToOneMapper_GetMaterialPointsSwarms( void* mapper, Index* count ) {
More information about the CIG-COMMITS
mailing list