zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GeometricField: Renamed internalField() -> primitiveField() and dimensionedInternalField() -> internalField()

Browse Source 
These new names are more consistent and logical because:

primitiveField():
primitiveFieldRef():
    Provides low-level access to the Field<Type> (primitive field)
    without dimension or mesh-consistency checking.  This should only be
    used in the low-level functions where dimensional consistency is
    ensured by careful programming and computational efficiency is
    paramount.

internalField():
internalFieldRef():
    Provides access to the DimensionedField<Type, GeoMesh> of values on
    the internal mesh-type for which the GeometricField is defined and
    supports dimension and checking and mesh-consistency checking.
This commit is contained in:
Henry Weller
2016-04-30 21:40:09 +01:00
parent 68fb9a2bf9
commit fe43b80536
313 changed files with 1182 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -725,7 +725,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::ref()
template<class Type, template<class> class PatchField, class GeoMesh>
typename
Foam::GeometricField<Type, PatchField, GeoMesh>::Internal::FieldType&
Foam::GeometricField<Type, PatchField, GeoMesh>::internalFieldRef()
Foam::GeometricField<Type, PatchField, GeoMesh>::primitiveFieldRef()
{
this->setUpToDate();
storeOldTimes();
@ -1016,7 +1016,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::T() const
)
);
Foam::T(result.ref().internalFieldRef(), internalField());
Foam::T(result.ref().primitiveFieldRef(), primitiveField());
Foam::T(result.ref().boundaryFieldRef(), boundaryField());
return result;
@ -1053,7 +1053,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::component
)
);
Foam::component(Component.ref().internalFieldRef(), internalField(), d);
Foam::component(Component.ref().primitiveFieldRef(), primitiveField(), d);
Foam::component(Component.ref().boundaryFieldRef(), boundaryField(), d);
return Component;
@ -1072,7 +1072,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::replace
>& gcf
)
{
internalFieldRef().replace(d, gcf.internalField());
primitiveFieldRef().replace(d, gcf.primitiveField());
boundaryFieldRef().replace(d, gcf.boundaryField());
}
@ -1084,7 +1084,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::replace
const dimensioned<cmptType>& ds
)
{
internalFieldRef().replace(d, ds.value());
primitiveFieldRef().replace(d, ds.value());
boundaryFieldRef().replace(d, ds.value());
}
@ -1095,7 +1095,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::max
const dimensioned<Type>& dt
)
{
Foam::max(internalFieldRef(), internalField(), dt.value());
Foam::max(primitiveFieldRef(), primitiveField(), dt.value());
Foam::max(boundaryFieldRef(), boundaryField(), dt.value());
}
@ -1106,7 +1106,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::min
const dimensioned<Type>& dt
)
{
Foam::min(internalFieldRef(), internalField(), dt.value());
Foam::min(primitiveFieldRef(), primitiveField(), dt.value());
Foam::min(boundaryFieldRef(), boundaryField(), dt.value());
}
@ -1114,7 +1114,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::min
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::negate()
{
internalFieldRef().negate();
primitiveFieldRef().negate();
boundaryFieldRef().negate();
}
@ -1165,9 +1165,9 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
this->dimensions() = gf.dimensions();
// Transfer the storage from the tmp
internalFieldRef().transfer
primitiveFieldRef().transfer
(
const_cast<Field<Type>&>(gf.internalField())
const_cast<Field<Type>&>(gf.primitiveField())
);
boundaryFieldRef() = gf.boundaryField();

6
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
View File

@ -450,7 +450,7 @@ public:
Internal& ref();
//- Return a const-reference to the dimensioned internal field
inline const Internal& dimensionedInternalField() const;
inline const Internal& internalField() const;
//- Return a const-reference to the dimensioned internal field
// of a "vol" field. Useful in the formulation of source-terms
@ -460,10 +460,10 @@ public:
//- Return a reference to the internal field
// Note: this increments the event counter and checks the
// old-time fields; avoid in loops.
typename Internal::FieldType& internalFieldRef();
typename Internal::FieldType& primitiveFieldRef();
//- Return a const-reference to the internal field
inline const typename Internal::FieldType& internalField() const;
inline const typename Internal::FieldType& primitiveField() const;
//- Return a reference to the boundary field
// Note: this increments the event counter and checks the

28
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
View File

@ -49,7 +49,7 @@ void component
const direction d
)
{
component(gcf.internalFieldRef(), gf.internalField(), d);
component(gcf.primitiveFieldRef(), gf.primitiveField(), d);
component(gcf.boundaryFieldRef(), gf.boundaryField(), d);
}
@ -61,7 +61,7 @@ void T
const GeometricField<Type, PatchField, GeoMesh>& gf1
)
{
T(gf.internalFieldRef(), gf1.internalField());
T(gf.primitiveFieldRef(), gf1.primitiveField());
T(gf.boundaryFieldRef(), gf1.boundaryField());
}
@ -79,7 +79,7 @@ void pow
const GeometricField<Type, PatchField, GeoMesh>& gf1
)
{
pow(gf.internalFieldRef(), gf1.internalField(), r);
pow(gf.primitiveFieldRef(), gf1.primitiveField(), r);
pow(gf.boundaryFieldRef(), gf1.boundaryField(), r);
}
@ -173,7 +173,7 @@ void sqr
const GeometricField<Type, PatchField, GeoMesh>& gf1
)
{
sqr(gf.internalFieldRef(), gf1.internalField());
sqr(gf.primitiveFieldRef(), gf1.primitiveField());
sqr(gf.boundaryFieldRef(), gf1.boundaryField());
}
@ -261,7 +261,7 @@ void magSqr
const GeometricField<Type, PatchField, GeoMesh>& gf
)
{
magSqr(gsf.internalFieldRef(), gf.internalField());
magSqr(gsf.primitiveFieldRef(), gf.primitiveField());
magSqr(gsf.boundaryFieldRef(), gf.boundaryField());
}
@ -333,7 +333,7 @@ void mag
const GeometricField<Type, PatchField, GeoMesh>& gf
)
{
mag(gsf.internalFieldRef(), gf.internalField());
mag(gsf.primitiveFieldRef(), gf.primitiveField());
mag(gsf.boundaryFieldRef(), gf.boundaryField());
}
@ -410,7 +410,7 @@ void cmptAv
const GeometricField<Type, PatchField, GeoMesh>& gf
)
{
cmptAv(gcf.internalFieldRef(), gf.internalField());
cmptAv(gcf.primitiveFieldRef(), gf.primitiveField());
cmptAv(gcf.boundaryFieldRef(), gf.boundaryField());
}
@ -505,7 +505,7 @@ dimensioned<returnType> func \
( \
#func "(" + gf.name() + ')', \
gf.dimensions(), \
Foam::func(gFunc(gf.internalField()), gFunc(gf.boundaryField())) \
Foam::func(gFunc(gf.primitiveField()), gFunc(gf.boundaryField())) \
); \
} \
\
@ -538,7 +538,7 @@ dimensioned<returnType> func \
( \
#func "(" + gf.name() + ')', \
gf.dimensions(), \
gFunc(gf.internalField()) \
gFunc(gf.primitiveField()) \
); \
} \
\
@ -601,9 +601,9 @@ void opFunc \
{ \
Foam::opFunc \
( \
gf.internalFieldRef(), \
gf1.internalField(), \
gf2.internalField() \
gf.primitiveFieldRef(), \
gf1.primitiveField(), \
gf2.primitiveField() \
); \
Foam::opFunc \
( \
@ -755,7 +755,7 @@ void opFunc \
const dimensioned<Form>& dvs \
) \
{ \
Foam::opFunc(gf.internalFieldRef(), gf1.internalField(), dvs.value()); \
Foam::opFunc(gf.primitiveFieldRef(), gf1.primitiveField(), dvs.value()); \
Foam::opFunc(gf.boundaryFieldRef(), gf1.boundaryField(), dvs.value()); \
} \
\
@ -868,7 +868,7 @@ void opFunc \
const GeometricField<Type, PatchField, GeoMesh>& gf1 \
) \
{ \
Foam::opFunc(gf.internalFieldRef(), dvs.value(), gf1.internalField()); \
Foam::opFunc(gf.primitiveFieldRef(), dvs.value(), gf1.primitiveField()); \
Foam::opFunc(gf.boundaryFieldRef(), dvs.value(), gf1.boundaryField()); \
} \
\

