[cig-commits] r5377 - in long/3D/Gale/trunk: .
src/PICellerator/Utils/src
walter at geodynamics.org
walter at geodynamics.org
Wed Nov 29 10:08:26 PST 2006
Author: walter
Date: 2006-11-29 10:08:26 -0800 (Wed, 29 Nov 2006)
New Revision: 5377
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c
long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.h
Log:
r1122 at earth: boo | 2006-11-29 01:43:21 -0800
get rid of extraneous swarm and material stuff in stress BC (although ForceTerm requires a swarm)
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1121
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1122
Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c 2006-11-29 18:08:18 UTC (rev 5376)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c 2006-11-29 18:08:26 UTC (rev 5377)
@@ -69,9 +69,7 @@
Name name,
ForceVector* forceVector,
Swarm* integrationSwarm,
- double force,
- Bool adjust,
- Materials_Register* materials_Register )
+ double force )
{
StressBC* self = (StressBC*) _StressBC_DefaultNew( name );
@@ -79,9 +77,7 @@
self,
forceVector,
integrationSwarm,
- force,
- adjust,
- materials_Register );
+ force );
return self;
}
@@ -130,13 +126,9 @@
void _StressBC_Init(
StressBC* self,
- double force,
- Bool adjust,
- Materials_Register* materials_Register )
+ double force )
{
self->force = force;
- self->adjust = adjust;
- self->materials_Register = materials_Register;
}
@@ -144,27 +136,18 @@
void* forceTerm,
ForceVector* forceVector,
Swarm* integrationSwarm,
- double force,
- Bool adjust,
- Materials_Register* materials_Register )
+ double force )
{
StressBC* self = (StressBC*) forceTerm;
ForceTerm_InitAll( self, forceVector, integrationSwarm, NULL );
- _StressBC_Init( self, force, adjust, materials_Register );
+ _StressBC_Init( self, force );
}
void _StressBC_Delete( void* forceTerm ) {
StressBC* self = (StressBC*)forceTerm;
Index i;
- for ( i = 0; i < self->materialSwarmCount; ++i ) {
- Stg_Class_Delete( self->densitySwarmVariables[i] );
- Stg_Class_Delete( self->alphaSwarmVariables[i] );
- }
- Stg_Class_Delete( self->densitySwarmVariables );
- Stg_Class_Delete( self->alphaSwarmVariables );
-
_ForceTerm_Delete( self );
}
@@ -198,79 +181,20 @@
void _StressBC_Construct( void* forceTerm, Stg_ComponentFactory* cf, void* data ) {
StressBC* self = (StressBC*)forceTerm;
double force;
- Bool adjust;
- Materials_Register* materials_Register;
/* Construct Parent */
_ForceTerm_Construct( self, cf, data );
force = Stg_ComponentFactory_GetDouble( cf, self->name, "force", 0.0 );
- adjust = Stg_ComponentFactory_GetBool( cf, self->name, "adjust", False );
- materials_Register = Stg_ObjectList_Get( cf->registerRegister, "Materials_Register" );
- assert( materials_Register );
-
- _StressBC_Init( self, force, adjust, materials_Register );
+ _StressBC_Init( self, force );
}
void _StressBC_Build( void* forceTerm, void* data ) {
StressBC* self = (StressBC*)forceTerm;
- StressBC_MaterialExt* materialExt;
- Material_Index material_I;
- Material* material;
- Materials_Register* materials_Register = self->materials_Register;
- IntegrationPointsSwarm* swarm = (IntegrationPointsSwarm*)self->integrationSwarm;
- MaterialPointsSwarm** materialSwarms;
- Index materialSwarm_I;
Name name;
_ForceTerm_Build( self, data );
-
- /* Sort out material extension stuff */
- self->materialExtHandle = Materials_Register_AddMaterialExtension(
- self->materials_Register,
- self->type,
- sizeof(StressBC_MaterialExt) );
- for ( material_I = 0 ; material_I < Materials_Register_GetCount( materials_Register ) ; material_I++) {
- material = Materials_Register_GetByIndex( materials_Register, material_I );
- materialExt = ExtensionManager_GetFunc( material->extensionMgr, material, self->materialExtHandle );
-
- materialExt->density = Dictionary_GetDouble_WithDefault( material->dictionary, "density", 0.0 );
- materialExt->alpha = Dictionary_GetDouble_WithDefault( material->dictionary, "alpha", 0.0 );
- }
-
- /* Create Swarm Variables of each material swarm this ip swarm is mapped against */
- materialSwarms = IntegrationPointMapper_GetMaterialPointsSwarms( swarm->mapper, &(self->materialSwarmCount) );
- self->densitySwarmVariables = Memory_Alloc_Array( MaterialSwarmVariable*, self->materialSwarmCount, "DensityVariables" );
- self->alphaSwarmVariables = Memory_Alloc_Array( MaterialSwarmVariable*, self->materialSwarmCount, "AlphaVariables" );
-
- for ( materialSwarm_I = 0; materialSwarm_I < self->materialSwarmCount; ++materialSwarm_I ) {
- name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Density" );
- self->densitySwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
- name,
- materialSwarms[materialSwarm_I],
- 1,
- self->materials_Register,
- self->materialExtHandle,
- GetOffsetOfMember( *materialExt, density ) );
- Memory_Free( name );
-
- name = Stg_Object_AppendSuffix( materialSwarms[materialSwarm_I], "Alpha" );
- self->alphaSwarmVariables[materialSwarm_I] = MaterialSwarmVariable_New(
- name,
- materialSwarms[materialSwarm_I],
- 1,
- self->materials_Register,
- self->materialExtHandle,
- GetOffsetOfMember( *materialExt, alpha ) );
- Memory_Free( name );
-
- /* Build new Swarm Variables */
- Stg_Component_Build( self->densitySwarmVariables[materialSwarm_I], data, False );
- Stg_Component_Build( self->alphaSwarmVariables[materialSwarm_I], data, False );
- }
-
-
}
void _StressBC_Initialise( void* forceTerm, void* data ) {
@@ -279,10 +203,6 @@
_ForceTerm_Initialise( self, data );
- for ( i = 0; i < self->materialSwarmCount; ++i ) {
- Stg_Component_Initialise( self->densitySwarmVariables[i], data, False );
- Stg_Component_Initialise( self->alphaSwarmVariables[i], data, False );
- }
}
void _StressBC_Execute( void* forceTerm, void* data ) {
Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.h
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.h 2006-11-29 18:08:18 UTC (rev 5376)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.h 2006-11-29 18:08:26 UTC (rev 5377)
@@ -55,11 +55,6 @@
/** Textual name of this class */
extern const Type StressBC_Type;
- typedef struct {
- double alpha;
- double density;
- } StressBC_MaterialExt;
-
/** StressBC class contents */
#define __StressBC \
/* General info */ \
@@ -70,22 +65,15 @@
\
/* StressBC info */ \
double force; \
- Bool adjust; \
- Materials_Register* materials_Register; \
- ExtensionInfo_Index materialExtHandle; \
- MaterialSwarmVariable** densitySwarmVariables; \
- MaterialSwarmVariable** alphaSwarmVariables; \
- Index materialSwarmCount;
+
struct StressBC { __StressBC };
StressBC* StressBC_New(
Name name,
ForceVector* forceVector,
Swarm* integrationSwarm,
- double force,
- Bool adjust,
- Materials_Register* materials_Register );
+ double force );
StressBC* _StressBC_New(
SizeT sizeOfSelf,
@@ -107,9 +95,7 @@
void* forceTerm,
ForceVector* forceVector,
Swarm* integrationSwarm,
- double force,
- Bool adjust,
- Materials_Register* materials_Register );
+ double force );
void _StressBC_Delete( void* forceTerm );
void _StressBC_Print( void* forceTerm, Stream* stream );
More information about the cig-commits
mailing list