zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: patch field Internal::null() instead of DimensionedField equivalent

Browse Source 
- makes for more consistent coding

STYLE: use two-parameter clone when making a copy of patch fields
This commit is contained in:
Mark Olesen
2024-01-08 17:34:00 +01:00
committed by Andrew Heather
parent 987dbe4589
commit 2190684914
19 changed files with 187 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2016-2023 OpenCFD Ltd. Copyright (C) 2016-2024 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -30,9 +30,8 @@ License
#include "Time.H" #include "Time.H"
#include "PtrList.H" #include "PtrList.H"
#include "fvPatchFields.H" #include "fvPatchFields.H"
#include "fvsPatchFields.H"
#include "emptyFvPatch.H" #include "emptyFvPatch.H"
#include "emptyFvPatchField.H"
#include "emptyFvsPatchField.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "mapDistributePolyMesh.H" #include "mapDistributePolyMesh.H"
#include "processorFvPatch.H" #include "processorFvPatch.H"
@ -123,15 +122,19 @@ Foam::parFvFieldDistributor::distributeField
{ {
if (patchFaceMaps_.set(patchi)) if (patchFaceMaps_.set(patchi))
{ {
// Clone local patch field
oldPatchFields.set(patchi, bfld[patchi].clone());
distributedFvPatchFieldMapper mapper distributedFvPatchFieldMapper mapper
( (
labelUList::null(), labelUList::null(),
patchFaceMaps_[patchi] patchFaceMaps_[patchi]
); );
// Clone local patch field
oldPatchFields.set
(
patchi,
bfld[patchi].clone(fld.internalField())
);
// Map into local copy // Map into local copy
oldPatchFields[patchi].autoMap(mapper); oldPatchFields[patchi].autoMap(mapper);
} }
@ -159,7 +162,7 @@ Foam::parFvFieldDistributor::distributeField
( (
pfld, pfld,
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, volMesh>::null(), fvPatchField<Type>::Internal::null(),
dummyMapper dummyMapper
) )
); );
@ -178,9 +181,9 @@ Foam::parFvFieldDistributor::distributeField
patchi, patchi,
fvPatchField<Type>::New fvPatchField<Type>::New
( (
emptyFvPatchField<Type>::typeName, fvPatchFieldBase::emptyType(),
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -268,15 +271,19 @@ Foam::parFvFieldDistributor::distributeField
{ {
if (patchFaceMaps_.set(patchi)) if (patchFaceMaps_.set(patchi))
{ {
// Clone local patch field
oldPatchFields.set(patchi, bfld[patchi].clone());
distributedFvPatchFieldMapper mapper distributedFvPatchFieldMapper mapper
( (
labelUList::null(), labelUList::null(),
patchFaceMaps_[patchi] patchFaceMaps_[patchi]
); );
// Clone local patch field
oldPatchFields.set
(
patchi,
bfld[patchi].clone(fld.internalField())
);
// Map into local copy // Map into local copy
oldPatchFields[patchi].autoMap(mapper); oldPatchFields[patchi].autoMap(mapper);
} }
@ -303,7 +310,7 @@ Foam::parFvFieldDistributor::distributeField
( (
pfld, pfld,
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, surfaceMesh>::null(), fvsPatchField<Type>::Internal::null(),
dummyMapper dummyMapper
) )
); );
@ -321,9 +328,9 @@ Foam::parFvFieldDistributor::distributeField
patchi, patchi,
fvsPatchField<Type>::New fvsPatchField<Type>::New
( (
emptyFvsPatchField<Type>::typeName, fvsPatchFieldBase::emptyType(),
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, surfaceMesh>::null() fvsPatchField<Type>::Internal::null()
) )
); );
} }

10
applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributorTemplates.C
View File

