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

Renamed FieldMapper -> fieldMapper: it is an abstract base class for field mapping, not templated

Browse Source
This commit is contained in:
Henry Weller
2019-05-03 08:58:13 +01:00
parent 76a8f398aa
commit 4b57ee554e
11 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
View File

@ -103,9 +103,9 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::autoMap
const fvPatchFieldMapper& m
)
{
Field<Type>::autoMap(m);
refValue_.autoMap(m);
valueFraction_.autoMap(m);
m(*this, *this);
m(refValue_, refValue_);
m(valueFraction_, valueFraction_);
}

4
applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
View File

@ -110,8 +110,8 @@ void Foam::tractionDisplacementFvPatchVectorField::autoMap
)
{
fixedGradientFvPatchVectorField::autoMap(m);
traction_.autoMap(m);
pressure_.autoMap(m);
m(traction_, traction_);
m(pressure_, pressure_);
}

4
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
View File

@ -115,8 +115,8 @@ void tractionDisplacementCorrectionFvPatchVectorField::autoMap
)
{
fixedGradientFvPatchVectorField::autoMap(m);
traction_.autoMap(m);
pressure_.autoMap(m);
m(traction_, traction_);
m(pressure_, pressure_);
}

2
src/OpenFOAM/Make/files
View File

@ -611,7 +611,7 @@ fields/cloud/cloud.C
Fields = fields/Fields
$(Fields)/Field/FieldMapper.C
$(Fields)/fieldMapper/fieldMapper.C
$(Fields)/labelField/labelField.C
$(Fields)/scalarField/scalarField.C
$(Fields)/vectorField/vectorField.C

8
src/OpenFOAM/fields/Fields/Field/directFieldMapper.H → src/OpenFOAM/fields/Fields/fieldMapper/directFieldMapper.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,12 +38,12 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class directFieldMapper Declaration
Class directFieldMapper Declaration
\*---------------------------------------------------------------------------*/
class directFieldMapper
:
public FieldMapper
public fieldMapper
{
const labelUList& directAddressing_;
@ -65,6 +65,7 @@ public:
}
}
//- Destructor
virtual ~directFieldMapper()
{}
@ -93,6 +94,7 @@ public:
}
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

30
src/OpenFOAM/fields/Fields/Field/FieldMapper.C → src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.C
View File

