Formatting and clean-up

src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockDiagonalPrecon/BlockDiagonalPrecon.H

@@ -84,10 +84,9 @@ public:
         {}
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~BlockDiagonalPrecon()
-        virtual ~BlockDiagonalPrecon()
+    {}
-        {}
 
 
     // Member Functions

src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.H

@@ -149,9 +149,8 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~BlockILUCpPrecon();
-        virtual ~BlockILUCpPrecon();
 
 
     // Member Functions

src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/BlockLduPrecon.H

@@ -113,10 +113,9 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~BlockLduPrecon()
-        virtual ~BlockLduPrecon()
+    {}
-        {}
 
 
     // Member Functions

src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/BlockNoPrecon.H

@@ -83,10 +83,9 @@ public:
         {}
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~BlockNoPrecon()
-        virtual ~BlockNoPrecon()
+    {}
-        {}
 
 
     // Member Functions

src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/BlockILUSmoother.H

@@ -95,10 +95,9 @@ public:
         {}
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~BlockILUSmoother()
-        virtual ~BlockILUSmoother()
+    {}
-        {}
 
 
     // Member Functions

src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C

@@ -77,9 +77,6 @@ typename Foam::BlockSolverPerformance<Type> Foam::BlockCGSolver<Type>::solve
 
     scalar norm = this->normFactor(x, b);
 
-    // Multiplication helper
-    typename BlockCoeff<Type>::multiply mult;
-
     Field<Type> wA(x.size());
 
     // Calculate initial residual

src/foam/matrices/lduMatrix/smoothers/GaussSeidel/GaussSeidelSmoother.C

@@ -64,10 +64,10 @@ Foam::GaussSeidelSmoother::GaussSeidelSmoother
 void Foam::GaussSeidelSmoother::smooth
 (
     scalarField& x,
-    const lduMatrix& matrix_,
+    const lduMatrix& matrix,
     const scalarField& b,
-    const FieldField<Field, scalar>& coupleBouCoeffs_,
+    const FieldField<Field, scalar>& coupleBouCoeffs,
-    const lduInterfaceFieldPtrsList& interfaces_,
+    const lduInterfaceFieldPtrsList& interfaces,
     const direction cmpt,
     const label nSweeps
 )
@@ -79,17 +79,17 @@ void Foam::GaussSeidelSmoother::smooth
     scalarField bPrime(nCells);
     register scalar* __restrict__ bPrimePtr = bPrime.begin();
 
-    register const scalar* const __restrict__ diagPtr = matrix_.diag().begin();
+    register const scalar* const __restrict__ diagPtr = matrix.diag().begin();
     register const scalar* const __restrict__ upperPtr =
-        matrix_.upper().begin();
+        matrix.upper().begin();
     register const scalar* const __restrict__ lowerPtr =
-        matrix_.lower().begin();
+        matrix.lower().begin();
 
     register const label* const __restrict__ uPtr =
-        matrix_.lduAddr().upperAddr().begin();
+        matrix.lduAddr().upperAddr().begin();
 
     register const label* const __restrict__ ownStartPtr =
-        matrix_.lduAddr().ownerStartAddr().begin();
+        matrix.lduAddr().ownerStartAddr().begin();
 
 
     // Coupled boundary initialisation.  The coupled boundary is treated
@@ -112,10 +112,10 @@ void Foam::GaussSeidelSmoother::smooth
         bPrime = b;
 
         // Update from lhs
-        matrix_.initMatrixInterfaces
+        matrix.initMatrixInterfaces
         (
-            coupleBouCoeffs_,
+            coupleBouCoeffs,
-            interfaces_,
+            interfaces,
             x,
             bPrime,
             cmpt,
@@ -123,10 +123,10 @@ void Foam::GaussSeidelSmoother::smooth
         );
 
         // Update from lhs
-        matrix_.updateMatrixInterfaces
+        matrix.updateMatrixInterfaces
         (
-            coupleBouCoeffs_,
+            coupleBouCoeffs,
-            interfaces_,
+            interfaces,
             x,
             bPrime,
             cmpt,