From 996cf3943020ff577dccb7881ea1ea5bf7c8091a Mon Sep 17 00:00:00 2001
From: Connor Morency <connor.morency@gmail.com>
Date: Mon, 15 Dec 2025 12:05:47 -0700
Subject: [PATCH 1/2] pumi adapt would crash for mixed element meshes with
 frozen quad layers; added a check to the maQuality routine that allows
 adaptation of tris in mixed element 2d meshes

---
 ma/maQuality.cc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ma/maQuality.cc b/ma/maQuality.cc
index 85f465116..7ace47f2e 100644
--- a/ma/maQuality.cc
+++ b/ma/maQuality.cc
@@ -569,6 +569,22 @@ bool isLayerElementOk(Mesh* m, Entity* e)
     return isPyramidOk(m, e);
   if (type == apf::Mesh::PRISM)
     return isPrismOk(m, e);
+  if (type == apf::Mesh::QUAD) {
+    // For 2D boundary layer meshes, check if quad is non-degenerate
+    // A quad is OK if it has positive area (non-inverted)
+    Entity* v[4];
+    m->getDownward(e, 0, v);
+    Vector p[4];
+    for (int i = 0; i < 4; ++i)
+      m->getPoint(v[i], 0, p[i]);
+
+    // Check both triangulation diagonals for positive area
+    Vector d1 = apf::cross(p[1] - p[0], p[2] - p[0]);
+    Vector d2 = apf::cross(p[2] - p[0], p[3] - p[0]);
+
+    // If both triangles have positive area in same direction, quad is OK
+    return (d1[2] > 0 && d2[2] > 0) || (d1[2] < 0 && d2[2] < 0);
+  }
   abort();
   return false;
 }

From 08d787bcab1f5a87fbd132f97769e6c064ca2dcd Mon Sep 17 00:00:00 2001
From: Connor Morency <connor.morency@gmail.com>
Date: Tue, 16 Dec 2025 11:40:01 -0700
Subject: [PATCH 2/2] Make quad validity check coordinate system-independent
 and numerically robust

---
 ma/maQuality.cc | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ma/maQuality.cc b/ma/maQuality.cc
index 7ace47f2e..5786eb7a6 100644
--- a/ma/maQuality.cc
+++ b/ma/maQuality.cc
@@ -570,20 +570,30 @@ bool isLayerElementOk(Mesh* m, Entity* e)
   if (type == apf::Mesh::PRISM)
     return isPrismOk(m, e);
   if (type == apf::Mesh::QUAD) {
-    // For 2D boundary layer meshes, check if quad is non-degenerate
-    // A quad is OK if it has positive area (non-inverted)
+    // Check if quad is non-degenerate without assuming a specific embedding.
+    // The quad is considered valid if its two sub-triangles have non-zero area
+    // and consistent orientation.
+
     Entity* v[4];
     m->getDownward(e, 0, v);
     Vector p[4];
     for (int i = 0; i < 4; ++i)
       m->getPoint(v[i], 0, p[i]);
 
-    // Check both triangulation diagonals for positive area
-    Vector d1 = apf::cross(p[1] - p[0], p[2] - p[0]);
-    Vector d2 = apf::cross(p[2] - p[0], p[3] - p[0]);
+    // Form two triangles sharing a diagonal
+    Vector n1 = apf::cross(p[1] - p[0], p[2] - p[0]);
+    Vector n2 = apf::cross(p[2] - p[0], p[3] - p[0]);
+
+    double a1 = n1.getLength();
+    double a2 = n2.getLength();
+
+    // Reject degenerate triangles
+    const double eps = 1e-14;
+    if (a1 < eps || a2 < eps)
+      return false;
 
-    // If both triangles have positive area in same direction, quad is OK
-    return (d1[2] > 0 && d2[2] > 0) || (d1[2] < 0 && d2[2] < 0);
+    // Check consistent orientation (normals point in the same general direction)
+    return (n1 * n2) > eps * a1 * a2;
   }
   abort();
   return false;