From c3c233a4935c7758eee3fa1eef41e82e5df0ed61 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 15 Jun 2017 19:40:53 +0100 Subject: [PATCH] Formatting and clean-up --- .../BlockDiagonalPrecon/BlockDiagonalPrecon.H | 7 ++--- .../BlockILUCpPrecon/BlockILUCpPrecon.H | 5 ++-- .../BlockLduPrecon/BlockLduPrecon.H | 7 ++--- .../BlockNoPrecon/BlockNoPrecon.H | 7 ++--- .../BlockILUSmoother/BlockILUSmoother.H | 7 ++--- .../BlockLduSolvers/BlockCG/BlockCGSolver.C | 3 -- .../GaussSeidel/GaussSeidelSmoother.C | 28 +++++++++---------- 7 files changed, 28 insertions(+), 36 deletions(-) diff --git a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockDiagonalPrecon/BlockDiagonalPrecon.H b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockDiagonalPrecon/BlockDiagonalPrecon.H index f127ce8f2..3071824a0 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockDiagonalPrecon/BlockDiagonalPrecon.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockDiagonalPrecon/BlockDiagonalPrecon.H @@ -84,10 +84,9 @@ public: {} - // Destructor - - virtual ~BlockDiagonalPrecon() - {} + //- Destructor + virtual ~BlockDiagonalPrecon() + {} // Member Functions diff --git a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.H b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.H index a2670e848..1b318a087 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.H @@ -149,9 +149,8 @@ public: ); - // Destructor - - virtual ~BlockILUCpPrecon(); + //- Destructor + virtual ~BlockILUCpPrecon(); // Member Functions diff --git a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/BlockLduPrecon.H b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/BlockLduPrecon.H index 1434d6f24..0c42df87b 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/BlockLduPrecon.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/BlockLduPrecon.H @@ -113,10 +113,9 @@ public: ); - // Destructor - - virtual ~BlockLduPrecon() - {} + //- Destructor + virtual ~BlockLduPrecon() + {} // Member Functions diff --git a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/BlockNoPrecon.H b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/BlockNoPrecon.H index d8c20996c..0f7646867 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/BlockNoPrecon.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/BlockNoPrecon.H @@ -83,10 +83,9 @@ public: {} - // Destructor - - virtual ~BlockNoPrecon() - {} + //- Destructor + virtual ~BlockNoPrecon() + {} // Member Functions diff --git a/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/BlockILUSmoother.H b/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/BlockILUSmoother.H index 33976899c..813d86012 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/BlockILUSmoother.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/BlockILUSmoother.H @@ -95,10 +95,9 @@ public: {} - // Destructor - - virtual ~BlockILUSmoother() - {} + //- Destructor + virtual ~BlockILUSmoother() + {} // Member Functions diff --git a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C index 311fb9d65..7a578b746 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C @@ -77,9 +77,6 @@ typename Foam::BlockSolverPerformance Foam::BlockCGSolver::solve scalar norm = this->normFactor(x, b); - // Multiplication helper - typename BlockCoeff::multiply mult; - Field wA(x.size()); // Calculate initial residual diff --git a/src/foam/matrices/lduMatrix/smoothers/GaussSeidel/GaussSeidelSmoother.C b/src/foam/matrices/lduMatrix/smoothers/GaussSeidel/GaussSeidelSmoother.C index bef1b534c..3f04a46ff 100644 --- a/src/foam/matrices/lduMatrix/smoothers/GaussSeidel/GaussSeidelSmoother.C +++ b/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& coupleBouCoeffs_, - const lduInterfaceFieldPtrsList& interfaces_, + const FieldField& coupleBouCoeffs, + 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_, - interfaces_, + coupleBouCoeffs, + interfaces, x, bPrime, cmpt, @@ -123,10 +123,10 @@ void Foam::GaussSeidelSmoother::smooth ); // Update from lhs - matrix_.updateMatrixInterfaces + matrix.updateMatrixInterfaces ( - coupleBouCoeffs_, - interfaces_, + coupleBouCoeffs, + interfaces, x, bPrime, cmpt,