Permalink
Browse files

Merge pull request #25 from benkirk/meshfree_interp

MeshFree Interpolation, merged.
  • Loading branch information...
benkirk committed Dec 27, 2012
2 parents 77f924f + 5e7d756 commit 376a8aad29b35e9096c2a87829e9ee4ee9335c87
Showing with 38,866 additions and 274 deletions.
  1. +3 −0 .gitignore
  2. +106 −43 Makefile.in
  3. +1 −0 aclocal.m4
  4. +64 −1 configure
  5. +1 −0 configure.ac
  6. +5 −0 contrib/Makefile.am
  7. +17 −12 contrib/Makefile.in
  8. +5 −3 contrib/boost/include/Makefile.in
  9. +5 −3 contrib/exodusii/Lib/Makefile.in
  10. +5 −3 contrib/fparser/Makefile.in
  11. +5 −3 contrib/fparser/extrasrc/Makefile.in
  12. +5 −3 contrib/gmv/Makefile.in
  13. +5 −3 contrib/gzstream/Makefile.in
  14. +5 −3 contrib/laspack/Makefile.in
  15. +5 −3 contrib/libHilbert/Makefile.in
  16. +5 −3 contrib/metis/Makefile.in
  17. +36 −0 contrib/nanoflann/CHANGELOG.txt
  18. +127 −0 contrib/nanoflann/CMakeLists.txt
  19. +29 −0 contrib/nanoflann/COPYING
  20. +1,679 −0 contrib/nanoflann/Doxyfile
  21. +37 −0 contrib/nanoflann/Makefile.am
  22. +970 −0 contrib/nanoflann/Makefile.in
  23. +10 −0 contrib/nanoflann/README.txt
  24. +15 −0 contrib/nanoflann/README_wiki.html
  25. +27 −0 contrib/nanoflann/cmake_uninstall.cmake.in
  26. +87 −0 contrib/nanoflann/configure
  27. BIN contrib/nanoflann/doc/logo.png
  28. BIN contrib/nanoflann/doc/perf1_conv_matrix.png
  29. BIN contrib/nanoflann/doc/perf1_conv_matrix.small.png
  30. BIN contrib/nanoflann/doc/perf2_build_index.png
  31. BIN contrib/nanoflann/doc/perf2_build_index.small.png
  32. BIN contrib/nanoflann/doc/perf3_query.png
  33. BIN contrib/nanoflann/doc/perf3_query.small.png
  34. BIN contrib/nanoflann/doc/perf4_time_saved.png
  35. BIN contrib/nanoflann/doc/perf4_time_saved.small.png
  36. BIN contrib/nanoflann/doc/perf5_1e5pts_time_vs_maxleaf.png
  37. BIN contrib/nanoflann/doc/perf5_1e5pts_time_vs_maxleaf_double.png
  38. BIN contrib/nanoflann/doc/perf5_1e5pts_time_vs_maxleaf_real_dataset.png
  39. +11 −0 contrib/nanoflann/examples/CMakeLists.txt
  40. +134 −0 contrib/nanoflann/examples/example_with_pkgconfig/pointcloud_example.cpp
  41. +115 −0 contrib/nanoflann/examples/matrix_example.cpp
  42. +155 −0 contrib/nanoflann/examples/pointcloud_adaptor_example.cpp
  43. +148 −0 contrib/nanoflann/examples/pointcloud_example.cpp
  44. +161 −0 contrib/nanoflann/examples/pointcloud_kdd_radius.cpp
  45. +192 −0 contrib/nanoflann/examples/vector_of_vectors_example.cpp
  46. +1,302 −0 contrib/nanoflann/include/nanoflann.hpp
  47. +14 −0 contrib/nanoflann/nanoflann.pc.in
  48. +6 −0 contrib/nanoflann/packaging/README.txt
  49. +7 −0 contrib/nanoflann/packaging/debian/changelog
  50. +1 −0 contrib/nanoflann/packaging/debian/compat
  51. +32 −0 contrib/nanoflann/packaging/debian/control
  52. +40 −0 contrib/nanoflann/packaging/debian/copyright
  53. +3 −0 contrib/nanoflann/packaging/debian/libnanoflann-dev.install
  54. +81 −0 contrib/nanoflann/packaging/debian/rules
  55. +33 −0 contrib/nanoflann/perf-tests/README.txt
  56. +54 −0 contrib/nanoflann/perf-tests/analyze_leafsize_stats.m
  57. +75 −0 contrib/nanoflann/perf-tests/analyze_stats.m
  58. +164 −0 contrib/nanoflann/perf-tests/flann/test_flann.cpp
  59. +227 −0 contrib/nanoflann/perf-tests/nanoflann/test_leaf_max_size.cpp
  60. +188 −0 contrib/nanoflann/perf-tests/nanoflann/test_nanoflann.cpp
  61. BIN contrib/nanoflann/perf-tests/perf1_conv_matrix.pdf
  62. BIN contrib/nanoflann/perf-tests/perf2_build_index.pdf
  63. BIN contrib/nanoflann/perf-tests/perf3_query.pdf
  64. BIN contrib/nanoflann/perf-tests/perf4_time_saved.pdf
  65. BIN contrib/nanoflann/perf-tests/stats_raw_results-26_aug_2011.tar.bz
  66. +152 −0 contrib/nanoflann/scripts/prepare_debian.sh
  67. +102 −0 contrib/nanoflann/scripts/prepare_release.sh
  68. +82 −0 contrib/nanoflann/scripts/prepare_ubuntu_pkgs_for_ppa.sh
  69. +38 −0 contrib/nanoflann/tests/CMakeLists.txt
  70. +18 −0 contrib/nanoflann/tests/gtest-1.6.0/CMakeLists.txt
  71. +37 −0 contrib/nanoflann/tests/gtest-1.6.0/CONTRIBUTORS
  72. +28 −0 contrib/nanoflann/tests/gtest-1.6.0/COPYING
  73. +424 −0 contrib/nanoflann/tests/gtest-1.6.0/README
  74. +9,118 −0 contrib/nanoflann/tests/gtest-1.6.0/fused-src/gtest/gtest-all.cc
  75. +19,537 −0 contrib/nanoflann/tests/gtest-1.6.0/fused-src/gtest/gtest.h
  76. +39 −0 contrib/nanoflann/tests/gtest-1.6.0/fused-src/gtest/gtest_main.cc
  77. +161 −0 contrib/nanoflann/tests/test_main.cpp
  78. +5 −3 contrib/nemesis/Lib/Makefile.in
  79. +5 −3 contrib/netcdf/Lib/Makefile.in
  80. +5 −3 contrib/parmetis/Makefile.in
  81. +5 −3 contrib/sfcurves/Makefile.in
  82. +5 −3 contrib/tecplot/tecio/Makefile.in
  83. +5 −3 contrib/tetgen/Makefile.in
  84. +5 −3 contrib/triangle/Makefile.in
  85. +2 −0 doc/html/examples.php
  86. +1 −0 examples/Makefile.am
  87. +6 −3 examples/Makefile.in
  88. +5 −3 examples/adaptivity/adaptivity_ex1/Makefile.in
  89. +5 −3 examples/adaptivity/adaptivity_ex2/Makefile.in
  90. +5 −3 examples/adaptivity/adaptivity_ex3/Makefile.in
  91. +5 −3 examples/adaptivity/adaptivity_ex4/Makefile.in
  92. +5 −3 examples/adaptivity/adaptivity_ex5/Makefile.in
  93. +5 −3 examples/adjoints/adjoints_ex1/Makefile.in
  94. +5 −3 examples/adjoints/adjoints_ex2/Makefile.in
  95. +5 −3 examples/adjoints/adjoints_ex3/Makefile.in
  96. +5 −3 examples/adjoints/adjoints_ex4/Makefile.in
  97. +5 −3 examples/eigenproblems/eigenproblems_ex1/Makefile.in
  98. +5 −3 examples/eigenproblems/eigenproblems_ex2/Makefile.in
  99. +5 −3 examples/eigenproblems/eigenproblems_ex3/Makefile.in
  100. +5 −3 examples/fem_system/fem_system_ex1/Makefile.in
  101. +5 −3 examples/introduction/introduction_ex1/Makefile.in
  102. +5 −3 examples/introduction/introduction_ex2/Makefile.in
  103. +5 −3 examples/introduction/introduction_ex3/Makefile.in
  104. +5 −3 examples/introduction/introduction_ex4/Makefile.in
  105. +5 −3 examples/introduction/introduction_ex5/Makefile.in
  106. +5 −3 examples/miscellaneous/miscellaneous_ex1/Makefile.in
  107. +5 −3 examples/miscellaneous/miscellaneous_ex2/Makefile.in
  108. +5 −3 examples/miscellaneous/miscellaneous_ex3/Makefile.in
  109. +5 −3 examples/miscellaneous/miscellaneous_ex4/Makefile.in
  110. +5 −3 examples/miscellaneous/miscellaneous_ex5/Makefile.in
  111. +5 −3 examples/miscellaneous/miscellaneous_ex6/Makefile.in
  112. +5 −3 examples/miscellaneous/miscellaneous_ex7/Makefile.in
  113. +27 −0 examples/miscellaneous/miscellaneous_ex8/Makefile.am
  114. +1,156 −0 examples/miscellaneous/miscellaneous_ex8/Makefile.in
  115. +149 −0 examples/miscellaneous/miscellaneous_ex8/meshless_interpolation_function.h
  116. +245 −0 examples/miscellaneous/miscellaneous_ex8/miscellaneous_ex8.C
  117. +11 −0 examples/miscellaneous/miscellaneous_ex8/run.sh
  118. BIN examples/miscellaneous/miscellaneous_ex8/struct.ucd.gz
  119. BIN examples/miscellaneous/miscellaneous_ex8/unstruct.ucd.gz
  120. +5 −3 examples/reduced_basis/reduced_basis_ex1/Makefile.in
  121. +5 −3 examples/reduced_basis/reduced_basis_ex2/Makefile.in
  122. +5 −3 examples/reduced_basis/reduced_basis_ex3/Makefile.in
  123. +5 −3 examples/reduced_basis/reduced_basis_ex4/Makefile.in
  124. +5 −3 examples/reduced_basis/reduced_basis_ex5/Makefile.in
  125. +5 −3 examples/reduced_basis/reduced_basis_ex6/Makefile.in
  126. +5 −3 examples/reduced_basis/reduced_basis_ex7/Makefile.in
  127. +5 −3 examples/subdomains/subdomains_ex1/Makefile.in
  128. +5 −3 examples/subdomains/subdomains_ex2/Makefile.in
  129. +5 −3 examples/systems_of_equations/systems_of_equations_ex1/Makefile.in
  130. +5 −3 examples/systems_of_equations/systems_of_equations_ex2/Makefile.in
  131. +5 −3 examples/systems_of_equations/systems_of_equations_ex3/Makefile.in
  132. +5 −3 examples/systems_of_equations/systems_of_equations_ex4/Makefile.in
  133. +5 −3 examples/systems_of_equations/systems_of_equations_ex5/Makefile.in
  134. +5 −3 examples/systems_of_equations/systems_of_equations_ex6/Makefile.in
  135. +5 −3 examples/transient/transient_ex1/Makefile.in
  136. +5 −3 examples/transient/transient_ex2/Makefile.in
  137. +5 −3 examples/vector_fe/vector_fe_ex1/Makefile.in
  138. +5 −3 examples/vector_fe/vector_fe_ex2/Makefile.in
  139. +5 −3 examples/vector_fe/vector_fe_ex3/Makefile.in
  140. +7 −4 include/Makefile.in
  141. +2 −1 include/include_HEADERS
  142. +14 −1 include/libmesh/Makefile.am
  143. +33 −22 include/libmesh/Makefile.in
  144. +10 −0 include/libmesh/rebuild_makefile.sh
  145. +4 −0 include/libmesh_config.h.in
  146. +1 −1 include/rebuild_include_HEADERS.sh
  147. +345 −0 include/utils/meshfree_interpolation.h
  148. +1 −0 m4/config_summary.m4
  149. +13 −0 m4/libmesh_optional_packages.m4
  150. +30 −0 m4/nanoflann.m4
  151. +1 −0 src/libmesh_SOURCES
  152. +405 −0 src/utils/meshfree_interpolation.C
  153. +5 −3 tests/Makefile.in
View
@@ -56,6 +56,8 @@ contrib/fparser/util/bytecoderules_parser
contrib/fparser/util/cpp_compress
contrib/fparser/util/tree_grammar_parser
contrib/fparser/util/tree_grammar_parser.cc
+contrib/nanoflann/*_example
+contrib/nanoflann/pointcloud_kdd_radius
contrib/utils/Make.common
contrib/utils/libmesh*pc
@@ -66,6 +68,7 @@ src/*/.dirstamp
include/libmesh/*.h
include/libmesh/fparser.hh
+include/libmesh/nanoflann.hpp
include/libmesh/parallel_communicator_specializations
include/libmesh_config.h
include/libmesh_config.h.tmp
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1091,6 +1091,7 @@ m4_include([m4/lt~obsolete.m4])
m4_include([m4/metis.m4])
m4_include([m4/mpi.m4])
m4_include([m4/namespaces.m4])
+m4_include([m4/nanoflann.m4])
m4_include([m4/nemesis.m4])
m4_include([m4/netcdf.m4])
m4_include([m4/parmetis.m4])
View
@@ -648,6 +648,9 @@ gitquery
libmesh_contrib_INCLUDES
libmesh_optional_LIBS
libmesh_optional_INCLUDES
+LIBMESH_ENABLE_NANOFLANN_FALSE
+LIBMESH_ENABLE_NANOFLANN_TRUE
+NANOFLANN_INCLUDE
LIBMESH_ENABLE_CPPUNIT_FALSE
LIBMESH_ENABLE_CPPUNIT_TRUE
CPPUNIT_LIBS
@@ -1074,6 +1077,7 @@ enable_fparser_optimizer
enable_cppunit
with_cppunit_prefix
with_cppunit_exec_prefix
+enable_nanoflann
'
ac_precious_vars='build_alias
host_alias
@@ -1813,6 +1817,7 @@ Optional Features:
--enable-fparser-optimizer
use fparser optimization where possible
--enable-cppunit Build with cppunit C++ unit testing support
+ --enable-nanoflann build with space-filling curves suppport
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -31701,6 +31706,57 @@ fi
+# -------------------------------------------------------------
+# nanoflann -- enabled by default
+# -------------------------------------------------------------
+
+ # Check whether --enable-nanoflann was given.
+if test "${enable_nanoflann+set}" = set; then :
+ enableval=$enable_nanoflann; case "${enableval}" in
+ yes) enablenanoflann=yes ;;
+ no) enablenanoflann=no ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-nanoflann" "$LINENO" 5 ;;
+ esac
+else
+ enablenanoflann=$enableoptional
+fi
+
+
+
+
+ # The NANOFLANN API is distributed with libmesh, so we don't have to guess
+ # where it might be installed...
+ if (test $enablenanoflann = yes); then
+ NANOFLANN_INCLUDE="-I\$(top_srcdir)/contrib/nanoflann/include"
+
+$as_echo "#define HAVE_NANOFLANN 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with nanoflann KDtree support >>>" >&5
+$as_echo "<<< Configuring library with nanoflann KDtree support >>>" >&6; }
+ else
+ NANOFLANN_INCLUDE=""
+ enablenanoflann=no
+ fi
+
+
+
+if (test $enablenanoflann = yes); then
+ libmesh_contrib_INCLUDES="$NANOFLANN_INCLUDE $libmesh_contrib_INCLUDES"
+fi
+ if test x$enablenanoflann = xyes; then
+ LIBMESH_ENABLE_NANOFLANN_TRUE=
+ LIBMESH_ENABLE_NANOFLANN_FALSE='#'
+else
+ LIBMESH_ENABLE_NANOFLANN_TRUE='#'
+ LIBMESH_ENABLE_NANOFLANN_FALSE=
+fi
+
+ac_config_files="$ac_config_files contrib/nanoflann/Makefile"
+
+# -------------------------------------------------------------
+
+
+
if test "$enableoptional" != no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ----------------------------------------------" >&5
$as_echo "----------------------------------------------" >&6; }
@@ -31859,7 +31915,7 @@ $as_echo "#define BUILD_DATE __DATE__\" \"__TIME__" >>confdefs.h
# Each example gets a makefile
if (test "x$enableexamples" = "xyes"); then
- ac_config_files="$ac_config_files examples/introduction/introduction_ex1/Makefile examples/introduction/introduction_ex2/Makefile examples/introduction/introduction_ex3/Makefile examples/introduction/introduction_ex4/Makefile examples/introduction/introduction_ex5/Makefile examples/adaptivity/adaptivity_ex1/Makefile examples/adaptivity/adaptivity_ex2/Makefile examples/adaptivity/adaptivity_ex3/Makefile examples/adaptivity/adaptivity_ex4/Makefile examples/adaptivity/adaptivity_ex5/Makefile examples/adjoints/adjoints_ex1/Makefile examples/adjoints/adjoints_ex2/Makefile examples/adjoints/adjoints_ex3/Makefile examples/adjoints/adjoints_ex4/Makefile examples/eigenproblems/eigenproblems_ex1/Makefile examples/eigenproblems/eigenproblems_ex2/Makefile examples/eigenproblems/eigenproblems_ex3/Makefile examples/fem_system/fem_system_ex1/Makefile examples/miscellaneous/miscellaneous_ex1/Makefile examples/miscellaneous/miscellaneous_ex2/Makefile examples/miscellaneous/miscellaneous_ex3/Makefile examples/miscellaneous/miscellaneous_ex4/Makefile examples/miscellaneous/miscellaneous_ex5/Makefile examples/miscellaneous/miscellaneous_ex6/Makefile examples/miscellaneous/miscellaneous_ex7/Makefile examples/subdomains/subdomains_ex1/Makefile examples/subdomains/subdomains_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex1/Makefile examples/systems_of_equations/systems_of_equations_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex3/Makefile examples/systems_of_equations/systems_of_equations_ex4/Makefile examples/systems_of_equations/systems_of_equations_ex5/Makefile examples/systems_of_equations/systems_of_equations_ex6/Makefile examples/reduced_basis/reduced_basis_ex1/Makefile examples/reduced_basis/reduced_basis_ex2/Makefile examples/reduced_basis/reduced_basis_ex3/Makefile examples/reduced_basis/reduced_basis_ex4/Makefile examples/reduced_basis/reduced_basis_ex5/Makefile examples/reduced_basis/reduced_basis_ex6/Makefile examples/reduced_basis/reduced_basis_ex7/Makefile examples/transient/transient_ex1/Makefile examples/transient/transient_ex2/Makefile examples/vector_fe/vector_fe_ex1/Makefile examples/vector_fe/vector_fe_ex2/Makefile examples/vector_fe/vector_fe_ex3/Makefile examples/Makefile"
+ ac_config_files="$ac_config_files examples/introduction/introduction_ex1/Makefile examples/introduction/introduction_ex2/Makefile examples/introduction/introduction_ex3/Makefile examples/introduction/introduction_ex4/Makefile examples/introduction/introduction_ex5/Makefile examples/adaptivity/adaptivity_ex1/Makefile examples/adaptivity/adaptivity_ex2/Makefile examples/adaptivity/adaptivity_ex3/Makefile examples/adaptivity/adaptivity_ex4/Makefile examples/adaptivity/adaptivity_ex5/Makefile examples/adjoints/adjoints_ex1/Makefile examples/adjoints/adjoints_ex2/Makefile examples/adjoints/adjoints_ex3/Makefile examples/adjoints/adjoints_ex4/Makefile examples/eigenproblems/eigenproblems_ex1/Makefile examples/eigenproblems/eigenproblems_ex2/Makefile examples/eigenproblems/eigenproblems_ex3/Makefile examples/fem_system/fem_system_ex1/Makefile examples/miscellaneous/miscellaneous_ex1/Makefile examples/miscellaneous/miscellaneous_ex2/Makefile examples/miscellaneous/miscellaneous_ex3/Makefile examples/miscellaneous/miscellaneous_ex4/Makefile examples/miscellaneous/miscellaneous_ex5/Makefile examples/miscellaneous/miscellaneous_ex6/Makefile examples/miscellaneous/miscellaneous_ex7/Makefile examples/miscellaneous/miscellaneous_ex8/Makefile examples/subdomains/subdomains_ex1/Makefile examples/subdomains/subdomains_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex1/Makefile examples/systems_of_equations/systems_of_equations_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex3/Makefile examples/systems_of_equations/systems_of_equations_ex4/Makefile examples/systems_of_equations/systems_of_equations_ex5/Makefile examples/systems_of_equations/systems_of_equations_ex6/Makefile examples/reduced_basis/reduced_basis_ex1/Makefile examples/reduced_basis/reduced_basis_ex2/Makefile examples/reduced_basis/reduced_basis_ex3/Makefile examples/reduced_basis/reduced_basis_ex4/Makefile examples/reduced_basis/reduced_basis_ex5/Makefile examples/reduced_basis/reduced_basis_ex6/Makefile examples/reduced_basis/reduced_basis_ex7/Makefile examples/transient/transient_ex1/Makefile examples/transient/transient_ex2/Makefile examples/vector_fe/vector_fe_ex1/Makefile examples/vector_fe/vector_fe_ex2/Makefile examples/vector_fe/vector_fe_ex3/Makefile examples/Makefile"
fi
@@ -32153,6 +32209,10 @@ if test -z "${LIBMESH_ENABLE_CPPUNIT_TRUE}" && test -z "${LIBMESH_ENABLE_CPPUNIT
as_fn_error $? "conditional \"LIBMESH_ENABLE_CPPUNIT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${LIBMESH_ENABLE_NANOFLANN_TRUE}" && test -z "${LIBMESH_ENABLE_NANOFLANN_FALSE}"; then
+ as_fn_error $? "conditional \"LIBMESH_ENABLE_NANOFLANN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${GIT_CHECKOUT_TRUE}" && test -z "${GIT_CHECKOUT_FALSE}"; then
as_fn_error $? "conditional \"GIT_CHECKOUT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -33336,6 +33396,7 @@ do
"contrib/libHilbert/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/libHilbert/Makefile" ;;
"contrib/fparser/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/fparser/Makefile" ;;
"contrib/fparser/extrasrc/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/fparser/extrasrc/Makefile" ;;
+ "contrib/nanoflann/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/nanoflann/Makefile" ;;
"examples/introduction/introduction_ex1/Makefile") CONFIG_FILES="$CONFIG_FILES examples/introduction/introduction_ex1/Makefile" ;;
"examples/introduction/introduction_ex2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/introduction/introduction_ex2/Makefile" ;;
"examples/introduction/introduction_ex3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/introduction/introduction_ex3/Makefile" ;;
@@ -33361,6 +33422,7 @@ do
"examples/miscellaneous/miscellaneous_ex5/Makefile") CONFIG_FILES="$CONFIG_FILES examples/miscellaneous/miscellaneous_ex5/Makefile" ;;
"examples/miscellaneous/miscellaneous_ex6/Makefile") CONFIG_FILES="$CONFIG_FILES examples/miscellaneous/miscellaneous_ex6/Makefile" ;;
"examples/miscellaneous/miscellaneous_ex7/Makefile") CONFIG_FILES="$CONFIG_FILES examples/miscellaneous/miscellaneous_ex7/Makefile" ;;
+ "examples/miscellaneous/miscellaneous_ex8/Makefile") CONFIG_FILES="$CONFIG_FILES examples/miscellaneous/miscellaneous_ex8/Makefile" ;;
"examples/subdomains/subdomains_ex1/Makefile") CONFIG_FILES="$CONFIG_FILES examples/subdomains/subdomains_ex1/Makefile" ;;
"examples/subdomains/subdomains_ex2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/subdomains/subdomains_ex2/Makefile" ;;
"examples/systems_of_equations/systems_of_equations_ex1/Makefile") CONFIG_FILES="$CONFIG_FILES examples/systems_of_equations/systems_of_equations_ex1/Makefile" ;;
@@ -35413,6 +35475,7 @@ if (test "x$enableoptional" = "xyes"); then
echo ' 'libhilbert....................... : $enablelibhilbert
echo ' 'metis............................ : $enablemetis
echo ' 'mpi.............................. : $enablempi
+ echo ' 'nanoflann........................ : $enablenanoflann
echo ' 'nemesis.......................... : $enablenemesis
echo ' 'netcdf........................... : $enablenetcdf
echo ' 'openmp........................... : $enableopenmp
View
@@ -280,6 +280,7 @@ if (test "x$enableexamples" = "xyes"); then
examples/miscellaneous/miscellaneous_ex5/Makefile
examples/miscellaneous/miscellaneous_ex6/Makefile
examples/miscellaneous/miscellaneous_ex7/Makefile
+ examples/miscellaneous/miscellaneous_ex8/Makefile
examples/subdomains/subdomains_ex1/Makefile
examples/subdomains/subdomains_ex2/Makefile
examples/systems_of_equations/systems_of_equations_ex1/Makefile
View
@@ -154,6 +154,11 @@ if LIBMESH_ENABLE_FPARSER
oprof_libs += fparser/libfparser.la
endif
+if LIBMESH_ENABLE_NANOFLANN
+ SUBDIRS += nanoflann
+ # header-only library - no library dependencies
+endif
+
######################################################################
View
@@ -144,11 +144,12 @@ target_triplet = @target@
@LIBMESH_ENABLE_FPARSER_TRUE@am__append_88 = fparser/libfparser.la
@LIBMESH_ENABLE_FPARSER_TRUE@am__append_89 = fparser/libfparser.la
@LIBMESH_ENABLE_FPARSER_TRUE@am__append_90 = fparser/libfparser.la
-@LIBMESH_OPT_MODE_TRUE@am__append_91 = libcontrib_opt.la
-@LIBMESH_DBG_MODE_TRUE@am__append_92 = libcontrib_dbg.la
-@LIBMESH_DEVEL_MODE_TRUE@am__append_93 = libcontrib_devel.la
-@LIBMESH_PROF_MODE_TRUE@am__append_94 = libcontrib_prof.la
-@LIBMESH_OPROF_MODE_TRUE@am__append_95 = libcontrib_oprof.la
+@LIBMESH_ENABLE_NANOFLANN_TRUE@am__append_91 = nanoflann
+@LIBMESH_OPT_MODE_TRUE@am__append_92 = libcontrib_opt.la
+@LIBMESH_DBG_MODE_TRUE@am__append_93 = libcontrib_dbg.la
+@LIBMESH_DEVEL_MODE_TRUE@am__append_94 = libcontrib_devel.la
+@LIBMESH_PROF_MODE_TRUE@am__append_95 = libcontrib_prof.la
+@LIBMESH_OPROF_MODE_TRUE@am__append_96 = libcontrib_oprof.la
subdir = contrib
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/build-aux/depcomp
@@ -174,9 +175,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_rtti.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/mpi.m4 \
- $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nemesis.m4 \
- $(top_srcdir)/m4/netcdf.m4 $(top_srcdir)/m4/parmetis.m4 \
- $(top_srcdir)/m4/petsc.m4 $(top_srcdir)/m4/precision.m4 \
+ $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nanoflann.m4 \
+ $(top_srcdir)/m4/nemesis.m4 $(top_srcdir)/m4/netcdf.m4 \
+ $(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/petsc.m4 \
+ $(top_srcdir)/m4/precision.m4 \
$(top_srcdir)/m4/prefix_config.m4 $(top_srcdir)/m4/sfc.m4 \
$(top_srcdir)/m4/slepc.m4 $(top_srcdir)/m4/sstream.m4 \
$(top_srcdir)/m4/strstream.m4 $(top_srcdir)/m4/tbb.m4 \
@@ -340,7 +342,7 @@ ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = boost/include gmv gzstream netcdf/Lib exodusii/Lib \
nemesis/Lib tecplot/tecio triangle tetgen libHilbert laspack \
- metis parmetis sfcurves fparser
+ metis parmetis sfcurves fparser nanoflann
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -488,6 +490,7 @@ MPI_INCLUDES_PATHS = @MPI_INCLUDES_PATHS@
MPI_LIBS = @MPI_LIBS@
MPI_LIBS_PATH = @MPI_LIBS_PATH@
MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
+NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
@@ -637,7 +640,8 @@ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_8) \
$(am__append_14) $(am__append_20) $(am__append_26) \
$(am__append_32) $(am__append_43) $(am__append_49) \
$(am__append_55) $(am__append_61) $(am__append_67) \
- $(am__append_73) $(am__append_79) $(am__append_85)
+ $(am__append_73) $(am__append_79) $(am__append_85) \
+ $(am__append_91)
opt_libs = $(am__append_3) $(am__append_9) $(am__append_15) \
$(am__append_21) $(am__append_27) $(am__append_33) \
$(am__append_38) $(am__append_44) $(am__append_50) \
@@ -668,8 +672,8 @@ oprof_libs = $(am__append_7) $(am__append_13) $(am__append_19) \
#
# Building the flavors
#
-noinst_LTLIBRARIES = $(am__append_91) $(am__append_92) \
- $(am__append_93) $(am__append_94) $(am__append_95)
+noinst_LTLIBRARIES = $(am__append_92) $(am__append_93) \
+ $(am__append_94) $(am__append_95) $(am__append_96)
@LIBMESH_OPT_MODE_TRUE@libcontrib_opt_la_SOURCES = cppsource.C
@LIBMESH_OPT_MODE_TRUE@libcontrib_opt_la_CPPFLAGS = $(CPPFLAGS_OPT) $(AM_CPPFLAGS)
@LIBMESH_OPT_MODE_TRUE@libcontrib_opt_la_CXXFLAGS = $(CXXFLAGS_OPT)
@@ -1137,6 +1141,7 @@ uninstall-am:
@LIBMESH_ENABLE_FPARSER_TRUE@ # ATM always compile fparser with optimized flags,
@LIBMESH_ENABLE_FPARSER_TRUE@ # and reuse in all methods
+@LIBMESH_ENABLE_NANOFLANN_TRUE@ # header-only library - no library dependencies
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
@@ -78,9 +78,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_rtti.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/mpi.m4 \
- $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nemesis.m4 \
- $(top_srcdir)/m4/netcdf.m4 $(top_srcdir)/m4/parmetis.m4 \
- $(top_srcdir)/m4/petsc.m4 $(top_srcdir)/m4/precision.m4 \
+ $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nanoflann.m4 \
+ $(top_srcdir)/m4/nemesis.m4 $(top_srcdir)/m4/netcdf.m4 \
+ $(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/petsc.m4 \
+ $(top_srcdir)/m4/precision.m4 \
$(top_srcdir)/m4/prefix_config.m4 $(top_srcdir)/m4/sfc.m4 \
$(top_srcdir)/m4/slepc.m4 $(top_srcdir)/m4/sstream.m4 \
$(top_srcdir)/m4/strstream.m4 $(top_srcdir)/m4/tbb.m4 \
@@ -523,6 +524,7 @@ MPI_INCLUDES_PATHS = @MPI_INCLUDES_PATHS@
MPI_LIBS = @MPI_LIBS@
MPI_LIBS_PATH = @MPI_LIBS_PATH@
MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
+NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
@@ -83,9 +83,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_rtti.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/mpi.m4 \
- $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nemesis.m4 \
- $(top_srcdir)/m4/netcdf.m4 $(top_srcdir)/m4/parmetis.m4 \
- $(top_srcdir)/m4/petsc.m4 $(top_srcdir)/m4/precision.m4 \
+ $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nanoflann.m4 \
+ $(top_srcdir)/m4/nemesis.m4 $(top_srcdir)/m4/netcdf.m4 \
+ $(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/petsc.m4 \
+ $(top_srcdir)/m4/precision.m4 \
$(top_srcdir)/m4/prefix_config.m4 $(top_srcdir)/m4/sfc.m4 \
$(top_srcdir)/m4/slepc.m4 $(top_srcdir)/m4/sstream.m4 \
$(top_srcdir)/m4/strstream.m4 $(top_srcdir)/m4/tbb.m4 \
@@ -1010,6 +1011,7 @@ MPI_INCLUDES_PATHS = @MPI_INCLUDES_PATHS@
MPI_LIBS = @MPI_LIBS@
MPI_LIBS_PATH = @MPI_LIBS_PATH@
MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
+NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
@@ -92,9 +92,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_rtti.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/mpi.m4 \
- $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nemesis.m4 \
- $(top_srcdir)/m4/netcdf.m4 $(top_srcdir)/m4/parmetis.m4 \
- $(top_srcdir)/m4/petsc.m4 $(top_srcdir)/m4/precision.m4 \
+ $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/nanoflann.m4 \
+ $(top_srcdir)/m4/nemesis.m4 $(top_srcdir)/m4/netcdf.m4 \
+ $(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/petsc.m4 \
+ $(top_srcdir)/m4/precision.m4 \
$(top_srcdir)/m4/prefix_config.m4 $(top_srcdir)/m4/sfc.m4 \
$(top_srcdir)/m4/slepc.m4 $(top_srcdir)/m4/sstream.m4 \
$(top_srcdir)/m4/strstream.m4 $(top_srcdir)/m4/tbb.m4 \
@@ -460,6 +461,7 @@ MPI_INCLUDES_PATHS = @MPI_INCLUDES_PATHS@
MPI_LIBS = @MPI_LIBS@
MPI_LIBS_PATH = @MPI_LIBS_PATH@
MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
+NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
Oops, something went wrong.

0 comments on commit 376a8aa

Please sign in to comment.