STYLE: qualify zero/one dispatch tags with Foam:: prefix

- use Foam::zero{} instead of Zero with tagged re-dispatch
This commit is contained in:
Mark Olesen
2023-08-09 18:38:55 +02:00
parent 97a42df7ba
commit 1340bc50bd
31 changed files with 71 additions and 94 deletions

View File

@ -530,8 +530,8 @@ inline void Foam::CircularBuffer<T>::operator=(const T& val)
template<class T>
inline void Foam::CircularBuffer<T>::operator=(const Foam::zero)
{
this->array_one() = Zero;
this->array_two() = Zero;
this->array_one() = Foam::zero{};
this->array_two() = Foam::zero{};
}

View File

@ -507,7 +507,7 @@ inline void Foam::CompactListList<T>::operator=(const T& val)
template<class T>
inline void Foam::CompactListList<T>::operator=(const Foam::zero)
{
values_ = Zero;
values_ = Foam::zero{};
}

View File

@ -171,7 +171,7 @@ inline Foam::DynamicList<T, SizeMin>::DynamicList
const Foam::zero
)
:
List<T>(len, Zero),
List<T>(len, Foam::zero{}),
capacity_(List<T>::size())
{}
@ -815,7 +815,7 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
const Foam::zero
)
{
UList<T>::operator=(Zero);
UList<T>::operator=(Foam::zero{});
}

View File

@ -51,7 +51,7 @@ inline Foam::FixedList<T, N>::FixedList(const T& val)
template<class T, unsigned N>
inline Foam::FixedList<T, N>::FixedList(const Foam::zero)
{
this->fill(Zero);
this->fill(Foam::zero{});
}
@ -500,7 +500,7 @@ inline void Foam::FixedList<T, N>::operator=(const T& val)
template<class T, unsigned N>
inline void Foam::FixedList<T, N>::operator=(const Foam::zero)
{
this->fill(Zero);
this->fill(Foam::zero{});
}

View File

@ -300,7 +300,7 @@ inline void Foam::List<T>::operator=(const T& val)
template<class T>
inline void Foam::List<T>::operator=(const Foam::zero)
{
UList<T>::operator=(Zero);
UList<T>::operator=(Foam::zero{});
}

View File

@ -160,7 +160,7 @@ inline void Foam::SubList<T>::operator=(const T& val)
template<class T>
inline void Foam::SubList<T>::operator=(const Foam::zero)
{
UList<T>::operator=(Zero);
UList<T>::operator=(Foam::zero{});
}

View File

@ -30,14 +30,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class T>
inline constexpr Foam::SortableList<T>::SortableList() noexcept
:
List<T>(),
indices_()
{}
template<class T>
inline Foam::SortableList<T>::SortableList(const label size)
:
@ -48,7 +40,7 @@ inline Foam::SortableList<T>::SortableList(const label size)
template<class T>
inline Foam::SortableList<T>::SortableList(const label size, const Foam::zero)
:
List<T>(size, Zero)
List<T>(size, Foam::zero{})
{}

View File

@ -73,7 +73,7 @@ public:
// Constructors
//- Default construct
inline constexpr SortableList() noexcept;
SortableList() noexcept = default;
//- Construct given size, sort later.
// The indices remain empty until the list is sorted

View File

@ -165,7 +165,7 @@ inline Foam::DynamicField<T, SizeMin>::DynamicField
const Foam::zero
)
:
Field<T>(len, Zero),
Field<T>(len, Foam::zero{}),
capacity_(Field<T>::size())
{}
@ -696,7 +696,7 @@ inline void Foam::DynamicField<T, SizeMin>::operator=
const Foam::zero
)
{
UList<T>::operator=(Zero);
UList<T>::operator=(Foam::zero{});
}

View File

