[cig-commits] r5648 - in long/3D/Gale/trunk/src/PICellerator: .
Apps/LidDrivenPIC Apps/PIC_Components Apps/RayleighTaylor
Apps/RayleighTaylor/tests Apps/RayleighTaylor/tests/AnalyticBlock
Apps/RayleighTaylor/tests/AnalyticColumn
walter at geodynamics.org
walter at geodynamics.org
Fri Jan 5 11:22:47 PST 2007
Author: walter
Date: 2007-01-05 11:22:47 -0800 (Fri, 05 Jan 2007)
New Revision: 5648
Modified:
long/3D/Gale/trunk/src/PICellerator/
long/3D/Gale/trunk/src/PICellerator/Apps/LidDrivenPIC/LidDrivenPIC.xml
long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-flip1.xml
long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-test1.xml
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-flip1.xml
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-test1.xml
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticBlock.xml
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticColumn.xml
Log:
r546 at earth (orig r396): LukeHodkinson | 2007-01-02 21:32:10 -0800
Updating some XML files to use the modified
interfaces.
Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
- 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:394
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
+ 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:396
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/LidDrivenPIC/LidDrivenPIC.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/LidDrivenPIC/LidDrivenPIC.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/LidDrivenPIC/LidDrivenPIC.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -43,11 +43,11 @@
<param name="journal-level-branch.debug.StgFEM"> 1 </param>
<!-- Geometry & mesh setup -->
- <param name="dim"> 3 </param>
+ <param name="dim"> 2 </param>
<!-- Remember in StGermain these currently refer to _node_ counts rather than elements... -->
<param name="elementResI"> 7 </param>
<param name="elementResJ"> 7 </param>
- <param name="elementResK"> 3 </param>
+ <param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
<param name="minY"> 0.0 </param>
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-flip1.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-flip1.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-flip1.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -30,7 +30,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -49,7 +49,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">picIntegrationPointsParticleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<!-- These guys may or may not be created -->
<param name="SwarmAdvector">materialSwarmAdvector</param>
@@ -67,7 +67,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">backgroundMapper</param>
</struct>
@@ -83,7 +83,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">backgroundLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="Material">denseMaterial</param>
</struct>
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-test1.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-test1.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/PIC_Components/MaterialPointSwarm-test1.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -30,7 +30,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -50,7 +50,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">picIntegrationPointsParticleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<!-- These guys may or may not be created -->
<param name="SwarmAdvector">materialSwarmAdvector</param>
@@ -68,7 +68,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">backgroundMapper</param>
</struct>
@@ -84,7 +84,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">backgroundLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="Material">lightMaterial</param>
</struct>
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-flip1.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-flip1.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-flip1.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -3,7 +3,6 @@
<!-- DTD to validate against -->
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>../StgFEM_Components/ElementLayout.xml </include>
<include>../StgFEM_Components/ConstantMesh.xml </include>
<include>../StgFEM_Components/LinearMesh.xml </include>
<include>../StgFEM_Components/VelocityField.xml </include>
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-test1.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-test1.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/RayTay_Example-test1.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -3,7 +3,6 @@
<!-- DTD to validate against -->
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>../StgFEM_Components/ElementLayout.xml </include>
<include>../StgFEM_Components/ConstantMesh.xml </include>
<include>../StgFEM_Components/LinearMesh.xml </include>
<include>../StgFEM_Components/VelocityField.xml </include>
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c 2007-01-05 19:22:47 UTC (rev 5648)
@@ -55,6 +55,8 @@
typedef struct {
__AnalyticSolution
+ FeVariable* velocityField;
+ FeVariable* pressureField;
double startBlockX;
double endBlockX;
double startBlockY;
@@ -1719,25 +1721,32 @@
void _AnalyticBlock_Construct( void* analyticSolution, Stg_ComponentFactory* cf, void* data ) {
AnalyticBlock* self = (AnalyticBlock*)analyticSolution;
- FeVariable* velocityField;
- FeVariable* pressureField;
/* Construct Parent */
_AnalyticSolution_Construct( self, cf, data );
/* Create Analytic Fields */
- velocityField = Stg_ComponentFactory_ConstructByName( cf, "VelocityField", FeVariable, True, data );
- AnalyticSolution_CreateAnalyticField( self, velocityField, _AnalyticBlock_VelocityFunction );
+ self->velocityField = Stg_ComponentFactory_ConstructByName( cf, "VelocityField", FeVariable, True, data );
+ self->pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data );
- pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data );
- AnalyticSolution_CreateAnalyticField( self, pressureField, _AnalyticBlock_PressureFunction );
-
self->startBlockX = Stg_ComponentFactory_GetRootDictDouble( cf, "startBlockX", 0.0 );
self->endBlockX = Stg_ComponentFactory_GetRootDictDouble( cf, "endBlockX", 0.0 );
self->startBlockY = Stg_ComponentFactory_GetRootDictDouble( cf, "startBlockY", 0.0 );
}
+void _AnalyticBlock_Build( void* analyticSolution, void* data ) {
+ AnalyticBlock* self = (AnalyticBlock*)analyticSolution;
+ assert( self && Stg_CheckType( self, AnalyticBlock ) );
+
+ Build( self->velocityField, data, False );
+ Build( self->pressureField, data, False );
+ AnalyticSolution_CreateAnalyticField( self, self->velocityField, _AnalyticBlock_VelocityFunction );
+ AnalyticSolution_CreateAnalyticField( self, self->pressureField, _AnalyticBlock_PressureFunction );
+
+ _AnalyticSolution_Build( self, data );
+}
+
void* _AnalyticBlock_DefaultNew( Name name ) {
return _AnalyticSolution_New(
sizeof(AnalyticBlock),
@@ -1747,7 +1756,7 @@
_AnalyticSolution_Copy,
_AnalyticBlock_DefaultNew,
_AnalyticBlock_Construct,
- _AnalyticSolution_Build,
+ _AnalyticBlock_Build,
_AnalyticSolution_Initialise,
_AnalyticSolution_Execute,
_AnalyticSolution_Destroy,
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c 2007-01-05 19:22:47 UTC (rev 5648)
@@ -55,6 +55,8 @@
typedef struct {
__AnalyticSolution
+ FeVariable* velocityField;
+ FeVariable* pressureField;
Dimension_Index dim;
double sigma;
double viscosity;
@@ -293,19 +295,14 @@
void _AnalyticColumn_Construct( void* analyticSolution, Stg_ComponentFactory* cf, void* data ) {
AnalyticColumn* self = (AnalyticColumn*)analyticSolution;
- FeVariable* velocityField;
- FeVariable* pressureField;
/* Construct Parent */
_AnalyticSolution_Construct( self, cf, data );
/* Create Analytic Fields */
- velocityField = Stg_ComponentFactory_ConstructByName( cf, "VelocityField", FeVariable, True, data );
- AnalyticSolution_CreateAnalyticField( self, velocityField, _AnalyticColumn_VelocityFunction );
+ self->velocityField = Stg_ComponentFactory_ConstructByName( cf, "VelocityField", FeVariable, True, data );
+ self->pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data );
- pressureField = Stg_ComponentFactory_ConstructByName( cf, "PressureField", FeVariable, True, data );
- AnalyticSolution_CreateAnalyticField( self, pressureField, _AnalyticColumn_PressureFunction );
-
self->dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dim", 0 );
self->startColumnX = Stg_ComponentFactory_GetRootDictDouble( cf, "startColumnX", 0.0 );
self->endColumnX = Stg_ComponentFactory_GetRootDictDouble( cf, "endColumnX", 0.0 );
@@ -315,6 +312,19 @@
self->sigma = Stg_ComponentFactory_GetRootDictDouble( cf, "sigma", 1.0 );
}
+void _AnalyticColumn_Build( void* analyticSolution, void* data ) {
+ AnalyticColumn* self = (AnalyticColumn*)analyticSolution;
+
+ assert( self && Stg_CheckType( self, AnalyticColumn ) );
+
+ Build( self->velocityField, data, False );
+ Build( self->pressureField, data, False );
+ AnalyticSolution_CreateAnalyticField( self, self->velocityField, _AnalyticColumn_VelocityFunction );
+ AnalyticSolution_CreateAnalyticField( self, self->pressureField, _AnalyticColumn_PressureFunction );
+
+ _AnalyticSolution_Build( self, data );
+}
+
void* _AnalyticColumn_DefaultNew( Name name ) {
return _AnalyticSolution_New(
sizeof(AnalyticColumn),
@@ -324,7 +334,7 @@
_AnalyticSolution_Copy,
_AnalyticColumn_DefaultNew,
_AnalyticColumn_Construct,
- _AnalyticSolution_Build,
+ _AnalyticColumn_Build,
_AnalyticSolution_Initialise,
_AnalyticSolution_Execute,
_AnalyticSolution_Destroy,
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticBlock.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticBlock.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticBlock.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -3,7 +3,6 @@
<!-- DTD to validate against -->
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>../../StgFEM_Components/ElementLayout.xml </include>
<include>../../StgFEM_Components/ConstantMesh.xml </include>
<include>../../StgFEM_Components/LinearMesh.xml </include>
<include>../../StgFEM_Components/VelocityField.xml </include>
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticColumn.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticColumn.xml 2007-01-05 19:22:44 UTC (rev 5647)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/testAnalyticColumn.xml 2007-01-05 19:22:47 UTC (rev 5648)
@@ -3,7 +3,6 @@
<!-- DTD to validate against -->
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>../../StgFEM_Components/ElementLayout.xml </include>
<include>../../StgFEM_Components/ConstantMesh.xml </include>
<include>../../StgFEM_Components/LinearMesh.xml </include>
<include>../../StgFEM_Components/VelocityField.xml </include>
More information about the cig-commits
mailing list