exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hack clean-up: Vector<bool>

Browse source
This commit is contained in:
Hrvoje Jasak 2011-01-20 00:49:41 +00:00
parent b59b86bd1e
commit a0162ece8a
2 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
View file

@ -61,45 +61,45 @@ void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
}
scalar scale = magSqr(tf1[0]);
Vector<bool> removeCmpts
(
magSqr(tf1[0].xx())/scale < SMALL,
magSqr(tf1[0].yy())/scale < SMALL,
magSqr(tf1[0].zz())/scale < SMALL
);
if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
// Fixed terrible hack. HJ, 20/Jan/2011
boolList removeCmpts(3);
removeCmpts[0] = magSqr(tf1[0].xx())/scale < SMALL;
removeCmpts[1] = magSqr(tf1[0].yy())/scale < SMALL;
removeCmpts[2] = magSqr(tf1[0].zz())/scale < SMALL;
if (removeCmpts[0] || removeCmpts[1] || removeCmpts[2])
{
symmTensorField tf1Plus(tf1);
if (removeCmpts.x())
if (removeCmpts[0])
{
tf1Plus += symmTensor(1,0,0,0,0,0);
}
if (removeCmpts.y())
if (removeCmpts[1])
{
tf1Plus += symmTensor(0,0,0,1,0,0);
}
if (removeCmpts.z())
if (removeCmpts[2])
{
tf1Plus += symmTensor(0,0,0,0,0,1);
}
TFOR_ALL_F_OP_FUNC_F(symmTensor, tf, =, inv, symmTensor, tf1Plus)
if (removeCmpts.x())
if (removeCmpts[0])
{
tf -= symmTensor(1,0,0,0,0,0);
}
if (removeCmpts.y())
if (removeCmpts[1])
{
tf -= symmTensor(0,0,0,1,0,0);
}
if (removeCmpts.z())
if (removeCmpts[2])
{
tf -= symmTensor(0,0,0,0,0,1);
}

28
src/OpenFOAM/fields/Fields/tensorField/tensorField.C
View file

@ -26,6 +26,7 @@ License
#include "tensorField.H"
#include "transformField.H"
#include "boolList.H"
#define TEMPLATE
#include "FieldFunctionsM.C"
@ -61,45 +62,46 @@ void inv(Field<tensor>& tf, const UList<tensor>& tf1)
}
scalar scale = magSqr(tf1[0]);
Vector<bool> removeCmpts
(
magSqr(tf1[0].xx())/scale < SMALL,
magSqr(tf1[0].yy())/scale < SMALL,
magSqr(tf1[0].zz())/scale < SMALL
);
if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
// Fixed terrible hack. HJ, 20/Jan/2011
boolList removeCmpts(3);
removeCmpts[0] = magSqr(tf1[0].xx())/scale < SMALL;
removeCmpts[1] = magSqr(tf1[0].yy())/scale < SMALL;
removeCmpts[2] = magSqr(tf1[0].zz())/scale < SMALL;
if (removeCmpts[0] || removeCmpts[1] || removeCmpts[2])
{
tensorField tf1Plus(tf1);
if (removeCmpts.x())
if (removeCmpts[0])
{
tf1Plus += tensor(1,0,0,0,0,0,0,0,0);
}
if (removeCmpts.y())
if (removeCmpts[1])
{
tf1Plus += tensor(0,0,0,0,1,0,0,0,0);
}
if (removeCmpts.z())
if (removeCmpts[2])
{
tf1Plus += tensor(0,0,0,0,0,0,0,0,1);
}
TFOR_ALL_F_OP_FUNC_F(tensor, tf, =, inv, tensor, tf1Plus)
if (removeCmpts.x())
if (removeCmpts[0])
{
tf -= tensor(1,0,0,0,0,0,0,0,0);
}
if (removeCmpts.y())
if (removeCmpts[1])
{
tf -= tensor(0,0,0,0,1,0,0,0,0);
}
if (removeCmpts.z())
if (removeCmpts[2])
{
tf -= tensor(0,0,0,0,0,0,0,0,1);
}