Merge pull request #974 from DLR-AMR/enhancement-split_cmesh_commit_a…

…nd_geometry_checks

Split cmesh commit and geometry checks

src/t8_cmesh.h

@@ -92,6 +92,13 @@ int
 t8_cmesh_is_committed (const t8_cmesh_t cmesh);
 
 #ifdef T8_ENABLE_DEBUG
+/** Check the geometry of the mesh for validity.
+ * \param [in] cmesh            This cmesh is examined.
+ * \return                      True if the geometry of the cmesh is valid.
+ */
+bool
+t8_cmesh_validate_geometry (const t8_cmesh_t cmesh);
+
 /** After a cmesh is committed, check whether all trees in a cmesh do have positive volume.
  * Returns true if all trees have positive volume.
  * \param [in]  cmesh           This cmesh is examined. May be NULL.

src/t8_cmesh/t8_cmesh.c

@@ -107,8 +107,7 @@ t8_cmesh_is_committed (const t8_cmesh_t cmesh)
 
 #ifdef T8_ENABLE_DEBUG
     /* TODO: check more conditions that must always hold after commit */
-    if ((!t8_cmesh_trees_is_face_consistent (cmesh, cmesh->trees)) || (!t8_cmesh_no_negative_volume (cmesh))
-        || (!t8_cmesh_check_trees_per_eclass (cmesh))) {
+    if ((!t8_cmesh_trees_is_face_consistent (cmesh, cmesh->trees)) || (!t8_cmesh_check_trees_per_eclass (cmesh))) {
       is_checking = 0;
       return 0;
     }
@@ -122,6 +121,18 @@ t8_cmesh_is_committed (const t8_cmesh_t cmesh)
   return 1;
 }
 
+#ifdef T8_ENABLE_DEBUG
+bool
+t8_cmesh_validate_geometry (const t8_cmesh_t cmesh)
+{
+  /* Geometry handler is not constructed yet */
+  if (cmesh->geometry_handler == NULL) {
+    return 1;
+  }
+  return t8_cmesh_no_negative_volume (cmesh);
+}
+#endif /* T8_ENABLE_DEBUG */
+
 /* Check whether a given communicator assigns the same rank and mpisize
  * as stored in a given cmesh. */
 int

src/t8_cmesh/t8_cmesh_commit.c

@@ -612,6 +612,7 @@ t8_cmesh_commit (t8_cmesh_t cmesh, sc_MPI_Comm comm)
              (long) cmesh->num_local_trees, (long long) cmesh->num_trees, (long) cmesh->num_ghosts);
 
   T8_ASSERT (t8_cmesh_is_committed (cmesh));
+  T8_ASSERT (t8_cmesh_validate_geometry (cmesh));
   /* If profiling is enabled, we measure the runtime of  commit. */
   if (cmesh->profile != NULL) {
     cmesh->profile->commit_runtime = sc_MPI_Wtime () - cmesh->profile->commit_runtime;