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

Formatting

Browse source
This commit is contained in:
Hrvoje Jasak 2016-01-05 14:20:34 +00:00
parent 365f13718c
commit 75a529a8e6
4 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
View file

@ -47,7 +47,7 @@ namespace Foam
class polyMesh; class polyMesh;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interpolation Declaration Class interpolation Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class Type> template<class Type>
@ -143,22 +143,22 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeInterpolationType(SS, Type) \ #define makeInterpolationType(SS, Type) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\ \
interpolation<Type>::adddictionaryConstructorToTable<SS<Type> > \ interpolation<Type>::adddictionaryConstructorToTable<SS<Type> > \
add##SS##Type##ConstructorToTable_; add##SS##Type##ConstructorToTable_;
#define makeInterpolation(SS) \ #define makeInterpolation(SS) \
\ \
makeInterpolationType(SS, scalar) \ makeInterpolationType(SS, scalar) \
makeInterpolationType(SS, vector) \ makeInterpolationType(SS, vector) \
makeInterpolationType(SS, sphericalTensor) \ makeInterpolationType(SS, sphericalTensor) \
makeInterpolationType(SS, symmTensor) \ makeInterpolationType(SS, symmTensor) \
makeInterpolationType(SS, symmTensor4thOrder) \ makeInterpolationType(SS, symmTensor4thOrder) \
makeInterpolationType(SS, diagTensor) \ makeInterpolationType(SS, diagTensor) \
makeInterpolationType(SS, tensor) makeInterpolationType(SS, tensor)

2
src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H
View file

@ -42,7 +42,7 @@ namespace Foam
class fvMesh; class fvMesh;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interpolationCell Declaration Class interpolationCell Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class Type> template<class Type>

37
src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C
View file

@ -78,10 +78,10 @@ Type interpolationCellPointFace<Type>::interpolate
vector projection = position - cellCentre; vector projection = position - cellCentre;
tetPoints[3] = cellCentre; tetPoints[3] = cellCentre;
// ********************************************************************* // ********************************************************************
// project the cell-center through the point onto the face // project the cell-center through the point onto the face
// and get the closest face, ... // and get the closest face, ...
// ********************************************************************* // ********************************************************************
bool foundTet = false; bool foundTet = false;
label closestFace = -1; label closestFace = -1;
@ -99,7 +99,8 @@ Type interpolationCellPointFace<Type>::interpolate
scalar multiplierNumerator = (faceCentreTmp - cellCentre) & normal; scalar multiplierNumerator = (faceCentreTmp - cellCentre) & normal;
scalar multiplierDenominator = projection & normal; scalar multiplierDenominator = projection & normal;
// if normal and projection are not orthogonal this could be the one... // if normal and projection are not orthogonal this could be
// the one...
if (mag(multiplierDenominator) > SMALL) if (mag(multiplierDenominator) > SMALL)
{ {
scalar multiplier = multiplierNumerator/multiplierDenominator; scalar multiplier = multiplierNumerator/multiplierDenominator;
@ -114,11 +115,11 @@ Type interpolationCellPointFace<Type>::interpolate
} }
} }
// ********************************************************************* // ********************************************************************
// find the tetrahedron containing 'position' // find the tetrahedron containing 'position'
// from the cell center, face center and // from the cell center, face center and
// two other points on the face // two other points on the face
// ********************************************************************* // ********************************************************************
minDistance = GREAT; minDistance = GREAT;
if (closestFace != -1) if (closestFace != -1)
@ -153,9 +154,9 @@ Type interpolationCellPointFace<Type>::interpolate
} }
} }
// ********************************************************************* // ********************************************************************
// if the search failed check all the cell-faces // if the search failed check all the cell-faces
// ********************************************************************* // ********************************************************************
if (!foundTet) if (!foundTet)
{ {
@ -200,10 +201,10 @@ Type interpolationCellPointFace<Type>::interpolate
} }
} }
// ********************************************************************* // ********************************************************************
// if the tet was found do the interpolation, // if the tet was found do the interpolation,
// otherwise use the closest face value // otherwise use the closest face value
// ********************************************************************* // ********************************************************************
if (foundTet) if (foundTet)
{ {
@ -218,14 +219,18 @@ Type interpolationCellPointFace<Type>::interpolate
} }
else else
{ {
label patchi = this->pMesh_.boundaryMesh().whichPatch(closestFace); label patchi =
this->pMesh_.boundaryMesh().whichPatch(closestFace);
// If the boundary patch is not empty use the face value // If the boundary patch is not empty use the face value
// else use the cell value // else use the cell value
if (this->psi_.boundaryField()[patchi].size()) if (this->psi_.boundaryField()[patchi].size())
{ {
ts[2] = this->psi_.boundaryField()[patchi] ts[2] = this->psi_.boundaryField()[patchi]
[this->pMesh_.boundaryMesh()[patchi].whichFace(closestFace)]; [
this->pMesh_.boundaryMesh()[patchi].
whichFace(closestFace)
];
} }
else else
{ {
@ -235,7 +240,7 @@ Type interpolationCellPointFace<Type>::interpolate
ts[3] = this->psi_[nCell]; ts[3] = this->psi_[nCell];
for (label n=0; n<4; n++) for (label n = 0; n<4; n++)
{ {
phi[n] = min(1.0, phi[n]); phi[n] = min(1.0, phi[n]);
phi[n] = max(0.0, phi[n]); phi[n] = max(0.0, phi[n]);
@ -257,14 +262,18 @@ Type interpolationCellPointFace<Type>::interpolate
} }
else else
{ {
label patchi = this->pMesh_.boundaryMesh().whichPatch(closestFace); label patchi =
this->pMesh_.boundaryMesh().whichPatch(closestFace);
// If the boundary patch is not empty use the face value // If the boundary patch is not empty use the face value
// else use the cell value // else use the cell value
if (this->psi_.boundaryField()[patchi].size()) if (this->psi_.boundaryField()[patchi].size())
{ {
t = this->psi_.boundaryField()[patchi] t = this->psi_.boundaryField()[patchi]
[this->pMesh_.boundaryMesh()[patchi].whichFace(closestFace)]; [
this->pMesh_.boundaryMesh()[patchi].
whichFace(closestFace)
];
} }
else else
{ {

2
src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H
View file

@ -40,7 +40,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interpolationCellPointFace Declaration Class interpolationCellPointFace Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class Type> template<class Type>