@ -26,11 +26,11 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "Time.H" #include "Time.H"
#include "emptyPointPatchField.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "mapDistributePolyMesh.H" #include "mapDistributePolyMesh.H"
#include "distributedFieldMapper.H" #include "distributedFieldMapper.H"
#include "distributedPointPatchFieldMapper.H" #include "distributedPointPatchFieldMapper.H"
#include "emptyPointPatch.H"
#include "pointFields.H" #include "pointFields.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -108,7 +108,7 @@ Foam::parPointFieldDistributor::distributeField
( (
bfld[patchi], bfld[patchi],
tgtMesh.boundary()[patchi], // pointPatch tgtMesh.boundary()[patchi], // pointPatch
DimensionedField<Type, pointMesh>::null(), pointPatchField<Type>::Internal::null(),
mapper mapper
) )
); );
@ -122,7 +122,7 @@ Foam::parPointFieldDistributor::distributeField
// bfld[patchi].clone // bfld[patchi].clone
// ( // (
// tgtMesh.boundary()[patchi], // tgtMesh.boundary()[patchi],
// DimensionedField<Type, pointMesh>::null(), // pointPatchField<Type>::Internal::null(),
// mapper // mapper
// ) // )
//); //);
@ -140,9 +140,9 @@ Foam::parPointFieldDistributor::distributeField
patchi, patchi,
pointPatchField<Type>::New pointPatchField<Type>::New
( (
emptyPointPatchField<Type>::typeName, pointPatchFieldBase::emptyType(),
tgtMesh.boundary()[patchi], tgtMesh.boundary()[patchi],
DimensionedField<Type, pointMesh>::null() pointPatchField<Type>::Internal::null()
) )
); );
} }

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

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019-2023 OpenCFD Ltd. Copyright (C) 2019-2024 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -240,6 +240,25 @@ class pointPatchField
: :
public pointPatchFieldBase public pointPatchFieldBase
{ {
public:
// Public Data Types
//- The patch type for the patch field
typedef pointPatch Patch;
//- The value_type for the patch field
typedef Type value_type;
//- The internal field type associated with the patch field
typedef DimensionedField<Type, pointMesh> Internal;
//- Type for a \em calculated patch
typedef calculatedPointPatchField<Type> Calculated;
private:
// Private Data // Private Data
//- Reference to internal field //- Reference to internal field
@ -248,19 +267,6 @@ class pointPatchField
public: public:
//- The Field value_type
typedef Type value_type;
//- The internal field type associated with the patch field
typedef DimensionedField<Type, pointMesh> Internal;
//- The patch type for the patch field
typedef pointPatch Patch;
//- Type for a \em calculated patch
typedef calculatedPointPatchField<Type> Calculated;
// Declare run-time constructor selection tables // Declare run-time constructor selection tables
declareRunTimeSelectionTable declareRunTimeSelectionTable

36
src/finiteArea/distributed/faMeshDistributorTemplates.C
View File

@ -26,8 +26,8 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "Time.H" #include "Time.H"
#include "emptyFaPatchField.H" #include "faPatchFields.H"
#include "emptyFaePatchField.H" #include "faePatchFields.H"
#include "IOobjectList.H" #include "IOobjectList.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "polyPatch.H" #include "polyPatch.H"
@ -49,10 +49,6 @@ Foam::faMeshDistributor::distributeField
const GeometricField<Type, faPatchField, areaMesh>& fld const GeometricField<Type, faPatchField, areaMesh>& fld
) const ) const
{ {
typedef typename
GeometricField<Type, faPatchField, areaMesh>::Patch
PatchFieldType;
if (tgtMesh_.boundary().size() && patchEdgeMaps_.empty()) if (tgtMesh_.boundary().size() && patchEdgeMaps_.empty())
{ {
createPatchMaps(); createPatchMaps();
@ -87,7 +83,7 @@ Foam::faMeshDistributor::distributeField
// Create patchFields by remote mapping // Create patchFields by remote mapping
PtrList<PatchFieldType> newPatchFields(tgtMesh_.boundary().size()); PtrList<faPatchField<Type>> newPatchFields(tgtMesh_.boundary().size());
const auto& bfld = fld.boundaryField(); const auto& bfld = fld.boundaryField();
@ -107,11 +103,11 @@ Foam::faMeshDistributor::distributeField
newPatchFields.set newPatchFields.set
( (
patchi, patchi,
PatchFieldType::New faPatchField<Type>::New
( (
bfld[patchi], bfld[patchi],
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, areaMesh>::null(), faPatchField<Type>::Internal::null(),
mapper mapper
) )
); );
@ -127,11 +123,11 @@ Foam::faMeshDistributor::distributeField
newPatchFields.set newPatchFields.set
( (
patchi, patchi,
PatchFieldType::New faPatchField<Type>::New
( (
emptyFaPatchField<Type>::typeName, faPatchFieldBase::emptyType(),
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, areaMesh>::null() faPatchField<Type>::Internal::null()
) )
); );
} }
@ -158,10 +154,6 @@ Foam::faMeshDistributor::distributeField
const GeometricField<Type, faePatchField, edgeMesh>& fld const GeometricField<Type, faePatchField, edgeMesh>& fld
) const ) const
{ {
typedef typename
GeometricField<Type, faePatchField, edgeMesh>::Patch
PatchFieldType;
if (!internalEdgeMap_) if (!internalEdgeMap_)
{ {
createInternalEdgeMap(); createInternalEdgeMap();
@ -197,7 +189,7 @@ Foam::faMeshDistributor::distributeField
// Create patchFields by remote mapping // Create patchFields by remote mapping
PtrList<PatchFieldType> newPatchFields(tgtMesh_.boundary().size()); PtrList<faePatchField<Type>> newPatchFields(tgtMesh_.boundary().size());
const auto& bfld = fld.boundaryField(); const auto& bfld = fld.boundaryField();
@ -217,11 +209,11 @@ Foam::faMeshDistributor::distributeField
newPatchFields.set newPatchFields.set
( (
patchi, patchi,
PatchFieldType::New faePatchField<Type>::New
( (
bfld[patchi], bfld[patchi],
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, edgeMesh>::null(), faePatchField<Type>::Internal::null(),
mapper mapper
) )
); );
@ -237,11 +229,11 @@ Foam::faMeshDistributor::distributeField
newPatchFields.set newPatchFields.set
( (
patchi, patchi,
PatchFieldType::New faePatchField<Type>::New
( (
emptyFaePatchField<Type>::typeName, faePatchFieldBase::emptyType(),
tgtMesh_.boundary()[patchi], tgtMesh_.boundary()[patchi],
DimensionedField<Type, edgeMesh>::null() faePatchField<Type>::Internal::null()
) )
); );
} }

4
src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
View File

@ -60,7 +60,7 @@ Foam::faMeshSubset::interpolate
( (
faPatchFieldBase::calculatedType(), faPatchFieldBase::calculatedType(),
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, areaMesh>::null() faPatchField<Type>::Internal::null()
) )
); );
} }
@ -167,7 +167,7 @@ Foam::faMeshSubset::interpolate
( (
faePatchFieldBase::calculatedType(), faePatchFieldBase::calculatedType(),
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, edgeMesh>::null() faePatchField<Type>::Internal::null()
) )
); );
} }

