[cig-commits] commit: Removing the assumption that the _getMinGlobalFieldMagnitude and _getMaxGlobalFieldMagnitude functions are set higher up in the hierachy of components. Instead they are set in by the _DefaultNew and passed up.

[Mercurial]

changeset:   747:1a9ef8152f3e
branch:      1.4.x
user:        JulianGiordani
date:        Tue Jan 19 15:41:33 2010 +1100
files:       Discretisation/src/ShapeFeVariable.c
description:
Removing the assumption that the _getMinGlobalFieldMagnitude and _getMaxGlobalFieldMagnitude functions are set higher up in the hierachy of components. Instead they are set in by the _DefaultNew and passed up.


diff -r c3b4e4b75a06 -r 1a9ef8152f3e Discretisation/src/ShapeFeVariable.c
--- a/Discretisation/src/ShapeFeVariable.c	Thu Jan 14 17:42:23 2010 +1100
+++ b/Discretisation/src/ShapeFeVariable.c	Tue Jan 19 15:41:33 2010 +1100
@@ -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  );