COMP: various compilation changes

- label-size 64 build, compiler warnings, unused template argument,
  faMatrix::clone() method

STYLE: faScalarMatrix - moved info message to within a debug scope
This commit is contained in:
Andrew Heather
2017-11-14 08:41:20 +00:00
committed by Andrew Heather
parent 9ac1fa417b
commit a14eb71160
9 changed files with 27 additions and 8 deletions

View File

@ -218,7 +218,7 @@ int main(int argc, char *argv[])
{ {
label curMeshEdge = meshEdges[edgeI]; label curMeshEdge = meshEdges[edgeI];
labelList curEdgePatchIDs(2, -1); labelList curEdgePatchIDs(2, label(-1));
label patchI = -1; label patchI = -1;

View File

@ -551,7 +551,7 @@ void faMeshDecomposition::decomposeMesh()
const label patchStart = patches[patchI].start(); const label patchStart = patches[patchI].start();
// if (typeid(patches[patchI]) != typeid(cyclicFaPatch)) // if (!isA<cyclicFaPatch>(patches[patchI]))
if (true) if (true)
{ {
// Normal patch. Add edges to processor where the face // Normal patch. Add edges to processor where the face

View File

@ -253,7 +253,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
// add empty patches // add empty patches
if if
( (
typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch) isA<emptyFaPatch>(mesh_.boundary()[patchI])
&& !patchFields(patchI) && !patchFields(patchI)
) )
{ {
@ -533,7 +533,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
// add empty patches // add empty patches
if if
( (
typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch) isA<emptyFaPatch>(mesh_.boundary()[patchI])
&& !patchFields(patchI) && !patchFields(patchI)
) )
{ {

View File

@ -301,6 +301,19 @@ Foam::faMatrix<Type>::faMatrix
} }
template<class Type>
Foam::tmp<Foam::faMatrix<Type>> Foam::faMatrix<Type>::clone() const
{
return tmp<faMatrix<Type>>
(
new faMatrix<Type>(*this)
);
}
// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * * //
template<class Type> template<class Type>
Foam::faMatrix<Type>::~faMatrix() Foam::faMatrix<Type>::~faMatrix()
{ {

View File

@ -207,6 +207,9 @@ public:
Istream& Istream&
); );
//- Clone
tmp<faMatrix<Type>> clone() const;
//- Destructor //- Destructor
virtual ~faMatrix(); virtual ~faMatrix();

View File

@ -80,7 +80,10 @@ Foam::solverPerformance Foam::faMatrix<Foam::scalar>::solve
solverControls solverControls
)->solve(psi.ref(), totalSource); )->solve(psi.ref(), totalSource);
if (solverPerformance::debug)
{
solverPerf.print(Info); solverPerf.print(Info);
}
diag() = saveDiag; diag() = saveDiag;

View File

@ -493,7 +493,7 @@ Foam::faMesh::faMesh
{ {
label curMeshEdge = meshEdges[edgeI]; label curMeshEdge = meshEdges[edgeI];
labelList curEdgePatchIDs(2, -1); labelList curEdgePatchIDs(2, label(-1));
label patchI = -1; label patchI = -1;

View File

@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<template<class> class PatchField, class Type> template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::volSurfaceMapping::mapToSurface Foam::tmp<Foam::Field<Type>> Foam::volSurfaceMapping::mapToSurface
( (
const typename GeometricField<Type, fvPatchField, volMesh>::Boundary& df const typename GeometricField<Type, fvPatchField, volMesh>::Boundary& df

View File

@ -90,7 +90,7 @@ public:
// Member Functions // Member Functions
//- Map droplet cloud sources to surface //- Map droplet cloud sources to surface
template<template<class> class PatchField, class Type> template<class Type>
tmp<Field<Type>> mapToSurface tmp<Field<Type>> mapToSurface
( (
const typename const typename