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

BUG: cyclicAMI: defaultValues are on *this. Fixes #2226.

Browse Source
This commit is contained in:
mattijs
2021-10-06 11:04:10 +01:00
parent 9ad7e87000
commit 3c0fef819b
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
View File

@ -92,20 +92,11 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
auto tlocalFld(tmp<Field<Type>>::New(fld.size())); auto tlocalFld(tmp<Field<Type>>::New(fld.size()));
Field<Type>& localFld = tlocalFld.ref(); Field<Type>& localFld = tlocalFld.ref();
List<Type> localDeflt(defaultValues.size());
// Transform to cylindrical coords // Transform to cylindrical coords
{ {
tmp<tensorField> nbrT(cs().R(nbrPp.faceCentres())); tmp<tensorField> nbrT(cs().R(nbrPp.faceCentres()));
localFld = Foam::invTransform(nbrT(), fld); localFld = Foam::invTransform(nbrT(), fld);
if (defaultValues.size() == fld.size())
{
// We get in UList (why? Copied from cyclicAMI). Convert to
// Field so we can use transformField routines.
const SubField<Type> defaultSubFld(defaultValues);
const Field<Type>& defaultFld(defaultSubFld);
localDeflt = Foam::invTransform(nbrT, defaultFld);
}
} }
if (debug&2) if (debug&2)
@ -129,13 +120,26 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
} }
} }
const vectorField::subField fc(this->faceCentres());
const tmp<tensorField> T(cs().R(this->faceCentres()));
List<Type> localDeflt(defaultValues.size());
if (defaultValues.size() == size())
{
// Transform default values into cylindrical coords (using
// *this faceCentres)
// We get in UList (why? Copied from cyclicAMI). Convert to
// Field so we can use transformField routines.
const SubField<Type> defaultSubFld(defaultValues);
const Field<Type>& defaultFld(defaultSubFld);
localDeflt = Foam::invTransform(T(), defaultFld);
}
// Do the actual interpolation and interpolate back to cartesian // Do the actual interpolation and interpolate back to cartesian
// coords // coords
return Foam::transform return Foam::transform
( (
cs().R(fc), T,
interpolateUntransformed(localFld, localDeflt) interpolateUntransformed(localFld, localDeflt)
); );
} }