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

Merge branch 'fix-3387-GAMGAgglomeration-caching' into 'develop'

Browse Source 
Draft: Fix 3387 gamg agglomeration caching

See merge request Development/openfoam!750
This commit is contained in:
Mattijs Janssens
2025-08-29 04:40:30 +00:00
parent 19caabbd56 c6f87c961a
commit d25d59b221
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
if (agglomPtr) if (agglomPtr)
{ {
if (agglomPtr->requireUpdate_) if (agglomPtr->requireUpdate_ || agglomPtr->requiresUpdate())
{ {
mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr)); mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr));
return GAMGAgglomeration::New(matrix, controlDict); return GAMGAgglomeration::New(matrix, controlDict);
@ -459,7 +459,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
if (agglomPtr) if (agglomPtr)
{ {
if (agglomPtr->requireUpdate_) if (agglomPtr->requireUpdate_ || agglomPtr->requiresUpdate())
{ {
mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr)); mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr));
return GAMGAgglomeration::New(mesh, controlDict); return GAMGAgglomeration::New(mesh, controlDict);

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

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019-2023 OpenCFD Ltd. Copyright (C) 2019-2025 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -38,7 +38,9 @@ Description
// Whether to cache the agglomeration // Whether to cache the agglomeration
cacheAgglomeration yes; cacheAgglomeration yes;
// Optionally update every updateInterval mesh motion. Default is 1. // Optionally update every updateInterval time steps. Default is 1.
// - only applies if cacheAgglomeration
// - applies also for static mesh cases
updateInterval 10; updateInterval 10;
// Optional name (default is GAMGAgglomeration) // Optional name (default is GAMGAgglomeration)
//name pAgglomeration; //name pAgglomeration;
@ -190,7 +192,7 @@ protected:
// Protected Member Functions // Protected Member Functions
//- Does the agglomeration need to be fully updated? //- Does the agglomeration need to be fully updated?
bool requiresUpdate() const; virtual bool requiresUpdate() const;
//- Assemble coarse mesh addressing //- Assemble coarse mesh addressing
void agglomerateLduAddressing(const label fineLevelIndex); void agglomerateLduAddressing(const label fineLevelIndex);