OverlapGGI merge: Oliver Borm

This commit is contained in:
Hrvoje Jasak 2010-10-14 15:31:25 +01:00
parent e2baa21242
commit af259832fa
2 changed files with 6 additions and 7 deletions

View file

@ -27,7 +27,7 @@ Class
Author Author
Hrvoje Jasak, Wikki Ltd. All rights reserved Hrvoje Jasak, Wikki Ltd. All rights reserved
Fethi Tekin, All rights reserved, Fethi Tekin, All rights reserved
Description Description
Mass-conservative face interpolation: typedef for stand-alone patch to Mass-conservative face interpolation: typedef for stand-alone patch to

View file

@ -24,7 +24,7 @@ License
Author Author
Hrvoje Jasak, Wikki Ltd. All rights reserved. Hrvoje Jasak, Wikki Ltd. All rights reserved.
Fethi Tekin, All rights reserved. Fethi Tekin, All rights reserved. fethitekin@gmail.com
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -43,6 +43,7 @@ Foam::overlapGgiPolyPatch::expandSlaveData(const Field<Type>& spf) const
const label ncp = shadow().nCopies(); const label ncp = shadow().nCopies();
tmp<Field<Type> > tef(new Field<Type>(ncp*spf.size())); tmp<Field<Type> > tef(new Field<Type>(ncp*spf.size()));
Field<Type>& ef = tef(); Field<Type>& ef = tef();
label nFaces = 0; label nFaces = 0;
@ -67,11 +68,12 @@ template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::tmp<Foam::Field<Type> >
Foam::overlapGgiPolyPatch::expandMasterData(const Field<Type>& spf) const Foam::overlapGgiPolyPatch::expandMasterData(const Field<Type>& spf) const
{ {
const scalar masterAngle = angle(); const scalar masterAngle = shadow().angle();
const label ncpm = nCopies(); const label ncpm = shadow().nCopies();
tmp<Field<Type> > tef(new Field<Type>(ncpm*spf.size())); tmp<Field<Type> > tef(new Field<Type>(ncpm*spf.size()));
Field<Type>& ef = tef(); Field<Type>& ef = tef();
label nFaces = 0; label nFaces = 0;
@ -91,8 +93,6 @@ Foam::overlapGgiPolyPatch::expandMasterData(const Field<Type>& spf) const
return tef; return tef;
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
@ -155,5 +155,4 @@ Foam::overlapGgiPolyPatch::interpolate(const tmp<Field<Type> >& tpf) const
} }
} }
// ************************************************************************* // // ************************************************************************* //