From 25dd524c84c519a0e86bec48e28b51c70f523633 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 3 Mar 2023 09:03:47 +0000 Subject: [PATCH] generic.*Patch: Moved to new genericPatches library genericPatches is linked into mesh generation and manipulation utilities but not solvers so that the solvers now check for the availability of the specified patch types. Bugs in the tutorials exposed by this check have been corrected. --- applications/utilities/mesh/advanced/PDRMesh/Make/options | 1 + .../utilities/mesh/advanced/autoRefineMesh/Make/options | 1 + .../utilities/mesh/advanced/collapseEdges/Make/options | 1 + .../utilities/mesh/advanced/combinePatchFaces/Make/options | 1 + applications/utilities/mesh/advanced/modifyMesh/Make/options | 1 + .../utilities/mesh/advanced/refineHexMesh/Make/options | 1 + .../utilities/mesh/advanced/refineWallLayer/Make/options | 1 + .../utilities/mesh/advanced/refinementLevel/Make/options | 1 + applications/utilities/mesh/advanced/selectCells/Make/options | 1 + applications/utilities/mesh/advanced/splitCells/Make/options | 1 + .../utilities/mesh/conversion/fluent3DMeshToFoam/Make/options | 1 + .../utilities/mesh/conversion/fluentMeshToFoam/Make/options | 1 + .../utilities/mesh/conversion/gmshToFoam/Make/options | 1 + .../utilities/mesh/conversion/ideasUnvToFoam/Make/options | 1 + .../utilities/mesh/conversion/kivaToFoam/Make/options | 1 + .../utilities/mesh/conversion/plot3dToFoam/Make/options | 1 + .../utilities/mesh/conversion/sammToFoam/Make/options | 1 + .../utilities/mesh/conversion/star3ToFoam/Make/options | 1 + applications/utilities/mesh/generation/blockMesh/Make/options | 1 + .../utilities/mesh/generation/extrude2DMesh/Make/options | 1 + .../utilities/mesh/generation/extrudeMesh/Make/options | 1 + .../mesh/generation/extrudeToRegionMesh/Make/options | 1 + .../utilities/mesh/generation/snappyHexMesh/Make/options | 1 + .../utilities/mesh/manipulation/attachMesh/Make/options | 1 + .../utilities/mesh/manipulation/autoPatch/Make/options | 1 + .../utilities/mesh/manipulation/checkMesh/Make/options | 1 + .../utilities/mesh/manipulation/createPatch/Make/options | 1 + .../utilities/mesh/manipulation/deformedGeom/Make/options | 2 +- .../utilities/mesh/manipulation/flattenMesh/Make/options | 1 + .../utilities/mesh/manipulation/insideCells/Make/options | 1 + .../utilities/mesh/manipulation/mergeMeshes/Make/options | 1 + .../utilities/mesh/manipulation/mirrorMesh/Make/options | 1 + .../utilities/mesh/manipulation/orientFaceZone/Make/options | 1 + .../utilities/mesh/manipulation/refineMesh/Make/options | 1 + .../utilities/mesh/manipulation/rotateMesh/Make/options | 1 + .../utilities/mesh/manipulation/splitBaffles/Make/options | 1 + .../utilities/mesh/manipulation/splitMesh/Make/options | 1 + applications/utilities/mesh/manipulation/topoSet/Make/options | 1 + .../utilities/mesh/manipulation/zipUpMesh/Make/options | 1 + src/Allwmake | 1 + src/OpenFOAM/Make/files | 2 -- src/finiteVolume/Make/files | 1 - src/genericPatchFields/Make/files | 1 + src/genericPatchFields/Make/options | 2 ++ .../genericFvPatch}/genericFvPatch.C | 2 +- .../genericFvPatch}/genericFvPatch.H | 2 +- src/genericPatches/Make/files | 4 ++++ src/genericPatches/Make/options | 3 +++ .../genericPointPatch}/genericPointPatch.C | 2 +- .../genericPointPatch}/genericPointPatch.H | 2 +- .../genericPolyPatch}/genericPolyPatch.C | 2 +- .../genericPolyPatch}/genericPolyPatch.H | 2 +- tutorials/modules/film/rivuletPanel/Allrun | 2 +- .../incompressibleFluid/rotorDisk/system/snappyHexMeshDict | 2 +- .../modules/multiphaseEuler/pipeBend/system/blockMeshDict | 2 +- 55 files changed, 59 insertions(+), 13 deletions(-) rename src/{finiteVolume/fvMesh/fvPatches/basic/generic => genericPatchFields/genericFvPatch}/genericFvPatch.C (95%) rename src/{finiteVolume/fvMesh/fvPatches/basic/generic => genericPatchFields/genericFvPatch}/genericFvPatch.H (97%) create mode 100644 src/genericPatches/Make/files create mode 100644 src/genericPatches/Make/options rename src/{OpenFOAM/meshes/pointMesh/pointPatches/basic/generic => genericPatches/genericPointPatch}/genericPointPatch.C (96%) rename src/{OpenFOAM/meshes/pointMesh/pointPatches/basic/generic => genericPatches/genericPointPatch}/genericPointPatch.H (97%) rename src/{OpenFOAM/meshes/polyMesh/polyPatches/basic/generic => genericPatches/genericPolyPatch}/genericPolyPatch.C (98%) rename src/{OpenFOAM/meshes/polyMesh/polyPatches/basic/generic => genericPatches/genericPolyPatch}/genericPolyPatch.H (98%) diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options index c914252157..026bc30532 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/Make/options +++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options @@ -8,6 +8,7 @@ EXE_LIBS = \ -lcompressibleMomentumTransportModels \ -lfluidThermophysicalModels \ -lmeshTools \ + -lgenericPatches \ -ldynamicMesh \ -lfiniteVolume \ -lfvModels diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/Make/options b/applications/utilities/mesh/advanced/autoRefineMesh/Make/options index 78df8bbcf4..bd6fe53d77 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/Make/options +++ b/applications/utilities/mesh/advanced/autoRefineMesh/Make/options @@ -7,5 +7,6 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ -lmeshTools \ + -lgenericPatches \ -ltriSurface \ -llagrangian diff --git a/applications/utilities/mesh/advanced/collapseEdges/Make/options b/applications/utilities/mesh/advanced/collapseEdges/Make/options index 987eae5ed7..7665565e82 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/Make/options +++ b/applications/utilities/mesh/advanced/collapseEdges/Make/options @@ -6,4 +6,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ -lmeshTools \ + -lgenericPatches \ -lfiniteVolume diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options index 3da3443a27..946497fc94 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options +++ b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options @@ -6,4 +6,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lgenericPatches \ -ldynamicMesh diff --git a/applications/utilities/mesh/advanced/modifyMesh/Make/options b/applications/utilities/mesh/advanced/modifyMesh/Make/options index 70c838b774..72321d31b5 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/Make/options +++ b/applications/utilities/mesh/advanced/modifyMesh/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ + -lgenericPatches \ -ldynamicMesh diff --git a/applications/utilities/mesh/advanced/refineHexMesh/Make/options b/applications/utilities/mesh/advanced/refineHexMesh/Make/options index baa7b45f00..a8c83dc5a3 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/Make/options +++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/options @@ -7,5 +7,6 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ -lmeshTools \ + -lgenericPatches \ -lfiniteVolume \ -lgenericPatchFields diff --git a/applications/utilities/mesh/advanced/refineWallLayer/Make/options b/applications/utilities/mesh/advanced/refineWallLayer/Make/options index 7349856cab..a76479bb0d 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/Make/options +++ b/applications/utilities/mesh/advanced/refineWallLayer/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/advanced/refinementLevel/Make/options b/applications/utilities/mesh/advanced/refinementLevel/Make/options index d27c95d033..871d16f846 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/Make/options +++ b/applications/utilities/mesh/advanced/refinementLevel/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/advanced/selectCells/Make/options b/applications/utilities/mesh/advanced/selectCells/Make/options index c4020c272c..20ceda87dc 100644 --- a/applications/utilities/mesh/advanced/selectCells/Make/options +++ b/applications/utilities/mesh/advanced/selectCells/Make/options @@ -8,5 +8,6 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ -lmeshTools \ + -lgenericPatches \ -ltriSurface \ -llagrangian diff --git a/applications/utilities/mesh/advanced/splitCells/Make/options b/applications/utilities/mesh/advanced/splitCells/Make/options index 7349856cab..a76479bb0d 100644 --- a/applications/utilities/mesh/advanced/splitCells/Make/options +++ b/applications/utilities/mesh/advanced/splitCells/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/Make/options b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/Make/options index 525acf8e56..5fcb9c7e2c 100644 --- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/Make/options +++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/Make/options @@ -5,5 +5,6 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ + -lgenericPatches \ -ldynamicMesh \ -lconversion diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/Make/options b/applications/utilities/mesh/conversion/fluentMeshToFoam/Make/options index 70c838b774..72321d31b5 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/Make/options +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ + -lgenericPatches \ -ldynamicMesh diff --git a/applications/utilities/mesh/conversion/gmshToFoam/Make/options b/applications/utilities/mesh/conversion/gmshToFoam/Make/options index 7349856cab..a76479bb0d 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/Make/options +++ b/applications/utilities/mesh/conversion/gmshToFoam/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options b/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options index 02c293ceed..65bcc43874 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ + -lgenericPatches \ -lsurfMesh diff --git a/applications/utilities/mesh/conversion/kivaToFoam/Make/options b/applications/utilities/mesh/conversion/kivaToFoam/Make/options index 9cc80f6d26..ca14c4a6bf 100644 --- a/applications/utilities/mesh/conversion/kivaToFoam/Make/options +++ b/applications/utilities/mesh/conversion/kivaToFoam/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lconversion diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/Make/options b/applications/utilities/mesh/conversion/plot3dToFoam/Make/options index 54c035b8f5..0feeb9f95a 100644 --- a/applications/utilities/mesh/conversion/plot3dToFoam/Make/options +++ b/applications/utilities/mesh/conversion/plot3dToFoam/Make/options @@ -2,4 +2,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/conversion/sammToFoam/Make/options b/applications/utilities/mesh/conversion/sammToFoam/Make/options index 9cc80f6d26..ca14c4a6bf 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/Make/options +++ b/applications/utilities/mesh/conversion/sammToFoam/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lconversion diff --git a/applications/utilities/mesh/conversion/star3ToFoam/Make/options b/applications/utilities/mesh/conversion/star3ToFoam/Make/options index c694289766..01d60f8e41 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/Make/options +++ b/applications/utilities/mesh/conversion/star3ToFoam/Make/options @@ -11,4 +11,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lconversion diff --git a/applications/utilities/mesh/generation/blockMesh/Make/options b/applications/utilities/mesh/generation/blockMesh/Make/options index 9d13a25de6..95ba434034 100644 --- a/applications/utilities/mesh/generation/blockMesh/Make/options +++ b/applications/utilities/mesh/generation/blockMesh/Make/options @@ -7,5 +7,6 @@ EXE_INC = \ EXE_LIBS = \ -lblockMesh \ -lmeshTools \ + -lgenericPatches \ -lfileFormats \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/Make/options index 3be2f34c18..d7d926aa7b 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/Make/options +++ b/applications/utilities/mesh/generation/extrude2DMesh/Make/options @@ -9,4 +9,5 @@ EXE_LIBS = \ -lsurfMesh \ -ldynamicMesh \ -lextrude2DMesh \ + -lgenericPatches \ -lextrudeModel diff --git a/applications/utilities/mesh/generation/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrudeMesh/Make/options index 94b355be3c..f6303eb8f9 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/Make/options +++ b/applications/utilities/mesh/generation/extrudeMesh/Make/options @@ -11,4 +11,5 @@ EXE_LIBS = \ -lsurfMesh \ -lmeshTools \ -ldynamicMesh \ + -lgenericPatches \ -lextrudeModel diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options index 29ab9dca6f..7051cf81cd 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/Make/options @@ -9,5 +9,6 @@ EXE_LIBS = \ -lfileFormats \ -lfiniteVolume \ -lmeshTools \ + -lgenericPatches \ -ldynamicMesh \ -lextrudeModel diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index 0fa291c8ef..00e73c0975 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -10,6 +10,7 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lgenericPatchFields \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ -lmeshTools \ diff --git a/applications/utilities/mesh/manipulation/attachMesh/Make/options b/applications/utilities/mesh/manipulation/attachMesh/Make/options index 21b17b14c9..68a72f1195 100644 --- a/applications/utilities/mesh/manipulation/attachMesh/Make/options +++ b/applications/utilities/mesh/manipulation/attachMesh/Make/options @@ -3,4 +3,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/autoPatch/Make/options b/applications/utilities/mesh/manipulation/autoPatch/Make/options index 7349856cab..a76479bb0d 100644 --- a/applications/utilities/mesh/manipulation/autoPatch/Make/options +++ b/applications/utilities/mesh/manipulation/autoPatch/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/checkMesh/Make/options b/applications/utilities/mesh/manipulation/checkMesh/Make/options index 0653767f3e..fd8cb20b87 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/Make/options +++ b/applications/utilities/mesh/manipulation/checkMesh/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ + -lgenericPatches \ -lsampling \ -lsurfMesh \ -ldynamicMesh diff --git a/applications/utilities/mesh/manipulation/createPatch/Make/options b/applications/utilities/mesh/manipulation/createPatch/Make/options index 73f34b0f85..df36a8a743 100644 --- a/applications/utilities/mesh/manipulation/createPatch/Make/options +++ b/applications/utilities/mesh/manipulation/createPatch/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/deformedGeom/Make/options b/applications/utilities/mesh/manipulation/deformedGeom/Make/options index dea7843ffd..d6608fa880 100644 --- a/applications/utilities/mesh/manipulation/deformedGeom/Make/options +++ b/applications/utilities/mesh/manipulation/deformedGeom/Make/options @@ -3,5 +3,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/flattenMesh/Make/options b/applications/utilities/mesh/manipulation/flattenMesh/Make/options index 73f34b0f85..df36a8a743 100644 --- a/applications/utilities/mesh/manipulation/flattenMesh/Make/options +++ b/applications/utilities/mesh/manipulation/flattenMesh/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/insideCells/Make/options b/applications/utilities/mesh/manipulation/insideCells/Make/options index 07bbf1aab9..e4d11a1c7c 100644 --- a/applications/utilities/mesh/manipulation/insideCells/Make/options +++ b/applications/utilities/mesh/manipulation/insideCells/Make/options @@ -5,4 +5,5 @@ EXE_INC = \ EXE_LIBS = \ -ltriSurface \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options index 21b17b14c9..68a72f1195 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options +++ b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options @@ -3,4 +3,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/Make/options b/applications/utilities/mesh/manipulation/mirrorMesh/Make/options index ac6ecd8333..22fc033a9f 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/Make/options +++ b/applications/utilities/mesh/manipulation/mirrorMesh/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lfiniteVolume diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options index 56e8dc4f17..39f854a220 100644 --- a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options +++ b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options @@ -5,5 +5,6 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ + -lgenericPatches \ -lsnappyHexMesh \ -ltriSurface diff --git a/applications/utilities/mesh/manipulation/refineMesh/Make/options b/applications/utilities/mesh/manipulation/refineMesh/Make/options index 73f34b0f85..df36a8a743 100644 --- a/applications/utilities/mesh/manipulation/refineMesh/Make/options +++ b/applications/utilities/mesh/manipulation/refineMesh/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/rotateMesh/Make/options b/applications/utilities/mesh/manipulation/rotateMesh/Make/options index fa15f12452..ad67c545cf 100644 --- a/applications/utilities/mesh/manipulation/rotateMesh/Make/options +++ b/applications/utilities/mesh/manipulation/rotateMesh/Make/options @@ -2,4 +2,5 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ + -lgenericPatches \ -lfiniteVolume diff --git a/applications/utilities/mesh/manipulation/splitBaffles/Make/options b/applications/utilities/mesh/manipulation/splitBaffles/Make/options index 792a51bf7f..c5f205b0ae 100644 --- a/applications/utilities/mesh/manipulation/splitBaffles/Make/options +++ b/applications/utilities/mesh/manipulation/splitBaffles/Make/options @@ -6,4 +6,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ + -lgenericPatches \ -ldynamicMesh diff --git a/applications/utilities/mesh/manipulation/splitMesh/Make/options b/applications/utilities/mesh/manipulation/splitMesh/Make/options index 73f34b0f85..df36a8a743 100644 --- a/applications/utilities/mesh/manipulation/splitMesh/Make/options +++ b/applications/utilities/mesh/manipulation/splitMesh/Make/options @@ -4,4 +4,5 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/topoSet/Make/options b/applications/utilities/mesh/manipulation/topoSet/Make/options index b90bc48df7..8b050b8c8b 100644 --- a/applications/utilities/mesh/manipulation/topoSet/Make/options +++ b/applications/utilities/mesh/manipulation/topoSet/Make/options @@ -3,4 +3,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ + -lgenericPatches \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/Make/options b/applications/utilities/mesh/manipulation/zipUpMesh/Make/options index 936ae242cf..534582e898 100644 --- a/applications/utilities/mesh/manipulation/zipUpMesh/Make/options +++ b/applications/utilities/mesh/manipulation/zipUpMesh/Make/options @@ -6,4 +6,5 @@ EXE_INC = \ #EXE_INC += -DDEBUG_ORDER EXE_LIBS = \ + -lgenericPatches \ -lmeshTools diff --git a/src/Allwmake b/src/Allwmake index 9b0cd434dd..317df567d7 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -29,6 +29,7 @@ wmake $targetType OpenFOAM wmake $targetType fileFormats wmake $targetType surfMesh wmake $targetType triSurface +wmake $targetType genericPatches wmake $targetType meshTools # Decomposition methods needed by dummyThirdParty diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index cca2391916..4660f6adce 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -478,7 +478,6 @@ $(polyPatches)/polyPatch/polyPatchNew.C basicPolyPatches = $(polyPatches)/basic $(basicPolyPatches)/coupled/coupledPolyPatch.C -$(basicPolyPatches)/generic/genericPolyPatch.C constraintPolyPatches = $(polyPatches)/constraint $(constraintPolyPatches)/cyclic/cyclicTransform.C @@ -606,7 +605,6 @@ $(pointPatches)/facePointPatch/facePointPatchNew.C basicPointPatches = $(pointPatches)/basic $(basicPointPatches)/coupled/coupledPointPatch.C -$(basicPointPatches)/generic/genericPointPatch.C constraintPointPatches = $(pointPatches)/constraint $(constraintPointPatches)/cyclic/cyclicPointPatch.C diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 9c3829408e..b0d8605d1c 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -16,7 +16,6 @@ $(fvPatches)/fvPatch/fvPatchNew.C basicFvPatches = $(fvPatches)/basic $(basicFvPatches)/coupled/coupledFvPatch.C -$(basicFvPatches)/generic/genericFvPatch.C constraintFvPatches = $(fvPatches)/constraint $(constraintFvPatches)/cyclic/cyclicFvPatch.C diff --git a/src/genericPatchFields/Make/files b/src/genericPatchFields/Make/files index bf28e03483..24bc8bb36e 100644 --- a/src/genericPatchFields/Make/files +++ b/src/genericPatchFields/Make/files @@ -1,3 +1,4 @@ +genericFvPatch/genericFvPatch.C genericPatchField/genericPatchField.C genericFvPatchField/genericFvPatchFields.C genericPointPatchField/genericPointPatchFields.C diff --git a/src/genericPatchFields/Make/options b/src/genericPatchFields/Make/options index 71b7873964..25d19f3c94 100644 --- a/src/genericPatchFields/Make/options +++ b/src/genericPatchFields/Make/options @@ -1,5 +1,7 @@ EXE_INC = \ + -I$(LIB_SRC)/genericPatches/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ + -lgenericPatches \ -lfiniteVolume diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/generic/genericFvPatch.C b/src/genericPatchFields/genericFvPatch/genericFvPatch.C similarity index 95% rename from src/finiteVolume/fvMesh/fvPatches/basic/generic/genericFvPatch.C rename to src/genericPatchFields/genericFvPatch/genericFvPatch.C index d3845c210a..9802f7ecae 100644 --- a/src/finiteVolume/fvMesh/fvPatches/basic/generic/genericFvPatch.C +++ b/src/genericPatchFields/genericFvPatch/genericFvPatch.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/generic/genericFvPatch.H b/src/genericPatchFields/genericFvPatch/genericFvPatch.H similarity index 97% rename from src/finiteVolume/fvMesh/fvPatches/basic/generic/genericFvPatch.H rename to src/genericPatchFields/genericFvPatch/genericFvPatch.H index 5a33a6e0c6..387aa1e8bb 100644 --- a/src/finiteVolume/fvMesh/fvPatches/basic/generic/genericFvPatch.H +++ b/src/genericPatchFields/genericFvPatch/genericFvPatch.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/genericPatches/Make/files b/src/genericPatches/Make/files new file mode 100644 index 0000000000..bb578acdd3 --- /dev/null +++ b/src/genericPatches/Make/files @@ -0,0 +1,4 @@ +genericPolyPatch/genericPolyPatch.C +genericPointPatch/genericPointPatch.C + +LIB = $(FOAM_LIBBIN)/libgenericPatches diff --git a/src/genericPatches/Make/options b/src/genericPatches/Make/options new file mode 100644 index 0000000000..79be6f3a7d --- /dev/null +++ b/src/genericPatches/Make/options @@ -0,0 +1,3 @@ +EXE_INC = + +LIB_LIBS = diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.C b/src/genericPatches/genericPointPatch/genericPointPatch.C similarity index 96% rename from src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.C rename to src/genericPatches/genericPointPatch/genericPointPatch.C index 62e9fec25b..3212b316ab 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.C +++ b/src/genericPatches/genericPointPatch/genericPointPatch.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H b/src/genericPatches/genericPointPatch/genericPointPatch.H similarity index 97% rename from src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H rename to src/genericPatches/genericPointPatch/genericPointPatch.H index 135e6e8134..20a077505d 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H +++ b/src/genericPatches/genericPointPatch/genericPointPatch.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/genericPatches/genericPolyPatch/genericPolyPatch.C similarity index 98% rename from src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C rename to src/genericPatches/genericPolyPatch/genericPolyPatch.C index 92ad66d9c4..1709af1304 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C +++ b/src/genericPatches/genericPolyPatch/genericPolyPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H b/src/genericPatches/genericPolyPatch/genericPolyPatch.H similarity index 98% rename from src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H rename to src/genericPatches/genericPolyPatch/genericPolyPatch.H index 40c185aefa..b8b0fc0bb8 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H +++ b/src/genericPatches/genericPolyPatch/genericPolyPatch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/tutorials/modules/film/rivuletPanel/Allrun b/tutorials/modules/film/rivuletPanel/Allrun index ba64272e8a..7d4d69fc15 100755 --- a/tutorials/modules/film/rivuletPanel/Allrun +++ b/tutorials/modules/film/rivuletPanel/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Copy the source case -isTest "$@" && path=.. || path=$FOAM_TUTORIALS/modules/isothermalFilm +path=$FOAM_TUTORIALS/modules/isothermalFilm cp -r $path/rivuletPanel/constant . cp -r $path/rivuletPanel/system . cp -r $path/rivuletPanel/0 . diff --git a/tutorials/modules/incompressibleFluid/rotorDisk/system/snappyHexMeshDict b/tutorials/modules/incompressibleFluid/rotorDisk/system/snappyHexMeshDict index 95841ea8e4..9a984141d0 100644 --- a/tutorials/modules/incompressibleFluid/rotorDisk/system/snappyHexMeshDict +++ b/tutorials/modules/incompressibleFluid/rotorDisk/system/snappyHexMeshDict @@ -60,7 +60,7 @@ castellatedMeshControls patch0 { level (2 2); - patchInfo { type slip; } + patchInfo { type wall; } } patch1 diff --git a/tutorials/modules/multiphaseEuler/pipeBend/system/blockMeshDict b/tutorials/modules/multiphaseEuler/pipeBend/system/blockMeshDict index 2d36367fd3..1dd718ec40 100644 --- a/tutorials/modules/multiphaseEuler/pipeBend/system/blockMeshDict +++ b/tutorials/modules/multiphaseEuler/pipeBend/system/blockMeshDict @@ -136,7 +136,7 @@ boundary ( inlet { - type pacth; + type patch; faces ( (0 1 2 3)