20
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
View File

@ -41,7 +41,7 @@ void Func \
const GeometricField<Type1, PatchField, GeoMesh>& gf1 \
) \
{ \
Foam::Func(res.internalFieldRef(), gf1.internalField()); \
Foam::Func(res.primitiveFieldRef(), gf1.primitiveField()); \
Foam::Func(res.boundaryFieldRef(), gf1.boundaryField()); \
} \
\
@ -110,7 +110,7 @@ void OpFunc \
const GeometricField<Type1, PatchField, GeoMesh>& gf1 \
) \
{ \
Foam::OpFunc(res.internalFieldRef(), gf1.internalField()); \
Foam::OpFunc(res.primitiveFieldRef(), gf1.primitiveField()); \
Foam::OpFunc(res.boundaryFieldRef(), gf1.boundaryField()); \
} \
\
@ -182,9 +182,9 @@ void Func \
{ \
Foam::Func \
( \
res.internalFieldRef(), \
gf1.internalField(), \
gf2.internalField() \
res.primitiveFieldRef(), \
gf1.primitiveField(), \
gf2.primitiveField() \
); \
Foam::Func \
( \
@ -318,7 +318,7 @@ void Func \
const GeometricField<Type2, PatchField, GeoMesh>& gf2 \
) \
{ \
Foam::Func(res.internalFieldRef(), dt1.value(), gf2.internalField()); \
Foam::Func(res.primitiveFieldRef(), dt1.value(), gf2.primitiveField()); \
Foam::Func(res.boundaryFieldRef(), dt1.value(), gf2.boundaryField()); \
} \
\
@ -409,7 +409,7 @@ void Func \
const dimensioned<Type2>& dt2 \
) \
{ \
Foam::Func(res.internalFieldRef(), gf1.internalField(), dt2.value()); \
Foam::Func(res.primitiveFieldRef(), gf1.primitiveField(), dt2.value()); \
Foam::Func(res.boundaryFieldRef(), gf1.boundaryField(), dt2.value()); \
} \
\
@ -508,7 +508,7 @@ void OpFunc \
) \
{ \
Foam::OpFunc \
(res.internalFieldRef(), gf1.internalField(), gf2.internalField()); \
(res.primitiveFieldRef(), gf1.primitiveField(), gf2.primitiveField()); \
Foam::OpFunc \
(res.boundaryFieldRef(), gf1.boundaryField(), gf2.boundaryField()); \
} \
@ -637,7 +637,7 @@ void OpFunc \
const GeometricField<Type2, PatchField, GeoMesh>& gf2 \
) \
{ \
Foam::OpFunc(res.internalFieldRef(), dt1.value(), gf2.internalField()); \
Foam::OpFunc(res.primitiveFieldRef(), dt1.value(), gf2.primitiveField()); \
Foam::OpFunc(res.boundaryFieldRef(), dt1.value(), gf2.boundaryField()); \
} \
\
@ -728,7 +728,7 @@ void OpFunc \
const dimensioned<Type2>& dt2 \
) \
{ \
Foam::OpFunc(res.internalFieldRef(), gf1.internalField(), dt2.value()); \
Foam::OpFunc(res.primitiveFieldRef(), gf1.primitiveField(), dt2.value()); \
Foam::OpFunc(res.boundaryFieldRef(), gf1.boundaryField(), dt2.value()); \
} \
\

4
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
View File

@ -38,7 +38,7 @@ inline
const typename
Foam::GeometricField<Type, PatchField, GeoMesh>::Internal&
Foam::GeometricField<Type, PatchField, GeoMesh>::
dimensionedInternalField() const
internalField() const
{
return *this;
}
@ -48,7 +48,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
inline
const typename
Foam::GeometricField<Type, PatchField, GeoMesh>::Internal::FieldType&
Foam::GeometricField<Type, PatchField, GeoMesh>::internalField() const
Foam::GeometricField<Type, PatchField, GeoMesh>::primitiveField() const
{
return *this;
}

2
src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
View File

@ -126,7 +126,7 @@ void MapGeometricFields
// Map the internal field
MapInternalField<Type, MeshMapper, GeoMesh>()
(
field.internalFieldRef(),
field.primitiveFieldRef(),
mapper
);

28
src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
View File

