From 0537b5ff9710d3d28397645145237413b01d0f4b Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Sun, 7 Nov 2010 06:15:27 +0000
Subject: [PATCH] Bug fixes and Apple Mac OS X porting

---
 .../starToFoam/createCoupleMatches.C          |  6 ++---
 .../POSIX/multiThreader/threadHandlerI.H      |  3 +--
 src/OpenFOAM/Make/files                       | 14 +++++------
 .../containers/LinkedLists/user/SLList.H      |  2 +-
 .../containers/Lists/FixedList/FixedList.H    |  3 ++-
 .../containers/Lists/FixedList/FixedListI.H   |  2 +-
 .../Lists/ListOps/ListOpsTemplates.C          |  1 +
 .../BlockLduMatrix/BlockLduMatrix.H           | 25 +++++++++++--------
 .../BlockLduSolver/BlockLduSolver.H           |  6 +++--
 .../Segregated/SegregatedSolver.C             |  6 ++---
 .../Segregated/segregatedSolvers.C            |  4 +--
 .../cyclicGAMGInterface/cyclicGAMGInterface.C |  8 ++++--
 .../ggiGAMGInterface/ggiGAMGInterface.C       | 20 +++++++++------
 .../processorGAMGInterface.C                  |  8 ++++--
 src/OpenFOAM/meshes/meshShapes/edge/edge.H    |  5 ++++
 src/OpenFOAM/meshes/meshShapes/edge/edgeI.H   |  5 +++-
 .../dynamicTopoFvMesh/dynamicTopoFvMesh.C     |  4 ---
 .../dynamicTopoFvMeshMapping.C                |  2 +-
 .../dynamicTopoFvMesh/edgeCollapse.C          |  2 +-
 19 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
index 25ef9eee2..dab1b4d55 100644
--- a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
@@ -124,7 +124,7 @@ void starMesh::createCoupleMatches()
                 cellRemovedFaces.insert
                 (
                     fp.masterCell(),
-                    fp.masterFace()
+                    SLList<label>(fp.masterFace())
                 );
             }
             else
@@ -1363,7 +1363,7 @@ void starMesh::createCoupleMatches()
                 cellRemovedFaces.insert
                 (
                     fp.masterCell(),
-                    fp.masterFace()
+                    SLList<label>(fp.masterFace())
                 );
             }
             else
@@ -1379,7 +1379,7 @@ void starMesh::createCoupleMatches()
                 cellRemovedFaces.insert
                 (
                     fp.slaveCell(),
-                    fp.slaveFace()
+                    SLList<label>(fp.slaveFace())
                 );
             }
             else
diff --git a/src/OSspecific/POSIX/multiThreader/threadHandlerI.H b/src/OSspecific/POSIX/multiThreader/threadHandlerI.H
index f4b6f6e66..972637dbf 100644
--- a/src/OSspecific/POSIX/multiThreader/threadHandlerI.H
+++ b/src/OSspecific/POSIX/multiThreader/threadHandlerI.H
@@ -43,8 +43,7 @@ threadHandler<T>::threadHandler
     threader_(threader),
     argList_(0),
     nThreads_(threader.getNumThreads()),
-    pthreadID_(0),//HJ, bug fix - please review (-1 not allowed)
-//     pthreadID_(-1),
+    pthreadID_(pthread_self()),
     master_(false),
     predicate_(false)
 {}
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index e7a0c264a..42af27cc5 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -578,8 +578,6 @@ $(writers)/gnuplotGraph/gnuplotGraph.C
 $(writers)/xmgrGraph/xmgrGraph.C
 $(writers)/jplotGraph/jplotGraph.C
 
-//- Block Matrix Additions
-//- I. Clifford 03-12-2009
 primitives/BlockCoeff/blockCoeffBase.C
 primitives/BlockCoeff/scalarBlockCoeff.C
 primitives/BlockCoeff/sphericalTensorBlockCoeff.C
@@ -589,14 +587,14 @@ primitives/BlockCoeff/tensorBlockCoeff.C
 fields/expandContract/expandTensorField.C
 
 fields/CoeffField/scalarCoeffField.C
