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 zip/unzip for FieldField

Browse Source
This commit is contained in:
Mark Olesen
2019-11-15 13:32:27 +01:00
committed by Andrew Heather
parent 6882ed35a4
commit cf2b84ef32
13 changed files with 863 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenFOAM/fields/FieldFields/FieldField/FieldFields.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -34,6 +35,7 @@ Description
#define FieldFields_H
#include "scalarFieldField.H"
#include "vectorFieldField.H"
#include "tensorFieldField.H"
#include "sphericalTensorFieldField.H"

2
src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
View File

@ -38,8 +38,8 @@ SourceFiles
#ifndef scalarFieldField_H
#define scalarFieldField_H
#include "scalarField.H"
#include "FieldField.H"
#include "scalar.H"
#define TEMPLATE template<template<class> class Field>
#include "FieldFieldFunctionsM.H"

33
src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -33,12 +34,42 @@ Description
#define TEMPLATE template<template<class> class Field>
#include "FieldFieldFunctionsM.C"
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<template<class> class Field, class Cmpt>
void Foam::zip
(
FieldField<Field, SphericalTensor<Cmpt>>& result,
const FieldField<Field, Cmpt>& ii
)
{
forAll(result, i)
{
Foam::zip(result[i], ii[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzip
(
const FieldField<Field, SphericalTensor<Cmpt>>& input,
FieldField<Field, Cmpt>& ii
)
{
forAll(input, i)
{
Foam::unzip(input[i], ii[i]);
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * global functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
UNARY_FUNCTION(scalar, sphericalTensor, tr)
UNARY_FUNCTION(sphericalTensor, sphericalTensor, sph)

20
src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -48,6 +49,25 @@ SourceFiles
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
//- Zip together sphericalTensor field field from components
template<template<class> class Field, class Cmpt>
void zip
(
FieldField<Field, SphericalTensor<Cmpt>>& result,
const FieldField<Field, Cmpt>& ii
);
//- Unzip sphericalTensor field field into components
template<template<class> class Field, class Cmpt>
void unzip
(
const FieldField<Field, SphericalTensor<Cmpt>>& input,
FieldField<Field, Cmpt>& ii
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION(scalar, sphericalTensor, tr)

67
src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -33,6 +34,72 @@ Description
#define TEMPLATE template<template<class> class Field>
#include "FieldFieldFunctionsM.C"
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<template<class> class Field, class Cmpt>
void Foam::zip
(
FieldField<Field, SymmTensor<Cmpt>>& result,
const FieldField<Field, Cmpt>& xx,
const FieldField<Field, Cmpt>& xy,
const FieldField<Field, Cmpt>& xz,
const FieldField<Field, Cmpt>& yy,
const FieldField<Field, Cmpt>& yz,
const FieldField<Field, Cmpt>& zz
)
{
forAll(result, i)
{
Foam::zip
(
result[i],
xx[i], xy[i], xz[i],
/*yx*/ yy[i], yz[i],
/*zx zy */ zz[i]
);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzip
(
const FieldField<Field, SymmTensor<Cmpt>>& input,
FieldField<Field, Cmpt>& xx,
FieldField<Field, Cmpt>& xy,
FieldField<Field, Cmpt>& xz,
FieldField<Field, Cmpt>& yy,
FieldField<Field, Cmpt>& yz,
FieldField<Field, Cmpt>& zz
)
{
forAll(input, i)
{
Foam::unzip
(
input[i],
xx[i], xy[i], xz[i],
/*yx*/ yy[i], yz[i],
/*zx zy */ zz[i]
);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzipDiag
(
const FieldField<Field, SymmTensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& result
)
{
forAll(input, i)
{
Foam::unzipDiag(input[i], result[i]);
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam

38
src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -48,6 +49,43 @@ SourceFiles
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
//- Zip together symmTensor field field from components
template<template<class> class Field, class Cmpt>
void zip
(
FieldField<Field, SymmTensor<Cmpt>>& result,
const FieldField<Field, Cmpt>& xx,
const FieldField<Field, Cmpt>& xy,
const FieldField<Field, Cmpt>& xz,
const FieldField<Field, Cmpt>& yy,
const FieldField<Field, Cmpt>& yz,
const FieldField<Field, Cmpt>& zz
);
//- Unzip symmTensor field field into components
template<template<class> class Field, class Cmpt>
void unzip
(
const FieldField<Field, SymmTensor<Cmpt>>& input,
FieldField<Field, Cmpt>& xx,
FieldField<Field, Cmpt>& xy,
FieldField<Field, Cmpt>& xz,
FieldField<Field, Cmpt>& yy,
FieldField<Field, Cmpt>& yz,
FieldField<Field, Cmpt>& zz
);
//- Extract a symmTensor field field diagonal
template<template<class> class Field, class Cmpt>
void unzipDiag
(
const FieldField<Field, SymmTensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& result
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION(symmTensor, vector, sqr)

171
src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -33,12 +34,178 @@ Description
#define TEMPLATE template<template<class> class Field>
#include "FieldFieldFunctionsM.C"
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<template<class> class Field, class Cmpt>
void Foam::zip
(
FieldField<Field, Tensor<Cmpt>>& result,
const FieldField<Field, Cmpt>& xx,
const FieldField<Field, Cmpt>& xy,
const FieldField<Field, Cmpt>& xz,
const FieldField<Field, Cmpt>& yx,
const FieldField<Field, Cmpt>& yy,
const FieldField<Field, Cmpt>& yz,
const FieldField<Field, Cmpt>& zx,
const FieldField<Field, Cmpt>& zy,
const FieldField<Field, Cmpt>& zz
)
{
forAll(result, i)
{
Foam::zip
(
result[i],
xx[i], xy[i], xz[i],
yx[i], yy[i], yz[i],
zx[i], zy[i], zz[i]
);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzip
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Cmpt>& xx,
FieldField<Field, Cmpt>& xy,
FieldField<Field, Cmpt>& xz,
FieldField<Field, Cmpt>& yx,
FieldField<Field, Cmpt>& yy,
FieldField<Field, Cmpt>& yz,
FieldField<Field, Cmpt>& zx,
FieldField<Field, Cmpt>& zy,
FieldField<Field, Cmpt>& zz
)
{
forAll(input, i)
{
Foam::unzip
(
input[i],
xx[i], xy[i], xz[i],
yx[i], yy[i], yz[i],
zx[i], zy[i], zz[i]
);
}
}
template<template<class> class Field, class Cmpt>
void Foam::zipRows
(
FieldField<Field, Tensor<Cmpt>>& result,
const FieldField<Field, Vector<Cmpt>>& x,
const FieldField<Field, Vector<Cmpt>>& y,
const FieldField<Field, Vector<Cmpt>>& z
)
{
forAll(result, i)
{
Foam::zipRows(result[i], x[i], y[i], z[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::zipCols
(
FieldField<Field, Tensor<Cmpt>>& result,
const FieldField<Field, Vector<Cmpt>>& x,
const FieldField<Field, Vector<Cmpt>>& y,
const FieldField<Field, Vector<Cmpt>>& z
)
{
forAll(result, i)
{
Foam::zipCols(result[i], x[i], y[i], z[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzipRows
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& x,
FieldField<Field, Vector<Cmpt>>& y,
FieldField<Field, Vector<Cmpt>>& z
)
{
forAll(input, i)
{
Foam::unzipRows(input[i], x[i], y[i], z[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzipCols
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& x,
FieldField<Field, Vector<Cmpt>>& y,
FieldField<Field, Vector<Cmpt>>& z
)
{
forAll(input, i)
{
Foam::unzipCols(input[i], x[i], y[i], z[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzipRow
(
const FieldField<Field, Tensor<Cmpt>>& input,
const vector::components cmpt,
FieldField<Field, Vector<Cmpt>>& result
)
{
forAll(input, i)
{
Foam::unzipRow(input[i], cmpt, result[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzipCol
(
const FieldField<Field, Tensor<Cmpt>>& input,
const vector::components cmpt,
FieldField<Field, Vector<Cmpt>>& result
)
{
forAll(input, i)
{
Foam::unzipCol(input[i], cmpt, result[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzipDiag
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& result
)
{
forAll(input, i)
{
Foam::unzipDiag(input[i], result[i]);
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
UNARY_FUNCTION(scalar, tensor, tr)
UNARY_FUNCTION(sphericalTensor, tensor, sph)
@ -57,7 +224,7 @@ UNARY_FUNCTION(vector, symmTensor, eigenValues)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
UNARY_OPERATOR(vector, tensor, *, hdual)
UNARY_OPERATOR(tensor, vector, *, hdual)

105
src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -49,6 +50,110 @@ SourceFiles
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
//- Zip together tensor field field from components
template<template<class> class Field, class Cmpt>
void zip
(
FieldField<Field, Tensor<Cmpt>>& result,
const FieldField<Field, Cmpt>& xx,
const FieldField<Field, Cmpt>& xy,
const FieldField<Field, Cmpt>& xz,
const FieldField<Field, Cmpt>& yx,
const FieldField<Field, Cmpt>& yy,
const FieldField<Field, Cmpt>& yz,
const FieldField<Field, Cmpt>& zx,
const FieldField<Field, Cmpt>& zy,
const FieldField<Field, Cmpt>& zz
);
//- Unzip tensor field field into components
template<template<class> class Field, class Cmpt>
void unzip
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Cmpt>& xx,
FieldField<Field, Cmpt>& xy,
FieldField<Field, Cmpt>& xz,
FieldField<Field, Cmpt>& yx,
FieldField<Field, Cmpt>& yy,
FieldField<Field, Cmpt>& yz,
FieldField<Field, Cmpt>& zx,
FieldField<Field, Cmpt>& zy,
FieldField<Field, Cmpt>& zz
);
//- Zip together tensor field field from row components
template<template<class> class Field, class Cmpt>
void zipRows
(
FieldField<Field, Tensor<Cmpt>>& result,
const FieldField<Field, Vector<Cmpt>>& x,
const FieldField<Field, Vector<Cmpt>>& y,
const FieldField<Field, Vector<Cmpt>>& z
);
//- Zip together tensor field from column components
template<template<class> class Field, class Cmpt>
void zipCols
(
FieldField<Field, Tensor<Cmpt>>& result,
const FieldField<Field, Vector<Cmpt>>& x,
const FieldField<Field, Vector<Cmpt>>& y,
const FieldField<Field, Vector<Cmpt>>& z
);
//- Extract tensor field field rows
template<template<class> class Field, class Cmpt>
void unzipRows
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& x,
FieldField<Field, Vector<Cmpt>>& y,
FieldField<Field, Vector<Cmpt>>& z
);
//- Extract tensor field field columns
template<template<class> class Field, class Cmpt>
void unzipCols
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& x,
FieldField<Field, Vector<Cmpt>>& y,
FieldField<Field, Vector<Cmpt>>& z
);
//- Extract a tensor field field row (x,y,z) == (0,1,2)
template<template<class> class Field, class Cmpt>
void unzipRow
(
const FieldField<Field, Tensor<Cmpt>>& input,
const vector::components cmpt,
FieldField<Field, Vector<Cmpt>>& result
);
//- Extract a tensor field field column (x,y,z) == (0,1,2)
template<template<class> class Field, class Cmpt>
void unzipCol
(
const FieldField<Field, Tensor<Cmpt>>& input,
const vector::components cmpt,
FieldField<Field, Vector<Cmpt>>& result
);
//- Extract a tensor field field diagonal
template<template<class> class Field, class Cmpt>
void unzipDiag
(
const FieldField<Field, Tensor<Cmpt>>& input,
FieldField<Field, Vector<Cmpt>>& result
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION(scalar, tensor, tr)

64
src/OpenFOAM/fields/FieldFields/vectorFieldField/vectorFieldField.C Normal file
View File

@ -0,0 +1,64 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
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 "vectorFieldField.H"
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<template<class> class Field, class Cmpt>
void Foam::zip
(
FieldField<Field, Vector<Cmpt>>& result,
const FieldField<Field, Cmpt>& x,
const FieldField<Field, Cmpt>& y,
const FieldField<Field, Cmpt>& z
)
{
forAll(result, i)
{
Foam::zip(result[i], x[i], y[i], z[i]);
}
}
template<template<class> class Field, class Cmpt>
void Foam::unzip
(
const FieldField<Field, Vector<Cmpt>>& input,
FieldField<Field, Cmpt>& x,
FieldField<Field, Cmpt>& y,
FieldField<Field, Cmpt>& z
)
{
forAll(input, i)
{
Foam::unzip(input[i], x[i], y[i], z[i]);
}
}
// ************************************************************************* //

85
src/OpenFOAM/fields/FieldFields/vectorFieldField/vectorFieldField.H Normal file
View File

@ -0,0 +1,85 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
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/>.
InClass
Foam::vectorFieldField
Description
Specialisation of FieldField\<T\> for vector.
SourceFiles
vectorFieldField.C
\*---------------------------------------------------------------------------*/
#ifndef vectorFieldField_H
#define vectorFieldField_H
#include "scalarFieldField.H"
#include "vectorField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * * //
//- Compose a vector field field from components
template<template<class> class Field, class Cmpt>
void zip
(
FieldField<Field, Vector<Cmpt>>& result,
const FieldField<Field, Cmpt>& x,
const FieldField<Field, Cmpt>& y,
const FieldField<Field, Cmpt>& z
);
//- Unzip vector field field into components
template<template<class> class Field, class Cmpt>
void unzip
(
const FieldField<Field, Vector<Cmpt>>& input,
FieldField<Field, Cmpt>& x,
FieldField<Field, Cmpt>& y,
FieldField<Field, Cmpt>& z
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "vectorFieldField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //