Merge pull request #362 from cburstedde/feature-multi

Feature multi

Author: hannesbrandt

Makefile.am

@@ -68,6 +68,7 @@ include src/Makefile.am
 include test/Makefile.am
 include example/balance/Makefile.am
 include example/mesh/Makefile.am
+include example/multi/Makefile.am
 include example/particles/Makefile.am
 include example/points/Makefile.am
 include example/search/Makefile.am

README

@@ -3,7 +3,7 @@ This is the README file for `p4est`.
 `p4est` is a C library to manage a collection (a forest) of multiple
 connected adaptive quadtrees or octrees in parallel.
 
-Copyright (C) 2010 The University of Texas System  
+Copyright (C) 2010 The University of Texas System
 Additional copyright (C) 2011 individual authors
 
 `p4est` is written by Carsten Burstedde, Lucas C. Wilcox, and Tobin Isaac
@@ -147,7 +147,7 @@ path.
 Note that the `--disable-shared` option suppresses the build of `.so` shared object lib files.
 In case these are also required this option needs to be omitted or changed to `--enable-shared`.
 
-The `configure` call is then followed by the usual `make` and `make install` commands, 
+The `configure` call is then followed by the usual `make` and `make install` commands,
 the latter potentially in `sudo` mode depending on the desired installation directory.
 
 The subpackage `sc` is contained in the tarball and used by default.  It is

example/CMakeLists.txt

@@ -91,6 +91,7 @@ endif(P4EST_HAVE_GETOPT_H)
 p4est_p8est_example(balance_seeds balance)
 p4est_p8est_example(balance_corner balance)
 p4est_p8est_example(mesh mesh)
+p4est_p8est_example(overlap multi)
 p4est_p8est_example(simple simple)
 p4est_p8est_example(dune_interface dune)
 p4est_copy_resource(mesh conndebug.p8c)

example/multi/Makefile.am

@@ -0,0 +1,17 @@
+
+# This file is part of p4est.
+# Makefile.am in example/multi
+# included non-recursively from toplevel directory
+
+if P4EST_ENABLE_BUILD_2D
+bin_PROGRAMS += \
+  example/multi/p4est_overlap
+example_multi_p4est_overlap_SOURCES = example/multi/overlap2.c
+endif
+
+if P4EST_ENABLE_BUILD_3D
+bin_PROGRAMS += \
+  example/multi/p8est_overlap
+example_multi_p8est_overlap_SOURCES = example/multi/p4est_to_p8est_multi.h \
+                                      example/multi/overlap3.c
+endif