Merge pull request #2078 from DLR-AMR/handle-add-destructor

Feature: Destructor for mesh handle

Author: spenke91

mesh_handle/mesh.hxx

@@ -59,6 +59,16 @@ class mesh {
     update_elements ();
   }
 
+  /** 
+   * Destructor for a mesh of the handle. 
+   * The forest in use will be unreferenced. 
+   * Call \ref t8_forest_ref before if you want to keep it alive.
+   */
+  ~mesh ()
+  {
+    t8_forest_unref (&m_forest);
+  }
+
   /**
    * Getter for the number of local elements in the mesh.
    * \return Number of local elements in the mesh.

test/mesh_handle/t8_gtest_cache_competence.cxx

@@ -82,7 +82,9 @@ class t8_gtest_cache_competence: public testing::Test {
   void
   TearDown () override
   {
-    t8_forest_unref (&forest);
+    if (forest->rc.refcount > 0) {
+      t8_forest_unref (&forest);
+    }
   }
 
   t8_forest_t forest;

test/mesh_handle/t8_gtest_compare_handle_to_forest.cxx

@@ -76,7 +76,4 @@ TEST (t8_gtest_compare_handle_to_forest, compare_handle_to_forest)
       mesh_iterator++;
     }
   }
-
-  // Unref the forest.
-  t8_forest_unref (&forest);
 }

test/mesh_handle/t8_gtest_custom_competence.cxx

@@ -96,6 +96,7 @@ TEST (t8_gtest_custom_competence, custom_competence)
     EXPECT_EQ (level, it->get_level_dummy ());
   }
 
+  t8_forest_ref (forest);
   // Test with two custom competences and a predefined competence.
   using mesh_class = t8_mesh_handle::mesh<dummy_get_level, dummy_trivial, t8_mesh_handle::cache_centroid>;
   mesh_class mesh_more_competences = mesh_class (forest);
@@ -111,7 +112,4 @@ TEST (t8_gtest_custom_competence, custom_competence)
     }
     EXPECT_TRUE (it->centroid_cache_filled ());
   }
-
-  // Unref the forest.
-  t8_forest_unref (&forest);
 }

test/mesh_handle/t8_gtest_ghost.cxx

@@ -54,7 +54,9 @@ class t8_mesh_ghost_test: public testing::TestWithParam<std::tuple<t8_eclass_t,
   void
   TearDown () override
   {
-    t8_forest_unref (&forest);
+    if (forest->rc.refcount > 0) {
+      t8_forest_unref (&forest);
+    }
   }
   t8_forest_t forest;
   int level;

test/mesh_handle/t8_gtest_mesh_handle.cxx

@@ -51,7 +51,9 @@ class t8_mesh_handle_test: public testing::TestWithParam<std::tuple<t8_eclass_t,
   void
   TearDown () override
   {
-    t8_forest_unref (&forest);
+    if (forest->rc.refcount > 0) {
+      t8_forest_unref (&forest);
+    }
   }
 
   t8_forest_t forest;
@@ -133,6 +135,7 @@ TEST_P (t8_mesh_handle_test, test_competences)
   }
 
   // --- Version with cached centroid variable. ---
+  t8_forest_ref (forest);
   using mesh_class_centroid = t8_mesh_handle::mesh<t8_mesh_handle::cache_centroid>;
   using element_class_centroid = mesh_class_centroid::element_class;
   mesh_class_centroid mesh_centroid = mesh_class_centroid (forest);