Merge branch 'defect-release-v1.1' into release

.gitignore

+*.dep
+**/lnInclude/*
+**/Make/**/*

executables/cartesian2DMesh/cartesian2DMesh.C

@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "cartesian2DMeshGenerator.H"
 
 using namespace Foam;

executables/pMesh/pMesh.C

@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "voronoiMeshGenerator.H"
 
 using namespace Foam;

executables/tetMesh/tetMesh.C

@@ -30,7 +30,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "Time.H"
 #include "tetMeshGenerator.H"
 
 using namespace Foam;

meshLibrary/utilities/anisotropicMeshing/coordinateModification/boxScaling.C

@@ -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;
 

meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C

@@ -46,7 +46,7 @@ coordinateModification::coordinateModification()
 coordinateModification::coordinateModification
 (
     const word& name,
-    const dictionary& dict
+    const dictionary& /*dict*/
 )
 :
     name_(name)

meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H

@@ -39,7 +39,6 @@ SourceFiles
 #include "word.H"
 #include "point.H"
 #include "coordinateModificationList.H"
-#include "Time.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

meshLibrary/utilities/anisotropicMeshing/coordinateModification/planeScaling.C

@@ -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;
 

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C

@@ -686,7 +686,7 @@ void boundaryLayers::createNewPartitionVerticesParallel
 (
     const labelLongList& procPoints,
     const List<direction>& pVertices,
-    const boolList& treatPatches
+    const boolList& /*treatPatches*/
 )
 {
     if( !Pstream::parRun() )

meshLibrary/utilities/checkMeshDict/checkMeshDict.C

@@ -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*/
 )
 {
 

meshLibrary/utilities/containers/FRWGraph/FRWGraph.C

@@ -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;
 }
 

meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H

@@ -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];
 }
 

meshLibrary/utilities/containers/LongList/LongList.C

@@ -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)"

meshLibrary/utilities/containers/LongList/LongList.H

@@ -41,7 +41,6 @@ SourceFiles
 #define LongList_H
 
 #include "label.H"
-#include "longLong.H"
 #include "bool.H"
 #include "IOstreams.H"
 #include "error.H"

meshLibrary/utilities/containers/LongList/LongListI.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];
 }
 

meshLibrary/utilities/containers/VRWGraph/VRWGraph.C

@@ -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