@ -43,7 +43,7 @@ void stabilise
const dimensioned<scalar>& ds
)
{
stabilise(result.internalFieldRef(), gsf.internalField(), ds.value());
stabilise(result.primitiveFieldRef(), gsf.primitiveField(), ds.value());
stabilise(result.boundaryFieldRef(), gsf.boundaryField(), ds.value());
}
@ -126,7 +126,7 @@ void pow
const GeometricField<scalar, PatchField, GeoMesh>& gsf2
)
{
pow(Pow.internalFieldRef(), gsf1.internalField(), gsf2.internalField());
pow(Pow.primitiveFieldRef(), gsf1.primitiveField(), gsf2.primitiveField());
pow(Pow.boundaryFieldRef(), gsf1.boundaryField(), gsf2.boundaryField());
}
@ -269,7 +269,7 @@ void pow
const dimensioned<scalar>& ds
)
{
pow(tPow.internalFieldRef(), gsf.internalField(), ds.value());
pow(tPow.primitiveFieldRef(), gsf.primitiveField(), ds.value());
pow(tPow.boundaryFieldRef(), gsf.boundaryField(), ds.value());
}
@ -358,7 +358,7 @@ void pow
const GeometricField<scalar, PatchField, GeoMesh>& gsf
)
{
pow(tPow.internalFieldRef(), ds.value(), gsf.internalField());
pow(tPow.primitiveFieldRef(), ds.value(), gsf.primitiveField());
pow(tPow.boundaryFieldRef(), ds.value(), gsf.boundaryField());
}
@ -450,8 +450,18 @@ void atan2
const GeometricField<scalar, PatchField, GeoMesh>& gsf2
)
{
atan2(Atan2.internalFieldRef(), gsf1.internalField(), gsf2.internalField());
atan2(Atan2.boundaryFieldRef(), gsf1.boundaryField(), gsf2.boundaryField());
atan2
(
Atan2.primitiveFieldRef(),
gsf1.primitiveField(),
gsf2.primitiveField()
);
atan2
(
Atan2.boundaryFieldRef(),
gsf1.boundaryField(),
gsf2.boundaryField()
);
}
@ -577,7 +587,7 @@ void atan2
const dimensioned<scalar>& ds
)
{
atan2(tAtan2.internalFieldRef(), gsf.internalField(), ds.value());
atan2(tAtan2.primitiveFieldRef(), gsf.primitiveField(), ds.value());
atan2(tAtan2.boundaryFieldRef(), gsf.boundaryField(), ds.value());
}
@ -666,7 +676,7 @@ void atan2
const GeometricField<scalar, PatchField, GeoMesh>& gsf
)
{
atan2(tAtan2.internalFieldRef(), ds.value(), gsf.internalField());
atan2(tAtan2.primitiveFieldRef(), ds.value(), gsf.primitiveField());
atan2(tAtan2.boundaryFieldRef(), ds.value(), gsf.boundaryField());
}
@ -799,7 +809,7 @@ void func \
const GeometricField<scalar, PatchField, GeoMesh>& gsf1 \
) \
{ \
func(gsf.internalFieldRef(), n, gsf1.internalField()); \
func(gsf.primitiveFieldRef(), n, gsf1.primitiveField()); \
func(gsf.boundaryFieldRef(), n, gsf1.boundaryField()); \
} \
\

4
src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
View File

@ -305,7 +305,7 @@ SlicedGeometricField
)
{
// Set the internalField to the supplied internal field
UList<Type>::shallowCopy(gf.internalField());
UList<Type>::shallowCopy(gf.primitiveField());
correctBoundaryConditions();
}
@ -334,7 +334,7 @@ SlicedGeometricField
)
{
// Set the internalField to the supplied internal field
UList<Type>::shallowCopy(gf.internalField());
UList<Type>::shallowCopy(gf.primitiveField());
}

2
src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
View File

@ -85,7 +85,7 @@ public:
inline Internal v() const;
inline typename Internal::FieldType internalField() const;
inline typename Internal::FieldType primitiveField() const;
inline Boundary boundaryField() const;
};

2
src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
View File

@ -66,7 +66,7 @@ Foam::geometricOneField::v() const
inline typename Foam::geometricOneField::Internal::FieldType
Foam::geometricOneField::internalField() const
Foam::geometricOneField::primitiveField() const
{
return typename Internal::FieldType();
}

16
src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
View File

@ -45,8 +45,18 @@ void transform
const GeometricField<Type, PatchField, GeoMesh>& tf
)
{
transform(rtf.internalFieldRef(), trf.internalField(), tf.internalField());
transform(rtf.boundaryFieldRef(), trf.boundaryField(), tf.boundaryField());
transform
(
rtf.primitiveFieldRef(),
trf.primitiveField(),
tf.primitiveField()
);
transform
(
rtf.boundaryFieldRef(),
trf.boundaryField(),
tf.boundaryField()
);
}
@ -131,7 +141,7 @@ void transform
const GeometricField<Type, PatchField, GeoMesh>& tf
)
{
transform(rtf.internalFieldRef(), t.value(), tf.internalField());
transform(rtf.primitiveFieldRef(), t.value(), tf.primitiveField());
transform(rtf.boundaryFieldRef(), t.value(), tf.boundaryField());
}

2
src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
View File

@ -96,7 +96,7 @@ void Foam::basicSymmetryPointPatchField<Type>::evaluate
);
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, tvalues());
}

4
src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
View File

@ -155,7 +155,7 @@ void Foam::valuePointPatchField<Type>::updateCoeffs()
}
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, *this);
@ -167,7 +167,7 @@ template<class Type>
void Foam::valuePointPatchField<Type>::evaluate(const Pstream::commsTypes)
{
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, *this);

2
src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
View File

@ -123,7 +123,7 @@ void Foam::cyclicPointPatchField<Type>::swapAddSeparated
const GeometricField<Type, pointPatchField, pointMesh>& fld =
refCast<const GeometricField<Type, pointPatchField, pointMesh>>
(
this->dimensionedInternalField()
this->internalField()
);
const cyclicPointPatchField<Type>& nbr =

2
src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
View File

@ -93,7 +93,7 @@ void Foam::cyclicSlipPointPatchField<Type>::evaluate(const Pstream::commsTypes)
);
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
View File

@ -100,7 +100,7 @@ void Foam::nonuniformTransformCyclicPointPatchField<Type>::evaluate
);
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
View File

@ -117,7 +117,7 @@ void Foam::symmetryPlanePointPatchField<Type>::evaluate
);
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
View File

@ -109,7 +109,7 @@ void Foam::wedgePointPatchField<Type>::evaluate(const Pstream::commsTypes)
transform(I - nHat*nHat, this->patchInternalField());
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, tvalues());
}

4
src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
View File

@ -161,7 +161,7 @@ Foam::string Foam::codedFixedValuePointPatchField<Type>::description() const
"patch "
+ this->patch().name()
+ " on field "
+ this->dimensionedInternalField().name();
+ this->internalField().name();
}
@ -276,7 +276,7 @@ Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
pointPatchField<Type>::New
(
this->patch(),
this->dimensionedInternalField(),
this->internalField(),
dict
).ptr()
);

2
src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
View File

@ -90,7 +90,7 @@ void Foam::fixedNormalSlipPointPatchField<Type>::evaluate
transform(I - n_*n_, this->patchInternalField());
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());
this->setInInternalField(iF, tvalues());
}

18
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
View File

