Merge branch 'develop-3d' into feature-hanging-corners

hannesbrandt · Feb 6, 2024 · a56462b · a56462b
2 parents b66ddad + 0d2ec2d
commit a56462b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/p4est b/p4est
diff --git a/sc b/sc
diff --git a/src/fclaw2d_convenience.c b/src/fclaw2d_convenience.c
@@ -330,25 +330,18 @@ fclaw2d_domain_new_p4est (p4est_t * p4est)
     FCLAW_ASSERT (p4est->user_pointer == NULL);
 
     p4est_wrap_t *wrap;
-    p4est_mesh_params_t params;
-
-    /* create p4est_wrap from the given p4est */
-    wrap = p4est_wrap_new_p4est (p4est, 1, P4EST_CONNECT_FULL, NULL, NULL);
-
-    /* fill the hollow wrap and using mesh_new_params for mesh creation with
-     * edgehanging corner neighbors */
-    wrap->hollow = 0;
-    wrap->flags = P4EST_ALLOC_ZERO (uint8_t, p4est->local_num_quadrants);
-    wrap->ghost = p4est_ghost_new (p4est, wrap->btype);
-    p4est_mesh_params_init (&params);
-    params.compute_level_lists = 1;
-    params.compute_tree_index = 1;
-    params.btype = wrap->btype;
+    p4est_wrap_params_t params;
+
+    /* wrap the p4est with edgehanging corners neighbors enabled in the mesh */
+    p4est_wrap_params_init (&params);
+    params.hollow = 0;
+    params.mesh_params.btype = P4EST_CONNECT_FULL;
+    params.mesh_params.compute_level_lists = 1;
+    params.mesh_params.compute_tree_index = 1;
 #ifdef P4_TO_P8
-    params.edgehanging_corners = 1;
+    params.mesh_params.edgehanging_corners = 1;
 #endif
-    wrap->mesh = p4est_mesh_new_params (p4est, wrap->ghost, &params);
-
+    wrap = p4est_wrap_new_p4est_params (p4est, &params);
     FCLAW_ASSERT (wrap->p4est->data_size == 0);
 
     /* attributes of the created domain is initialized by sc_keyvalue_new */
@@ -447,15 +440,14 @@ fclaw2d_domain_new_conn (sc_MPI_Comm mpicomm, int initial_level,
     /* Wrap the connectivity. This does the same as p4est_wrap_new_conn,
      * except for setting edgehanging_corners to 1. */
     p4est_wrap_params_init (&params);
-    params.initial_level = initial_level;
     params.hollow = 0;
     params.mesh_params.btype = P4EST_CONNECT_FULL;
     params.mesh_params.compute_level_lists = 1;
     params.mesh_params.compute_tree_index = 1;
 #ifdef P4_TO_P8
     params.mesh_params.edgehanging_corners = 1;
 #endif
-    wrap = p4est_wrap_new_params (mpicomm, conn, &params);
+    wrap = p4est_wrap_new_params (mpicomm, conn, initial_level, &params);
 
     return fclaw2d_domain_new (wrap, NULL);
 }
+10 −10		.github/workflows/ci.yml
+4 −4		.github/workflows/ci_darwin.yml
+2 −1		cmake/GitSubmodule.cmake
+1 −1		cmake/git.cmake
+3 −3		example/CMakeLists.txt
+1 −1		sc
+2 −0		src/p4est_to_p8est.h
+96 −90		src/p4est_wrap.c
+50 −22		src/p4est_wrap.h
+50 −22		src/p8est_wrap.h