From 9f26e6738fbf8c37a4dd6a9e3dd203fcee9dfd5b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 31 May 2021 20:54:22 +0200 Subject: [PATCH] COMP: fix linkage on some libs and utils (general and mingw) - remove finiteVolume dependency from libfaDecompose --- .../dataConversion/foamToEnsight/Make/options | 1 + src/parallel/decompose/faDecompose/Make/options | 2 -- .../decompose/faDecompose/faMeshDecomposition.C | 14 +++++++------- .../decompose/faDecompose/faMeshDecomposition.H | 4 ++-- .../reconstruct/faReconstruct/Make/options | 2 +- .../reconstruct/faReconstruct/processorFaMeshes.C | 10 +++++----- .../reconstruct/faReconstruct/processorFaMeshes.H | 4 ++-- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options index 5014ceacb3..7fd9abdcb7 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options @@ -10,6 +10,7 @@ EXE_LIBS = \ -lfiniteVolume \ -lfiniteArea \ -lfileFormats \ + -lmeshTools \ -lconversion \ -llagrangianIntermediate \ -lgenericPatchFields diff --git a/src/parallel/decompose/faDecompose/Make/options b/src/parallel/decompose/faDecompose/Make/options index b5d6f595dc..c35fa0cada 100644 --- a/src/parallel/decompose/faDecompose/Make/options +++ b/src/parallel/decompose/faDecompose/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteArea/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ - -lfiniteVolume \ -lfiniteArea \ -lmeshTools diff --git a/src/parallel/decompose/faDecompose/faMeshDecomposition.C b/src/parallel/decompose/faDecompose/faMeshDecomposition.C index aecad1c65e..9db060abcb 100644 --- a/src/parallel/decompose/faDecompose/faMeshDecomposition.C +++ b/src/parallel/decompose/faDecompose/faMeshDecomposition.C @@ -56,7 +56,7 @@ void Foam::faMeshDecomposition::distributeFaces() time().caseName()/("processor" + Foam::name(procI)) ); - fvMesh procMesh + polyMesh procMesh ( IOobject ( @@ -161,7 +161,7 @@ void Foam::faMeshDecomposition::distributeFaces() Foam::faMeshDecomposition::faMeshDecomposition ( - const fvMesh& mesh, + const polyMesh& mesh, const label nProcessors, const dictionary& params ) @@ -266,7 +266,7 @@ void Foam::faMeshDecomposition::decomposeMesh() time().caseName()/("processor" + Foam::name(procI)) ); - fvMesh procFvMesh + polyMesh procFvMesh ( IOobject ( @@ -1058,8 +1058,8 @@ void Foam::faMeshDecomposition::decomposeMesh() ); - // read finite volume mesh - fvMesh procFvMesh + // Read volume mesh + polyMesh procFvMesh ( IOobject ( @@ -1176,8 +1176,8 @@ bool Foam::faMeshDecomposition::writeDecomposition() processorCasePath ); - // read finite volume mesh - fvMesh procFvMesh + // Read volume mesh + polyMesh procFvMesh ( IOobject ( diff --git a/src/parallel/decompose/faDecompose/faMeshDecomposition.H b/src/parallel/decompose/faDecompose/faMeshDecomposition.H index 44a5323353..7642801d86 100644 --- a/src/parallel/decompose/faDecompose/faMeshDecomposition.H +++ b/src/parallel/decompose/faDecompose/faMeshDecomposition.H @@ -42,7 +42,7 @@ SourceFiles #ifndef faMeshDecomposition_H #define faMeshDecomposition_H -#include "fvMesh.H" +#include "polyMesh.H" #include "faMesh.H" #include "labelList.H" #include "PtrList.H" @@ -140,7 +140,7 @@ public: // \param params additional parameters, sent to updateParameters faMeshDecomposition ( - const fvMesh& mesh, + const polyMesh& mesh, const label nProcessors, const dictionary& params = dictionary::null ); diff --git a/src/parallel/reconstruct/faReconstruct/Make/options b/src/parallel/reconstruct/faReconstruct/Make/options index 2526f4eb0e..3cf15e6a84 100644 --- a/src/parallel/reconstruct/faReconstruct/Make/options +++ b/src/parallel/reconstruct/faReconstruct/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude -EXE_LIBS = \ +LIB_LIBS = \ -lfiniteArea \ -lfiniteVolume \ -lmeshTools diff --git a/src/parallel/reconstruct/faReconstruct/processorFaMeshes.C b/src/parallel/reconstruct/faReconstruct/processorFaMeshes.C index 645a166900..eb6201fa4d 100644 --- a/src/parallel/reconstruct/faReconstruct/processorFaMeshes.C +++ b/src/parallel/reconstruct/faReconstruct/processorFaMeshes.C @@ -131,15 +131,15 @@ void Foam::processorFaMeshes::read() Foam::processorFaMeshes::processorFaMeshes ( - const PtrList& processorFvMeshes + const UPtrList& processorFvMeshes ) : fvMeshes_(processorFvMeshes), meshes_(processorFvMeshes.size()), - pointProcAddressing_(processorFvMeshes.size()), - edgeProcAddressing_(processorFvMeshes.size()), - faceProcAddressing_(processorFvMeshes.size()), - boundaryProcAddressing_(processorFvMeshes.size()) + pointProcAddressing_(meshes_.size()), + edgeProcAddressing_(meshes_.size()), + faceProcAddressing_(meshes_.size()), + boundaryProcAddressing_(meshes_.size()) { read(); } diff --git a/src/parallel/reconstruct/faReconstruct/processorFaMeshes.H b/src/parallel/reconstruct/faReconstruct/processorFaMeshes.H index 342beb8375..e6dd39adff 100644 --- a/src/parallel/reconstruct/faReconstruct/processorFaMeshes.H +++ b/src/parallel/reconstruct/faReconstruct/processorFaMeshes.H @@ -60,7 +60,7 @@ class processorFaMeshes // Private data //- List of processor finite volume meshes - const PtrList& fvMeshes_; + const UPtrList& fvMeshes_; //- List of processor finite area meshes PtrList meshes_; @@ -95,7 +95,7 @@ public: // Constructors //- Construct from components - processorFaMeshes(const PtrList& processorFvMeshes); + explicit processorFaMeshes(const UPtrList& processorFvMeshes); // Member Functions