From 00dc73fad790cf3351f3dccce926e975ad54842d Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 16 May 2008 12:31:49 +0100 Subject: [PATCH 1/4] Corrected READLINE flag testing --- .../utilities/mesh/manipulation/Optional/setSet/setSet.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C b/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C index 705ffed422..3c3f01de93 100644 --- a/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C +++ b/applications/utilities/mesh/manipulation/Optional/setSet/setSet.C @@ -47,7 +47,7 @@ Description #include -#ifdef READLINE +#if READLINE != 0 #include #include #endif @@ -57,7 +57,7 @@ using namespace Foam; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef READLINE +#if READLINE != 0 static const char* historyFile = ".setSet"; #endif @@ -739,7 +739,7 @@ int main(int argc, char *argv[]) fileStreamPtr = new std::ifstream(batchFile.c_str()); } -#ifdef READLINE +#if READLINE != 0 else if (!read_history(historyFile)) { Info<< "Successfully read history from " << historyFile << endl; @@ -784,7 +784,7 @@ int main(int argc, char *argv[]) } else { -# ifdef READLINE +# if READLINE != 0 { char* linePtr = readline("readline>"); From 0693cf28d1101885dbbd90a3156c8cddb7e5cfe9 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 16 May 2008 13:06:06 +0100 Subject: [PATCH 2/4] Fix for build on Eee --- src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C index 84bca40cf8..4c09f35ae7 100644 --- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C +++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C @@ -1,4 +1,4 @@ -/*---------------------------------------------------------------------------*\ +/*---------------------------------------------------------------------------* \ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | @@ -333,7 +333,7 @@ Foam::labelList Foam::faceCoupleInfo::findMappedEdges label v0 = pointMap[e[0]]; label v1 = pointMap[e[1]]; - toPatchEdges[edgeI] = + toPatchEdges[edgeI] = meshTools::findEdge ( patch.edges(), @@ -517,7 +517,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges) labelListList masterToCutEdges ( invertOneToMany - ( + ( masterPatch().nEdges(), cutToMasterEdges ) @@ -577,7 +577,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges) while (startVertI != unsplitEdge[1]) { - // Loop over all string of edges. Update + // Loop over all string of edges. Update // - startVertI : previous vertex // - startEdgeI : previous edge // and insert any points into splitPoints @@ -995,7 +995,7 @@ void Foam::faceCoupleInfo::findPerfectMatchingFaces nMatched++; } } - + mesh0Faces.setSize(nMatched); mesh1Faces.setSize(nMatched); } @@ -1050,7 +1050,7 @@ void Foam::faceCoupleInfo::findSlavesCoveringMaster point fc(f1.centre(mesh1.points())); // Search in bounding box of face only. - treeBoundBox tightest(f1.points(mesh1.points())); + treeBoundBox tightest(static_cast(f1.points(mesh1.points()))); scalar tightestDist = GREAT; @@ -1509,7 +1509,7 @@ void Foam::faceCoupleInfo::perfectPointMatch // Cut faces to slave patch. bool matchedAllFaces = false; - + if (slaveFacesOrdered) { cutToSlaveFaces_ = identity(cutFaces().size()); @@ -1576,7 +1576,7 @@ void Foam::faceCoupleInfo::perfectPointMatch compactToCut // compaction map: from compacted to cut ); - + // Use compaction lists to renumber cutPoints. cutPoints_ = IndirectList(cutPoints_, compactToCut)(); { @@ -1882,7 +1882,7 @@ void Foam::faceCoupleInfo::subDivisionMatch break; } } - + // All cut faces matched? forAll(cutToMasterFaces_, cutFaceI) From 4b5809ea7bd48d735c7a864653f85e032d34c317 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 16 May 2008 14:00:22 +0100 Subject: [PATCH 3/4] Printing of bounding box of patches --- .../mesh/manipulation/checkMesh/checkMesh.C | 2 +- .../manipulation/checkMesh/checkTopology.C | 73 ++++++++++++------- .../manipulation/checkMesh/checkTopology.H | 2 +- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C index dcbab5c1b9..ecfb565038 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) if (!noTopology) { - noFailedChecks += checkTopology(mesh, allTopology); + noFailedChecks += checkTopology(mesh, allTopology, allGeometry); } noFailedChecks += checkGeometry(mesh, allGeometry); diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C index 6fbb2c0bf9..85dc0bae62 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C @@ -7,7 +7,12 @@ #include "pointSet.H" #include "IOmanip.H" -Foam::label Foam::checkTopology(const polyMesh& mesh, const bool allTopology) +Foam::label Foam::checkTopology +( + const polyMesh& mesh, + const bool allTopology, + const bool allGeometry +) { label noFailedChecks = 0; @@ -142,39 +147,38 @@ Foam::label Foam::checkTopology(const polyMesh& mesh, const bool allTopology) << setw(20) << "Patch" << setw(9) << "Faces" << setw(9) << "Points" - << " Surface" << endl; + << setw(34) << "Surface topology"; + if (allGeometry) + { + Pout<< " Bounding box"; + } + Pout<< endl; forAll(patches, patchI) { const polyPatch& pp = patches[patchI]; + Pout<< " " + << setw(20) << pp.name() + << setw(9) << pp.size() + << setw(9) << pp.nPoints(); + + primitivePatch::surfaceTopo pTyp = pp.surfaceType(); if (pp.size() == 0) { - Pout<< " " - << setw(20) << pp.name() - << setw(9) << pp.size() - << setw(9) << pp.nPoints() - << " ok (empty)" << endl; + Pout<< setw(34) << "ok (empty)"; } else if (pTyp == primitivePatch::MANIFOLD) { if (pp.checkPointManifold(true, &points)) { - Pout<< " " - << setw(20) << pp.name() - << setw(9) << pp.size() - << setw(9) << pp.nPoints() - << " multiply connected (shared point)" << endl; + Pout<< setw(34) << "multiply connected (shared point)"; } else { - Pout<< " " - << setw(20) << pp.name() - << setw(9) << pp.size() - << setw(9) << pp.nPoints() - << " ok (closed singly connected surface)" << endl; + Pout<< setw(34) << "ok (closed singly connected)"; } // Add points on non-manifold edges to make set complete @@ -186,22 +190,35 @@ Foam::label Foam::checkTopology(const polyMesh& mesh, const bool allTopology) if (pTyp == primitivePatch::OPEN) { - Pout<< " " - << setw(20) << pp.name() - << setw(9) << pp.size() - << setw(9) << pp.nPoints() - << " ok (not multiply connected)" << endl; + Pout<< setw(34) << "ok (non-closed singly connected)"; } else { - Pout<< " " - << setw(20) << pp.name() - << setw(9) << pp.size() - << setw(9) << pp.nPoints() - << " multiply connected surface (shared edge)" - << endl; + Pout<< setw(34) << "multiply connected (shared edge)"; } } + + if (allGeometry) + { + const pointField& pts = pp.points(); + const labelList& mp = pp.meshPoints(); + + boundBox bb(vector::zero, vector::zero); + if (returnReduce(mp.size(), sumOp