exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Formatting and clean-up

Browse source
This commit is contained in:
Hrvoje Jasak 2017-06-15 19:40:53 +01:00
parent cf887cbe5e
commit c3c233a493
7 changed files with 28 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockDiagonalPrecon/BlockDiagonalPrecon.H
View file

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

5
src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.H
View file

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

7
src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/BlockLduPrecon.H
View file

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

7
src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/BlockNoPrecon.H
View file

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

7
src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockILUSmoother/BlockILUSmoother.H
View file

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

3
src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C
View file

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

28
src/foam/matrices/lduMatrix/smoothers/GaussSeidel/GaussSeidelSmoother.C
View file

@ -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 lduInterfaceFieldPtrsList& interfaces_,
const FieldField<Field, scalar>& 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,