@ -127,7 +127,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::pointPatchField<Type>::patchInternalField() const
{
return patchInternalField(internalField());
return patchInternalField(primitiveField());
}
@ -141,12 +141,12 @@ Foam::pointPatchField<Type>::patchInternalField
) const
{
// Check size
if (iF.size() != internalField().size())
if (iF.size() != primitiveField().size())
{
FatalErrorInFunction
<< "given internal field does not correspond to the mesh. "
<< "Field size: " << iF.size()
<< " mesh size: " << internalField().size()
<< " mesh size: " << primitiveField().size()
<< abort(FatalError);
}
@ -175,12 +175,12 @@ void Foam::pointPatchField<Type>::addToInternalField
) const
{
// Check size
if (iF.size() != internalField().size())
if (iF.size() != primitiveField().size())
{
FatalErrorInFunction
<< "given internal field does not correspond to the mesh. "
<< "Field size: " << iF.size()
<< " mesh size: " << internalField().size()
<< " mesh size: " << primitiveField().size()
<< abort(FatalError);
}
@ -213,12 +213,12 @@ void Foam::pointPatchField<Type>::addToInternalField
) const
{
// Check size
if (iF.size() != internalField().size())
if (iF.size() != primitiveField().size())
{
FatalErrorInFunction
<< "given internal field does not correspond to the mesh. "
<< "Field size: " << iF.size()
<< " mesh size: " << internalField().size()
<< " mesh size: " << primitiveField().size()
<< abort(FatalError);
}
@ -252,12 +252,12 @@ void Foam::pointPatchField<Type>::setInInternalField
) const
{
// Check size
if (iF.size() != internalField().size())
if (iF.size() != primitiveField().size())
{
FatalErrorInFunction
<< "given internal field does not correspond to the mesh. "
<< "Field size: " << iF.size()
<< " mesh size: " << internalField().size()
<< " mesh size: " << primitiveField().size()
<< abort(FatalError);
}

4
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
View File

@ -279,13 +279,13 @@ public:
//- Return dimensioned internal field reference
const DimensionedField<Type, pointMesh>&
dimensionedInternalField() const
internalField() const
{
return internalField_;
}
//- Return internal field reference
const Field<Type>& internalField() const
const Field<Type>& primitiveField() const
{
return internalField_;
}

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
View File

@ -116,7 +116,7 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
compressible::turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
View File

@ -133,7 +133,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

6
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
View File

@ -147,8 +147,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField
<< "\n patch type '" << p.type()
<< "' either q or h and Ta were not found '"
<< "\n for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath()
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath()
<< exit(FatalError);
}
@ -319,7 +319,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
<< this->dimensionedInternalField().name() << " :"
<< this->internalField().name() << " :"
<< " heat transfer rate:" << Q
<< " walltemperature "
<< " min:" << gMin(*this)

4
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
View File

@ -403,9 +403,9 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
scalar Q = gAverage(kappaw*snGrad());
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
<< this->dimensionedInternalField().name() << " <- "
<< this->internalField().name() << " <- "
<< nbrPatch.name() << ':'
<< this->dimensionedInternalField().name() << " :"
<< this->internalField().name() << " :"
<< " heat[W]:" << Q
<< " walltemperature "
<< " min:" << gMin(*this)

4
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
View File

@ -163,7 +163,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -191,7 +191,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
<< this->dimensionedInternalField().name() << " :"
<< this->internalField().name() << " :"
<< " mass flux[Kg/s]:" << phi
<< endl;
}

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
View File

@ -96,8 +96,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
FatalErrorInFunction
<< "' not type '" << mappedPatchBase::typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath()
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath()
<< exit(FatalError);
}
@ -237,10 +237,10 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
<< this->dimensionedInternalField().name() << " <- "
<< this->internalField().name() << " <- "
<< nbrMesh.name() << ':'
<< nbrPatch.name() << ':'
<< this->dimensionedInternalField().name() << " :"
<< this->internalField().name() << " :"
<< " heat transfer rate:" << Q
<< " walltemperature "
<< " min:" << gMin(*this)

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
View File

@ -102,8 +102,8 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
FatalErrorInFunction
<< "' not type '" << mappedPatchBase::typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath()
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath()
<< exit(FatalError);
}
@ -237,10 +237,10 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
<< this->dimensionedInternalField().name() << " <- "
<< this->internalField().name() << " <- "
<< nbrMesh.name() << ':'
<< nbrPatch.name() << ':'
<< this->dimensionedInternalField().name() << " :"
<< this->internalField().name() << " :"
<< " heat transfer rate:" << Q
<< " walltemperature "
<< " min:" << gMin(Tp)

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -203,7 +203,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
compressible::turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
View File

@ -113,7 +113,7 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
compressibleTurbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
View File

@ -154,7 +154,7 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

2
src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -206,7 +206,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

4
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
View File

@ -66,7 +66,7 @@ void Foam::LESModels::IDDESDelta::calcDelta()
)
);
scalarField& faceToFacenMax = tfaceToFacenMax.ref().internalFieldRef();
scalarField& faceToFacenMax = tfaceToFacenMax.ref().primitiveFieldRef();
const cellList& cells = mesh.cells();
const vectorField& faceCentres = mesh.faceCentres();
@ -113,7 +113,7 @@ void Foam::LESModels::IDDESDelta::calcDelta()
<< "Case must be either 2D or 3D" << exit(FatalError);
}
delta_.internalFieldRef() =
delta_.primitiveFieldRef() =
min
(
max

4
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
View File

@ -48,7 +48,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta()
if (nD == 3)
{
delta_.internalFieldRef() = deltaCoeff_*pow(mesh.V(), 1.0/3.0);
delta_.primitiveFieldRef() = deltaCoeff_*pow(mesh.V(), 1.0/3.0);
}
else if (nD == 2)
{
@ -68,7 +68,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta()
}
}
delta_.internalFieldRef() = deltaCoeff_*sqrt(mesh.V()/thickness);
delta_.primitiveFieldRef() = deltaCoeff_*sqrt(mesh.V()/thickness);
}
else
{

4
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
View File

@ -71,7 +71,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
if (nD == 3)
{
delta_.internalFieldRef() = hmax;
delta_.primitiveFieldRef() = hmax;
}
else if (nD == 2)
{
@ -79,7 +79,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
<< "Case is 2D, LES is not strictly applicable\n"
<< endl;
delta_.internalFieldRef() = hmax;
delta_.primitiveFieldRef() = hmax;
}
else
{

8
src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
View File

@ -63,14 +63,14 @@ Foam::anisotropicFilter::anisotropicFilter
{
for (direction d=0; d<vector::nComponents; d++)
{
coeff_.internalFieldRef().replace
coeff_.primitiveFieldRef().replace
(
d,
(1/widthCoeff_)*
sqr
(
2.0*mesh.V()
/fvc::surfaceSum(mag(mesh.Sf().component(d)))().internalField()
/fvc::surfaceSum(mag(mesh.Sf().component(d)))().primitiveField()
)
);
}
@ -100,14 +100,14 @@ Foam::anisotropicFilter::anisotropicFilter
{
for (direction d=0; d<vector::nComponents; d++)
{
coeff_.internalFieldRef().replace
coeff_.primitiveFieldRef().replace
(
d,
(1/widthCoeff_)*
sqr
(
2.0*mesh.V()
/fvc::surfaceSum(mag(mesh.Sf().component(d)))().internalField()
/fvc::surfaceSum(mag(mesh.Sf().component(d)))().primitiveField()
)
);
}

2
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
View File

@ -131,7 +131,7 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

2
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
View File

@ -127,7 +127,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
View File

@ -105,7 +105,7 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

4
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
View File

@ -142,7 +142,7 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -153,7 +153,7 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
+ I_*0.5*magUn
)*magUn*length_;
if (dimensionedInternalField().dimensions() == dimPressure)
if (internalField().dimensions() == dimPressure)
{
jump_ *= patch().lookupPatchField<volScalarField, scalar>(rhoName_);
}

20
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
View File

@ -70,7 +70,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::setMaster()
}
const volScalarField& epsilon =
static_cast<const volScalarField&>(this->dimensionedInternalField());
static_cast<const volScalarField&>(this->internalField());
const volScalarField::Boundary& bf = epsilon.boundaryField();
@ -95,7 +95,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::setMaster()
void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights()
{
const volScalarField& epsilon =
static_cast<const volScalarField&>(this->dimensionedInternalField());
static_cast<const volScalarField&>(this->internalField());
const volScalarField::Boundary& bf = epsilon.boundaryField();
@ -144,8 +144,8 @@ void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights()
cornerWeights_[patchi] = 1.0/wf.patchInternalField();
}
G_.setSize(dimensionedInternalField().size(), 0.0);
epsilon_.setSize(dimensionedInternalField().size(), 0.0);
G_.setSize(internalField().size(), 0.0);
epsilon_.setSize(internalField().size(), 0.0);
initialised_ = true;
}
@ -155,7 +155,7 @@ Foam::epsilonWallFunctionFvPatchScalarField&
Foam::epsilonWallFunctionFvPatchScalarField::epsilonPatch(const label patchi)
{
const volScalarField& epsilon =
static_cast<const volScalarField&>(this->dimensionedInternalField());
static_cast<const volScalarField&>(this->internalField());
const volScalarField::Boundary& bf = epsilon.boundaryField();
@ -408,7 +408,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -431,7 +431,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs()
db().lookupObject<FieldType>(turbModel.GName())
);
FieldType& epsilon = const_cast<FieldType&>(dimensionedInternalField());
FieldType& epsilon = const_cast<FieldType&>(internalField());
forAll(*this, facei)
{
@ -460,7 +460,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -483,7 +483,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs
db().lookupObject<FieldType>(turbModel.GName())
);
FieldType& epsilon = const_cast<FieldType&>(dimensionedInternalField());
FieldType& epsilon = const_cast<FieldType&>(internalField());
scalarField& epsilonf = *this;
@ -538,7 +538,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::manipulateMatrix
const labelUList& faceCells = patch().faceCells();
const DimensionedField<scalar, volMesh>& epsilon
= dimensionedInternalField();
= internalField();
label nConstrainedCells = 0;

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
View File

@ -178,7 +178,7 @@ void fWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const v2fBase& v2fModel = refCast<const v2fBase>(turbModel);

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
View File

@ -175,7 +175,7 @@ void kLowReWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
View File

@ -106,7 +106,7 @@ tmp<scalarField> nutLowReWallFunctionFvPatchScalarField::yPlus() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

6
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
View File

@ -45,7 +45,7 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];
@ -87,7 +87,7 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcYPlus
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];
@ -280,7 +280,7 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::yPlus() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];

