From 096200c6b6ee67ff5a9824db6a7e6f94cbb5d0bb Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 19 Oct 2023 18:19:38 +0100 Subject: [PATCH] primitiveMeshCheck, polyMeshCheck: Moved to meshCheck library --- .../mesh/advanced/combinePatchFaces/Make/options | 3 +++ src/OpenFOAM/Make/files | 10 ---------- src/dynamicMesh/Make/options | 3 +++ src/functionObjects/utilities/Make/options | 6 ++++-- src/meshCheck/Make/files | 8 ++++++++ .../polyMeshCheck/polyMeshCheck.C | 0 .../polyMeshCheck/polyMeshCheck.H | 0 .../polyMeshCheck/polyMeshTools.C | 0 .../polyMeshCheck/polyMeshTools.H | 0 .../primitiveMeshCheck/primitiveMeshCheck.C | 0 .../primitiveMeshCheck/primitiveMeshCheck.H | 0 .../primitiveMeshCheck/primitiveMeshCheckEdgeLength.C | 0 .../primitiveMeshCheckPointNearness.C | 0 .../primitiveMeshCheck/primitiveMeshTools.C | 0 .../primitiveMeshCheck/primitiveMeshTools.H | 0 15 files changed, 18 insertions(+), 12 deletions(-) rename src/{OpenFOAM/meshes/polyMesh => meshCheck}/polyMeshCheck/polyMeshCheck.C (100%) rename src/{OpenFOAM/meshes/polyMesh => meshCheck}/polyMeshCheck/polyMeshCheck.H (100%) rename src/{OpenFOAM/meshes/polyMesh => meshCheck}/polyMeshCheck/polyMeshTools.C (100%) rename src/{OpenFOAM/meshes/polyMesh => meshCheck}/polyMeshCheck/polyMeshTools.H (100%) rename src/{OpenFOAM/meshes/primitiveMesh => meshCheck}/primitiveMeshCheck/primitiveMeshCheck.C (100%) rename src/{OpenFOAM/meshes/primitiveMesh => meshCheck}/primitiveMeshCheck/primitiveMeshCheck.H (100%) rename src/{OpenFOAM/meshes/primitiveMesh => meshCheck}/primitiveMeshCheck/primitiveMeshCheckEdgeLength.C (100%) rename src/{OpenFOAM/meshes/primitiveMesh => meshCheck}/primitiveMeshCheck/primitiveMeshCheckPointNearness.C (100%) rename src/{OpenFOAM/meshes/primitiveMesh => meshCheck}/primitiveMeshCheck/primitiveMeshTools.C (100%) rename src/{OpenFOAM/meshes/primitiveMesh => meshCheck}/primitiveMeshCheck/primitiveMeshTools.H (100%) diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options index d269003b00..9c93821d4c 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options +++ b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options @@ -1,9 +1,12 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/meshCheck/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ EXE_LIBS = \ -lfiniteVolume \ -lgenericPatches \ + -lmeshTools \ + -lmeshCheck \ -ldynamicMesh diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index cb3b166ba5..efc2755dab 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -531,10 +531,6 @@ $(polyMesh)/polyMeshInitMesh.C $(polyMesh)/polyMeshClear.C $(polyMesh)/polyMeshUpdate.C -polyMeshCheck = $(polyMesh)/polyMeshCheck -$(polyMeshCheck)/polyMeshCheck.C -$(polyMeshCheck)/polyMeshTools.C - primitiveMesh = meshes/primitiveMesh $(primitiveMesh)/primitiveMesh.C $(primitiveMesh)/primitiveMeshCellCells.C @@ -553,12 +549,6 @@ $(primitiveMesh)/primitiveMeshPointPoints.C $(primitiveMesh)/primitiveMeshCellPoints.C $(primitiveMesh)/primitiveMeshCalcCellShapes.C -primitiveMeshCheck = $(primitiveMesh)/primitiveMeshCheck -$(primitiveMeshCheck)/primitiveMeshCheck.C -$(primitiveMeshCheck)/primitiveMeshCheckPointNearness.C -$(primitiveMeshCheck)/primitiveMeshCheckEdgeLength.C -$(primitiveMeshCheck)/primitiveMeshTools.C - primitivePatch = $(primitiveMesh)/primitivePatch $(primitivePatch)/patchZones.C $(primitivePatch)/walkPatch.C diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options index 0757c29678..f2b55c951f 100644 --- a/src/dynamicMesh/Make/options +++ b/src/dynamicMesh/Make/options @@ -1,10 +1,13 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/meshCheck/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude LIB_LIBS = \ -lfiniteVolume \ + -lmeshTools \ + -lmeshCheck \ -ltriSurface \ -lextrudeModel diff --git a/src/functionObjects/utilities/Make/options b/src/functionObjects/utilities/Make/options index 71b7873964..a90f0b5aef 100644 --- a/src/functionObjects/utilities/Make/options +++ b/src/functionObjects/utilities/Make/options @@ -1,5 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshCheck/lnInclude LIB_LIBS = \ - -lfiniteVolume + -lfiniteVolume \ + -lmeshCheck diff --git a/src/meshCheck/Make/files b/src/meshCheck/Make/files index 01fd41923f..37a566adf3 100644 --- a/src/meshCheck/Make/files +++ b/src/meshCheck/Make/files @@ -1,3 +1,11 @@ +polyMeshCheck/polyMeshCheck.C +polyMeshCheck/polyMeshTools.C + +primitiveMeshCheck/primitiveMeshCheck.C +primitiveMeshCheck/primitiveMeshCheckPointNearness.C +primitiveMeshCheck/primitiveMeshCheckEdgeLength.C +primitiveMeshCheck/primitiveMeshTools.C + checkTools/checkTools.C checkTools/checkTopology.C checkTools/checkGeometry.C diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/meshCheck/polyMeshCheck/polyMeshCheck.C similarity index 100% rename from src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C rename to src/meshCheck/polyMeshCheck/polyMeshCheck.C diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.H b/src/meshCheck/polyMeshCheck/polyMeshCheck.H similarity index 100% rename from src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.H rename to src/meshCheck/polyMeshCheck/polyMeshCheck.H diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C b/src/meshCheck/polyMeshCheck/polyMeshTools.C similarity index 100% rename from src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C rename to src/meshCheck/polyMeshCheck/polyMeshTools.C diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.H b/src/meshCheck/polyMeshCheck/polyMeshTools.H similarity index 100% rename from src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.H rename to src/meshCheck/polyMeshCheck/polyMeshTools.H diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.C similarity index 100% rename from src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C rename to src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.C diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.H b/src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.H similarity index 100% rename from src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.H rename to src/meshCheck/primitiveMeshCheck/primitiveMeshCheck.H diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckEdgeLength.C b/src/meshCheck/primitiveMeshCheck/primitiveMeshCheckEdgeLength.C similarity index 100% rename from src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckEdgeLength.C rename to src/meshCheck/primitiveMeshCheck/primitiveMeshCheckEdgeLength.C diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckPointNearness.C b/src/meshCheck/primitiveMeshCheck/primitiveMeshCheckPointNearness.C similarity index 100% rename from src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckPointNearness.C rename to src/meshCheck/primitiveMeshCheck/primitiveMeshCheckPointNearness.C diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C b/src/meshCheck/primitiveMeshCheck/primitiveMeshTools.C similarity index 100% rename from src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C rename to src/meshCheck/primitiveMeshCheck/primitiveMeshTools.C diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H b/src/meshCheck/primitiveMeshCheck/primitiveMeshTools.H similarity index 100% rename from src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.H rename to src/meshCheck/primitiveMeshCheck/primitiveMeshTools.H