From 3f73fb8dd22caa8c6bd837781a08e222e5ae2d99 Mon Sep 17 00:00:00 2001
From: Johannes Markert <johannes.markert@dlr.de>
Date: Fri, 10 May 2024 17:15:25 +0200
Subject: [PATCH] Switching to t8_cmesh_new_brick_{2,3}d.

---
 src/meshes/t8code_mesh.jl | 14 +++++---------
 test/test_t8code_2d.jl    |  1 +
 test/test_t8code_3d.jl    |  1 +
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/meshes/t8code_mesh.jl b/src/meshes/t8code_mesh.jl
index 0af4c6ae023..5a9e87d0183 100644
--- a/src/meshes/t8code_mesh.jl
+++ b/src/meshes/t8code_mesh.jl
@@ -294,15 +294,11 @@ function T8codeMesh(trees_per_dimension; polydeg = 1,
 
     do_partition = 0
     if NDIMS == 2
-        conn = T8code.Libt8.p4est_connectivity_new_brick(trees_per_dimension...,
-                                                         periodicity...)
-        cmesh = t8_cmesh_new_from_p4est(conn, mpi_comm(), do_partition)
-        T8code.Libt8.p4est_connectivity_destroy(conn)
+        cmesh = t8_cmesh_new_brick_2d(trees_per_dimension..., periodicity...,
+                                      sc_MPI_COMM_WORLD)
     elseif NDIMS == 3
-        conn = T8code.Libt8.p8est_connectivity_new_brick(trees_per_dimension...,
-                                                         periodicity...)
-        cmesh = t8_cmesh_new_from_p8est(conn, mpi_comm(), do_partition)
-        T8code.Libt8.p8est_connectivity_destroy(conn)
+        cmesh = t8_cmesh_new_brick_3d(trees_per_dimension..., periodicity...,
+                                      sc_MPI_COMM_WORLD)
     end
 
     do_face_ghost = mpi_isparallel()
@@ -332,7 +328,7 @@ function T8codeMesh(trees_per_dimension; polydeg = 1,
         end
     end
 
-    # Note, `p*est_connectivity_new_brick` converts a domain of `[0,nx] x [0,ny] x ....`.
+    # Note, `t8_cmesh_new_brick_*d` converts a domain of `[0,nx] x [0,ny] x ....`.
     # Hence, transform mesh coordinates to reference space [-1,1]^NDIMS before applying user defined mapping.
     mapping_(xyz...) = mapping((x * 2.0 / tpd - 1.0 for (x, tpd) in zip(xyz,
                                                                         trees_per_dimension))...)
diff --git a/test/test_t8code_2d.jl b/test/test_t8code_2d.jl
index b63d2a105ac..bb412f6d581 100644
--- a/test/test_t8code_2d.jl
+++ b/test/test_t8code_2d.jl
@@ -57,6 +57,7 @@ end
         # actually is `Ptr{P4est.LibP4est.p4est_connectivity}`.
         conn = Trixi.P4est.LibP4est.p4est_connectivity_new_brick(2, 3, 1, 1)
         mesh = T8codeMesh(conn)
+        Trixi.p4est_connectivity_destroy(conn)
         all(size(mesh.tree_node_coordinates) .== (2, 2, 2, 6))
     end
 end
diff --git a/test/test_t8code_3d.jl b/test/test_t8code_3d.jl
index 81d2a7cdd85..c3435945f0d 100644
--- a/test/test_t8code_3d.jl
+++ b/test/test_t8code_3d.jl
@@ -20,6 +20,7 @@ mkdir(outdir)
             # actually is `Ptr{P4est.LibP4est.p8est_connectivity}`.
             conn = Trixi.P4est.LibP4est.p8est_connectivity_new_brick(2, 3, 4, 1, 1, 1)
             mesh = T8codeMesh(conn)
+            Trixi.p8est_connectivity_destroy(conn)
             all(size(mesh.tree_node_coordinates) .== (3, 2, 2, 2, 24))
         end
     end