6
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
View File

@ -45,7 +45,7 @@ tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
@ -73,7 +73,7 @@ tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcUTau
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];
@ -197,7 +197,7 @@ tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

4
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
View File

@ -45,7 +45,7 @@ tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];
@ -187,7 +187,7 @@ tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

6
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
View File

@ -45,7 +45,7 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
@ -84,7 +84,7 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcYPlus
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];
@ -182,7 +182,7 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::yPlus() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
View File

@ -45,7 +45,7 @@ tmp<scalarField> nutkAtmRoughWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
View File

@ -68,7 +68,7 @@ tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

4
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
View File

@ -46,7 +46,7 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -142,7 +142,7 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);

20
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View File

@ -74,7 +74,7 @@ void omegaWallFunctionFvPatchScalarField::setMaster()
}
const volScalarField& omega =
static_cast<const volScalarField&>(this->dimensionedInternalField());
static_cast<const volScalarField&>(this->internalField());
const volScalarField::Boundary& bf = omega.boundaryField();
@ -99,7 +99,7 @@ void omegaWallFunctionFvPatchScalarField::setMaster()
void omegaWallFunctionFvPatchScalarField::createAveragingWeights()
{
const volScalarField& omega =
static_cast<const volScalarField&>(this->dimensionedInternalField());
static_cast<const volScalarField&>(this->internalField());
const volScalarField::Boundary& bf = omega.boundaryField();
@ -149,8 +149,8 @@ void omegaWallFunctionFvPatchScalarField::createAveragingWeights()
cornerWeights_[patchi] = 1.0/wf.patchInternalField();
}
G_.setSize(dimensionedInternalField().size(), 0.0);
omega_.setSize(dimensionedInternalField().size(), 0.0);
G_.setSize(internalField().size(), 0.0);
omega_.setSize(internalField().size(), 0.0);
initialised_ = true;
}
@ -160,7 +160,7 @@ omegaWallFunctionFvPatchScalarField&
omegaWallFunctionFvPatchScalarField::omegaPatch(const label patchi)
{
const volScalarField& omega =
static_cast<const volScalarField&>(this->dimensionedInternalField());
static_cast<const volScalarField&>(this->internalField());
const volScalarField::Boundary& bf = omega.boundaryField();
@ -418,7 +418,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -441,7 +441,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
db().lookupObject<FieldType>(turbModel.GName())
);
FieldType& omega = const_cast<FieldType&>(dimensionedInternalField());
FieldType& omega = const_cast<FieldType&>(internalField());
forAll(*this, facei)
{
@ -470,7 +470,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
@ -493,7 +493,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs
db().lookupObject<FieldType>(turbModel.GName())
);
FieldType& omega = const_cast<FieldType&>(dimensionedInternalField());
FieldType& omega = const_cast<FieldType&>(internalField());
scalarField& omegaf = *this;
@ -548,7 +548,7 @@ void omegaWallFunctionFvPatchScalarField::manipulateMatrix
const labelUList& faceCells = patch().faceCells();
const DimensionedField<scalar, volMesh>& omega
= dimensionedInternalField();
= internalField();
label nConstrainedCells = 0;

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
View File

@ -178,7 +178,7 @@ void v2WallFunctionFvPatchScalarField::updateCoeffs()
IOobject::groupName
(
turbulenceModel::propertiesName,
dimensionedInternalField().group()
internalField().group()
)
);
const scalarField& y = turbModel.y()[patchi];

2
src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
View File

@ -344,7 +344,7 @@ Foam::dynamicRefineFvMesh::refine
surfaceScalarField& phi = *iter();
sigFpe::fillNan(phi.internalFieldRef());
sigFpe::fillNan(phi.primitiveFieldRef());
continue;
}

2
src/dynamicFvMesh/include/meshCourantNo.H
View File

