From e0b972606bf97aee3d96cd1f5d2ec9eb7c20259a Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 3 May 2013 09:27:26 +0100 Subject: [PATCH] STYLE: GAMGAgglomeration: move starting mesh interface setting into base class --- .../GAMGAgglomeration/GAMGAgglomeration.C | 1 + .../GAMGAgglomeration/GAMGAgglomeration.H | 6 +++--- .../dummyAgglomeration/dummyAgglomeration.C | 3 --- .../pairGAMGAgglomeration/pairGAMGAgglomerate.C | 3 --- .../MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C | 4 ---- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index a9a0c29790..d1551eb399 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -117,6 +117,7 @@ Foam::GAMGAgglomeration::GAMGAgglomeration ( readLabel(controlDict.lookup("nCellsInCoarsestLevel")) ), + meshInterfaces_(mesh.interfaces()), procAgglomeratorPtr_ ( ( diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H index dd048c782c..4f6ad8af07 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H @@ -73,10 +73,10 @@ protected: //- Number of cells in coarsest level const label nCellsInCoarsestLevel_; - autoPtr procAgglomeratorPtr_; - //- Cached mesh interfaces - lduInterfacePtrsList meshInterfaces_; + const lduInterfacePtrsList meshInterfaces_; + + autoPtr procAgglomeratorPtr_; //- The number of cells in each level labelList nCells_; diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C index 575acef71e..b189aaaf2c 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C @@ -52,9 +52,6 @@ Foam::dummyAgglomeration::dummyAgglomeration GAMGAgglomeration(mesh, controlDict), nLevels_(readLabel(controlDict.lookup("nLevels"))) { - // Get the finest-level interfaces from the mesh - meshInterfaces_ = mesh.interfaces(); - const label nCoarseCells = mesh.lduAddr().size(); for diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C index 4d9de507eb..b0f5e757da 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C @@ -204,9 +204,6 @@ void Foam::pairGAMGAgglomeration::agglomerate const scalarField& faceWeights ) { - // Get the finest-level interfaces from the mesh - meshInterfaces_ = mesh.interfaces(); - // Start geometric agglomeration from the given faceWeights scalarField* faceWeightsPtr = const_cast(&faceWeights); diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C index 875201c0c8..25df8d29d1 100644 --- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C +++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C @@ -57,10 +57,6 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration label minSize(readLabel(controlDict.lookup("minSize"))); label maxSize(readLabel(controlDict.lookup("maxSize"))); - - // Get the finest-level interfaces from the mesh - meshInterfaces_(fvMesh_.boundary().interfaces()); - // Start geometric agglomeration from the cell volumes and areas of the mesh scalarField* VPtr = const_cast(&fvMesh_.cellVolumes()); vectorField* SfPtr = const_cast(&fvMesh_.faceAreas());