diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H index db58f90828..ea5823cc1c 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H +++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createUpdatedDynamicFvMesh.H @@ -7,7 +7,7 @@ ( IOobject ( - dynamicFvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::MUST_READ diff --git a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H index db58f90828..ea5823cc1c 100644 --- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H +++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createUpdatedDynamicFvMesh.H @@ -7,7 +7,7 @@ ( IOobject ( - dynamicFvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::MUST_READ diff --git a/applications/test/mesh/Test-mesh.C b/applications/test/mesh/Test-mesh.C index 386e5d8ede..49c64c4b51 100644 --- a/applications/test/mesh/Test-mesh.C +++ b/applications/test/mesh/Test-mesh.C @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) ( IOobject ( - fvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::MUST_READ diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C index a2332508f4..8d6a3c3870 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C +++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C @@ -212,7 +212,7 @@ int main(int argc, char *argv[]) ( IOobject ( - fvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::NO_READ, diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.H b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.H index f3cc64d45d..cfaf760e2b 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.H +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.H @@ -56,7 +56,7 @@ public: // Constructors //- Construct from IOobject - fluentFvMesh(const IOobject& io); + explicit fluentFvMesh(const IOobject& io); // Member functions diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C index de485f99e7..72a854d20f 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) ( IOobject ( - fluentFvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.constant(), runTime ) diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C index 8f9c0b9d7b..bdb9ce9270 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) } else { - regionName = fvMesh::defaultRegion; + regionName = polyMesh::defaultRegion; Info<< "Create mesh for time = " << runTimeExtruded.timeName() << nl << endl; } @@ -787,7 +787,7 @@ int main(int argc, char *argv[]) ( IOobject ( - extrudedMesh::defaultRegion, + polyMesh::defaultRegion, runTimeExtruded.constant(), runTimeExtruded ), diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C index 5806a316f9..978cb86662 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) ( IOobject ( - mirrorFvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.constant(), runTime ), diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 5e6fd78416..af9a933237 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -2905,7 +2905,7 @@ int main(int argc, char *argv[]) const word& regionName = regionNames[regioni]; const fileName meshSubDir ( - regionName == fvMesh::defaultRegion + regionName == polyMesh::defaultRegion ? fileName(polyMesh::meshSubDir) : regionNames[regioni]/polyMesh::meshSubDir ); diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C index 8951d73ba7..458dc61e8a 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C @@ -499,7 +499,7 @@ int main(int argc, char *argv[]) fileName regionPrefix; - if (regionName != fvMesh::defaultRegion) + if (regionName != polyMesh::defaultRegion) { regionPrefix = regionName; } diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C index eb340016bc..3ebce53977 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) #include "setRootCase.H" #include "createTime.H" - wordList regionNames(1, fvMesh::defaultRegion); + wordList regionNames(1, polyMesh::defaultRegion); if (!args.readIfPresent("region", regionNames.first())) { args.readIfPresent("regions", regionNames); diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C index 78645b20b4..047e613209 100644 --- a/applications/utilities/preProcessing/mapFields/mapFields.C +++ b/applications/utilities/preProcessing/mapFields/mapFields.C @@ -291,7 +291,7 @@ int main(int argc, char *argv[]) const fileName caseDirSource = casePath.name(); Info<< "Source: " << rootDirSource << " " << caseDirSource << endl; - word sourceRegion = fvMesh::defaultRegion; + word sourceRegion = polyMesh::defaultRegion; if (args.found("sourceRegion")) { sourceRegion = args["sourceRegion"]; @@ -299,7 +299,7 @@ int main(int argc, char *argv[]) } Info<< "Target: " << rootDirTarget << " " << caseDirTarget << endl; - word targetRegion = fvMesh::defaultRegion; + word targetRegion = polyMesh::defaultRegion; if (args.found("targetRegion")) { targetRegion = args["targetRegion"]; diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C index 025c400b26..4bb265894b 100644 --- a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C +++ b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C @@ -219,14 +219,14 @@ int main(int argc, char *argv[]) const fileName caseDirSource = casePath.name(); Info<< "Source: " << rootDirSource << " " << caseDirSource << endl; - word sourceRegion = fvMesh::defaultRegion; + word sourceRegion = polyMesh::defaultRegion; if (args.readIfPresent("sourceRegion", sourceRegion)) { Info<< "Source region: " << sourceRegion << endl; } Info<< "Target: " << rootDirTarget << " " << caseDirTarget << endl; - word targetRegion = fvMesh::defaultRegion; + word targetRegion = polyMesh::defaultRegion; if (args.readIfPresent("targetRegion", targetRegion)) { Info<< "Target region: " << targetRegion << endl; diff --git a/src/OpenFOAM/include/createMeshNoClear.H b/src/OpenFOAM/include/createMeshNoClear.H index 321120aae8..5ccde9ca78 100644 --- a/src/OpenFOAM/include/createMeshNoClear.H +++ b/src/OpenFOAM/include/createMeshNoClear.H @@ -33,7 +33,7 @@ Foam::fvMesh mesh ( Foam::IOobject ( - Foam::fvMesh::defaultRegion, + Foam::polyMesh::defaultRegion, runTime.timeName(), runTime, Foam::IOobject::MUST_READ diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H index cda2419cbd..940de59331 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017, 2020 OpenFOAM Foundation - Copyright (C) 2018-2020 OpenCFD Ltd. + Copyright (C) 2018-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -325,7 +325,7 @@ public: // Constructors //- Read construct from IOobject - polyMesh(const IOobject& io, const bool doInit = true); + explicit polyMesh(const IOobject& io, const bool doInit = true); //- Construct from IOobject or as zero-sized mesh // Boundary is added using addPatches() member function diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C index 482ff63e4c..487534b1d2 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C @@ -154,7 +154,7 @@ Foam::autoPtr Foam::dynamicFvMesh::New ( IOobject ( - dynamicFvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::MUST_READ @@ -168,7 +168,7 @@ Foam::autoPtr Foam::dynamicFvMesh::New ( IOobject ( - dynamicFvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::MUST_READ diff --git a/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H b/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H index 21b6c092d8..6cb1444055 100644 --- a/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H +++ b/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H @@ -1,4 +1,4 @@ - Foam::word regionName = Foam::fvMesh::defaultRegion; + Foam::word regionName = Foam::polyMesh::defaultRegion; if (args.readIfPresent("region", regionName)) { diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C index f8b89e90b3..9745cb61db 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C @@ -1756,7 +1756,7 @@ Foam::autoPtr Foam::fvMeshDistribute::receiveMesh ( IOobject ( - fvMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, IOobject::NO_READ diff --git a/src/engine/include/createEngineMesh.H b/src/engine/include/createEngineMesh.H index 263ebed5ff..7a9daed5f4 100644 --- a/src/engine/include/createEngineMesh.H +++ b/src/engine/include/createEngineMesh.H @@ -7,7 +7,7 @@ ( IOobject ( - engineMesh::defaultRegion, + polyMesh::defaultRegion, runTime.timeName(), runTime, Foam::IOobject::MUST_READ diff --git a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C index 39a0da94ed..c373ab314b 100644 --- a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C +++ b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C @@ -103,7 +103,7 @@ bool Foam::simplifiedMeshes::columnFvMeshInfo::setPatchEntries ( runTime, runTime.timeName(), - (regionName_ == fvMesh::defaultRegion ? "" : regionName_) + (regionName_ == polyMesh::defaultRegion ? "" : regionName_) ); if (objects.empty()) @@ -411,7 +411,7 @@ Foam::simplifiedMeshes::columnFvMeshInfo::columnFvMeshInfo regionName_(regionName), regionPrefix_ ( - regionName_ == fvMesh::defaultRegion + regionName_ == polyMesh::defaultRegion ? "" : regionName_ + '/' ), diff --git a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.H b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.H index 3bfd009bf7..4e345ac3ac 100644 --- a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.H +++ b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.H @@ -149,7 +149,7 @@ public: columnFvMesh ( const Time& runTime, - const word& regionName = fvMesh::defaultRegion + const word& regionName = polyMesh::defaultRegion ); }; diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C index 93b9ff90ac..184173bdca 100644 --- a/src/functionObjects/field/streamLine/streamLineBase.C +++ b/src/functionObjects/field/streamLine/streamLineBase.C @@ -663,7 +663,7 @@ bool Foam::functionObjects::streamLineBase::writeToFile() ( time_.globalPath()/functionObject::outputPrefix/"sets"/name() ); - if (mesh_.name() != fvMesh::defaultRegion) + if (mesh_.name() != polyMesh::defaultRegion) { vtkPath = vtkPath/mesh_.name(); } diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C index 965cad242f..2420bc7ac5 100644 --- a/src/sampling/sampledSet/sampledSets/sampledSets.C +++ b/src/sampling/sampledSet/sampledSets/sampledSets.C @@ -104,7 +104,7 @@ Foam::sampledSets::sampledSets mesh_.time().globalPath()/functionObject::outputPrefix/name ); - if (mesh_.name() != fvMesh::defaultRegion) + if (mesh_.name() != polyMesh::defaultRegion) { outputPath_ = outputPath_/mesh_.name(); } @@ -137,7 +137,7 @@ Foam::sampledSets::sampledSets mesh_.time().globalPath()/functionObject::outputPrefix/name ); - if (mesh_.name() != fvMesh::defaultRegion) + if (mesh_.name() != polyMesh::defaultRegion) { outputPath_ = outputPath_/mesh_.name(); }