@ -36,7 +36,7 @@ if (mesh.nInternalFaces())
{
scalarField sumPhi
(
fvc::surfaceSum(mag(mesh.phi()))().internalField()
fvc::surfaceSum(mag(mesh.phi()))().primitiveField()
);
meshCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();

8
src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
View File

@ -46,15 +46,15 @@ void Foam::fvMeshAdder::MapVolField
{
// Store old internal field
Field<Type> oldInternalField(fld.internalField());
Field<Type> oldInternalField(fld.primitiveField());
// Modify internal field
Field<Type>& intFld = fld.internalFieldRef();
Field<Type>& intFld = fld.primitiveFieldRef();
intFld.setSize(mesh.nCells());
intFld.rmap(oldInternalField, meshMap.oldCellMap());
intFld.rmap(fldToAdd.internalField(), meshMap.addedCellMap());
intFld.rmap(fldToAdd.primitiveField(), meshMap.addedCellMap());
}
@ -340,7 +340,7 @@ void Foam::fvMeshAdder::MapSurfaceField
Field<Type> oldField(fld);
// Modify internal field
Field<Type>& intFld = fld.internalFieldRef();
Field<Type>& intFld = fld.primitiveFieldRef();
intFld.setSize(mesh.nInternalFaces());

6
src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
View File

@ -818,7 +818,7 @@ Foam::tmp<Foam::pointField> Foam::motionSmootherAlgo::curPoints() const
);
}
tmp<pointField> tnewPoints(oldPoints_ + totalDisplacement.internalField());
tmp<pointField> tnewPoints(oldPoints_ + totalDisplacement.primitiveField());
// Correct for 2-D motion
modifyMotionPoints(tnewPoints.ref());
@ -886,8 +886,8 @@ bool Foam::motionSmootherAlgo::scaleMesh
);
Info<< "Moving mesh using displacement scaling :"
<< " min:" << gMin(scale_.internalField())
<< " max:" << gMax(scale_.internalField())
<< " min:" << gMin(scale_.primitiveField())
<< " max:" << gMax(scale_.primitiveField())
<< endl;
// Get points using current displacement and scale. Optionally 2D corrected.

4
src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H
View File

@ -36,8 +36,8 @@ if (mesh.nInternalFaces())
{
scalarField sumPhi
(
fvc::surfaceSum(mag(phi))().internalField()
/ rho.internalField()
fvc::surfaceSum(mag(phi))().primitiveField()
/ rho.primitiveField()
);
CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();

2
src/finiteVolume/cfdTools/general/MRF/MRFZone.C
View File

@ -319,7 +319,7 @@ void Foam::MRFZone::addCoriolis
}
const labelList& cells = mesh_.cellZones()[cellZoneID_];
vectorField& ddtUc = ddtU.internalFieldRef();
vectorField& ddtUc = ddtU.primitiveFieldRef();
const vectorField& Uc = U;
const vector Omega = this->Omega();

4
src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
View File

@ -45,7 +45,7 @@ void Foam::MRFZone::makeRelativeRhoFlux
const vectorField& Cfi = Cf;
const vectorField& Sfi = Sf;
scalarField& phii = phi.internalFieldRef();
scalarField& phii = phi.primitiveFieldRef();
// Internal faces
forAll(internalFaces_, i)
@ -145,7 +145,7 @@ void Foam::MRFZone::makeAbsoluteRhoFlux
const vectorField& Cfi = Cf;
const vectorField& Sfi = Sf;
scalarField& phii = phi.internalFieldRef();
scalarField& phii = phi.primitiveFieldRef();
// Internal faces
forAll(internalFaces_, i)

2
src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
View File

@ -228,7 +228,7 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
volVectorField& Uabs = tUabs.ref();
// Add SRF contribution to internal field
Uabs.internalFieldRef() += Urel_.internalField();
Uabs.primitiveFieldRef() += Urel_.primitiveField();
// Add Urel boundary contributions
volVectorField::Boundary& Uabsbf = Uabs.boundaryFieldRef();

4
src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
View File

@ -120,8 +120,8 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
word ddtScheme
(
this->dimensionedInternalField().mesh()
.ddtScheme(this->dimensionedInternalField().name())
this->internalField().mesh()
.ddtScheme(this->internalField().name())
);
if (ddtScheme == fv::steadyStateDdtScheme<scalar>::typeName)

10
src/finiteVolume/cfdTools/general/bound/bound.C
View File

@ -39,16 +39,16 @@ Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
Info<< "bounding " << vsf.name()
<< ", min: " << minVsf
<< " max: " << max(vsf).value()
<< " average: " << gAverage(vsf.internalField())
<< " average: " << gAverage(vsf.primitiveField())
<< endl;
vsf.internalFieldRef() = max
vsf.primitiveFieldRef() = max
(
max
(
vsf.internalField(),
fvc::average(max(vsf, lowerBound))().internalField()
* pos(-vsf.internalField())
vsf.primitiveField(),
fvc::average(max(vsf, lowerBound))().primitiveField()
* pos(-vsf.primitiveField())
),
lowerBound.value()
);

2
src/finiteVolume/cfdTools/general/include/volContinuity.H
View File

@ -3,7 +3,7 @@
// The ddt term constructed by hand because it would be wrong for
// Backward Differencing in time.
conserve.internalFieldRef() +=
conserve.primitiveFieldRef() +=
(1.0 - mesh.V0()/mesh.V())/runTime.deltaTValue();
scalar sumLocalContErr = runTime.deltaTValue()*

2
src/finiteVolume/cfdTools/incompressible/CourantNo.H
View File

