diff --git a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.C b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.C index f2950cfd02f251df2dc08079674f42faaa100e72..065cfb1d7b2c5dd017ac0e172daea38edafe982f 100644 --- a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.C +++ b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.C @@ -45,18 +45,18 @@ defineRunTimeSelectionTable(createFundamentalSheets, polyMeshGen); // Construct from mesh, octree, regions for boundary vertices createFundamentalSheets::createFundamentalSheets ( - polyMeshGen& mesh + polyMeshGen& mesh, + const bool createWrapperSheet ) : - mesh_(mesh) -{ -} + mesh_(mesh), + createWrapperSheet_(createWrapperSheet) +{} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // createFundamentalSheets::~createFundamentalSheets() -{ -} +{} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.H b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.H index eb2b79bca9cf895cef4a8b7a5cdc3d029db9244e..bd77a3a670ae6b417f92752d78073c5c462ba871 100644 --- a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.H +++ b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheets/createFundamentalSheets.H @@ -64,6 +64,9 @@ protected: //- reference to mesh polyMeshGen& mesh_; + //- shall the procedure create the intial wrapper sheet + const bool createWrapperSheet_; + // Protected member functions //- Disallow default bitwise copy construct @@ -80,7 +83,11 @@ public: // Constructors //- Construct from mesh data - createFundamentalSheets(polyMeshGen& mesh); + createFundamentalSheets + ( + polyMeshGen& mesh, + const bool createWrapperSheet = true + ); // Declare run-time constructor selection table @@ -90,9 +97,10 @@ public: createFundamentalSheets, polyMeshGen, ( - polyMeshGen& mesh + polyMeshGen& mesh, + const bool createWrapperSheet ), - (mesh) + (mesh, createWrapperSheet) ); @@ -101,7 +109,7 @@ public: //- Select constructed from dictionary static autoPtr<createFundamentalSheets> New ( - polyMeshGen& mesh + polyMeshGen& mesh, const bool createWrapperSheet = true ); // Destructor diff --git a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.C b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.C index 869c38677d307dcf982c389b25a27c79a4ed5f97..35dbda5f0a48f6caf6e732515c6715e18de978b9 100644 --- a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.C +++ b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.C @@ -57,6 +57,9 @@ addToRunTimeSelectionTable void createFundamentalSheetsFJ::createInitialSheet() { + if( !createWrapperSheet_ ) + return; + const PtrList<boundaryPatch>& boundaries = mesh_.boundaries(); const label start = boundaries[0].patchStart(); @@ -197,10 +200,11 @@ void createFundamentalSheetsFJ::createSheetsAtFeatureEdges() // Construct from mesh, octree, regions for boundary vertices createFundamentalSheetsFJ::createFundamentalSheetsFJ ( - polyMeshGen& mesh + polyMeshGen& mesh, + const bool createWrapperSheet ) : - createFundamentalSheets(mesh) + createFundamentalSheets(mesh, createWrapperSheet) { createInitialSheet(); diff --git a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.H b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.H index 6436d2edd32c45b527538ac662c78997f757fea3..1a9f33f642ca954fa8af24c486ba5f9499a8b020 100644 --- a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.H +++ b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsFJ/createFundamentalSheetsFJ.H @@ -84,7 +84,11 @@ public: // Constructors //- Construct from mesh data - createFundamentalSheetsFJ(polyMeshGen& mesh); + createFundamentalSheetsFJ + ( + polyMeshGen& mesh, + const bool createWrapperSheet = true + ); // Destructor diff --git a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.C b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.C index eb244eb87be35e69d89d87bf70bdc92c5ac2ea97..35762937360679ad3cf3ffc8b040e79a2487a560 100644 --- a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.C +++ b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.C @@ -57,6 +57,9 @@ addToRunTimeSelectionTable void createFundamentalSheetsJFS::createInitialSheet() { + if( !createWrapperSheet_ ) + return; + const PtrList<boundaryPatch>& boundaries = mesh_.boundaries(); const label start = boundaries[0].patchStart(); @@ -168,10 +171,11 @@ void createFundamentalSheetsJFS::createSheetsAtFeatureEdges() // Construct from mesh, octree, regions for boundary vertices createFundamentalSheetsJFS::createFundamentalSheetsJFS ( - polyMeshGen& mesh + polyMeshGen& mesh, + const bool createWrapperSheet ) : - createFundamentalSheets(mesh) + createFundamentalSheets(mesh, createWrapperSheet) { createInitialSheet(); diff --git a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.H b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.H index 11b5249b3c2dd16f124150501409d73d0195ecd3..ecc564d39de7a827dcd522c9c111d7ecd6dd18a8 100644 --- a/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.H +++ b/meshLibrary/utilities/surfaceTools/createFundamentalSheets/createFundamentalSheetsJFS/createFundamentalSheetsJFS.H @@ -80,7 +80,11 @@ public: // Constructors //- Construct from mesh data - createFundamentalSheetsJFS(polyMeshGen& mesh); + createFundamentalSheetsJFS + ( + polyMeshGen& mesh, + const bool createWrapperSheet = true + ); // Destructor diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.C index c77b80a3a0897e46aaf11f26a99b42aee78e271d..a0c5e3bf0f4f0ed916a6f0013d2bfc82e3558ade 100644 --- a/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.C +++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.C @@ -70,12 +70,14 @@ void meshSurfaceEdgeExtractorFUN::clearOut() meshSurfaceEdgeExtractorFUN::meshSurfaceEdgeExtractorFUN ( polyMeshGen& mesh, - const meshOctree& octree + const meshOctree& octree, + const bool createWrapperSheet ) : mesh_(mesh), meshOctree_(octree), - surfaceEnginePtr_(NULL) + surfaceEnginePtr_(NULL), + createWrapperSheet_(createWrapperSheet) { if( Pstream::parRun() ) FatalErrorIn @@ -84,20 +86,10 @@ meshSurfaceEdgeExtractorFUN::meshSurfaceEdgeExtractorFUN "(polyMeshGen&, const meshOctree&)" ) << "Cannot run in parallel!" << exit(FatalError); - //distributeBoundaryFaces(); - - //reviseCorners(); - - //reviseEdges(); - - //remapBoundaryPoints(); - createBasicFundamentalSheets(); smoothMeshSurface(); - //improveQualityOfFundamentalSheets(); - remapBoundaryPoints(); } diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.H b/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.H index 071238fc192b8041bf5211eb97cc34f921693ff0..21b16ad1122b2b1427ed19b6dc85fca515adb7ed 100644 --- a/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.H +++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUN.H @@ -64,6 +64,9 @@ class meshSurfaceEdgeExtractorFUN //- mesh surface pointer meshSurfaceEngine* surfaceEnginePtr_; + //- shall the procedure generate an initial wrapper sheet + const bool createWrapperSheet_; + // Private member functions //- return reference to surface engine @@ -115,7 +118,8 @@ public: meshSurfaceEdgeExtractorFUN ( polyMeshGen& mesh, - const meshOctree& octree + const meshOctree& octree, + const bool createWrapperSheet = true ); // Destructor diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUNDistributeFaces.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUNDistributeFaces.C index ae7539c934b735bbb8c2f40581dbdf82a3f674fb..462a62edd02978a648ba92cbf2fd8b9cbb3fbe67 100644 --- a/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUNDistributeFaces.C +++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEdgeExtractorFUN/meshSurfaceEdgeExtractorFUNDistributeFaces.C @@ -137,7 +137,7 @@ void meshSurfaceEdgeExtractorFUN::remapBoundaryPoints() void meshSurfaceEdgeExtractorFUN::createBasicFundamentalSheets() { - createFundamentalSheetsJFS edgeSheets(mesh_); + createFundamentalSheetsJFS edgeSheets(mesh_, createWrapperSheet_); clearOut(); } diff --git a/meshLibrary/voronoiMesh/voronoiMeshGenerator/voronoiMeshGenerator.C b/meshLibrary/voronoiMesh/voronoiMeshGenerator/voronoiMeshGenerator.C index 685551e4ca3a856e4ea8084d472ca55cfe89d0df..36c6651ff2b93702f630ab78f935ade977cb4dd9 100644 --- a/meshLibrary/voronoiMesh/voronoiMeshGenerator/voronoiMeshGenerator.C +++ b/meshLibrary/voronoiMesh/voronoiMeshGenerator/voronoiMeshGenerator.C @@ -128,8 +128,7 @@ void voronoiMeshGenerator::extractPatches() void voronoiMeshGenerator::mapEdgesAndCorners() { - //meshSurfaceEdgeExtractorNonTopo(mesh_, *octreePtr_); - meshSurfaceEdgeExtractorFUN(mesh_, *octreePtr_); + meshSurfaceEdgeExtractorFUN(mesh_, *octreePtr_, false); # ifdef DEBUG mesh_.write();