[cig-commits] r13647 - in long/3D/Gale/trunk: . input/examples src/PICellerator/Utils/src src/StgFEM/plugins/StandardConditionFunctions
walter at geodynamics.org
walter at geodynamics.org
Thu Dec 11 01:30:01 PST 2008
Author: walter
Date: 2008-12-11 01:30:01 -0800 (Thu, 11 Dec 2008)
New Revision: 13647
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/examples/tibet.xml
long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c
long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.h
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h
Log:
r2409 at dante: boo | 2008-12-11 01:28:06 -0800
Remove all BackgroundDensity stuff
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2408
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2409
Modified: long/3D/Gale/trunk/input/examples/tibet.xml
===================================================================
--- long/3D/Gale/trunk/input/examples/tibet.xml 2008-12-11 09:29:58 UTC (rev 13646)
+++ long/3D/Gale/trunk/input/examples/tibet.xml 2008-12-11 09:30:01 UTC (rev 13647)
@@ -117,31 +117,6 @@
<param name="LinkedDofInfo">pressureLinkedDofs</param>
</struct>
- <struct name="backgroundDensity">
- <param name="Type">MeshVariable</param>
- <param name="mesh">mesh-linear</param>
- <param name="Rank">Scalar</param>
- <param name="DataType">Double</param>
- </struct>
- <struct name="backgroundDensityICs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="backgroundDensityDofLayout">
- <param name="Type">DofLayout</param>
- <param name="mesh">mesh-linear</param>
- <list name="BaseVariables">
- <param>backgroundDensity</param>
- </list>
- </struct>
- <struct name="BackgroundDensityField">
- <param name="Type">FeVariable</param>
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">backgroundDensityDofLayout</param>
- <param name="LinkedDofInfo">backgroundDensityLinkedDofs</param>
- <param name="IC">backgroundDensityICs</param>
- </struct>
-
<struct name="backgroundPressure">
<param name="Type">MeshVariable</param>
<param name="mesh">mesh-linear</param>
@@ -373,7 +348,6 @@
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
<param name="TemperatureField">TemperatureField</param>
- <param name="BackgroundDensityField">BackgroundDensityField</param>
<param name="Swarm">picIntegrationPoints</param>
<param name="gravity">gravity</param>
</struct>
@@ -902,22 +876,6 @@
</list>
</struct>
- <struct name="backgroundDensityICs">
- <param name="type">CompositeVC</param>
- <list name="vcList">
- <struct>
- <param name="type">AllNodesVC</param>
- <list name="variables">
- <struct>
- <param name="name">backgroundDensity</param>
- <param name="type">func</param>
- <param name="value">DensityProfile</param>
- </struct>
- </list>
- </struct>
- </list>
- </struct>
-
<struct name="backgroundPressureICs">
<param name="type">CompositeVC</param>
<list name="vcList">
Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c 2008-12-11 09:29:58 UTC (rev 13646)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c 2008-12-11 09:30:01 UTC (rev 13647)
@@ -105,7 +105,6 @@
ForceVector* forceVector,
Swarm* integrationSwarm,
FeVariable* temperatureField,
- FeVariable* densityField,
double gravity,
Bool adjust,
Materials_Register* materials_Register )
@@ -117,7 +116,6 @@
forceVector,
integrationSwarm,
temperatureField,
- densityField,
gravity,
adjust,
materials_Register );
@@ -170,13 +168,11 @@
void _BuoyancyForceTerm_Init(
BuoyancyForceTerm* self,
FeVariable* temperatureField,
- FeVariable* densityField,
double gravity,
Bool adjust,
Materials_Register* materials_Register )
{
self->temperatureField = temperatureField;
- self->densityField = densityField;
self->gravity = gravity;
self->gHat = NULL;
self->adjust = adjust;
@@ -188,7 +184,6 @@
ForceVector* forceVector,
Swarm* integrationSwarm,
FeVariable* temperatureField,
- FeVariable* densityField,
double gravity,
Bool adjust,
Materials_Register* materials_Register )
@@ -196,7 +191,7 @@
BuoyancyForceTerm* self = (BuoyancyForceTerm*) forceTerm;
ForceTerm_InitAll( self, forceVector, integrationSwarm, NULL );
- _BuoyancyForceTerm_Init( self, temperatureField, densityField,
+ _BuoyancyForceTerm_Init( self, temperatureField,
gravity, adjust, materials_Register );
}
@@ -222,7 +217,6 @@
/* General info */
Journal_PrintPointer( stream, self->temperatureField );
- Journal_PrintPointer( stream, self->densityField );
Journal_PrintDouble( stream, self->gravity );
}
@@ -249,7 +243,7 @@
Dictionary* dict;
Dictionary_Entry_Value* tmp;
char* rootKey;
- FeVariable *temperatureField, *densityField;
+ FeVariable *temperatureField;
double gravity;
Bool adjust;
Materials_Register* materials_Register;
@@ -263,8 +257,6 @@
dict = Dictionary_Entry_Value_AsDictionary( Dictionary_Get( cf->componentDict, self->name ) );
temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TemperatureField", FeVariable, False, data ) ;
- densityField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "BackgroundDensityField",
- FeVariable, False, data ) ;
gravity = Stg_ComponentFactory_GetDouble( cf, self->name, "gravity", 0.0 );
adjust = Stg_ComponentFactory_GetBool( cf, self->name, "adjust", False );
@@ -291,7 +283,7 @@
materials_Register = Stg_ObjectList_Get( cf->registerRegister, "Materials_Register" );
assert( materials_Register );
- _BuoyancyForceTerm_Init( self, temperatureField, densityField,
+ _BuoyancyForceTerm_Init( self, temperatureField,
gravity, adjust, materials_Register );
}
@@ -310,8 +302,6 @@
if ( self->temperatureField )
Stg_Component_Build( self->temperatureField, data, False );
- if ( self->densityField )
- Stg_Component_Build( self->densityField, data, False );
/* Sort out material extension stuff */
self->materialExtHandle = Materials_Register_AddMaterialExtension(
@@ -366,8 +356,6 @@
if ( self->temperatureField )
Stg_Component_Initialise( self->temperatureField, data, False );
- if ( self->densityField )
- Stg_Component_Initialise( self->densityField, data, False );
for ( i = 0; i < self->materialSwarmCount; ++i ) {
Stg_Component_Initialise( self->densitySwarmVariables[i], data, False );
@@ -407,7 +395,6 @@
Material* material;
FeVariable* temperatureField = self->temperatureField;
double temperature = 0.0;
- double *densityField = self->densityField;
double background_density = 0.0;
double* gHat;
unsigned d_i;
@@ -455,8 +442,6 @@
/* Get parameters */
if ( temperatureField )
FeVariable_InterpolateWithinElement( temperatureField, lElement_I, xi, &temperature );
-/* if(densityField) */
-/* FeVariable_InterpolateWithinElement( densityField, lElement_I, xi, &background_density ); */
FeMesh_CoordLocalToGlobal(mesh, cell_I, xi, coord);
background_density=DensityFunction(coord);
Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.h
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.h 2008-12-11 09:29:58 UTC (rev 13646)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.h 2008-12-11 09:30:01 UTC (rev 13647)
@@ -68,7 +68,6 @@
\
/* BuoyancyForceTerm info */ \
FeVariable* temperatureField; \
- FeVariable* densityField; \
double gravity; \
double* gHat; \
Bool adjust; \
@@ -85,7 +84,6 @@
ForceVector* forceVector,
Swarm* integrationSwarm,
FeVariable* temperatureField,
- FeVariable* densityField,
double gravity,
Bool adjust,
Materials_Register* materials_Register );
@@ -111,7 +109,6 @@
ForceVector* forceVector,
Swarm* integrationSwarm,
FeVariable* temperatureField,
- FeVariable* densityField,
double gravity,
Bool adjust,
Materials_Register* materials_Register );
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2008-12-11 09:29:58 UTC (rev 13646)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2008-12-11 09:30:01 UTC (rev 13647)
@@ -134,9 +134,6 @@
condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_PressureProfile, "PressureProfile");
ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
- condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_DensityProfile, "DensityProfile");
- ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
-
condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_Gaussian, "Gaussian");
ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
@@ -1530,55 +1527,9 @@
+ PressureProfile_Analytic(lower_density, gravity,h,
lower_alpha, T_0, A, B, C);
}
-
-/* printf("pressure %d %g %g %g %g %g\n",node_lI,coord[1],h, */
-/* material_boundary, */
-
}
}
-void StgFEM_StandardConditionFunctions_DensityProfile( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
- FiniteElementContext * context = (FiniteElementContext*)_context;
- FeVariable* feVariable = NULL;
- FeMesh* mesh = NULL;
- Dictionary* dictionary = context->dictionary;
- double* result = (double*) _result;
- double* coord;
- double upper_density, lower_density, upper_alpha, lower_alpha, y_max,
- material_boundary;
-
- feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
- mesh = feVariable->feMesh;
- coord = Mesh_GetVertex( mesh, node_lI );
-
- y_max = Dictionary_GetDouble_WithDefault( dictionary, "maxY", 0.0 );
- upper_density=Dictionary_GetDouble_WithDefault(dictionary,"upperDensity",0.0);
-
- lower_density=Dictionary_GetDouble_WithDefault(dictionary,"lowerDensity",0.0);
- upper_alpha=Dictionary_GetDouble_WithDefault( dictionary, "upperAlpha", 0.0 );
- lower_alpha=Dictionary_GetDouble_WithDefault( dictionary, "lowerAlpha", 0.0 );
- material_boundary=Dictionary_GetDouble_WithDefault(dictionary,
- "materialBoundary",0.0);
- if(coord[1]>y_max)
- {
- *result=0;
- }
- else
- {
- double T;
- StgFEM_StandardConditionFunctions_TemperatureProfile(node_lI,var_I,
- _context,&T);
- if(coord[1]>material_boundary)
- {
- *result=upper_density*(1-upper_alpha*T);
- }
- else
- {
- *result=lower_density*(1-lower_alpha*T);
- }
- }
-}
-
void StgFEM_StandardConditionFunctions_ERF( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
FiniteElementContext * context = (FiniteElementContext*)_context;
FeVariable* feVariable = NULL;
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h 2008-12-11 09:29:58 UTC (rev 13646)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h 2008-12-11 09:30:01 UTC (rev 13647)
@@ -89,7 +89,6 @@
void StG_FEM_StandardConditionFunctions_StepFunctionProduct4( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
void StgFEM_StandardConditionFunctions_TemperatureProfile( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
void StgFEM_StandardConditionFunctions_PressureProfile( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StgFEM_StandardConditionFunctions_DensityProfile( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
void StG_FEM_StandardConditionFunctions_Gaussian( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
void StgFEM_StandardConditionFunctions_ConvectionBenchmark( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
More information about the CIG-COMMITS
mailing list