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: faMatrix - added dot operator functions

Browse Source
This commit is contained in:
Andrew Heather
2022-09-09 13:12:15 +01:00
parent fc19ca39f3
commit 913c45afff
2 changed files with 193 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/finiteArea/faMatrices/faMatrix/faMatrix.C
View File

@ -2074,6 +2074,127 @@ Foam::tmp<Foam::faMatrix<Type>> Foam::operator*
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::operator&
(
const faMatrix<Type>& M,
const DimensionedField<Type, areaMesh>& psi
)
{
auto tMphi = tmp<GeometricField<Type, faPatchField, areaMesh>>::New
(
IOobject
(
"M&" + psi.name(),
psi.instance(),
psi.mesh().mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
psi.mesh(),
M.dimensions()/dimArea
);
auto& Mphi = tMphi.ref();
// Loop over field components
if (M.hasDiag())
{
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{
scalarField psiCmpt(psi.field().component(cmpt));
scalarField boundaryDiagCmpt(M.diag());
M.addBoundaryDiag(boundaryDiagCmpt, cmpt);
Mphi.primitiveFieldRef().replace(cmpt, -boundaryDiagCmpt*psiCmpt);
}
}
else
{
Mphi.primitiveFieldRef() = Zero;
}
Mphi.primitiveFieldRef() += M.lduMatrix::H(psi.field()) + M.source();
M.addBoundarySource(Mphi.primitiveFieldRef());
Mphi.primitiveFieldRef() /= -psi.mesh().S();
Mphi.correctBoundaryConditions();
return tMphi;
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::operator&
(
const faMatrix<Type>& M,
const tmp<DimensionedField<Type, areaMesh>>& tpsi
)
{
tmp<GeometricField<Type, faPatchField, areaMesh>> tMpsi = M & tpsi();
tpsi.clear();
return tMpsi;
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::operator&
(
const faMatrix<Type>& M,
const tmp<GeometricField<Type, faPatchField, areaMesh>>& tpsi
)
{
tmp<GeometricField<Type, faPatchField, areaMesh>> tMpsi = M & tpsi();
tpsi.clear();
return tMpsi;
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::operator&
(
const tmp<faMatrix<Type>>& tM,
const DimensionedField<Type, areaMesh>& psi
)
{
tmp<GeometricField<Type, faPatchField, areaMesh>> tMpsi = tM() & psi;
tM.clear();
return tMpsi;
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::operator&
(
const tmp<faMatrix<Type>>& tM,
const tmp<DimensionedField<Type, areaMesh>>& tpsi
)
{
tmp<GeometricField<Type, faPatchField, areaMesh>> tMpsi = tM() & tpsi();
tM.clear();
tpsi.clear();
return tMpsi;
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::operator&
(
const tmp<faMatrix<Type>>& tM,
const tmp<GeometricField<Type, faPatchField, areaMesh>>& tpsi
)
{
tmp<GeometricField<Type, faPatchField, areaMesh>> tMpsi = tM() & tpsi();
tM.clear();
tpsi.clear();
return tMpsi;
}
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class Type>

72
src/finiteArea/faMatrices/faMatrix/faMatrix.H
View File

@ -64,6 +64,47 @@ template<class T> class UIndirectList;
template<class Type>
Ostream& operator<<(Ostream&, const faMatrix<Type>&);
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> operator&
(
const faMatrix<Type>&,
const DimensionedField<Type, areaMesh>&
);
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> operator&
(
const faMatrix<Type>&,
const tmp<DimensionedField<Type, areaMesh>>&
);
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> operator&
(
const faMatrix<Type>&,
const tmp<GeometricField<Type, faPatchField, areaMesh>>&
);
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> operator&
(
const tmp<faMatrix<Type>>&,
const DimensionedField<Type, areaMesh>&
);
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> operator&
(
const tmp<faMatrix<Type>>&,
const tmp<DimensionedField<Type, areaMesh>>&
);
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> operator&
(
const tmp<faMatrix<Type>>&,
const tmp<GeometricField<Type, faPatchField, areaMesh>>&
);
/*---------------------------------------------------------------------------*\
Class faMatrix Declaration
@ -469,6 +510,37 @@ public:
void operator*=(const dimensioned<scalar>&);
// Friend Operators
friend tmp<GeometricField<Type, faPatchField, areaMesh>>
operator& <Type>
(
const faMatrix<Type>&,
const DimensionedField<Type, areaMesh>&
);
friend tmp<GeometricField<Type, faPatchField, areaMesh>>
operator& <Type>
(
const faMatrix<Type>&,
const tmp<GeometricField<Type, faPatchField, areaMesh>>&
);
friend tmp<GeometricField<Type, faPatchField, areaMesh>>
operator& <Type>
(
const tmp<faMatrix<Type>>&,
const DimensionedField<Type, areaMesh>&
);
friend tmp<GeometricField<Type, faPatchField, areaMesh>>
operator& <Type>
(
const tmp<faMatrix<Type>>&,
const tmp<GeometricField<Type, faPatchField, areaMesh>>&
);
// Ostream Operator
friend Ostream& operator<< <Type>