From 2fae9768effb9f007bab097f84a7cb9d4ca6ee88 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 18 Oct 2023 12:13:53 +0100
Subject: [PATCH] checkMesh::checkGeometry: Updated for changes to
 polyMeshCheck

---
 .../manipulation/checkMesh/checkGeometry.C    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index d785cc7123..6ce2b71957 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "PatchTools.H"
 #include "checkGeometry.H"
 #include "polyMesh.H"
+#include "polyMeshCheck.H"
 #include "cellSet.H"
 #include "faceSet.H"
 #include "pointSet.H"
@@ -549,7 +550,13 @@ Foam::label Foam::checkGeometry
             )
          || (
                 validDirs == solDirs
-             && mesh.checkEdgeAlignment(true, validDirs, &nonAlignedPoints)
+             && polyMeshCheck::checkEdgeAlignment
+                (
+                    mesh,
+                    true,
+                    validDirs,
+                    &nonAlignedPoints
+                )
             )
         )
         {
@@ -670,7 +677,7 @@ Foam::label Foam::checkGeometry
 
     {
         faceSet faces(mesh, "nonOrthoFaces", mesh.nFaces()/100+1);
-        if (mesh.checkFaceOrthogonality(true, &faces))
+        if (polyMeshCheck::checkFaceOrthogonality(mesh, true, &faces))
         {
             noFailedChecks++;
         }
@@ -715,7 +722,7 @@ Foam::label Foam::checkGeometry
 
     {
         faceSet faces(mesh, "skewFaces", mesh.nFaces()/100+1);
-        if (mesh.checkFaceSkewness(true, &faces))
+        if (polyMeshCheck::checkFaceSkewness(mesh, true, &faces))
         {
             noFailedChecks++;
 
@@ -890,7 +897,7 @@ Foam::label Foam::checkGeometry
     if (allGeometry)
     {
         cellSet cells(mesh, "underdeterminedCells", mesh.nCells()/100);
-        if (mesh.checkCellDeterminant(true, &cells))
+        if (polyMeshCheck::checkCellDeterminant(mesh, true, &cells))
         {
             noFailedChecks++;
 
@@ -930,7 +937,7 @@ Foam::label Foam::checkGeometry
     if (allGeometry)
     {
         faceSet faces(mesh, "lowWeightFaces", mesh.nFaces()/100);
-        if (mesh.checkFaceWeight(true, 0.05, &faces))
+        if (polyMeshCheck::checkFaceWeight(mesh, true, 0.05, &faces))
         {
             noFailedChecks++;
 
@@ -951,7 +958,7 @@ Foam::label Foam::checkGeometry
     if (allGeometry)
     {
         faceSet faces(mesh, "lowVolRatioFaces", mesh.nFaces()/100);
-        if (mesh.checkVolRatio(true, 0.01, &faces))
+        if (polyMeshCheck::checkVolRatio(mesh, true, 0.01, &faces))
         {
             noFailedChecks++;