[cig-commits] commit: tidying / rejiggin'
Mercurial
hg at geodynamics.org
Mon Feb 1 15:30:53 PST 2010
changeset: 330:3f8450183c04
branch: pcu_rejig
user: JohnMansour <john.mansour at maths.monash.edu.au>
date: Wed Nov 25 16:25:21 2009 +1100
files: MaterialPoints/src/BackgroundParticleLayout.c Weights/src/ConstantWeights.c Weights/src/ConstantWeights.h Weights/src/DVCWeights.c Weights/src/DVCWeights.h Weights/src/IterativeWeights.c Weights/src/IterativeWeights.h Weights/src/MomentBalanceWeights.c Weights/src/MomentBalanceWeights.h Weights/src/VolumeWeights.c Weights/src/VolumeWeights.h Weights/src/WeightsCalculator.c Weights/src/WeightsCalculator.h
description:
tidying / rejiggin'
diff -r fbc66183146f -r 3f8450183c04 MaterialPoints/src/BackgroundParticleLayout.c
--- a/MaterialPoints/src/BackgroundParticleLayout.c Wed Nov 25 11:13:14 2009 +1100
+++ b/MaterialPoints/src/BackgroundParticleLayout.c Wed Nov 25 16:25:21 2009 +1100
@@ -165,7 +165,10 @@ void _BackgroundParticleLayout_Build( v
void _BackgroundParticleLayout_Build( void* component, void* data ) {}
void _BackgroundParticleLayout_Initialise( void* component, void* data ) {}
void _BackgroundParticleLayout_Execute( void* component, void* data ) {}
-void _BackgroundParticleLayout_Destroy( void* component, void* data ) {}
+void _BackgroundParticleLayout_Destroy( void* component, void* data ) {
+ BackgroundParticleLayout* self = (BackgroundParticleLayout*)component;
+ _ParticleLayout_Destroy( self, data );
+}
void _BackgroundParticleLayout_SetInitialCounts( void* particleLayout, void* _swarm )
diff -r fbc66183146f -r 3f8450183c04 Weights/src/ConstantWeights.c
--- a/Weights/src/ConstantWeights.c Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/ConstantWeights.c Wed Nov 25 16:25:21 2009 +1100
@@ -132,7 +132,7 @@ void* _ConstantWeights_DefaultNew( Name
_ConstantWeights_Build,
_ConstantWeights_Initialise,
_ConstantWeights_Execute,
- NULL,
+ _ConstantWeights_Destroy,
name,
NON_GLOBAL,
_ConstantWeights_Calculate,
@@ -153,6 +153,13 @@ void _ConstantWeights_Build( void* const
_WeightsCalculator_Build( self, data );
}
+
+void _ConstantWeights_Destroy( void* constantWeights, void* data ) {
+ ConstantWeights* self = (ConstantWeights*)constantWeights;
+
+ _WeightsCalculator_Destroy( self, data );
+}
+
void _ConstantWeights_Initialise( void* constantWeights, void* data ) {
ConstantWeights* self = (ConstantWeights*)constantWeights;
diff -r fbc66183146f -r 3f8450183c04 Weights/src/ConstantWeights.h
--- a/Weights/src/ConstantWeights.h Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/ConstantWeights.h Wed Nov 25 16:25:21 2009 +1100
@@ -96,6 +96,7 @@ void* _ConstantWeights_DefaultNew( Name
void* _ConstantWeights_DefaultNew( Name name ) ;
void _ConstantWeights_AssignFromXML( void* constantWeights, Stg_ComponentFactory* cf, void* data ) ;
void _ConstantWeights_Build( void* constantWeights, void* data ) ;
+void _ConstantWeights_Destroy( void* constantWeights, void* data ) ;
void _ConstantWeights_Initialise( void* constantWeights, void* data ) ;
void _ConstantWeights_Execute( void* constantWeights, void* data );
diff -r fbc66183146f -r 3f8450183c04 Weights/src/DVCWeights.c
--- a/Weights/src/DVCWeights.c Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/DVCWeights.c Wed Nov 25 16:25:21 2009 +1100
@@ -149,7 +149,7 @@ void* _DVCWeights_DefaultNew( Name name
_DVCWeights_Build,
_DVCWeights_Initialise,
_DVCWeights_Execute,
- NULL,
+ _DVCWeights_Destroy,
name,
NON_GLOBAL,
_DVCWeights_Calculate,
@@ -185,6 +185,11 @@ void _DVCWeights_Execute( void* dvcWeigh
void _DVCWeights_Execute( void* dvcWeights, void* data ) {
DVCWeights* self = (DVCWeights*)dvcWeights;
_WeightsCalculator_Execute( self, data );
+}
+
+void _DVCWeights_Destroy( void* dvcWeights, void* data ) {
+ DVCWeights* self = (DVCWeights*)dvcWeights;
+ _WeightsCalculator_Destroy( self, data );
}
/*-------------------------------------------------------------------------------------------------------------------------
diff -r fbc66183146f -r 3f8450183c04 Weights/src/DVCWeights.h
--- a/Weights/src/DVCWeights.h Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/DVCWeights.h Wed Nov 25 16:25:21 2009 +1100
@@ -254,10 +254,10 @@ void* _DVCWeights_DefaultNew( Name name
void _DVCWeights_AssignFromXML( void* dvcWeights, Stg_ComponentFactory* cf, void* data ) ;
-void _DVCWeights_Build( void* dvcWeights, void* data ) ;
-void _DVCWeights_Initialise( void* dvcWeights, void* data ) ;
+void _DVCWeights_Build( void* dvcWeights, void* data );
+void _DVCWeights_Initialise( void* dvcWeights, void* data );
void _DVCWeights_Execute( void* dvcWeights, void* data );
-
+void _DVCWeights_Destroy( void* dvcWeights, void* data );
void _DVCWeights_Calculate( void* dvcWeights, void* _swarm, Cell_LocalIndex lCell_I ) ;
diff -r fbc66183146f -r 3f8450183c04 Weights/src/IterativeWeights.c
--- a/Weights/src/IterativeWeights.c Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/IterativeWeights.c Wed Nov 25 16:25:21 2009 +1100
@@ -148,7 +148,7 @@ void* _IterativeWeights_DefaultNew( Name
_IterativeWeights_Build,
_IterativeWeights_Initialise,
_IterativeWeights_Execute,
- NULL,
+ _IterativeWeights_Destroy,
name,
NON_GLOBAL,
_IterativeWeights_Calculate,
@@ -177,17 +177,26 @@ void _IterativeWeights_Build( void* iter
void _IterativeWeights_Build( void* iterativeWeights, void* data ) {
IterativeWeights* self = (IterativeWeights*)iterativeWeights;
+ Stg_Component_Build( self->initialWeights, data, False );
_ConstantWeights_Build( self, data );
}
void _IterativeWeights_Initialise( void* iterativeWeights, void* data ) {
IterativeWeights* self = (IterativeWeights*)iterativeWeights;
-
+
+ Stg_Component_Initialise( self->initialWeights, data, False );
_ConstantWeights_Initialise( self, data );
}
void _IterativeWeights_Execute( void* iterativeWeights, void* data ) {
IterativeWeights* self = (IterativeWeights*)iterativeWeights;
_ConstantWeights_Execute( self, data );
+}
+void _IterativeWeights_Destroy( void* iterativeWeights, void* data ) {
+ IterativeWeights* self = (IterativeWeights*)iterativeWeights;
+
+ if (self->freeInitialWeights )
+ Stg_Component_Destroy( self->initialWeights, data, False );
+ _ConstantWeights_Destroy( self, data );
}
/*-------------------------------------------------------------------------------------------------------------------------
diff -r fbc66183146f -r 3f8450183c04 Weights/src/IterativeWeights.h
--- a/Weights/src/IterativeWeights.h Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/IterativeWeights.h Wed Nov 25 16:25:21 2009 +1100
@@ -102,7 +102,7 @@ void _IterativeWeights_Build( void* iter
void _IterativeWeights_Build( void* iterativeWeights, void* data ) ;
void _IterativeWeights_Initialise( void* iterativeWeights, void* data ) ;
void _IterativeWeights_Execute( void* iterativeWeights, void* data );
-
+void _IterativeWeights_Destroy( void* iterativeWeights, void* data );
void _IterativeWeights_Calculate( void* iterativeWeights, void* _swarm, Cell_LocalIndex lCell_I ) ;
/*---------------------------------------------------------------------------------------------------------------------
diff -r fbc66183146f -r 3f8450183c04 Weights/src/MomentBalanceWeights.c
--- a/Weights/src/MomentBalanceWeights.c Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/MomentBalanceWeights.c Wed Nov 25 16:25:21 2009 +1100
@@ -108,14 +108,10 @@ void _MomentBalanceWeights_Init( void* m
void _MomentBalanceWeights_Delete( void* momentBalanceWeights ) {
MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
-
- if ( self->freeBackupWeights )
- Stg_Class_Delete( self->backupWeights );
/* Delete parent */
_WeightsCalculator_Delete( self );
}
-
void _MomentBalanceWeights_Print( void* momentBalanceWeights, Stream* stream ) {
MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
@@ -145,7 +141,7 @@ void* _MomentBalanceWeights_DefaultNew(
_MomentBalanceWeights_Build,
_MomentBalanceWeights_Initialise,
_MomentBalanceWeights_Execute,
- NULL,
+ _MomentBalanceWeights_Destroy,
name,
NON_GLOBAL,
_MomentBalanceWeights_Calculate,
@@ -165,18 +161,27 @@ void _MomentBalanceWeights_AssignFromXML
void _MomentBalanceWeights_Build( void* momentBalanceWeights, void* data ) {
MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
-
+
+ Stg_Component_Build( self->backupWeights, data, False );
_WeightsCalculator_Build( self, data );
}
void _MomentBalanceWeights_Initialise( void* momentBalanceWeights, void* data ) {
MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
-
+
+ Stg_Component_Initialise( self->backupWeights, data, False );
_WeightsCalculator_Initialise( self, data );
}
void _MomentBalanceWeights_Execute( void* momentBalanceWeights, void* data ) {
MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
_WeightsCalculator_Execute( self, data );
+}
+void _MomentBalanceWeights_Destroy( void* momentBalanceWeights, void* data ) {
+ MomentBalanceWeights* self = (MomentBalanceWeights*)momentBalanceWeights;
+
+ if ( self->freeBackupWeights )
+ Stg_Component_Destroy( self->backupWeights, data, False );
+ _WeightsCalculator_Destroy( self, data );
}
diff -r fbc66183146f -r 3f8450183c04 Weights/src/MomentBalanceWeights.h
--- a/Weights/src/MomentBalanceWeights.h Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/MomentBalanceWeights.h Wed Nov 25 16:25:21 2009 +1100
@@ -105,6 +105,8 @@ extern const Type MomentBalanceWeights_T
void _MomentBalanceWeights_Initialise( void* momentBalanceWeights, void* data );
+ void _MomentBalanceWeights_Destroy( void* momentBalanceWeights, void* data );
+
void _MomentBalanceWeights_Execute( void* momentBalanceWeights, void* data );
void _MomentBalanceWeights_Calculate( void* momentBalanceWeights, void* _swarm, Cell_LocalIndex lCell_I );
diff -r fbc66183146f -r 3f8450183c04 Weights/src/VolumeWeights.c
--- a/Weights/src/VolumeWeights.c Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/VolumeWeights.c Wed Nov 25 16:25:21 2009 +1100
@@ -114,7 +114,7 @@ void* _VolumeWeights_DefaultNew( Name na
_VolumeWeights_Build,
_VolumeWeights_Initialise,
_VolumeWeights_Execute,
- NULL,
+ _VolumeWeights_Destroy,
name,
NON_GLOBAL,
_VolumeWeights_Calculate,
@@ -144,17 +144,28 @@ void _VolumeWeights_Build( void* weights
void _VolumeWeights_Build( void* weights, void* data ) {
VolumeWeights* self = (VolumeWeights*)weights;
+ Stg_Component_Build( self->shape, data, False );
+ Stg_Component_Build( self->mesh, data, False );
_WeightsCalculator_Build( self, data );
}
void _VolumeWeights_Initialise( void* weights, void* data ) {
VolumeWeights* self = (VolumeWeights*)weights;
-
+
+ Stg_Component_Initialise( self->shape, data, False );
+ Stg_Component_Initialise( self->mesh, data, False );
_WeightsCalculator_Initialise( self, data );
}
void _VolumeWeights_Execute( void* weights, void* data ) {
VolumeWeights* self = (VolumeWeights*)weights;
_WeightsCalculator_Execute( self, data );
+}
+void _VolumeWeights_Destroy( void* weights, void* data ) {
+ VolumeWeights* self = (VolumeWeights*)weights;
+
+ Stg_Component_Destroy( self->shape, data, False );
+ Stg_Component_Destroy( self->mesh, data, False );
+ _WeightsCalculator_Destroy( self, data );
}
/*-------------------------------------------------------------------------------------------------------------------------
diff -r fbc66183146f -r 3f8450183c04 Weights/src/VolumeWeights.h
--- a/Weights/src/VolumeWeights.h Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/VolumeWeights.h Wed Nov 25 16:25:21 2009 +1100
@@ -79,7 +79,7 @@ void _VolumeWeights_Build( void* weights
void _VolumeWeights_Build( void* weights, void* data ) ;
void _VolumeWeights_Initialise( void* weights, void* data ) ;
void _VolumeWeights_Execute( void* weights, void* data );
-
+void _VolumeWeights_Destroy( void* weights, void* data );
void _VolumeWeights_Calculate( void* weights, void* _swarm, Cell_LocalIndex lCell_I ) ;
diff -r fbc66183146f -r 3f8450183c04 Weights/src/WeightsCalculator.c
--- a/Weights/src/WeightsCalculator.c Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/WeightsCalculator.c Wed Nov 25 16:25:21 2009 +1100
@@ -133,6 +133,12 @@ void _WeightsCalculator_Build( void* wei
/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
}
+
+void _WeightsCalculator_Destroy( void* weightsCalculator, void* data ) {
+/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
+}
+
+
void _WeightsCalculator_Initialise( void* weightsCalculator, void* data ) {
/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
diff -r fbc66183146f -r 3f8450183c04 Weights/src/WeightsCalculator.h
--- a/Weights/src/WeightsCalculator.h Wed Nov 25 11:13:14 2009 +1100
+++ b/Weights/src/WeightsCalculator.h Wed Nov 25 16:25:21 2009 +1100
@@ -101,6 +101,7 @@ extern const Type WeightsCalculator_Type
void _WeightsCalculator_AssignFromXML( void* self, Stg_ComponentFactory* cf, void* data ) ;
void _WeightsCalculator_Build( void* self, void* data ) ;
+ void _WeightsCalculator_Destroy( void* self, void* data ) ;
void _WeightsCalculator_Initialise( void* self, void* data ) ;
void _WeightsCalculator_Execute( void* self, void* data );
More information about the CIG-COMMITS
mailing list