Merge pull request #289 from tim-griesbach/feature-domain-p4est

Add domain constructor for given p4est

src/fclaw2d_convenience.c

@@ -323,6 +323,23 @@ fclaw2d_domain_new (p4est_wrap_t * wrap, sc_keyvalue_t * attributes)
     return domain;
 }
 
+fclaw2d_domain_t *
+fclaw2d_domain_new_p4est (p4est_t *p4est)
+{
+    FCLAW_ASSERT (p4est != NULL);
+    FCLAW_ASSERT (p4est->user_pointer == NULL);
+
+    p4est_wrap_t *wrap;
+
+    /* create p4est_wrap from the given p4est */
+    wrap = p4est_wrap_new_p4est (p4est, 0, P4EST_CONNECT_FULL, NULL, NULL);
+
+    FCLAW_ASSERT (wrap->p4est->data_size == 0);
+
+    /* attributes of the created domain is initialized by sc_keyvalue_new */
+    return fclaw2d_domain_new (wrap, NULL);
+}
+
 static void
 fclaw2d_check_initial_level (sc_MPI_Comm mpicomm, int initial_level)
 {

src/fclaw2d_convenience.h

@@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define FCLAW2D_CONVENIENCE_H
 
 #include <forestclaw2d.h>
-#include <p4est_connectivity.h>
+#include <p4est.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -37,6 +37,21 @@ extern "C"
 #endif
 #endif
 
+/** Construct a domain from a given p4est.
+ *
+ * This function takes ownership of the passed p4est and its connectivity.
+ *
+ * \param [in,out]    p4est   The p4est that is used to create the domain.
+ *                            p4est->user_pointer must be NULL and will be
+ *                            changed to pointing to a p4est_wrap created using
+ *                            the given p4est. The data size of the p4est will
+ *                            be set to 0 and its quadrant data will be freed.
+ * \return                    A domain that is constructed based on the given
+ *                            p4est and in particular with a pp based on the
+ *                            given p4est.
+ */
+fclaw2d_domain_t *fclaw2d_domain_new_p4est (p4est_t *p4est);
+
 fclaw2d_domain_t *fclaw2d_domain_new_unitsquare (sc_MPI_Comm mpicomm,
                                                  int initial_level);
 

src/fclaw2d_to_3d.h

@@ -172,6 +172,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define fclaw2d_domain_new_unitsquare   fclaw3d_domain_new_unitcube
 #define fclaw2d_domain_new_brick        fclaw3d_domain_new_brick
 #define fclaw2d_domain_new_conn         fclaw3d_domain_new_conn
+#define fclaw2d_domain_new_p4est        fclaw3d_domain_new_p8est
 #define fclaw2d_domain_num_faces        fclaw3d_domain_num_faces
 #define fclaw2d_domain_num_corners      fclaw3d_domain_num_corners
 #define fclaw2d_domain_num_face_corners     fclaw3d_domain_num_face_corners

src/fclaw3d_convenience.h

@@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define FCLAW3D_CONVENIENCE_H
 
 #include <forestclaw3d.h>
-#include <p8est_connectivity.h>
+#include <p8est.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -37,6 +37,21 @@ extern "C"
 #endif
 #endif
 
+/** Construct a domain from a given p8est.
+ *
+ * This function takes ownership of the passed p8est and its connectivity.
+ *
+ * \param [in,out]    p8est   The p8est that is used to create the domain.
+ *                            p8est->user_pointer must be NULL and will be
+ *                            changed to pointing to a p8est_wrap created using
+ *                            the given p8est. The data size of the p8est will
+ *                            be set to 0 and its quadrant data will be freed.
+ * \return                    A domain that is constructed based on the given
+ *                            p8est and in particular with a pp based on the
+ *                            given p8est.
+ */
+fclaw3d_domain_t *fclaw3d_domain_new_p8est (p8est_t *p8est);
+
 fclaw3d_domain_t *fclaw3d_domain_new_unitcube (sc_MPI_Comm mpicomm,
                                                int initial_level);