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 remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Mark Olesen
2022-09-07 16:24:54 +02:00
parent 0f5cc77b61 f1da147925
commit 0b37234804
5 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
META-INFO/api-info
View File

@ -1,2 +1,2 @@
api=2206
patch=0
patch=220907

4
src/OpenFOAM/db/functionObjects/valueAverageBase/valueAverageBaseTemplates.C
View File

@ -117,8 +117,8 @@ bool Foam::functionObjects::valueAverageBase::calc
auto timeIter = windowTimes.cbegin();
auto valueIter = windowValues.cbegin();
meanValue = pTraits<Type2>::zero;
Type valueOld(pTraits<Type2>::zero);
meanValue = Zero;
Type2 valueOld(Zero);
for
(

10
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-2021 OpenCFD Ltd.
Copyright (C) 2020-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -170,7 +170,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
)
{
// Make sure gamma,delta are available
if (Pstream::parRun())
if (Pstream::parRun() && outstandingRequest != -1)
{
Pstream::waitRequest(outstandingRequest);
outstandingRequest = -1;
@ -248,6 +248,12 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
matrix_.Amul(n, m, interfaceBouCoeffs_, interfaces_, cmpt);
}
// Cleanup any outstanding requests
if (Pstream::parRun() && outstandingRequest != -1)
{
Pstream::waitRequest(outstandingRequest);
}
return solverPerf;
}

4
src/finiteArea/distributed/faMeshDistributorTemplates.C
View File

@ -93,7 +93,7 @@ Foam::faMeshDistributor::distributeField
forAll(bfld, patchi)
{
if (patchEdgeMaps_.set(patchi))
if (patchEdgeMaps_.test(patchi))
{
// Clone local patch field
@ -203,7 +203,7 @@ Foam::faMeshDistributor::distributeField
forAll(bfld, patchi)
{
if (patchEdgeMaps_.set(patchi))
if (patchEdgeMaps_.test(patchi))
{
// Clone local patch field

23
src/functionObjects/forces/forceCoeffs/forceCoeffs.H
View File

@ -318,7 +318,7 @@ public:
};
// Coefficients description
//- Coefficients description
struct coeffDesc
{
enum splitType
@ -366,6 +366,12 @@ public:
return name_ + "(r)";
}
//- Print description
void print(Ostream& os) const
{
os << desc_.c_str() << ": " << name_;
}
//- Return force/moment components based on the specified split type
vector value(const forceComponents& f, const forceComponents& m) const
{
@ -546,18 +552,25 @@ public:
virtual bool write();
};
} // End namespace functionObjects
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Ostream& operator<<(Ostream& os, const forceCoeffs::coeffDesc& coeff)
// Output operator
inline Ostream& operator<<
(
Ostream& os,
const functionObjects::forceCoeffs::coeffDesc& coeff
)
{
os << coeff.desc_.c_str() << ": " << coeff.name_;
coeff.print(os);
return os;
}
} // End namespace functionObjects
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //