[cig-commits] r4357 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Geometry/src
walter at geodynamics.org
walter at geodynamics.org
Thu Aug 17 17:18:17 PDT 2006
Author: walter
Date: 2006-08-17 17:18:15 -0700 (Thu, 17 Aug 2006)
New Revision: 4357
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
Log:
r2724 at earth: boo | 2006-08-17 17:14:29 -0700
r2678 at earth (orig r3759): RaquibulHassan | 2006-08-08 03:11:41 -0700
Changing the return types of a few accessor functions.
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2723
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3758
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2724
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3759
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c 2006-08-18 00:18:11 UTC (rev 4356)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c 2006-08-18 00:18:15 UTC (rev 4357)
@@ -428,6 +428,7 @@
self->idOffset = idOffset;
_Delaunay_Init( self );
+ _Delaunay_Build( self, NULL );
}
void _Delaunay_Build( void* delaunay, void* data )
@@ -653,19 +654,19 @@
QuadEdge *edges = NULL;
Site *sites = NULL;
int maxEdges = 0;
- int **triIndices = NULL;
+ unsigned int **triIndices = NULL;
int **edgeToTriangle = NULL;
int index = 0;
assert( delaunay );
- delaunay->triangleIndices = Memory_Alloc_Array_Unnamed( int*, delaunay->numFaces );
- delaunay->triangleIndices[0] = Memory_Alloc_Array_Unnamed( int, delaunay->numFaces * 3 );
- memset( delaunay->triangleIndices[0] , 0, sizeof(int) * delaunay->numFaces * 3 );
+ delaunay->triangleIndices = Memory_Alloc_Array_Unnamed( unsigned int*, delaunay->numFaces );
+ delaunay->triangleIndices[0] = Memory_Alloc_Array_Unnamed( unsigned int, delaunay->numFaces * 3 );
+ memset( delaunay->triangleIndices[0] , 0, sizeof(unsigned int) * delaunay->numFaces * 3 );
if( delaunay->attributes->BuildTriangleNeighbours ){
- delaunay->triangleNeighbours = Memory_Alloc_Array_Unnamed( int*, delaunay->numFaces );
- delaunay->triangleNeighbours[0] = Memory_Alloc_Array_Unnamed( int, delaunay->numFaces * 3 );
+ delaunay->triangleNeighbours = Memory_Alloc_Array_Unnamed( unsigned int*, delaunay->numFaces );
+ delaunay->triangleNeighbours[0] = Memory_Alloc_Array_Unnamed( unsigned int, delaunay->numFaces * 3 );
edgeToTriangle = Memory_Alloc_Array_Unnamed( int*, delaunay->qp->numQuadEdges );
edgeToTriangle[0] = Memory_Alloc_Array_Unnamed( int, delaunay->qp->numQuadEdges * 2 );
@@ -677,9 +678,9 @@
if( delaunay->attributes->BuildTriangleNeighbours ){
delaunay->triangleNeighbours[i] = delaunay->triangleNeighbours[0]+i*3;
- delaunay->triangleNeighbours[i][0] = delaunay->numFaces;
- delaunay->triangleNeighbours[i][1] = delaunay->numFaces;
- delaunay->triangleNeighbours[i][2] = delaunay->numFaces;
+ delaunay->triangleNeighbours[i][0] = delaunay->numFaces-1;
+ delaunay->triangleNeighbours[i][1] = delaunay->numFaces-1;
+ delaunay->triangleNeighbours[i][2] = delaunay->numFaces-1;
}
}
@@ -687,8 +688,8 @@
for( i=0; i<delaunay->qp->numQuadEdges; i++ ){
edgeToTriangle[i] = edgeToTriangle[0]+i*2;
- edgeToTriangle[i][0] = delaunay->numFaces;
- edgeToTriangle[i][1] = delaunay->numFaces;
+ edgeToTriangle[i][0] = delaunay->numFaces-1;
+ edgeToTriangle[i][1] = delaunay->numFaces-1;
}
}
@@ -780,10 +781,10 @@
if( IS_FREE( (QuadEdgeRef)(&(delaunay->qp->quadEdges[i])) ) ) continue;
- if( edgeToTriangle[i][0] != delaunay->numFaces )
+ if( edgeToTriangle[i][0] != (delaunay->numFaces-1) )
delaunay->triangleNeighbours[edgeToTriangle[i][0]][triangleNeighbourCount[edgeToTriangle[i][0]]++] = edgeToTriangle[i][1];
- if( edgeToTriangle[i][1] > delaunay->numFaces )
+ if( edgeToTriangle[i][1] != (delaunay->numFaces-1) )
delaunay->triangleNeighbours[edgeToTriangle[i][1]][triangleNeighbourCount[edgeToTriangle[i][1]]++] = edgeToTriangle[i][0];
}
@@ -865,8 +866,9 @@
float dist = 0.0f, diffx = 0.0f, diffy = 0.0f, voronoiAreaResult = 0.0;
Site *sites = NULL;
QuadEdge *edges = NULL;
- int *numNeighbours, *hull;
- int **neighbours;
+ unsigned int *numNeighbours;
+ int *hull;
+ unsigned int **neighbours;
float *voronoiArea, **sides;
DelaunayAttributes *attr = NULL;
@@ -882,8 +884,8 @@
edges[i].count = 0;
}
- delaunay->numNeighbours = Memory_Alloc_Array_Unnamed( int, numSites );
- memset( delaunay->numNeighbours, 0, sizeof( int ) * numSites );
+ delaunay->numNeighbours = Memory_Alloc_Array_Unnamed( unsigned int, numSites );
+ memset( delaunay->numNeighbours, 0, sizeof( unsigned int ) * numSites );
numNeighbours = delaunay->numNeighbours;
hull = delaunay->hull;
@@ -920,9 +922,9 @@
}
if( attr->FindNeighbours ){
- delaunay->neighbours = Memory_Alloc_Array_Unnamed( int*, numSites );
- delaunay->neighbours[0] = Memory_Alloc_Array_Unnamed( int, numNeighboursSum );
- memset( delaunay->neighbours[0], 0, sizeof( int ) * numNeighboursSum );
+ delaunay->neighbours = Memory_Alloc_Array_Unnamed( unsigned int*, numSites );
+ delaunay->neighbours[0] = Memory_Alloc_Array_Unnamed( unsigned int, numNeighboursSum );
+ memset( delaunay->neighbours[0], 0, sizeof( unsigned int ) * numNeighboursSum );
}
if( attr->CalculateVoronoiSides ){
@@ -1016,7 +1018,7 @@
/* Accessor functions below for accessing arrays inside the class */
-int **Delaunay_GetTriangleIndices( Delaunay *delaunay )
+unsigned int **Delaunay_GetTriangleIndices( Delaunay *delaunay )
{
assert( delaunay );
@@ -1037,14 +1039,14 @@
return delaunay->voronoiArea;
}
-int *Delaunay_GetNumNeighbours( Delaunay *delaunay )
+unsigned int *Delaunay_GetNumNeighbours( Delaunay *delaunay )
{
assert( delaunay );
return delaunay->numNeighbours;
}
-int **Delaunay_GetNeighbours( Delaunay *delaunay )
+unsigned int **Delaunay_GetNeighbours( Delaunay *delaunay )
{
assert( delaunay );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.h 2006-08-18 00:18:11 UTC (rev 4356)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.h 2006-08-18 00:18:15 UTC (rev 4357)
@@ -76,11 +76,11 @@
int numVoronoiSites; \
int numTriangles; \
int numFaces; \
- int **triangleIndices; \
- int **triangleNeighbours; \
+ unsigned int **triangleIndices; \
+ unsigned int **triangleNeighbours; \
int numVoronoiVertices; \
- int *numNeighbours; \
- int **neighbours; \
+ unsigned int *numNeighbours; \
+ unsigned int **neighbours; \
float **voronoiSides; \
float *voronoiArea; \
int *hull; \
@@ -162,11 +162,11 @@
void _Delaunay_Destroy( void* delaunay, void* data );
- int **Delaunay_GetTriangleIndices( Delaunay *delaunay );
+ unsigned int **Delaunay_GetTriangleIndices( Delaunay *delaunay );
float **Delaunay_GetVoronoiSides( Delaunay *delaunay );
float *Delaunay_GetSurfaceArea( Delaunay *delaunay );
- int *Delaunay_GetNumNeighbours( Delaunay *delaunay );
- int **Delaunay_GetNeighbours( Delaunay *delaunay );
+ unsigned int *Delaunay_GetNumNeighbours( Delaunay *delaunay );
+ unsigned int **Delaunay_GetNeighbours( Delaunay *delaunay );
int *Delaunay_GetHull( Delaunay *delaunay );
/*--------------------------------------------------------------------------------------------------------------------------
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c 2006-08-18 00:18:11 UTC (rev 4356)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c 2006-08-18 00:18:15 UTC (rev 4357)
@@ -585,16 +585,16 @@
int maxEdges = 0;
int rank = 0;
int pass = 0;
- int **triIndices = NULL;
+ unsigned int **triIndices = NULL;
Delaunay *delaunay = NULL;
delaunay = pd->localTriangulation;
assert( delaunay );
- delaunay->triangleIndices = Memory_Alloc_Array_Unnamed( int*, delaunay->numFaces );
- delaunay->triangleIndices[0] = Memory_Alloc_Array_Unnamed( int, delaunay->numFaces * 3 );
- memset( delaunay->triangleIndices[0] , 0, sizeof(int) * delaunay->numFaces * 3 );
+ delaunay->triangleIndices = Memory_Alloc_Array_Unnamed( unsigned int*, delaunay->numFaces );
+ delaunay->triangleIndices[0] = Memory_Alloc_Array_Unnamed( unsigned int, delaunay->numFaces * 3 );
+ memset( delaunay->triangleIndices[0] , 0, sizeof(unsigned int) * delaunay->numFaces * 3 );
for( i=0; i<delaunay->numFaces; i++ ){
delaunay->triangleIndices[i] = delaunay->triangleIndices[0]+i*3;
@@ -687,7 +687,7 @@
}
if( pd->attributes->FindNeighbours ){
- pd->numNeighbours = Memory_Alloc_Array_Unnamed( int, pd->numInputSites );
+ pd->numNeighbours = Memory_Alloc_Array_Unnamed( unsigned int, pd->numInputSites );
}
count = 0;
@@ -715,8 +715,8 @@
}
if( pd->attributes->FindNeighbours ){
- pd->neighbours = Memory_Alloc_Array_Unnamed( int*, pd->numInputSites );
- pd->neighbours[0] = Memory_Alloc_Array_Unnamed( int, numNeighboursSum );
+ pd->neighbours = Memory_Alloc_Array_Unnamed( unsigned int*, pd->numInputSites );
+ pd->neighbours[0] = Memory_Alloc_Array_Unnamed( unsigned int, numNeighboursSum );
}
if( pd->attributes->CalculateVoronoiSides ){
@@ -794,7 +794,7 @@
}
if( pd->attributes->BuildTriangleIndices ){
- int **triIndices = NULL;
+ unsigned int **triIndices = NULL;
int globalNumTriangles = 0;
Delaunay *delaunay = NULL;
int *triCountArray = NULL;
@@ -817,12 +817,12 @@
if( rank == MASTER_PROC ){
- pd->triangleIndices = Memory_Alloc_Array_Unnamed( int*, globalNumTriangles );
- pd->triangleIndices[0] = Memory_Alloc_Array_Unnamed( int, globalNumTriangles*3 );
+ pd->triangleIndices = Memory_Alloc_Array_Unnamed( unsigned int*, globalNumTriangles );
+ pd->triangleIndices[0] = Memory_Alloc_Array_Unnamed( unsigned int, globalNumTriangles*3 );
if ( pd->attributes->BuildTriangleNeighbours ){
- pd->triangleNeighbours = Memory_Alloc_Array_Unnamed( int*, globalNumTriangles );
- pd->triangleNeighbours[0] = Memory_Alloc_Array_Unnamed( int, globalNumTriangles*3 );
+ pd->triangleNeighbours = Memory_Alloc_Array_Unnamed( unsigned int*, globalNumTriangles );
+ pd->triangleNeighbours[0] = Memory_Alloc_Array_Unnamed( unsigned int, globalNumTriangles*3 );
}
triCountArray[0] = triCount;
More information about the cig-commits
mailing list