ENH: add zip/unzip for GeometricField

This commit is contained in:
Mark Olesen
2019-11-15 17:29:50 +01:00
committed by Andrew Heather
parent a3d0a7d049
commit 2a8669b3f8
11 changed files with 835 additions and 6 deletions

View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -31,6 +32,223 @@ License
#define TEMPLATE template<template<class> class PatchField, class GeoMesh>
#include "GeometricFieldFunctionsM.C"
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::zip
(
GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& result,
const GeometricField<Cmpt, PatchField, GeoMesh>& xx,
const GeometricField<Cmpt, PatchField, GeoMesh>& xy,
const GeometricField<Cmpt, PatchField, GeoMesh>& xz,
const GeometricField<Cmpt, PatchField, GeoMesh>& yx,
const GeometricField<Cmpt, PatchField, GeoMesh>& yy,
const GeometricField<Cmpt, PatchField, GeoMesh>& yz,
const GeometricField<Cmpt, PatchField, GeoMesh>& zx,
const GeometricField<Cmpt, PatchField, GeoMesh>& zy,
const GeometricField<Cmpt, PatchField, GeoMesh>& zz
)
{
Foam::zip
(
result.primitiveFieldRef(),
xx.primitiveField(), xy.primitiveField(), xz.primitiveField(),
yx.primitiveField(), yy.primitiveField(), yz.primitiveField(),
zx.primitiveField(), zy.primitiveField(), zz.primitiveField()
);
Foam::zip
(
result.boundaryFieldRef(),
xx.boundaryField(), xy.boundaryField(), xz.boundaryField(),
yx.boundaryField(), yy.boundaryField(), yz.boundaryField(),
zx.boundaryField(), zy.boundaryField(), zz.boundaryField()
);
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::unzip
(
const GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& input,
GeometricField<Cmpt, PatchField, GeoMesh>& xx,
GeometricField<Cmpt, PatchField, GeoMesh>& xy,
GeometricField<Cmpt, PatchField, GeoMesh>& xz,
GeometricField<Cmpt, PatchField, GeoMesh>& yx,
GeometricField<Cmpt, PatchField, GeoMesh>& yy,
GeometricField<Cmpt, PatchField, GeoMesh>& yz,
GeometricField<Cmpt, PatchField, GeoMesh>& zx,
GeometricField<Cmpt, PatchField, GeoMesh>& zy,
GeometricField<Cmpt, PatchField, GeoMesh>& zz
)
{
Foam::unzip
(
input.primitiveField(),
xx.primitiveFieldRef(), xy.primitiveFieldRef(), xz.primitiveFieldRef(),
yx.primitiveFieldRef(), yy.primitiveFieldRef(), yz.primitiveFieldRef(),
zx.primitiveFieldRef(), zy.primitiveFieldRef(), zz.primitiveFieldRef()
);
Foam::unzip
(
input.boundaryField(),
xx.boundaryFieldRef(), xy.boundaryFieldRef(), xz.boundaryFieldRef(),
yx.boundaryFieldRef(), yy.boundaryFieldRef(), yz.boundaryFieldRef(),
zx.boundaryFieldRef(), zy.boundaryFieldRef(), zz.boundaryFieldRef()
);
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::zipRows
(
GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& result,
const GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& x,
const GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& y,
const GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& z
)
{
Foam::zipRows
(
result.primitiveFieldRef(),
x.primitiveField(),
y.primitiveField(),
z.primitiveField()
);
Foam::zipRows
(
result.boundaryFieldRef(),
x.boundaryField(),
y.boundaryField(),
z.boundaryField()
);
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::zipCols
(
GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& result,
const GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& x,
const GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& y,
const GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& z
)
{
Foam::zipCols
(
result.primitiveFieldRef(),
x.primitiveField(),
y.primitiveField(),
z.primitiveField()
);
Foam::zipCols
(
result.boundaryFieldRef(),
x.boundaryField(),
y.boundaryField(),
z.boundaryField()
);
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::unzipRows
(
const GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& input,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& x,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& y,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& z
)
{
Foam::unzipRows
(
input.primitiveField(),
x.primitiveFieldRef(),
y.primitiveFieldRef(),
z.primitiveFieldRef()
);
Foam::unzipRows
(
input.boundaryField(),
x.boundaryFieldRef(),
y.boundaryFieldRef(),
z.boundaryFieldRef()
);
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::unzipCols
(
const GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& input,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& x,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& y,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& z
)
{
Foam::unzipCols
(
input.primitiveField(),
x.primitiveFieldRef(),
y.primitiveFieldRef(),
z.primitiveFieldRef()
);
Foam::unzipCols
(
input.boundaryField(),
x.boundaryFieldRef(),
y.boundaryFieldRef(),
z.boundaryFieldRef()
);
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::unzipRow
(
const GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& input,
const vector::components cmpt,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& result
)
{
Foam::unzipRow(input.primitiveField(), cmpt, result.primitiveFieldRef());
Foam::unzipRow(input.boundaryField(), cmpt, result.boundaryFieldRef());
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::unzipCol
(
const GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& input,
const vector::components cmpt,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& result
)
{
Foam::unzipCol(input.primitiveField(), cmpt, result.primitiveFieldRef());
Foam::unzipCol(input.boundaryField(), cmpt, result.boundaryFieldRef());
}
template<class Cmpt, template<class> class PatchField, class GeoMesh>
void Foam::unzipDiag
(
const GeometricField<Tensor<Cmpt>, PatchField, GeoMesh>& input,
GeometricField<Vector<Cmpt>, PatchField, GeoMesh>& result
)
{
Foam::unzipDiag(input.primitiveField(), result.primitiveFieldRef());
Foam::unzipDiag(input.boundaryField(), result.boundaryFieldRef());
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@ -56,7 +274,7 @@ UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
UNARY_OPERATOR(vector, tensor, *, hdual, transform)
UNARY_OPERATOR(tensor, vector, *, hdual, transform)