[cig-commits] r4857 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Mesh/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:47:26 -0700 (Wed, 11 Oct 2006)
New Revision: 4857

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.h
Log:
 r2914 at earth:  boo | 2006-10-11 13:42:40 -0700
  r2830 at earth (orig r3818):  LukeHodkinson | 2006-09-27 01:16:16 -0700
  * Removed a couple of warnings.
  * Forgot to update sub-classes' virtual methods.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2913
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3817
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2914
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3818

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c	2006-10-11 20:47:20 UTC (rev 4856)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c	2006-10-11 20:47:26 UTC (rev 4857)
@@ -48,6 +48,7 @@
 #include "Decomp_Sync.h"
 #include "MeshTopology.h"
 #include "HexaMD.h"
+#include "MeshClass.h"
 
 
 /* Textual name of this class */

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c	2006-10-11 20:47:20 UTC (rev 4856)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c	2006-10-11 20:47:26 UTC (rev 4857)
@@ -504,7 +504,7 @@
 }
 
 
-Element_GlobalIndex _IrregEL_ElementWithPoint( void* irregEL, void* decomp, Coord point,
+Element_GlobalIndex _IrregEL_ElementWithPoint( void* irregEL, void* decomp, Coord point, void* mesh, 
 					       PartitionBoundaryStatus boundaryStatus, unsigned nHints, unsigned* hints )
 {		
 	/* Not yet supported */

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.h	2006-10-11 20:47:20 UTC (rev 4856)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.h	2006-10-11 20:47:26 UTC (rev 4857)
@@ -150,7 +150,7 @@
 	
 	void _IrregEL_EdgeAt( void* irregEL, Index index, Edge edge );
 	
-	Element_GlobalIndex _IrregEL_ElementWithPoint( void* irregEL, void* decomp, Coord point,
+	Element_GlobalIndex _IrregEL_ElementWithPoint( void* irregEL, void* decomp, Coord point, void* mesh, 
 						       PartitionBoundaryStatus boundaryStatus, unsigned nHints, unsigned* hints );
 	
 	

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.c	2006-10-11 20:47:20 UTC (rev 4856)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshTopology.c	2006-10-11 20:47:26 UTC (rev 4857)
@@ -303,7 +303,8 @@
 	if( !self->domains[MT_VERTEX]->commTopo->nInc )
 		return;
 
-	shadows = Memory_Alloc_2DArray_Unnamed( RangeSet**, self->nTDims, self->domains[MT_VERTEX]->commTopo->nInc );
+	shadows = (RangeSet***)Memory_Alloc_2DArray_Unnamed( RangeSet**, self->nTDims, 
+							     self->domains[MT_VERTEX]->commTopo->nInc );
 	MeshTopology_BuildTopShadows( self, shadows + self->nDims );
 	MeshTopology_BuildAllShadows( self, shadows );
 	MeshTopology_BuildShadowInc( self, shadows, &incSizes, &shadowInc );

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c	2006-10-11 20:47:20 UTC (rev 4856)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c	2006-10-11 20:47:26 UTC (rev 4857)
@@ -467,7 +467,7 @@
 }
 
 
-Element_DomainIndex _ParallelPipedHexaEL_ElementWithPoint( void* parallelPipedHexaEL, void* decomp, Coord point,
+Element_DomainIndex _ParallelPipedHexaEL_ElementWithPoint( void* parallelPipedHexaEL, void* decomp, Coord point, void* mesh, 
 							   PartitionBoundaryStatus boundaryStatus, unsigned nHints, unsigned* hints )
 {
 	ParallelPipedHexaEL*	self = (ParallelPipedHexaEL*)parallelPipedHexaEL;

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.h	2006-10-11 20:47:20 UTC (rev 4856)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.h	2006-10-11 20:47:26 UTC (rev 4857)
@@ -155,7 +155,7 @@
 	
 	Bool _ParallelPipedHexaEL_GetStaticMinAndMaxGlobalCoords( void* parallelPipedHexaEL, Coord min, Coord max );
 
-	Element_GlobalIndex _ParallelPipedHexaEL_ElementWithPoint( void* parallelPipedHexaEL, void* decomp, Coord point,
+	Element_GlobalIndex _ParallelPipedHexaEL_ElementWithPoint( void* parallelPipedHexaEL, void* decomp, Coord point, void* mesh, 
 								   PartitionBoundaryStatus boundaryStatus, unsigned nHints, unsigned* hints );
 	
 	/*--------------------------------------------------------------------------------------------------------------------------