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: use 'using Field<Type>::operator[]' in DynamicField

Browse Source
This commit is contained in:
Mark Olesen
2010-06-07 14:37:48 +02:00
parent 394b05a7ab
commit 3277d0573e
3 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/test/DynamicField/DynamicFieldTest.C
View File

@ -43,6 +43,9 @@ int main(int argc, char *argv[])
dl.append(2); dl.append(2);
dl.append(1); dl.append(1);
Pout<< "appending : dl:" << dl << endl; Pout<< "appending : dl:" << dl << endl;
dl[2] *= 10;
Pout<< "assigning : dl:" << dl << endl;
} }
{ {

7
src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -175,10 +175,7 @@ public:
inline void operator=(const tmp<DynamicField<Type> >&); inline void operator=(const tmp<DynamicField<Type> >&);
//- Return element of Field. //- Return element of Field.
inline Type& operator[](const label i); using Field<Type>::operator[];
//- Return element of constant Field.
inline const Type& operator[](const label) const;
// IOstream operators // IOstream operators

51
src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -25,15 +25,10 @@ License
#include "DynamicField.H" #include "DynamicField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type> template<class Type>
DynamicField<Type>::DynamicField() Foam::DynamicField<Type>::DynamicField()
: :
Field<Type>(), Field<Type>(),
capacity_(0) capacity_(0)
@ -41,7 +36,7 @@ DynamicField<Type>::DynamicField()
template<class Type> template<class Type>
DynamicField<Type>::DynamicField(const label size) Foam::DynamicField<Type>::DynamicField(const label size)
: :
Field<Type>(size), Field<Type>(size),
capacity_(Field<Type>::size()) capacity_(Field<Type>::size())
@ -73,7 +68,7 @@ inline Foam::DynamicField<Type>::DynamicField
template<class Type> template<class Type>
DynamicField<Type>::DynamicField Foam::DynamicField<Type>::DynamicField
( (
const UList<Type>& mapF, const UList<Type>& mapF,
const labelList& mapAddressing const labelList& mapAddressing
@ -85,7 +80,7 @@ DynamicField<Type>::DynamicField
template<class Type> template<class Type>
DynamicField<Type>::DynamicField Foam::DynamicField<Type>::DynamicField
( (
const UList<Type>& mapF, const UList<Type>& mapF,
const labelListList& mapAddressing, const labelListList& mapAddressing,
@ -99,7 +94,7 @@ DynamicField<Type>::DynamicField
//- Construct by mapping from the given field //- Construct by mapping from the given field
template<class Type> template<class Type>
DynamicField<Type>::DynamicField Foam::DynamicField<Type>::DynamicField
( (
const UList<Type>& mapF, const UList<Type>& mapF,
const FieldMapper& map const FieldMapper& map
@ -111,7 +106,7 @@ DynamicField<Type>::DynamicField
template<class Type> template<class Type>
DynamicField<Type>::DynamicField(const DynamicField<Type>& f) Foam::DynamicField<Type>::DynamicField(const DynamicField<Type>& f)
: :
Field<Type>(f), Field<Type>(f),
capacity_(Field<Type>::size()) capacity_(Field<Type>::size())
@ -119,7 +114,7 @@ DynamicField<Type>::DynamicField(const DynamicField<Type>& f)
template<class Type> template<class Type>
DynamicField<Type>::DynamicField(DynamicField<Type>& f, bool reUse) Foam::DynamicField<Type>::DynamicField(DynamicField<Type>& f, bool reUse)
: :
Field<Type>(f, reUse), Field<Type>(f, reUse),
capacity_(Field<Type>::size()) capacity_(Field<Type>::size())
@ -127,7 +122,7 @@ DynamicField<Type>::DynamicField(DynamicField<Type>& f, bool reUse)
template<class Type> template<class Type>
DynamicField<Type>::DynamicField(const Xfer<DynamicField<Type> >& f) Foam::DynamicField<Type>::DynamicField(const Xfer<DynamicField<Type> >& f)
: :
Field<Type>(f), Field<Type>(f),
capacity_(Field<Type>::size()) capacity_(Field<Type>::size())
@ -137,14 +132,14 @@ DynamicField<Type>::DynamicField(const Xfer<DynamicField<Type> >& f)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
Foam::label DynamicField<Type>::capacity() const Foam::label Foam::DynamicField<Type>::capacity() const
{ {
return capacity_; return capacity_;
} }
template<class Type> template<class Type>
void DynamicField<Type>::append(const Type& t) void Foam::DynamicField<Type>::append(const Type& t)
{ {
label elemI = Field<Type>::size(); label elemI = Field<Type>::size();
setSize(elemI + 1); setSize(elemI + 1);
@ -156,7 +151,7 @@ void DynamicField<Type>::append(const Type& t)
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Type> template<class Type>
void DynamicField<Type>::operator=(const DynamicField<Type>& rhs) void Foam::DynamicField<Type>::operator=(const DynamicField<Type>& rhs)
{ {
if (this == &rhs) if (this == &rhs)
{ {
@ -171,7 +166,7 @@ void DynamicField<Type>::operator=(const DynamicField<Type>& rhs)
template<class Type> template<class Type>
void DynamicField<Type>::operator=(const UList<Type>& rhs) void Foam::DynamicField<Type>::operator=(const UList<Type>& rhs)
{ {
Field<Type>::operator=(rhs); Field<Type>::operator=(rhs);
capacity_ = Field<Type>::size(); capacity_ = Field<Type>::size();
@ -179,7 +174,7 @@ void DynamicField<Type>::operator=(const UList<Type>& rhs)
template<class Type> template<class Type>
void DynamicField<Type>::operator=(const tmp<DynamicField>& rhs) void Foam::DynamicField<Type>::operator=(const tmp<DynamicField>& rhs)
{ {
if (this == &(rhs())) if (this == &(rhs()))
{ {
@ -196,25 +191,7 @@ void DynamicField<Type>::operator=(const tmp<DynamicField>& rhs)
} }
template<class Type>
Type& DynamicField<Type>::operator[](const label i)
{
return Field<Type>::operator[](i);
}
template<class Type>
const Type& DynamicField<Type>::operator[](const label i) const
{
return Field<Type>::operator[](i);
}
// * * * * * * * * * * * * * * * IOstream Operator * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * IOstream Operator * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //