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: add coupledFaPatch::delta()

Browse Source 
- symmetrical evaluation for processor patches, eliminates
  scalar/vector multiply followed by projection.

STYLE: use evaluateCoupled instead of local versions
This commit is contained in:
Mark Olesen
2023-01-26 17:12:45 +01:00
parent eb8b51b475
commit ea2bedf073
9 changed files with 80 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
View File

@ -50,8 +50,7 @@ Description
#include "turbulentTransportModel.H"
#include "turbulentFluidThermoModel.H"
#include "wallDist.H"
#include "processorFvPatchField.H"
#include "zeroGradientFvPatchField.H"
#include "processorFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -61,35 +60,11 @@ static const scalar kappa(0.41);
template<class Type>
void correctProcessorPatches
(
GeometricField<Type, fvPatchField, volMesh>& vf
)
void correctProcessorPatches(GeometricField<Type, fvPatchField, volMesh>& fld)
{
if (!Pstream::parRun())
if (UPstream::parRun())
{
return;
}
// Not possible to use correctBoundaryConditions on fields as they may
// use local info as opposed to the constraint values employed here,
// but still need to update processor patches
auto& bf = vf.boundaryFieldRef();
forAll(bf, patchi)
{
if (isA<processorFvPatchField<Type>>(bf[patchi]))
{
bf[patchi].initEvaluate();
}
}
forAll(bf, patchi)
{
if (isA<processorFvPatchField<Type>>(bf[patchi]))
{
bf[patchi].evaluate();
}
fld.boundaryFieldRef().template evaluateCoupled<processorFvPatch>();
}
}
@ -119,11 +94,11 @@ void blendField
pf = (1 - mask)*pf + mask*boundaryLayerField;
fld.max(SMALL);
// Correct the processor patches only.
// Do not correct BC
// - operation may use inconsistent fields wrt these local
// manipulations
//fld.correctBoundaryConditions();
correctProcessorPatches<scalar>(fld);
correctProcessorPatches(fld);
Info<< "Writing " << fieldName << nl << endl;
fld.write();
@ -158,11 +133,11 @@ void calcOmegaField
pf = (1 - mask)*pf + mask*epsilonBL/(Cmu*kBL + SMALL);
omega.max(SMALL);
// Correct the processor patches only.
// Do not correct BC
// - operation may use inconsistent fields wrt these local
// manipulations
// omega.correctBoundaryConditions();
correctProcessorPatches<scalar>(omega);
correctProcessorPatches(omega);
Info<< "Writing omega\n" << endl;
omega.write();
@ -192,11 +167,11 @@ void setField
volScalarField fld(fldHeader, mesh);
fld = value;
// Correct the processor patches only.
// Do not correct BC
// - operation may use inconsistent fields wrt these local
// manipulations
// fld.correctBoundaryConditions();
correctProcessorPatches<scalar>(fld);
correctProcessorPatches(fld);
Info<< "Writing " << fieldName << nl << endl;
fld.write();
@ -343,7 +318,7 @@ int main(int argc, char *argv[])
}
}
mask.correctBoundaryConditions();
correctProcessorPatches<vector>(U);
correctProcessorPatches(U);
if (writeTurbulenceFields)
{
@ -356,7 +331,7 @@ int main(int argc, char *argv[])
// Do not correct BC - wall functions will 'undo' manipulation above
// by using nut from turbulence model
correctProcessorPatches<scalar>(nut);
correctProcessorPatches(nut);
Info<< "Writing nut\n" << endl;
nut.write();

46
applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
View File

@ -109,8 +109,8 @@ Note
#include "singlePhaseTransportModel.H"
#include "turbulentTransportModel.H"
#include "turbulentFluidThermoModel.H"
#include "processorFvPatchField.H"
#include "wallFvPatch.H"
#include "processorFvPatch.H"
#include "fixedValueFvPatchFields.H"
using namespace Foam;
@ -124,35 +124,11 @@ void InfoField(const word& fldName)
template<class Type>
void correctProcessorPatches
(
GeometricField<Type, fvPatchField, volMesh>& vf
)
void correctProcessorPatches(GeometricField<Type, fvPatchField, volMesh>& fld)
{
if (!Pstream::parRun())
if (UPstream::parRun())
{
return;
}
// Not possible to use correctBoundaryConditions on fields as they may
// use local info as opposed to the constraint values employed here,
// but still need to update processor patches
auto& bf = vf.boundaryFieldRef();
forAll(bf, patchi)
{
if (isA<processorFvPatchField<Type>>(bf[patchi]))
{
bf[patchi].initEvaluate();
}
}
forAll(bf, patchi)
{
if (isA<processorFvPatchField<Type>>(bf[patchi]))
{
bf[patchi].evaluate();
}
fld.boundaryFieldRef().template evaluateCoupled<processorFvPatch>();
}
}
@ -411,7 +387,7 @@ int main(int argc, char *argv[])
),
mesh,
dimensionedScalar(dimless, scalar(1)),
fixedValueFvPatchField<scalar>::typeName
fixedValueFvPatchScalarField::typeName
);
for (fvPatchScalarField& pfld : f.boundaryFieldRef())
@ -482,31 +458,31 @@ int main(int argc, char *argv[])
// (M:Eq. 9)
const dimensionedScalar maxU(dimVelocity, SMALL);
U *= min(scalar(1), fRei*uTau/max(mag(U), maxU));
correctProcessorPatches<vector>(U);
correctProcessorPatches(U);
}
if (tepsilon.valid())
{
tepsilon.ref() = epsilon;
correctProcessorPatches<scalar>(tepsilon.ref());
correctProcessorPatches(tepsilon.ref());
}
if (tk.valid())
{
tk.ref() = k;
correctProcessorPatches<scalar>(tk.ref());
correctProcessorPatches(tk.ref());
}
if (tomega.valid())
{
const dimensionedScalar k0(sqr(dimLength/dimTime), SMALL);
tomega.ref() = Cmu*epsilon/(k + k0);
correctProcessorPatches<scalar>(tomega.ref());
correctProcessorPatches(tomega.ref());
}
if (tR.valid())
{
volSymmTensorField& R = tR.ref();
auto& R = tR.ref();
// (M:Eq. 3)
const volSphericalTensorField Rdiag(k*twoThirdsI);
@ -514,7 +490,7 @@ int main(int argc, char *argv[])
{
R[celli] = Rdiag[celli];
}
correctProcessorPatches<symmTensor>(R);
correctProcessorPatches(R);
}