diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Allwclean b/applications/utilities/mesh/generation/foamyHexMesh/Allwclean index 3eff84006a..696f6c0b65 100755 --- a/applications/utilities/mesh/generation/foamyHexMesh/Allwclean +++ b/applications/utilities/mesh/generation/foamyHexMesh/Allwclean @@ -4,7 +4,7 @@ set -x wclean libso conformalVoronoiMesh wclean -wclean cvMeshSurfaceSimplify -wclean cvMeshBackgroundMesh +wclean foamyHexMeshSurfaceSimplify +wclean foamyHexMeshBackgroundMesh # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Allwmake b/applications/utilities/mesh/generation/foamyHexMesh/Allwmake index 16cda4280c..3a5c35d779 100755 --- a/applications/utilities/mesh/generation/foamyHexMesh/Allwmake +++ b/applications/utilities/mesh/generation/foamyHexMesh/Allwmake @@ -6,8 +6,8 @@ if [ -d "$CGAL_ARCH_PATH" ] then wmake libso conformalVoronoiMesh wmake - #wmake cvMeshBackgroundMesh - #(cd cvMeshSurfaceSimplify && ./Allwmake) + #wmake foamyHexMeshBackgroundMesh + #(cd foamyHexMeshSurfaceSimplify && ./Allwmake) #wmake cellSizeAndAlignmentGrid fi diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options index a622cd68d3..b7df05f045 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options @@ -21,8 +21,9 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(FOAM_UTILITIES)/mesh/generation/cvMesh/conformalVoronoiMesh/lnInclude \ - -I$(FOAM_UTILITIES)/mesh/generation/cvMesh/vectorTools + -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ + -I$(FOAM_UTILITIES)/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \ + -I$(FOAM_UTILITIES)/mesh/generation/foamyHexMesh/vectorTools EXE_LIBS = \ $(CGAL_LIBS) \ diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C index 716d4cef15..250873b458 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -285,11 +285,11 @@ int main(int argc, char *argv[]) // - type should be optional cellShapeControlMesh mesh(runTime); - IOdictionary cvMeshDict + IOdictionary foamyHexMeshDict ( IOobject ( - "cvMeshDict", + "foamyHexMeshDict", runTime.system(), runTime, IOobject::MUST_READ, @@ -310,7 +310,8 @@ int main(int argc, char *argv[]) IOobject::MUST_READ, IOobject::NO_WRITE ), - cvMeshDict.subDict("geometry") + foamyHexMeshDict.subDict("geometry"), + foamyHexMeshDict.lookupOrDefault("singleRegionName", true) ); conformationSurfaces geometryToConformTo @@ -318,7 +319,7 @@ int main(int argc, char *argv[]) runTime, rndGen, allGeometry, - cvMeshDict.subDict("surfaceConformation") + foamyHexMeshDict.subDict("surfaceConformation") ); autoPtr bMesh; @@ -331,7 +332,7 @@ int main(int argc, char *argv[]) runTime, rndGen, geometryToConformTo, - cvMeshDict.subDict("backgroundMeshDecomposition") + foamyHexMeshDict.subDict("backgroundMeshDecomposition") ) ); } diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C index c74740d812..6bfb7f3067 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -855,7 +855,8 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh IOobject::MUST_READ, IOobject::NO_WRITE ), - foamyHexMeshDict.subDict("geometry") + foamyHexMeshDict.subDict("geometry"), + foamyHexMeshDict.lookupOrDefault("singleRegionName", true) ), geometryToConformTo_ ( diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files deleted file mode 100644 index 58406b931a..0000000000 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -cvMeshBackgroundMesh.C - -EXE = $(FOAM_APPBIN)/cvMeshBackgroundMesh diff --git a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C index c27d816cac..1a98decbc3 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,8 @@ int main(int argc, char *argv[]) IOobject::MUST_READ, IOobject::NO_WRITE ), - foamyHexMeshDict.subDict("geometry") + foamyHexMeshDict.subDict("geometry"), + foamyHexMeshDict.lookupOrDefault("singleRegionName", true) ); // Write some stats diff --git a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/files new file mode 100644 index 0000000000..b01c96b15a --- /dev/null +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/files @@ -0,0 +1,3 @@ +foamyHexMeshBackgroundMesh.C + +EXE = $(FOAM_APPBIN)/foamyHexMeshBackgroundMesh diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options similarity index 87% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/options rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options index 0322435c8c..c81108dbca 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/options @@ -11,9 +11,12 @@ EXE_INC = \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ + -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I../vectorTools diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C similarity index 96% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index 0a207b707d..afe0e56f29 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,10 +22,10 @@ License along with OpenFOAM. If not, see . Application - cvMeshBackGroundMesh + foamyHexMeshBackGroundMesh Description - Writes out background mesh as constructed by cvMesh and constructs + Writes out background mesh as constructed by foamyHexMesh and constructs distanceSurface. \*---------------------------------------------------------------------------*/ @@ -346,7 +346,7 @@ tmp signedDistance // Calculate sideness of these surface points label geomI = surfaces[surfI]; - List volType; + List volType; geometry[geomI].getVolumeType(surfPoints, volType); // Push back to original @@ -355,13 +355,13 @@ tmp signedDistance label pointI = surfIndices[i]; scalar dist = mag(points[pointI] - nearest[pointI].hitPoint()); - searchableSurface::volumeType vT = volType[i]; + volumeType vT = volType[i]; - if (vT == searchableSurface::OUTSIDE) + if (vT == volumeType::OUTSIDE) { fld[pointI] = dist; } - else if (vT == searchableSurface::INSIDE) + else if (vT == volumeType::INSIDE) { fld[i] = -dist; } @@ -385,7 +385,7 @@ int main(int argc, char *argv[]) { argList::addNote ( - "Generate cvMesh-consistent representation of surfaces" + "Generate foamyHexMesh-consistent representation of surfaces" ); argList::addBoolOption ( @@ -413,11 +413,11 @@ int main(int argc, char *argv[]) } - IOdictionary cvMeshDict + IOdictionary foamyHexMeshDict ( IOobject ( - "cvMeshDict", + "foamyHexMeshDict", runTime.system(), runTime, IOobject::MUST_READ_IF_MODIFIED, @@ -437,7 +437,8 @@ int main(int argc, char *argv[]) IOobject::MUST_READ, IOobject::NO_WRITE ), - cvMeshDict.subDict("geometry") + foamyHexMeshDict.subDict("geometry"), + foamyHexMeshDict.lookupOrDefault("singleRegionName", true) ); Random rndGen(64293*Pstream::myProcNo()); @@ -447,18 +448,15 @@ int main(int argc, char *argv[]) runTime, rndGen, allGeometry, - cvMeshDict.subDict("surfaceConformation") + foamyHexMeshDict.subDict("surfaceConformation") ); - autoPtr cellShapeControls + cellShapeControl cellShapeControls ( - cellShapeControl::New - ( - runTime, - cvMeshDict.subDict("motionControl"), - allGeometry, - geometryToConformTo - ) + runTime, + foamyHexMeshDict.subDict("motionControl"), + allGeometry, + geometryToConformTo ); @@ -587,7 +585,7 @@ int main(int argc, char *argv[]) geometryToConformTo, cellShapeControls(), rndGen, - cvMeshDict + foamyHexMeshDict ); if (writeMesh) diff --git a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict index d7d890d789..3d05f38485 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshDict @@ -75,6 +75,12 @@ geometry } } +//Optional: single region surfaces get patch names according to +// surface only. Multi-region surfaces get patch name +// surface "_ "region. Default is true +//singleRegionName false; + + // Controls for conforming to the surfaces. surfaceConformation diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Allwmake similarity index 100% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Allwmake rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Allwmake diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/files similarity index 74% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/files rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/files index fbe4cfeda6..f75432eebe 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/files +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/files @@ -1,5 +1,5 @@ /* -cvMeshSurfaceSimplify_non_octree.C +foamyHexMeshSurfaceSimplify_non_octree.C MarchingCubes/MarchingCubes.cpp MarchingCubes/ply.c */ @@ -17,6 +17,6 @@ $(MarchingCubes)/opt_octree.cpp $(MarchingCubes)/hash_octree.cpp */ -cvMeshSurfaceSimplify.C +foamyHexMeshSurfaceSimplify.C -EXE = $(FOAM_APPBIN)/cvMeshSurfaceSimplify +EXE = $(FOAM_APPBIN)/foamyHexMeshSurfaceSimplify diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/options similarity index 94% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/options rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/options index 7bd92a24ab..18ce8326c7 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ -I$(FASTDUALOCTREE_SRC_PATH) \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ + -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C similarity index 97% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C index 5b214c5d6a..cd12b4d294 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - cvMeshSurfaceSimplify + foamyHexMeshSurfaceSimplify Description Simplifies surfaces by resampling. @@ -112,7 +112,7 @@ class distanceCalc surfaces, samples, scalarField(1, GREAT), - searchableSurface::OUTSIDE, + volumeType::OUTSIDE, nearestSurfaces, distance ); @@ -366,7 +366,7 @@ int main(int argc, char *argv[]) { argList::addNote ( - "Re-sample surfaces used in cvMesh operation" + "Re-sample surfaces used in foamyHexMesh operation" ); argList::validArgs.append("outputName"); @@ -376,17 +376,17 @@ int main(int argc, char *argv[]) const fileName exportName = args.args()[1]; - Info<< "Reading surfaces as specified in the cvMeshDict and" + Info<< "Reading surfaces as specified in the foamyHexMeshDict and" << " writing a re-sampled surface to " << exportName << nl << endl; cpuTime timer; - IOdictionary cvMeshDict + IOdictionary foamyHexMeshDict ( IOobject ( - "cvMeshDict", + "foamyHexMeshDict", runTime.system(), runTime, IOobject::MUST_READ_IF_MODIFIED, @@ -406,7 +406,8 @@ int main(int argc, char *argv[]) IOobject::MUST_READ, IOobject::NO_WRITE ), - cvMeshDict.subDict("geometry") + foamyHexMeshDict.subDict("geometry"), + foamyHexMeshDict.lookupOrDefault("singleRegionName", true) ); Info<< "Geometry read in = " @@ -420,7 +421,7 @@ int main(int argc, char *argv[]) runTime, rndGen, allGeometry, - cvMeshDict.subDict("surfaceConformation") + foamyHexMeshDict.subDict("surfaceConformation") ); Info<< "Set up geometry in = " diff --git a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C similarity index 95% rename from applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C rename to applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C index 3bc7c013cd..961004b386 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - cvMeshSurfaceSimplify + foamyHexMeshSurfaceSimplify Description Simplifies surfaces by resampling. @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { argList::addNote ( - "Re-sample surfaces used in cvMesh operation" + "Re-sample surfaces used in foamyHexMesh operation" ); //argList::validArgs.append("inputFile"); argList::validArgs.append("(nx ny nz)"); @@ -63,17 +63,17 @@ int main(int argc, char *argv[]) const Vector