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

Clean-up of debug statements

Browse source
This commit is contained in:
Hrvoje Jasak 2017-08-25 14:15:04 +01:00
parent 990affa9ea
commit 4d70590651
1 changed files with 15 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixSelection/BlockMatrixSelection.C
View file

@ -303,30 +303,6 @@ void Foam::BlockMatrixSelection<Type>::calcCoarsening()
} }
} }
// CHECK
// forAll (strongCoeffCounter, i)
// {
// if (strongCoeffCounter[i] == 0)
// {
// Pout<< "Solo strong row " << i
// << " strongCoeff: " << epsilonStrongCoeff[i]/epsilon_()
// << endl;
//
// Pout<< "diag = " << normDiag[i] << " lower = ";
// // Write coeffs
// for (register label jp = losortStart[i]; jp < losortStart[i + 1]; jp++)
// {
// Pout<< normLower[losortAddr[jp]] << " ";
// }
// Pout<< " upper = ";
// for (label ip = ownerStart[i]; ip < ownerStart[i + 1]; ip++)
// {
// Pout<< normUpper[ip] << " ";
// }
// Pout<< endl;
// }
// }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// COARSENING: SORT EQUATIONS INTO COARSE AND FINE SUBSETS // COARSENING: SORT EQUATIONS INTO COARSE AND FINE SUBSETS
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -433,25 +409,20 @@ void Foam::BlockMatrixSelection<Type>::calcCoarsening()
} }
} }
if (min(rowLabel_) < -1) // // Renumber matrix - coarse equations are renumbered in natural order
{ // if (true)
Pout<< "******************************** FOUND UNDECIDED Equations" << endl; // {
} // label number = 0;
// Renumber matrix - coarse equations are renumbered in natural order // for (label eqn = 0; eqn < nRows; eqn++)
if (true) // {
{ // if (rowLabel_[eqn] != FINE)
label number = 0; // {
// rowLabel_[eqn] = number;
for (label eqn = 0; eqn < nRows; eqn++) // number++;
{ // }
if (rowLabel_[eqn] != FINE) // }
{ // }
rowLabel_[eqn] = number;
number++;
}
}
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// CALCULATING CONTRIBUTIONS TO THE SCALING FACTOR // CALCULATING CONTRIBUTIONS TO THE SCALING FACTOR
@ -651,15 +622,6 @@ void Foam::BlockMatrixSelection<Type>::calcCoarsening()
pRow[i + 1] = rowCount; pRow[i + 1] = rowCount;
} }
// CHECK
// for (label i = 0; i < nRows; i++)
// {
// if (pRow[i + 1] - pRow[i] == 0)
// {
// Pout<< "Solo prolongation row " << i << endl;
// }
// }
// Resize column and coeffs // Resize column and coeffs
pCoeff.setSize(pRow[nRows]); pCoeff.setSize(pRow[nRows]);
pCol.setSize(pRow[nRows]); pCol.setSize(pRow[nRows]);
@ -711,20 +673,6 @@ void Foam::BlockMatrixSelection<Type>::calcCoarsening()
coarsen_ = true; coarsen_ = true;
} }
// Dump the level if there is a bad prolongation row
// Temporary stability solution. HJ, 30/Jul/2017
// for (register label rowI = 0; rowI < nRows; rowI++)
// {
// // if (prolongationRow[rowI] == prolongationRow[rowI + 1])
// if (strongRow[rowI + 1] - strongRow[rowI] == 0)
// {
// // Found bad prolongation
// Pout<< "**************Bad strong matrix" << endl;
// coarsen_ = false;
// break;
// }
// }
reduce(coarsen_, andOp<bool>()); reduce(coarsen_, andOp<bool>());
if (blockLduMatrix::debug >= 3) if (blockLduMatrix::debug >= 3)
@ -895,7 +843,6 @@ Foam::BlockMatrixSelection<Type>::restrictMatrix() const
// matrix, respectively. In addition, row of matrix A is denoted ia, col // matrix, respectively. In addition, row of matrix A is denoted ia, col
// ja, row of prolongation is ip, etc. // ja, row of prolongation is ip, etc.
// Loop through rows of R // Loop through rows of R
for (label ir = 0; ir < nCoarseEqns_; ir++) for (label ir = 0; ir < nCoarseEqns_; ir++)
{ {
@ -1317,9 +1264,7 @@ Foam::BlockMatrixSelection<Type>::restrictMatrix() const
if (face == -1) if (face == -1)
{ {
Pout<< "BadTripleProduct1 " Pout<< "BadTripleProduct1 "
<< ir << " " << jp << " found: " << ir << " " << jp
<< coarseNbrsSets[jp].found(ir)
<< " toc: " << coarseNbrsSets[jp].toc()
<< endl; << endl;
} }
else else
@ -1403,7 +1348,7 @@ Foam::BlockMatrixSelection<Type>::restrictMatrix() const
else else
{ {
activeCoarseUpper[face] += ra*coeffP[indexP]; activeCoarseUpper[face] += ra*coeffP[indexP];
} }
} }
} }
} }