@ -36,7 +36,7 @@ if (mesh.nInternalFaces())
{
scalarField sumPhi
(
fvc::surfaceSum(mag(phi))().internalField()
fvc::surfaceSum(mag(phi))().primitiveField()
);
CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();

16
src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
View File

@ -150,8 +150,8 @@ Foam::calculatedFvPatchField<Type>::valueInternalCoeffs
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< "\n You are probably trying to solve for a field with a "
"default boundary condition."
<< abort(FatalError);
@ -170,8 +170,8 @@ Foam::calculatedFvPatchField<Type>::valueBoundaryCoeffs
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< "\n You are probably trying to solve for a field with a "
"default boundary condition."
<< abort(FatalError);
@ -187,8 +187,8 @@ Foam::calculatedFvPatchField<Type>::gradientInternalCoeffs() const
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< "\n You are probably trying to solve for a field with a "
"default boundary condition."
<< abort(FatalError);
@ -204,8 +204,8 @@ Foam::calculatedFvPatchField<Type>::gradientBoundaryCoeffs() const
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< "\n You are probably trying to solve for a field with a "
"default boundary condition."
<< abort(FatalError);

2
src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
View File

@ -116,7 +116,7 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
fvPatchField<Type>
(
ptf.patch(),
ptf.dimensionedInternalField(),
ptf.internalField(),
Field<Type>()
)
{

12
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
View File

@ -59,8 +59,8 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
@ -85,8 +85,8 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -122,7 +122,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::cyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
const Field<Type>& iField = this->primitiveField();
const labelUList& nbrFaceCells =
cyclicPatch().cyclicPatch().neighbPatch().faceCells();
@ -159,7 +159,7 @@ Foam::cyclicFvPatchField<Type>::neighbourPatchField() const
const GeometricField<Type, fvPatchField, volMesh>& fld =
static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
(
this->internalField()
this->primitiveField()
);
return refCast<const cyclicFvPatchField<Type>>

14
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
View File

@ -59,8 +59,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -86,8 +86,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
@ -136,7 +136,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::cyclicACMIFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
const Field<Type>& iField = this->primitiveField();
const labelUList& nbrFaceCellsCoupled =
cyclicACMIPatch_.cyclicACMIPatch().neighbPatch().faceCells();
const labelUList& faceCellsNonOverlap =
@ -173,7 +173,7 @@ Foam::cyclicACMIFvPatchField<Type>::neighbourPatchField() const
const GeometricField<Type, fvPatchField, volMesh>& fld =
static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
(
this->internalField()
this->primitiveField()
);
return refCast<const cyclicACMIFvPatchField<Type>>
@ -190,7 +190,7 @@ Foam::cyclicACMIFvPatchField<Type>::nonOverlapPatchField() const
const GeometricField<Type, fvPatchField, volMesh>& fld =
static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
(
this->internalField()
this->primitiveField()
);
return fld.boundaryField()[cyclicACMIPatch_.nonOverlapPatchID()];

12
src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
View File

@ -56,8 +56,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -83,8 +83,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
@ -133,7 +133,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
const Field<Type>& iField = this->primitiveField();
const labelUList& nbrFaceCells =
cyclicAMIPatch_.cyclicAMIPatch().neighbPatch().faceCells();
@ -165,7 +165,7 @@ Foam::cyclicAMIFvPatchField<Type>::neighbourPatchField() const
const GeometricField<Type, fvPatchField, volMesh>& fld =
static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
(
this->internalField()
this->primitiveField()
);
return refCast<const cyclicAMIFvPatchField<Type>>

10
src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
View File

@ -55,8 +55,8 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -80,8 +80,8 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -96,7 +96,7 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
fvPatchField<Type>
(
ptf.patch(),
ptf.dimensionedInternalField(),
ptf.internalField(),
Field<Type>(0)
)
{}

4
src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
View File

@ -93,7 +93,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::jumpCyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
const Field<Type>& iField = this->primitiveField();
const labelUList& nbrFaceCells =
this->cyclicPatch().neighbFvPatch().faceCells();
@ -157,7 +157,7 @@ void Foam::jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
this->cyclicPatch().neighbFvPatch().faceCells();
// only apply jump to original field
if (&psiInternal == &this->internalField())
if (&psiInternal == &this->primitiveField())
{
Field<Type> jf(this->jump());

2
src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C
View File

@ -52,7 +52,7 @@ void Foam::jumpCyclicFvPatchField<Foam::scalar>::updateInterfaceMatrix
this->cyclicPatch().neighbFvPatch().faceCells();
// only apply jump to original field
if (&psiInternal == &this->internalField())
if (&psiInternal == &this->primitiveField())
{
Field<scalar> jf(this->jump());

4
src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
View File

@ -94,7 +94,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
const Field<Type>& iField = this->primitiveField();
const labelUList& nbrFaceCells =
this->cyclicAMIPatch().cyclicAMIPatch().neighbPatch().faceCells();
@ -174,7 +174,7 @@ void Foam::jumpCyclicAMIFvPatchField<Type>::updateInterfaceMatrix
}
// only apply jump to original field
if (&psiInternal == &this->internalField())
if (&psiInternal == &this->primitiveField())
{
Field<Type> jf(this->jump());
if (!this->cyclicAMIPatch().owner())

2
src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFields.C
View File

@ -56,7 +56,7 @@ void Foam::jumpCyclicAMIFvPatchField<scalar>::updateInterfaceMatrix
pnf = this->cyclicAMIPatch().interpolate(pnf);
// only apply jump to original field
if (&psiInternal == &this->internalField())
if (&psiInternal == &this->primitiveField())
{
Field<scalar> jf(this->jump());

8
src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
View File

@ -90,8 +90,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
if (debug && !ptf.ready())
@ -128,8 +128,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}

8
src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
View File

@ -72,8 +72,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -98,8 +98,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}

8
src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
View File

@ -56,8 +56,8 @@ Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -79,8 +79,8 @@ Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}

8
src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
View File

@ -57,8 +57,8 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -83,8 +83,8 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}

8
src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
View File

@ -59,8 +59,8 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -84,8 +84,8 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}

18
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
View File

@ -112,8 +112,8 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
dict
) << "unphysical lInf specified (lInf < 0)" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalIOError);
}
}
@ -190,11 +190,11 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
return;
}
const fvMesh& mesh = this->dimensionedInternalField().mesh();
const fvMesh& mesh = this->internalField().mesh();
word ddtScheme
(
mesh.ddtScheme(this->dimensionedInternalField().name())
mesh.ddtScheme(this->internalField().name())
);
scalar deltaT = this->db().time().deltaTValue();
@ -202,7 +202,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
this->db().objectRegistry::template
lookupObject<GeometricField<Type, fvPatchField, volMesh>>
(
this->dimensionedInternalField().name()
this->internalField().name()
);
// Calculate the advection speed of the field wave
@ -274,8 +274,8 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
FatalErrorInFunction
<< ddtScheme << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalError);
}
}
@ -324,8 +324,8 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
FatalErrorInFunction
<< ddtScheme
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalError);
}
}

4
src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
View File

@ -160,7 +160,7 @@ Foam::string Foam::codedFixedValueFvPatchField<Type>::description() const
"patch "
+ this->patch().name()
+ " on field "
+ this->dimensionedInternalField().name();
+ this->internalField().name();
}
@ -274,7 +274,7 @@ Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
fvPatchField<Type>::New
(
this->patch(),
this->dimensionedInternalField(),
this->internalField(),
dict
).ptr()
);

4
src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
View File

@ -160,7 +160,7 @@ Foam::string Foam::codedMixedFvPatchField<Type>::description() const
"patch "
+ this->patch().name()
+ " on field "
+ this->dimensionedInternalField().name();
+ this->internalField().name();
}
@ -280,7 +280,7 @@ Foam::codedMixedFvPatchField<Type>::redirectPatchField() const
fvPatchField<Type>::New
(
this->patch(),
this->dimensionedInternalField(),
this->internalField(),
dict
).ptr()
)

12
src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
View File

@ -44,7 +44,7 @@ Foam::externalCoupledMixedFvPatchField<Type>::patchKey = "# Patch: ";
template<class Type>
Foam::fileName Foam::externalCoupledMixedFvPatchField<Type>::baseDir() const
{
word regionName(this->dimensionedInternalField().mesh().name());
word regionName(this->internalField().mesh().name());
if (regionName == polyMesh::defaultRegion)
{
regionName = ".";
@ -64,7 +64,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::setMaster
)
{
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
static_cast<const volFieldType&>(this->internalField());
volFieldType& vf = const_cast<volFieldType&>(cvf);
@ -242,7 +242,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::startWait() const
// only wait on master patch
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
static_cast<const volFieldType&>(this->internalField());
const typename volFieldType::Boundary& bf =
cvf.boundaryField();
@ -406,7 +406,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::writeData
writeHeader(os);
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
static_cast<const volFieldType&>(this->internalField());
const typename volFieldType::Boundary& bf =
cvf.boundaryField();
@ -608,7 +608,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::initialise
}
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
static_cast<const volFieldType&>(this->internalField());
volFieldType& vf = const_cast<volFieldType&>(cvf);
@ -777,7 +777,7 @@ template<class Type>
void Foam::externalCoupledMixedFvPatchField<Type>::writeGeometry() const
{
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
static_cast<const volFieldType&>(this->internalField());
const typename volFieldType::Boundary& bf =
cvf.boundaryField();

4
src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
View File

@ -151,8 +151,8 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << patch().name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath() << nl
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath() << nl
<< exit(FatalError);
}

4
src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
View File

@ -127,8 +127,8 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
FatalErrorInFunction
<< "dimensions of phi are incorrect\n"
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalError);
}
}

