Merge pull request #137 from friedenhe/master

Added the writting failed mesh to files to checkMesh.

src/adjoint/DACheckMesh/DACheckMesh.C

@@ -19,7 +19,9 @@ DACheckMesh::DACheckMesh(
     const fvMesh& mesh1)
     : daOption_(daOption),
       runTime(runTime1),
-      mesh(mesh1)
+      mesh(mesh1),
+      surfWriter(nullptr),
+      setWriter(nullptr)
 {
     // Give an option to overwrite the default value of mesh quality check threshold
     fvMesh& meshNew = const_cast<fvMesh&>(mesh);
@@ -34,6 +36,10 @@ DACheckMesh::DACheckMesh(
     Info << "maxNonOrth: " << maxNonOrth_ << endl;
     Info << "maxSkewness: " << maxSkewness_ << endl;
     Info << "maxAspectRatio: " << maxAspectRatio_ << endl;
+
+    word surfaceFormat = "vtk";
+    surfWriter.reset(surfaceWriter::New(surfaceFormat));
+    setWriter.reset(writer<scalar>::New(vtkSetWriter<scalar>::typeName));
 }
 
 DACheckMesh::~DACheckMesh()
@@ -54,7 +60,7 @@ label DACheckMesh::run() const
 
     Info << "Checking mesh quality for time = " << runTime.timeName() << endl;
 
-    label nFailedChecks = checkGeometry(mesh);
+    label nFailedChecks = checkGeometry(mesh, surfWriter, setWriter);
 
     if (nFailedChecks)
     {

src/adjoint/DACheckMesh/DACheckMesh.H

@@ -41,10 +41,10 @@ private:
 
     /// Time object
     const Time& runTime;
-    
+
     /// fvMesh object
     const fvMesh& mesh;
-    
+
     /// max aspect ratio
     scalar maxAspectRatio_ = 1000.0;
 
@@ -54,6 +54,12 @@ private:
     /// max skewness
     scalar maxSkewness_ = 4.0;
 
+    /// surface writer pointer for failed mesh
+    autoPtr<surfaceWriter> surfWriter;
+
+    /// set writer pointer for failed mesh
+    autoPtr<writer<scalar>> setWriter;
+
 public:
     // Constructors
 

src/adjoint/DACheckMesh/checkGeometry.C

@@ -5,20 +5,7 @@
 
 \*---------------------------------------------------------------------------*/
 
-#include "PatchTools.H"
 #include "checkGeometry.H"
-#include "polyMesh.H"
-#include "cellSet.H"
-#include "faceSet.H"
-#include "pointSet.H"
-#include "edgeHashes.H"
-#include "wedgePolyPatch.H"
-#include "unitConversion.H"
-#include "polyMeshTetDecomposition.H"
-#include "functionObject.H"
-
-#include "cyclicACMIPolyPatch.H"
-#include "Time.H"
 
 namespace Foam
 {
@@ -221,7 +208,10 @@ bool Foam::checkCoupledPoints(
     }
 }
 
-Foam::label Foam::checkGeometry(const polyMesh& mesh)
+Foam::label Foam::checkGeometry(
+    const polyMesh& mesh,
+    const autoPtr<surfaceWriter>& surfWriter,
+    const autoPtr<writer<scalar>>& setWriter)
 {
     label noFailedChecks = 0;
 
@@ -274,18 +264,30 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
             if (nNonClosed > 0)
             {
-                Info << "  <<There are " << nNonClosed
-                     << " non closed cells " << endl;
+                Info << "  <<Writing " << nNonClosed
+                     << " non closed cells to set " << cells.name() << endl;
+                cells.instance() = mesh.pointsInstance();
+                cells.write();
+                if (surfWriter.valid())
+                {
+                    mergeAndWrite(surfWriter(), cells);
+                }
             }
         }
 
         label nHighAspect = returnReduce(aspectCells.size(), sumOp<label>());
 
         if (nHighAspect > 0)
         {
-            Info << "  <<There are " << nHighAspect
-                 << " cells with high aspect ratio"
-                 << endl;
+            Info << "  <<Writing " << nHighAspect
+                 << " cells with high aspect ratio to set "
+                 << aspectCells.name() << endl;
+            aspectCells.instance() = mesh.pointsInstance();
+            aspectCells.write();
+            if (surfWriter.valid())
+            {
+                mergeAndWrite(surfWriter(), aspectCells);
+            }
         }
     }
 
@@ -299,8 +301,14 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
             if (nFaces > 0)
             {
-                Info << "  <<There are " << nFaces
-                     << " zero area faces " << endl;
+                Info << "  <<Writing " << nFaces
+                     << " zero area faces to set " << faces.name() << endl;
+                faces.instance() = mesh.pointsInstance();
+                faces.write();
+                if (surfWriter.valid())
+                {
+                    mergeAndWrite(surfWriter(), faces);
+                }
             }
         }
     }
