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: restrict scope of waitRequests() in LduMatrix update

Browse Source 
- Only wait for locally invoked requests.
  Reflects behaviour of lduMatrix update.
This commit is contained in:
Mark Olesen
2023-01-12 19:59:52 +01:00
parent 568ced68e2
commit bd0ad07d40
5 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019-2022 OpenCFD Ltd.
Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -637,7 +637,8 @@ public:
const bool add,
const FieldField<Field, LUType>& interfaceCoeffs,
const Field<Type>& psiif,
Field<Type>& result
Field<Type>& result,
const label startRequest // starting request (for non-blocking)
) const;

17
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2019 OpenCFD Ltd.
Copyright (C) 2017-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -80,6 +80,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Amul
const LUType* const __restrict__ upperPtr = upper().begin();
const LUType* const __restrict__ lowerPtr = lower().begin();
const label startRequest = UPstream::nRequests();
// Initialise the update of interfaced interfaces
initMatrixInterfaces
(
@ -109,7 +111,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Amul
true,
interfacesUpper_,
psi,
Apsi
Apsi,
startRequest
);
tpsi.clear();
@ -136,6 +139,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Tmul
const LUType* const __restrict__ lowerPtr = lower().begin();
const LUType* const __restrict__ upperPtr = upper().begin();
const label startRequest = UPstream::nRequests();
// Initialise the update of interfaced interfaces
initMatrixInterfaces
(
@ -164,7 +169,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Tmul
true,
interfacesLower_,
psi,
Tpsi
Tpsi,
startRequest
);
tpsi.clear();
@ -242,6 +248,8 @@ void Foam::LduMatrix<Type, DType, LUType>::residual
// Note: there is a change of sign in the coupled
// interface update to add the contibution to the r.h.s.
const label startRequest = UPstream::nRequests();
// Initialise the update of interfaced interfaces
initMatrixInterfaces
(
@ -271,7 +279,8 @@ void Foam::LduMatrix<Type, DType, LUType>::residual
false,
interfacesUpper_,
psi,
rA
rA,
startRequest
);
}

17
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019-2022 OpenCFD Ltd.
Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -111,23 +111,24 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
const bool add,
const FieldField<Field, LUType>& interfaceCoeffs,
const Field<Type>& psiif,
Field<Type>& result
Field<Type>& result,
const label startRequest
) const
{
const UPstream::commsTypes commsType = UPstream::defaultCommsType;
// Block until sends/receives have finished
if (commsType == UPstream::commsTypes::nonBlocking)
{
UPstream::waitRequests(startRequest);
}
if
(
commsType == UPstream::commsTypes::blocking
|| commsType == UPstream::commsTypes::nonBlocking
)
{
// Block until all sends/receives have been finished
if (commsType == UPstream::commsTypes::nonBlocking)
{
UPstream::waitRequests();
}
forAll(interfaces_, interfacei)
{
if (interfaces_.set(interfacei))

7
src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017 OpenCFD Ltd.
Copyright (C) 2017-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -98,6 +98,8 @@ void Foam::TGaussSeidelSmoother<Type, DType, LUType>::smooth
{
bPrime = matrix_.source();
const label startRequest = UPstream::nRequests();
matrix_.initMatrixInterfaces
(
false,
@ -111,7 +113,8 @@ void Foam::TGaussSeidelSmoother<Type, DType, LUType>::smooth
false,
matrix_.interfacesUpper(),
psi,
bPrime
bPrime,
startRequest
);
Type curPsi;

7
src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2019,2022 OpenCFD Ltd.
Copyright (C) 2019-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -116,6 +116,8 @@ Foam::labelListList Foam::lduPrimitiveMesh::globalCellCells
// Get the interface cells
PtrList<labelList> nbrGlobalCells(interfaces.size());
{
const label startOfRequests = UPstream::nRequests();
// Initialise transfer of restrict addressing on the interface
forAll(interfaces, inti)
{
@ -129,8 +131,7 @@ Foam::labelListList Foam::lduPrimitiveMesh::globalCellCells
}
}
// Wait for all
UPstream::waitRequests();
UPstream::waitRequests(startOfRequests);
forAll(interfaces, inti)
{