| 1 |
commit: 4a0832f4a3fbc03195c3f9a2bbadde48c40b58a4 |
| 2 |
Author: Grégory Salvan <apieum <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 20 22:26:59 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 22 08:36:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a0832f4 |
| 7 |
|
| 8 |
merge parallelmesh.cpp patches |
| 9 |
|
| 10 |
...dora-metis.patch => netgen-5.x-metis-fixes.patch} | 15 ++++++++++++--- |
| 11 |
.../netgen/files/netgen-5.x-metis-numflag.patch | 20 -------------------- |
| 12 |
sci-mathematics/netgen/netgen-5.3.1.ebuild | 5 ++--- |
| 13 |
3 files changed, 14 insertions(+), 26 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch |
| 16 |
similarity index 85% |
| 17 |
rename from sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch |
| 18 |
rename to sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch |
| 19 |
index 68b3396..cf59613 100644 |
| 20 |
--- a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch |
| 21 |
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
---- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-20 21:55:59.227450843 +0100 |
| 24 |
-+++ ./netgen/libsrc/meshing/parallelmesh.cpp 2016-02-20 21:46:32.331435233 +0100 |
| 25 |
+--- netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp 2014-08-29 11:54:05.000000000 +0200 |
| 26 |
++++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-20 23:07:00.350568182 +0100 |
| 27 |
@@ -14,7 +14,7 @@ |
| 28 |
|
| 29 |
#if METIS_VER_MAJOR >= 5 |
| 30 |
@@ -47,6 +47,15 @@ |
| 31 |
BubbleSort(array); |
| 32 |
} |
| 33 |
|
| 34 |
+@@ -1318,7 +1318,7 @@ |
| 35 |
+ idxtype *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL; |
| 36 |
+ |
| 37 |
+ int weightflag = 0; |
| 38 |
+- // int numflag = 0; |
| 39 |
++ int numflag = 0; |
| 40 |
+ int nparts = ntasks - 1; |
| 41 |
+ |
| 42 |
+ int options[5]; |
| 43 |
@@ -1377,7 +1377,7 @@ |
| 44 |
|
| 45 |
for ( int el = 0; el < ne; el++ ) |
| 46 |
@@ -72,7 +81,7 @@ |
| 47 |
idxtype *v_weights = NULL, *e_weights = NULL; |
| 48 |
|
| 49 |
- int weightflag = 0; |
| 50 |
-- int numflag = 0; |
| 51 |
+- // int numflag = 0; |
| 52 |
- int nparts = ntasks - 1; |
| 53 |
+ metis::idx_t weightflag = 0; |
| 54 |
+ metis::idx_t numflag = 0; |
| 55 |
|
| 56 |
diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch |
| 57 |
deleted file mode 100644 |
| 58 |
index 9e5ba88..0000000 |
| 59 |
--- a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch |
| 60 |
+++ /dev/null |
| 61 |
@@ -1,20 +0,0 @@ |
| 62 |
---- libsrc/meshing/parallelmesh.cpp 2014-08-29 11:54:05.000000000 +0200 |
| 63 |
-+++ libsrc/meshing/parallelmesh.cpp 2016-02-11 19:12:14.474185736 +0100 |
| 64 |
-@@ -1318,7 +1318,7 @@ |
| 65 |
- idxtype *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL; |
| 66 |
- |
| 67 |
- int weightflag = 0; |
| 68 |
-- // int numflag = 0; |
| 69 |
-+ int numflag = 0; |
| 70 |
- int nparts = ntasks - 1; |
| 71 |
- |
| 72 |
- int options[5]; |
| 73 |
-@@ -1485,7 +1485,7 @@ |
| 74 |
- idxtype *v_weights = NULL, *e_weights = NULL; |
| 75 |
- |
| 76 |
- int weightflag = 0; |
| 77 |
-- // int numflag = 0; |
| 78 |
-+ int numflag = 0; |
| 79 |
- int nparts = ntasks - 1; |
| 80 |
- |
| 81 |
- int edgecut; |
| 82 |
|
| 83 |
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
| 84 |
index cf09c82..0c2da7d 100644 |
| 85 |
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild |
| 86 |
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
| 87 |
@@ -35,9 +35,8 @@ src_prepare() { |
| 88 |
default |
| 89 |
# Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824 |
| 90 |
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch" |
| 91 |
- epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch" |
| 92 |
- # Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch |
| 93 |
- epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch" |
| 94 |
+ # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch |
| 95 |
+ epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch" |
| 96 |
epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch" |
| 97 |
if use mpi; then |
| 98 |
export CC=mpicc |
Archives