@ -60,7 +60,7 @@ inline Foam::Field<Type>::Field(const label len, const Type& val)
template<class Type>
inline Foam::Field<Type>::Field(const label len, const Foam::zero)
:
List<Type>(len, Zero)
List<Type>(len, Foam::zero{})
{}
@ -81,7 +81,7 @@ inline Foam::Field<Type>::Field(const Foam::one, Type&& val)
template<class Type>
inline Foam::Field<Type>::Field(const Foam::one, const Foam::zero)
:
List<Type>(Foam::one{}, Zero)
List<Type>(Foam::one{}, Foam::zero{})
{}
@ -224,7 +224,7 @@ inline void Foam::Field<Type>::operator=(const Type& val)
template<class Type>
inline void Foam::Field<Type>::operator=(const Foam::zero)
{
List<Type>::operator=(Zero);
List<Type>::operator=(Foam::zero{});
}

View File

@ -165,7 +165,7 @@ inline void Foam::SubField<Type>::operator=(const Type& val)
template<class Type>
inline void Foam::SubField<Type>::operator=(const Foam::zero)
{
SubList<Type>::operator=(Zero);
SubList<Type>::operator=(Foam::zero{});
}

View File

@ -40,7 +40,7 @@ Foam::DiagonalMatrix<Type>::DiagonalMatrix(const label n)
template<class Type>
Foam::DiagonalMatrix<Type>::DiagonalMatrix(const label n, const Foam::zero)
:
List<Type>(n, Zero)
List<Type>(n, Foam::zero{})
{}

View File

@ -64,7 +64,7 @@ inline Foam::Matrix<Form, Type>::Matrix(const labelPair& dims)
template<class Form, class Type>
inline Foam::Matrix<Form, Type>::Matrix(const labelPair& dims, const Foam::zero)
:
Matrix<Form, Type>(dims.first(), dims.second(), Zero)
Matrix<Form, Type>(dims.first(), dims.second(), Foam::zero{})
{}

View File