4
src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
View File

@ -144,8 +144,8 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalError);
}

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

@ -150,7 +150,7 @@ void Foam::mappedFieldFvPatchField<Type>::updateCoeffs()
if (debug)
{
Info<< "operating on field:" << this->dimensionedInternalField().name()
Info<< "operating on field:" << this->internalField().name()
<< " patch:" << this->patch().name()
<< " avg:" << gAverage(*this)
<< " min:" << gMin(*this)

8
src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
View File

@ -69,7 +69,7 @@ mappedPatchFieldBase<Type>::mappedPatchFieldBase
dict.template lookupOrDefault<word>
(
"fieldName",
patchField_.dimensionedInternalField().name()
patchField_.internalField().name()
)
),
setAverage_(readBool(dict.lookup("setAverage"))),
@ -92,7 +92,7 @@ mappedPatchFieldBase<Type>::mappedPatchFieldBase
:
mapper_(mapper),
patchField_(patchField),
fieldName_(patchField_.dimensionedInternalField().name()),
fieldName_(patchField_.internalField().name()),
setAverage_(false),
average_(Zero),
interpolationScheme_(interpolationCell<Type>::typeName)
@ -143,13 +143,13 @@ mappedPatchFieldBase<Type>::sampleField() const
if (mapper_.sameRegion())
{
if (fieldName_ == patchField_.dimensionedInternalField().name())
if (fieldName_ == patchField_.internalField().name())
{
// Optimisation: bypass field lookup
return
dynamic_cast<const fieldType&>
(
patchField_.dimensionedInternalField()
patchField_.internalField()
);
}
else

2
src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
View File

@ -179,7 +179,7 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
UPstream::msgType() = oldTag;
// Assign to (this) patch internal field its neighbour values
Field<Type>& intFld = const_cast<Field<Type>&>(this->internalField());
Field<Type>& intFld = const_cast<Field<Type>&>(this->primitiveField());
UIndirectList<Type>(intFld, this->patch().faceCells()) = nbrIntFld;
}

2
src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C
View File

@ -104,7 +104,7 @@ void Foam::mappedFixedPushedInternalValueFvPatchField<Type>::updateCoeffs()
mappedFixedValueFvPatchField<Type>::updateCoeffs();
// Assign the patch internal field to its boundary value
Field<Type>& intFld = const_cast<Field<Type>&>(this->internalField());
Field<Type>& intFld = const_cast<Field<Type>&>(this->primitiveField());
UIndirectList<Type>(intFld, this->patch().faceCells()) = *this;
}

2
src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
View File

@ -126,7 +126,7 @@ void Foam::mappedFixedValueFvPatchField<Type>::updateCoeffs()
if (debug)
{
Info<< "mapped on field:"
<< this->dimensionedInternalField().name()
<< this->internalField().name()
<< " patch:" << this->patch().name()
<< " avg:" << gAverage(*this)
<< " min:" << gMin(*this)

8
src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
View File

@ -155,10 +155,10 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
scalar phi = gSum(rhop*(*this) & patch().Sf());
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
<< this->dimensionedInternalField().name() << " <- "
<< this->internalField().name() << " <- "
<< nbrMesh.name() << ':'
<< nbrPatch.name() << ':'
<< this->dimensionedInternalField().name() << " :"
<< this->internalField().name() << " :"
<< " mass flux[Kg/s]:" << -phi
<< endl;
}
@ -168,8 +168,8 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
FatalErrorInFunction
<< "dimensions of " << phiName_ << " are incorrect" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< nl << exit(FatalError);
}

14
src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
View File

@ -63,8 +63,8 @@ mappedVelocityFluxFixedValueFvPatchField
<< "Patch type '" << p.type()
<< "' not type '" << mappedPatchBase::typeName << "'"
<< " for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath()
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath()
<< exit(FatalError);
}
}
@ -87,8 +87,8 @@ mappedVelocityFluxFixedValueFvPatchField
<< "Patch type '" << p.type()
<< "' not type '" << mappedPatchBase::typeName << "'"
<< " for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath()
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath()
<< exit(FatalError);
}
@ -102,8 +102,8 @@ mappedVelocityFluxFixedValueFvPatchField
<< "Patch " << p.name()
<< " of type '" << p.type()
<< "' can not be used in 'nearestCell' mode"
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath()
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath()
<< exit(FatalError);
}
}
@ -152,7 +152,7 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
mappedVelocityFluxFixedValueFvPatchField::patch().patch()
);
const fvMesh& nbrMesh = refCast<const fvMesh>(mpp.sampleMesh());
const word& fieldName = dimensionedInternalField().name();
const word& fieldName = internalField().name();
const volVectorField& UField =
nbrMesh.lookupObject<volVectorField>(fieldName);

4
src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
View File

@ -99,7 +99,7 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs()
return;
}
const fvMesh& mesh = dimensionedInternalField().mesh();
const fvMesh& mesh = internalField().mesh();
if (mesh.moving())
{
@ -119,7 +119,7 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs()
const vectorField Up((pp.faceCentres() - oldFc)/deltaT);
const volVectorField& U =
static_cast<const volVectorField&>(dimensionedInternalField());
static_cast<const volVectorField&>(internalField());
scalarField phip
(

2
src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
View File

@ -116,7 +116,7 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::updateCoeffs()
(
dynamic_cast<const GeometricField<Type, fvPatchField, volMesh>&>
(
this->dimensionedInternalField()
this->internalField()
)
);

10
src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
View File

@ -184,7 +184,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
const fvPatchField<scalar>& p_old =
db().lookupObject<volScalarField>
(
dimensionedInternalField().name()
internalField().name()
).oldTime().boundaryField()[patch().index()];
const fvPatchField<vector>& U =
patch().lookupPatchField<volVectorField, vector>(UName_);
@ -205,7 +205,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
// Calculate the current mass flow rate
scalar massFlowRate(1.0);
if (phi.dimensionedInternalField().dimensions() == dimVelocity*dimArea)
if (phi.internalField().dimensions() == dimVelocity*dimArea)
{
if (hasRho_)
{
@ -220,7 +220,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
}
else if
(
phi.dimensionedInternalField().dimensions()
phi.internalField().dimensions()
== dimDensity*dimVelocity*dimArea
)
{
@ -240,8 +240,8 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << patch().name()
<< " of field " << dimensionedInternalField().name()
<< " in file " << dimensionedInternalField().objectPath() << nl
<< " of field " << internalField().name()
<< " in file " << internalField().objectPath() << nl
<< exit(FatalError);
}

4
src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
View File

@ -172,8 +172,8 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalError);
}

4
src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
View File

@ -165,8 +165,8 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
<< exit(FatalError);
}

Some files were not shown because too many files have changed in this diff Show More