[cig-commits] commit: Rejiged this SwarmVariable child.
Mercurial
hg at geodynamics.org
Mon Feb 1 15:30:46 PST 2010
changeset: 323:7232ccb8eefd
branch: pcu_rejig
parent: 321:d49cc2534020
user: JericoRevote
date: Fri Nov 20 15:53:11 2009 +1100
files: Utils/src/MaterialSwarmVariable.c Utils/src/MaterialSwarmVariable.h
description:
Rejiged this SwarmVariable child.
diff -r d49cc2534020 -r 7232ccb8eefd Utils/src/MaterialSwarmVariable.c
--- a/Utils/src/MaterialSwarmVariable.c Fri Nov 20 11:55:33 2009 +1100
+++ b/Utils/src/MaterialSwarmVariable.c Fri Nov 20 15:53:11 2009 +1100
@@ -61,98 +61,69 @@ const Type MaterialSwarmVariable_Type =
const Type MaterialSwarmVariable_Type = "MaterialSwarmVariable";
MaterialSwarmVariable* MaterialSwarmVariable_New(
- Name name,
- AbstractContext* context,
- MaterialPointsSwarm* swarm,
- Index dofCount,
- Materials_Register* materials_Register,
- ExtensionInfo_Index materialExtensionHandle,
- SizeT offset )
+ Name name,
+ AbstractContext* context,
+ MaterialPointsSwarm* swarm,
+ Index dofCount,
+ Materials_Register* materials_Register,
+ ExtensionInfo_Index materialExtensionHandle,
+ SizeT offset )
{
MaterialSwarmVariable* self = (MaterialSwarmVariable*) _MaterialSwarmVariable_DefaultNew( name );
- MaterialSwarmVariable_InitAll(
- self,
- context,
- swarm,
- dofCount,
- materials_Register,
- materialExtensionHandle,
- offset );
+ self->isConstructed = True;
+ _SwarmVariable_Init( (SwarmVariable*)self, context, (Swarm*)swarm, NULL, dofCount );
+ _MaterialSwarmVariable_Init( self, materials_Register, materialExtensionHandle, offset );
return self;
}
+void* _MaterialSwarmVariable_DefaultNew( Name name ) {
+ return (void*)_MaterialSwarmVariable_New(
+ sizeof(MaterialSwarmVariable),
+ MaterialSwarmVariable_Type,
+ _MaterialSwarmVariable_Delete,
+ _MaterialSwarmVariable_Print,
+ NULL,
+ _MaterialSwarmVariable_DefaultNew,
+ _MaterialSwarmVariable_AssignFromXML,
+ _MaterialSwarmVariable_Build,
+ _MaterialSwarmVariable_Initialise,
+ _MaterialSwarmVariable_Execute,
+ _MaterialSwarmVariable_Destroy,
+ name,
+ NON_GLOBAL,
+ _MaterialSwarmVariable_ValueAt,
+ _MaterialSwarmVariable_GetMinGlobalMagnitude,
+ _MaterialSwarmVariable_GetMaxGlobalMagnitude );
+}
+
/* Creation implementation / Virtual constructor */
-MaterialSwarmVariable* _MaterialSwarmVariable_New(
- SizeT sizeOfSelf,
- Type type,
- Stg_Class_DeleteFunction* _delete,
- Stg_Class_PrintFunction* _print,
- Stg_Class_CopyFunction* _copy,
- Stg_Component_DefaultConstructorFunction* _defaultConstructor,
- Stg_Component_ConstructFunction* _construct,
- Stg_Component_BuildFunction* _build,
- Stg_Component_InitialiseFunction* _initialise,
- Stg_Component_ExecuteFunction* _execute,
- Stg_Component_DestroyFunction* _destroy,
- SwarmVariable_ValueAtFunction* _valueAt,
- SwarmVariable_GetGlobalValueFunction* _getMinGlobalMagnitude,
- SwarmVariable_GetGlobalValueFunction* _getMaxGlobalMagnitude,
- Name name )
-{
+MaterialSwarmVariable* _MaterialSwarmVariable_New( MATERIALSWARMVARIABLE_DEFARGS ) {
MaterialSwarmVariable* self;
/* Allocate memory */
assert( sizeOfSelf >= sizeof(MaterialSwarmVariable) );
- self = (MaterialSwarmVariable*) _SwarmVariable_New(
- sizeOfSelf,
- type,
- _delete,
- _print,
- _copy,
- _defaultConstructor,
- _construct,
- _build,
- _initialise,
- _execute,
- _destroy,
- _valueAt,
- _getMinGlobalMagnitude,
- _getMaxGlobalMagnitude,
- name );
+ self = (MaterialSwarmVariable*) _SwarmVariable_New( SWARMVARIABLE_PASSARGS );
/* Virtual info */
return self;
}
-void _MaterialSwarmVariable_Init(
- MaterialSwarmVariable* self,
- Materials_Register* materials_Register,
- ExtensionInfo_Index materialExtensionHandle,
- SizeT offset )
+void _MaterialSwarmVariable_Init(
+ void* swarmVariable,
+ Materials_Register* materials_Register,
+ ExtensionInfo_Index materialExtensionHandle,
+ SizeT offset )
{
+ MaterialSwarmVariable* self = (MaterialSwarmVariable*)swarmVariable;
+
self->materials_Register = materials_Register;
self->materialExtensionHandle = materialExtensionHandle;
self->offset = offset;
/* variable does not store data, so is not checkpointed */
self->isCheckpointedAndReloaded = False;
-}
-
-void MaterialSwarmVariable_InitAll(
- void* swarmVariable,
- AbstractContext* context,
- MaterialPointsSwarm* swarm,
- Index dofCount,
- Materials_Register* materials_Register,
- ExtensionInfo_Index materialExtensionHandle,
- SizeT offset )
-{
- MaterialSwarmVariable* self = (MaterialSwarmVariable*) swarmVariable;
-
- _SwarmVariable_Init( (SwarmVariable*)self, context, (Swarm*)swarm, NULL, dofCount );
- _MaterialSwarmVariable_Init( self, materials_Register, materialExtensionHandle, offset );
}
void _MaterialSwarmVariable_Delete( void* swarmVariable ) {
@@ -172,29 +143,10 @@ void _MaterialSwarmVariable_Print( void*
Journal_PrintValue( stream, self->offset );
}
-void* _MaterialSwarmVariable_DefaultNew( Name name ) {
- return (void*)_MaterialSwarmVariable_New(
- sizeof(MaterialSwarmVariable),
- MaterialSwarmVariable_Type,
- _MaterialSwarmVariable_Delete,
- _MaterialSwarmVariable_Print,
- NULL,
- _MaterialSwarmVariable_DefaultNew,
- _MaterialSwarmVariable_AssignFromXML,
- _MaterialSwarmVariable_Build,
- _MaterialSwarmVariable_Initialise,
- _MaterialSwarmVariable_Execute,
- _MaterialSwarmVariable_Destroy,
- _MaterialSwarmVariable_ValueAt,
- _MaterialSwarmVariable_GetMinGlobalMagnitude,
- _MaterialSwarmVariable_GetMaxGlobalMagnitude,
- name );
-}
-
void _MaterialSwarmVariable_AssignFromXML( void* swarmVariable, Stg_ComponentFactory* cf, void* data ) {
- MaterialSwarmVariable* self = (MaterialSwarmVariable*)swarmVariable;
- Materials_Register* materials_Register;
- PICelleratorContext* context = (PICelleratorContext*)self->context;
+ MaterialSwarmVariable* self = (MaterialSwarmVariable*)swarmVariable;
+ Materials_Register* materials_Register;
+ PICelleratorContext* context = (PICelleratorContext*)self->context;
/* Construct Parent */
_SwarmVariable_AssignFromXML( self, cf, data );
@@ -208,7 +160,7 @@ void _MaterialSwarmVariable_AssignFromXM
}
void _MaterialSwarmVariable_Build( void* swarmVariable, void* data ) {
- MaterialSwarmVariable* self = (MaterialSwarmVariable*)swarmVariable;
+ MaterialSwarmVariable* self = (MaterialSwarmVariable*)swarmVariable;
_SwarmVariable_Build( self, data );
}
@@ -222,12 +174,14 @@ void _MaterialSwarmVariable_Execute( voi
}
void _MaterialSwarmVariable_Destroy( void* swarmVariable, void* data ) {
- _SwarmVariable_Destroy( swarmVariable, data );
+ MaterialSwarmVariable* self = (MaterialSwarmVariable*) swarmVariable;
+
+ _SwarmVariable_Destroy( self, data );
}
void _MaterialSwarmVariable_ValueAt( void* swarmVariable, Particle_Index lParticle_I, double* value ) {
- MaterialSwarmVariable* self = (MaterialSwarmVariable*) swarmVariable;
- MaterialPointsSwarm* swarm = (MaterialPointsSwarm*)self->swarm;
+ MaterialSwarmVariable* self = (MaterialSwarmVariable*) swarmVariable;
+ MaterialPointsSwarm* swarm = (MaterialPointsSwarm*)self->swarm;
Material* material;
ArithPointer materialExt;
diff -r d49cc2534020 -r 7232ccb8eefd Utils/src/MaterialSwarmVariable.h
--- a/Utils/src/MaterialSwarmVariable.h Fri Nov 20 11:55:33 2009 +1100
+++ b/Utils/src/MaterialSwarmVariable.h Fri Nov 20 15:53:11 2009 +1100
@@ -53,59 +53,55 @@
__SwarmVariable \
/* Virtual info */ \
/* MaterialSwarmVariable info */ \
- Materials_Register* materials_Register; \
- ExtensionInfo_Index materialExtensionHandle; \
- SizeT offset;
+ Materials_Register* materials_Register; \
+ ExtensionInfo_Index materialExtensionHandle; \
+ SizeT offset;
struct MaterialSwarmVariable { __MaterialSwarmVariable };
+ #define MATERIALSWARMVARIABLE_DEFARGS \
+ SWARMVARIABLE_DEFARGS
+
+ #define MATERIALSWARMVARIABLE_PASSARGS \
+ SWARMVARIABLE_PASSARGS
+
MaterialSwarmVariable* MaterialSwarmVariable_New(
- Name name,
- AbstractContext* context,
- MaterialPointsSwarm* swarm,
- Index dofCount,
- Materials_Register* materials_Register,
- ExtensionInfo_Index materialExtensionHandle,
- SizeT offset );
+ Name name,
+ AbstractContext* context,
+ MaterialPointsSwarm* swarm,
+ Index dofCount,
+ Materials_Register* materials_Register,
+ ExtensionInfo_Index materialExtensionHandle,
+ SizeT offset );
- MaterialSwarmVariable* _MaterialSwarmVariable_New(
- SizeT sizeOfSelf,
- Type type,
- Stg_Class_DeleteFunction* _delete,
- Stg_Class_PrintFunction* _print,
- Stg_Class_CopyFunction* _copy,
- Stg_Component_DefaultConstructorFunction* _defaultConstructor,
- Stg_Component_ConstructFunction* _construct,
- Stg_Component_BuildFunction* _build,
- Stg_Component_InitialiseFunction* _initialise,
- Stg_Component_ExecuteFunction* _execute,
- Stg_Component_DestroyFunction* _destroy,
- SwarmVariable_ValueAtFunction* _valueAt,
- SwarmVariable_GetGlobalValueFunction* _getMinGlobalMagnitude,
- SwarmVariable_GetGlobalValueFunction* _getMaxGlobalMagnitude,
- Name name );
+ MaterialSwarmVariable* _MaterialSwarmVariable_New( MATERIALSWARMVARIABLE_DEFARGS );
- void MaterialSwarmVariable_InitAll(
- void* swarmVariable,
- AbstractContext* context,
- MaterialPointsSwarm* swarm,
- Index dofCount,
- Materials_Register* materials_Register,
- ExtensionInfo_Index materialExtensionHandle,
- SizeT offset );
+ void _MaterialSwarmVariable_Init(
+ void* swarmVariable,
+ Materials_Register* materials_Register,
+ ExtensionInfo_Index materialExtensionHandle,
+ SizeT offset );
void _MaterialSwarmVariable_Delete( void* swarmVariable );
+
void _MaterialSwarmVariable_Print( void* swarmVariable, Stream* stream );
- void* _MaterialSwarmVariable_DefaultNew( Name name ) ;
-void _MaterialSwarmVariable_AssignFromXML( void* swarmVariable, Stg_ComponentFactory* cf, void* data ) ;
- void _MaterialSwarmVariable_Build( void* swarmVariable, void* data ) ;
- void _MaterialSwarmVariable_Initialise( void* swarmVariable, void* data ) ;
- void _MaterialSwarmVariable_Execute( void* swarmVariable, void* data ) ;
- void _MaterialSwarmVariable_Destroy( void* swarmVariable, void* data ) ;
+ void* _MaterialSwarmVariable_DefaultNew( Name name );
- void _MaterialSwarmVariable_ValueAt( void* swarmVariable, Particle_Index lParticle_I, double* value ) ;
- double _MaterialSwarmVariable_GetMinGlobalMagnitude( void* swarmVariable ) ;
- double _MaterialSwarmVariable_GetMaxGlobalMagnitude( void* swarmVariable ) ;
+ void _MaterialSwarmVariable_AssignFromXML( void* swarmVariable, Stg_ComponentFactory* cf, void* data );
+
+ void _MaterialSwarmVariable_Build( void* swarmVariable, void* data );
+
+ void _MaterialSwarmVariable_Initialise( void* swarmVariable, void* data );
+
+ void _MaterialSwarmVariable_Execute( void* swarmVariable, void* data );
+
+ void _MaterialSwarmVariable_Destroy( void* swarmVariable, void* data );
+
+ void _MaterialSwarmVariable_ValueAt( void* swarmVariable, Particle_Index lParticle_I, double* value );
+
+ double _MaterialSwarmVariable_GetMinGlobalMagnitude( void* swarmVariable );
+
+ double _MaterialSwarmVariable_GetMaxGlobalMagnitude( void* swarmVariable );
#endif
More information about the CIG-COMMITS
mailing list