mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
COMP: fix linkage on some libs and utils (general and mingw)
- remove finiteVolume dependency from libfaDecompose
This commit is contained in:
@ -10,6 +10,7 @@ EXE_LIBS = \
|
|||||||
-lfiniteVolume \
|
-lfiniteVolume \
|
||||||
-lfiniteArea \
|
-lfiniteArea \
|
||||||
-lfileFormats \
|
-lfileFormats \
|
||||||
|
-lmeshTools \
|
||||||
-lconversion \
|
-lconversion \
|
||||||
-llagrangianIntermediate \
|
-llagrangianIntermediate \
|
||||||
-lgenericPatchFields
|
-lgenericPatchFields
|
||||||
|
|||||||
@ -1,9 +1,7 @@
|
|||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
|
||||||
-I$(LIB_SRC)/finiteArea/lnInclude \
|
-I$(LIB_SRC)/finiteArea/lnInclude \
|
||||||
-I$(LIB_SRC)/meshTools/lnInclude \
|
-I$(LIB_SRC)/meshTools/lnInclude \
|
||||||
|
|
||||||
LIB_LIBS = \
|
LIB_LIBS = \
|
||||||
-lfiniteVolume \
|
|
||||||
-lfiniteArea \
|
-lfiniteArea \
|
||||||
-lmeshTools
|
-lmeshTools
|
||||||
|
|||||||
@ -56,7 +56,7 @@ void Foam::faMeshDecomposition::distributeFaces()
|
|||||||
time().caseName()/("processor" + Foam::name(procI))
|
time().caseName()/("processor" + Foam::name(procI))
|
||||||
);
|
);
|
||||||
|
|
||||||
fvMesh procMesh
|
polyMesh procMesh
|
||||||
(
|
(
|
||||||
IOobject
|
IOobject
|
||||||
(
|
(
|
||||||
@ -161,7 +161,7 @@ void Foam::faMeshDecomposition::distributeFaces()
|
|||||||
|
|
||||||
Foam::faMeshDecomposition::faMeshDecomposition
|
Foam::faMeshDecomposition::faMeshDecomposition
|
||||||
(
|
(
|
||||||
const fvMesh& mesh,
|
const polyMesh& mesh,
|
||||||
const label nProcessors,
|
const label nProcessors,
|
||||||
const dictionary& params
|
const dictionary& params
|
||||||
)
|
)
|
||||||
@ -266,7 +266,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
|
|||||||
time().caseName()/("processor" + Foam::name(procI))
|
time().caseName()/("processor" + Foam::name(procI))
|
||||||
);
|
);
|
||||||
|
|
||||||
fvMesh procFvMesh
|
polyMesh procFvMesh
|
||||||
(
|
(
|
||||||
IOobject
|
IOobject
|
||||||
(
|
(
|
||||||
@ -1058,8 +1058,8 @@ void Foam::faMeshDecomposition::decomposeMesh()
|
|||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
// read finite volume mesh
|
// Read volume mesh
|
||||||
fvMesh procFvMesh
|
polyMesh procFvMesh
|
||||||
(
|
(
|
||||||
IOobject
|
IOobject
|
||||||
(
|
(
|
||||||
@ -1176,8 +1176,8 @@ bool Foam::faMeshDecomposition::writeDecomposition()
|
|||||||
processorCasePath
|
processorCasePath
|
||||||
);
|
);
|
||||||
|
|
||||||
// read finite volume mesh
|
// Read volume mesh
|
||||||
fvMesh procFvMesh
|
polyMesh procFvMesh
|
||||||
(
|
(
|
||||||
IOobject
|
IOobject
|
||||||
(
|
(
|
||||||
|
|||||||
@ -42,7 +42,7 @@ SourceFiles
|
|||||||
#ifndef faMeshDecomposition_H
|
#ifndef faMeshDecomposition_H
|
||||||
#define faMeshDecomposition_H
|
#define faMeshDecomposition_H
|
||||||
|
|
||||||
#include "fvMesh.H"
|
#include "polyMesh.H"
|
||||||
#include "faMesh.H"
|
#include "faMesh.H"
|
||||||
#include "labelList.H"
|
#include "labelList.H"
|
||||||
#include "PtrList.H"
|
#include "PtrList.H"
|
||||||
@ -140,7 +140,7 @@ public:
|
|||||||
// \param params additional parameters, sent to updateParameters
|
// \param params additional parameters, sent to updateParameters
|
||||||
faMeshDecomposition
|
faMeshDecomposition
|
||||||
(
|
(
|
||||||
const fvMesh& mesh,
|
const polyMesh& mesh,
|
||||||
const label nProcessors,
|
const label nProcessors,
|
||||||
const dictionary& params = dictionary::null
|
const dictionary& params = dictionary::null
|
||||||
);
|
);
|
||||||
|
|||||||
@ -3,7 +3,7 @@ EXE_INC = \
|
|||||||
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
||||||
-I$(LIB_SRC)/meshTools/lnInclude
|
-I$(LIB_SRC)/meshTools/lnInclude
|
||||||
|
|
||||||
EXE_LIBS = \
|
LIB_LIBS = \
|
||||||
-lfiniteArea \
|
-lfiniteArea \
|
||||||
-lfiniteVolume \
|
-lfiniteVolume \
|
||||||
-lmeshTools
|
-lmeshTools
|
||||||
|
|||||||
@ -131,15 +131,15 @@ void Foam::processorFaMeshes::read()
|
|||||||
|
|
||||||
Foam::processorFaMeshes::processorFaMeshes
|
Foam::processorFaMeshes::processorFaMeshes
|
||||||
(
|
(
|
||||||
const PtrList<fvMesh>& processorFvMeshes
|
const UPtrList<fvMesh>& processorFvMeshes
|
||||||
)
|
)
|
||||||
:
|
:
|
||||||
fvMeshes_(processorFvMeshes),
|
fvMeshes_(processorFvMeshes),
|
||||||
meshes_(processorFvMeshes.size()),
|
meshes_(processorFvMeshes.size()),
|
||||||
pointProcAddressing_(processorFvMeshes.size()),
|
pointProcAddressing_(meshes_.size()),
|
||||||
edgeProcAddressing_(processorFvMeshes.size()),
|
edgeProcAddressing_(meshes_.size()),
|
||||||
faceProcAddressing_(processorFvMeshes.size()),
|
faceProcAddressing_(meshes_.size()),
|
||||||
boundaryProcAddressing_(processorFvMeshes.size())
|
boundaryProcAddressing_(meshes_.size())
|
||||||
{
|
{
|
||||||
read();
|
read();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,7 +60,7 @@ class processorFaMeshes
|
|||||||
// Private data
|
// Private data
|
||||||
|
|
||||||
//- List of processor finite volume meshes
|
//- List of processor finite volume meshes
|
||||||
const PtrList<fvMesh>& fvMeshes_;
|
const UPtrList<fvMesh>& fvMeshes_;
|
||||||
|
|
||||||
//- List of processor finite area meshes
|
//- List of processor finite area meshes
|
||||||
PtrList<faMesh> meshes_;
|
PtrList<faMesh> meshes_;
|
||||||
@ -95,7 +95,7 @@ public:
|
|||||||
// Constructors
|
// Constructors
|
||||||
|
|
||||||
//- Construct from components
|
//- Construct from components
|
||||||
processorFaMeshes(const PtrList<fvMesh>& processorFvMeshes);
|
explicit processorFaMeshes(const UPtrList<fvMesh>& processorFvMeshes);
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|||||||
Reference in New Issue
Block a user