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: fvcCellReduce - allow setting of initial value, and loop over surface field boundaries

Browse Source
This commit is contained in:
Andrew Heather
2015-11-25 17:05:13 +00:00
parent 2830985ba9
commit f4de5d17e4
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -45,7 +45,8 @@ template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
( (
const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf, const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf,
const CombineOp& cop const CombineOp& cop,
const Type& nullValue
) )
{ {
typedef GeometricField<Type, fvPatchField, volMesh> volFieldType; typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
@ -65,7 +66,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensioned<Type>("0", ssf.dimensions(), pTraits<Type>::zero), dimensioned<Type>("initialValue", ssf.dimensions(), nullValue),
zeroGradientFvPatchField<Type>::typeName zeroGradientFvPatchField<Type>::typeName
) )
); );
@ -75,15 +76,29 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
const labelUList& own = mesh.owner(); const labelUList& own = mesh.owner();
const labelUList& nbr = mesh.neighbour(); const labelUList& nbr = mesh.neighbour();
forAll(own, i) // Internal field
const Field<Type>& iField = ssf.internalField();
forAll(iField, faceI)
{ {
label cellI = own[i]; label cellOwn = own[faceI];
cop(result[cellI], ssf[i]); cop(result[cellOwn], iField[faceI]);
label cellNbr = nbr[faceI];
cop(result[cellNbr], iField[faceI]);
} }
forAll(nbr, i)
// Boundary field
forAll(ssf.boundaryField(), patchI)
{ {
label cellI = nbr[i]; const fvsPatchField<Type>& pf = ssf.boundaryField()[patchI];
cop(result[cellI], ssf[i]); const label start = pf.patch().start();
forAll(pf, i)
{
label faceI = start + i;
label cellI = own[faceI];
cop(result[cellI], pf[i]);
}
} }
result.correctBoundaryConditions(); result.correctBoundaryConditions();
@ -96,11 +111,12 @@ template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
( (
const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>&> tssf, const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>&> tssf,
const CombineOp& cop const CombineOp& cop,
const Type& nullValue
) )
{ {
tmp<GeometricField<Type, fvPatchField, volMesh> > tmp<GeometricField<Type, fvPatchField, volMesh> >
tvf(cellReduce(cop, tssf)); tvf(cellReduce(cop, tssf, nullValue));
tssf.clear(); tssf.clear();
return tvf; return tvf;

8
src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,14 +53,16 @@ namespace fvc
tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
( (
const GeometricField<Type, fvsPatchField, surfaceMesh>&, const GeometricField<Type, fvsPatchField, surfaceMesh>&,
const CombineOp& cop const CombineOp& cop,
const Type& nullValue = pTraits<Type>::zero
); );
template<class Type, class CombineOp> template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
( (
const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&, const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&,
const CombineOp& cop const CombineOp& cop,
const Type& nullValue = pTraits<Type>::zero
); );
} }