fixing regionCoupleFvPatchField double templating
Conflicts: src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C
This commit is contained in:
parent
937b7d8ea0
commit
59e15370ce
2 changed files with 14 additions and 11 deletions
|
@ -30,6 +30,8 @@ Author
|
||||||
#include "regionCouplingFvPatchField.H"
|
#include "regionCouplingFvPatchField.H"
|
||||||
#include "symmTransformField.H"
|
#include "symmTransformField.H"
|
||||||
#include "magLongDelta.H"
|
#include "magLongDelta.H"
|
||||||
|
#include "volFields.H"
|
||||||
|
#include "surfaceFields.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -150,19 +152,19 @@ regionCouplingFvPatchField<Type>::regionCouplingFvPatchField
|
||||||
|
|
||||||
// Return a named shadow patch field
|
// Return a named shadow patch field
|
||||||
template<class Type>
|
template<class Type>
|
||||||
template<class GeometricField, class Type2>
|
template<class LookupField, class LookupType>
|
||||||
const typename GeometricField::PatchFieldType&
|
const typename LookupField::PatchFieldType&
|
||||||
regionCouplingFvPatchField<Type>::lookupShadowPatchField
|
regionCouplingFvPatchField<Type>::lookupShadowPatchField
|
||||||
(
|
(
|
||||||
const word& name,
|
const word& name,
|
||||||
const GeometricField*,
|
const LookupField*,
|
||||||
const Type2*
|
const LookupType*
|
||||||
) const
|
) const
|
||||||
{
|
{
|
||||||
// Lookup neighbour field
|
// Lookup neighbour field
|
||||||
const GeometricField& shadowField =
|
const LookupField& shadowField =
|
||||||
regionCouplePatch_.shadowRegion().
|
regionCouplePatch_.shadowRegion().
|
||||||
objectRegistry::lookupObject<GeometricField>(name);
|
objectRegistry::lookupObject<LookupField>(name);
|
||||||
|
|
||||||
return shadowField.boundaryField()[regionCouplePatch_.shadowIndex()];
|
return shadowField.boundaryField()[regionCouplePatch_.shadowIndex()];
|
||||||
}
|
}
|
||||||
|
@ -183,7 +185,7 @@ regionCouplingFvPatchField<Type>::shadowPatchField() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Return neighbour field
|
// Return neighbour field given internal cell data
|
||||||
template<class Type>
|
template<class Type>
|
||||||
tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField() const
|
tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField() const
|
||||||
{
|
{
|
||||||
|
@ -236,6 +238,7 @@ tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
void regionCouplingFvPatchField<Type>::initEvaluate
|
void regionCouplingFvPatchField<Type>::initEvaluate
|
||||||
(
|
(
|
||||||
|
|
|
@ -172,13 +172,13 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
//- Return a named shadow patch field
|
//- Return a named shadow patch field
|
||||||
template<class GeometricField, class Type2>
|
template<class LookupField, class LookupType>
|
||||||
const typename GeometricField::PatchFieldType&
|
const typename LookupField::PatchFieldType&
|
||||||
lookupShadowPatchField
|
lookupShadowPatchField
|
||||||
(
|
(
|
||||||
const word& name,
|
const word& name,
|
||||||
const GeometricField* = NULL,
|
const LookupField* = NULL,
|
||||||
const Type2* = NULL
|
const LookupType* = NULL
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in a new issue