diff --git a/applications/test/vectorTools/Make/files b/applications/test/vectorTools/Make/files deleted file mode 100644 index 0b30b98f8f..0000000000 --- a/applications/test/vectorTools/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -Test-vectorTools.C - -EXE = $(FOAM_USER_APPBIN)/Test-vectorTools diff --git a/applications/test/vectorTools/Make/options b/applications/test/vectorTools/Make/options deleted file mode 100644 index 9e015e6078..0000000000 --- a/applications/test/vectorTools/Make/options +++ /dev/null @@ -1 +0,0 @@ -EXE_INC = -I$(FOAM_APP)/utilities/mesh/generation/cvMesh/vectorTools diff --git a/applications/test/vectorTools/Test-vectorTools.C b/applications/test/vectorTools/Test-vectorTools.C deleted file mode 100644 index 85d18ed989..0000000000 --- a/applications/test/vectorTools/Test-vectorTools.C +++ /dev/null @@ -1,71 +0,0 @@ -#include "vector.H" -#include "IOstreams.H" -#include "vectorTools.H" -#include "unitConversion.H" - -using namespace Foam; - - -void test(const vector& a, const vector& b, const scalar tolerance) -{ - Info<< "Vectors " << a << " and " << b - << " are (to tolerance of " << tolerance << "): "; - - if (vectorTools::areParallel(a, b, tolerance)) - Info<< " parallel "; - - if (vectorTools::areOrthogonal(a, b, tolerance)) - Info<< " orthogonal "; - - if (vectorTools::areAcute(a, b)) - Info<< " acute "; - - if (vectorTools::areObtuse(a, b)) - Info<< " obtuse "; - - Info<< ", angle = " << vectorTools::degAngleBetween(a, b); - - Info<< endl; -} - - -int main() -{ - vector a(1.0, 1.0, 1.0); - vector b(2.0, 2.0, 2.0); - - test(a, b, 0.0); - test(a, b, VSMALL); - test(a, b, SMALL); - test(a, b, 1e-3); - test(a, b, 1e-1); - - a = vector(1,0,0); - b = vector(0,2,0); - - test(a, b, 0.0); - test(a, b, VSMALL); - test(a, b, SMALL); - test(a, b, 1e-3); - test(a, b, 1e-1); - - a = vector(1,0,0); - b = vector(-1,0,0); - - test(a, b, 0.0); - test(a, b, VSMALL); - test(a, b, SMALL); - test(a, b, 1e-3); - test(a, b, 1e-1); - - a = vector(1,0,0); - b = vector(-1,2,0); - - test(a, b, 0.0); - test(a, b, VSMALL); - test(a, b, SMALL); - test(a, b, 1e-3); - test(a, b, 1e-1); - - return 0; -} diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseDict b/applications/utilities/mesh/advanced/collapseEdges/collapseDict index 78905475e3..60f4cb2f43 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseDict +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseDict @@ -2,24 +2,16 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object collapseDict; + version 2.0; + format ascii; + class dictionary; + object collapseDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // collapseEdgesCoeffs @@ -78,7 +70,11 @@ meshQualityCoeffs meshQualityCoeffDict meshQualityDict; // Maximum number of outer iterations is mesh quality checking is enabled - maximumIterations 30; + maximumIterations 10; + + // Maximum number of iterations deletion of a point can cause a bad face + // to be constructed before it is forced to not be deleted + maxPointErrorCount 5; } diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index 132a602b1a..f617fd6ad1 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,6 +70,12 @@ int main(int argc, char *argv[]) "Collapse small and sliver faces as well as small edges" ); + argList::addBoolOption + ( + "collapseIndirectPatchFaces", + "Collapse faces that are in the face zone indirectPatchFaces" + ); + # include "addOverwriteOption.H" # include "setRootCase.H" # include "createTime.H" @@ -84,6 +90,8 @@ int main(int argc, char *argv[]) const bool overwrite = args.optionFound("overwrite"); const bool collapseFaces = args.optionFound("collapseFaces"); + const bool collapseIndirectPatchFaces = + args.optionFound("collapseIndirectPatchFaces"); forAll(timeDirs, timeI) { @@ -105,6 +113,18 @@ int main(int argc, char *argv[]) meshMod.changeMesh(mesh, false); } + if (collapseIndirectPatchFaces) + { + // Filter faces. Pass in the number of bad faces that are present + // from the previous edge filtering to use as a stopping criterion. + meshFilter.filterIndirectPatchFaces(); + { + polyTopoChange meshMod(newMesh); + + meshMod.changeMesh(mesh, false); + } + } + if (collapseFaces) { // Filter faces. Pass in the number of bad faces that are present diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake index a1141cfb1b..d557fa34f8 100755 --- a/applications/utilities/mesh/generation/Allwmake +++ b/applications/utilities/mesh/generation/Allwmake @@ -9,9 +9,5 @@ extrude2DMesh/Allwmake wmake snappyHexMesh -if [ -d "$CGAL_ARCH_PATH" ] -then - cvMesh/Allwmake -fi # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/mesh/generation/cvMesh/Allwclean b/applications/utilities/mesh/generation/cvMesh/Allwclean deleted file mode 100755 index 3eff84006a..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/Allwclean +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # run from this directory -set -x - -wclean libso conformalVoronoiMesh -wclean -wclean cvMeshSurfaceSimplify -wclean cvMeshBackgroundMesh - -# ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/mesh/generation/cvMesh/Allwmake b/applications/utilities/mesh/generation/cvMesh/Allwmake deleted file mode 100755 index d88e8cee4a..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/Allwmake +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # run from this directory -set -x - -wmake libso conformalVoronoiMesh -wmake -#wmake cvMeshBackgroundMesh -(cd cvMeshSurfaceSimplify && ./Allwmake) -wmake cellSizeAndAlignmentGrid - -# ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/mesh/generation/cvMesh/Make/files b/applications/utilities/mesh/generation/cvMesh/Make/files deleted file mode 100644 index 425e0f5b83..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -cvMesh.C - -EXE = $(FOAM_APPBIN)/cvMesh diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options deleted file mode 100644 index 9461fa3725..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/Make/options +++ /dev/null @@ -1,38 +0,0 @@ -EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math -EXE_NDEBUG = -DNDEBUG - -CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/ -CGAL_INEXACT = -DCGAL_INEXACT - -include $(GENERAL_RULES)/CGAL - -EXE_INC = \ - ${EXE_FROUNDING_MATH} \ - ${EXE_NDEBUG} \ - ${CGAL_INEXACT} \ - ${CGAL_INC} \ - -IconformalVoronoiMesh/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ - -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -IvectorTools - -EXE_LIBS = \ - $(CGAL_LIBS) \ - -lboost_thread \ - -lmpfr \ - -lconformalVoronoiMesh \ - -lmeshTools \ - -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ - -ledgeMesh \ - -lfileFormats \ - -ltriSurface \ - -ldynamicMesh \ - -lsampling diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files b/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files deleted file mode 100644 index 83b77fdc77..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files +++ /dev/null @@ -1,2 +0,0 @@ -cellSizeAndAlignmentGrid.C -EXE = $(FOAM_USER_APPBIN)/cellSizeAndAlignmentGrid diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options deleted file mode 100644 index 31d0d80858..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options +++ /dev/null @@ -1,40 +0,0 @@ -EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_FROUNDING_MATH = -frounding-math -EXE_NDEBUG = -DNDEBUG - -CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/ -CGAL_INEXACT = -DCGAL_INEXACT - -include $(GENERAL_RULES)/CGAL - - -EXE_INC = \ - ${EXE_FROUNDING_MATH} \ - ${EXE_NDEBUG} \ - ${CGAL_INEXACT} \ - ${CGAL_INC} \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ - -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(HOME)/OpenFOAM/OpenFOAM-dev/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/lnInclude \ - -I$(HOME)/OpenFOAM/OpenFOAM-dev/applications/utilities/mesh/generation/cvMesh/vectorTools - -EXE_LIBS = \ - $(CGAL_LIBS) \ - -lmpfr \ - -lboost_thread \ - -lconformalVoronoiMesh \ - -lfiniteVolume \ - -lmeshTools \ - -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ - -ledgeMesh \ - -ltriSurface \ - -ldynamicMesh \ - -lsampling \ - -lfileFormats diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C deleted file mode 100644 index 18109761a5..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C +++ /dev/null @@ -1,711 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - Test-distributedDelaunayMesh - -Description - -\*---------------------------------------------------------------------------*/ - -#include "CGALTriangulation3DKernel.H" - -#include "indexedVertex.H" -#include "indexedCell.H" - -#include "argList.H" -#include "Time.H" -#include "DistributedDelaunayMesh.H" -#include "backgroundMeshDecomposition.H" -#include "searchableSurfaces.H" -#include "conformationSurfaces.H" -#include "PrintTable.H" -#include "Random.H" -#include "boundBox.H" -#include "point.H" -#include "cellShapeControlMesh.H" -#include "triadField.H" -#include "scalarIOField.H" -#include "pointIOField.H" -#include "triadIOField.H" - -using namespace Foam; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Main program: - -template -Foam::tmp > filterFarPoints -( - const Triangulation& mesh, - const Field& field -) -{ - tmp > tNewField(new Field(field.size())); - Field& newField = tNewField(); - - label added = 0; - label count = 0; - - for - ( - typename Triangulation::Finite_vertices_iterator vit = - mesh.finite_vertices_begin(); - vit != mesh.finite_vertices_end(); - ++vit - ) - { - if (vit->real()) - { - newField[added++] = field[count]; - } - - count++; - } - - newField.resize(added); - - return tNewField; -} - - -template -autoPtr buildMap -( - const T& mesh, - labelListList& pointPoints -) -{ - pointPoints.setSize(mesh.vertexCount()); - - globalIndex globalIndexing(mesh.vertexCount()); - - for - ( - typename T::Finite_vertices_iterator vit = mesh.finite_vertices_begin(); - vit != mesh.finite_vertices_end(); - ++vit - ) - { - if (!vit->real()) - { - continue; - } - - std::list adjVerts; - mesh.finite_adjacent_vertices(vit, std::back_inserter(adjVerts)); - - DynamicList