Bugfix: corrected wrong transformFvPatchField header inclusion

This commit is contained in:
Hrvoje Jasak 2016-05-06 09:19:45 +01:00
parent c0fba6f3e2
commit 605b9e6f24
9 changed files with 57 additions and 32 deletions

View file

@ -37,7 +37,7 @@ SourceFiles
#ifndef mixedFixedValueSlipFvPatchField_H #ifndef mixedFixedValueSlipFvPatchField_H
#define mixedFixedValueSlipFvPatchField_H #define mixedFixedValueSlipFvPatchField_H
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -45,7 +45,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class mixedFixedValueSlipFvPatch Declaration Class mixedFixedValueSlipFvPatch Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class Type> template<class Type>

View file

@ -35,7 +35,7 @@ SourceFiles
#ifndef basicSymmetryFvPatchField_H #ifndef basicSymmetryFvPatchField_H
#define basicSymmetryFvPatchField_H #define basicSymmetryFvPatchField_H
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
#include "symmetryFvPatch.H" #include "symmetryFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -47,6 +47,23 @@ directionMixedFvPatchField<Type>::directionMixedFvPatchField
{} {}
template<class Type>
directionMixedFvPatchField<Type>::directionMixedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
const dictionary& dict
)
:
transformFvPatchField<Type>(p, iF, dict),
refValue_("refValue", dict, p.size()),
refGrad_("refGradient", dict, p.size()),
valueFraction_("valueFraction", dict, p.size())
{
evaluate();
}
template<class Type> template<class Type>
directionMixedFvPatchField<Type>::directionMixedFvPatchField directionMixedFvPatchField<Type>::directionMixedFvPatchField
( (
@ -66,18 +83,14 @@ directionMixedFvPatchField<Type>::directionMixedFvPatchField
template<class Type> template<class Type>
directionMixedFvPatchField<Type>::directionMixedFvPatchField directionMixedFvPatchField<Type>::directionMixedFvPatchField
( (
const fvPatch& p, const directionMixedFvPatchField<Type>& ptf
const DimensionedField<Type, volMesh>& iF,
const dictionary& dict
) )
: :
transformFvPatchField<Type>(p, iF, dict), transformFvPatchField<Type>(ptf),
refValue_("refValue", dict, p.size()), refValue_(ptf.refValue_),
refGrad_("refGradient", dict, p.size()), refGrad_(ptf.refGrad_),
valueFraction_("valueFraction", dict, p.size()) valueFraction_(ptf.valueFraction_)
{ {}
evaluate();
}
template<class Type> template<class Type>

View file

@ -35,7 +35,7 @@ SourceFiles
#ifndef directionMixedFvPatchField_H #ifndef directionMixedFvPatchField_H
#define directionMixedFvPatchField_H #define directionMixedFvPatchField_H
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -105,6 +105,12 @@ public:
); );
} }
//- Construct as copy
directionMixedFvPatchField
(
const directionMixedFvPatchField<Type>&
);
//- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
directionMixedFvPatchField directionMixedFvPatchField
( (
@ -156,32 +162,38 @@ public:
// Return defining fields // Return defining fields
virtual Field<Type>& refValue() //- Return reference value
{
return refValue_;
}
virtual const Field<Type>& refValue() const virtual const Field<Type>& refValue() const
{ {
return refValue_; return refValue_;
} }
virtual Field<Type>& refGrad() //- Return access to reference value
virtual Field<Type>& refValue()
{ {
return refGrad_; return refValue_;
} }
//- Return reference gradient
virtual const Field<Type>& refGrad() const virtual const Field<Type>& refGrad() const
{ {
return refGrad_; return refGrad_;
} }
virtual symmTensorField& valueFraction() //- Return access to reference gradient
virtual Field<Type>& refGrad()
{
return refGrad_;
}
//- Return value fraction
virtual const symmTensorField& valueFraction() const
{ {
return valueFraction_; return valueFraction_;
} }
virtual const symmTensorField& valueFraction() const //- Return access to value fraction
virtual symmTensorField& valueFraction()
{ {
return valueFraction_; return valueFraction_;
} }

View file

@ -31,7 +31,7 @@ License
#include "VectorNFieldTypes.H" #include "VectorNFieldTypes.H"
#include "transformFvPatchVectorNFieldsFwd.H" #include "transformFvPatchVectorNFieldsFwd.H"
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -35,7 +35,7 @@ SourceFiles
#ifndef wedgeFvPatchField_H #ifndef wedgeFvPatchField_H
#define wedgeFvPatchField_H #define wedgeFvPatchField_H
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
#include "wedgeFvPatch.H" #include "wedgeFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -35,7 +35,7 @@ SourceFiles
#ifndef fixedNormalSlipFvPatchField_H #ifndef fixedNormalSlipFvPatchField_H
#define fixedNormalSlipFvPatchField_H #define fixedNormalSlipFvPatchField_H
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -35,7 +35,7 @@ SourceFiles
#ifndef partialSlipFvPatchField_H #ifndef partialSlipFvPatchField_H
#define partialSlipFvPatchField_H #define partialSlipFvPatchField_H
#include "transformFvPatchField.H" #include "transformFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -42,7 +42,7 @@ translatingWallVelocityFvPatchVectorField
const DimensionedField<vector, volMesh>& iF const DimensionedField<vector, volMesh>& iF
) )
: :
fixedValueFvPatchField<vector>(p, iF), fixedValueFvPatchVectorField(p, iF),
U_(vector::zero) U_(vector::zero)
{} {}
@ -55,7 +55,7 @@ translatingWallVelocityFvPatchVectorField
const dictionary& dict const dictionary& dict
) )
: :
fixedValueFvPatchField<vector>(p, iF), fixedValueFvPatchVectorField(p, iF),
U_(dict.lookup("U")) U_(dict.lookup("U"))
{ {
// Evaluate the wall velocity // Evaluate the wall velocity
@ -72,7 +72,7 @@ translatingWallVelocityFvPatchVectorField
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
) )
: :
fixedValueFvPatchField<vector>(ptf, p, iF, mapper), fixedValueFvPatchVectorField(ptf, p, iF, mapper),
U_(ptf.U_) U_(ptf.U_)
{} {}
@ -83,7 +83,7 @@ translatingWallVelocityFvPatchVectorField
const translatingWallVelocityFvPatchVectorField& twvpvf const translatingWallVelocityFvPatchVectorField& twvpvf
) )
: :
fixedValueFvPatchField<vector>(twvpvf), fixedValueFvPatchVectorField(twvpvf),
U_(twvpvf.U_) U_(twvpvf.U_)
{} {}
@ -95,7 +95,7 @@ translatingWallVelocityFvPatchVectorField
const DimensionedField<vector, volMesh>& iF const DimensionedField<vector, volMesh>& iF
) )
: :
fixedValueFvPatchField<vector>(twvpvf, iF), fixedValueFvPatchVectorField(twvpvf, iF),
U_(twvpvf.U_) U_(twvpvf.U_)
{} {}