[cig-commits] commit: Merge with 1.4.x

[Mercurial]

changeset:   748:9ed40ccb1082
tag:         tip
parent:      745:1cadf0398515
parent:      747:1a9ef8152f3e
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Feb 04 15:31:56 2010 -0800
files:       Discretisation/src/AnalyticSolution.c Discretisation/src/FeVariable.c Discretisation/src/FieldTest.c SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c SLE/ProvidedSystems/AdvectionDiffusion/tests/LumpedMassMatrixSuite.c plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
description:
Merge with 1.4.x


diff -r 1cadf0398515 -r 9ed40ccb1082 Discretisation/src/ShapeFeVariable.c
--- a/Discretisation/src/ShapeFeVariable.c	Tue Jan 26 16:30:39 2010 -0800
+++ b/Discretisation/src/ShapeFeVariable.c	Thu Feb 04 15:31:56 2010 -0800
@@ -67,6 +67,8 @@ void* ShapeFeVariable_DefaultNew( Name n
 	Stg_Component_ExecuteFunction*                                 _execute = _ShapeFeVariable_Execute;
 	Stg_Component_DestroyFunction*                                 _destroy = _ShapeFeVariable_Destroy;
 	FieldVariable_InterpolateValueAtFunction*           _interpolateValueAt = _FeVariable_InterpolateValueAt;
+	FieldVariable_GetValueFunction*             _getMinGlobalFieldMagnitude = _FeVariable_GetMinGlobalFieldMagnitude;
+	FieldVariable_GetValueFunction*             _getMaxGlobalFieldMagnitude = _FeVariable_GetMaxGlobalFieldMagnitude;
 	FieldVariable_GetCoordFunction*                _getMinAndMaxLocalCoords = _FeVariable_GetMinAndMaxLocalCoords;
 	FieldVariable_GetCoordFunction*               _getMinAndMaxGlobalCoords = _FeVariable_GetMinAndMaxGlobalCoords;
 	FeVariable_InterpolateWithinElementFunction*  _interpolateWithinElement = _FeVariable_InterpolateNodeValuesToElLocalCoord;
@@ -74,8 +76,6 @@ void* ShapeFeVariable_DefaultNew( Name n
 
 	/* Variables that are set to ZERO are variables that will be set either by the current _New function or another parent _New function further up the hierachy */
 	AllocationType                             nameAllocationType = ZERO;
-	FieldVariable_GetValueFunction*   _getMinGlobalFieldMagnitude = ZERO;
-	FieldVariable_GetValueFunction*   _getMaxGlobalFieldMagnitude = ZERO;
 	FeVariable_SyncShadowValuesFunc*            _syncShadowValues = ZERO;
 
 	return (ShapeFeVariable*) _ShapeFeVariable_New(  SHAPEFEVARIABLE_PASSARGS  );