zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: GAMGAgglomeration: move starting mesh interface setting into base class

Browse Source
This commit is contained in:
mattijs
2013-05-03 09:27:26 +01:00
parent ec7ceed1e2
commit e0b972606b
5 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
View File

@ -117,6 +117,7 @@ Foam::GAMGAgglomeration::GAMGAgglomeration
( (
readLabel(controlDict.lookup("nCellsInCoarsestLevel")) readLabel(controlDict.lookup("nCellsInCoarsestLevel"))
), ),
meshInterfaces_(mesh.interfaces()),
procAgglomeratorPtr_ procAgglomeratorPtr_
( (
( (

6
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
View File

@ -73,10 +73,10 @@ protected:
//- Number of cells in coarsest level //- Number of cells in coarsest level
const label nCellsInCoarsestLevel_; const label nCellsInCoarsestLevel_;
autoPtr<GAMGProcAgglomeration> procAgglomeratorPtr_;
//- Cached mesh interfaces //- Cached mesh interfaces
lduInterfacePtrsList meshInterfaces_; const lduInterfacePtrsList meshInterfaces_;
autoPtr<GAMGProcAgglomeration> procAgglomeratorPtr_;
//- The number of cells in each level //- The number of cells in each level
labelList nCells_; labelList nCells_;

3
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
View File

@ -52,9 +52,6 @@ Foam::dummyAgglomeration::dummyAgglomeration
GAMGAgglomeration(mesh, controlDict), GAMGAgglomeration(mesh, controlDict),
nLevels_(readLabel(controlDict.lookup("nLevels"))) nLevels_(readLabel(controlDict.lookup("nLevels")))
{ {
// Get the finest-level interfaces from the mesh
meshInterfaces_ = mesh.interfaces();
const label nCoarseCells = mesh.lduAddr().size(); const label nCoarseCells = mesh.lduAddr().size();
for for

3
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
View File

@ -204,9 +204,6 @@ void Foam::pairGAMGAgglomeration::agglomerate
const scalarField& faceWeights const scalarField& faceWeights
) )
{ {
// Get the finest-level interfaces from the mesh
meshInterfaces_ = mesh.interfaces();
// Start geometric agglomeration from the given faceWeights // Start geometric agglomeration from the given faceWeights
scalarField* faceWeightsPtr = const_cast<scalarField*>(&faceWeights); scalarField* faceWeightsPtr = const_cast<scalarField*>(&faceWeights);

4
src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
View File

@ -57,10 +57,6 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
label minSize(readLabel(controlDict.lookup("minSize"))); label minSize(readLabel(controlDict.lookup("minSize")));
label maxSize(readLabel(controlDict.lookup("maxSize"))); 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 // Start geometric agglomeration from the cell volumes and areas of the mesh
scalarField* VPtr = const_cast<scalarField*>(&fvMesh_.cellVolumes()); scalarField* VPtr = const_cast<scalarField*>(&fvMesh_.cellVolumes());
vectorField* SfPtr = const_cast<vectorField*>(&fvMesh_.faceAreas()); vectorField* SfPtr = const_cast<vectorField*>(&fvMesh_.faceAreas());