[cig-commits] r4910 - in long/3D/Gale/trunk/src/StgFEM: .
Discretisation/src Discretisation/tests
SLE/ProvidedSystems/AdvectionDiffusion/tests
SLE/SystemSetup/tests plugins/LevelSetPlugin
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:50:47 PDT 2006
Author: walter
Date: 2006-10-11 13:50:45 -0700 (Wed, 11 Oct 2006)
New Revision: 4910
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.h
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.h
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c
long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.h
Log:
r796 at earth: boo | 2006-10-11 13:49:40 -0700
r770 at earth (orig r649): KathleenHumble | 2006-10-05 01:11:02 -0700
Implementing a reasonably big change to the FeildVariable:
Adding in a Bool isCheckpointedAndReloaded
that at present can not be set per FieldVariable type
except by using the standard method of deciding which
variables to checkpoint...
This change is to prevent the checkpointing system from
checkpointing spurious FieldVariables that were breaking
some of the checkpointing tests.
At present, this new flag cannot be set from the xml
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:795
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:648
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:796
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:649
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -408,8 +408,9 @@
/* Create new FeVariable */
tmpName = Stg_Object_AppendSuffix( feVariable, "Analytic" );
analyticFeVariable = FeVariable_New( tmpName, feVariable->feMesh, feVariable->geometryMesh, dofLayout,
- NULL, NULL, NULL, feVariable->dim, feVariable->importFormatType,
- feVariable->exportFormatType, feVariable->fieldVariable_Register );
+ NULL, NULL, NULL, feVariable->dim, feVariable->isCheckpointedAndReloaded,
+ feVariable->importFormatType, feVariable->exportFormatType,
+ feVariable->fieldVariable_Register );
/* Add new FeVariable to list */
Stg_ObjectList_Append( self->feVariableList, feVariable );
@@ -522,6 +523,3 @@
return FieldVariable_InterpolateValueAt( normalFeVariable, coord, value );
}
-
-
-
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -98,6 +98,7 @@
NULL,
0,
0,
+ True,
NULL,
NULL,
MPI_COMM_WORLD,
@@ -114,6 +115,7 @@
void* ics,
void* linkedDofInfo,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
const char* const importFormatType,
const char* const exportFormatType,
FieldVariable_Register* fV_Register )
@@ -129,6 +131,7 @@
NULL,
dofLayout->_totalVarCount,
dim,
+ isCheckpointedAndReloaded,
importFormatType,
exportFormatType,
((Mesh*)feMesh)->layout->decomp->communicator,
@@ -159,6 +162,7 @@
templateFeVariable,
templateFeVariable->fieldComponentCount,
templateFeVariable->dim,
+ templateFeVariable->isCheckpointedAndReloaded,
importFormatType,
exportFormatType,
templateFeVariable->communicator,
@@ -180,6 +184,7 @@
void* templateFeVariable,
Index fieldComponentCount,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
const char* const importFormatType,
const char* const exportFormatType,
MPI_Comm communicator,
@@ -215,6 +220,7 @@
templateFeVariable,
fieldComponentCount,
dim,
+ isCheckpointedAndReloaded,
importFormatType,
exportFormatType,
communicator,
@@ -252,6 +258,7 @@
void* templateFeVariable,
Index fieldComponentCount,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
const char* const importFormatType,
const char* const exportFormatType,
MPI_Comm communicator,
@@ -284,6 +291,7 @@
_getMinAndMaxGlobalCoords,
fieldComponentCount,
dim,
+ isCheckpointedAndReloaded,
communicator,
fV_Register );
@@ -581,8 +589,8 @@
}
FeEquationNumber_Initialise( self->eqNum );
-
- if ( self->ics || (context && (True == context->loadFromCheckPoint) ) ) {
+ /*Seting up whether to load from checkpointing */
+ if ( self->ics || ((context && (True == context->loadFromCheckPoint) )&& (self->isCheckpointedAndReloaded)) ) {
Journal_DPrintf( self->debug, "applying the I.C.s for this Variable:\n" );
Stream_Indent( self->debug );
@@ -1954,10 +1962,16 @@
void FeVariable_SaveToFile( void* feVariable, const char* prefixStr, unsigned int timeStep ) {
FeVariable* self = (FeVariable*)feVariable;
FeVariable_ImportExportInfo* importExportInfo;
+ /* put in an extra loop here that first checks if the feVariable should be
+ saved to file. */
+ if (self->isCheckpointedAndReloaded) {
- importExportInfo = Stg_ObjectList_Get( FeVariable_FileFormatImportExportList, self->exportFormatType );
- assert( importExportInfo );
- importExportInfo->saveNodalValuesToFile( feVariable, prefixStr, timeStep );
+ importExportInfo = Stg_ObjectList_Get( FeVariable_FileFormatImportExportList,
+ self->exportFormatType );
+ assert( importExportInfo );
+ importExportInfo->saveNodalValuesToFile( feVariable, prefixStr, timeStep );
+ }
+
}
@@ -2028,9 +2042,13 @@
located, though this may not work easily in parallel ),. - PatrickSunter 9 Jun 2006
*/
- importExportInfo = Stg_ObjectList_Get( FeVariable_FileFormatImportExportList, self->importFormatType );
- assert( importExportInfo );
- importExportInfo->readNodalValuesFromFile( feVariable, prefixStr, timeStep );
+ /* Put an extra check in here to check whether the feVariable should be read from a file */
+ if (self->isCheckpointedAndReloaded) {
+ importExportInfo = Stg_ObjectList_Get( FeVariable_FileFormatImportExportList,
+ self->importFormatType );
+ assert( importExportInfo );
+ importExportInfo->readNodalValuesFromFile( feVariable, prefixStr, timeStep );
+ }
}
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h 2006-10-11 20:50:45 UTC (rev 4910)
@@ -141,6 +141,7 @@
void* ics,
void* linkedDofInfo,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
const char* const importFormatType,
const char* const exportFormatType,
FieldVariable_Register* fV_Register );
@@ -169,6 +170,7 @@
void* templateFeVariable,
Index fieldComponentCount,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
const char* const importFormatType,
const char* const exportFormatType,
MPI_Comm communicator,
@@ -205,6 +207,7 @@
void* templateFeVariable,
Index fieldComponentCount,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
const char* const importFormatType,
const char* const exportFormatType,
MPI_Comm communicator,
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -69,6 +69,7 @@
1,
&feVariable,
feVariable->dim,
+ feVariable->isCheckpointedAndReloaded,
feVariable->communicator,
feVariable->fieldVariable_Register );
}
@@ -96,6 +97,7 @@
2,
feVariableList,
feVariableList[0]->dim,
+ feVariableList[0]->isCheckpointedAndReloaded,
feVariableList[0]->communicator,
feVariableList[0]->fieldVariable_Register );
}
@@ -115,7 +117,7 @@
_OperatorFeVariable_Destroy,
name,
False,
- _FeVariable_InterpolateValueAt,
+ _OperatorFeVariable_InterpolateValueAt,
_FeVariable_GetMinGlobalFieldMagnitude,
_FeVariable_GetMaxGlobalFieldMagnitude,
_FeVariable_GetMinAndMaxLocalCoords,
@@ -128,6 +130,7 @@
NULL,
NULL,
0,
+ False,
MPI_COMM_WORLD,
NULL );
}
@@ -140,6 +143,7 @@
Index feVariableCount,
FeVariable** feVariableList,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fV_Register )
{
@@ -159,7 +163,7 @@
_OperatorFeVariable_Destroy,
name,
True,
- _FeVariable_InterpolateValueAt,
+ _OperatorFeVariable_InterpolateValueAt,
_FeVariable_GetMinGlobalFieldMagnitude,
_FeVariable_GetMaxGlobalFieldMagnitude,
_FeVariable_GetMinAndMaxLocalCoords,
@@ -172,6 +176,7 @@
feVariable->feMesh,
feVariable->geometryMesh,
dim,
+ isCheckpointedAndReloaded,
communicator,
fV_Register );
}
@@ -191,7 +196,7 @@
Name name,
Bool initFlag,
FieldVariable_InterpolateValueAtFunction* _interpolateValueAt,
- FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude,
+ FieldVariable_GetValueFunction* _getMinGlobalFieldMagnitude,
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude,
FieldVariable_GetCoordFunction* _getMinAndMaxLocalCoords,
FieldVariable_GetCoordFunction* _getMinAndMaxGlobalCoords,
@@ -203,6 +208,7 @@
void* feMesh,
void* geometryMesh,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fV_Register )
{
@@ -240,6 +246,7 @@
NULL, /* Template FeVariable */
0 /* fieldComponentCount - this will be reset later */,
dim,
+ False, /* isCheckpointedAndReloaded */
/* TODO: hack as always StgFEM_Native for now - PatrickSunter - 7 July 2006 */
StgFEM_Native_ImportExportType,
StgFEM_Native_ImportExportType,
@@ -312,7 +319,7 @@
Memory_Free( self->feVariableList );
/* TODO - HACK - Should be FeVariable_Delete */
- _FieldVariable_Delete( self );
+ _FeVariable_Delete( self );
}
void _OperatorFeVariable_Print( void* _feVariable, Stream* stream ) {
@@ -454,7 +461,72 @@
/** Private Functions */
+Bool _OperatorFeVariable_CheckIfValidToInterpolateInShadowSpace( OperatorFeVariable* self ){
+ int feVar_I;
+ FeVariable* currFeVar;
+ Bool parentIsValid;
+ for ( feVar_I=0; feVar_I < self->feVariableCount; feVar_I++ ) {
+ currFeVar = self->feVariableList[feVar_I];
+ if( 0 == strcmp( currFeVar->type, FeVariable_Type ) ) {
+ if ( False == currFeVar->shadowValuesSynchronised ) {
+ return False;
+ }
+ else {
+ return True;
+ }
+ }
+ else {
+ parentIsValid = _OperatorFeVariable_CheckIfValidToInterpolateInShadowSpace(
+ (OperatorFeVariable*)currFeVar );
+ if ( False == parentIsValid ) {
+ return False;
+ }
+ }
+ }
+
+ return True;
+}
+
+
+/** Needed to over-ride the standard _FeVariable_InterpolateValueAt() since for operator fe variables, as long as the
+base fe variable has been shadowed, this operatorFeVar can be calculated in shadow space */
+InterpolationResult _OperatorFeVariable_InterpolateValueAt( void* variable, Coord globalCoord, double* value ) {
+ OperatorFeVariable* self = (OperatorFeVariable*)variable;
+ Element_DomainIndex elementCoordIn = (unsigned)-1;
+ Coord elLocalCoord={0,0,0};
+ InterpolationResult retValue;
+ Bool validToInterpolateInShadowSpace;
+
+
+ retValue = FeVariable_GetElementLocalCoordAtGlobalCoord( self, globalCoord, elLocalCoord, &elementCoordIn );
+
+ if ( retValue == LOCAL ) {
+ /* Now interpolate the value at that coordinate, using shape functions */
+ self->_interpolateWithinElement( self, elementCoordIn, elLocalCoord, value );
+ }
+ else if ( retValue == SHADOW ) {
+ validToInterpolateInShadowSpace = _OperatorFeVariable_CheckIfValidToInterpolateInShadowSpace(self);
+
+ if ( False == validToInterpolateInShadowSpace ) {
+ Stream* warningStr = Journal_Register( Error_Type, self->type );
+ Journal_Printf( warningStr, "Warning - in %s, for OperatorFeVar \"%s\": user asking to "
+ "interpolate a value at "
+ "coord (%g,%g,%g), which is in shadow space, but "
+ "FeVariable_SyncShadowValues() hasn't been called on FeVariables this one is "
+ "derived from yet.\n",
+ __func__, self->name, globalCoord[0], globalCoord[1], globalCoord[2] );
+ return retValue;
+ }
+ /* Now interpolate the value at that coordinate, using shape functions */
+ self->_interpolateWithinElement( self, elementCoordIn, elLocalCoord, value );
+ }
+
+ return retValue;
+}
+
+
+
void OperatorFeVariable_UnaryInterpolationFunc( void* feVariable, Element_DomainIndex dElement_I, Coord coord, double* value ) {
OperatorFeVariable* self = (OperatorFeVariable*) feVariable;
FeVariable* field0 = self->feVariableList[0];
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.h 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.h 2006-10-11 20:50:45 UTC (rev 4910)
@@ -108,6 +108,7 @@
Index feVariableCount,
FeVariable** feVariableList,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fV_Register );
@@ -139,6 +140,7 @@
void* feMesh,
void* geometryMesh,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fV_Register );
@@ -159,8 +161,10 @@
/* 'FeVariable Virtual Implementations */
void _OperatorFeVariable_InterpolateWithinElement( void* feVariable, Element_DomainIndex dElement_I, Coord coord, double* value ) ;
void _OperatorFeVariable_GetValueAtNode( void* feVariable, Node_DomainIndex dNode_I, double* value);
-
+ InterpolationResult _OperatorFeVariable_InterpolateValueAt( void* variable, Coord globalCoord, double* value ) ;
+
/** Private Functions */
+ Bool _OperatorFeVariable_CheckIfValidToInterpolateInShadowSpace( OperatorFeVariable* self );
void _OperatorFeVariable_SetFunctions( void* feVariable ) ;
void OperatorFeVariable_UnaryInterpolationFunc(
void* feVariable, Element_DomainIndex dElement_I, Coord coord, double* value ) ;
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -79,6 +79,7 @@
NULL,
NULL,
0, /* dim */
+ False,
0, /* communicator */
NULL /* fv_Register */
);
@@ -109,6 +110,7 @@
void* geometryMesh,
void* dofLayout,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fV_Register
)
@@ -148,6 +150,7 @@
NULL, /* templateFeVariable */
1, /* fieldComponentCount */
dim, /* dim */
+ isCheckpointedAndReloaded, /* Checkpointing boolean */
StgFEM_Native_ImportExportType, /* import format type */
StgFEM_Native_ImportExportType, /* export format type */
communicator, /* communicator */
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.h 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.h 2006-10-11 20:50:45 UTC (rev 4910)
@@ -92,6 +92,7 @@
void* geometryMesh,
void* dofLayout,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fV_Register
);
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -197,7 +197,7 @@
/* Create the finite element field variable*/
fV_Register = FieldVariable_Register_New();
feVariable = FeVariable_New( "velocity", feMesh, NULL, dofs, wallVC, NULL, NULL, context->dim,
- StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
+ True,StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* Apply some arbitrary initial conditions */
for ( i = 0; i < decomp->nodeDomainCount; i++ ) {
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -205,7 +205,7 @@
/* Create the finite element field variable*/
fV_Register = FieldVariable_Register_New();
feVariable = FeVariable_New( "velocity", feMesh, NULL, dofs, wallVC, NULL, NULL, context->dim,
- StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
+ False, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* Build and initialise system */
Build( wallVC, 0, False );
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -201,7 +201,7 @@
/* Create the finite element field variable*/
fV_Register = FieldVariable_Register_New();
feVariable = FeVariable_New( "velocity", feMesh, NULL, dofs, wallVC, NULL, NULL, context->dim,
- StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
+ False, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* Apply some arbitrary initial conditions */
for ( i = 0; i < decomp->nodeDomainCount; i++ ) {
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -207,7 +207,7 @@
/* Create the finite element field variable*/
fV_Register = FieldVariable_Register_New();
feVariable = FeVariable_New( "testField", feMesh, NULL, dofs, wallVC, NULL, NULL, context->dim,
- StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
+ False, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* simulate solid body rotation */
geometry = (BlockGeometry*)eLayout->geometry;
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -193,7 +193,7 @@
/* Create the finite element field variable*/
fV_Register = FieldVariable_Register_New();
feVariable = FeVariable_New( "phi", feMesh, NULL, dofs, wallVC, NULL, NULL, context->dim,
- StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
+ False, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* Create Stream */
outputStream = Journal_Register( InfoStream_Type, CURR_MODULE_NAME );
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -230,7 +230,7 @@
}
/* Create the finite element field variable*/
- feVariable = FeVariable_New( "VelocityField", feMesh, NULL, dofs, NULL, NULL, NULL, context->dim,
+ feVariable = FeVariable_New( "VelocityField", feMesh, NULL, dofs, NULL, NULL, NULL, context->dim, False,
StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, context->fieldVariable_Register );
/* Swarm stuff */
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -190,7 +190,7 @@
/* Create the fe variable and solution vector */
fV_Register = FieldVariable_Register_New();
feVariable = FeVariable_New( velocityName, feMesh, NULL, dofLayout, wallVC, NULL, NULL, 3,
- StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
+ False, StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
solnVec = SolutionVector_New( velocityName, CommWorld, feVariable);
/* Build and initialise system */
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -226,7 +226,7 @@
/* Create the fe variable */
fV_Register = FieldVariable_Register_New();
- feVariable = FeVariable_New( velocityName, feMesh, NULL, dofLayout, compositeVC, NULL, linkedDofInfo, numDims,
+ feVariable = FeVariable_New( velocityName, feMesh, NULL, dofLayout, compositeVC, NULL, linkedDofInfo, numDims,False,
StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* Create a hack swarm ptr - we won't actually use it in this test */
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -222,7 +222,7 @@
/* Create the fe variable */
fV_Register = FieldVariable_Register_New();
- feVariable = FeVariable_New( velocityName, feMesh, NULL, dofLayout, compositeVC, NULL, NULL, numDims,
+ feVariable = FeVariable_New( velocityName, feMesh, NULL, dofLayout, compositeVC, NULL, NULL, numDims,False,
StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType, fV_Register );
/* Create a hack swarm ptr - we won't actually use it in this test */
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c 2006-10-11 20:50:45 UTC (rev 4910)
@@ -94,6 +94,7 @@
_LevelSet_GetGlobalCrds,
1,
0,
+ False,
MPI_COMM_WORLD,
NULL );
}
@@ -121,7 +122,8 @@
_LevelSet_GetLocalCrds,
_LevelSet_GetGlobalCrds,
1,
- 0,
+ 0,
+ False,
MPI_COMM_WORLD,
fieldVariable_Register );
}
@@ -145,9 +147,10 @@
FieldVariable_GetValueFunction* _getMaxGlobalFieldMagnitude,
FieldVariable_GetCoordFunction* _getMinAndMaxLocalCoords,
FieldVariable_GetCoordFunction* _getMinAndMaxGlobalCoords,
- Index fieldComponentCount,
- Dimension_Index dim,
- MPI_Comm communicator,
+ Index fieldComponentCount,
+ Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
+ MPI_Comm communicator,
FieldVariable_Register* fieldVariable_Register )
{
LevelSet* self;
@@ -173,6 +176,7 @@
_getMinAndMaxGlobalCoords,
fieldComponentCount,
dim,
+ isCheckpointedAndReloaded,
communicator,
fieldVariable_Register );
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.h 2006-10-11 20:50:42 UTC (rev 4909)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.h 2006-10-11 20:50:45 UTC (rev 4910)
@@ -144,6 +144,7 @@
FieldVariable_GetCoordFunction* _getMinAndMaxGlobalCoords,
Index fieldComponentCount,
Dimension_Index dim,
+ Bool isCheckpointedAndReloaded,
MPI_Comm communicator,
FieldVariable_Register* fieldVariable_Register );
More information about the cig-commits
mailing list