Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2011-11-18 12:44:17 +00:00
2 changed files with 6 additions and 8 deletions

View File

@ -745,8 +745,6 @@ void Foam::cyclicAMIPolyPatch::calcGeometry
nbrCtrs, nbrCtrs,
nbrAreas nbrAreas
); );
resetAMI();
} }

View File

@ -33,11 +33,11 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
{ {
if (owner()) if (owner())
{ {
return AMIPtr_->interpolateToSource(fld); return AMI().interpolateToSource(fld);
} }
else else
{ {
return neighbPatch().AMIPtr_->interpolateToTarget(fld); return neighbPatch().AMI().interpolateToTarget(fld);
} }
} }
@ -50,11 +50,11 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
{ {
if (owner()) if (owner())
{ {
return AMIPtr_->interpolateToSource(tFld); return AMI().interpolateToSource(tFld);
} }
else else
{ {
return neighbPatch().AMIPtr_->interpolateToTarget(tFld); return neighbPatch().AMI().interpolateToTarget(tFld);
} }
} }
@ -69,11 +69,11 @@ void Foam::cyclicAMIPolyPatch::interpolate
{ {
if (owner()) if (owner())
{ {
AMIPtr_->interpolateToSource(fld, bop, result); AMI().interpolateToSource(fld, bop, result);
} }
else else
{ {
neighbPatch().AMIPtr_->interpolateToTarget(fld, bop, result); neighbPatch().AMI().interpolateToTarget(fld, bop, result);
} }
} }