fixing regionCoupleFvPatchField double templating

Conflicts:

	src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C
This commit is contained in:
Hrvoje Jasak 2011-09-29 10:42:09 +01:00
parent 30fdce1de4
commit 6d3f609b92
2 changed files with 14 additions and 11 deletions

View file

@ -30,6 +30,8 @@ Author
#include "regionCouplingFvPatchField.H"
#include "symmTransformField.H"
#include "magLongDelta.H"
#include "volFields.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -150,19 +152,19 @@ regionCouplingFvPatchField<Type>::regionCouplingFvPatchField
// Return a named shadow patch field
template<class Type>
template<class GeometricField, class Type2>
const typename GeometricField::PatchFieldType&
template<class LookupField, class LookupType>
const typename LookupField::PatchFieldType&
regionCouplingFvPatchField<Type>::lookupShadowPatchField
(
const word& name,
const GeometricField*,
const Type2*
const LookupField*,
const LookupType*
) const
{
// Lookup neighbour field
const GeometricField& shadowField =
const LookupField& shadowField =
regionCouplePatch_.shadowRegion().
objectRegistry::lookupObject<GeometricField>(name);
objectRegistry::lookupObject<LookupField>(name);
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>
tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField() const
{
@ -236,6 +238,7 @@ tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField
}
template<class Type>
void regionCouplingFvPatchField<Type>::initEvaluate
(

View file

@ -172,13 +172,13 @@ public:
}
//- Return a named shadow patch field
template<class GeometricField, class Type2>
const typename GeometricField::PatchFieldType&
template<class LookupField, class LookupType>
const typename LookupField::PatchFieldType&
lookupShadowPatchField
(
const word& name,
const GeometricField* = NULL,
const Type2* = NULL
const LookupField* = NULL,
const LookupType* = NULL
) const;