diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C index 6a14bcf3dc..4eba33b6eb 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -305,7 +305,7 @@ int main(int argc, char *argv[]) ( "cvSearchableSurfaces", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C index 739b18eb29..209b45e368 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,7 +145,10 @@ Foam::tmp Foam::automatic::load() ( surfaceName_ + ".cellSize", surface_.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surface_.searchableSurface::time() + ), surface_.searchableSurface::time(), IOobject::NO_READ, IOobject::NO_WRITE @@ -169,7 +172,10 @@ Foam::tmp Foam::automatic::load() ( curvatureFile_, surface_.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surface_.searchableSurface::time() + ), surface_.searchableSurface::time(), IOobject::MUST_READ, IOobject::NO_WRITE @@ -214,7 +220,10 @@ Foam::tmp Foam::automatic::load() ( internalClosenessFile_, surface_.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surface_.searchableSurface::time() + ), surface_.searchableSurface::time(), IOobject::MUST_READ, IOobject::NO_WRITE @@ -247,7 +256,10 @@ Foam::tmp Foam::automatic::load() ( featureProximityFile_, surface_.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surface_.searchableSurface::time() + ), surface_.searchableSurface::time(), IOobject::MUST_READ, IOobject::NO_WRITE @@ -291,7 +303,11 @@ Foam::tmp Foam::automatic::load() surface_.searchableSurface::time().writeFormat() ).write ( - surface_.searchableSurface::time().constant()/"triSurface", + surface_.searchableSurface::time().constant()/ + searchableSurface::geometryDir + ( + surface_.searchableSurface::time() + ), surfaceName_.lessExt().name(), surface_.points(), faces, diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C index 7f2173b892..ce30db36ac 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,10 @@ Foam::tmp Foam::fieldFromFile::load() ( fileName_, surface_.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surface_.searchableSurface::time() + ), surface_.searchableSurface::time(), IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C index e684475b39..5145448922 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,10 @@ Foam::nonUniformField::nonUniformField ( "pointCellSize.cellSize", surfaceTriMesh_.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surfaceTriMesh_.searchableSurface::time() + ), surfaceTriMesh_.searchableSurface::time(), IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C index 51412e3160..9772c1a951 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -835,7 +835,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh ( "cvSearchableSurfaces", runTime_.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime_, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C index f335e6f289..960e7e20fe 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) ( "cvSearchableSurfaces", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index 47c0525d11..86cb67aade 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -432,7 +432,7 @@ int main(int argc, char *argv[]) ( "cvSearchableSurfaces", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C index ea03108d99..4d7a2c80f9 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -401,7 +401,7 @@ int main(int argc, char *argv[]) ( "cvSearchableSurfaces", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::MUST_READ, IOobject::NO_WRITE @@ -611,9 +611,9 @@ int main(int argc, char *argv[]) IOobject ( exportName, - runTime.constant(), // instance - "triSurface", - runTime, // registry + runTime.constant(), + searchableSurface::geometryDir(runTime), + runTime, IOobject::NO_READ, IOobject::AUTO_WRITE, false diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C index 465ff6060f..f6280a33da 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) ( "cvSearchableSurfaces", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::MUST_READ, IOobject::NO_WRITE @@ -323,9 +323,9 @@ int main(int argc, char *argv[]) IOobject ( exportName, - runTime.constant(), // instance - "triSurface", - runTime, // registry + runTime.constant(), + searchableSurface::geometryDir(runTime), + runTime, IOobject::NO_READ, IOobject::AUTO_WRITE, false diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C index 7fba200b30..0485ba800d 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -117,7 +117,7 @@ Foam::CV2D::CV2D ( "cvSearchableSurfaces", runTime_.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime_, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index ae7edf54ce..b560733c0f 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -867,11 +867,10 @@ int main(int argc, char *argv[]) ( IOobject ( - "abc", // dummy name - mesh.time().constant(), // instance - // mesh.time().findInstance("triSurface", word::null),// instance - "triSurface", // local - mesh.time(), // registry + "abc", + mesh.time().constant(), + searchableSurface::geometryDir(mesh.time()), + mesh.time(), IOobject::MUST_READ, IOobject::NO_WRITE ), diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C index 807cd43925..977a6ee238 100644 --- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C +++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ Description #include "pointFields.H" #include "fvMeshMapper.H" #include "faceSelection.H" - +#include "searchableSurface.H" #include "fvMeshTools.H" using namespace Foam; @@ -446,7 +446,6 @@ int main(int argc, char *argv[]) runTime.functionObjects().off(); #include "createNamedMesh.H" - const bool overwrite = args.optionFound("overwrite"); const word oldInstance = mesh.pointsInstance(); diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C index c45d3d3b9a..c361172fc8 100644 --- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C +++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ Foam::faceSelections::searchableSurfaceSelection::searchableSurfaceSelection ( dict.lookupOrDefault("name", mesh.objectRegistry::db().name()), mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh.objectRegistry::db(), IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H index 4518cfc327..3fcde4f5b7 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H +++ b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H @@ -56,9 +56,9 @@ distributedTriSurfaceMesh surfacesMesh IOobject ( "wallSurface.stl", - runTime.constant(), // directory - "triSurface", // instance - runTime, // registry + runTime.constant(), + searchableSurface::geometryDir(runTime), + runTime, IOobject::NO_READ, IOobject::NO_WRITE ), diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C index 4f54c8c140..cbc2baff77 100644 --- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C +++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -780,10 +780,10 @@ int main(int argc, char *argv[]) ( IOobject ( - sFeatFileName + ".eMesh", // name - runTime.constant(), // instance - "triSurface", - runTime, // registry + sFeatFileName + ".eMesh", + runTime.constant(), + searchableSurface::geometryDir(runTime), + runTime, IOobject::NO_READ, IOobject::NO_WRITE, false diff --git a/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C b/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C index 5956ead88e..380eaacaa5 100644 --- a/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C +++ b/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -180,7 +180,12 @@ namespace Foam // Read // ~~~~ - triSurface surf(runTime.constantPath()/"triSurface"/surfaceFileName); + triSurface surf + ( + runTime.constantPath() + /searchableSurface::geometryDir(runTime) + /surfaceFileName + ); Info<< "Statistics:" << endl; surf.writeStats(Info); @@ -405,7 +410,7 @@ namespace Foam ( surfaceFileName.lessExt().name() + ".eMesh", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::NO_READ, IOobject::AUTO_WRITE, @@ -457,7 +462,7 @@ namespace Foam ( sFeatFileName + ".closeness", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), surf @@ -488,8 +493,9 @@ namespace Foam vtkSurfaceWriter(runTime.writeFormat()).write ( - runTime.constantPath()/"triSurface",// outputDir - searchSurf.objectRegistry::name(), // surfaceName + runTime.constantPath() + /searchableSurface::geometryDir(runTime), + searchSurf.objectRegistry::name(), searchSurf.points(), faces, "internalCloseness", // fieldName @@ -499,8 +505,9 @@ namespace Foam vtkSurfaceWriter(runTime.writeFormat()).write ( - runTime.constantPath()/"triSurface",// outputDir - searchSurf.objectRegistry::name(), // surfaceName + runTime.constantPath() + /searchableSurface::geometryDir(runTime), + searchSurf.objectRegistry::name(), searchSurf.points(), faces, "externalCloseness", // fieldName @@ -554,8 +561,9 @@ namespace Foam vtkSurfaceWriter(runTime.writeFormat()).write ( - runTime.constantPath()/"triSurface",// outputDir - searchSurf.objectRegistry::name(), // surfaceName + runTime.constantPath() + /searchableSurface::geometryDir(runTime), + searchSurf.objectRegistry::name(), searchSurf.points(), faces, "internalPointCloseness", // fieldName @@ -565,8 +573,9 @@ namespace Foam vtkSurfaceWriter(runTime.writeFormat()).write ( - runTime.constantPath()/"triSurface",// outputDir - searchSurf.objectRegistry::name(), // surfaceName + runTime.constantPath() + /searchableSurface::geometryDir(runTime), + searchSurf.objectRegistry::name(), searchSurf.points(), faces, "externalPointCloseness", // fieldName @@ -589,7 +598,7 @@ namespace Foam ( sFeatFileName + ".curvature", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), surf, @@ -603,8 +612,9 @@ namespace Foam { vtkSurfaceWriter(runTime.writeFormat()).write ( - runTime.constantPath()/"triSurface",// outputDir - sFeatFileName, // surfaceName + runTime.constantPath() + /searchableSurface::geometryDir(runTime), + sFeatFileName, surf.points(), faces, "curvature", // fieldName @@ -659,7 +669,7 @@ namespace Foam ( sFeatFileName + ".featureProximity", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime, IOobject::NO_READ, IOobject::NO_WRITE @@ -675,8 +685,9 @@ namespace Foam { vtkSurfaceWriter(runTime.writeFormat()).write ( - runTime.constantPath()/"triSurface",// outputDir - sFeatFileName, // surfaceName + runTime.constantPath() + /searchableSurface::geometryDir(runTime), + sFeatFileName, surf.points(), faces, "featureProximity", // fieldName diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C index e2c25924d9..73d2c7cd96 100644 --- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C +++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -300,7 +300,7 @@ int main(int argc, char *argv[]) ( "surfacesToHook", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), dict, @@ -345,7 +345,7 @@ int main(int argc, char *argv[]) ( "hookedSurface_" + surfs.names()[surfI], runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), surf @@ -559,7 +559,7 @@ int main(int argc, char *argv[]) ( "hookedSurface_" + surfs.names()[surfI], runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), triSurface diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C index c9edd94ddd..0a4954526c 100644 --- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C +++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) argList::addBoolOption("clean"); argList::addBoolOption("orient"); argList::addBoolOption("surfMesh"); - argList::addBoolOption("triSurface"); + argList::addBoolOption(triSurface::typeName); argList::addBoolOption("unsorted"); argList::addBoolOption("triFace"); @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) return 1; } - if (args.optionFound("triSurface")) + if (args.optionFound(triSurface::typeName)) { triSurface surf(importName); diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C index e26dfc883d..51c7650758 100644 --- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C +++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -158,11 +158,10 @@ int main(int argc, char *argv[]) IOobject io ( - surfFileName, // name - // runTime.findInstance("triSurface", surfFileName), // instance - runTime.constant(), // instance - "triSurface", // local - runTime, // registry + surfFileName, + runTime.constant(), + searchableSurface::geometryDir(runTime), + runTime, IOobject::MUST_READ, IOobject::AUTO_WRITE ); diff --git a/etc/caseDicts/annotated/snappyHexMeshDict b/etc/caseDicts/annotated/snappyHexMeshDict index bcfac42bd8..409f160617 100644 --- a/etc/caseDicts/annotated/snappyHexMeshDict +++ b/etc/caseDicts/annotated/snappyHexMeshDict @@ -119,7 +119,7 @@ castellatedMeshControls // Specifies a level for any cell intersected by explicitly provided // edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. // Specify 'levels' in the same way as the 'distance' mode in the // refinementRegions (see below). The old specification // level 2; diff --git a/etc/caseDicts/annotated/surfaceFeaturesDict b/etc/caseDicts/annotated/surfaceFeaturesDict index 1f0e152e60..184fc0f9c2 100644 --- a/etc/caseDicts/annotated/surfaceFeaturesDict +++ b/etc/caseDicts/annotated/surfaceFeaturesDict @@ -45,7 +45,7 @@ surface2 // Load from an existing feature edge file files ( - "surface2.nas" "constant/triSurface/featureEdges.nas"; + "surface2.nas" "constant/geometry/featureEdges.nas"; ); trimFeatures diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines index 7e21ab8ffc..94072d9a7f 100644 --- a/etc/caseDicts/postProcessing/visualization/streamlines +++ b/etc/caseDicts/postProcessing/visualization/streamlines @@ -76,7 +76,7 @@ sphereRandom triSurfaceMesh { type triSurfaceMesh; - surface "surfaceMeshFile.obj"; // in constant/triSurface directory + surface "surfaceMeshFile.obj"; // in constant/geometry directory } // Seeding at a boundary diff --git a/etc/templates/closedVolume/README b/etc/templates/closedVolume/README index 8692931c17..0203bed3f8 100644 --- a/etc/templates/closedVolume/README +++ b/etc/templates/closedVolume/README @@ -4,7 +4,7 @@ Overview + Setup to run buoyantSimpleFoam + The case is designed to be meshed with snappyHexMesh + snappyHexMesh is setup to use a single trisurface file named CAD.obj -+ Copy the CAD.obj file to the constant/triSurface directory ++ Copy the CAD.obj file to the constant/geometry directory + The CAD.obj can contain one or more regions to create patches in the mesh + The user can then specify different boundary condition on T on these patches diff --git a/etc/templates/closedVolume/constant/triSurface/.keep b/etc/templates/closedVolume/constant/geometry/.keep similarity index 100% rename from etc/templates/closedVolume/constant/triSurface/.keep rename to etc/templates/closedVolume/constant/geometry/.keep diff --git a/etc/templates/closedVolumeRotating/README b/etc/templates/closedVolumeRotating/README index 72086ca5e2..1ca7fb98ce 100644 --- a/etc/templates/closedVolumeRotating/README +++ b/etc/templates/closedVolumeRotating/README @@ -8,7 +8,7 @@ Overview + fixed.obj: CAD of the stationary geometry + rotating.obj: CAD of the rotating geometry + rotatingZone.obj: CAD of surface bounding the rotating region -+ Copy the *.obj files to the constant/triSurface directory ++ Copy the *.obj files to the constant/geometry directory + The fixed.obj should contain an inlet and outlet region to create the relevant patches in the mesh diff --git a/etc/templates/closedVolumeRotating/constant/triSurface/.keep b/etc/templates/closedVolumeRotating/constant/geometry/.keep similarity index 100% rename from etc/templates/closedVolumeRotating/constant/triSurface/.keep rename to etc/templates/closedVolumeRotating/constant/geometry/.keep diff --git a/etc/templates/compressibleInflowOutflow/README b/etc/templates/compressibleInflowOutflow/README index 3500e5e16e..a55b5eea4e 100644 --- a/etc/templates/compressibleInflowOutflow/README +++ b/etc/templates/compressibleInflowOutflow/README @@ -4,7 +4,7 @@ Overview + Setup to run the compressible rhoSimpleFoam solver + The case is designed to be meshed with snappyHexMesh + snappyHexMesh is setup to use a single trisurface file named CAD.obj -+ Copy the CAD.obj file to the constant/triSurface directory ++ Copy the CAD.obj file to the constant/geometry directory + The CAD.obj should contain an inlet and outlet region to create the relevant patches in the mesh diff --git a/etc/templates/compressibleInflowOutflow/constant/triSurface/.keep b/etc/templates/compressibleInflowOutflow/constant/geometry/.keep similarity index 100% rename from etc/templates/compressibleInflowOutflow/constant/triSurface/.keep rename to etc/templates/compressibleInflowOutflow/constant/geometry/.keep diff --git a/etc/templates/inflowOutflow/README b/etc/templates/inflowOutflow/README index 7c2252a7ad..be5092f14f 100644 --- a/etc/templates/inflowOutflow/README +++ b/etc/templates/inflowOutflow/README @@ -4,7 +4,7 @@ Overview + Setup to run the simpleFoam solver + The case is designed to be meshed with snappyHexMesh + snappyHexMesh is setup to use a single trisurface file named CAD.obj -+ Copy the CAD.obj file to the constant/triSurface directory ++ Copy the CAD.obj file to the constant/geometry directory + The CAD.obj should contain an inlet and outlet region to create the relevant patches in the mesh diff --git a/etc/templates/inflowOutflow/constant/triSurface/.keep b/etc/templates/inflowOutflow/constant/geometry/.keep similarity index 100% rename from etc/templates/inflowOutflow/constant/triSurface/.keep rename to etc/templates/inflowOutflow/constant/geometry/.keep diff --git a/etc/templates/inflowOutflowRotating/README b/etc/templates/inflowOutflowRotating/README index ecb355b454..9d48a820d5 100644 --- a/etc/templates/inflowOutflowRotating/README +++ b/etc/templates/inflowOutflowRotating/README @@ -8,7 +8,7 @@ Overview + fixed.obj: CAD of the stationary geometry + rotating.obj: CAD of the rotating geometry + rotatingZone.obj: CAD of surface bounding the rotating region -+ Copy the *.obj files to the constant/triSurface directory ++ Copy the *.obj files to the constant/geometry directory + The fixed.obj should contain an inlet and outlet region to create the relevant patches in the mesh diff --git a/etc/templates/inflowOutflowRotating/constant/triSurface/.keep b/etc/templates/inflowOutflowRotating/constant/geometry/.keep similarity index 100% rename from etc/templates/inflowOutflowRotating/constant/triSurface/.keep rename to etc/templates/inflowOutflowRotating/constant/geometry/.keep diff --git a/etc/templates/singleFluidCHT/README b/etc/templates/singleFluidCHT/README index 538892d305..8fd1b27677 100644 --- a/etc/templates/singleFluidCHT/README +++ b/etc/templates/singleFluidCHT/README @@ -23,7 +23,7 @@ Meshing Strategy Surface Geometry ================ + Copy the overall domain geometry file ("CAD.obj") and solid geometry files - (e.g. "solid.obj") to the constant/triSurface + (e.g. "solid.obj") to the constant/geometry + The CAD.obj should contain an inlet and outlet region to create the relevant patches in the mesh diff --git a/etc/templates/singleFluidCHT/constant/triSurface/.keep b/etc/templates/singleFluidCHT/constant/geometry/.keep similarity index 100% rename from etc/templates/singleFluidCHT/constant/triSurface/.keep rename to etc/templates/singleFluidCHT/constant/geometry/.keep diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C index 236883c572..7c6ec528e3 100644 --- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C +++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ Foam::porosityModels::powerLawLopesdaCostaZone::powerLawLopesdaCostaZone ( topSurfaceFileName, mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh.time() ) ); diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C index 78717a2cec..739a77a8f8 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -392,10 +392,10 @@ surfaceDisplacementPointPatchVectorField::surfaces() const ( IOobject ( - "abc", // dummy name - db().time().constant(), // directory - "triSurface", // instance - db().time(), // registry + "abc", // dummy name + db().time().constant(), + searchableSurface::geometryDir(db().time()), + db().time(), IOobject::MUST_READ, IOobject::NO_WRITE ), diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C index 7e0613b71c..57a41ffa33 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -378,10 +378,10 @@ surfaceSlipDisplacementPointPatchVectorField::surfaces() const ( IOobject ( - "abc", // dummy name - db().time().constant(), // directory - "triSurface", // instance - db().time(), // registry + "abc", // dummy name + db().time().constant(), + searchableSurface::geometryDir(db().time()), + db().time(), IOobject::MUST_READ, IOobject::NO_WRITE ), diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.C b/src/mesh/blockMesh/blockMesh/blockMesh.C index 70be850eb7..80d16043e1 100644 --- a/src/mesh/blockMesh/blockMesh/blockMesh.C +++ b/src/mesh/blockMesh/blockMesh/blockMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,10 +51,10 @@ Foam::blockMesh::blockMesh(const IOdictionary& dict, const word& regionName) ( IOobject ( - "geometry", // dummy name - meshDict_.time().constant(), // instance - "geometry", // local - meshDict_.time(), // registry + "geometry", + meshDict_.time().constant(), + searchableSurface::geometryDir(), + meshDict_.time(), IOobject::MUST_READ, IOobject::NO_WRITE ), diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C index b657eb67f6..5cbb2c7f07 100644 --- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C +++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,10 +79,10 @@ void Foam::refinementFeatures::read IOobject featObj ( - featFileName, // name - io.time().constant(), // instance - "triSurface", // local - io.time(), // registry + featFileName, + io.time().constant(), + searchableSurface::geometryDir(io.time()), + io.time(), IOobject::MUST_READ, IOobject::NO_WRITE, false diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C index e38249a595..339dd2777a 100644 --- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C +++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -532,7 +532,10 @@ Foam::shellSurfaces::shellSurfaces ) + "PointCloseness", surface.searchableSurface::time().constant(), - "triSurface", + searchableSurface::geometryDir + ( + surface.searchableSurface::time() + ), surface.searchableSurface::time(), IOobject::MUST_READ ), diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/sweptFaceAreaWeightAMI/sweptFaceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/sweptFaceAreaWeightAMI/sweptFaceAreaWeightAMI.C index b4c504d988..870c66da33 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/sweptFaceAreaWeightAMI/sweptFaceAreaWeightAMI.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/sweptFaceAreaWeightAMI/sweptFaceAreaWeightAMI.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,6 +28,7 @@ License #include "linearEqn.H" #include "quadraticEqn.H" #include "unitConversion.H" +#include "triSurface.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -56,7 +57,7 @@ void Foam::sweptFaceAreaWeightAMI::writeCutTrisVTK OFstream obj(typeName + "_" + name + ".vtk"); obj << "# vtk DataFile Version 2.0" << endl - << "triSurface" << endl + << triSurface::typeName << endl << "ASCII" << endl << "DATASET POLYDATA" << endl << "POINTS " << 3*tris.size() << " float" << endl; diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C index 31fab0ff5c..46f8e10142 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -486,7 +486,7 @@ Foam::cyclicAMIPolyPatch::surfPtr() const ( surfName, mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C index 79bc84ccd5..3248ab35a4 100644 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -793,7 +793,7 @@ const ( surfName, mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C index 16c3a3c7db..c185dc35b4 100644 --- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C +++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -266,7 +266,7 @@ surfPtr() const ( surfName, mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh, IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C index 161c556c7f..fe385eabb9 100644 --- a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C +++ b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,10 +61,10 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle ( IOobject ( - dict.lookup("file"), // name - io.time().constant(), // instance - "geometry", // local - io.time(), // registry + dict.lookup("file"), + io.time().constant(), + searchableSurface::geometryDir(), + io.time(), IOobject::MUST_READ, IOobject::NO_WRITE, false diff --git a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C index 232d15a859..152e98ac30 100644 --- a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C +++ b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "searchableSurface.H" +#include "Time.H" +#include "triSurface.H" +#include "OSspecific.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -33,6 +36,8 @@ namespace Foam defineRunTimeSelectionTable(searchableSurface, dict); } +Foam::word Foam::searchableSurface::geometryDir_("geometry"); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,6 +81,43 @@ Foam::searchableSurface::~searchableSurface() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +const Foam::word& Foam::searchableSurface::geometryDir() +{ + return geometryDir_; +} + + +const Foam::word& Foam::searchableSurface::geometryDir(const Time& time) +{ + if + ( + isDir + ( + time.rootPath()/time.globalCaseName()/time.constant()/ + searchableSurface::geometryDir_ + ) + ) + { + return searchableSurface::geometryDir_; + } + else if + ( + isDir + ( + time.rootPath()/time.globalCaseName()/time.constant()/ + triSurface::typeName + ) + ) + { + return triSurface::typeName; + } + else + { + return searchableSurface::geometryDir_; + } +} + + void Foam::searchableSurface::findNearest ( const pointField& sample, diff --git a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H index 27ca68c6b8..a20f60936b 100644 --- a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H +++ b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,6 +80,14 @@ public: //- Runtime type information TypeName("searchableSurface"); + + // Static data + + //- Name of the directory for the geometry files + // Defaults to "geometry" + static word geometryDir_; + + // Declare run-time constructor selection table // For the dictionary constructor @@ -154,6 +162,13 @@ public: // Member Functions + //- Return the geometry directory name + static const word& geometryDir(); + + //- Check that the geometry directory exists and return + // if not return "triSurface" for backward compatibility + static const word& geometryDir(const Time& time); + //- Return const reference to boundBox const boundBox& bounds() const { diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C index aa829d1822..755b896960 100644 --- a/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C +++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/extractCloseness.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -266,7 +266,7 @@ Foam::triSurfaceMesh::extractCloseness ( objectRegistry::name() + ".internalCloseness", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), *this, @@ -283,7 +283,7 @@ Foam::triSurfaceMesh::extractCloseness ( objectRegistry::name() + ".externalCloseness", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), *this, @@ -396,7 +396,7 @@ Foam::triSurfaceMesh::extractPointCloseness ( objectRegistry::name() + ".internalPointCloseness", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), *this, @@ -413,7 +413,7 @@ Foam::triSurfaceMesh::extractPointCloseness ( objectRegistry::name() + ".externalPointCloseness", runTime.constant(), - "triSurface", + searchableSurface::geometryDir(runTime), runTime ), *this, diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C index 7be9d07efa..c8adf0db0a 100644 --- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C +++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -828,8 +828,8 @@ void Foam::triSurfaceMesh::setField(const labelList& values) IOobject ( "values", - objectRegistry::time().timeName(), // instance - "triSurface", // local + objectRegistry::time().timeName(), + searchableSurface::geometryDir(objectRegistry::time()), *this, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C index 3284704c7b..2392f605a9 100644 --- a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -220,7 +220,7 @@ Foam::searchableSurfaceToFaceZone::searchableSurfaceToFaceZone ( dict.lookupOrDefault("name", mesh.objectRegistry::db().name()), mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh.objectRegistry::db(), IOobject::MUST_READ, IOobject::NO_WRITE diff --git a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C index a2104c2274..5ef494c031 100644 --- a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C +++ b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ Foam::sampledSets::triSurfaceMeshSampledSet::triSurfaceMeshSampledSet ( surface_, mesh.time().constant(), - "triSurface", + searchableSurface::geometryDir(mesh.time()), mesh.time(), IOobject::MUST_READ, IOobject::NO_WRITE, diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C index 2849ff61ae..dcbbfca76e 100644 --- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C +++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -329,10 +329,10 @@ Foam::sampledSurfaces::distanceSurface::distanceSurface dict.lookup("surfaceType"), IOobject ( - dict.lookupOrDefault("surfaceName", name), // name - mesh.time().constant(), // directory - "triSurface", // instance - mesh.time(), // registry + dict.lookupOrDefault("surfaceName", name), + mesh.time().constant(), + searchableSurface::geometryDir(mesh.time()), + mesh.time(), IOobject::MUST_READ, IOobject::NO_WRITE ), diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C index f295f3f130..5ff184ef2b 100644 --- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C +++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -528,9 +528,9 @@ Foam::sampledSurfaces::triSurfaceMesh::triSurfaceMesh IOobject ( surfaceName, - mesh.time().constant(), // instance - "triSurface", // local - mesh, // registry + mesh.time().constant(), + searchableSurface::geometryDir(mesh.time()), + mesh, IOobject::MUST_READ, IOobject::NO_WRITE, false @@ -556,9 +556,9 @@ Foam::sampledSurfaces::triSurfaceMesh::triSurfaceMesh IOobject ( dict.lookup("surface"), - mesh.time().constant(), // instance - "triSurface", // local - mesh, // registry + mesh.time().constant(), + searchableSurface::geometryDir(mesh.time()), + mesh, IOobject::MUST_READ, IOobject::NO_WRITE, false @@ -585,9 +585,9 @@ Foam::sampledSurfaces::triSurfaceMesh::triSurfaceMesh IOobject ( name, - mesh.time().constant(), // instance - "triSurface", // local - mesh, // registry + mesh.time().constant(), + searchableSurface::geometryDir(mesh.time()), + mesh, IOobject::NO_READ, IOobject::NO_WRITE, false diff --git a/src/triSurface/triSurface/interfaces/VTK/writeVTK.C b/src/triSurface/triSurface/interfaces/VTK/writeVTK.C index 525baac64f..b081a600df 100644 --- a/src/triSurface/triSurface/interfaces/VTK/writeVTK.C +++ b/src/triSurface/triSurface/interfaces/VTK/writeVTK.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ void triSurface::writeVTK(const bool writeSorted, Ostream& os) const { // Write header os << "# vtk DataFile Version 2.0" << nl - << "triSurface" << nl + << triSurface::typeName << nl << "ASCII" << nl << "DATASET POLYDATA" << nl; diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/triSurface/boundaries.stl.gz b/tutorials/combustion/reactingFoam/RAS/membrane/constant/geometry/boundaries.stl.gz similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/membrane/constant/triSurface/boundaries.stl.gz rename to tutorials/combustion/reactingFoam/RAS/membrane/constant/geometry/boundaries.stl.gz diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/triSurface/membrane.stl.gz b/tutorials/combustion/reactingFoam/RAS/membrane/constant/geometry/membrane.stl.gz similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/membrane/constant/triSurface/membrane.stl.gz rename to tutorials/combustion/reactingFoam/RAS/membrane/constant/geometry/membrane.stl.gz diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/AMI.eMesh b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/AMI.eMesh similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/AMI.eMesh rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/AMI.eMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/AMI.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/AMI.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/AMI.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/AMI.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/innerInlet.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/innerInlet.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/innerInlet.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/innerInlet.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/innerOutlet.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/innerOutlet.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/innerOutlet.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/innerOutlet.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/outerInlet.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/outerInlet.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/outerInlet.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/outerInlet.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/outerOutlet.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/outerOutlet.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/outerOutlet.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/outerOutlet.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/rotorBlades.eMesh b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/rotorBlades.eMesh similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/rotorBlades.eMesh rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/rotorBlades.eMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/rotorBlades.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/rotorBlades.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/rotorBlades.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/rotorBlades.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/shaft.eMesh b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/shaft.eMesh similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/shaft.eMesh rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/shaft.eMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/shaft.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/shaft.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/shaft.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/shaft.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/statorBlades.eMesh b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/statorBlades.eMesh similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/statorBlades.eMesh rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/statorBlades.eMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/statorBlades.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/statorBlades.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/statorBlades.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/statorBlades.obj diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/wall.eMesh b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/wall.eMesh similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/wall.eMesh rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/wall.eMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/wall.obj b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/wall.obj similarity index 100% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/triSurface/wall.obj rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/geometry/wall.obj diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/triSurface/baffle1D.stl b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle1D.stl similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/triSurface/baffle1D.stl rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle1D.stl diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/triSurface/baffle3D.stl b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle3D.stl similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/triSurface/baffle3D.stl rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/geometry/baffle3D.stl diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/geometry/fridgeA.eMesh similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh rename to tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/geometry/fridgeA.eMesh diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict index 1c533030b2..8e0a59aee7 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict @@ -127,7 +127,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/triSurface/fluidToMetal.stl b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/geometry/fluidToMetal.stl similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/triSurface/fluidToMetal.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/geometry/fluidToMetal.stl diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/triSurface/heatedDuct.stl b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/geometry/heatedDuct.stl similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/triSurface/heatedDuct.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/geometry/heatedDuct.stl diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/triSurface/metalToHeater.stl b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/geometry/metalToHeater.stl similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/triSurface/metalToHeater.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/geometry/metalToHeater.stl diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/shell.stl.gz b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/shell.stl.gz similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/shell.stl.gz rename to tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/shell.stl.gz diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/shell_to_solid.stl.gz b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/shell_to_solid.stl.gz similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/shell_to_solid.stl.gz rename to tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/shell_to_solid.stl.gz diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/solid.stl.gz b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/solid.stl.gz similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/solid.stl.gz rename to tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/solid.stl.gz diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/tube.stl.gz b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/tube.stl.gz similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/tube.stl.gz rename to tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/tube.stl.gz diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/tube_to_solid.stl.gz b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/tube_to_solid.stl.gz similarity index 100% rename from tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/triSurface/tube_to_solid.stl.gz rename to tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/geometry/tube_to_solid.stl.gz diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/triSurface/surface1.obj b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/geometry/surface1.obj similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/triSurface/surface1.obj rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/geometry/surface1.obj diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/triSurface/surface2.obj b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/geometry/surface2.obj similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/triSurface/surface2.obj rename to tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/geometry/surface2.obj diff --git a/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/triSurface/surface0.stl.gz b/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/geometry/surface0.stl.gz similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/impeller/constant/triSurface/surface0.stl.gz rename to tutorials/incompressible/pimpleFoam/RAS/impeller/constant/geometry/surface0.stl.gz diff --git a/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/triSurface/surface1.stl.gz b/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/geometry/surface1.stl.gz similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/impeller/constant/triSurface/surface1.stl.gz rename to tutorials/incompressible/pimpleFoam/RAS/impeller/constant/geometry/surface1.stl.gz diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean index c100538654..f0f3c99759 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean @@ -5,11 +5,11 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surfaces -rm -f constant/triSurface/propeller*.obj.gz > /dev/null 2>&1 +rm -f constant/geometry/propeller*.obj.gz > /dev/null 2>&1 cleanCase rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1 +rm -f constant/geometry/*.eMesh* > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allmesh b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allmesh index 0487bb53d0..e82c853498 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allmesh +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allmesh @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy propeller surfaces from resources directory -cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ # Meshing runApplication blockMesh diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/README b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/geometry/README similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/README rename to tutorials/incompressible/pimpleFoam/RAS/propeller/constant/geometry/README diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict index 3b54271f02..b06d2bc570 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict @@ -135,7 +135,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/constant/geometry/wing_5degrees.obj similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/constant/geometry/wing_5degrees.obj diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict index 5fe0cc842a..9f63dbffa2 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict @@ -80,7 +80,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features (); diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/geometry/projectionSurface.stl similarity index 100% rename from tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl rename to tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/geometry/projectionSurface.stl diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean index 9eed1676c6..ebc008734d 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface -rm -f constant/triSurface/motorBike.obj.gz +rm -f constant/geometry/motorBike.obj.gz cleanCase diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun index c3be1c403f..eb31274210 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # copy motorbike surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/geometry/ runApplication blockMesh cp system/decomposeParDict.hierarchical system/decomposeParDict diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/triSurface/README b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/geometry/README similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/triSurface/README rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/geometry/README diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict index 5ffe8418d7..105fc0b9fb 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict @@ -88,7 +88,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( //{ diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean index f7e384215e..c9d0c1e875 100755 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean @@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory rm *.obj > /dev/null 2>&1 rm -r constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm constant/triSurface/boundaryAndFaceZones.eMesh > /dev/null 2>&1 +rm constant/geometry/boundaryAndFaceZones.eMesh > /dev/null 2>&1 rm constant/polyMesh/boundary > /dev/null 2>&1 cleanCase diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/README.txt b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/README.txt index ffbbf1d357..d8c28ab174 100644 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/README.txt +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/README.txt @@ -1,9 +1,9 @@ 2013-10-01 Meshing the angledDuct geometry. -constant/triSurface/angledDuct.stl +constant/geometry/angledDuct.stl outer geometry -constant/triSurface/boundaryAndFaceZones.stl +constant/geometry/boundaryAndFaceZones.stl boundary and faceZones to extract feature edges from. @@ -23,7 +23,7 @@ surfaceFeatures -constant/triSurface/porosity_inflated.stl +constant/geometry/porosity_inflated.stl block around porosity (slightly inflated) diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/boundaryAndFaceZones.stl b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/boundaryAndFaceZones.stl similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/boundaryAndFaceZones.stl rename to tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/boundaryAndFaceZones.stl diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/porosity.stl b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/porosity.stl similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/porosity.stl rename to tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/porosity.stl diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/porosity_inflated.stl b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/porosity_inflated.stl similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/porosity_inflated.stl rename to tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/porosity_inflated.stl diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/straightDuct.stl b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/straightDuct.stl similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/triSurface/straightDuct.stl rename to tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/geometry/straightDuct.stl diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean index 638d2025a7..06078b5cb3 100755 --- a/tutorials/incompressible/simpleFoam/motorBike/Allclean +++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean @@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface and features -rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1 +rm -f constant/geometry/motorBike.obj.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1 +rm -f constant/geometry/motorBike.eMesh > /dev/null 2>&1 cleanCase diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun index a945f07842..e64f17d710 100755 --- a/tutorials/incompressible/simpleFoam/motorBike/Allrun +++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy motorbike surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/geometry/ runApplication surfaceFeatures runApplication blockMesh diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README b/tutorials/incompressible/simpleFoam/motorBike/constant/geometry/README similarity index 100% rename from tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README rename to tutorials/incompressible/simpleFoam/motorBike/constant/geometry/README diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict index ece52680d0..6bcae35348 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict @@ -87,7 +87,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean index 2204732e45..53a645efcf 100755 --- a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean +++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean @@ -5,8 +5,8 @@ # remove surface and features rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/rotatingZone.eMesh > /dev/null 2>&1 -rm -f constant/triSurface/fixed.eMesh > /dev/null 2>&1 +rm -f constant/geometry/rotatingZone.eMesh > /dev/null 2>&1 +rm -f constant/geometry/fixed.eMesh > /dev/null 2>&1 rm -f 0/pointLevel > /dev/null 2>&1 rm -f 0/cellLevel > /dev/null 2>&1 diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/triSurface/fixed.obj b/tutorials/incompressible/simpleFoam/rotorDisk/constant/geometry/fixed.obj similarity index 100% rename from tutorials/incompressible/simpleFoam/rotorDisk/constant/triSurface/fixed.obj rename to tutorials/incompressible/simpleFoam/rotorDisk/constant/geometry/fixed.obj diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/triSurface/rotatingZone.obj b/tutorials/incompressible/simpleFoam/rotorDisk/constant/geometry/rotatingZone.obj similarity index 100% rename from tutorials/incompressible/simpleFoam/rotorDisk/constant/triSurface/rotatingZone.obj rename to tutorials/incompressible/simpleFoam/rotorDisk/constant/geometry/rotatingZone.obj diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/triSurface/terrain.stl b/tutorials/incompressible/simpleFoam/turbineSiting/constant/geometry/terrain.stl similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/constant/triSurface/terrain.stl rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/geometry/terrain.stl diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict index 896ad3d7b8..e58476b4ad 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict @@ -96,7 +96,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( //{ diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean index baa135b1d4..454c996982 100755 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory cleanCase rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1 +rm -f constant/geometry/buildings.eMesh > /dev/null 2>&1 rm -f constant/polyMesh/boundary > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/triSurface/buildings.obj.gz b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/geometry/buildings.obj.gz similarity index 100% rename from tutorials/incompressible/simpleFoam/windAroundBuildings/constant/triSurface/buildings.obj.gz rename to tutorials/incompressible/simpleFoam/windAroundBuildings/constant/geometry/buildings.obj.gz diff --git a/tutorials/lagrangian/denseParticleFoam/cyclone/constant/triSurface/cyclone.stl.gz b/tutorials/lagrangian/denseParticleFoam/cyclone/constant/geometry/cyclone.stl.gz similarity index 100% rename from tutorials/lagrangian/denseParticleFoam/cyclone/constant/triSurface/cyclone.stl.gz rename to tutorials/lagrangian/denseParticleFoam/cyclone/constant/geometry/cyclone.stl.gz diff --git a/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict index c728aa8b7a..d0b9e8c65a 100644 --- a/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict +++ b/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict @@ -78,7 +78,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( ); diff --git a/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/blob.stl.gz b/tutorials/mesh/foamyHexMesh/blob/constant/geometry/blob.stl.gz similarity index 100% rename from tutorials/mesh/foamyHexMesh/blob/constant/triSurface/blob.stl.gz rename to tutorials/mesh/foamyHexMesh/blob/constant/geometry/blob.stl.gz diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict index a49a283913..17ed86632b 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict @@ -87,7 +87,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( //{ diff --git a/tutorials/mesh/foamyHexMesh/flange/Allclean b/tutorials/mesh/foamyHexMesh/flange/Allclean index 2ceecfe1f9..c6c3bbaf7a 100755 --- a/tutorials/mesh/foamyHexMesh/flange/Allclean +++ b/tutorials/mesh/foamyHexMesh/flange/Allclean @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -rm -r constant/triSurface/flange.stl.gz > /dev/null 2>&1 +rm -r constant/geometry/flange.stl.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -r constant/ccx constant/ccy constant/ccz > /dev/null 2>&1 diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun index 414ca8f4a3..f55b998dac 100755 --- a/tutorials/mesh/foamyHexMesh/flange/Allrun +++ b/tutorials/mesh/foamyHexMesh/flange/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # copy flange surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/geometry/ runApplication foamyHexMesh diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel index fb57faff8e..7dc08c7c91 100755 --- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel +++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # copy flange surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/geometry/ # Create tight-fitting background mesh runApplication blockMesh -region backgroundMeshDecomposition diff --git a/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README b/tutorials/mesh/foamyHexMesh/flange/constant/geometry/README similarity index 100% rename from tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README rename to tutorials/mesh/foamyHexMesh/flange/constant/geometry/README diff --git a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict index e916b7204e..096874477c 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict @@ -76,7 +76,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background index 8a3f9429f1..738428aa37 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background +++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background @@ -23,7 +23,7 @@ actions source surfaceToCell; sourceInfo { - file "constant/triSurface/flange.obj"; + file "constant/geometry/flange.obj"; outsidePoints ((-0.026 -0.0275 -0.0235)); includeCut true; includeInside true; diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean index 66229e46ca..302df3f094 100755 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allclean @@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions rm -r constant/extendedFeatureEdgeMesh constant/internalDelaunayVertices > /dev/null 2>&1 -rm constant/triSurface/*.eMesh > /dev/null 2>&1 -rm constant/triSurface/*_orient* > /dev/null 2>&1 +rm constant/geometry/*.eMesh > /dev/null 2>&1 +rm constant/geometry/*_orient* > /dev/null 2>&1 rm -r constant/polyMesh > /dev/null 2>&1 rm -r constant/polyMesh > /dev/null 2>&1 rm -r constant/tetDualMesh > /dev/null 2>&1 diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun index 6824c9176d..0263f58664 100755 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun @@ -5,19 +5,19 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication -s cone \ - surfaceOrient constant/triSurface/cone.stl \ - constant/triSurface/cone_orient.stl \ + surfaceOrient constant/geometry/cone.stl \ + constant/geometry/cone_orient.stl \ -inside '(0 -0.5 0)' runApplication -s sphere \ - surfaceOrient constant/triSurface/sphere.stl \ - constant/triSurface/sphere_orient.stl \ + surfaceOrient constant/geometry/sphere.stl \ + constant/geometry/sphere_orient.stl \ -inside '(0 -0.5 0)' runApplication \ surfaceBooleanFeatures \ - constant/triSurface/cone_orient.stl \ - constant/triSurface/sphere_orient.stl \ + constant/geometry/cone_orient.stl \ + constant/geometry/sphere_orient.stl \ intersection runApplication foamyHexMesh diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/cone.stl b/tutorials/mesh/foamyHexMesh/simpleShapes/constant/geometry/cone.stl similarity index 100% rename from tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/cone.stl rename to tutorials/mesh/foamyHexMesh/simpleShapes/constant/geometry/cone.stl diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/sphere.stl b/tutorials/mesh/foamyHexMesh/simpleShapes/constant/geometry/sphere.stl similarity index 100% rename from tutorials/mesh/foamyHexMesh/simpleShapes/constant/triSurface/sphere.stl rename to tutorials/mesh/foamyHexMesh/simpleShapes/constant/geometry/sphere.stl diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean index 3a0c222993..bb3bf4d1f7 100755 --- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean +++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -rf constant/triSurface/jaggedBoundary.eMesh > /dev/null 2>&1 +rm -rf constant/geometry/jaggedBoundary.eMesh > /dev/null 2>&1 rm -rf constant/polyMesh > /dev/null 2>&1 rm -rf MeshedSurface.obj > /dev/null 2>&1 diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/constant/geometry/jaggedBoundary.stl similarity index 100% rename from tutorials/mesh/foamyQuadMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/constant/geometry/jaggedBoundary.stl diff --git a/tutorials/mesh/foamyQuadMesh/square/Allclean b/tutorials/mesh/foamyQuadMesh/square/Allclean index d8936babb0..5dc443babb 100755 --- a/tutorials/mesh/foamyQuadMesh/square/Allclean +++ b/tutorials/mesh/foamyQuadMesh/square/Allclean @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -rf constant/triSurface/unit_cube.eMesh > /dev/null 2>&1 +rm -rf constant/geometry/unit_cube.eMesh > /dev/null 2>&1 rm -rf constant/polyMesh > /dev/null 2>&1 rm -rf MeshedSurface*.obj > /dev/null 2>&1 diff --git a/tutorials/mesh/foamyQuadMesh/square/constant/triSurface/unit_cube.stl b/tutorials/mesh/foamyQuadMesh/square/constant/geometry/unit_cube.stl similarity index 100% rename from tutorials/mesh/foamyQuadMesh/square/constant/triSurface/unit_cube.stl rename to tutorials/mesh/foamyQuadMesh/square/constant/geometry/unit_cube.stl diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/triSurface/ACROSSCYN.JPG b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/geometry/ACROSSCYN.JPG similarity index 100% rename from tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/triSurface/ACROSSCYN.JPG rename to tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/geometry/ACROSSCYN.JPG diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/triSurface/AcrossCyn.XYZ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/geometry/AcrossCyn.XYZ similarity index 100% rename from tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/triSurface/AcrossCyn.XYZ rename to tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/geometry/AcrossCyn.XYZ diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/triSurface/AcrossRiver.stl.gz b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/geometry/AcrossRiver.stl.gz similarity index 100% rename from tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/triSurface/AcrossRiver.stl.gz rename to tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/geometry/AcrossRiver.stl.gz diff --git a/tutorials/mesh/snappyHexMesh/flange/Allclean b/tutorials/mesh/snappyHexMesh/flange/Allclean index 86aae8fae3..f9aef21fd5 100755 --- a/tutorials/mesh/snappyHexMesh/flange/Allclean +++ b/tutorials/mesh/snappyHexMesh/flange/Allclean @@ -5,12 +5,12 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface -rm -f constant/triSurface/flange.stl.gz +rm -f constant/geometry/flange.stl.gz rm -rf 0 > /dev/null 2>&1 rm -f ./flange ./*.obj > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/flange.eMesh > /dev/null 2>&1 +rm -f constant/geometry/flange.eMesh > /dev/null 2>&1 rm -f constant/polyMesh/boundary cleanCase diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun index 976552c29c..235bb43d2e 100755 --- a/tutorials/mesh/snappyHexMesh/flange/Allrun +++ b/tutorials/mesh/snappyHexMesh/flange/Allrun @@ -3,7 +3,7 @@ . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy flange surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/geometry/ runApplication blockMesh runApplication surfaceFeatures diff --git a/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README b/tutorials/mesh/snappyHexMesh/flange/constant/geometry/README similarity index 100% rename from tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README rename to tutorials/mesh/snappyHexMesh/flange/constant/geometry/README diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict index dfe5989cea..8694697045 100644 --- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict @@ -82,7 +82,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/mesh/snappyHexMesh/pipe/Allclean b/tutorials/mesh/snappyHexMesh/pipe/Allclean index 4646b7d777..6b2d801d2a 100755 --- a/tutorials/mesh/snappyHexMesh/pipe/Allclean +++ b/tutorials/mesh/snappyHexMesh/pipe/Allclean @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface -rm -rf constant/triSurface +rm -rf constant/geometry rm -rf constant/extendedFeatureEdgeMesh diff --git a/tutorials/mesh/snappyHexMesh/pipe/Allrun b/tutorials/mesh/snappyHexMesh/pipe/Allrun index 98f7090e10..636c0be809 100755 --- a/tutorials/mesh/snappyHexMesh/pipe/Allrun +++ b/tutorials/mesh/snappyHexMesh/pipe/Allrun @@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy pipe surface from resources directory -mkdir -p constant/triSurface -cp $FOAM_TUTORIALS/resources/geometry/pipe*.obj.gz constant/triSurface/ +mkdir -p constant/geometry +cp $FOAM_TUTORIALS/resources/geometry/pipe*.obj.gz constant/geometry/ runApplication surfaceFeatures runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean index 26ecdefad0..829fdedcc1 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean @@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface -rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1 +rm -f constant/geometry/DTC-scaled.stl.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 +rm -f constant/geometry/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh index abdeb34ed2..a5759e568d 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy DTC hull surface from resources folder -cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/geometry/ runApplication surfaceFeatures diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/triSurface/README b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/geometry/README similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/constant/triSurface/README rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/geometry/README diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict index aeba2daffb..11571a1a49 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict @@ -79,7 +79,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean index 26ecdefad0..829fdedcc1 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean @@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface -rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1 +rm -f constant/geometry/DTC-scaled.stl.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 +rm -f constant/geometry/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh index abdeb34ed2..a5759e568d 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy DTC hull surface from resources folder -cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/geometry/ runApplication surfaceFeatures diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/triSurface/README b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/geometry/README similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/triSurface/README rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/geometry/README diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict index aeba2daffb..11571a1a49 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict @@ -79,7 +79,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean index 26ecdefad0..829fdedcc1 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean @@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surface -rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1 +rm -f constant/geometry/DTC-scaled.stl.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 +rm -f constant/geometry/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh index abdeb34ed2..a5759e568d 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy DTC hull surface from resources folder -cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/geometry/ runApplication surfaceFeatures diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/triSurface/README b/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/geometry/README similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/triSurface/README rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/geometry/README diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict index aeba2daffb..11571a1a49 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict @@ -79,7 +79,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean index a9702718d4..f551494bd3 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean @@ -5,11 +5,11 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surfaces -rm -f constant/triSurface/mixerVessel*.stl.gz > /dev/null 2>&1 +rm -f constant/geometry/mixerVessel*.stl.gz > /dev/null 2>&1 cleanCase rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1 +rm -f constant/geometry/*.eMesh* > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allmesh b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allmesh index 86791e7cf2..57e7618cee 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allmesh @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy mixerVessel surfaces from resources directory -cp $FOAM_TUTORIALS/resources/geometry/mixerVessel*.stl.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/mixerVessel*.stl.gz constant/geometry/ # Meshing runApplication blockMesh diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/README b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/geometry/README similarity index 100% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/README rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/geometry/README diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/rotating.stl b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/geometry/rotating.stl similarity index 100% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/rotating.stl rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/geometry/rotating.stl diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index 686a860b44..a147530f75 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -182,7 +182,7 @@ castellatedMeshControls // Specifies a level for any cell intersected by explicitly provided // edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. // Specify 'levels' in the same way as the 'distance' mode in the // refinementRegions (see below). The old specification // level 2; diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/Allclean b/tutorials/multiphase/interFoam/RAS/planingHullW3/Allclean index 3f3159999e..6efdb144d3 100755 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/Allclean +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/Allclean @@ -6,8 +6,8 @@ cd ${0%/*} || exit 1 # Run from this directory # Remove surface rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/w3.eMesh > /dev/null 2>&1 -rm -f constant/triSurface/w3.stl > /dev/null 2>&1 +rm -f constant/geometry/w3.eMesh > /dev/null 2>&1 +rm -f constant/geometry/w3.stl > /dev/null 2>&1 rm -rf sequencedVTK > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.1 b/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.1 index efde54c0ae..1640374b97 100755 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.1 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.1 @@ -5,11 +5,11 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication surfaceTransformPoints -translate '(-0.586 0 -0.156)' \ - constant/triSurface/w3_orig.stl constant/triSurface/w3.stl + constant/geometry/w3_orig.stl constant/geometry/w3.stl runApplication -a surfaceTransformPoints -rollPitchYaw '(0 -3.485 0)' \ - constant/triSurface/w3.stl constant/triSurface/w3.stl + constant/geometry/w3.stl constant/geometry/w3.stl runApplication -a surfaceTransformPoints -translate '(0.586 0 0.156)' \ - constant/triSurface/w3.stl constant/triSurface/w3.stl + constant/geometry/w3.stl constant/geometry/w3.stl runApplication surfaceFeatures diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.2 b/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.2 index 2dbf15e8a9..c682dd7689 100755 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.2 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.2 @@ -5,11 +5,11 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication surfaceTransformPoints -translate '(-0.586 0 -0.156)' \ - constant/triSurface/w3_orig.stl constant/triSurface/w3.stl + constant/geometry/w3_orig.stl constant/geometry/w3.stl runApplication -a surfaceTransformPoints -rollPitchYaw '(0 -3.485 0)' \ - constant/triSurface/w3.stl constant/triSurface/w3.stl + constant/geometry/w3.stl constant/geometry/w3.stl runApplication -a surfaceTransformPoints -translate '(0.586 0 0.156)' \ - constant/triSurface/w3.stl constant/triSurface/w3.stl + constant/geometry/w3.stl constant/geometry/w3.stl runApplication surfaceFeatures diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/constant/triSurface/w3_orig.stl b/tutorials/multiphase/interFoam/RAS/planingHullW3/constant/geometry/w3_orig.stl similarity index 100% rename from tutorials/multiphase/interFoam/RAS/planingHullW3/constant/triSurface/w3_orig.stl rename to tutorials/multiphase/interFoam/RAS/planingHullW3/constant/geometry/w3_orig.stl diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 index efd9cea7f3..a8a5936aa1 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 @@ -79,7 +79,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.2 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.2 index be33ae0a9e..c6a7c5c72a 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.2 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.2 @@ -85,7 +85,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/multiphase/interFoam/RAS/propeller/Allclean b/tutorials/multiphase/interFoam/RAS/propeller/Allclean index c100538654..f0f3c99759 100755 --- a/tutorials/multiphase/interFoam/RAS/propeller/Allclean +++ b/tutorials/multiphase/interFoam/RAS/propeller/Allclean @@ -5,11 +5,11 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions # Remove surfaces -rm -f constant/triSurface/propeller*.obj.gz > /dev/null 2>&1 +rm -f constant/geometry/propeller*.obj.gz > /dev/null 2>&1 cleanCase rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1 +rm -f constant/geometry/*.eMesh* > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/propeller/Allmesh b/tutorials/multiphase/interFoam/RAS/propeller/Allmesh index 584af195a6..29d49db8fa 100755 --- a/tutorials/multiphase/interFoam/RAS/propeller/Allmesh +++ b/tutorials/multiphase/interFoam/RAS/propeller/Allmesh @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy propeller surfaces from resources directory -cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/triSurface/ +cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ runApplication blockMesh runApplication surfaceFeatures diff --git a/tutorials/multiphase/interFoam/RAS/propeller/constant/triSurface/README b/tutorials/multiphase/interFoam/RAS/propeller/constant/geometry/README similarity index 100% rename from tutorials/multiphase/interFoam/RAS/propeller/constant/triSurface/README rename to tutorials/multiphase/interFoam/RAS/propeller/constant/geometry/README diff --git a/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict index 3b54271f02..b06d2bc570 100644 --- a/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict @@ -135,7 +135,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( { diff --git a/tutorials/multiphase/interFoam/laminar/cavitatingBullet/constant/triSurface/bullet.stl.gz b/tutorials/multiphase/interFoam/laminar/cavitatingBullet/constant/geometry/bullet.stl.gz similarity index 100% rename from tutorials/multiphase/interFoam/laminar/cavitatingBullet/constant/triSurface/bullet.stl.gz rename to tutorials/multiphase/interFoam/laminar/cavitatingBullet/constant/geometry/bullet.stl.gz diff --git a/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict index d4037685ab..4cd6a7ef3a 100644 --- a/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/laminar/cavitatingBullet/system/snappyHexMeshDict @@ -97,7 +97,7 @@ castellatedMeshControls // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. + // This is a featureEdgeMesh, read from constant/geometry for now. features ( //{ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/triSurface/sloshingCylinder.obj b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/geometry/sloshingCylinder.obj similarity index 100% rename from tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/triSurface/sloshingCylinder.obj rename to tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/geometry/sloshingCylinder.obj