diff --git a/applications/test/vectorTools/Make/options b/applications/test/vectorTools/Make/options index 4fd76effed..41306609f2 100644 --- a/applications/test/vectorTools/Make/options +++ b/applications/test/vectorTools/Make/options @@ -1,2 +1 @@ -EXE_INC = \ - -I$(FOAM_APP)/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools +EXE_INC = diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake index 224921ce65..75e367f085 100755 --- a/applications/utilities/mesh/generation/Allwmake +++ b/applications/utilities/mesh/generation/Allwmake @@ -10,9 +10,4 @@ wmake -all $targetType extrudeMesh wmake -all $targetType extrudeToRegionMesh wmake -all $targetType snappyHexMesh -if [ -n "$FOAMY_HEX_MESH" ] -then - foamyMesh/Allwmake $targetType $* -fi - #------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwclean b/applications/utilities/mesh/generation/foamyMesh/Allwclean deleted file mode 100755 index 725d20869d..0000000000 --- a/applications/utilities/mesh/generation/foamyMesh/Allwclean +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -wclean conformalVoronoiMesh -wclean conformalVoronoi2DMesh -wclean foamyQuadMesh -wclean foamyHexMesh -wclean foamyHexMeshSurfaceSimplify -wclean foamyHexMeshBackgroundMesh -wclean cellSizeAndAlignmentGrid - -#------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake deleted file mode 100755 index 194ec84b48..0000000000 --- a/applications/utilities/mesh/generation/foamyMesh/Allwmake +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Parse arguments for library compilation -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments - -# Get BOOST_ARCH_PATH, CGAL_ARCH_PATH -if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL` -then - . $settings - if [ -n "$BOOST_ARCH_PATH" ] - then - echo " using BOOST_ARCH_PATH=$BOOST_ARCH_PATH" - fi - if [ -n "$CGAL_ARCH_PATH" ] - then - echo " using CGAL_ARCH_PATH=$CGAL_ARCH_PATH" - fi -else - echo - echo " Error: no config.sh/CGAL settings" - echo -fi - -wmake $targetType conformalVoronoiMesh -wmake $targetType conformalVoronoi2DMesh - -wmake $targetType foamyQuadMesh -wmake $targetType foamyHexMesh -#wmake $targetType foamyHexMeshBackgroundMesh -#wmake -a $targetType foamyHexMeshSurfaceSimplify -#wmake $targetType cellSizeAndAlignmentGrid - -#------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/files b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/files deleted file mode 100644 index 30c2e4e4fa..0000000000 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/files +++ /dev/null @@ -1,2 +0,0 @@ -cellSizeAndAlignmentGrid.C -EXE = $(FOAM_APPBIN)/cellSizeAndAlignmentGrid diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options deleted file mode 100644 index ad008471b1..0000000000 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options +++ /dev/null @@ -1,37 +0,0 @@ -EXE_DEBUG = -DFULLDEBUG -g -O0 -EXE_NDEBUG = -DNDEBUG - -CGAL_EXACT = -#CGAL_EXACT = -DCGAL_DONT_USE_LAZY_KERNEL -CGAL_INEXACT = -DCGAL_INEXACT - -include $(GENERAL_RULES)/CGAL - -EXE_INC = \ - ${ROUNDING_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)/mesh/snappyHexMesh/lnInclude \ - -I../conformalVoronoiMesh/lnInclude - -EXE_LIBS = \ - $(CGAL_LIBS) \ - -lmpfr \ - -lboost_thread \ - -lconformalVoronoiMesh \ - -lfiniteVolume \ - -lmeshTools \ - -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ - -ltriSurface \ - -ldynamicMesh \ - -lsampling \ - -lfileFormats diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C deleted file mode 100644 index e562c61103..0000000000 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C +++ /dev/null @@ -1,717 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2022 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.ref(); - - 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