polyMesh: Subdirectory for mesh objects

Poly-mesh mesh objects are now in a subdirectory of the polyMesh
directory. The cpuLoad object has been made a polyMesh object, rather
than an fvMesh object, in order to remove the dependence on the finite
volume library. This has, in turn, removed the base lagrangian library's
dependence on finite volume.

src/OpenFOAM/Make/files

@@ -537,6 +537,9 @@ $(polyMesh)/polyMeshInitMesh.C
 $(polyMesh)/polyMeshClear.C
 $(polyMesh)/polyMeshUpdate.C
 
+$(polyMesh)/meshObjects/Residuals/residuals.C
+$(polyMesh)/meshObjects/cpuLoad/cpuLoad.C
+
 primitiveMesh = meshes/primitiveMesh
 $(primitiveMesh)/primitiveMesh.C
 $(primitiveMesh)/primitiveMeshCellCells.C
@@ -720,8 +723,6 @@ algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
 algorithms/polygonTriangulate/polygonTriangulate.C
 algorithms/solutionControl/solutionControl.C
 
-meshes/Residuals/residuals.C
-
 distributions/distribution/distribution.C
 distributions/distribution/distributionNew.C
 distributions/unintegrable/unintegrable.C

src/OpenFOAM/meshes/polyMesh/meshObjects/Residuals/Residuals.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/meshes/polyMesh/meshObjects/Residuals/Residuals.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/meshes/polyMesh/meshObjects/Residuals/residuals.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/meshes/polyMesh/meshObjects/cpuLoad/cpuLoad.C

@@ -40,9 +40,9 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cpuLoad::cpuLoad( const word& name, const fvMesh& mesh)
+Foam::cpuLoad::cpuLoad(const word& name, const polyMesh& mesh)
 :
-    DemandDrivenMeshObject<fvMesh, TopoChangeableMeshObject, cpuLoad>
+    DemandDrivenMeshObject<polyMesh, TopoChangeableMeshObject, cpuLoad>
     (
         name,
         mesh
@@ -62,7 +62,7 @@ Foam::cpuLoad::~cpuLoad()
 Foam::optionalCpuLoad& Foam::optionalCpuLoad::New
 (
     const word& name,
-    const fvMesh& mesh,
+    const polyMesh& mesh,
     const bool loadBalancing
 )
 {
@@ -70,7 +70,7 @@ Foam::optionalCpuLoad& Foam::optionalCpuLoad::New
     {
         return DemandDrivenMeshObject
         <
-            fvMesh,
+            polyMesh,
             TopoChangeableMeshObject,
             cpuLoad
         >::New(name, mesh);
@@ -82,24 +82,6 @@ Foam::optionalCpuLoad& Foam::optionalCpuLoad::New
 }
 
 
-Foam::optionalCpuLoad& Foam::optionalCpuLoad::New
-(
-    const word& name,
-    const polyMesh& mesh,
-    const bool loadBalancing
-)
-{
-    if (loadBalancing && isA<fvMesh>(mesh))
-    {
-        return New(name, refCast<const fvMesh>(mesh), loadBalancing);
-    }
-    else
-    {
-        return optionalCpuLoad::optionalCpuLoad_;
-    }
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::cpuLoad::resetCpuTime()

src/OpenFOAM/meshes/polyMesh/meshObjects/cpuLoad/cpuLoad.H

@@ -43,8 +43,9 @@ SourceFiles
 #ifndef cpuLoad_H
 #define cpuLoad_H
 
+#include "cpuTime.H"
 #include "scalarField.H"
-#include "fvMesh.H"
+#include "polyMesh.H"
 #include "DemandDrivenMeshObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -79,17 +80,9 @@ public:
 
     // Selectors
 
-        //- Construct from fvMesh if loadBalancing is true
-        // otherwise return the dummy optionalCpuLoad
-        static optionalCpuLoad& New
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const bool loadBalancing
-        );
 
-        //- Construct from polyMesh if it is an fvMesh and loadBalancing is true
-        // otherwise return the dummy optionalCpuLoad
+        //- Construct from polyMesh if loadBalancing is true
+        //  otherwise return the dummy optionalCpuLoad
         static optionalCpuLoad& New
         (
             const word& name,
@@ -132,7 +125,7 @@ public:
 class cpuLoad
 :
     public optionalCpuLoad,
-    public DemandDrivenMeshObject<fvMesh, TopoChangeableMeshObject, cpuLoad>,
+    public DemandDrivenMeshObject<polyMesh, TopoChangeableMeshObject, cpuLoad>,
     public scalarField
 {
     // Private Data
@@ -152,7 +145,7 @@ public:
         cpuLoad
         (
             const word& name,
-            const fvMesh& mesh
+            const polyMesh& mesh
         );
 
         //- Disallow default bitwise copy construction

src/finiteVolume/Make/files

@@ -115,7 +115,6 @@ fvMeshDistributors = fvMesh/fvMeshDistributors
 $(fvMeshDistributors)/fvMeshDistributor/fvMeshDistributor.C
 $(fvMeshDistributors)/fvMeshDistributor/fvMeshDistributorNew.C
 $(fvMeshDistributors)/none/fvMeshDistributorsNone.C
-$(fvMeshDistributors)/cpuLoad/cpuLoad.C
 
 fvMeshMovers = fvMesh/fvMeshMovers
 

src/lagrangian/basic/Make/options

@@ -1,6 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -lmeshTools