32
src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd Copyright (C) 2016-2017 Wikki Ltd
Copyright (C) 2019-2023 OpenCFD Ltd. Copyright (C) 2019-2024 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -238,11 +238,31 @@ class faPatchField
public faPatchFieldBase, public faPatchFieldBase,
public Field<Type> public Field<Type>
{ {
public:
// Public Data Types
//- The patch type for the patch field
typedef faPatch Patch;
//- The value_type for the patch field
typedef Type value_type;
//- The internal field type associated with the patch field
typedef DimensionedField<Type, areaMesh> Internal;
//- Type for a \em calculated patch
typedef calculatedFaPatchField<Type> Calculated;
private:
// Private Data // Private Data
//- Reference to internal field //- Reference to internal field
const DimensionedField<Type, areaMesh>& internalField_; const DimensionedField<Type, areaMesh>& internalField_;
protected: protected:
// Protected Member Functions // Protected Member Functions
@ -268,16 +288,6 @@ protected:
public: public:
//- The internal field type associated with the patch field
typedef DimensionedField<Type, areaMesh> Internal;
//- The patch type for the patch field
typedef faPatch Patch;
//- Type for a \em calculated patch
typedef calculatedFaPatchField<Type> Calculated;
// Declare run-time constructor selection tables // Declare run-time constructor selection tables
declareRunTimeSelectionTable declareRunTimeSelectionTable

31
src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd Copyright (C) 2016-2017 Wikki Ltd
Copyright (C) 2019-2023 OpenCFD Ltd. Copyright (C) 2019-2024 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -211,6 +211,25 @@ class faePatchField
public faePatchFieldBase, public faePatchFieldBase,
public Field<Type> public Field<Type>
{ {
public:
// Public Data Types
//- The patch type for the patch field
typedef faPatch Patch;
//- The value_type for the patch field
typedef Type value_type;
//- The internal field type associated with the patch field
typedef DimensionedField<Type, edgeMesh> Internal;
//- Type for a \em calculated patch
typedef calculatedFaePatchField<Type> Calculated;
private:
// Private Data // Private Data
//- Reference to internal field //- Reference to internal field
@ -238,16 +257,6 @@ protected:
public: public:
//- The internal field type associated with the patch field
typedef DimensionedField<Type, edgeMesh> Internal;
//- The patch type for the patch field
typedef faPatch Patch;
//- Type for a \em calculated patch
typedef calculatedFaePatchField<Type> Calculated;
// Declare run-time constructor selection tables // Declare run-time constructor selection tables
declareRunTimeSelectionTable declareRunTimeSelectionTable

32
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019-2023 OpenCFD Ltd. Copyright (C) 2019-2024 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -281,11 +281,31 @@ class fvPatchField
public fvPatchFieldBase, public fvPatchFieldBase,
public Field<Type> public Field<Type>
{ {
public:
// Public Data Types
//- The patch type for the patch field
typedef fvPatch Patch;
//- The value_type for the patch field
typedef Type value_type;
//- The internal field type associated with the patch field
typedef DimensionedField<Type, volMesh> Internal;
//- Type for a \em calculated patch
typedef calculatedFvPatchField<Type> Calculated;
private:
// Private Data // Private Data
//- Reference to internal field //- Reference to internal field
const DimensionedField<Type, volMesh>& internalField_; const DimensionedField<Type, volMesh>& internalField_;
protected: protected:
// Protected Member Functions // Protected Member Functions
@ -311,16 +331,6 @@ protected:
public: public:
//- The internal field type associated with the patch field
typedef DimensionedField<Type, volMesh> Internal;
//- The patch type for the patch field
typedef fvPatch Patch;
//- Type for a \em calculated patch
typedef calculatedFvPatchField<Type> Calculated;
// Declare run-time constructor selection tables // Declare run-time constructor selection tables
declareRunTimeSelectionTable declareRunTimeSelectionTable

32
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019-2023 OpenCFD Ltd. Copyright (C) 2019-2024 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -205,11 +205,31 @@ class fvsPatchField
public fvsPatchFieldBase, public fvsPatchFieldBase,
public Field<Type> public Field<Type>
{ {
public:
// Public Data Types
//- The patch type for the patch field
typedef fvPatch Patch;
//- The value_type for the patch field
typedef Type value_type;
//- The internal field type associated with the patch field
typedef DimensionedField<Type, surfaceMesh> Internal;
//- Type for a \em calculated patch
typedef calculatedFvsPatchField<Type> Calculated;
private:
// Private Data // Private Data
//- Reference to internal field //- Reference to internal field
const DimensionedField<Type, surfaceMesh>& internalField_; const DimensionedField<Type, surfaceMesh>& internalField_;
protected: protected:
// Protected Member Functions // Protected Member Functions
@ -232,16 +252,6 @@ protected:
public: public:
//- The internal field type associated with the patch field
typedef DimensionedField<Type, surfaceMesh> Internal;
//- The patch type for the patch field
typedef fvPatch Patch;
//- Type for a \em calculated patch
typedef calculatedFvsPatchField<Type> Calculated;
// Declare run-time constructor selection tables // Declare run-time constructor selection tables
declareRunTimeSelectionTable declareRunTimeSelectionTable

12
src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
View File

@ -67,7 +67,7 @@ Foam::fvMeshSubset::interpolate
new emptyFvPatchField<Type> new emptyFvPatchField<Type>
( (
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -80,7 +80,7 @@ Foam::fvMeshSubset::interpolate
( (
fvPatchFieldBase::calculatedType(), fvPatchFieldBase::calculatedType(),
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -248,7 +248,7 @@ Foam::fvMeshSubset::interpolate
new emptyFvsPatchField<Type> new emptyFvsPatchField<Type>
( (
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, surfaceMesh>::null() fvsPatchField<Type>::Internal::null()
) )
); );
} }
@ -261,7 +261,7 @@ Foam::fvMeshSubset::interpolate
( (
fvsPatchFieldBase::calculatedType(), fvsPatchFieldBase::calculatedType(),
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, surfaceMesh>::null() fvsPatchField<Type>::Internal::null()
) )
); );
} }
@ -435,7 +435,7 @@ Foam::fvMeshSubset::interpolate
new emptyPointPatchField<Type> new emptyPointPatchField<Type>
( (
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, pointMesh>::null() pointPatchField<Type>::Internal::null()
) )
); );
} }
@ -448,7 +448,7 @@ Foam::fvMeshSubset::interpolate
( (
pointPatchFieldBase::calculatedType(), pointPatchFieldBase::calculatedType(),
sMesh.boundary()[patchi], sMesh.boundary()[patchi],
DimensionedField<Type, pointMesh>::null() pointPatchField<Type>::Internal::null()
) )
); );
} }

