[SCM] Packaging for getfem++ branch, experimental, updated. debian/4.2-1_exp1-11-g7d43327

Anton Gladky gladky.anton at gmail.com
Sun Feb 3 16:10:51 UTC 2013


The following commit has been merged in the experimental branch:
commit bd0d183a57617fe415a601cb9a553388d8efad95
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Feb 3 13:37:00 2013 +0100

    Respect GETFEM_HAVE_METIS variable.

diff --git a/debian/patches/respect_nometis_flag.patch b/debian/patches/respect_nometis_flag.patch
new file mode 100644
index 0000000..6c3be9e
--- /dev/null
+++ b/debian/patches/respect_nometis_flag.patch
@@ -0,0 +1,34 @@
+Description: respect GETFEM_HAVE_METIS variable
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-02-03
+
+--- a/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
++++ b/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
+@@ -42,6 +42,7 @@
+ #include "getfem/getfem_mesh_fem_sum.h"
+ #include "gmm/gmm_inoutput.h"
+ 
++#ifdef GETFEM_HAVE_METIS 
+ extern "C" void METIS_PartGraphKway(int *, int *, int *, int *, int *, int *,
+ 			    int *, int *, int *, int *, int *);
+ extern "C" void METIS_PartGraphRecursive(int *, int *, int *, int *, int *, int *,
+@@ -52,6 +53,7 @@
+ 				      int *, int *, float *, int *, int *, int *);
+ extern "C" void METIS_mCPartGraphRecursive(int *, int *, int *, int *, int *, int *, int *,
+ 				      int *, int *, int *, int *, int *);
++#endif
+ 
+ /* some Getfem++ types that we will be using */
+ using bgeot::base_small_vector; /* special class for small (dim<16) vectors */
+@@ -506,9 +508,10 @@
+   //			 &numflag, &nparts,  options, &edgecut, &(part[0]));
+   //METIS_PartGraphKway(&ne, &(xadj[0]), &(adjncy[0]), &(vwgt[0]), &(adjwgt[0]), &wgtflag,
+   //	  &numflag, &nparts, options, &edgecut, &(part[0]));
++  #ifdef GETFEM_HAVE_METIS 
+   METIS_PartGraphRecursive(&ne, &(xadj[0]), &(adjncy[0]), &(vwgt[0]), &(adjwgt[0]), &wgtflag,
+ 			   &numflag, &nparts, options, &edgecut, &(part[0]));
+-  
++  #endif
+   //cout<<"size_of_mesh="<<h<<endl;
+   cout<<"size_of_crack="<< size_of_crack <<endl;
+   cout<<"nb_partition="<<nparts<<endl;
diff --git a/debian/patches/series b/debian/patches/series
index ef89a8d..7cd27c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_mumps_error.patch
 #inlineequation.diff
 
 stream_redirect.diff
+respect_nometis_flag.patch

-- 
Packaging for getfem++



More information about the debian-science-commits mailing list