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

ENH: use isolated request wait in PPCG solver

Browse Source
This commit is contained in:
Mark Olesen
2023-01-11 17:55:31 +01:00
parent bf99c104eb
commit bf2f87f7e3
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019-2020 Mattijs Janssens
Copyright (C) 2020-2022 OpenCFD Ltd.
Copyright (C) 2020-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -49,7 +49,7 @@ void Foam::PPCG::gSumMagProd
const solveScalarField& b,
const solveScalarField& c,
const solveScalarField& sumMag,
label& outstandingRequest,
UPstream::Request& request,
const label comm
) const
{
@ -72,7 +72,7 @@ void Foam::PPCG::gSumMagProd
sumOp<solveScalar>(),
Pstream::msgType(),
comm,
outstandingRequest
request
);
}
}
@ -136,7 +136,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
solveScalarField m(nCells);
FixedList<solveScalar, 3> globalSum;
label outstandingRequest = -1;
UPstream::Request outstandingRequest;
if (cgMode)
{
// --- Start global reductions for inner products
@ -170,11 +170,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
)
{
// Make sure gamma,delta are available
if (outstandingRequest != -1)
{
UPstream::waitRequest(outstandingRequest);
outstandingRequest = -1;
}
outstandingRequest.wait();
const solveScalar gammaOld = gamma;
gamma = globalSum[0];
@ -249,10 +245,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
}
// Cleanup any outstanding requests
if (outstandingRequest != -1)
{
UPstream::waitRequest(outstandingRequest);
}
outstandingRequest.wait();
return solverPerf;
}

8
src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019-2020 Mattijs Janssens
Copyright (C) 2020 OpenCFD Ltd.
Copyright (C) 2020-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -48,8 +48,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef PPCG_H
#define PPCG_H
#ifndef Foam_PPCG_H
#define Foam_PPCG_H
#include "lduMatrix.H"
@ -76,7 +76,7 @@ class PPCG
const solveScalarField& b,
const solveScalarField& c,
const solveScalarField& sumMag,
label& outstandingRequest,
UPstream::Request& request,
const label comm
) const;