@@ -315,8 +323,14 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
             if (nCells > 0)
             {
-                Info << "  <<There are " << nCells
-                     << " zero volume cells " << endl;
+                Info << "  <<Writing " << nCells
+                     << " zero volume cells to set " << cells.name() << endl;
+                cells.instance() = mesh.pointsInstance();
+                cells.write();
+                if (surfWriter.valid())
+                {
+                    mergeAndWrite(surfWriter(), cells);
+                }
             }
         }
     }
@@ -332,8 +346,14 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
         if (nFaces > 0)
         {
-            Info << "  <<There are " << nFaces
-                 << " non-orthogonal faces " << endl;
+            Info << "  <<Writing " << nFaces
+                 << " non-orthogonal faces to set " << faces.name() << endl;
+            faces.instance() = mesh.pointsInstance();
+            faces.write();
+            if (surfWriter.valid())
+            {
+                mergeAndWrite(surfWriter(), faces);
+            }
         }
     }
 
@@ -347,9 +367,15 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
             if (nFaces > 0)
             {
-                Info << "  <<There are " << nFaces
-                     << " faces with incorrect orientation "
-                     << endl;
+                Info << "  <<Writing " << nFaces
+                     << " faces with incorrect orientation to set "
+                     << faces.name() << endl;
+                faces.instance() = mesh.pointsInstance();
+                faces.write();
+                if (surfWriter.valid())
+                {
+                    mergeAndWrite(surfWriter(), faces);
+                }
             }
         }
     }
@@ -364,8 +390,14 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
             if (nFaces > 0)
             {
-                Info << "  <<There are " << nFaces
-                     << " skew faces" << endl;
+                Info << "  <<Writing " << nFaces
+                     << " skew faces to set " << faces.name() << endl;
+                faces.instance() = mesh.pointsInstance();
+                faces.write();
+                if (surfWriter.valid())
+                {
+                    mergeAndWrite(surfWriter(), faces);
+                }
             }
         }
     }
@@ -380,9 +412,16 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh)
 
             if (nFaces > 0)
             {
-                Info << " <<There are " << nFaces
+                Info << "  <<Writing " << nFaces
                      << " faces with incorrectly matched 0th (or consecutive)"
-                     << endl;
+                     << " vertex to set "
+                     << faces.name() << endl;
+                faces.instance() = mesh.pointsInstance();
+                faces.write();
+                if (surfWriter.valid())
+                {
+                    mergeAndWrite(surfWriter(), faces);
+                }
             }
         }
     }

src/adjoint/DACheckMesh/checkGeometry.H

@@ -8,6 +8,25 @@
 #include "label.H"
 #include "HashSet.H"
 #include "labelVector.H"
+#include "polyMesh.H"
+#include "cellSet.H"
+#include "faceSet.H"
+#include "pointSet.H"
+#include "edgeHashes.H"
+#include "wedgePolyPatch.H"
+#include "unitConversion.H"
+#include "polyMeshTetDecomposition.H"
+#include "surfaceWriter.H"
+#include "checkTools.H"
+#include "functionObject.H"
+
+#include "vtkSurfaceWriter.H"
+#include "vtkSetWriter.H"
+#include "writer.H"
+
+#include "cyclicACMIPolyPatch.H"
+#include "Time.H"
+#include "PatchTools.H"
 
 namespace Foam
 {
@@ -27,6 +46,9 @@ bool checkWedges(
 bool checkCoupledPoints(const polyMesh&, const bool report, labelHashSet*);
 
 /// check mesh quality
-label checkGeometry(const polyMesh& mesh);
+label checkGeometry(
+    const polyMesh& mesh,
+    const autoPtr<surfaceWriter>& surfWriter,
+    const autoPtr<writer<scalar>>& setWriter);
 
 }