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

ENH: Added cell interpolation updates to mappedField from self-contained variant

Browse Source
This commit is contained in:
andy
2011-11-29 15:07:32 +00:00
parent 1f9fd259fd
commit 8fca2f1ace
2 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
View File

@ -27,7 +27,6 @@ License
#include "volFields.H"
#include "interpolationCell.H"
#include "mapDistribute.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -47,7 +46,8 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
fixedValueFvPatchField<Type>(p, iF),
fieldName_(iF.name()),
setAverage_(false),
average_(pTraits<Type>::zero)
average_(pTraits<Type>::zero),
interpolationScheme_(interpolationCell<Type>::typeName)
{}
@ -64,7 +64,8 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
fieldName_(ptf.fieldName_),
setAverage_(ptf.setAverage_),
average_(ptf.average_)
average_(ptf.average_),
interpolationScheme_(ptf.interpolationScheme_)
{}
@ -80,8 +81,14 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
fixedValueFvPatchField<Type>(p, iF, dict),
fieldName_(dict.template lookupOrDefault<word>("fieldName", iF.name())),
setAverage_(readBool(dict.lookup("setAverage"))),
average_(pTraits<Type>(dict.lookup("average")))
{}
average_(pTraits<Type>(dict.lookup("average"))),
interpolationScheme_(interpolationCell<Type>::typeName)
{
if (mode() == mappedPatchBase::NEARESTCELL)
{
dict.lookup("interpolationScheme") >> interpolationScheme_;
}
}
template<class Type>
@ -99,7 +106,8 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
// My settings
const word& fieldName,
const bool setAverage,
const Type average
const Type average,
const word& interpolationScheme
)
:
mappedPatchBase
@ -113,7 +121,8 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
fixedValueFvPatchField<Type>(p, iF),
fieldName_(fieldName),
setAverage_(setAverage),
average_(average)
average_(average),
interpolationScheme_(interpolationScheme)
{}
@ -127,7 +136,8 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
fixedValueFvPatchField<Type>(ptf),
fieldName_(ptf.fieldName_),
setAverage_(ptf.setAverage_),
average_(ptf.average_)
average_(ptf.average_),
interpolationScheme_(ptf.interpolationScheme_)
{}
@ -142,7 +152,8 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
fixedValueFvPatchField<Type>(ptf, iF),
fieldName_(ptf.fieldName_),
setAverage_(ptf.setAverage_),
average_(ptf.average_)
average_(ptf.average_),
interpolationScheme_(ptf.interpolationScheme_)
{}
@ -180,6 +191,22 @@ mappedFieldFvPatchField<Type>::sampleField() const
}
template<class Type>
const interpolation<Type>&
mappedFieldFvPatchField<Type>::interpolator() const
{
if (!interpolator_.valid())
{
interpolator_ = interpolation<Type>::New
(
interpolationScheme_,
sampleField()
);
}
return interpolator_();
}
template<class Type>
void mappedFieldFvPatchField<Type>::updateCoeffs()
{
@ -195,6 +222,7 @@ void mappedFieldFvPatchField<Type>::updateCoeffs()
int oldTag = UPstream::msgType();
UPstream::msgType() = oldTag + 1;
const fvMesh& thisMesh = this->patch().boundaryMesh().mesh();
const fvMesh& nbrMesh = refCast<const fvMesh>(sampleMesh());
// Result of obtaining remote values
@ -204,9 +232,42 @@ void mappedFieldFvPatchField<Type>::updateCoeffs()
{
case NEARESTCELL:
{
newValues = sampleField();
const mapDistribute& mapDist = this->mappedPatchBase::map();
this->distribute(newValues);
if (interpolationScheme_ != interpolationCell<Type>::typeName)
{
// Need to do interpolation so need cells to sample
// Send back sample points to the processor that holds the cell
vectorField samples(samplePoints());
mapDist.reverseDistribute
(
(sameRegion() ? thisMesh.nCells() : nbrMesh.nCells()),
point::max,
samples
);
const interpolation<Type>& interp = interpolator();
newValues.setSize(samples.size(), pTraits<Type>::max);
forAll(samples, cellI)
{
if (samples[cellI] != point::max)
{
newValues[cellI] = interp.interpolate
(
samples[cellI],
cellI
);
}
}
}
else
{
newValues = sampleField();
}
mapDist.distribute(newValues);
break;
}
@ -306,6 +367,8 @@ void mappedFieldFvPatchField<Type>::write(Ostream& os) const
os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl;
os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
os.writeKeyword("average") << average_ << token::END_STATEMENT << nl;
os.writeKeyword("interpolationScheme") << interpolationScheme_
<< token::END_STATEMENT << nl;
this->writeEntry("value", os);
}

13
src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H
View File

@ -40,6 +40,7 @@ SourceFiles
#include "mappedPatchBase.H"
#include "fixedValueFvPatchFields.H"
#include "interpolation.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -69,12 +70,21 @@ class mappedFieldFvPatchField
// setAverage_ is set true
const Type average_;
//- Interpolation scheme to use for nearestCell mode
word interpolationScheme_;
//- Pointer to the cell interpolator
mutable autoPtr<interpolation<Type> > interpolator_;
// Private Member Functions
//- Field to sample. Either on my or nbr mesh
const GeometricField<Type, fvPatchField, volMesh>& sampleField() const;
//- Access the interpolation method
const interpolation<Type>& interpolator() const;
public:
@ -115,7 +125,8 @@ public:
// My settings
const word& fieldName,
const bool setAverage,
const Type average
const Type average,
const word& interpolationScheme
);
//- Construct by mapping given