-// fields/CoeffField/sphericalTensorCoeffField.C
-// fields/CoeffField/symmTensorCoeffField.C
+fields/CoeffField/sphericalTensorCoeffField.C
+fields/CoeffField/symmTensorCoeffField.C
 fields/CoeffField/tensorCoeffField.C
 
 matrices/blockLduMatrix/BlockLduMatrix/blockLduMatrices.C
 matrices/blockLduMatrix/BlockLduMatrix/scalarBlockLduMatrix.C
-// matrices/blockLduMatrix/BlockLduMatrix/sphericalTensorBlockLduMatrix.C
-// matrices/blockLduMatrix/BlockLduMatrix/symmTensorBlockLduMatrix.C
+matrices/blockLduMatrix/BlockLduMatrix/sphericalTensorBlockLduMatrix.C
+matrices/blockLduMatrix/BlockLduMatrix/symmTensorBlockLduMatrix.C
 matrices/blockLduMatrix/BlockLduMatrix/tensorBlockLduMatrix.C
 matrices/blockLduMatrix/BlockLduMatrix/BlockConstraint/scalarBlockConstraint.C
 
@@ -616,12 +614,12 @@ matrices/blockLduMatrix/BlockLduPrecons/BlockCholeskyPrecon/tensorBlockCholeskyP
 matrices/blockLduMatrix/BlockLduPrecons/BlockCholeskyPrecon/blockCholeskyPrecons.C
 
 matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/blockLduSmoothers.C
-// matrices/blockLduMatrix/BlockLduSmoothers/BlockGaussSeidelSmoother/blockGaussSeidelSmoothers.C
+matrices/blockLduMatrix/BlockLduSmoothers/BlockGaussSeidelSmoother/blockGaussSeidelSmoothers.C
 matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/blockILUSmoothers.C
 
 matrices/blockLduMatrix/BlockLduSolvers/BlockLduSolver/blockLduSolvers.C
 matrices/blockLduMatrix/BlockLduSolvers/BlockDiagonal/blockDiagonalSolvers.C
-// matrices/blockLduMatrix/BlockLduSolvers/Segregated/segregatedSolvers.C
+/*HJ matrices/blockLduMatrix/BlockLduSolvers/Segregated/segregatedSolvers.C */
 matrices/blockLduMatrix/BlockLduSolvers/BlockGaussSeidel/blockGaussSeidelSolvers.C
 matrices/blockLduMatrix/BlockLduSolvers/BlockCG/blockCGSolvers.C
 matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/blockBiCGStabSolvers.C
diff --git a/src/OpenFOAM/containers/LinkedLists/user/SLList.H b/src/OpenFOAM/containers/LinkedLists/user/SLList.H
index 21db83ea7..6982055c7 100644
--- a/src/OpenFOAM/containers/LinkedLists/user/SLList.H
+++ b/src/OpenFOAM/containers/LinkedLists/user/SLList.H
@@ -60,7 +60,7 @@ public:
         {}
 
         //- Construct given initial T
