From 246f994b6fbd4c496cfe469f02e499f106faa4a5 Mon Sep 17 00:00:00 2001 From: Dominik Christ Date: Tue, 27 May 2014 10:36:42 +0100 Subject: [PATCH] BlockMatrixAgglomeration --- src/foam/Make/files | 4 +- .../blockLduMatrix/BlockAmg/BlockAmgCycle.H | 2 +- .../blockLduMatrix/BlockAmg/BlockAmgLevel.H | 4 +- .../BlockMatrixAgglomeration.C} | 64 ++++++++++--------- .../BlockMatrixAgglomeration.H} | 28 ++++---- .../BlockMatrixCoarsening.C} | 20 +++--- .../BlockMatrixCoarsening.H} | 46 ++++++------- .../blockMatrixAgglomerations.C} | 6 +- .../blockMatrixAgglomerations.H} | 24 +++---- .../blockMatrixCoarsenings.C} | 14 ++-- .../blockMatrixCoarsenings.H} | 18 +++--- .../scalarBlockMatrixAgglomeration.H} | 22 +++---- .../tensorBlockMatrixAgglomeration.H} | 20 +++--- .../vectorBlockMatrixAgglomeration.H} | 21 +++--- .../BlockAmg/coarseBlockAmgLevel.C | 24 +++---- .../BlockAmg/coarseBlockAmgLevel.H | 6 +- .../BlockAmg/fineBlockAmgLevel.C | 22 +++---- .../BlockAmg/fineBlockAmgLevel.H | 8 +-- .../BlockAmgPrecon/BlockAmgPrecon.C | 2 +- .../BlockAmgSolver/BlockAmgSolver.C | 2 +- .../BlockAmgSolver/BlockAmgSolver.H | 2 +- .../BlockLduSolvers/blockVectorNSolvers.C | 14 ++-- 22 files changed, 190 insertions(+), 183 deletions(-) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/BlockAamgPolicy.C => BlockMatrixCoarsening/BlockMatrixAgglomeration.C} (90%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/BlockAamgPolicy.H => BlockMatrixCoarsening/BlockMatrixAgglomeration.H} (86%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/BlockAmgPolicy.C => BlockMatrixCoarsening/BlockMatrixCoarsening.C} (79%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/BlockAmgPolicy.H => BlockMatrixCoarsening/BlockMatrixCoarsening.H} (78%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/blockAamgPolicies.C => BlockMatrixCoarsening/blockMatrixAgglomerations.C} (92%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/blockAamgPolicies.H => BlockMatrixCoarsening/blockMatrixAgglomerations.H} (75%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/blockAmgPolicies.C => BlockMatrixCoarsening/blockMatrixCoarsenings.C} (83%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/blockAmgPolicies.H => BlockMatrixCoarsening/blockMatrixCoarsenings.H} (80%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/scalarBlockAamgPolicy.H => BlockMatrixCoarsening/scalarBlockMatrixAgglomeration.H} (82%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/tensorBlockAamgPolicy.H => BlockMatrixCoarsening/tensorBlockMatrixAgglomeration.H} (80%) rename src/foam/matrices/blockLduMatrix/BlockAmg/{BlockAmgPolicy/vectorBlockAamgPolicy.H => BlockMatrixCoarsening/vectorBlockMatrixAgglomeration.H} (80%) diff --git a/src/foam/Make/files b/src/foam/Make/files index aa6d266f2..6a8892e63 100644 --- a/src/foam/Make/files +++ b/src/foam/Make/files @@ -661,8 +661,8 @@ $(BlockLduInterfaceField)/blockVectorNGAMGInterfaceFields.C matrices/blockLduMatrix/BlockAmg/blockAmgCycles.C matrices/blockLduMatrix/BlockAmg/blockAmgLevels.C -matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.C -matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.C +matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.C +matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.C matrices/blockLduMatrix/BlockLduPrecons/BlockLduPrecon/blockLduPrecons.C matrices/blockLduMatrix/BlockLduPrecons/BlockNoPrecon/blockNoPrecons.C diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgCycle.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgCycle.H index 8edd8ff9e..3244f2a95 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgCycle.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgCycle.H @@ -55,7 +55,7 @@ template class coarseBlockAmgLevel; template -class BlockAmgPolicy; +class BlockMatrixCoarsening; template class BlockAmgLevel; diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgLevel.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgLevel.H index b8aa17a36..86799870b 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgLevel.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgLevel.H @@ -39,7 +39,7 @@ SourceFiles #define BlockAmgLevel_H #include "BlockLduMatrix.H" -#include "BlockAmgPolicy.H" +#include "BlockMatrixCoarsening.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -58,7 +58,7 @@ template class BlockAmgCycle; template -class BlockAmgPolicy; +class BlockMatrixCoarsening; template class BlockAmgSolver; diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAamgPolicy.C b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixAgglomeration.C similarity index 90% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAamgPolicy.C rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixAgglomeration.C index 84a2dc33e..1d3b08de5 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAamgPolicy.C +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixAgglomeration.C @@ -22,17 +22,17 @@ License along with foam-extend. If not, see . Class - BlockAamgPolicy + BlockMatrixAgglomeration Description - Agglomerative AMG policy, adjusted for BlockLduMatrix + Agglomerative block matrix AMG corsening, adjusted for BlockLduMatrix Author Klas Jareteg, 2012-12-13 \*---------------------------------------------------------------------------*/ -#include "BlockAamgPolicy.H" +#include "BlockMatrixAgglomeration.H" #include "coeffFields.H" #include "addToRunTimeSelectionTable.H" #include "BlockGAMGInterfaceField.H" @@ -41,13 +41,13 @@ Author // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // template -const Foam::scalar Foam::BlockAamgPolicy::weightFactor_ = 0.65; +const Foam::scalar Foam::BlockMatrixAgglomeration::weightFactor_ = 0.65; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void Foam::BlockAamgPolicy::calcChild() +void Foam::BlockMatrixAgglomeration::calcChild() { // Algorithm: // 1) Create temporary equation addressing using a double-pass algorithm. @@ -249,7 +249,7 @@ void Foam::BlockAamgPolicy::calcChild() if ( - nCoarseEqns_ > BlockAmgPolicy::minCoarseEqns() + nCoarseEqns_ > BlockMatrixCoarsening::minCoarseEqns() && 3*nCoarseEqns_ <= 2*nRows ) { @@ -264,7 +264,7 @@ void Foam::BlockAamgPolicy::calcChild() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::BlockAamgPolicy::BlockAamgPolicy +Foam::BlockMatrixAgglomeration::BlockMatrixAgglomeration ( const BlockLduMatrix& matrix, const dictionary& dict, @@ -272,7 +272,7 @@ Foam::BlockAamgPolicy::BlockAamgPolicy const label minCoarseEqns ) : - BlockAmgPolicy(matrix, dict, groupSize, minCoarseEqns), + BlockMatrixCoarsening(matrix, dict, groupSize, minCoarseEqns), matrix_(matrix), normPtr_ ( @@ -292,7 +292,7 @@ Foam::BlockAamgPolicy::BlockAamgPolicy // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::BlockAamgPolicy::~BlockAamgPolicy() +Foam::BlockMatrixAgglomeration::~BlockMatrixAgglomeration() {} @@ -300,13 +300,14 @@ Foam::BlockAamgPolicy::~BlockAamgPolicy() template Foam::autoPtr > -Foam::BlockAamgPolicy::restrictMatrix() const +Foam::BlockMatrixAgglomeration::restrictMatrix() const { if (!coarsen_) { FatalErrorIn ( - "autoPtr BlockAamgPolicy::restrictMatrix() const" + "autoPtr " + "BlockMatrixAgglomeration::restrictMatrix() const" ) << "Requesting coarse matrix when it cannot be created" << abort(FatalError); } @@ -335,7 +336,7 @@ Foam::BlockAamgPolicy::restrictMatrix() const { FatalErrorIn ( - "autoPtr > BlockAamgPolicy::" + "autoPtr > BlockMatrixAgglomeration::" "restrictMatrix() const" ) << "Child array does not correspond to fine level. " << endl << " Child size: " << child_.size() @@ -671,39 +672,42 @@ Foam::BlockAamgPolicy::restrictMatrix() const if (cCoeff >= 0) { - activeCoarseUpper[cCoeff] += activeFineUpper[fineCoeffI]; - activeCoarseLower[cCoeff] += activeFineLower[fineCoeffI]; + activeCoarseUpper[cCoeff] + += activeFineUpper[fineCoeffI]; + activeCoarseLower[cCoeff] + += activeFineLower[fineCoeffI]; } else { // Add the fine face coefficients into the diagonal. activeCoarseDiag[-1 - cCoeff] += - activeFineUpper[fineCoeffI] + activeFineLower[fineCoeffI]; + activeFineUpper[fineCoeffI] + + activeFineLower[fineCoeffI]; } } } else if (fineUpper.activeType() == blockCoeffBase::LINEAR) { - FatalErrorIn("autoPtr BlockAamgPolicy::restrictMatrix() const") + FatalErrorIn("autoPtr BlockMatrixAgglomeration::restrictMatrix() const") << "Matrix diagonal of square type and upper of linear type is not implemented" << abort(FatalError); } else { - FatalErrorIn("autoPtr BlockAamgPolicy::restrictMatrix() const") + FatalErrorIn("autoPtr BlockMatrixAgglomeration::restrictMatrix() const") << "Matrix diagonal of square type and upper of scalar type is not implemented" << abort(FatalError); } } else if (fineDiag.activeType() == blockCoeffBase::LINEAR) { - FatalErrorIn("autoPtr BlockAamgPolicy::restrictMatrix() const") + FatalErrorIn("autoPtr BlockMatrixAgglomeration::restrictMatrix() const") << "Matrix diagonal of linear type not implemented" << abort(FatalError); } else { - FatalErrorIn("autoPtr BlockAamgPolicy::restrictMatrix() const") + FatalErrorIn("autoPtr BlockMatrixAgglomeration::restrictMatrix() const") << "Matrix diagonal of scalar type not implemented" << abort(FatalError); } @@ -726,24 +730,26 @@ Foam::BlockAamgPolicy::restrictMatrix() const if (cCoeff >= 0) { - activeCoarseUpper[cCoeff] += activeFineUpper[fineCoeffI]; + activeCoarseUpper[cCoeff] + += activeFineUpper[fineCoeffI]; } else { // Add the fine face coefficient into the diagonal. - activeCoarseDiag[-1 - cCoeff] += 2*activeFineUpper[fineCoeffI]; + activeCoarseDiag[-1 - cCoeff] + += 2*activeFineUpper[fineCoeffI]; } } } else if (fineUpper.activeType() == blockCoeffBase::LINEAR) { - FatalErrorIn("autoPtr BlockAamgPolicy::restrictMatrix() const") + FatalErrorIn("autoPtr BlockMatrixAgglomeration::restrictMatrix() const") << "Matrix diagonal of square type and upper of linear type is not implemented" << abort(FatalError); } else { - FatalErrorIn("autoPtr BlockAamgPolicy::restrictMatrix() const") + FatalErrorIn("autoPtr BlockMatrixAgglomeration::restrictMatrix() const") << "Matrix diagonal of square type and upper of scalar type is not implemented" << abort(FatalError); } @@ -753,7 +759,7 @@ Foam::BlockAamgPolicy::restrictMatrix() const { FatalErrorIn ( - "autoPtr BlockAamgPolicy::" + "autoPtr BlockMatrixAgglomeration::" "restrictMatrix() const" ) << "Matrix diagonal of linear type not implemented" << abort(FatalError); @@ -762,7 +768,7 @@ Foam::BlockAamgPolicy::restrictMatrix() const { FatalErrorIn ( - "autoPtr BlockAamgPolicy::" + "autoPtr BlockMatrixAgglomeration::" "restrictMatrix() const" ) << "Matrix diagonal of scalar type not implemented" << abort(FatalError); @@ -780,7 +786,7 @@ Foam::BlockAamgPolicy::restrictMatrix() const template -void Foam::BlockAamgPolicy::restrictResidual +void Foam::BlockMatrixAgglomeration::restrictResidual ( const CoeffField& res, CoeffField& coarseRes @@ -809,7 +815,7 @@ void Foam::BlockAamgPolicy::restrictResidual } else { - FatalErrorIn("void BlockAamgPolicy::restrictResidual() const") + FatalErrorIn("void BlockMatrixAgglomeration::restrictResidual() const") << "Only present for square type coeff type" << abort(FatalError); } @@ -817,7 +823,7 @@ void Foam::BlockAamgPolicy::restrictResidual template -void Foam::BlockAamgPolicy::restrictResidual +void Foam::BlockMatrixAgglomeration::restrictResidual ( const Field& res, Field& coarseRes @@ -833,7 +839,7 @@ void Foam::BlockAamgPolicy::restrictResidual template -void Foam::BlockAamgPolicy::prolongateCorrection +void Foam::BlockMatrixAgglomeration::prolongateCorrection ( Field& x, const Field& coarseX diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAamgPolicy.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixAgglomeration.H similarity index 86% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAamgPolicy.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixAgglomeration.H index fdb2fb372..1c2355e56 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAamgPolicy.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixAgglomeration.H @@ -22,23 +22,23 @@ License along with foam-extend. If not, see . Class - BlockAamgPolicy + BlockMatrixAgglomeration Description - Agglomerative AMG policy + Agglomerative block matrix AMG coarsening Author Klas Jareteg, 2013-04-15 SourceFiles - BlockAamgPolicy.C + BlockMatrixAgglomeration.C \*---------------------------------------------------------------------------*/ -#ifndef BlockAamgPolicy_H -#define BlockAamgPolicy_H +#ifndef BlockMatrixAgglomeration_H +#define BlockMatrixAgglomeration_H -#include "BlockAmgPolicy.H" +#include "BlockMatrixCoarsening.H" #include "BlockLduMatrix.H" #include "BlockCoeffNorm.H" #include "BlockCoeff.H" @@ -51,13 +51,13 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // /*---------------------------------------------------------------------------*\ - Class BlockAamgPolicy Declaration + Class BlockMatrixAgglomeration Declaration \*---------------------------------------------------------------------------*/ template -class BlockAamgPolicy +class BlockMatrixAgglomeration : - public BlockAmgPolicy + public BlockMatrixCoarsening { public: @@ -85,10 +85,10 @@ public: // Private Member Functions //- Disallow default bitwise copy construct - BlockAamgPolicy(const BlockAamgPolicy&); + BlockMatrixAgglomeration(const BlockMatrixAgglomeration&); // Disallow default bitwise assignment - void operator=(const BlockAamgPolicy&); + void operator=(const BlockMatrixAgglomeration&); //- Calculate child void calcChild(); @@ -109,7 +109,7 @@ public: // Constructors //- Construct from matrix and group size - BlockAamgPolicy + BlockMatrixAgglomeration ( const BlockLduMatrix& matrix, const dictionary& dict, @@ -119,7 +119,7 @@ public: // Destructor - virtual ~BlockAamgPolicy(); + virtual ~BlockMatrixAgglomeration(); // Member Functions @@ -165,7 +165,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "BlockAamgPolicy.C" +# include "BlockMatrixAgglomeration.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAmgPolicy.C b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixCoarsening.C similarity index 79% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAmgPolicy.C rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixCoarsening.C index e870f1903..a05ff5c04 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAmgPolicy.C +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixCoarsening.C @@ -22,18 +22,18 @@ License along with foam-extend. If not, see . Class - BlockAmgPolicy + BlockMatrixCoarsening \*---------------------------------------------------------------------------*/ -#include "BlockAmgPolicy.H" +#include "BlockMatrixCoarsening.H" // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // template -Foam::autoPtr > Foam::BlockAmgPolicy::New +Foam::autoPtr > Foam::BlockMatrixCoarsening::New ( - const word& policyType, + const word& coarseningType, const BlockLduMatrix& matrix, const dictionary& dict, const label groupSize, @@ -41,27 +41,27 @@ Foam::autoPtr > Foam::BlockAmgPolicy::New ) { typename matrixConstructorTable::iterator constructorIter = - matrixConstructorTablePtr_->find(policyType); + matrixConstructorTablePtr_->find(coarseningType); if (constructorIter == matrixConstructorTablePtr_->end()) { FatalErrorIn ( - "autoPtr > BlockAmgPolicy::New\n" + "autoPtr > BlockMatrixCoarsening::New\n" "(\n" - " const word& policyType,\n" + " const word& coarseningType,\n" " const lduMatrix& matrix,\n" " const label groupSize\n" " const label nCoarseCells\n" ")" - ) << "Unknown AMG policy " << policyType + ) << "Unknown AMG coarsening type. " << coarseningType << endl << endl - << "Valid AMG policies are :" << endl + << "Valid AMG coarsening types are :" << endl << matrixConstructorTablePtr_->toc() << exit(FatalError); } - return autoPtr > + return autoPtr > ( constructorIter() ( diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAmgPolicy.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixCoarsening.H similarity index 78% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAmgPolicy.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixCoarsening.H index 1a838886d..becbba0be 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/BlockAmgPolicy.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/BlockMatrixCoarsening.H @@ -22,22 +22,22 @@ License along with foam-extend. If not, see . Class - BlockAmgPolicy + BlockMatrixCoarsening Description - Virtual base class for AMG coarsening policy, implemented for + Virtual base class for block matrix AMG coarsening, implemented for BlockLduMatrix Author Klas Jareteg, 2012-12-15 SourceFiles - BlockAmgPolicy.C + BlockMatrixCoarsening.C \*---------------------------------------------------------------------------*/ -#ifndef BlockAmgPolicy_H -#define BlockAmgPolicy_H +#ifndef BlockMatrixCoarsening_H +#define BlockMatrixCoarsening_H #include "runTimeSelectionTables.H" #include "primitiveFieldsFwd.H" @@ -62,11 +62,11 @@ template class BlockAmgLevel; /*---------------------------------------------------------------------------*\ - Class BlockAmgPolicy Declaration + Class BlockMatrixCoarsening Declaration \*---------------------------------------------------------------------------*/ template -class BlockAmgPolicy +class BlockMatrixCoarsening { // Private Data @@ -82,16 +82,16 @@ class BlockAmgPolicy // Private Member Functions //- Disallow default bitwise copy construct - BlockAmgPolicy(const BlockAmgPolicy&); + BlockMatrixCoarsening(const BlockMatrixCoarsening&); //- Disallow default bitwise assignment - void operator=(const BlockAmgPolicy&); + void operator=(const BlockMatrixCoarsening&); public: //- Runtime type information - TypeName("BlockAmgPolicy"); + TypeName("BlockMatrixCoarsening"); // KRJ: 2012-12-15: Replaced by the above function //- Runtime type information @@ -103,7 +103,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - BlockAmgPolicy, + BlockMatrixCoarsening, matrix, ( const BlockLduMatrix& matrix, @@ -118,9 +118,9 @@ public: // Selectors //- Select given name, group size and matrix - static autoPtr > New + static autoPtr > New ( - const word& policyType, + const word& coarseningType, const BlockLduMatrix& matrix, const dictionary& dict, const label groupSize, @@ -131,7 +131,7 @@ public: // Constructors //- Construct from components - BlockAmgPolicy + BlockMatrixCoarsening ( const BlockLduMatrix& matrix, const dictionary& dict, @@ -147,7 +147,7 @@ public: // Destructor - virtual ~BlockAmgPolicy() + virtual ~BlockMatrixCoarsening() {} @@ -196,20 +196,20 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "BlockAmgPolicy.C" +# include "BlockMatrixCoarsening.C" #endif -#define makeBlockAmgPolicy(BlockAmgPolicyType, typeBlockAmgPolicyType) \ +#define makeBlockMatrixCoarsening(BlockMatrixCoarseningType, typeBlockMatrixCoarseningType) \ \ -defineNamedTemplateTypeNameAndDebug(typeBlockAmgPolicyType, 0); \ +defineNamedTemplateTypeNameAndDebug(typeBlockMatrixCoarseningType, 0); \ \ -addToRunTimeSelectionTable(BlockAmgPolicyType, typeBlockAmgPolicyType, matrix); +addToRunTimeSelectionTable(BlockMatrixCoarseningType, typeBlockMatrixCoarseningType, matrix); -#define makeBlockAmgPolicys(blockAmgPolicyType) \ +#define makeBlockMatrixCoarsenings(blockAmgCoarseningType) \ \ -makeBlockAmgPolicy(blockScalarAmgPolicy, blockAmgPolicyType##Scalar); \ -makeBlockAmgPolicy(blockVectorAmgPolicy, blockAmgPolicyType##Vector); \ -makeBlockAmgPolicy(blockTensorAmgPolicy, blockAmgPolicyType##Tensor); +makeBlockMatrixCoarsening(blockScalarMatrixCoarsening, blockAmgCoarseningType##Scalar); \ +makeBlockMatrixCoarsening(blockVectorMatrixCoarsening, blockAmgCoarseningType##Vector); \ +makeBlockMatrixCoarsening(blockTensorMatrixCoarsening, blockAmgCoarseningType##Tensor); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.C b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.C similarity index 92% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.C rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.C index fcfcc36c5..35d087171 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.C +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.C @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#include "blockAamgPolicies.H" -#include "blockAmgPolicies.H" +#include "blockMatrixAgglomerations.H" +#include "blockMatrixCoarsenings.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makeBlockAmgPolicys(blockAamgPolicy); +makeBlockMatrixCoarsenings(blockMatrixAgglomeration); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.H similarity index 75% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.H index 5197737c2..454e3f057 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAamgPolicies.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixAgglomerations.H @@ -22,27 +22,27 @@ License along with foam-extend. If not, see . Class - BlockAamgPolicy + BlockMatrixAgglomeration Description - Typedefs for block AMG policies. + Typedefs for block matrix AMG coarsening. Author Klas Jareteg, 2012-12-15 SourceFiles - blockAamgPolicies.C + blockMatrixAgglomeration.C \*---------------------------------------------------------------------------*/ -#ifndef blockAamgPolicies_H -#define blockAamgPolicies_H +#ifndef blockMatrixAgglomerations_H +#define blockMatrixAgglomerations_H // Disabled instantiation for primitive types by force. HJ, 15/Apr/2013 -#include "scalarBlockAamgPolicy.H" -#include "vectorBlockAamgPolicy.H" -#include "tensorBlockAamgPolicy.H" -#include "BlockAamgPolicy.H" +#include "scalarBlockMatrixAgglomeration.H" +#include "vectorBlockMatrixAgglomeration.H" +#include "tensorBlockMatrixAgglomeration.H" +#include "BlockMatrixAgglomeration.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,9 +51,9 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -typedef BlockAamgPolicy blockAamgPolicyScalar; -typedef BlockAamgPolicy blockAamgPolicyVector; -typedef BlockAamgPolicy blockAamgPolicyTensor; +typedef BlockMatrixAgglomeration blockMatrixAgglomerationScalar; +typedef BlockMatrixAgglomeration blockMatrixAgglomerationVector; +typedef BlockMatrixAgglomeration blockMatrixAgglomerationTensor; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.C b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.C similarity index 83% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.C rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.C index 5baaa87f2..c23250ee5 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.C +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "blockAmgPolicies.H" +#include "blockMatrixCoarsenings.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32,25 +32,25 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -defineNamedTemplateTypeNameAndDebug(blockScalarAmgPolicy, 0); -defineNamedTemplateTypeNameAndDebug(blockVectorAmgPolicy, 0); -defineNamedTemplateTypeNameAndDebug(blockTensorAmgPolicy, 0); +defineNamedTemplateTypeNameAndDebug(blockScalarMatrixCoarsening, 0); +defineNamedTemplateTypeNameAndDebug(blockVectorMatrixCoarsening, 0); +defineNamedTemplateTypeNameAndDebug(blockTensorMatrixCoarsening, 0); defineTemplateRunTimeSelectionTable ( - blockScalarAmgPolicy, + blockScalarMatrixCoarsening, matrix ); defineTemplateRunTimeSelectionTable ( - blockVectorAmgPolicy, + blockVectorMatrixCoarsening, matrix ); defineTemplateRunTimeSelectionTable ( - blockTensorAmgPolicy, + blockTensorMatrixCoarsening, matrix ); diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.H similarity index 80% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.H index 15b6a15aa..533d7d682 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/blockAmgPolicies.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/blockMatrixCoarsenings.H @@ -22,23 +22,23 @@ License along with foam-extend. If not, see . Class - BlockAmgPolicy + BlockMatrixCoarsening Description - Typedefs for block AMG policies. + Typedefs for block matrix AMG coarsening. Author Klas Jareteg, 2012-12-15 SourceFiles - blockAmgPolicies.C + blockMatrixCoarsenings.C \*---------------------------------------------------------------------------*/ -#ifndef blockAmgPolicies_H -#define blockAmgPolicies_H +#ifndef blockMatrixCoarsenings_H +#define blockMatrixCoarsenings_H -#include "BlockAmgPolicy.H" +#include "BlockMatrixCoarsening.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,9 +47,9 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -typedef BlockAmgPolicy blockScalarAmgPolicy; -typedef BlockAmgPolicy blockVectorAmgPolicy; -typedef BlockAmgPolicy blockTensorAmgPolicy; +typedef BlockMatrixCoarsening blockScalarMatrixCoarsening; +typedef BlockMatrixCoarsening blockVectorMatrixCoarsening; +typedef BlockMatrixCoarsening blockTensorMatrixCoarsening; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/scalarBlockAamgPolicy.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/scalarBlockMatrixAgglomeration.H similarity index 82% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/scalarBlockAamgPolicy.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/scalarBlockMatrixAgglomeration.H index edb20eacd..991123aa6 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/scalarBlockAamgPolicy.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/scalarBlockMatrixAgglomeration.H @@ -22,23 +22,23 @@ License along with foam-extend. If not, see . Class - BlockAamgPolicy + BlockMatrixAgglomeration Description - Specialisation of the BlockAamgPolicy for scalars. + Specialisation of the BlockMatrixAgglomeration for scalars. Author Klas Jareteg, 2013-01-31 \*---------------------------------------------------------------------------*/ -#ifndef scalarBlockAamgPolicy_H -#define scalarBlockAamgPolicy_H +#ifndef scalarBlockMatrixAgglomeration_H +#define scalarBlockMatrixAgglomeration_H -#include "blockAmgPolicies.H" -#include "blockAamgPolicies.H" -#include "BlockAamgPolicy.H" -#include "BlockAmgPolicy.H" +#include "blockMatrixCoarsenings.H" +#include "blockMatrixAgglomerations.H" +#include "BlockMatrixAgglomeration.H" +#include "BlockMatrixCoarsening.H" #include "runTimeSelectionTables.H" #include "scalarBlockLduMatrix.H" #include "scalarBlockConstraint.H" @@ -52,19 +52,19 @@ namespace Foam /*---------------------------------------------------------------------------*\ - Class BlockAamgPolicy Declaration + Class BlockMatrixAgglomeration Declaration \*---------------------------------------------------------------------------*/ //- Restrict matrix template<> inline autoPtr > -BlockAamgPolicy::restrictMatrix() const +BlockMatrixAgglomeration::restrictMatrix() const { FatalErrorIn ( "autoPtr > " - "BlockAamgPolicy::restrictMatrix() const" + "BlockMatrixAgglomeration::restrictMatrix() const" ) << "Function not implemented for Type=scalar. " << endl << abort(FatalError); diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/tensorBlockAamgPolicy.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/tensorBlockMatrixAgglomeration.H similarity index 80% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/tensorBlockAamgPolicy.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/tensorBlockMatrixAgglomeration.H index 7665f61a9..aee1ff1c0 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/tensorBlockAamgPolicy.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/tensorBlockMatrixAgglomeration.H @@ -22,22 +22,22 @@ License along with foam-extend. If not, see . Class - BlockAamgPolicy + BlockMatrixAgglomeration Description - Specialisation of the BlockAamgPolicy for tensors. + Specialisation of the BlockMatrixAgglomeration for tensors. Author Klas Jareteg, 2013-01-31 \*---------------------------------------------------------------------------*/ -#ifndef tensorBlockAamgPolicy_H -#define tensorBlockAamgPolicy_H +#ifndef tensorBlockMatrixAgglomeration_H +#define tensorBlockMatrixAgglomeration_H -#include "blockAmgPolicies.H" -#include "blockAamgPolicies.H" -#include "BlockAamgPolicy.H" +#include "blockMatrixCoarsenings.H" +#include "blockMatrixAgglomerations.H" +#include "BlockMatrixAgglomeration.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,18 +46,18 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class BlockAamgPolicy Declaration + Class BlockMatrixAgglomeration Declaration \*---------------------------------------------------------------------------*/ //- Restrict matrix template<> -inline autoPtr > BlockAamgPolicy::restrictMatrix +inline autoPtr > BlockMatrixAgglomeration::restrictMatrix () const { FatalErrorIn ( - "autoPtr > BlockAamgPolicy::" + "autoPtr > BlockMatrixAgglomeration::" "restrictMatrix() const" ) << "Function not implemented for Type=tensor. " << endl << abort(FatalError); diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/vectorBlockAamgPolicy.H b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/vectorBlockMatrixAgglomeration.H similarity index 80% rename from src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/vectorBlockAamgPolicy.H rename to src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/vectorBlockMatrixAgglomeration.H index ec8604d28..6db4f83ae 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/BlockAmgPolicy/vectorBlockAamgPolicy.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/BlockMatrixCoarsening/vectorBlockMatrixAgglomeration.H @@ -22,22 +22,22 @@ License along with foam-extend. If not, see . Class - BlockAamgPolicy + BlockMatrixAgglomeration Description - Specialisation of the BlockAamgPolicy for vectors. + Specialisation of the BlockMatrixAgglomeration for vectors. Author Klas Jareteg, 2013-01-31 \*---------------------------------------------------------------------------*/ -#ifndef vectorBlockAamgPolicy_H -#define vectorBlockAamgPolicy_H +#ifndef vectorBlockMatrixAgglomeration_H +#define vectorBlockMatrixAgglomeration_H -#include "blockAmgPolicies.H" -#include "blockAamgPolicies.H" -#include "BlockAamgPolicy.H" +#include "blockMatrixCoarsenings.H" +#include "blockMatrixAgglomerations.H" +#include "BlockMatrixAgglomeration.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,18 +46,19 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class BlockAamgPolicy Declaration + Class BlockMatrixAgglomeration Declaration \*---------------------------------------------------------------------------*/ //- Restrict matrix template<> -inline autoPtr > BlockAamgPolicy::restrictMatrix +inline autoPtr > +BlockMatrixAgglomeration::restrictMatrix () const { FatalErrorIn ( - "autoPtr > BlockAamgPolicy::" + "autoPtr > BlockMatrixAgglomeration::" "restrictMatrix() const" ) << "Function not implemented for Type=vector. " << endl << abort(FatalError); diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C b/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C index 16c1bf1c4..ee44f6c7a 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C @@ -50,7 +50,7 @@ Foam::coarseBlockAmgLevel::coarseBlockAmgLevel ( autoPtr > matrixPtr, const dictionary& dict, - const word& policyType, + const word& coarseningType, const label groupSize, const label minCoarseEqns, const word& smootherType @@ -60,11 +60,11 @@ Foam::coarseBlockAmgLevel::coarseBlockAmgLevel x_(matrixPtr_->diag().size(),pTraits::zero), b_(matrixPtr_->diag().size(),pTraits::zero), dict_(dict), - policyPtr_ + coarseningPtr_ ( - BlockAmgPolicy::New + BlockMatrixCoarsening::New ( - policyType, + coarseningType, matrixPtr_, dict_, groupSize, @@ -148,13 +148,13 @@ void Foam::coarseBlockAmgLevel::restrictResidual residual(x, b, res); - policyPtr_->restrictResidual(res, coarseRes); + coarseningPtr_->restrictResidual(res, coarseRes); } else { // No pre-sweeps done: x = 0 and residual = b - policyPtr_->restrictResidual(b, coarseRes); + coarseningPtr_->restrictResidual(b, coarseRes); } } @@ -166,7 +166,7 @@ void Foam::coarseBlockAmgLevel::prolongateCorrection const Field& coarseX ) const { - policyPtr_->prolongateCorrection(x, coarseX); + coarseningPtr_->prolongateCorrection(x, coarseX); } @@ -279,17 +279,17 @@ void Foam::coarseBlockAmgLevel::scaleX template Foam::autoPtr > Foam::coarseBlockAmgLevel::makeNextLevel() const { - if (policyPtr_->coarsen()) + if (coarseningPtr_->coarsen()) { return autoPtr > ( new coarseBlockAmgLevel ( - policyPtr_->restrictMatrix(), + coarseningPtr_->restrictMatrix(), dict(), - policyPtr_->type(), - policyPtr_->groupSize(), - policyPtr_->minCoarseEqns(), + coarseningPtr_->type(), + coarseningPtr_->groupSize(), + coarseningPtr_->minCoarseEqns(), smootherPtr_->type() ) ); diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.H b/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.H index 6c82d3662..e4bec3f57 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.H @@ -70,8 +70,8 @@ class coarseBlockAmgLevel //- Dictionary const dictionary& dict_; - //- AMG policy - autoPtr > policyPtr_; + //- AMG coarsening + autoPtr > coarseningPtr_; //- Smoother autoPtr > smootherPtr_; @@ -96,7 +96,7 @@ public: ( autoPtr > matrixPtr, const dictionary& dict, - const word& policyType, + const word& coarseningType, const label groupSize, const label minCoarseEqns, const word& smootherType diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.C b/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.C index c576f5a2e..abadd549f 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.C +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.C @@ -49,7 +49,7 @@ Foam::fineBlockAmgLevel::fineBlockAmgLevel ( const BlockLduMatrix& matrix, const dictionary& dict, - const word& policyType, + const word& coarseningType, const label groupSize, const label minCoarseEqns, const word& smootherType @@ -57,11 +57,11 @@ Foam::fineBlockAmgLevel::fineBlockAmgLevel : matrix_(matrix), dict_(dict), - policyPtr_ + coarseningPtr_ ( - BlockAmgPolicy::New + BlockMatrixCoarsening::New ( - policyType, + coarseningType, matrix_, dict_, groupSize, @@ -145,7 +145,7 @@ void Foam::fineBlockAmgLevel::restrictResidual // Here x != 0. It is assumed that the buffer will contain the residual // if no pre-sweeps have been done. HJ, 4/Sep/2006 - policyPtr_->restrictResidual(xBuffer, coarseRes); + coarseningPtr_->restrictResidual(xBuffer, coarseRes); } @@ -156,7 +156,7 @@ void Foam::fineBlockAmgLevel::prolongateCorrection const Field& coarseX ) const { - policyPtr_->prolongateCorrection(x, coarseX); + coarseningPtr_->prolongateCorrection(x, coarseX); } @@ -267,17 +267,17 @@ template Foam::autoPtr > Foam::fineBlockAmgLevel::makeNextLevel() const { - if (policyPtr_->coarsen()) + if (coarseningPtr_->coarsen()) { return autoPtr > ( new coarseBlockAmgLevel ( - policyPtr_->restrictMatrix(), + coarseningPtr_->restrictMatrix(), dict(), - policyPtr_->type(), - policyPtr_->groupSize(), - policyPtr_->minCoarseEqns(), + coarseningPtr_->type(), + coarseningPtr_->groupSize(), + coarseningPtr_->minCoarseEqns(), smootherPtr_->type() ) ); diff --git a/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.H b/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.H index d4b0cfd37..2605b2a85 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.H +++ b/src/foam/matrices/blockLduMatrix/BlockAmg/fineBlockAmgLevel.H @@ -55,7 +55,7 @@ template class coarseBlockAmgLevel; template -class BlockAmgPolicy; +class BlockMatrixCoarsening; /*---------------------------------------------------------------------------*\ Class fineBlockAmgLevel Declaration @@ -74,8 +74,8 @@ class fineBlockAmgLevel //- Dictionary const dictionary& dict_; - //- AMG policy - autoPtr > policyPtr_; + //- AMG coarsening + autoPtr > coarseningPtr_; //- Smoother autoPtr > smootherPtr_; @@ -101,7 +101,7 @@ public: ( const BlockLduMatrix& matrix, const dictionary& dict, - const word& policyType, + const word& coarseningType, const label groupSize, const label minCoarseEqns, const word& smootherType diff --git a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockAmgPrecon/BlockAmgPrecon.C b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockAmgPrecon/BlockAmgPrecon.C index 168089ce1..bcf144072 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockAmgPrecon/BlockAmgPrecon.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockAmgPrecon/BlockAmgPrecon.C @@ -68,7 +68,7 @@ Foam::BlockAmgPrecon::BlockAmgPrecon ( matrix, dict, - dict.lookup("policy"), + dict.lookup("coarseningType"), readLabel(dict.lookup("groupSize")), readLabel(dict.lookup("minCoarseEqns")), dict.lookup("smoother") diff --git a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.C b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.C index e1b4b712c..fd2551c3f 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.C @@ -22,7 +22,7 @@ License along with foam-extend. If not, see . Description - Algebraic Multigrid solver with run-time selection of policy and cycle + Algebraic Multigrid solver with run-time selection of coarsening and cycle Author Klas Jareteg, 2013-04-15 diff --git a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.H b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.H index 85b229e49..4cd27b026 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.H +++ b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/BlockAmgSolver/BlockAmgSolver.H @@ -25,7 +25,7 @@ Class BlockAmgSolver Description - Algebraic Multigrid solver with run-time selection of policy and cycle + Algebraic Multigrid solver with run-time selection of coarsening and cycle adjusted for BlockLduMatrix. Author diff --git a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/blockVectorNSolvers.C b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/blockVectorNSolvers.C index 60f0d58da..559162736 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduSolvers/blockVectorNSolvers.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduSolvers/blockVectorNSolvers.C @@ -46,8 +46,8 @@ License // KRJ: 2012-12-15: Multigrid solver #include "blockAmgSolvers.H" #include "blockAmgPrecons.H" -#include "blockAmgPolicies.H" -#include "blockAamgPolicies.H" +#include "blockMatrixCoarsenings.H" +#include "blockMatrixAgglomerations.H" #include "blockCoeffNorms.H" #include "blockCoeffTwoNorms.H" #include "blockCoeffMaxNorms.H" @@ -131,12 +131,12 @@ makeBlockSolverTypeName(block##Type##GMRESSolver); \ addSolverToBlockMatrix(Type, block##Type##GMRESSolver, symMatrix); \ addSolverToBlockMatrix(Type, block##Type##GMRESSolver, asymMatrix); \ \ -typedef BlockAmgPolicy block##Type##AmgPolicy; \ -defineNamedTemplateTypeNameAndDebug(block##Type##AmgPolicy, 0); \ -defineTemplateRunTimeSelectionTable(block##Type##AmgPolicy, matrix); \ +typedef BlockMatrixCoarsening block##Type##MatrixCoarsening; \ +defineNamedTemplateTypeNameAndDebug(block##Type##MatrixCoarsening, 0); \ +defineTemplateRunTimeSelectionTable(block##Type##MatrixCoarsening, matrix); \ \ -typedef BlockAamgPolicy block##Type##AamgPolicy; \ -makeBlockAmgPolicy(block##Type##AmgPolicy, block##Type##AamgPolicy); \ +typedef BlockMatrixAgglomeration block##Type##MatrixAgglomeration; \ +makeBlockMatrixCoarsening(block##Type##MatrixCoarsening, block##Type##MatrixAgglomeration); \ \ typedef BlockCoeffNorm block##Type##CoeffNorm; \ defineNamedTemplateTypeNameAndDebug(block##Type##CoeffNorm, 0); \