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

Code simplification: GeometricField<Type, fvPatchField, volMesh> -> VolField<Type>

Browse Source 
Using the VolField<Type> partial specialisation of
GeometricField<Type, fvPatchField, volMesh>
simplifies the code and improves readability.
This commit is contained in:
Henry Weller
2022-12-02 22:04:45 +00:00
parent fe368d5332
commit 2f4dd4fe27
274 changed files with 1796 additions and 1802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
applications/utilities/preProcessing/mapFields/meshToMesh0.H
View File

@ -267,7 +267,7 @@ public:
void interpolateField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const labelList& adr,
const scalarListList& weights
) const;
@ -277,7 +277,7 @@ public:
void interpolateField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const labelListList& adr,
const scalarListList& weights
) const;
@ -288,7 +288,7 @@ public:
void interpolateField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const labelList& adr,
const vectorField& centres
)const;
@ -299,7 +299,7 @@ public:
void interpolateInternalField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
order=INTERPOLATE
) const;
@ -307,7 +307,7 @@ public:
void interpolateInternalField
(
Field<Type>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
order=INTERPOLATE
) const;
@ -316,32 +316,32 @@ public:
template<class Type>
void interpolate
(
GeometricField<Type, fvPatchField, volMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&,
VolField<Type>&,
const VolField<Type>&,
order=INTERPOLATE
) const;
template<class Type>
void interpolate
(
GeometricField<Type, fvPatchField, volMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
VolField<Type>&,
const tmp<VolField<Type>>&,
order=INTERPOLATE
) const;
//- Interpolate volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
tmp<VolField<Type>> interpolate
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
order=INTERPOLATE
) const;
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
tmp<VolField<Type>> interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
order=INTERPOLATE
) const;
};

30
applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C
View File

@ -57,7 +57,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
const labelListList& adr,
const scalarListList& weights
) const
@ -83,7 +83,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
const labelList& adr,
const scalarListList& weights
) const
@ -117,7 +117,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
const labelList& adr,
const vectorField& centres
) const
@ -139,7 +139,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateInternalField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
meshToMesh0::order ord
) const
{
@ -216,7 +216,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateInternalField
(
Field<Type>& toF,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
const tmp<VolField<Type>>& tfromVf,
meshToMesh0::order ord
) const
{
@ -228,14 +228,14 @@ void Foam::meshToMesh0::interpolateInternalField
template<class Type>
void Foam::meshToMesh0::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
VolField<Type>& toVf,
const VolField<Type>& fromVf,
meshToMesh0::order ord
) const
{
interpolateInternalField(toVf, fromVf, ord);
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& toVfBf = toVf.boundaryFieldRef();
forAll(toMesh_.boundaryMesh(), patchi)
@ -322,8 +322,8 @@ void Foam::meshToMesh0::interpolate
template<class Type>
void Foam::meshToMesh0::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
VolField<Type>& toVf,
const tmp<VolField<Type>>& tfromVf,
meshToMesh0::order ord
) const
{
@ -336,7 +336,7 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh0::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
meshToMesh0::order ord
) const
{
@ -380,9 +380,9 @@ Foam::meshToMesh0::interpolate
// Create the complete field from the pieces
tmp<GeometricField<Type, fvPatchField, volMesh>> ttoF
tmp<VolField<Type>> ttoF
(
new GeometricField<Type, fvPatchField, volMesh>
new VolField<Type>
(
IOobject
(
@ -408,11 +408,11 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh0::interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
const tmp<VolField<Type>>& tfromVf,
meshToMesh0::order ord
) const
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tint =
tmp<VolField<Type>> tint =
interpolate(tfromVf(), ord);
tfromVf.clear();

4
applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C
View File

@ -36,9 +36,9 @@ namespace Foam
{
template<class Type>
void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
void evaluateConstraintTypes(VolField<Type>& fld)
{
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& fldBf = fld.boundaryFieldRef();
if

2
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -101,7 +101,7 @@ bool setCellFieldType
}
}
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& fieldBf = field.boundaryFieldRef();
forAll(field.boundaryField(), patchi)