2
src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
View File

@ -55,7 +55,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
( (
fvPatchFieldBase::calculatedType(), fvPatchFieldBase::calculatedType(),
boundary()[patchi], boundary()[patchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }

4
src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
View File

@ -89,7 +89,7 @@ Foam::fvFieldDecomposer::decomposeField
( (
fvPatchFieldBase::calculatedType(), fvPatchFieldBase::calculatedType(),
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -262,7 +262,7 @@ Foam::fvFieldDecomposer::decomposeField
( (
fvsPatchFieldBase::calculatedType(), fvsPatchFieldBase::calculatedType(),
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, surfaceMesh>::null() fvsPatchField<Type>::Internal::null()
) )
); );
} }

4
src/parallel/decompose/decompose/pointFieldDecomposerTemplates.C
View File

@ -56,7 +56,7 @@ Foam::pointFieldDecomposer::decomposeField
( (
field.boundaryField()[boundaryAddressing_[patchi]], field.boundaryField()[boundaryAddressing_[patchi]],
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, pointMesh>::null(), pointPatchField<Type>::Internal::null(),
patchFieldDecomposerPtrs_[patchi] patchFieldDecomposerPtrs_[patchi]
) )
); );
@ -69,7 +69,7 @@ Foam::pointFieldDecomposer::decomposeField
new processorPointPatchField<Type> new processorPointPatchField<Type>
( (
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, pointMesh>::null() pointPatchField<Type>::Internal::null()
) )
); );
} }