@ -23,11 +23,11 @@ License
\*---------------------------------------------------------------------------*/
#include "FieldMapper.H"
#include "fieldMapper.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::mapDistributeBase& Foam::FieldMapper::distributeMap() const
const Foam::mapDistributeBase& Foam::fieldMapper::distributeMap() const
{
FatalErrorInFunction
<< "attempt to access null distributeMap"
@ -36,7 +36,7 @@ const Foam::mapDistributeBase& Foam::FieldMapper::distributeMap() const
}
const Foam::labelUList& Foam::FieldMapper::directAddressing() const
const Foam::labelUList& Foam::fieldMapper::directAddressing() const
{
FatalErrorInFunction
<< "attempt to access null direct addressing"
@ -46,7 +46,7 @@ const Foam::labelUList& Foam::FieldMapper::directAddressing() const
}
const Foam::labelListList& Foam::FieldMapper::addressing() const
const Foam::labelListList& Foam::fieldMapper::addressing() const
{
FatalErrorInFunction
<< "attempt to access null interpolation addressing"
@ -56,7 +56,7 @@ const Foam::labelListList& Foam::FieldMapper::addressing() const
}
const Foam::scalarListList& Foam::FieldMapper::weights() const
const Foam::scalarListList& Foam::fieldMapper::weights() const
{
FatalErrorInFunction
<< "attempt to access null interpolation weights"
@ -68,7 +68,7 @@ const Foam::scalarListList& Foam::FieldMapper::weights() const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
Foam::tmp<Foam::Field<Foam::scalar>> Foam::FieldMapper::operator()
Foam::tmp<Foam::Field<Foam::scalar>> Foam::fieldMapper::operator()
(
const Field<scalar>& mapF
) const
@ -77,7 +77,7 @@ Foam::tmp<Foam::Field<Foam::scalar>> Foam::FieldMapper::operator()
}
Foam::tmp<Foam::Field<Foam::vector>> Foam::FieldMapper::operator()
Foam::tmp<Foam::Field<Foam::vector>> Foam::fieldMapper::operator()
(
const Field<vector>& mapF
) const
@ -86,7 +86,7 @@ Foam::tmp<Foam::Field<Foam::vector>> Foam::FieldMapper::operator()
}
Foam::tmp<Foam::Field<Foam::sphericalTensor>> Foam::FieldMapper::operator()
Foam::tmp<Foam::Field<Foam::sphericalTensor>> Foam::fieldMapper::operator()
(
const Field<sphericalTensor>& mapF
) const
@ -95,7 +95,7 @@ Foam::tmp<Foam::Field<Foam::sphericalTensor>> Foam::FieldMapper::operator()
}
Foam::tmp<Foam::Field<Foam::symmTensor>> Foam::FieldMapper::operator()
Foam::tmp<Foam::Field<Foam::symmTensor>> Foam::fieldMapper::operator()
(
const Field<symmTensor>& mapF
) const
@ -104,7 +104,7 @@ Foam::tmp<Foam::Field<Foam::symmTensor>> Foam::FieldMapper::operator()
}
Foam::tmp<Foam::Field<Foam::tensor>> Foam::FieldMapper::operator()
Foam::tmp<Foam::Field<Foam::tensor>> Foam::fieldMapper::operator()
(
const Field<tensor>& mapF
) const
@ -113,7 +113,7 @@ Foam::tmp<Foam::Field<Foam::tensor>> Foam::FieldMapper::operator()
}
void Foam::FieldMapper::operator()
void Foam::fieldMapper::operator()
(
Field<scalar>& f,
const Field<scalar>& mapF
@ -123,7 +123,7 @@ void Foam::FieldMapper::operator()
}
void Foam::FieldMapper::operator()
void Foam::fieldMapper::operator()
(
Field<vector>& f,
const Field<vector>& mapF
@ -133,7 +133,7 @@ void Foam::FieldMapper::operator()
}
void Foam::FieldMapper::operator()
void Foam::fieldMapper::operator()
(
Field<sphericalTensor>& f,
const Field<sphericalTensor>& mapF
@ -143,7 +143,7 @@ void Foam::FieldMapper::operator()
}
void Foam::FieldMapper::operator()
void Foam::fieldMapper::operator()
(
Field<symmTensor>& f,
const Field<symmTensor>& mapF
@ -153,7 +153,7 @@ void Foam::FieldMapper::operator()
}
void Foam::FieldMapper::operator()
void Foam::fieldMapper::operator()
(
Field<tensor>& f,
const Field<tensor>& mapF

16
src/OpenFOAM/fields/Fields/Field/FieldMapper.H → src/OpenFOAM/fields/Fields/fieldMapper/fieldMapper.H
View File

@ -22,15 +22,15 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::FieldMapper
Foam::fieldMapper
Description
Abstract base class to hold the Field mapping addressing and weights.
\*---------------------------------------------------------------------------*/
#ifndef FieldMapper_H
#define FieldMapper_H
#ifndef fieldMapper_H
#define fieldMapper_H
#include "Field.H"
#include "mapDistributeBase.H"
@ -41,10 +41,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class FieldMapper Declaration
Class fieldMapper Declaration
\*---------------------------------------------------------------------------*/
class FieldMapper
class fieldMapper
{
// Private member functions
@ -60,12 +60,12 @@ public:
// Constructors
//- Null constructor
FieldMapper()
fieldMapper()
{}
//- Destructor
virtual ~FieldMapper()
virtual ~fieldMapper()
{}
@ -166,7 +166,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "FieldMapperTemplates.C"
#include "fieldMapperTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/OpenFOAM/fields/Fields/Field/FieldMapperTemplates.C → src/OpenFOAM/fields/Fields/fieldMapper/fieldMapperTemplates.C
View File

@ -23,12 +23,12 @@ License
\*---------------------------------------------------------------------------*/
#include "FieldMapper.H"
#include "fieldMapper.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
void Foam::FieldMapper::map(Field<Type>& f, const Field<Type>& mapF) const
void Foam::fieldMapper::map(Field<Type>& f, const Field<Type>& mapF) const
{
if (distributed())
{
@ -87,7 +87,7 @@ void Foam::FieldMapper::map(Field<Type>& f, const Field<Type>& mapF) const
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::FieldMapper::map
Foam::tmp<Foam::Field<Type>> Foam::fieldMapper::map
(
const Field<Type>& mapF
) const
@ -99,7 +99,7 @@ Foam::tmp<Foam::Field<Type>> Foam::FieldMapper::map
template<class Type>
void Foam::FieldMapper::operator()
void Foam::fieldMapper::operator()
(
Field<Type>& f,
const tmp<Field<Type>>& tmapF
@ -111,7 +111,7 @@ void Foam::FieldMapper::operator()
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::FieldMapper::operator()
Foam::tmp<Foam::Field<Type>> Foam::fieldMapper::operator()
(
const tmp<Field<Type>>& tmapF
) const

6
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,7 +33,7 @@ Description
#define pointPatchFieldMapper_H
#include "primitiveFields.H"
#include "FieldMapper.H"
#include "fieldMapper.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -46,7 +46,7 @@ namespace Foam
class pointPatchFieldMapper
:
public FieldMapper
public fieldMapper
{
public:

5
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
View File

@ -32,7 +32,7 @@ Description
#ifndef morphFieldMapper_H
#define morphFieldMapper_H
#include "FieldMapper.H"
#include "fieldMapper.H"
#include "Map.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -46,7 +46,7 @@ namespace Foam
class morphFieldMapper
:
public FieldMapper
public fieldMapper
{
public:
@ -73,7 +73,6 @@ public:
//- Return list of inserted objects
virtual const labelList& insertedObjectLabels() const = 0;
};

4
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H
View File

@ -33,7 +33,7 @@ Description
#define fvPatchFieldMapper_H
#include "primitiveFields.H"
#include "FieldMapper.H"
#include "fieldMapper.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -46,7 +46,7 @@ namespace Foam
class fvPatchFieldMapper
:
public FieldMapper
public fieldMapper
{
public: