[cig-commits] r5546 - in long/3D/Gale/trunk: .
src/PICellerator/Utils/src src/PICellerator/Weights/src
src/StGermain/Base/Container/src src/StGermain/Base/Foundation/src
src/StGermain/Discretisation/Geometry/src
src/StGermain/Discretisation/Mesh/src
src/StGermain/Discretisation/Swarm/src
src/StGermain/Discretisation/Utils/src
src/StgFEM/Discretisation/src src/StgFEM/SLE
src/StgFEM/SLE/src src/StgFEM/plugins
src/StgFEM/plugins/StandardConditionFunctions
src/Underworld/Utils/src
walter at geodynamics.org
walter at geodynamics.org
Fri Dec 8 10:42:22 PST 2006
Author: walter
Date: 2006-12-08 10:42:21 -0800 (Fri, 08 Dec 2006)
New Revision: 5546
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c
long/3D/Gale/trunk/src/PICellerator/Weights/src/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript
long/3D/Gale/trunk/src/StgFEM/SLE/SConscript
long/3D/Gale/trunk/src/StgFEM/SLE/src/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript
Log:
r1187 at earth: boo | 2006-12-08 10:33:32 -0800
Make everything build again (except SurfaceAdaptor)
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1186
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1187
Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/StressBC.c 2006-12-08 18:42:21 UTC (rev 5546)
@@ -327,25 +327,27 @@
StressBC* self = (StressBC*) forceTerm;
Element_NodeIndex elementNodeCount;
Dimension_Index dim = forceVector->dim;
- FiniteElement_Mesh* mesh = forceVector->feVariable->feMesh;
+ FeMesh* mesh = forceVector->feVariable->feMesh;
+ Grid* grid;
Node_ElementLocalIndex eNode_I;
ElementType* elementType;
Dof_Index nodeDofCount;
double stress, area;
- MeshLayout* meshLayout = mesh->layout;
- HexaMD* decomp = (HexaMD*)meshLayout->decomp;
+ Node_DomainIndex* elementNodes = NULL;
- elementType = FeMesh_ElementTypeAt( mesh, lElement_I );
- elementNodeCount = elementType->nodeCount;
+ elementType = FeMesh_GetElementType( mesh, lElement_I );
nodeDofCount = dim;
IJK ijk;
+ grid = *(Grid**)ExtensionManager_Get( mesh->info, mesh,
+ ExtensionManager_GetHandle( mesh->info, "vertexGrid" ) );
+
/* Compute the area of the face. */
if(dim==2)
{
- Coord *coord1, *coord2;
+ double *coord1, *coord2;
int lower,upper,direction;
switch(self->_wall)
{
@@ -371,9 +373,12 @@
break;
}
- coord1=&(Mesh_CoordAt(mesh,mesh->elementNodeTbl[lElement_I][lower]));
- coord2=&(Mesh_CoordAt(mesh,mesh->elementNodeTbl[lElement_I][upper]));
- area=(*coord2)[direction]-(*coord1)[direction];
+ Mesh_GetIncidence(mesh, Mesh_GetDimSize(mesh), lElement_I,
+ MT_VERTEX,&elementNodeCount, &elementNodes);
+
+ coord1=Mesh_GetVertex(mesh,elementNodes[lower]);
+ coord2=Mesh_GetVertex(mesh,elementNodes[upper]);
+ area=coord2[direction]-coord1[direction];
/* printf("area %d %d %d %d %lf %lf %lf %lf %lf %lf %lf %lf\n",lElement_I, lower, upper, direction, */
/* Mesh_CoordAt(mesh,mesh->elementNodeTbl[lElement_I][0])[0], */
@@ -398,27 +403,26 @@
/* Make sure that we are on the boundary */
int condition, entry_I;
ConditionFunction* cf;
- RegularMeshUtils_Node_1DTo3D( decomp, mesh->elementNodeTbl[lElement_I][eNode_I],
- &ijk[0], &ijk[1], &ijk[2] );
+ RegularMeshUtils_Node_1DTo3D( mesh, Mesh_DomainToGlobal(mesh, MT_VERTEX, elementNodes[eNode_I]), ijk );
switch(self->_wall)
{
case StressBC_Wall_Left:
condition=(ijk[0] == 0);
break;
case StressBC_Wall_Right:
- condition=(ijk[0] == ( decomp->nodeGlobal3DCounts[0] - 1 ));
+ condition=(ijk[0] == ( grid->sizes[0] - 1 ));
break;
case StressBC_Wall_Bottom:
condition=(ijk[1] == 0);
break;
case StressBC_Wall_Top:
- condition=(ijk[1] == ( decomp->nodeGlobal3DCounts[1] - 1 ));
+ condition=(ijk[1] == ( grid->sizes[1] - 1 ));
break;
case StressBC_Wall_Front:
condition=(ijk[2] == 0);
break;
case StressBC_Wall_Back:
- condition=(ijk[2] == ( decomp->nodeGlobal3DCounts[2] - 1 ));
+ condition=(ijk[2] == ( grid->sizes[2] - 1 ));
break;
}
@@ -438,14 +442,12 @@
/* We use a variable number of zero "0", because
we don't use the variable number and that one
is always going to exist. */
- ConditionFunction_Apply
- (cf,mesh->elementNodeTbl[lElement_I][eNode_I],
- 0,self->context,&stress);
+ ConditionFunction_Apply(cf,elementNodes[eNode_I],
+ 0,self->context,&stress);
break;
}
elForceVec[ eNode_I * nodeDofCount
+ self->_entryTbl[entry_I].axis ] += stress*area;
-
}
}
}
Modified: long/3D/Gale/trunk/src/PICellerator/Weights/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -21,6 +21,7 @@
header_groups['PICellerator/Weights']=Split("""ConstantWeights.h
DiscreteVoronoiWeights.h
+DVCWeights.h
Finalise.h
Init.h
IterativeWeights.h
@@ -33,6 +34,7 @@
c_files=Split("""ConstantWeights.c
DiscreteVoronoiWeights.c
+DVCWeights.c
Finalise.c
Init.c
IterativeWeights.c
@@ -43,6 +45,7 @@
meta_files=Split("""ConstantWeights.meta
DiscreteVoronoiWeights.meta
+DVCWeights.meta
IterativeWeights.meta
MomentBalanceWeights.meta
VolumeWeights.meta
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -34,7 +34,6 @@
"LinkedListIterator.h",
"LinkedListNode.h",
"List.h",
- "Map.h",
"MaxHeap.h",
"MemoryPool.h",
"MPIRoutines.h",
@@ -44,7 +43,6 @@
"Set.h",
"types.h",
"UIntMap.h",
- "UniqueList.h",
"units.h"]
c_files=Split("""Array.c
@@ -61,7 +59,6 @@
LinkedListIterator.c
LinkedListNode.c
List.c
-Map.c
MaxHeap.c
MemoryPool.c
MPIRoutines.c
@@ -69,8 +66,7 @@
PtrSet.c
RangeSet.c
Set.c
-UIntMap.c
-UniqueList.c""")
+UIntMap.c""")
shared_lib_objects+=[local_env.SharedLibrary('StGermainBaseContainer',c_files)]
StGermain_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -32,6 +32,7 @@
MemoryReport.h
MemoryTag.h
NamedObject_Register.h
+Numerics.h
ObjectAdaptor.h
Object.h
ObjectList.h
@@ -51,6 +52,7 @@
MemoryPointer.c
MemoryReport.c
NamedObject_Register.c
+Numerics.c
ObjectAdaptor.c
Object.c
ObjectList.c
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -29,6 +29,7 @@
Finalise.h
GeometryClass.h
Geometry.h
+Hex.h
IJK26Topology.h
IJK6Topology.h
IJKTopology.h
@@ -43,6 +44,7 @@
RefinedRegionsGeometry.h
RMatrix.h
ShellGeometry.h
+Simplex.h
stg_lapack.h
TensorMath.h
TensorMultMath.h
@@ -60,6 +62,7 @@
Edge.c
Finalise.c
GeometryClass.c
+Hex.c
IJK26Topology.c
IJK6Topology.c
IJKTopology.c
@@ -73,6 +76,7 @@
RefinedRegionsGeometry.c
RMatrix.c
ShellGeometry.c
+Simplex.c
TensorMath.c
TensorMultMath.c
Topology.c
@@ -90,6 +94,7 @@
ParallelDelaunay.meta
RefinedRegionsGeometry.meta
ShellGeometry.meta
+Simplex.meta
Topology.meta
""")
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -20,95 +20,58 @@
local_env=env.Copy()
header_groups['StGermain/Discretisation/Mesh']=Split("""
-BodyNL.h
CartesianGenerator.h
CommTopology.h
-CornerNL.h
Decomp.h
Decomp_Sync.h
+Decomp_Sync_Array.h
Decomp_Sync_Claim.h
-Decomp_Sync_Negotiate.h
+Decomposer.h
DecompTransfer.h
-DummyMD.h
-ElementLayout.h
Finalise.h
Grid.h
-HexaEL.h
-HexaMD.h
-HMesh.h
Init.h
-IrregEL.h
MeshClass.h
-MeshDecomp.h
-MeshGeometry.h
MeshTopology.h
Mesh.h
-MeshAdaptor.h
MeshGenerator.h
-MeshLayout.h
-NodeLayout.h
-ParallelPipedHexaEL.h
-ShadowInfo.h
+MeshVariable.h
+Mesh_Algorithms.h
+Mesh_ElementType.h
+Mesh_HexType.h
shortcuts.h
-StencilMD.h
-SurfaceAdaptor.h
types.h""")
-c_files=Split("""BodyNL.c
-CartesianGenerator.c
+c_files=Split("""CartesianGenerator.c
CommTopology.c
-CornerNL.c
Decomp.c
Decomp_Sync.c
-Decomp_Sync_Claim.c
-Decomp_Sync_Negotiate.c
+Decomp_Sync_Array.c
+Decomposer.c
DecompTransfer.c
-DummyMD.c
-ElementLayout.c
Finalise.c
Grid.c
-HexaEL.c
-HexaMD.c
-HMesh.c
Init.c
-IrregEL.c
-MeshAdaptor.c
MeshClass.c
-MeshDecomp.c
MeshGenerator.c
-MeshGeometry.c
-MeshLayout.c
MeshTopology.c
-NodeLayout.c
-ParallelPipedHexaEL.c
-SurfaceAdaptor.c""")
+MeshVariable.c
+Mesh_Algorithms.c
+Mesh_ElementType.c
+Mesh_HexType.c""")
-meta_files=Split("""BodyNL.meta
-CartesianGenerator.meta
+meta_files=Split("""CartesianGenerator.meta
CommTopology.meta
-CornerNL.meta
Decomp.meta
Decomp_Sync.meta
-Decomp_Sync_Claim.meta
-Decomp_Sync_Negotiate.meta
DecompTransfer.meta
-DummyMD.meta
-ElementLayout.meta
Grid.meta
-HexaEL.meta
-HexaMD.meta
-HMesh.meta
-IrregEL.meta
-MeshAdaptor.meta
MeshClass.meta
-MeshDecomp.meta
MeshGenerator.meta
-MeshGeometry.meta
-MeshLayout.meta
MeshTopology.meta
-NodeLayout.meta
-ParallelPipedHexaEL.meta
-SurfaceAdaptor.meta""")
+MeshVariable.meta
+Mesh_Algorithms.meta
+Mesh_ElementType.meta""")
c_files+=[local_env.Meta(meta_files)]
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -38,6 +38,7 @@
"Random.h",
"RandomParticleLayout.h",
"shortcuts.h",
+ "ShadowInfo.h",
"SingleCellLayout.h",
"SpaceFillerParticleLayout.h",
"StandardParticle.h",
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -34,14 +34,12 @@
"FieldVariable_Register.h",
"OperatorFieldVariable.h",
"Operator.h",
- "MeshCoarsener_Hexa.h",
"DiscretisationContext.h",
"LinearRegression.h",
"TimeIntegrator.h",
"TimeIntegratee.h",
"ShapeAdvector.h",
"SobolGenerator.h",
- "Sync.h",
"SemiRegDeform.h",
"Remesher.h",
"StripRemesher.h",
@@ -64,14 +62,12 @@
"FieldVariable_Register.c",
"OperatorFieldVariable.c",
"Operator.c",
- "MeshCoarsener_Hexa.c",
"DiscretisationContext.c",
"LinearRegression.c",
"TimeIntegrator.c",
"TimeIntegratee.c",
"ShapeAdvector.c",
"SobolGenerator.c",
- "Sync.c",
"SemiRegDeform.c",
"Remesher.c",
"StripRemesher.c",
@@ -88,7 +84,6 @@
FieldVariable.meta
FrictionVC.meta
InnerWallVC.meta
-MeshCoarsener_Hexa.meta
OperatorFieldVariable.meta
Remesher.meta
SemiRegDeform.meta
@@ -96,7 +91,6 @@
ShapeVC.meta
SplitFrictionWallVC.meta
StripRemesher.meta
-Sync.meta
TimeIntegratee.meta
TimeIntegrator.meta
WallVC.meta""")
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -22,18 +22,21 @@
header_groups['StgFEM/Discretisation']=Split("""AnalyticSolution.h
BilinearElementType.h
ConstantElementType.h
+C0Generator.h
Discretisation.h
Element.h
ElementType.h
ElementType_Register.h
FeEquationNumber.h
+FeMesh.h
+FeMesh_Algorithms.h
+FeMesh_ElementType.h
FeSwarmVariable.h
FeVariable.h
Finalise.h
Init.h
LinearTriangleElementType.h
LinkedDofInfo.h
-Mesh.h
OperatorFeVariable.h
ShapeFeVariable.h
shortcuts.h
@@ -44,31 +47,37 @@
c_files=Split("""AnalyticSolution.c
BilinearElementType.c
ConstantElementType.c
+C0Generator.c
Element.c
ElementType.c
ElementType_Register.c
FeEquationNumber.c
+FeMesh.c
+FeMesh_Algorithms.c
+FeMesh_ElementType.c
FeSwarmVariable.c
FeVariable.c
Finalise.c
Init.c
LinearTriangleElementType.c
LinkedDofInfo.c
-Mesh.c
OperatorFeVariable.c
ShapeFeVariable.c
TrilinearElementType.c""")
meta_files=Split("""BilinearElementType.meta
ConstantElementType.meta
+C0Generator.meta
ElementType.meta
ElementType_Register.meta
FeEquationNumber.meta
+FeMesh.meta
+FeMesh_Algorithms.meta
+FeMesh_ElementType.meta
FeSwarmVariable.meta
FeVariable.meta
LinearTriangleElementType.meta
LinkedDofInfo.meta
-Mesh.meta
OperatorFeVariable.meta
ShapeFeVariable.meta
TrilinearElementType.meta""")
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -18,6 +18,6 @@
SConscript('src/SConscript')
SConscript('LinearAlgebra/SConscript')
SConscript('SystemSetup/SConscript')
-SConscript('MultiGrid/SConscript')
+#SConscript('MultiGrid/SConscript')
SConscript('ProvidedSystems/SConscript')
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -22,17 +22,11 @@
header_groups['StgFEM/SLE']=Split("""Finalise.h
Init.h
SLE.h
-StiffRemesher.h
types.h""")
c_files=Split("""Finalise.c
-Init.c
-StiffRemesher.c""")
+Init.c""")
-meta_files=Split("""StiffRemesher.meta""")
-
-c_files+=[local_env.Meta(meta_files)]
-
shared_lib_objects+=[local_env.SharedLibrary('StgFEMSLE',c_files)]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -18,7 +18,7 @@
SConscript('CompareFeVariableAgainstReferenceSolution/SConscript')
SConscript('Document/SConscript')
SConscript('FeVariableImportExporters/SConscript')
-SConscript('LevelSetPlugin/SConscript')
-SConscript('MultiGrid/SConscript')
+#SConscript('LevelSetPlugin/SConscript')
+#SConscript('MultiGrid/SConscript')
SConscript('Output/SConscript')
SConscript('StandardConditionFunctions/SConscript')
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2006-12-08 18:42:21 UTC (rev 5546)
@@ -732,7 +732,7 @@
void StG_FEM_StandardConditionFunctions_StepFunctionProduct1( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
FiniteElementContext * context = (FiniteElementContext*)_context;
FeVariable* feVariable = NULL;
- FiniteElement_Mesh* mesh = NULL;
+ FeMesh* mesh = NULL;
Dictionary* dictionary = context->dictionary;
double* result = (double*) _result;
double* coord;
@@ -742,7 +742,7 @@
feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
mesh = feVariable->feMesh;
- coord = Mesh_CoordAt( mesh, node_lI );
+ coord = Mesh_GetVertex( mesh, node_lI );
start = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct1Start", 0.0 );
end = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct1End", 0.0 );
@@ -760,7 +760,7 @@
void StG_FEM_StandardConditionFunctions_StepFunctionProduct2( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
FiniteElementContext * context = (FiniteElementContext*)_context;
FeVariable* feVariable = NULL;
- FiniteElement_Mesh* mesh = NULL;
+ FeMesh* mesh = NULL;
Dictionary* dictionary = context->dictionary;
double* result = (double*) _result;
double* coord;
@@ -770,7 +770,7 @@
feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
mesh = feVariable->feMesh;
- coord = Mesh_CoordAt( mesh, node_lI );
+ coord = Mesh_GetVertex( mesh, node_lI );
start = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct2Start", 0.0 );
end = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct2End", 0.0 );
@@ -789,7 +789,7 @@
void StG_FEM_StandardConditionFunctions_StepFunctionProduct3( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
FiniteElementContext * context = (FiniteElementContext*)_context;
FeVariable* feVariable = NULL;
- FiniteElement_Mesh* mesh = NULL;
+ FeMesh* mesh = NULL;
Dictionary* dictionary = context->dictionary;
double* result = (double*) _result;
double* coord;
@@ -799,7 +799,7 @@
feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
mesh = feVariable->feMesh;
- coord = Mesh_CoordAt( mesh, node_lI );
+ coord = Mesh_GetVertex( mesh, node_lI );
start = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct3Start", 0.0 );
end = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct3End", 0.0 );
@@ -817,7 +817,7 @@
void StG_FEM_StandardConditionFunctions_StepFunctionProduct4( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
FiniteElementContext * context = (FiniteElementContext*)_context;
FeVariable* feVariable = NULL;
- FiniteElement_Mesh* mesh = NULL;
+ FeMesh* mesh = NULL;
Dictionary* dictionary = context->dictionary;
double* result = (double*) _result;
double* coord;
@@ -827,7 +827,7 @@
feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
mesh = feVariable->feMesh;
- coord = Mesh_CoordAt( mesh, node_lI );
+ coord = Mesh_GetVertex( mesh, node_lI );
start = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct4Start", 0.0 );
end = Dictionary_GetDouble_WithDefault( dictionary, "StepFunctionProduct4End", 0.0 );
@@ -849,7 +849,7 @@
void* _result ) {
FiniteElementContext * context = (FiniteElementContext*)_context;
FeVariable* feVariable = NULL;
- FiniteElement_Mesh* mesh = NULL;
+ FeMesh* mesh = NULL;
Dictionary* dictionary = context->dictionary;
double* result = (double*) _result;
double* coord;
@@ -858,7 +858,7 @@
feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "VelocityField" );
mesh = feVariable->feMesh;
- coord = Mesh_CoordAt( mesh, node_lI );
+ coord = Mesh_GetVertex( mesh, node_lI );
center = Dictionary_GetDouble_WithDefault( dictionary,
"GaussianCenter", 0.0 );
Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript 2006-12-08 18:42:18 UTC (rev 5545)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript 2006-12-08 18:42:21 UTC (rev 5546)
@@ -20,7 +20,7 @@
local_env=env.Copy()
header_groups['Underworld/Utils']=Split("""Context.h
-DVCWeights.h
+DensityField.h
Finalise.h
Init.h
PressureTemperatureOutput.h
@@ -32,7 +32,7 @@
c_files=Split("""Context.c
-DVCWeights.c
+DensityField.c
Finalise.c
Init.c
PressureTemperatureOutput.c
@@ -42,7 +42,7 @@
meta_files=Split("""Context.meta
-DVCWeights.meta
+DensityField.meta
PressureTemperatureOutput.meta
RadiogenicHeatingTerm.meta
StressField.meta
More information about the cig-commits
mailing list