Upgrade SimpleX to the newer libqhull_r

Author: LourensVeen

src/amuse_simplex/src/Makefile

@@ -30,7 +30,7 @@ CXXCFLAGS := $(CXXCFLAGS_NO_C) -c
 export CXXCFLAGS
 
 MACRODEFS = -DH5_USE_16_API
-MYLIBS = -lqhull $(GSL_LIBS)  $(HDF5_LIBS)
+MYLIBS = -lqhull_r $(GSL_LIBS)  $(HDF5_LIBS)
 MYINCLUDE = -I$(KEYVALUE_PATH) $(HDF5_PLUGIN_FLAGS) $(HDF5_FLAGS) \
             -I$(PLUGINS)/octree -I$(PLUGINS)/hilbert -I$(SRC) \
             -I$(PLUGINS)/unit_sphere_tess/include $(GSL_FLAGS)

src/amuse_simplex/src/src/SimpleX.cpp

@@ -76,6 +76,9 @@ SimpleX::SimpleX(const string& output_path, const string& data_path){
   // Random number generator
   ran = gsl_rng_alloc (gsl_rng_taus);
 
+  // Qhull library
+  qh = &Qhull;
+
   // Method for RT
   ballisticTransport = 0;
   dirConsTransport = 0;
@@ -1183,7 +1186,7 @@ void SimpleX::compute_triangulation(){
       //assume for now the triangulation will be correct, check will follow
       correct = 1;      
       //call to qhull to do triangulation
-      int qh_error = qh_new_qhull(dimension, in_box.size(), pt_array, ismalloc, flags, NULL, errfile);
+      int qh_error = qh_new_qhull(qh, dimension, in_box.size(), pt_array, ismalloc, flags, NULL, errfile);
       if (!qh_error) {
 	//loop over all facets
 	FORALLfacets {
@@ -1192,11 +1195,11 @@ void SimpleX::compute_triangulation(){
 	    //store the simplex in simplices vector
 	    unsigned int r=0;
 	    Simpl tempSimpl;
-	    tempSimpl.set_volume( qh_facetarea(facet) );
+	    tempSimpl.set_volume( qh_facetarea(qh, facet) );
 
 	    FOREACHvertex_ (facet->vertices) {
 	      //store the indices of each simplex
-	      ids[r++]=idList[qh_pointid(vertex->point)];
+	      ids[r++]=idList[qh_pointid(qh, vertex->point)];
 	    }//for each facet
 
 	    tempSimpl.set_id1( in_box[ ids[0] ] );
@@ -1447,10 +1450,10 @@ void SimpleX::compute_triangulation(){
       }
 
       //free long memory
-      qh_freeqhull(!qh_ALL);
+      qh_freeqhull(qh, !qh_ALL);
 
       //free short memory and memory allocator
-      qh_memfreeshort (&curlong, &totlong);
+      qh_memfreeshort (qh, &curlong, &totlong);
       if (curlong || totlong) {
 	fprintf(errfile, "QHull: did not free %d bytes of long memory (%d pieces)", totlong, curlong);
       }

src/amuse_simplex/src/src/SimpleX.h

@@ -54,14 +54,8 @@ extern "C"
 #endif
 #include <stdio.h>
 #include <stdlib.h>
-#include <libqhull/libqhull.h>
-#include <libqhull/mem.h>
-#include <libqhull/qset.h>
-#include <libqhull/geom.h>
-#include <libqhull/merge.h>
-#include <libqhull/poly.h>
-#include <libqhull/io.h>
-#include <libqhull/stat.h>
+#include <libqhull_r/libqhull_r.h>
+#include <libqhull_r/geom_r.h>
 #if defined(__cplusplus)
 }
 #endif
@@ -542,6 +536,8 @@ class SimpleX{
     unsigned int*** maps;          //!< Array to hold the mappings between direction bins
     unsigned int number_of_directions; //!< Number of discretizations of the unit sphere for DCT
     unsigned int number_of_orientations;//!< Number of random rotations of the DCT discretization
+    qhT Qhull;                     //!< QHull main object
+    qhT *qh;                       //!< Points to Qhull, needed for Qhull macros to work
 };
 
 #endif

src/amuse_simplex/support/configure

@@ -5995,7 +5995,7 @@ return conftest::qh_freeqhull ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' qhull
+for ac_lib in '' qhull_r
 do
   if test -z "$ac_lib"; then
     ac_res="none required"

support/configure

@@ -14745,7 +14745,7 @@ return qh_freeqhull ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' qhull
+for ac_lib in '' qhull_r
 do
   if test -z "$ac_lib"; then
     ac_res="none required"
@@ -15216,6 +15216,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
     amuse_lib_healpix_cxx_save_libs="$LIBS"
 
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HEALPix" >&5
+printf %s "checking for HEALPix... " >&6; }
+
     ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -15229,7 +15232,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 /* end confdefs.h.  */
 
 
-            #include <healpix_base.h>
+            #include <healpix_cxx/healpix_base.h>
 
 #ifdef F77_DUMMY_MAIN
 
@@ -15243,7 +15246,7 @@ int
 main (void)
 {
 
-            Healpix_Base hb();
+            Healpix_Base hb;
 
   ;
   return 0;
@@ -15257,6 +15260,9 @@ then :
         HEALPIX_CXX_CFLAGS=""
         HEALPIX_CXX_LIBS="$LIBS"
 
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
 else $as_nop
 
         # Not found, try pkg-config instead
@@ -15321,12 +15327,16 @@ fi
 
 
             FOUND_HEALPIX_CXX="no"
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 elif test $pkg_failed = untried; then
      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
             FOUND_HEALPIX_CXX="no"
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 else
 	HEALPIX_CXX_CFLAGS=$pkg_cv_HEALPIX_CXX_CFLAGS
@@ -15335,6 +15345,8 @@ else
 printf "%s\n" "yes" >&6; }
 
             FOUND_HEALPIX_CXX="yes"
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 

support/shared/m4/amuse_lib_qhull.m4

@@ -14,7 +14,7 @@ AC_DEFUN([AMUSE_LIB_QHULL], [
     amuse_lib_qhull_save_libs="$LIBS"
 
     LIBS=""
-    AC_SEARCH_LIBS([qh_freeqhull], [qhull], [
+    AC_SEARCH_LIBS([qh_freeqhull], [qhull_r], [
         FOUND_QHULL="yes"
     ], [])
     QHULL_LIBS="$LIBS"