@ -57,7 +57,7 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
const Foam::zero
)
:
Matrix<RectangularMatrix<Type>, Type>(m, n, Zero)
Matrix<RectangularMatrix<Type>, Type>(m, n, Foam::zero{})
{}
@ -81,7 +81,7 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
const Identity<AnyType>
)
:
Matrix<RectangularMatrix<Type>, Type>(dims.first(), dims.second(), Zero)
RectangularMatrix<Type>(dims.first(), dims.second(), Foam::zero{})
{
for (label i = 0; i < min(dims.first(), dims.second()); ++i)
{
@ -107,7 +107,7 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
const Foam::zero
)
:
RectangularMatrix<Type>(dims.first(), dims.second(), Zero)
RectangularMatrix<Type>(dims.first(), dims.second(), Foam::zero{})
{}
@ -184,7 +184,7 @@ inline void Foam::RectangularMatrix<Type>::operator=
template<class Type>
inline void Foam::RectangularMatrix<Type>::operator=(const Foam::zero)
{
Matrix<RectangularMatrix<Type>, Type>::operator=(Zero);
Matrix<RectangularMatrix<Type>, Type>::operator=(Foam::zero{});
}

View File

@ -85,7 +85,7 @@ template<class Type>
template<class AnyType>
void Foam::SquareMatrix<Type>::operator=(const Identity<AnyType>)
{
Matrix<SquareMatrix<Type>, Type>::operator=(Zero);
Matrix<SquareMatrix<Type>, Type>::operator=(Foam::zero{});
for (label i = 0; i < this->n(); ++i)
{

View File

@ -51,7 +51,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
const Foam::zero
)
:
Matrix<SquareMatrix<Type>, Type>(n, n, Zero)
Matrix<SquareMatrix<Type>, Type>(n, n, Foam::zero{})
{}
@ -74,7 +74,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
const Identity<AnyType>
)
:
Matrix<SquareMatrix<Type>, Type>(n, n, Zero)
SquareMatrix<Type>(n, Foam::zero{})
{
for (label i = 0; i < n; ++i)
{
@ -91,7 +91,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
const Identity<AnyType>
)
:
Matrix<SquareMatrix<Type>, Type>(dims, Zero)
Matrix<SquareMatrix<Type>, Type>(dims, Foam::zero{})
{
CHECK_MATRIX_IS_SQUARE(dims.first(), dims.second());
@ -121,7 +121,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
const Foam::zero
)
:
Matrix<SquareMatrix<Type>, Type>(dims, Zero)
Matrix<SquareMatrix<Type>, Type>(dims, Foam::zero{})
{
CHECK_MATRIX_IS_SQUARE(dims.first(), dims.second());
}
@ -148,7 +148,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
const Foam::zero
)
:
Matrix<SquareMatrix<Type>, Type>(m, n, Zero)
Matrix<SquareMatrix<Type>, Type>(m, n, Foam::zero{})
{
CHECK_MATRIX_IS_SQUARE(m, n);
}
@ -300,7 +300,7 @@ inline void Foam::SquareMatrix<Type>::operator=(SquareMatrix<Type>&& mat)
template<class Type>
inline void Foam::SquareMatrix<Type>::operator=(const Foam::zero)
{
Matrix<SquareMatrix<Type>, Type>::operator=(Zero);
Matrix<SquareMatrix<Type>, Type>::operator=(Foam::zero{});
}

View File

@ -117,7 +117,7 @@ template<class Type>
template<class AnyType>
void Foam::SymmetricSquareMatrix<Type>::operator=(const Identity<AnyType>)
{
Matrix<SymmetricSquareMatrix<Type>, Type>::operator=(Zero);
Matrix<SymmetricSquareMatrix<Type>, Type>::operator=(Foam::zero{});
for (label i=0; i < this->n(); ++i)
{

View File

@ -51,7 +51,7 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
const Foam::zero
)
:
Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, Zero)
Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, Foam::zero{})
{}
@ -74,7 +74,7 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
const Identity<AnyType>
)
:
Matrix<SymmetricSquareMatrix<Type>, Type>(n, n, Zero)
SymmetricSquareMatrix<Type>(n, Foam::zero{})
{
for (label i=0; i < n; ++i)
{
@ -105,7 +105,7 @@ Foam::SymmetricSquareMatrix<Type>::clone() const
template<class Type>
inline void Foam::SymmetricSquareMatrix<Type>::operator=(const Foam::zero)
{
Matrix<SymmetricSquareMatrix<Type>, Type>::operator=(Zero);
Matrix<SymmetricSquareMatrix<Type>, Type>::operator=(Foam::zero{});
}

View File

@ -78,7 +78,7 @@ inline Foam::IjkField<Type>::IjkField
const Foam::zero
)
:
Field<Type>(cmptProduct(ijk), Zero),
Field<Type>(cmptProduct(ijk), Foam::zero{}),
ijk_(ijk)
{}
@ -247,7 +247,7 @@ inline void Foam::IjkField<Type>::operator=(const Type& val)
template<class Type>
inline void Foam::IjkField<Type>::operator=(const Foam::zero)
{
Field<Type>::operator=(Zero);
Field<Type>::operator=(Foam::zero{});
}

View File

@ -707,7 +707,12 @@ Foam::polyMesh::polyMesh
}
Foam::polyMesh::polyMesh(const IOobject& io, const zero, const bool syncPar)
Foam::polyMesh::polyMesh
(
const IOobject& io,
const Foam::zero,
const bool syncPar
)
:
polyMesh(io, pointField(), faceList(), labelList(), labelList(), syncPar)
{}

View File

@ -332,7 +332,7 @@ public:
//- Construct from IOobject or as zero-sized mesh
// Boundary is added using addPatches() member function
polyMesh(const IOobject& io, const zero, const bool syncPar=true);
polyMesh(const IOobject& io, const Foam::zero, const bool syncPar=true);
//- Construct from IOobject and components.
// Boundary is added using addPatches() member function

View File

@ -952,16 +952,6 @@ void Foam::faMatrix<Type>::operator-=
}
template<class Type>
void Foam::faMatrix<Type>::operator+=(const Foam::zero)
{}
template<class Type>
void Foam::faMatrix<Type>::operator-=(const Foam::zero)
{}
template<class Type>
void Foam::faMatrix<Type>::operator*=
(

View File

@ -499,8 +499,8 @@ public:
void operator+=(const dimensioned<Type>&);
void operator-=(const dimensioned<Type>&);
void operator+=(const Foam::zero);
void operator-=(const Foam::zero);
void operator+=(const Foam::zero) {}
void operator-=(const Foam::zero) {}
void operator*=(const areaScalarField::Internal&);
void operator*=(const tmp<areaScalarField::Internal>&);

View File

@ -146,7 +146,7 @@ template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
ddt
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
{
@ -159,7 +159,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>>
ddt
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const one&
const Foam::one
)
{
return ddt(vf);

View File

@ -99,7 +99,7 @@ namespace fvc
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>&
);
@ -107,13 +107,13 @@ namespace fvc
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
(
const GeometricField<Type, fvPatchField, volMesh>&,
const one&
const Foam::one
);
inline geometricZeroField ddt
(
const one&,
const one&
const Foam::one,
const Foam::one
)
{
return geometricZeroField();

View File

@ -61,7 +61,7 @@ template<class Type>
tmp<fvMatrix<Type>>
ddt
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
{
@ -128,8 +128,8 @@ template<class Type>
tmp<fvMatrix<Type>>
ddt
(
const one&,
const one&,
const Foam::one,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
{
@ -141,7 +141,7 @@ template<class Type>
tmp<fvMatrix<Type>>
ddt
(
const one&,
const Foam::one,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
@ -155,7 +155,7 @@ tmp<fvMatrix<Type>>
ddt
(
const volScalarField& alpha,
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
{

View File

@ -61,7 +61,7 @@ namespace fvm
template<class Type>
tmp<fvMatrix<Type>> ddt
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>&
);
@ -90,15 +90,15 @@ namespace fvm
template<class Type>
tmp<fvMatrix<Type>> ddt
(
const one&,
const one&,
const Foam::one,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>&
);
template<class Type>
tmp<fvMatrix<Type>> ddt
(
const one&,
const Foam::one,
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
);
@ -107,7 +107,7 @@ namespace fvm
tmp<fvMatrix<Type>> ddt
(
const volScalarField&,
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>&
);
}

View File

@ -100,7 +100,7 @@ template<class Type>
tmp<fvMatrix<Type>>
laplacian
(
const zero&,
const Foam::zero,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
@ -116,7 +116,7 @@ template<class Type>
tmp<fvMatrix<Type>>
laplacian
(
const zero&,
const Foam::zero,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
{
@ -131,7 +131,7 @@ template<class Type>
tmp<fvMatrix<Type>>
laplacian
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
@ -144,7 +144,7 @@ template<class Type>
tmp<fvMatrix<Type>>
laplacian
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>& vf
)
{

View File

@ -70,7 +70,7 @@ namespace fvm
template<class Type>
tmp<fvMatrix<Type>> laplacian
(
const zero&,
const Foam::zero,
const GeometricField<Type, fvPatchField, volMesh>&,
const word&
);
@ -78,7 +78,7 @@ namespace fvm
template<class Type>
tmp<fvMatrix<Type>> laplacian
(
const zero&,
const Foam::zero,
const GeometricField<Type, fvPatchField, volMesh>&
);
@ -86,7 +86,7 @@ namespace fvm
template<class Type>
tmp<fvMatrix<Type>> laplacian
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>&,
const word&
);
@ -94,7 +94,7 @@ namespace fvm
template<class Type>
tmp<fvMatrix<Type>> laplacian
(
const one&,
const Foam::one,
const GeometricField<Type, fvPatchField, volMesh>&
);

View File

@ -1763,16 +1763,6 @@ void Foam::fvMatrix<Type>::operator-=
}
template<class Type>
void Foam::fvMatrix<Type>::operator+=(const Foam::zero)
{}
template<class Type>
void Foam::fvMatrix<Type>::operator-=(const Foam::zero)
{}
template<class Type>
void Foam::fvMatrix<Type>::operator*=
(

View File

@ -676,8 +676,8 @@ public:
void operator+=(const dimensioned<Type>&);
void operator-=(const dimensioned<Type>&);
void operator+=(const Foam::zero);
void operator-=(const Foam::zero);
void operator+=(const Foam::zero) {}
void operator-=(const Foam::zero) {}
void operator*=(const volScalarField::Internal&);
void operator*=(const tmp<volScalarField::Internal>&);