use idxtype instead of int for metis

This commit is contained in:
Matthias Hochsteger 2016-02-16 19:04:08 +01:00
parent d0ba57fd3a
commit 0db3dc8c54

View File

@ -794,10 +794,10 @@ namespace netgen
eptr.Append (eind.Size()); eptr.Append (eind.Size());
Array<idx_t> epart(ne), npart(nn); Array<idx_t> epart(ne), npart(nn);
int nparts = ntasks-1; idxtype nparts = ntasks-1;
int edgecut; idxtype edgecut;
int ncommon = 3; idxtype ncommon = 3;
METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts, METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts,
NULL, NULL, NULL, NULL,
&edgecut, &epart[0], &npart[0]); &edgecut, &epart[0], &npart[0]);
@ -1029,11 +1029,11 @@ namespace netgen
eptr.Append (eind.Size()); eptr.Append (eind.Size());
Array<idx_t> epart(ne), npart(nn); Array<idx_t> epart(ne), npart(nn);
int nparts = ntasks-1; idxtype nparts = ntasks-1;
int edgecut; idxtype edgecut;
int ncommon = 3; idxtype ncommon = 3;
METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts, METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts,
NULL, NULL, NULL, NULL,
&edgecut, &epart[0], &npart[0]); &edgecut, &epart[0], &npart[0]);
@ -1266,7 +1266,7 @@ namespace netgen
for ( int vert = 0; vert < nn; vert++ ) for ( int vert = 0; vert < nn; vert++ )
{ {
FlatArray<int> array ( cnt[vert], &adjacency[ xadj[vert] ] ); FlatArray<idxtype> array ( cnt[vert], &adjacency[ xadj[vert] ] );
BubbleSort(array); BubbleSort(array);
} }
@ -1377,7 +1377,7 @@ namespace netgen
for ( int el = 0; el < ne; el++ ) for ( int el = 0; el < ne; el++ )
{ {
FlatArray<int> array ( cnt[el], &adjacency[ xadj[el] ] ); FlatArray<idxtype> array ( cnt[el], &adjacency[ xadj[el] ] );
BubbleSort(array); BubbleSort(array);
} }
@ -1428,7 +1428,7 @@ namespace netgen
void Mesh :: PartDualHybridMesh2D ( ) void Mesh :: PartDualHybridMesh2D ( )
{ {
#ifdef METIS #ifdef METIS
int ne = GetNSE(); idxtype ne = GetNSE();
int nv = GetNV(); int nv = GetNV();
Array<idxtype> xadj(ne+1); Array<idxtype> xadj(ne+1);
@ -1484,11 +1484,11 @@ namespace netgen
idxtype *v_weights = NULL, *e_weights = NULL; idxtype *v_weights = NULL, *e_weights = NULL;
int weightflag = 0; idxtype weightflag = 0;
// int numflag = 0; // int numflag = 0;
int nparts = ntasks - 1; idxtype nparts = ntasks - 1;
int edgecut; idxtype edgecut;
Array<idxtype> part(ne); Array<idxtype> part(ne);
for ( int el = 0; el < ne; el++ ) for ( int el = 0; el < ne; el++ )