8
src/parallel/decompose/faDecompose/faFieldDecomposerTemplates.C
View File

@ -60,7 +60,7 @@ Foam::faFieldDecomposer::decomposeField
( (
field.boundaryField()[oldPatchi], field.boundaryField()[oldPatchi],
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, areaMesh>::null(), faPatchField<Type>::Internal::null(),
patchFieldDecomposerPtrs_[patchi] patchFieldDecomposerPtrs_[patchi]
) )
); );
@ -73,7 +73,7 @@ Foam::faFieldDecomposer::decomposeField
new processorFaPatchField<Type> new processorFaPatchField<Type>
( (
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, areaMesh>::null(), faPatchField<Type>::Internal::null(),
Field<Type> Field<Type>
( (
field.internalField(), field.internalField(),
@ -171,7 +171,7 @@ Foam::faFieldDecomposer::decomposeField
( (
field.boundaryField()[oldPatchi], field.boundaryField()[oldPatchi],
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, edgeMesh>::null(), faePatchField<Type>::Internal::null(),
patchFieldDecomposerPtrs_[patchi] patchFieldDecomposerPtrs_[patchi]
) )
); );
@ -184,7 +184,7 @@ Foam::faFieldDecomposer::decomposeField
new processorFaePatchField<Type> new processorFaePatchField<Type>
( (
procMesh_.boundary()[patchi], procMesh_.boundary()[patchi],
DimensionedField<Type, edgeMesh>::null(), faePatchField<Type>::Internal::null(),
Field<Type> Field<Type>
( (
allEdgeField, allEdgeField,

22
src/parallel/reconstruct/faReconstruct/faFieldReconstructorTemplates.C
View File

@ -29,10 +29,9 @@ License
#include "faFieldReconstructor.H" #include "faFieldReconstructor.H"
#include "Time.H" #include "Time.H"
#include "PtrList.H" #include "PtrList.H"
#include "faPatchFields.H"
#include "emptyFaPatch.H" #include "emptyFaPatch.H"
#include "emptyFaPatchField.H" #include "faPatchFields.H"
#include "emptyFaePatchField.H" #include "faePatchFields.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -130,7 +129,7 @@ Foam::faFieldReconstructor::reconstructField
( (
procField.boundaryField()[patchI], procField.boundaryField()[patchI],
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, areaMesh>::null(), faPatchField<Type>::Internal::null(),
faPatchFieldReconstructor faPatchFieldReconstructor
( (
mesh_.boundary()[curBPatch].size(), mesh_.boundary()[curBPatch].size(),
@ -204,7 +203,7 @@ Foam::faFieldReconstructor::reconstructField
( (
mesh_.boundary()[curBPatch].type(), mesh_.boundary()[curBPatch].type(),
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, areaMesh>::null() faPatchField<Type>::Internal::null()
) )
); );
} }
@ -238,9 +237,9 @@ Foam::faFieldReconstructor::reconstructField
patchI, patchI,
faPatchField<Type>::New faPatchField<Type>::New
( (
emptyFaPatchField<Type>::typeName, faPatchFieldBase::emptyType(),
mesh_.boundary()[patchI], mesh_.boundary()[patchI],
DimensionedField<Type, areaMesh>::null() faPatchField<Type>::Internal::null()
) )
); );
} }
@ -371,7 +370,7 @@ Foam::faFieldReconstructor::reconstructField
( (
procField.boundaryField()[patchI], procField.boundaryField()[patchI],
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, edgeMesh>::null(), faePatchField<Type>::Internal::null(),
faPatchFieldReconstructor faPatchFieldReconstructor
( (
mesh_.boundary()[curBPatch].size(), mesh_.boundary()[curBPatch].size(),
@ -448,8 +447,7 @@ Foam::faFieldReconstructor::reconstructField
( (
mesh_.boundary()[curBPatch].type(), mesh_.boundary()[curBPatch].type(),
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, edgeMesh> faePatchField<Type>::Internal::null()
::null()
) )
); );
} }
@ -489,9 +487,9 @@ Foam::faFieldReconstructor::reconstructField
patchI, patchI,
faePatchField<Type>::New faePatchField<Type>::New
( (
emptyFaePatchField<Type>::typeName, faePatchFieldBase::emptyType(),
mesh_.boundary()[patchI], mesh_.boundary()[patchI],
DimensionedField<Type, edgeMesh>::null() faePatchField<Type>::Internal::null()
) )
); );
} }

