From 35106b60c60f55f4383fb1998612f2e1d4719e6c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 4 Apr 2022 17:22:57 +0200
Subject: [PATCH] GIT: relocate uniformFixedValuePointPatchField to meshTools
- was in fvMotionSolver, but only requires PatchFunction1 capabilities
(from within meshTools).
GIT: relocate IOmapDistributePolyMesh (from dynamicMesh to OpenFOAM)
---
src/OpenFOAM/Make/files | 1 +
.../mapPolyMesh/mapDistribute}/IOmapDistributePolyMesh.C | 0
.../mapPolyMesh/mapDistribute}/IOmapDistributePolyMesh.H | 0
src/dynamicMesh/Make/files | 1 -
src/fvMotionSolver/Make/files | 2 --
src/meshTools/Make/files | 3 ++-
.../uniformFixedValue/uniformFixedValuePointPatchField.C | 0
.../uniformFixedValue/uniformFixedValuePointPatchField.H | 0
.../uniformFixedValue/uniformFixedValuePointPatchFields.C | 0
.../uniformFixedValue/uniformFixedValuePointPatchFields.H | 0
src/meshTools/fields/{ => volume}/polyGeoMesh.H | 0
src/meshTools/fields/{ => volume}/polyMeshFields.C | 0
src/meshTools/fields/{ => volume}/polyMeshFields.H | 0
src/meshTools/fields/{ => volume}/polyMeshFieldsFwd.H | 0
14 files changed, 3 insertions(+), 4 deletions(-)
rename src/{dynamicMesh/fvMeshDistribute => OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute}/IOmapDistributePolyMesh.C (100%)
rename src/{dynamicMesh/fvMeshDistribute => OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute}/IOmapDistributePolyMesh.H (100%)
rename src/{fvMotionSolver/pointPatchFields/derived => meshTools/fields/pointPatchFields}/uniformFixedValue/uniformFixedValuePointPatchField.C (100%)
rename src/{fvMotionSolver/pointPatchFields/derived => meshTools/fields/pointPatchFields}/uniformFixedValue/uniformFixedValuePointPatchField.H (100%)
rename src/{fvMotionSolver/pointPatchFields/derived => meshTools/fields/pointPatchFields}/uniformFixedValue/uniformFixedValuePointPatchFields.C (100%)
rename src/{fvMotionSolver/pointPatchFields/derived => meshTools/fields/pointPatchFields}/uniformFixedValue/uniformFixedValuePointPatchFields.H (100%)
rename src/meshTools/fields/{ => volume}/polyGeoMesh.H (100%)
rename src/meshTools/fields/{ => volume}/polyMeshFields.C (100%)
rename src/meshTools/fields/{ => volume}/polyMeshFields.H (100%)
rename src/meshTools/fields/{ => volume}/polyMeshFieldsFwd.H (100%)
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index d58a27f7ae3..edd6b51add4 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -666,6 +666,7 @@ $(mapPolyMesh)/mapDistribute/mapDistribute.C
$(mapPolyMesh)/mapDistribute/mapDistributeBase.C
$(mapPolyMesh)/mapDistribute/mapDistributePolyMesh.C
$(mapPolyMesh)/mapDistribute/IOmapDistribute.C
+$(mapPolyMesh)/mapDistribute/IOmapDistributePolyMesh.C
$(mapPolyMesh)/mapAddedPolyMesh.C
PrimitivePatch = $(primitiveMesh)/PrimitivePatch
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.C
similarity index 100%
rename from src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
rename to src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.C
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
similarity index 100%
rename from src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
rename to src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index eedcd7fe8c7..8a511222983 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -81,7 +81,6 @@ polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
fvMeshAdder/fvMeshAdder.C
fvMeshDistribute/fvMeshDistribute.C
-fvMeshDistribute/IOmapDistributePolyMesh.C
polyMeshAdder/faceCoupleInfo.C
polyMeshAdder/polyMeshAdder.C
diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files
index f9ba08367cc..426e49f6b6c 100644
--- a/src/fvMotionSolver/Make/files
+++ b/src/fvMotionSolver/Make/files
@@ -37,12 +37,10 @@ $(derivedPoint)/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorF
$(derivedPoint)/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
$(derivedPoint)/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
$(derivedPoint)/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
-$(derivedPoint)/uniformFixedValue/uniformFixedValuePointPatchFields.C
$(derivedPoint)/waveDisplacement/waveDisplacementPointPatchVectorField.C
$(derivedPoint)/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
$(derivedPoint)/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
-
LIB = $(FOAM_LIBBIN)/libfvMotionSolvers
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 449d275e07a..cb48fb872d7 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -81,7 +81,8 @@ meshSearch/meshSearch.C
meshSearch/meshSearchFACE_CENTRE_TRISMeshObject.C
meshSearch/meshSearchMeshObject.C
-fields/polyMeshFields.C
+fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
+fields/volume/polyMeshFields.C
meshTools/meshTools.C
algorithms = algorithms
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.C
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
similarity index 100%
rename from src/fvMotionSolver/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchFields.H
rename to src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
diff --git a/src/meshTools/fields/polyGeoMesh.H b/src/meshTools/fields/volume/polyGeoMesh.H
similarity index 100%
rename from src/meshTools/fields/polyGeoMesh.H
rename to src/meshTools/fields/volume/polyGeoMesh.H
diff --git a/src/meshTools/fields/polyMeshFields.C b/src/meshTools/fields/volume/polyMeshFields.C
similarity index 100%
rename from src/meshTools/fields/polyMeshFields.C
rename to src/meshTools/fields/volume/polyMeshFields.C
diff --git a/src/meshTools/fields/polyMeshFields.H b/src/meshTools/fields/volume/polyMeshFields.H
similarity index 100%
rename from src/meshTools/fields/polyMeshFields.H
rename to src/meshTools/fields/volume/polyMeshFields.H
diff --git a/src/meshTools/fields/polyMeshFieldsFwd.H b/src/meshTools/fields/volume/polyMeshFieldsFwd.H
similarity index 100%
rename from src/meshTools/fields/polyMeshFieldsFwd.H
rename to src/meshTools/fields/volume/polyMeshFieldsFwd.H
--
GitLab