|
 |
accac45 |
diff -rupN netgen-5.3.0/libsrc/meshing/parallelmesh.cpp netgen-5.3.0-new/libsrc/meshing/parallelmesh.cpp
|
|
|
accac45 |
--- netgen-5.3.0/libsrc/meshing/parallelmesh.cpp 2014-09-01 20:54:48.987249216 +0200
|
|
|
accac45 |
+++ netgen-5.3.0-new/libsrc/meshing/parallelmesh.cpp 2014-09-01 21:02:25.783230174 +0200
|
|
|
8fe3486 |
@@ -14,7 +14,7 @@ namespace metis {
|
|
|
8fe3486 |
|
|
|
8fe3486 |
#if METIS_VER_MAJOR >= 5
|
|
|
8fe3486 |
#define METIS5
|
|
|
8fe3486 |
- typedef idx_t idxtype;
|
|
|
8fe3486 |
+ typedef metis::idx_t idxtype;
|
|
|
8fe3486 |
#else
|
|
|
8fe3486 |
#define METIS4
|
|
|
8fe3486 |
typedef idxtype idx_t;
|
|
|
8fe3486 |
@@ -794,10 +794,10 @@ namespace netgen
|
|
|
8fe3486 |
eptr.Append (eind.Size());
|
|
|
8fe3486 |
Array<idx_t> epart(ne), npart(nn);
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- int nparts = ntasks-1;
|
|
|
8fe3486 |
- int edgecut;
|
|
|
8fe3486 |
+ metis::idx_t nparts = ntasks-1;
|
|
|
8fe3486 |
+ metis::idx_t edgecut;
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- int ncommon = 3;
|
|
|
8fe3486 |
+ metis::idx_t ncommon = 3;
|
|
|
8fe3486 |
METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts,
|
|
|
8fe3486 |
NULL, NULL,
|
|
|
8fe3486 |
&edgecut, &epart[0], &npart[0]);
|
|
|
accac45 |
@@ -1029,11 +1029,11 @@ namespace netgen
|
|
|
8fe3486 |
eptr.Append (eind.Size());
|
|
|
8fe3486 |
Array<idx_t> epart(ne), npart(nn);
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- int nparts = ntasks-1;
|
|
|
8fe3486 |
- int edgecut;
|
|
|
8fe3486 |
+ metis::idx_t nparts = ntasks-1;
|
|
|
8fe3486 |
+ metis::idx_t edgecut;
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- int ncommon = 3;
|
|
|
8fe3486 |
+ metis::idx_t ncommon = 3;
|
|
|
8fe3486 |
METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts,
|
|
|
8fe3486 |
NULL, NULL,
|
|
|
8fe3486 |
&edgecut, &epart[0], &npart[0]);
|
|
|
accac45 |
@@ -1266,7 +1266,7 @@ namespace netgen
|
|
|
8fe3486 |
|
|
|
8fe3486 |
for ( int vert = 0; vert < nn; vert++ )
|
|
|
8fe3486 |
{
|
|
|
8fe3486 |
- FlatArray<int> array ( cnt[vert], &adjacency[ xadj[vert] ] );
|
|
|
8fe3486 |
+ FlatArray<metis::idx_t> array ( cnt[vert], &adjacency[ xadj[vert] ] );
|
|
|
8fe3486 |
BubbleSort(array);
|
|
|
8fe3486 |
}
|
|
|
8fe3486 |
|
|
|
accac45 |
@@ -1377,7 +1377,7 @@ namespace netgen
|
|
|
8fe3486 |
|
|
|
8fe3486 |
for ( int el = 0; el < ne; el++ )
|
|
|
8fe3486 |
{
|
|
|
8fe3486 |
- FlatArray<int> array ( cnt[el], &adjacency[ xadj[el] ] );
|
|
|
8fe3486 |
+ FlatArray<metis::idx_t> array ( cnt[el], &adjacency[ xadj[el] ] );
|
|
|
8fe3486 |
BubbleSort(array);
|
|
|
8fe3486 |
}
|
|
|
8fe3486 |
|
|
|
accac45 |
@@ -1428,8 +1428,8 @@ namespace netgen
|
|
|
8fe3486 |
void Mesh :: PartDualHybridMesh2D ( )
|
|
|
8fe3486 |
{
|
|
|
8fe3486 |
#ifdef METIS
|
|
|
8fe3486 |
- int ne = GetNSE();
|
|
|
8fe3486 |
- int nv = GetNV();
|
|
|
8fe3486 |
+ metis::idx_t ne = GetNSE();
|
|
|
8fe3486 |
+ metis::idx_t nv = GetNV();
|
|
|
8fe3486 |
|
|
|
8fe3486 |
Array<idxtype> xadj(ne+1);
|
|
|
8fe3486 |
Array<idxtype> adjacency(ne*4);
|
|
|
accac45 |
@@ -1484,18 +1484,18 @@ namespace netgen
|
|
|
8fe3486 |
|
|
|
8fe3486 |
idxtype *v_weights = NULL, *e_weights = NULL;
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- int weightflag = 0;
|
|
|
accac45 |
- // int numflag = 0;
|
|
|
8fe3486 |
- int nparts = ntasks - 1;
|
|
|
8fe3486 |
+ metis::idx_t weightflag = 0;
|
|
|
8fe3486 |
+ metis::idx_t numflag = 0;
|
|
|
8fe3486 |
+ metis::idx_t nparts = ntasks - 1;
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- int edgecut;
|
|
|
8fe3486 |
+ metis::idx_t edgecut;
|
|
|
8fe3486 |
Array<idxtype> part(ne);
|
|
|
8fe3486 |
|
|
|
8fe3486 |
for ( int el = 0; el < ne; el++ )
|
|
|
accac45 |
BubbleSort (adjacency.Range (xadj[el], xadj[el+1]));
|
|
|
accac45 |
|
|
|
accac45 |
#ifdef METIS4
|
|
|
accac45 |
- int options[5];
|
|
|
accac45 |
+ metis::idx_t options[5];
|
|
|
accac45 |
options[0] = 0;
|
|
|
accac45 |
METIS_PartGraphKway ( &ne, &xadj[0], &adjacency[0], v_weights, e_weights, &weightflag,
|
|
|
accac45 |
&numflag, &nparts, options, &edgecut, &part[0] );
|