[cig-commits] commit: Minor fixes to {Bi|Tri}linearInnerElType.cxx

[Mercurial]

changeset:   789:3c946f016807
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Sep 07 23:38:00 2011 -0700
files:       Discretisation/src/BilinearInnerElType.cxx Discretisation/src/TrilinearInnerElType.cxx
description:
Minor fixes to {Bi|Tri}linearInnerElType.cxx


diff -r b8e84f1700d3 -r 3c946f016807 Discretisation/src/BilinearInnerElType.cxx
--- a/Discretisation/src/BilinearInnerElType.cxx	Tue May 17 13:05:53 2011 -0700
+++ b/Discretisation/src/BilinearInnerElType.cxx	Wed Sep 07 23:38:00 2011 -0700
@@ -109,6 +109,7 @@ void _BilinearInnerElType_Init( Bilinear
 	Dimension_Index dim_I=0;
 	/* General and Virtual info should already be set */
 	
+	self->dim = 2;
 	/* BilinearInnerElType info */
 	self->isConstructed = True;
 	for ( dim_I = 0; dim_I < 2; dim_I++ ) {
@@ -173,10 +174,17 @@ void _BilinearInnerElType_Destroy( void*
 
 	FreeArray( self->triInds );
 
+	Memory_Free( self->evaluatedShapeFunc );
+	Memory_Free( self->GNi );
+
 	_ElementType_Destroy( self, data );
 }
 
 void _BilinearInnerElType_Build( void* elementType, void *data ) {
+	BilinearInnerElType* self = (BilinearInnerElType*)elementType;
+
+	self->evaluatedShapeFunc = Memory_Alloc_Array( double, self->nodeCount, "evaluatedShapeFuncs" );
+	self->GNi = Memory_Alloc_2DArray( double, self->dim, self->nodeCount, (Name)"localShapeFuncDerivitives"  );
 }
 
 /*
diff -r b8e84f1700d3 -r 3c946f016807 Discretisation/src/TrilinearInnerElType.cxx
--- a/Discretisation/src/TrilinearInnerElType.cxx	Tue May 17 13:05:53 2011 -0700
+++ b/Discretisation/src/TrilinearInnerElType.cxx	Wed Sep 07 23:38:00 2011 -0700
@@ -112,6 +112,7 @@ void _TrilinearInnerElType_Init( Triline
 
 	/* General and Virtual info should already be set */
 	
+	self->dim = 3;
 	/* TriInnerEllementType info */
 	for ( dim_I = 0; dim_I < 3; dim_I++ ) {
 		self->minElLocalCoord[dim_I] = -1;
@@ -162,7 +163,10 @@ void _TrilinearInnerElType_AssignFromXML
 }
 	
 void _TrilinearInnerElType_Initialise( void* elementType, void *data ){
+	TrilinearInnerElType* self = (TrilinearInnerElType*)elementType;
 	
+	self->evaluatedShapeFunc = Memory_Alloc_Array( double, self->nodeCount, "evaluatedShapeFuncs" );
+	self->GNi = Memory_Alloc_2DArray( double, self->dim, self->nodeCount, (Name)"localShapeFuncDerivitives"  );
 }
 	
 void _TrilinearInnerElType_Execute( void* elementType, void *data ){
@@ -172,6 +176,9 @@ void _TrilinearInnerElType_Destroy( void
 void _TrilinearInnerElType_Destroy( void* elementType, void *data ){
 	TrilinearInnerElType* self = (TrilinearInnerElType*)elementType;
 	
+	Memory_Free( self->evaluatedShapeFunc );
+	Memory_Free( self->GNi );
+
 	FreeArray( self->tetInds );
 
 	_ElementType_Destroy( self, data );