diff --git a/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H b/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H index 956b3e3bf7..e1638a77ee 100644 --- a/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H +++ b/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H @@ -13,6 +13,19 @@ License Description Search for the appropriate faMeshDefinition dictionary... +Required Classes + - Foam::polyMesh + - Foam::IOdictionary + +Required Variables + - regionName [word] + - args [argList] + - runTime [Time] + +Provided Variables + - meshDefDict [IOdictionary] + - meshDictPtr [autoPtr] + \*---------------------------------------------------------------------------*/ const word dictName("faMeshDefinition"); @@ -21,7 +34,7 @@ autoPtr meshDictPtr; { fileName dictPath; - const word& regionDir = polyMesh::regionName(regionName); + const word& regionDir = Foam::polyMesh::regionName(regionName); if (args.readIfPresent("dict", dictPath)) { diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C index 4e6a5b3a7c..77331991ab 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C +++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2020-2021 OpenCFD Ltd. + Copyright (C) 2020-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -1317,11 +1317,12 @@ int main(int argc, char *argv[]) #include "setRootCase.H" #include "createTime.H" - word regionName(polyMesh::defaultRegion); + // Specified region or default region + #include "getRegionOption.H" - if (args.readIfPresent("region", regionName)) + if (!polyMesh::regionName(regionName).empty()) { - Info<< "Creating polyMesh for region " << regionName << endl; + Info<< "Creating polyMesh for region " << regionName << nl; } const bool keepOrientation = args.found("keepOrientation"); diff --git a/applications/utilities/mesh/generation/PDRblockMesh/cleanMeshDirectory.H b/applications/utilities/mesh/generation/PDRblockMesh/cleanMeshDirectory.H index 9b0d60bebd..c1ef7dc62c 100644 --- a/applications/utilities/mesh/generation/PDRblockMesh/cleanMeshDirectory.H +++ b/applications/utilities/mesh/generation/PDRblockMesh/cleanMeshDirectory.H @@ -18,11 +18,10 @@ Description { // Shadows enclosing parameter (dictName) const word blockMeshDictName("blockMeshDict"); - const word& regionDir = polyMesh::regionName(regionName); const fileName polyMeshPath ( - runTime.path()/meshInstance/regionDir/polyMesh::meshSubDir + runTime.path()/meshInstance/polyMesh::meshDir(regionName) ); if (exists(polyMeshPath)) diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C index a033155052..a09d631fd5 100644 --- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C +++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2016-2022 OpenCFD Ltd. + Copyright (C) 2016-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -183,12 +183,12 @@ int main(int argc, char *argv[]) : blockMesh::DEFAULT_MERGE ); - word regionName(polyMesh::defaultRegion); + // Specified region or default region + #include "getRegionOption.H" - // Check if the region is specified otherwise mesh the default region - if (args.readIfPresent("region", regionName)) + if (!polyMesh::regionName(regionName).empty()) { - Info<< nl << "Generating mesh for region " << regionName << endl; + Info<< nl << "Generating mesh for region " << regionName << nl; } // Instance for resulting mesh diff --git a/applications/utilities/mesh/generation/blockMesh/cleanMeshDirectory.H b/applications/utilities/mesh/generation/blockMesh/cleanMeshDirectory.H index 9b0d60bebd..c1ef7dc62c 100644 --- a/applications/utilities/mesh/generation/blockMesh/cleanMeshDirectory.H +++ b/applications/utilities/mesh/generation/blockMesh/cleanMeshDirectory.H @@ -18,11 +18,10 @@ Description { // Shadows enclosing parameter (dictName) const word blockMeshDictName("blockMeshDict"); - const word& regionDir = polyMesh::regionName(regionName); const fileName polyMeshPath ( - runTime.path()/meshInstance/regionDir/polyMesh::meshSubDir + runTime.path()/meshInstance/polyMesh::meshDir(regionName) ); if (exists(polyMeshPath)) diff --git a/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H b/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H index 5dab776091..5c820b6aa6 100644 --- a/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H +++ b/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H @@ -38,7 +38,7 @@ autoPtr meshDictPtr; exists ( runTime.path()/runTime.constant() - / regionDir/polyMesh::meshSubDir/dictName + / polyMesh::meshDir(regionName)/dictName ) ) { @@ -47,7 +47,7 @@ autoPtr meshDictPtr; dictPath = ( runTime.constant() - / regionDir/polyMesh::meshSubDir/dictName + / polyMesh::meshDir(regionName)/dictName ); diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C index 06823eb738..aed6edfbea 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C @@ -255,19 +255,17 @@ int main(int argc, char *argv[]) #include "setRootCase.H" #include "createTimeExtruded.H" - // Get optional regionName - word regionName(polyMesh::defaultRegion); - if (args.readIfPresent("region", regionName)) - { - Info<< "Create mesh " << regionName << " for time = " - << runTimeExtruded.timeName() << nl << endl; - } - else - { - Info<< "Create mesh for time = " - << runTimeExtruded.timeName() << nl << endl; - } + // Specified region or default region + #include "getRegionOption.H" + { + Info<< "Create mesh"; + if (!polyMesh::regionName(regionName).empty()) + { + Info<< ' ' << regionName; + } + Info<< " for time = " << runTimeExtruded.timeName() << nl << nl; + } const IOdictionary dict ( diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C index ab9b2657aa..decbb1aa56 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C @@ -1210,7 +1210,7 @@ void extrudeGeometricProperties ( "patchFaceCentres", mesh.pointsInstance(), - mesh.meshSubDir, + polyMesh::meshSubDir, mesh, IOobject::MUST_READ ) @@ -1222,7 +1222,7 @@ void extrudeGeometricProperties ( "patchEdgeCentres", mesh.pointsInstance(), - mesh.meshSubDir, + polyMesh::meshSubDir, mesh, IOobject::MUST_READ ) @@ -1268,7 +1268,7 @@ void extrudeGeometricProperties ( "faceCentres", regionMesh.pointsInstance(), - regionMesh.meshSubDir, + polyMesh::meshSubDir, regionMesh, IOobject::NO_READ, IOobject::NO_WRITE, @@ -1352,7 +1352,7 @@ void extrudeGeometricProperties ( "cellCentres", regionMesh.pointsInstance(), - regionMesh.meshSubDir, + polyMesh::meshSubDir, regionMesh, IOobject::NO_READ, IOobject::NO_WRITE, @@ -2555,7 +2555,7 @@ int main(int argc, char *argv[]) ( "cellToPatchFaceAddressing", regionMesh.facesInstance(), - regionMesh.meshSubDir, + polyMesh::meshSubDir, regionMesh, IOobject::NO_READ, IOobject::NO_WRITE, @@ -2571,7 +2571,7 @@ int main(int argc, char *argv[]) ( "faceToPatchFaceAddressing", regionMesh.facesInstance(), - regionMesh.meshSubDir, + polyMesh::meshSubDir, regionMesh, IOobject::NO_READ, IOobject::NO_WRITE, @@ -2588,7 +2588,7 @@ int main(int argc, char *argv[]) ( "faceToPatchEdgeAddressing", regionMesh.facesInstance(), - regionMesh.meshSubDir, + polyMesh::meshSubDir, regionMesh, IOobject::NO_READ, IOobject::NO_WRITE, @@ -2605,7 +2605,7 @@ int main(int argc, char *argv[]) ( "pointToPatchPointAddressing", regionMesh.facesInstance(), - regionMesh.meshSubDir, + polyMesh::meshSubDir, regionMesh, IOobject::NO_READ, IOobject::NO_WRITE, @@ -2647,7 +2647,7 @@ int main(int argc, char *argv[]) ( "patchFaceCentres", mesh.pointsInstance(), - mesh.meshSubDir, + polyMesh::meshSubDir, mesh, IOobject::MUST_READ ); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C index d312a57f43..7f4ddccb0f 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C @@ -296,7 +296,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance) // ( // "pointDualAddressing", // instance, -// "tetDualMesh"/polyMesh::meshSubDir, +// polyMesh::meshDir("tetDualMesh"), // runTime_, // IOobject::NO_READ, // IOobject::NO_WRITE, @@ -343,7 +343,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance) // ( // "dualPoints", // instance, -// "tetDualMesh"/polyMesh::meshSubDir, +// polyMesh::meshDir("tetDualMesh"), // runTime_, // IOobject::NO_READ, // IOobject::NO_WRITE, diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C index c798553561..2106a2b1cf 100644 --- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C +++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) const word& regionName = regionNames[regioni]; const fileName meshDir ( - polyMesh::regionName(regionName)/polyMesh::meshSubDir + polyMesh::meshDir(regionName) ); if (regionNames.size() > 1) diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C index a42a9ec7ee..f15e24dc09 100644 --- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C +++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) #include "createNamedPolyMesh.H" - const fileName setsSubPath(mesh.dbDir()/polyMesh::meshSubDir/"sets"); + const fileName setsSubPath(mesh.meshDir()/"sets"); // Search for list of objects for the time of the mesh word setsInstance = runTime.findInstance diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index fcb6469181..4594157462 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -894,7 +894,7 @@ void createAndWriteRegion ( "pointRegionAddressing", newMesh().facesInstance(), - newMesh().meshSubDir, + polyMesh::meshSubDir, newMesh(), IOobject::NO_READ, IOobject::NO_WRITE, @@ -913,7 +913,7 @@ void createAndWriteRegion ( "faceRegionAddressing", newMesh().facesInstance(), - newMesh().meshSubDir, + polyMesh::meshSubDir, newMesh(), IOobject::NO_READ, IOobject::NO_WRITE, @@ -951,7 +951,7 @@ void createAndWriteRegion ( "cellRegionAddressing", newMesh().facesInstance(), - newMesh().meshSubDir, + polyMesh::meshSubDir, newMesh(), IOobject::NO_READ, IOobject::NO_WRITE, @@ -970,7 +970,7 @@ void createAndWriteRegion ( "boundaryRegionAddressing", newMesh().facesInstance(), - newMesh().meshSubDir, + polyMesh::meshSubDir, newMesh(), IOobject::NO_READ, IOobject::NO_WRITE, diff --git a/applications/utilities/mesh/manipulation/transformPoints/createRegionMesh.H b/applications/utilities/mesh/manipulation/transformPoints/createRegionMesh.H index 03066d6288..38b968ad96 100644 --- a/applications/utilities/mesh/manipulation/transformPoints/createRegionMesh.H +++ b/applications/utilities/mesh/manipulation/transformPoints/createRegionMesh.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2021 OpenCFD Ltd. + Copyright (C) 2021-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -22,12 +22,14 @@ Provided Variables \*---------------------------------------------------------------------------*/ -Foam::Info << "Create mesh"; -if (regionName != Foam::polyMesh::defaultRegion) { - Foam::Info << ' ' << regionName; + Foam::Info << "Create mesh"; + if (!Foam::polyMesh::regionName(regionName).empty()) + { + Foam::Info << ' ' << regionName; + } + Foam::Info << " for time = " << runTime.timeName() << Foam::nl; } -Foam::Info << " for time = " << runTime.timeName() << Foam::nl; Foam::fvMesh mesh ( diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C index 05335a7f32..c339fde851 100644 --- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C +++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C @@ -396,7 +396,7 @@ int main(int argc, char *argv[]) const word& regionName = regionNames[regioni]; const fileName meshDir ( - polyMesh::regionName(regionName)/polyMesh::meshSubDir + polyMesh::meshDir(regionName) ); if (regionNames.size() > 1) diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C index 760474570f..a75f0ed650 100644 --- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C +++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2016-2022 OpenCFD Ltd. + Copyright (C) 2016-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -296,15 +296,16 @@ int main(int argc, char *argv[]) IOobject::fileModificationChecking = IOobject::timeStamp; - word regionName(polyMesh::defaultRegion); - if (args.readIfPresent("region", regionName)) + // Specified region or default region + #include "getRegionOption.H" + if (!polyMesh::regionName(regionName).empty()) { Info<< "Using region " << regionName << nl << endl; } const fileName meshDir ( - polyMesh::regionName(regionName)/polyMesh::meshSubDir + polyMesh::meshDir(regionName) ); diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index 130bf98a46..7676ec50d1 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C @@ -813,11 +813,7 @@ int main(int argc, char *argv[]) IOobject io ( "faBoundary", - mesh.time().findInstance - ( - mesh.dbDir()/polyMesh::meshSubDir, - "boundary" - ), + mesh.time().findInstance(mesh.meshDir(), "boundary"), faMesh::meshSubDir, mesh, IOobject::READ_IF_PRESENT, diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C index feb14f0c40..eb844f5779 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C +++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C @@ -305,7 +305,7 @@ autoPtr mergeSharedPoints boundBox procBounds ( const PtrList