MPPIC: Removed moment averaging method
Resolves bug report https://bugs.openfoam.org/view.php?id=4047
This commit is contained in:
Will Bainbridge
@ -1,213 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------*\
|
|
||||||
========= |
|
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
||||||
\\ / O peration | Website: https://openfoam.org
|
|
||||||
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation
|
|
||||||
\\/ M anipulation |
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
License
|
|
||||||
This file is part of OpenFOAM.
|
|
||||||
|
|
||||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
||||||
under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
\*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
#include "Moment.H"
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
Foam::AveragingMethods::Moment<Type>::Moment
|
|
||||||
(
|
|
||||||
const IOobject& io,
|
|
||||||
const dictionary& dict,
|
|
||||||
const fvMesh& mesh
|
|
||||||
)
|
|
||||||
:
|
|
||||||
AveragingMethod<Type>(io, dict, mesh, labelList(4, mesh.nCells())),
|
|
||||||
data_(FieldField<Field, Type>::operator[](0)),
|
|
||||||
dataX_(FieldField<Field, Type>::operator[](1)),
|
|
||||||
dataY_(FieldField<Field, Type>::operator[](2)),
|
|
||||||
dataZ_(FieldField<Field, Type>::operator[](3)),
|
|
||||||
transform_(mesh.nCells(), Zero),
|
|
||||||
scale_(0.5*pow(mesh.V(), 1.0/3.0))
|
|
||||||
{
|
|
||||||
scalar a = 1.0/24.0;
|
|
||||||
scalar b = 0.5854101966249685;
|
|
||||||
scalar c = 0.1381966011250105;
|
|
||||||
|
|
||||||
scalarField wQ(4);
|
|
||||||
wQ[0] = a;
|
|
||||||
wQ[1] = a;
|
|
||||||
wQ[2] = a;
|
|
||||||
wQ[3] = a;
|
|
||||||
|
|
||||||
vectorField xQ(4);
|
|
||||||
xQ[0] = vector(b, c, c);
|
|
||||||
xQ[1] = vector(c, b, c);
|
|
||||||
xQ[2] = vector(c, c, b);
|
|
||||||
xQ[3] = vector(c, c, c);
|
|
||||||
|
|
||||||
forAll(mesh.C(), celli)
|
|
||||||
{
|
|
||||||
const List<tetIndices> cellTets =
|
|
||||||
polyMeshTetDecomposition::cellTetIndices(mesh, celli);
|
|
||||||
|
|
||||||
symmTensor A(Zero);
|
|
||||||
|
|
||||||
forAll(cellTets, tetI)
|
|
||||||
{
|
|
||||||
const tetIndices& tetIs = cellTets[tetI];
|
|
||||||
const triFace triIs = tetIs.faceTriIs(mesh);
|
|
||||||
|
|
||||||
const tensor T
|
|
||||||
(
|
|
||||||
tensor
|
|
||||||
(
|
|
||||||
mesh.points()[triIs[0]] - mesh.C()[celli],
|
|
||||||
mesh.points()[triIs[1]] - mesh.C()[celli],
|
|
||||||
mesh.points()[triIs[2]] - mesh.C()[celli]
|
|
||||||
).T()
|
|
||||||
);
|
|
||||||
|
|
||||||
const vectorField d((T & xQ)/scale_[celli]);
|
|
||||||
|
|
||||||
const scalar v(6.0*tetIs.tet(mesh).mag()/mesh.V()[celli]);
|
|
||||||
|
|
||||||
A += v*sum(wQ*sqr(d));
|
|
||||||
}
|
|
||||||
|
|
||||||
transform_[celli] = inv(A);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
Foam::AveragingMethods::Moment<Type>::Moment
|
|
||||||
(
|
|
||||||
const Moment<Type>& am
|
|
||||||
)
|
|
||||||
:
|
|
||||||
AveragingMethod<Type>(am),
|
|
||||||
data_(FieldField<Field, Type>::operator[](0)),
|
|
||||||
dataX_(FieldField<Field, Type>::operator[](1)),
|
|
||||||
dataY_(FieldField<Field, Type>::operator[](2)),
|
|
||||||
dataZ_(FieldField<Field, Type>::operator[](3)),
|
|
||||||
transform_(am.transform_)
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
Foam::AveragingMethods::Moment<Type>::~Moment()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
void Foam::AveragingMethods::Moment<Type>::updateGrad()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
void Foam::AveragingMethods::Moment<Type>::add
|
|
||||||
(
|
|
||||||
const barycentric& coordinates,
|
|
||||||
const tetIndices& tetIs,
|
|
||||||
const Type& value
|
|
||||||
)
|
|
||||||
{
|
|
||||||
const label celli = tetIs.cell();
|
|
||||||
const triFace triIs = tetIs.faceTriIs(this->mesh_);
|
|
||||||
|
|
||||||
const point delta =
|
|
||||||
(coordinates[0] - 1)*this->mesh_.C()[celli]
|
|
||||||
+ coordinates[1]*this->mesh_.points()[triIs[0]]
|
|
||||||
+ coordinates[2]*this->mesh_.points()[triIs[1]]
|
|
||||||
+ coordinates[3]*this->mesh_.points()[triIs[2]];
|
|
||||||
|
|
||||||
const Type v = value/this->mesh_.V()[celli];
|
|
||||||
const GradType dv = transform_[celli] & (v*delta/scale_[celli]);
|
|
||||||
|
|
||||||
data_[celli] += v;
|
|
||||||
dataX_[celli] += v + dv.x();
|
|
||||||
dataY_[celli] += v + dv.y();
|
|
||||||
dataZ_[celli] += v + dv.z();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
Type Foam::AveragingMethods::Moment<Type>::interpolate
|
|
||||||
(
|
|
||||||
const barycentric& coordinates,
|
|
||||||
const tetIndices& tetIs
|
|
||||||
) const
|
|
||||||
{
|
|
||||||
const label celli = tetIs.cell();
|
|
||||||
const triFace triIs = tetIs.faceTriIs(this->mesh_);
|
|
||||||
|
|
||||||
const point delta =
|
|
||||||
(coordinates[0] - 1)*this->mesh_.C()[celli]
|
|
||||||
+ coordinates[1]*this->mesh_.points()[triIs[0]]
|
|
||||||
+ coordinates[2]*this->mesh_.points()[triIs[1]]
|
|
||||||
+ coordinates[3]*this->mesh_.points()[triIs[2]];
|
|
||||||
|
|
||||||
return
|
|
||||||
data_[celli]
|
|
||||||
+ (
|
|
||||||
GradType
|
|
||||||
(
|
|
||||||
dataX_[celli] - data_[celli],
|
|
||||||
dataY_[celli] - data_[celli],
|
|
||||||
dataZ_[celli] - data_[celli]
|
|
||||||
)
|
|
||||||
& delta/scale_[celli]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
typename Foam::AveragingMethods::Moment<Type>::GradType
|
|
||||||
Foam::AveragingMethods::Moment<Type>::interpolateGrad
|
|
||||||
(
|
|
||||||
const barycentric& coordinates,
|
|
||||||
const tetIndices& tetIs
|
|
||||||
) const
|
|
||||||
{
|
|
||||||
const label celli(tetIs.cell());
|
|
||||||
|
|
||||||
return
|
|
||||||
GradType
|
|
||||||
(
|
|
||||||
dataX_[celli] - data_[celli],
|
|
||||||
dataY_[celli] - data_[celli],
|
|
||||||
dataZ_[celli] - data_[celli]
|
|
||||||
)/scale_[celli];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
Foam::tmp<Foam::Field<Type>>
|
|
||||||
Foam::AveragingMethods::Moment<Type>::primitiveField() const
|
|
||||||
{
|
|
||||||
return tmp<Field<Type>>(data_);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ************************************************************************* //
|
|
||||||
@ -1,183 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------*\
|
|
||||||
========= |
|
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
||||||
\\ / O peration | Website: https://openfoam.org
|
|
||||||
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation
|
|
||||||
\\/ M anipulation |
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
License
|
|
||||||
This file is part of OpenFOAM.
|
|
||||||
|
|
||||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
||||||
under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Class
|
|
||||||
Foam::AveragingMethods::Moment
|
|
||||||
|
|
||||||
Description
|
|
||||||
Moment lagrangian averaging procedure.
|
|
||||||
|
|
||||||
Point values and moments from the cell centroid are summed over
|
|
||||||
computational cells. A linear function is generated which has the same
|
|
||||||
integrated moment as that of the point data.
|
|
||||||
|
|
||||||
The computed linear function is used to interpolate values within a cell.
|
|
||||||
The gradient is calculated from the coefficients of the function, and is
|
|
||||||
assumed constant over the cell.
|
|
||||||
|
|
||||||
SourceFiles
|
|
||||||
Moment.C
|
|
||||||
|
|
||||||
\*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
#ifndef Moment_H
|
|
||||||
#define Moment_H
|
|
||||||
|
|
||||||
#include "AveragingMethod.H"
|
|
||||||
#include "pointMesh.H"
|
|
||||||
#include "tetIndices.H"
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
namespace Foam
|
|
||||||
{
|
|
||||||
namespace AveragingMethods
|
|
||||||
{
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*\
|
|
||||||
Class Moment Declaration
|
|
||||||
\*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
template<class Type>
|
|
||||||
class Moment
|
|
||||||
:
|
|
||||||
public AveragingMethod<Type>
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
// Public Typedefs
|
|
||||||
|
|
||||||
//- Gradient type
|
|
||||||
typedef typename AveragingMethod<Type>::GradType GradType;
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
// Private data
|
|
||||||
|
|
||||||
//- Data mean
|
|
||||||
Field<Type>& data_;
|
|
||||||
|
|
||||||
//- X-data moment
|
|
||||||
Field<Type>& dataX_;
|
|
||||||
|
|
||||||
//- Y-data moment
|
|
||||||
Field<Type>& dataY_;
|
|
||||||
|
|
||||||
//- Z-data moment
|
|
||||||
Field<Type>& dataZ_;
|
|
||||||
|
|
||||||
//- Transform tensor from moment to gradient
|
|
||||||
Field<symmTensor> transform_;
|
|
||||||
|
|
||||||
//- Length scale for moment values
|
|
||||||
Field<scalar> scale_;
|
|
||||||
|
|
||||||
|
|
||||||
// Private Member Functions
|
|
||||||
|
|
||||||
//- Re-calculate gradient
|
|
||||||
virtual void updateGrad();
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
//- Runtime type information
|
|
||||||
TypeName("moment");
|
|
||||||
|
|
||||||
|
|
||||||
//- Constructors
|
|
||||||
|
|
||||||
//- Construct from components
|
|
||||||
Moment
|
|
||||||
(
|
|
||||||
const IOobject& io,
|
|
||||||
const dictionary& dict,
|
|
||||||
const fvMesh &mesh
|
|
||||||
);
|
|
||||||
|
|
||||||
//- Construct a copy
|
|
||||||
Moment(const Moment<Type>& am);
|
|
||||||
|
|
||||||
//- Construct and return a clone
|
|
||||||
virtual autoPtr<AveragingMethod<Type>> clone() const
|
|
||||||
{
|
|
||||||
return autoPtr<AveragingMethod<Type>>
|
|
||||||
(
|
|
||||||
new Moment<Type>(*this)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//- Destructor
|
|
||||||
virtual ~Moment();
|
|
||||||
|
|
||||||
|
|
||||||
//- Member Functions
|
|
||||||
|
|
||||||
//- Add point value to interpolation
|
|
||||||
void add
|
|
||||||
(
|
|
||||||
const barycentric& coordinates,
|
|
||||||
const tetIndices& tetIs,
|
|
||||||
const Type& value
|
|
||||||
);
|
|
||||||
|
|
||||||
//- Interpolate
|
|
||||||
Type interpolate
|
|
||||||
(
|
|
||||||
const barycentric& coordinates,
|
|
||||||
const tetIndices& tetIs
|
|
||||||
) const;
|
|
||||||
|
|
||||||
//- Interpolate gradient
|
|
||||||
GradType interpolateGrad
|
|
||||||
(
|
|
||||||
const barycentric& coordinates,
|
|
||||||
const tetIndices& tetIs
|
|
||||||
) const;
|
|
||||||
|
|
||||||
//- Return an internal field of the average
|
|
||||||
tmp<Field<Type>> primitiveField() const;
|
|
||||||
|
|
||||||
//- Return an internal field of the gradient
|
|
||||||
tmp<Field<GradType>> internalFieldGrad() const;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
} // End namespace AveragingMethods
|
|
||||||
} // End namespace Foam
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
#ifdef NoRepository
|
|
||||||
#include "Moment.C"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ************************************************************************* //
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration | Website: https://openfoam.org
|
\\ / O peration | Website: https://openfoam.org
|
||||||
\\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2013-2024 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -29,7 +29,6 @@ License
|
|||||||
|
|
||||||
#include "Basic.H"
|
#include "Basic.H"
|
||||||
#include "Dual.H"
|
#include "Dual.H"
|
||||||
#include "Moment.H"
|
|
||||||
|
|
||||||
// Scalar interpolation
|
// Scalar interpolation
|
||||||
defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::scalar>, 0);
|
defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::scalar>, 0);
|
||||||
@ -94,24 +93,4 @@ adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::vector>>
|
|||||||
addDualvectorConstructorToTable_;
|
addDualvectorConstructorToTable_;
|
||||||
|
|
||||||
|
|
||||||
// Moment interpolation
|
|
||||||
defineNamedTemplateTypeNameAndDebug
|
|
||||||
(
|
|
||||||
Foam::AveragingMethods::Moment<Foam::scalar>,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
Foam::AveragingMethod<Foam::scalar>::
|
|
||||||
adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::scalar>>
|
|
||||||
addMomentscalarConstructorToTable_;
|
|
||||||
|
|
||||||
defineNamedTemplateTypeNameAndDebug
|
|
||||||
(
|
|
||||||
Foam::AveragingMethods::Moment<Foam::vector>,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
Foam::AveragingMethod<Foam::vector>::
|
|
||||||
adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::vector>>
|
|
||||||
addMomentvectorConstructorToTable_;
|
|
||||||
|
|
||||||
|
|
||||||
// ************************************************************************* //
|
// ************************************************************************* //
|
||||||
|
|||||||
Reference in New Issue
Block a user