Commit a6640eb0 authored by Franjo's avatar Franjo

Merge branch 'release'

parents bbb5defd 5c5c423d
*.dep
*lnInclude*
*linux*
cfMesh.*
**/lnInclude/*
**/Make/**/*
......@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "Time.H"
#include "cartesian2DMeshGenerator.H"
using namespace Foam;
......
......@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "Time.H"
#include "voronoiMeshGenerator.H"
using namespace Foam;
......
......@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "Time.H"
#include "tetMeshGenerator.H"
using namespace Foam;
......
......@@ -176,7 +176,7 @@ void boxScaling::boundingPlanes(PtrList<plane>&pl) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionary boxScaling::dict(bool ignoreType) const
dictionary boxScaling::dict(bool /*ignoreType*/) const
{
dictionary dict;
......
......@@ -46,7 +46,7 @@ coordinateModification::coordinateModification()
coordinateModification::coordinateModification
(
const word& name,
const dictionary& dict
const dictionary& /*dict*/
)
:
name_(name)
......
......@@ -39,7 +39,6 @@ SourceFiles
#include "word.H"
#include "point.H"
#include "coordinateModificationList.H"
#include "Time.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -153,7 +153,7 @@ void planeScaling::boundingPlanes(PtrList<plane>& pl) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionary planeScaling::dict(bool ignoreType) const
dictionary planeScaling::dict(bool /*ignoreType*/) const
{
dictionary dict;
......
......@@ -686,7 +686,7 @@ void boundaryLayers::createNewPartitionVerticesParallel
(
const labelLongList& procPoints,
const List<direction>& pVertices,
const boolList& treatPatches
const boolList& /*treatPatches*/
)
{
if( !Pstream::parRun() )
......
......@@ -860,7 +860,7 @@ void checkMeshDict::updatePatchCellSize
void checkMeshDict::updateSubsetCellSize
(
const std::map<word, wordList>& patchesFromPatch
const std::map<word, wordList>& /*patchesFromPatch*/
)
{
......@@ -1028,7 +1028,7 @@ void checkMeshDict::updateRemoveCellsIntersectingPatches
void checkMeshDict::updateObjectRefinements
(
const std::map<word, wordList>& patchesFromPatch
const std::map<word, wordList>& /*patchesFromPatch*/
)
{
......
......@@ -34,15 +34,34 @@ Foam::Ostream& Foam::operator<<
const Foam::FRWGraph<T, width>& DL
)
{
os << DL.size() << "(" << endl;
for(register label i=0;i<DL.size();++i)
os << DL.size() << "(" << nl;
for(label i=0;i<DL.size();++i)
{
os << width << "(";
for(label j=0;j<width;++j)
os << DL(i, j) << " " << endl;
os << ")" << endl;
{
if( j )
{
os << " ";
}
os << DL(i, j);
}
os << ")" << nl;
}
os << ")";
// Check state of IOstream
os.check
(
"template<class T, Foam::label width>Foam::Ostream& Foam::operator<<"
"(Foam::Ostream& os, const Foam::FRWGraph<T, width>&)"
);
return os;
}
......
......@@ -36,7 +36,7 @@ void Foam::FRWGraph<T, width>::checkIndex(const label i, const label j) const
<< " is not in range " << 0
<< " and " << nRows_ << abort(FatalError);
}
if( (j < 0) || (j >= width) )
FatalErrorIn
(
......@@ -105,7 +105,7 @@ inline Foam::label Foam::FRWGraph<T,width>::size() const
}
template<class T, Foam::label width>
inline Foam::label Foam::FRWGraph<T,width>::sizeOfRow(const label rowI) const
inline Foam::label Foam::FRWGraph<T,width>::sizeOfRow(const label) const
{
return width;
}
......@@ -155,10 +155,11 @@ inline bool Foam::FRWGraph<T,width>::contains
) const
{
const label start = rowI * width;
for(register label i=0;i<width;++i)
for(label i=0;i<width;++i)
if( data_[start+i] == e )
return true;
return false;
}
......@@ -170,10 +171,11 @@ inline Foam::label Foam::FRWGraph<T,width>::containsAtPosition
) const
{
const label start = rowI * width;
for(register label i=0;i<width;++i)
for(label i=0;i<width;++i)
if( data_[start+i] == e )
return i;
return -1;
}
......@@ -188,7 +190,7 @@ inline const T& Foam::FRWGraph<T,width>::operator()
#ifdef FULLDEBUG
checkIndex(i, j);
#endif
return data_[i * width + j];
}
......@@ -201,7 +203,7 @@ inline T& Foam::FRWGraph<T,width>::operator()
#ifdef FULLDEBUG
checkIndex(i, j);
#endif
return data_[i * width + j];
}
......
......@@ -202,7 +202,7 @@ Foam::Istream& Foam::operator>>
if( listDelimiter == token::BEGIN_LIST )
{
for(register label i=0;i<size;++i)
for(label i=0;i<size;++i)
{
is >> DL[i];
......@@ -223,7 +223,7 @@ Foam::Istream& Foam::operator>>
"reading the single entry"
);
for(register label i=0;i<size;++i)
for(label i=0;i<size;++i)
{
DL[i] = element;
}
......@@ -306,7 +306,7 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
if( listDelimiter == token::BEGIN_LIST )
{
for(register label i=0;i<size;++i)
for(label i=0;i<size;++i)
{
is >> this->operator[](origSize);
++origSize;
......@@ -328,7 +328,7 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
"reading the single entry"
);
for(register label i=0;i<size;++i)
for(label i=0;i<size;++i)
{
this->operator[](origSize) = element;
++origSize;
......@@ -346,31 +346,6 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
forAll(buf, i)
this->operator[](origSize++) = buf[i];
/*const label blockSize = 1<<shift_;
Info << "nextFree_ " << nextFree_ << endl;
//- append elements by reading binary block
while( origSize < nextFree_ )
{
const label currBlock = origSize >> shift_;
const label currPos = origSize & mask_;
Info << "Orig size " << origSize
<< nl << "currBlock " << currBlock
<< nl << "currPos " << currPos << endl;
T* data = &dataPtr_[currBlock][currPos];
label bs = Foam::min(nextFree_-origSize, blockSize);
bs = Foam::min(blockSize - currPos, bs);
Info << "bs " << bs << endl;
is.read(reinterpret_cast<char*>(data), bs * sizeof(T));
origSize += bs;
} */
is.fatalCheck
(
"appendFromStream(Istream& is)"
......
......@@ -41,7 +41,6 @@ SourceFiles
#define LongList_H
#include "label.H"
#include "longLong.H"
#include "bool.H"
#include "IOstreams.H"
#include "error.H"
......
......@@ -78,7 +78,7 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
if( numblock1 < numBlocks_ )
{
for(register label i=numblock1;i<numBlocks_;++i)
for(label i=numblock1;i<numBlocks_;++i)
delete [] dataPtr_[i];
}
else if( numblock1 > numBlocks_ )
......@@ -91,7 +91,8 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
} while( numblock1 > numAllocatedBlocks_ );
T** dataptr1 = new T*[numAllocatedBlocks_];
for(register label i=0;i<numBlocks_;++i)
for(label i=0;i<numBlocks_;++i)
dataptr1[i] = dataPtr_[i];
if( dataPtr_ )
......@@ -99,7 +100,7 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
dataPtr_ = dataptr1;
}
for(register label i=numBlocks_;i<numblock1;++i)
for(label i=numBlocks_;i<numblock1;++i)
dataPtr_[i] = new T[blockSize];
}
......@@ -110,7 +111,7 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
template<class T, Foam::label Offset>
void Foam::LongList<T, Offset>::clearOut()
{
for(register label i=0;i<numBlocks_;++i)
for(label i=0;i<numBlocks_;++i)
delete [] dataPtr_[i];
if( dataPtr_ )
......@@ -281,7 +282,7 @@ inline void Foam::LongList<T, Offset>::appendIfNotIn(const T& e)
template<class T, Foam::label Offset>
inline bool Foam::LongList<T, Offset>::contains(const T& e) const
{
for(register label i=0;i<nextFree_;++i)
for(label i=0;i<nextFree_;++i)
if( (*this)[i] == e )
return true;
......@@ -294,7 +295,7 @@ inline Foam::label Foam::LongList<T, Offset>::containsAtPosition
const T& e
) const
{
for(register label i=0;i<nextFree_;++i)
for(label i=0;i<nextFree_;++i)
if( (*this)[i] == e )
return i;
......@@ -376,7 +377,7 @@ inline T& Foam::LongList<T, Offset>::newElmt(const label i)
template<class T, Foam::label Offset>
inline void Foam::LongList<T, Offset>::operator=(const T& t)
{
for(register label i=0;i<nextFree_;++i)
for(label i=0;i<nextFree_;++i)
operator[](i) = t;
}
......@@ -384,7 +385,8 @@ template<class T, Foam::label Offset>
inline void Foam::LongList<T, Offset>::operator=(const LongList<T, Offset>& l)
{
setSize(l.size());
for(register label i=0;i<l.nextFree_;++i)
for(label i=0;i<l.nextFree_;++i)
operator[](i) = l[i];
}
......
......@@ -35,22 +35,29 @@ Foam::Ostream& Foam::operator<<
const Foam::VRWGraph& DL
)
{
os << DL.size() << nl << token::BEGIN_LIST;
for(register label i=0;i<DL.size();++i)
os << DL.size() << nl << token::BEGIN_LIST << nl;
for(label i=0;i<DL.size();++i)
{
os << nl << DL.sizeOfRow(i) << token::BEGIN_LIST;
os << DL.sizeOfRow(i) << token::BEGIN_LIST;
for(label j=0;j<DL.sizeOfRow(i);++j)
{
if( j > 0 ) os << token::SPACE;
if( j ) os << token::SPACE;
os << DL(i, j);
}
os << token::END_LIST;
os << token::END_LIST << nl;
}
os << nl << token::END_LIST;
os << token::END_LIST;
// Check state of IOstream
os.check
(
"Foam::Ostream& Foam::operator<<(Foam::Ostream&, const Foam::VRWGraph&)"
);
return os;
}
......@@ -90,14 +97,14 @@ void Foam::VRWGraph::optimizeMemoryUsage()
{
newPosForNode[elI] = -1;
}
//- create new data
for(label elI=0;elI<nElements;++elI)
if( (newPosForNode[elI] != -1) && (newPosForNode[elI] < elI) )
data_[newPosForNode[elI]] = data_[elI];
data_.setSize(pos);
//- renumber rows
nElements = rows_.size();
for(label rowI=0;rowI<nElements;++rowI)
......
......@@ -518,7 +518,7 @@ inline bool Foam::VRWGraph::contains
return false;
const label size = rows_[rowI].size();
for(register label i=0;i<size;++i)
for(label i=0;i<size;++i)
if( data_[start+i] == e )
return true;
......@@ -536,7 +536,8 @@ inline Foam::label Foam::VRWGraph::containsAtPosition
return -1;
const label size = rows_[rowI].size();
for(register label i=0;i<size;++i)
for(label i=0;i<size;++i)
if( data_[start+i] == e )
return i;
......
......@@ -36,13 +36,21 @@ Foam::Ostream& Foam::operator<<
)
{
os << DL.size() << nl << token::BEGIN_LIST;
for(register label i=0;i<DL.size();++i)
for(label i=0;i<DL.size();++i)
{
os << nl << DL[i];
}
os << nl << token::END_LIST;
// Check state of IOstream
os.check
(
"Foam::Ostream& Foam::operator<<"
"(Foam::Ostream&, const Foam::VRWGraphList&)"
);
return os;
}
......
......@@ -162,7 +162,7 @@ void decomposeCells::createPointsAndCellFaces(const boolList& decomposeCell)
}
}
void decomposeCells::storeBoundaryFaces(const boolList& decomposeCell)
void decomposeCells::storeBoundaryFaces(const boolList& /*decomposeCell*/)
{
meshSurfaceEngine mse(mesh_);
const faceList::subList& bFaces = mse.boundaryFaces();
......
......@@ -127,9 +127,9 @@ void decomposeCells::findAddressingForCell
label decomposeCells::findTopVertex
(
const label cellI,
const DynList<label, 32>& vrt,
const DynList<edge, 64>& edges,
const DynList<DynList<label, 2>, 64>& edgeFaces
const DynList<label, 32>& /*vrt*/,
const DynList<edge, 64>& /*edges*/,
const DynList<DynList<label, 2>, 64>& /*edgeFaces*/
)
{
const cell& c = mesh_.cells()[cellI];
......
......@@ -370,7 +370,7 @@ void decomposeFaces::decomposeConcaveInternalFaces
# endif
//- decompose internal faces
for(register label faceI=0;faceI<nIntFaces;++faceI)
for(label faceI=0;faceI<nIntFaces;++faceI)
{
const face& f = faces[faceI];
......
......@@ -87,7 +87,7 @@ public:
return pts_[i];
}
inline bool operator !=(const parPartTet& ptf) const
inline bool operator !=(const parPartTet& /*ptf*/) const
{
Serr << "Not implemented" << endl;
::exit(1);
......
......@@ -99,12 +99,10 @@ class parTriFace
// Member operators
inline bool operator !=(const parTriFace& ptf) const
inline bool operator !=(const parTriFace& /*ptf*/) const
{
Serr << "parTriFace::operator!= Not implemented" << endl;
::exit(1);
return true;
}
// Friend operators
......
......@@ -46,8 +46,8 @@ namespace Foam
void partTetMesh::createParallelAddressing
(
const labelLongList& nodeLabelForPoint,
const labelLongList& nodeLabelForFace,
const labelLongList& nodeLabelForCell
const labelLongList& /*nodeLabelForFace*/,
const labelLongList& /*nodeLabelForCell*/
)
{
//- vertices marked as SMOOTH and BOUNDARY are used by the smoother
......
......@@ -47,7 +47,7 @@ namespace Foam
void partTriMesh::createParallelAddressing
(
const labelList& nodeLabelForPoint,
const labelList& nodeLabelForFace
const labelList& /*nodeLabelForFace*/
)
{
const meshSurfaceEngine& mse = mPart_.surfaceEngine();
......
......@@ -90,7 +90,7 @@ void processorBoundaryPatch::write(Ostream& os) const
this->operator<<(os);
}
void processorBoundaryPatch::writeDict(Ostream& os) const
void processorBoundaryPatch::writeDict(Ostream& /*os*/) const
{
}
......
......@@ -367,7 +367,7 @@ bool checkFaceAreas
const boolList* changedFacePtr
)
{
const scalarField magFaceAreas = mag(mesh.addressingData().faceAreas());
const vectorField& faceAreas = mesh.addressingData().faceAreas();
const labelList& own = mesh.owner();
const labelList& nei = mesh.neighbour();
......@@ -384,12 +384,14 @@ bool checkFaceAreas
# ifdef USE_OMP
# pragma omp for schedule(guided)
# endif
forAll(magFaceAreas, faceI)
forAll(faceAreas, faceI)
{
if( changedFacePtr && !changedFacePtr->operator[](faceI) )
continue;
if( magFaceAreas[faceI] < minFaceArea )
const scalar magFaceArea = mag(faceAreas[faceI]);
if( magFaceArea < minFaceArea )
{
if( report )
{
......@@ -399,14 +401,14 @@ bool checkFaceAreas
<< "internal face " << faceI << " between cells "
<< own[faceI] << " and " << nei[faceI]
<< ". Face area magnitude = "
<< magFaceAreas[faceI] << endl;
<< magFaceArea << endl;
}
else
{
Pout<< "Zero or negative face area detected for "
<< "boundary face " << faceI << " next to cell "
<< own[faceI] << ". Face area magnitude = "
<< magFaceAreas[faceI] << endl;
<< magFaceArea << endl;
}
}
......@@ -419,8 +421,8 @@ bool checkFaceAreas
}
}
localMinArea = Foam::min(localMinArea, magFaceAreas[faceI]);
localMaxArea = Foam::max(localMaxArea, magFaceAreas[faceI]);
localMinArea = Foam::min(localMinArea, magFaceArea);
localMaxArea = Foam::max(localMaxArea, magFaceArea);
}
# ifdef USE_OMP
......@@ -1604,10 +1606,10 @@ void checkVolumeUniformity
bool checkVolumeUniformity
(