22
src/parallel/reconstruct/reconstruct/fvFieldReconstructorTemplates.C
View File

@ -29,10 +29,9 @@ License
#include "fvFieldReconstructor.H" #include "fvFieldReconstructor.H"
#include "Time.H" #include "Time.H"
#include "PtrList.H" #include "PtrList.H"
#include "fvPatchFields.H"
#include "emptyFvPatch.H" #include "emptyFvPatch.H"
#include "emptyFvPatchField.H" #include "fvPatchFields.H"
#include "emptyFvsPatchField.H" #include "fvsPatchFields.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -125,7 +124,7 @@ Foam::fvFieldReconstructor::reconstructField
( (
procField.boundaryField()[patchi], procField.boundaryField()[patchi],
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, volMesh>::null(), fvPatchField<Type>::Internal::null(),
fvPatchFieldReconstructor fvPatchFieldReconstructor
( (
mesh_.boundary()[curBPatch].size() mesh_.boundary()[curBPatch].size()
@ -193,7 +192,7 @@ Foam::fvFieldReconstructor::reconstructField
( (
mesh_.boundary()[curBPatch].type(), mesh_.boundary()[curBPatch].type(),
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -225,9 +224,9 @@ Foam::fvFieldReconstructor::reconstructField
patchi, patchi,
fvPatchField<Type>::New fvPatchField<Type>::New
( (
emptyFvPatchField<Type>::typeName, fvPatchFieldBase::emptyType(),
mesh_.boundary()[patchi], mesh_.boundary()[patchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -323,7 +322,7 @@ Foam::fvFieldReconstructor::reconstructField
( (
procField.boundaryField()[patchi], procField.boundaryField()[patchi],
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, surfaceMesh>::null(), fvsPatchField<Type>::Internal::null(),
fvPatchFieldReconstructor fvPatchFieldReconstructor
( (
mesh_.boundary()[curBPatch].size() mesh_.boundary()[curBPatch].size()
@ -379,8 +378,7 @@ Foam::fvFieldReconstructor::reconstructField
( (
mesh_.boundary()[curBPatch].type(), mesh_.boundary()[curBPatch].type(),
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, surfaceMesh> fvsPatchField<Type>::Internal::null()
::null()
) )
); );
} }
@ -418,9 +416,9 @@ Foam::fvFieldReconstructor::reconstructField
patchi, patchi,
fvsPatchField<Type>::New fvsPatchField<Type>::New
( (
emptyFvsPatchField<Type>::typeName, fvsPatchFieldBase::emptyType(),
mesh_.boundary()[patchi], mesh_.boundary()[patchi],
DimensionedField<Type, surfaceMesh>::null() fvsPatchField<Type>::Internal::null()
) )
); );
} }

2
src/parallel/reconstruct/reconstruct/pointFieldReconstructorTemplates.C
View File

@ -79,7 +79,7 @@ Foam::pointFieldReconstructor::reconstructField
( (
procField.boundaryField()[patchi], procField.boundaryField()[patchi],
mesh_.boundary()[curBPatch], mesh_.boundary()[curBPatch],
DimensionedField<Type, pointMesh>::null(), pointPatchField<Type>::Internal::null(),
pointPatchFieldReconstructor pointPatchFieldReconstructor
( (
mesh_.boundary()[curBPatch].size() mesh_.boundary()[curBPatch].size()

8
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -612,7 +612,7 @@ Foam::meshToMesh::mapSrcToTgt
( (
srcBfld[srcPatchi], srcBfld[srcPatchi],
tgtMesh.boundary()[tgtPatchi], tgtMesh.boundary()[tgtPatchi],
DimensionedField<Type, volMesh>::null(), fvPatchField<Type>::Internal::null(),
directFvPatchFieldMapper directFvPatchFieldMapper
( (
labelList(tgtMesh.boundary()[tgtPatchi].size(), -1) labelList(tgtMesh.boundary()[tgtPatchi].size(), -1)
@ -636,7 +636,7 @@ Foam::meshToMesh::mapSrcToTgt
( (
fvPatchFieldBase::calculatedType(), fvPatchFieldBase::calculatedType(),
tgtMesh.boundary()[tgtPatchi], tgtMesh.boundary()[tgtPatchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }
@ -843,7 +843,7 @@ Foam::meshToMesh::mapTgtToSrc
( (
tgtBfld[tgtPatchi], tgtBfld[tgtPatchi],
srcMesh.boundary()[srcPatchi], srcMesh.boundary()[srcPatchi],
DimensionedField<Type, volMesh>::null(), fvPatchField<Type>::Internal::null(),
directFvPatchFieldMapper directFvPatchFieldMapper
( (
labelList(srcMesh.boundary()[srcPatchi].size(), -1) labelList(srcMesh.boundary()[srcPatchi].size(), -1)
@ -867,7 +867,7 @@ Foam::meshToMesh::mapTgtToSrc
( (
fvPatchFieldBase::calculatedType(), fvPatchFieldBase::calculatedType(),
srcMesh.boundary()[srcPatchi], srcMesh.boundary()[srcPatchi],
DimensionedField<Type, volMesh>::null() fvPatchField<Type>::Internal::null()
) )
); );
} }

2
src/sampling/meshToMesh0/meshToMesh0Templates.C
View File

@ -395,7 +395,7 @@ Foam::meshToMesh0::interpolate
( (
fromVf.boundaryField()[patchi], fromVf.boundaryField()[patchi],
toMesh_.boundary()[patchi], toMesh_.boundary()[patchi],
DimensionedField<Type, volMesh>::null(), fvPatchField<Type>::Internal::null(),
patchFieldInterpolator patchFieldInterpolator
( (
boundaryAddressing_[patchi] boundaryAddressing_[patchi]