From 8acfa4692a1a4eafe81539b1964e84871dfd0b1f Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 27 Jan 2014 12:25:56 +0000 Subject: [PATCH 1/5] STYLE: snappyHexMeshDict: removed optional parameter --- .../annularThermalMixer/system/snappyHexMeshDict | 1 - .../iglooWithFridges/system/snappyHexMeshDict | 8 -------- .../snappyMultiRegionHeater/system/snappyHexMeshDict | 8 -------- .../wingMotion_snappyHexMesh/system/snappyHexMeshDict | 8 -------- .../les/motorBike/motorBike/system/snappyHexMeshDict | 8 -------- .../simpleFoam/turbineSiting/system/snappyHexMeshDict | 8 -------- tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict | 8 -------- .../mesh/foamyHexMesh/flange/system/snappyHexMeshDict | 8 -------- .../LTSInterFoam/wigleyHull/system/snappyHexMeshDict | 8 -------- .../ras/mixerVesselAMI/system/snappyHexMeshDict | 7 ------- .../cavitatingBullet/system/snappyHexMeshDict | 8 -------- 11 files changed, 80 deletions(-) diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict index f211a4aebb..00eee0f698 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict @@ -268,7 +268,6 @@ meshQualityControls } } -debug 0; mergeTolerance 1e-6; // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict index ff6504711b..89829fcc32 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict @@ -363,14 +363,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict index bafbafc518..d4955c7710 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict @@ -352,14 +352,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict index fcf64ed65d..1089c82ed3 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict @@ -312,14 +312,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict index 452adf13de..4e5aa48a6c 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict @@ -315,14 +315,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1E-6; diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict index 8d135329e0..d9ed334301 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict @@ -386,14 +386,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict index c5723d829f..ee9eaf14da 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict @@ -294,14 +294,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; diff --git a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict index 74570a4ae5..f4b351452e 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict @@ -303,14 +303,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1E-6; diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict index 012ba92343..36bd09b946 100644 --- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict @@ -370,14 +370,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1E-6; diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict index 0aa43b6384..21772cfe1a 100644 --- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict @@ -557,13 +557,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict index 48e88d648b..9a372d4b1d 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict @@ -335,14 +335,6 @@ meshQualityControls // Advanced -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; From 85c60ecc34c1e86242407003b089efe3ae7ba6e4 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 27 Jan 2014 12:28:18 +0000 Subject: [PATCH 2/5] ENH: OBJstream: relaxed input --- src/surfMesh/surfaceFormats/obj/OBJstream.C | 6 +++--- src/surfMesh/surfaceFormats/obj/OBJstream.H | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/surfMesh/surfaceFormats/obj/OBJstream.C index 46a6b7e0c0..6a5626e906 100644 --- a/src/surfMesh/surfaceFormats/obj/OBJstream.C +++ b/src/surfMesh/surfaceFormats/obj/OBJstream.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 @@ -223,7 +223,7 @@ Foam::Ostream& Foam::OBJstream::write(const point& pt, const vector& n) } -Foam::Ostream& Foam::OBJstream::write(const edge& e, const pointField& points) +Foam::Ostream& Foam::OBJstream::write(const edge& e, const UList& points) { write(points[e[0]]); write(points[e[1]]); @@ -290,7 +290,7 @@ Foam::Ostream& Foam::OBJstream::write Foam::Ostream& Foam::OBJstream::write ( const face& f, - const pointField& points, + const UList& points, const bool lines ) { diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/surfMesh/surfaceFormats/obj/OBJstream.H index ee6ae58143..47da27c51b 100644 --- a/src/surfMesh/surfaceFormats/obj/OBJstream.H +++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H @@ -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 @@ -130,7 +130,7 @@ public: Ostream& write(const point&, const vector&); //- Write edge as points with line - Ostream& write(const edge&, const pointField&); + Ostream& write(const edge&, const UList&); //- Write line Ostream& write(const linePointRef&); @@ -150,7 +150,7 @@ public: Ostream& write ( const face&, - const pointField&, + const UList&, const bool lines = true ); From 7506490ecf8c1de4d557f5f01efcb79e22b5267c Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 27 Jan 2014 12:29:52 +0000 Subject: [PATCH 3/5] STYLE: reconstructParMesh: typo in comment --- .../parallelProcessing/reconstructParMesh/reconstructParMesh.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C index 90a081d1d0..c32833c208 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C +++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C @@ -816,7 +816,7 @@ int main(int argc, char *argv[]) ); // Now add turning index to faceProcAddressing. - // See reconstrurPar for meaning of turning index. + // See reconstructPar for meaning of turning index. forAll(faceProcAddr, procFaceI) { label masterFaceI = faceProcAddr[procFaceI]; From 1f192f8b7319293da8f49af23909ea43ae7cff63 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 27 Jan 2014 12:44:45 +0000 Subject: [PATCH 4/5] ENH: snappyHexMesh: have single region surface named as instead of _ --- .../mesh/generation/foamyHexMesh/Allwclean | 4 +- .../mesh/generation/foamyHexMesh/Allwmake | 4 +- .../cellSizeAndAlignmentGrid/Make/options | 5 ++- .../cellSizeAndAlignmentGrid.C | 13 +++--- .../conformalVoronoiMesh.C | 5 ++- .../cvMeshBackgroundMesh/Make/files | 3 -- .../generation/foamyHexMesh/foamyHexMesh.C | 5 ++- .../foamyHexMeshBackgroundMesh/Make/files | 3 ++ .../Make/options | 3 ++ .../foamyHexMeshBackgroundMesh.C} | 40 +++++++++---------- .../generation/foamyHexMesh/foamyHexMeshDict | 6 +++ .../Allwmake | 0 .../Make/files | 6 +-- .../Make/options | 1 + .../foamyHexMeshSurfaceSimplify.C} | 17 ++++---- .../foamyHexMeshSurfaceSimplify_non_octree.C} | 17 ++++---- .../mesh/generation/foamyQuadMesh/CV2D.C | 5 ++- .../generation/foamyQuadMesh/Make/options | 2 +- .../generation/snappyHexMesh/snappyHexMesh.C | 3 +- .../snappyHexMesh/snappyHexMeshDict | 7 ++++ .../foamFormatConvert/foamFormatConvert.C | 4 +- .../surface/surfaceHookUp/surfaceHookUp.C | 5 ++- ...surfaceDisplacementPointPatchVectorField.C | 5 ++- ...aceSlipDisplacementPointPatchVectorField.C | 5 ++- .../searchableSurface/searchableSurfaces.C | 16 ++++++-- .../searchableSurface/searchableSurfaces.H | 14 +++++-- .../annularThermalMixer/Allrun | 1 - 27 files changed, 120 insertions(+), 79 deletions(-) delete mode 100644 applications/utilities/mesh/generation/foamyHexMesh/cvMeshBackgroundMesh/Make/files create mode 100644 applications/utilities/mesh/generation/foamyHexMesh/foamyHexMeshBackgroundMesh/Make/files rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshBackgroundMesh => foamyHexMeshBackgroundMesh}/Make/options (87%) rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshBackgroundMesh/cvMeshBackgroundMesh.C => foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C} (96%) rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshSurfaceSimplify => foamyHexMeshSurfaceSimplify}/Allwmake (100%) rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshSurfaceSimplify => foamyHexMeshSurfaceSimplify}/Make/files (74%) rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshSurfaceSimplify => foamyHexMeshSurfaceSimplify}/Make/options (94%) rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C => foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C} (97%) rename applications/utilities/mesh/generation/foamyHexMesh/{cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C => foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C} (95%) 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