-        SLList(T a)
+        explicit SLList(T a)
         :
             LList<SLListBase, T>(a)
         {}
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 27d0af294..a824e488c 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -91,6 +91,7 @@ public:
     class Hash
     {
     public:
+
         Hash()
         {}
 
@@ -116,7 +117,7 @@ public:
         inline FixedList(const T v[Size]);
 
         //- Construct from value
-        inline FixedList(const T&);
+        explicit inline FixedList(const T&);
 
         //- Construct from UList.
         inline FixedList(const UList<T>&);
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 41ac91b65..7da9b4d1f 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -88,7 +88,7 @@ inline Foam::FixedList<T, Size>::FixedList(const SLList<T>& lst)
 template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
 {
-    for (register unsigned i=0; i<Size; i++)
+    for (register unsigned i = 0; i < Size; i++)
     {
         v_[i] = lst[i];
     }
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 39fd44132..7bf680a5b 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -644,6 +644,7 @@ Foam::List<Container> Foam::initListList(const T elems[nRows][nColumns])
     List<Container> lst(nRows);
 
     Container cols(nColumns);
+
     forAll(lst, rowI)
     {
         forAll(cols, colI)
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.H b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.H
index ac51b0e8e..1cf200cba 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.H
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrix.H
@@ -88,6 +88,7 @@ public:
         typedef Field<Type> TypeField;
         typedef BlockConstraint<Type> ConstraintType;
 
+
 private:
 
     // Private data
@@ -148,15 +149,16 @@ private:
             void decoupledMultEqOp(const scalarField& sf);
 
             //- Matrix multiplication without coupled interface update,
-            //  decoupled version
+            //  Decoupled version
             void decoupledAmulCore
             (
                 TypeField& Ax,
                 const TypeField& x
             ) const;
 
-            //- Matrix transpose multiplication without coupled interface update
-            //  decoupled version
+            //- Matrix transpose multiplication without coupled
+            //  interface update
+            //  Decoupled version
             void decoupledTmulCore
             (
                 TypeField& Tx,
@@ -164,11 +166,11 @@ private:
             ) const;
 
             //- Return L-U vector-matrix multiplication in row-form,
-            //  decoupled version
+            //  Decoupled version
             tmp<TypeField> decoupledH(const TypeField& x) const;
 
             //- Return L-U  vector-matrix multiplication in off-diagonal form,
-            //  decoupled version
+            //  Decoupled version
             tmp<TypeField> decoupledFaceH(const TypeField& x) const;
 
 
@@ -318,8 +320,9 @@ public:
             (
                 TypeField& Ax,
                 const TypeField& x,
-				const FieldField<CoeffField, Type>& boundaryCoeffs,
-                const typename BlockLduInterfaceFieldPtrsList<Type>::Type& interfaces
+                const FieldField<CoeffField, Type>& boundaryCoeffs,
+                const typename BlockLduInterfaceFieldPtrsList<Type>::Type&
+                    interfaces
             ) const;
 
             //- Matrix multiplication without coupled interface update
@@ -334,11 +337,13 @@ public:
             (
                 TypeField& Ax,
                 const TypeField& x,
-				const FieldField<CoeffField, Type>& boundaryCoeffs,
-                const typename BlockLduInterfaceFieldPtrsList<Type>::Type& interfaces
+                const FieldField<CoeffField, Type>& boundaryCoeffs,
+                const typename BlockLduInterfaceFieldPtrsList<Type>::Type&
+                    interfaces
             ) const;
 
-            //- Matrix transpose multiplication without coupled interface update
+            //- Matrix transpose multiplication without coupled
+           //  interface update
             void TmulCore
             (
                 TypeField& Ax,
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockLduSolver/BlockLduSolver.H b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockLduSolver/BlockLduSolver.H
index eb018ffef..ef51e784f 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockLduSolver/BlockLduSolver.H
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockLduSolver/BlockLduSolver.H
@@ -129,7 +129,8 @@ public:
                 const word& fieldName,
                 BlockLduMatrix<Type>& matrix,
                 const FieldField<CoeffField, Type>& boundaryCoeffs,
-                const typename BlockLduInterfaceFieldPtrsList<Type>::Type& interfaces,
+                const typename BlockLduInterfaceFieldPtrsList<Type>::Type&
+                    interfaces,
                 const dictionary& dict
             ),
             (
@@ -150,7 +151,8 @@ public:
                 const word& fieldName,
                 BlockLduMatrix<Type>& matrix,
                 const FieldField<CoeffField, Type>& boundaryCoeffs,
-                const typename BlockLduInterfaceFieldPtrsList<Type>::Type& interfaces,
+                const typename BlockLduInterfaceFieldPtrsList<Type>::Type&
+                    interfaces,
                 const dictionary& dict
             ),
             (
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/SegregatedSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/SegregatedSolver.C
index 259106535..0ab5397d1 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/SegregatedSolver.C
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/SegregatedSolver.C
@@ -38,7 +38,7 @@ Foam::SegregatedSolver<Type>::SegregatedSolver
 (
     const word& fieldName,
     const BlockLduMatrix<Type>& matrix,
-    const FieldField<CoeffField, Type>& boundaryCoeffs,,
+    const FieldField<CoeffField, Type>& boundaryCoeffs,
     const typename BlockLduInterfaceFieldPtrsList<Type>::Type& interfaces,
     const dictionary& dict
 )
@@ -181,8 +181,8 @@ Foam::BlockSolverPerformance<Type> Foam::SegregatedSolver<Type>::solve
             (
                 this->fieldName(),
                 scalarMatrix_,
-                BlockLduSolver<Type>::boundaryCoeffs,
-                BlockLduSolver<Type>::interfaces_,
+                boundaryCoeffs,
+                interfaces_,
                 this->dict()
             )->solve(scalarX_, scalarB_);
 
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/segregatedSolvers.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/segregatedSolvers.C
index 57b39747d..add717747 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/segregatedSolvers.C
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/Segregated/segregatedSolvers.C
@@ -40,10 +40,10 @@ makeBlockSolverTypeName(segregatedSolverVector);
 makeBlockSolverTypeName(segregatedSolverTensor);
 
 addSolverToBlockMatrix(Vector, segregatedSolverVector, symMatrix);
-addSolverToBlockMatrix(Tensor, segregatedSolverTensor, symMatrix);
+// addSolverToBlockMatrix(Tensor, segregatedSolverTensor, symMatrix);
 
 addSolverToBlockMatrix(Vector, segregatedSolverVector, asymMatrix);
-addSolverToBlockMatrix(Tensor, segregatedSolverTensor, asymMatrix);
+// addSolverToBlockMatrix(Tensor, segregatedSolverTensor, asymMatrix);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 30625ff7a..614fc9ab5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -113,7 +113,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
             if (!nbrFound)
             {
                 curNbrs.append(curSlave);
-                curFaceFaces.append(ffi);
+                curFaceFaces.append(SLList<label>(ffi));
 
                 // New coarse face created
                 nCoarseFaces++;
@@ -124,7 +124,11 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
             // This master has got no neighbours yet.  Add a neighbour
             // and a coefficient, thus creating a new face
             neighboursTable.insert(curMaster, SLList<label>(curSlave));
-            faceFaceTable.insert(curMaster, SLList<SLList<label> >(ffi));
+            faceFaceTable.insert
+            (
+                curMaster,
+                SLList<SLList<label> >(SLList<label>(ffi))
+            );
 
             // New coarse face created
             nCoarseFaces++;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/ggiGAMGInterface/ggiGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/ggiGAMGInterface/ggiGAMGInterface.C
index cd692fbd3..b67b8d21c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/ggiGAMGInterface/ggiGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/ggiGAMGInterface/ggiGAMGInterface.C
@@ -228,8 +228,8 @@ Foam::ggiGAMGInterface::ggiGAMGInterface
                     if (!nbrFound)
                     {
                         curNbrs.append(curSlave);
-                        curFaceFaces.append(ffI);
-                        curFaceWeights.append(curNW);
+                        curFaceFaces.append(SLList<label>(ffI));
+                        curFaceWeights.append(SLList<scalar>(curNW));
 
                         // New coarse face created
                         nCoarseFaces++;
@@ -245,13 +245,13 @@ Foam::ggiGAMGInterface::ggiGAMGInterface
                     faceFaceTable.insert
                     (
                         curMaster,
-                        SLList<SLList<label> >(ffI)
+                        SLList<SLList<label> >(SLList<label>(ffI))
                     );
 
                     faceFaceWeightsTable.insert
                     (
                         curMaster,
-                        SLList<SLList<scalar> >(curNW)
+                        SLList<SLList<scalar> >(SLList<scalar>(curNW))
                     );
 
                     // New coarse face created
@@ -335,9 +335,9 @@ Foam::ggiGAMGInterface::ggiGAMGInterface
                 if (!nbrFound)
                 {
                     curNbrs.append(curSlave);
-                    curFaceFaces.append(ffi);
+                    curFaceFaces.append(SLList<label>(ffi));
                     // Add dummy weight
-                    curFaceWeights.append(1.0);
+                    curFaceWeights.append(SLList<scalar>(1.0));
 
                     // New coarse face created
                     nCoarseFaces++;
@@ -350,13 +350,17 @@ Foam::ggiGAMGInterface::ggiGAMGInterface
                 // and a coefficient, thus creating a new face
                 neighboursTable.insert(curMaster, SLList<label>(curSlave));
 
-                faceFaceTable.insert(curMaster, SLList<SLList<label> >(ffi));
+                faceFaceTable.insert
+                (
+                    curMaster,
+                    SLList<SLList<label> >(SLList<label>(ffi))
+                );
 
                 // Add dummy weight
                 faceFaceWeightsTable.insert
                 (
                     curMaster,
-                    SLList<SLList<scalar> >(1.0)
+                    SLList<SLList<scalar> >(SLList<scalar>(1.0))
                 );
 
                 // New coarse face created
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index 35ba8a9bd..e861272c3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -125,7 +125,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             if (!nbrFound)
             {
                 curNbrs.append(curSlave);
-                curFaceFaces.append(ffi);
+                curFaceFaces.append(SLList<label>(ffi));
 
                 // New coarse face created
                 nCoarseFaces++;
@@ -136,7 +136,11 @@ Foam::processorGAMGInterface::processorGAMGInterface
             // This master has got no neighbours yet.  Add a neighbour
             // and a coefficient, thus creating a new face
             neighboursTable.insert(curMaster, SLList<label>(curSlave));
-            faceFaceTable.insert(curMaster, SLList<SLList<label> >(ffi));
+            faceFaceTable.insert
+            (
+                curMaster,
+                SLList<SLList<label> >(SLList<label>(ffi))
+            );
 
             // New coarse face created
             nCoarseFaces++;
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index bed23b684..ac883a47f 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -74,6 +74,11 @@ public:
         //- Null constructor for lists
         inline edge();
 
+        //- Constructor given size
+        //  Nasty hack for consistency in creation of edges/faces/cells
+        //  HJ, 6/Nov/2010
+        explicit inline edge(const label size);
+
         //- Construct from components
         inline edge(const label a, const label b);
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
index c467f3541..6e05f9a11 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
@@ -28,7 +28,6 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-
 // return
 //  -  0: different
 //  - +1: identical
@@ -56,6 +55,10 @@ inline Foam::edge::edge()
 {}
 
 
+inline Foam::edge::edge(const label)
+{}
+
+
 inline Foam::edge::edge(const label a, const label b)
 {
     start() = a;
diff --git a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C
index 317bba07a..a501e488b 100644
--- a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C
+++ b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMesh.C
@@ -1519,10 +1519,6 @@ void dynamicTopoFvMesh::initializeThreadingEnvironment
 
             if (threadI == 0)
             {
-                // HJ, bug fix - please review: negative number not allowed
-                // HJ, 6/Nov/2010
-                handlerPtr_[0].setID(0);
-//                 handlerPtr_[0].setID(-1);
                 handlerPtr_[0].setMaster();
             }
             else
diff --git a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C
index 94e829d22..73b6318b8 100644
--- a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C
+++ b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMeshMapping.C
@@ -33,7 +33,7 @@ Author
     University of Massachusetts Amherst
     All rights reserved
 
-\*----------------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
 
 #include "dynamicTopoFvMesh.H"
 
diff --git a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/edgeCollapse.C b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/edgeCollapse.C
index 99c1382b2..490d7f6b9 100644
--- a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/edgeCollapse.C
+++ b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/edgeCollapse.C
@@ -307,7 +307,7 @@ const changeMap dynamicTopoFvMesh::collapseQuadFace
 
     // Configure the new point-positions
     FixedList<bool, 2> check(false);
-    FixedList<FixedList<label, 2>, 2> checkPoints(-1);
+    FixedList<FixedList<label, 2>, 2> checkPoints(FixedList<label, 2>(-1));
     FixedList<point, 2> newPoint(vector::zero);
     FixedList<point, 2> oldPoint(vector::zero);