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

Merge branch 'master' into cvm

Browse Source 
Conflicts:
	doc/codingStyleGuide.org
This commit is contained in:
graham
2009-11-30 14:55:39 +00:00
parent 4db98cd236 909e6b27e4
commit ad669ae3d8
609 changed files with 56025 additions and 2873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Allwmake
View File

@ -26,7 +26,7 @@ wmake libso triSurface
wmake libso surfMesh
# Decomposition methods needed by meshTools
decompositionMethods/Allwmake
wmake libso parallel/decompositionMethods
wmake libso meshTools
wmake libso finiteVolume
@ -47,6 +47,7 @@ thermophysicalModels/Allwmake
transportModels/Allwmake
turbulenceModels/Allwmake
lagrangian/Allwmake
parallel/Allwmake
postProcessing/Allwmake
conversion/Allwmake
mesh/Allwmake

2
src/OSspecific/POSIX/printStack.C
View File

@ -181,7 +181,7 @@ void error::printStack(Ostream& os)
{
IFstream is("/proc/" + name(pid()) + "/maps");
while(is.good())
while (is.good())
{
string line;
is.getLine(line);

30
src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
View File

@ -57,11 +57,11 @@ Foam::Ostream& Foam::FaceCellWave<Type>::writeFaces
{
os << nFaces;
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
os << ' ' << faceLabels[i];
}
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
os << ' ' << faceInfo[i];
}
@ -70,11 +70,11 @@ Foam::Ostream& Foam::FaceCellWave<Type>::writeFaces
{
os << nFaces;
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
os << faceLabels[i];
}
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
os << faceInfo[i];
}
@ -95,11 +95,11 @@ Foam::Istream& Foam::FaceCellWave<Type>::readFaces
{
is >> nFaces;
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
is >> faceLabels[i];
}
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
is >> faceInfo[i];
}
@ -254,7 +254,7 @@ void Foam::FaceCellWave<Type>::checkCyclic(const polyPatch& patch) const
{
label cycOffset = patch.size()/2;
for(label patchFaceI = 0; patchFaceI < cycOffset; patchFaceI++)
for (label patchFaceI = 0; patchFaceI < cycOffset; patchFaceI++)
{
label i1 = patch.start() + patchFaceI;
label i2 = i1 + cycOffset;
@ -339,7 +339,7 @@ void Foam::FaceCellWave<Type>::mergeFaceInfo
const bool
)
{
for(label changedFaceI = 0; changedFaceI < nFaces; changedFaceI++)
for (label changedFaceI = 0; changedFaceI < nFaces; changedFaceI++)
{
const Type& neighbourWallInfo = changedFacesInfo[changedFaceI];
label patchFaceI = changedFaces[changedFaceI];
@ -377,7 +377,7 @@ Foam::label Foam::FaceCellWave<Type>::getChangedPatchFaces
{
label nChangedPatchFaces = 0;
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
label patchFaceI = i + startFaceI;
@ -406,7 +406,7 @@ void Foam::FaceCellWave<Type>::leaveDomain
{
const vectorField& fc = mesh_.faceCentres();
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
label patchFaceI = faceLabels[i];
@ -428,7 +428,7 @@ void Foam::FaceCellWave<Type>::enterDomain
{
const vectorField& fc = mesh_.faceCentres();
for(label i = 0; i < nFaces; i++)
for (label i = 0; i < nFaces; i++)
{
label patchFaceI = faceLabels[i];
@ -451,14 +451,14 @@ void Foam::FaceCellWave<Type>::transform
{
const tensor& T = rotTensor[0];
for(label faceI = 0; faceI < nFaces; faceI++)
for (label faceI = 0; faceI < nFaces; faceI++)
{
faceInfo[faceI].transform(mesh_, T);
}
}
else
{
for(label faceI = 0; faceI < nFaces; faceI++)
for (label faceI = 0; faceI < nFaces; faceI++)
{
faceInfo[faceI].transform(mesh_, rotTensor[faceI]);
}
@ -510,7 +510,7 @@ void Foam::FaceCellWave<Type>::offset
labelList& faces
)
{
for(label faceI = 0; faceI < nFaces; faceI++)
for (label faceI = 0; faceI < nFaces; faceI++)
{
faces[faceI] += cycOffset;
}
@ -1064,7 +1064,7 @@ Foam::label Foam::FaceCellWave<Type>::iterate(const label maxIter)
handleProcPatches();
}
while(iter_ < maxIter)
while (iter_ < maxIter)
{
if (debug)
{

2
src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
View File

@ -144,7 +144,7 @@ public:
void clear();
//- Transfer the contents of the argument into this DictionaryBase
// and annull the argument.
// and annul the argument.
void transfer(DictionaryBase<IDLListType, T>&);
// Member operators

4
src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
View File

@ -287,7 +287,7 @@ public:
void shrink();
//- Transfer the contents of the argument table into this table
// and annull the argument table.
// and annul the argument table.
void transfer(HashTable<T, Key, Hash>&);
//- Transfer contents to the Xfer container
@ -463,7 +463,7 @@ public:
inline iterator operator++(int);
};
//- iterator set to the begining of the HashTable
//- iterator set to the beginning of the HashTable
inline iterator begin();

2
src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
View File

@ -180,7 +180,7 @@ inline Foam::HashTable<T, Key, Hash>::iteratorBase::iteratorBase
entryPtr_(0),
hashIndex_(0)
{
if (hashTable_->nElmts_ && hashTable_->table_)
if (hashTable_->nElmts_)
{
// find first non-NULL table entry
while

2
src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
View File

@ -247,7 +247,7 @@ public:
void clearStorage();
//- Transfer the contents of the argument table into this table
// and annull the argument table.
// and annul the argument table.
void transfer(StaticHashTable<T, Key, Hash>&);
//- Transfer contents to the Xfer container

2
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
View File

@ -140,7 +140,7 @@ public:
void clear();
//- Transfer the contents of the argument into this List
// and annull the argument list.
// and annul the argument list.
void transfer(ILList<LListBase, T>&);

2
src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
View File

@ -202,7 +202,7 @@ public:
void clear();
//- Transfer the contents of the argument into this List
// and annull the argument list.
// and annul the argument list.
void transfer(LList<LListBase, T>&);
// Member operators

2
src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
View File

@ -156,7 +156,7 @@ public:
void clear();
//- Transfer the contents of the argument into this List
// and annull the argument list.
// and annul the argument list.
void transfer(LPtrList<LListBase, T>&);

2
src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
View File

@ -172,7 +172,7 @@ public:
inline void clear();
//- Transfer the contents of the argument into this List
// and annull the argument list.
// and annul the argument list.
inline void transfer(DLListBase&);
// STL iterator

2
src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
View File

@ -157,7 +157,7 @@ public:
inline void clear();
//- Transfer the contents of the argument into this List
// and annull the argument list.
// and annul the argument list.
inline void transfer(SLListBase&);
// STL iterator

9
src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
View File

@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class BiIndirectList Declaration
Class BiIndirectList Declaration
\*---------------------------------------------------------------------------*/
template<class T>
@ -82,11 +82,16 @@ public:
// Access
//- Return the number of elements in the list
inline label size() const;
inline bool empty() const;
//- Return true if the list is empty (ie, size() is zero).
inline bool empty() const;
inline const UList<T>& posList() const;
inline const UList<T>& negList() const;
//- Return the list addressing
inline const List<label>& addressing() const;
//- Calculate index given whether index is into posList or negList

2
src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
View File

@ -191,7 +191,7 @@ public:
labelList sizes() const;
//- Transfer the contents of the argument CompactListList
// into this CompactListList and annull the argument list.
// into this CompactListList and annul the argument list.
void transfer(CompactListList<T, Container>&);
//- Transfer the contents to the Xfer container

12
src/OpenFOAM/containers/Lists/FixedList/FixedList.H
View File

@ -154,6 +154,18 @@ public:
// This can be used (with caution) when interfacing with C code.
inline T* data();
//- Return the first element of the list.
inline T& first();
//- Return first element of the list.
inline const T& first() const;
//- Return the last element of the list.
inline T& last();
//- Return the last element of the list.
inline const T& last() const;
// Check

28
src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
View File

@ -208,6 +208,34 @@ Foam::FixedList<T, Size>::data()
}
template<class T, unsigned Size>
inline T& Foam::FixedList<T, Size>::first()
{
return v_[0];
}
template<class T, unsigned Size>
inline const T& Foam::FixedList<T, Size>::first() const
{
return v_[0];
}
template<class T, unsigned Size>
inline T& Foam::FixedList<T, Size>::last()
{
return v_[Size-1];
}
template<class T, unsigned Size>
inline const T& Foam::FixedList<T, Size>::last() const
{
return v_[Size-1];
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// element access

22
src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
View File

@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class IndirectList Declaration
Class IndirectList Declaration
\*---------------------------------------------------------------------------*/
template<class T>
@ -70,10 +70,28 @@ public:
// Access
//- Return the number of elements in the list
inline label size() const;
inline bool empty() const;
//- Return true if the list is empty (ie, size() is zero).
inline bool empty() const;
//- Return the first element of the list.
inline T& first();
//- Return first element of the list.
inline const T& first() const;
//- Return the last element of the list.
inline T& last();
//- Return the last element of the list.
inline const T& last() const;
//- Return the complete list
inline const UList<T>& completeList() const;
//- Return the list addressing
inline const List<label>& addressing() const;
// Edit

28
src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
View File

@ -66,6 +66,34 @@ inline bool Foam::IndirectList<T>::empty() const
}
template<class T>
inline T& Foam::IndirectList<T>::first()
{
return completeList_[addressing_.first()];
}
template<class T>
inline const T& Foam::IndirectList<T>::first() const
{
return completeList_[addressing_.first()];
}
template<class T>
inline T& Foam::IndirectList<T>::last()
{
return completeList_[addressing_.last()];
}
template<class T>
inline const T& Foam::IndirectList<T>::last() const
{
return completeList_[addressing_.last()];
}
template<class T>
inline const Foam::UList<T>& Foam::IndirectList<T>::completeList() const
{

6
src/OpenFOAM/containers/Lists/List/List.C
View File

@ -404,7 +404,7 @@ void Foam::List<T>::clear()
// Transfer the contents of the argument List into this List
// and anull the argument list
// and annul the argument list
template<class T>
void Foam::List<T>::transfer(List<T>& a)
{
@ -418,7 +418,7 @@ void Foam::List<T>::transfer(List<T>& a)
// Transfer the contents of the argument DynamicList into this List
// and anull the argument list
// and annul the argument list
template<class T>
template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
void Foam::List<T>::transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>& a)
@ -431,7 +431,7 @@ void Foam::List<T>::transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>& a)
// Transfer the contents of the argument SortableList into this List
// and anull the argument list
// and annul the argument list
template<class T>
void Foam::List<T>::transfer(SortableList<T>& a)
{

6
src/OpenFOAM/containers/Lists/List/List.H
View File

@ -188,16 +188,16 @@ public:
inline void append(const UIndirectList<T>&);
//- Transfer the contents of the argument List into this list
// and annull the argument list.
// and annul the argument list.
void transfer(List<T>&);
//- Transfer the contents of the argument List into this list
// and annull the argument list.
// and annul the argument list.
template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
//- Transfer the contents of the argument List into this list
// and annull the argument list.
// and annul the argument list.
void transfer(SortableList<T>&);
//- Transfer contents to the Xfer container

2
src/OpenFOAM/containers/Lists/PackedList/PackedList.H
View File

@ -253,7 +253,7 @@ public:
inline void shrink();
//- Transfer the contents of the argument list into this list
// and annull the argument list.
// and annul the argument list.
inline void transfer(PackedList<nBits>&);
//- Transfer contents to the Xfer container

23
src/OpenFOAM/containers/Lists/PtrList/PtrList.H
View File

@ -29,8 +29,8 @@ Description
A templated 1D list of pointers to objects of type \<T\>, where the
size of the array is known and used for subscript bounds checking, etc.
The element operator [] returns a reference to the object
rather than to the pointer.
The element operator [] returns a reference to the object rather than a
pointer.
SourceFiles
PtrList.C
@ -119,7 +119,7 @@ public:
//- Null Constructor.
PtrList();
//- Construct with length specified.
//- Construct with size specified.
explicit PtrList(const label);
//- Copy constructor.
@ -130,7 +130,7 @@ public:
PtrList(const PtrList<T>&, const CloneArg&);
//- Construct by transferring the parameter contents
PtrList(const Xfer<PtrList<T> >&);
PtrList(const Xfer< PtrList<T> >&);
//- Construct as copy or re-use as specified.
PtrList(PtrList<T>&, bool reUse);
@ -161,6 +161,17 @@ public:
//- Return true if the PtrList is empty (ie, size() is zero).
inline bool empty() const;
//- Return reference to the first element of the list.
inline T& first();
//- Return reference to first element of the list.
inline const T& first() const;
//- Return reference to the last element of the list.
inline T& last();
//- Return reference to the last element of the list.
inline const T& last() const;
// Edit
@ -181,11 +192,11 @@ public:
void clear();
//- Transfer the contents of the argument PtrList into this PtrList
// and annull the argument list.
// and annul the argument list.
void transfer(PtrList<T>&);
//- Transfer contents to the Xfer container
inline Xfer<PtrList<T> > xfer();
inline Xfer< PtrList<T> > xfer();
//- Is element set
inline bool set(const label) const;

37
src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
View File

@ -45,6 +45,34 @@ inline bool Foam::PtrList<T>::empty() const
}
template<class T>
inline T& Foam::PtrList<T>::first()
{
return this->operator[](0);
}
template<class T>
inline const T& Foam::PtrList<T>::first() const
{
return this->operator[](0);
}
template<class T>
inline T& Foam::PtrList<T>::last()
{
return this->operator[](this->size()-1);
}
template<class T>
inline const T& Foam::PtrList<T>::last() const
{
return this->operator[](this->size()-1);
}
template<class T>
inline void Foam::PtrList<T>::resize(const label newSize)
{
@ -63,9 +91,7 @@ template<class T>
inline Foam::autoPtr<T> Foam::PtrList<T>::set(const label i, T* ptr)
{
autoPtr<T> old(ptrs_[i]);
ptrs_[i] = ptr;
return old;
}
@ -102,7 +128,7 @@ inline Foam::Xfer<Foam::PtrList<T> > Foam::PtrList<T>::xfer()
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class T>
const T& Foam::PtrList<T>::operator[](const label i) const
inline const T& Foam::PtrList<T>::operator[](const label i) const
{
if (!ptrs_[i])
{
@ -116,7 +142,7 @@ const T& Foam::PtrList<T>::operator[](const label i) const
template<class T>
T& Foam::PtrList<T>::operator[](const label i)
inline T& Foam::PtrList<T>::operator[](const label i)
{
if (!ptrs_[i])
{
@ -130,7 +156,7 @@ T& Foam::PtrList<T>::operator[](const label i)
template<class T>
const T* Foam::PtrList<T>::operator()(const label i) const
inline const T* Foam::PtrList<T>::operator()(const label i) const
{
return ptrs_[i];
}
@ -297,5 +323,4 @@ Foam::PtrList<T>::end()
}
// ************************************************************************* //

19
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
View File

@ -27,6 +27,7 @@ Class
Description
A List with indirect addressing.
Like IndirectList but does not store addressing.
SourceFiles
@ -73,8 +74,24 @@ public:
// Access
//- Return the number of elements in the list
inline label size() const;
inline bool empty() const;
//- Return true if the list is empty (ie, size() is zero).
inline bool empty() const;
//- Return the first element of the list.
inline T& first();
//- Return first element of the list.
inline const T& first() const;
//- Return the last element of the list.
inline T& last();
//- Return the last element of the list.
inline const T& last() const;
inline const UList<T>& completeList() const;
inline const List<label>& addressing() const;

28
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
View File

@ -54,6 +54,34 @@ inline bool Foam::UIndirectList<T>::empty() const
}
template<class T>
inline T& Foam::UIndirectList<T>::first()
{
return completeList_[addressing_.first()];
}
template<class T>
inline const T& Foam::UIndirectList<T>::first() const
{
return completeList_[addressing_.first()];
}
template<class T>
inline T& Foam::UIndirectList<T>::last()
{
return completeList_[addressing_.last()];
}
template<class T>
inline const T& Foam::UIndirectList<T>::last() const
{
return completeList_[addressing_.last()];
}
template<class T>
inline const Foam::UList<T>& Foam::UIndirectList<T>::completeList() const
{

20
src/OpenFOAM/containers/Lists/UList/UList.H
View File

@ -132,7 +132,7 @@ public:
inline label fcIndex(const label i) const;
//- Return the reverse circular index, i.e. the previous index
// which returns to the last at the begining of the list
// which returns to the last at the beginning of the list
inline label rcIndex(const label i) const;
//- Return the binary size in number of characters of the UList
@ -151,6 +151,18 @@ public:
// This can be used (with caution) when interfacing with C code.
inline T* data();
//- Return the first element of the list.
inline T& first();
//- Return first element of the list.
inline const T& first() const;
//- Return the last element of the list.
inline T& last();
//- Return the last element of the list.
inline const T& last() const;
// Check
@ -184,12 +196,6 @@ public:
// an out-of-range element returns false without any ill-effects
inline const T& operator[](const label) const;
//- Return last element of UList.
inline T& last();
//- Return last element of UList.
inline const T& last() const;
//- Allow cast to a const List<T>&
inline operator const Foam::List<T>&() const;

14
src/OpenFOAM/containers/Lists/UList/UListI.H
View File

@ -114,6 +114,20 @@ inline void Foam::UList<T>::checkIndex(const label i) const
}
template<class T>
inline T& Foam::UList<T>::first()
{
return this->operator[](0);
}
template<class T>
inline const T& Foam::UList<T>::first() const
{
return this->operator[](0);
}
template<class T>
inline T& Foam::UList<T>::last()
{

2
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
View File

@ -93,8 +93,6 @@ void Foam::UPtrList<T>::clear()
}
// Transfer the contents of the argument List into this List
// and anull the argument list
template<class T>
void Foam::UPtrList<T>::transfer(UPtrList<T>& a)
{

24
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
View File

@ -26,8 +26,8 @@ Class
Foam::UPtrList
Description
A 1D array of pointers to objects of type \<T\>, where the size of the
array is known and used for subscript bounds checking, etc.
A templated 1D list of pointers to objects of type \<T\>, where the
size of the array is known and used for subscript bounds checking, etc.
The element operator [] returns a reference to the object rather than a
pointer. Storage is not allocated during construction or use but is
@ -107,11 +107,11 @@ public:
//- Null Constructor.
UPtrList();
//- Construct with length specified.
//- Construct with size specified.
explicit UPtrList(const label);
//- Construct by transferring the parameter contents
UPtrList(const Xfer<UPtrList<T> >&);
UPtrList(const Xfer< UPtrList<T> >&);
//- Construct as copy or re-use as specified.
UPtrList(UPtrList<T>&, bool reUse);
@ -127,6 +127,18 @@ public:
//- Return true if the UPtrList is empty (ie, size() is zero).
inline bool empty() const;
//- Return reference to the first element of the list.
inline T& first();
//- Return reference to first element of the list.
inline const T& first() const;
//- Return reference to the last element of the list.
inline T& last();
//- Return reference to the last element of the list.
inline const T& last() const;
// Edit
@ -144,11 +156,11 @@ public:
void clear();
//- Transfer the contents of the argument UPtrList into this
// UPtrList and annull the argument list.
// UPtrList and annul the argument list.
void transfer(UPtrList<T>&);
//- Transfer contents to the Xfer container
inline Xfer<UPtrList<T> > xfer();
inline Xfer< UPtrList<T> > xfer();
//- Is element set
inline bool set(const label) const;

36
src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
View File

@ -42,6 +42,34 @@ inline bool Foam::UPtrList<T>::empty() const
}
template<class T>
inline T& Foam::UPtrList<T>::first()
{
return this->operator[](0);
}
template<class T>
inline const T& Foam::UPtrList<T>::first() const
{
return this->operator[](0);
}
template<class T>
inline T& Foam::UPtrList<T>::last()
{
return this->operator[](this->size()-1);
}
template<class T>
inline const T& Foam::UPtrList<T>::last() const
{
return this->operator[](this->size()-1);
}
template<class T>
inline void Foam::UPtrList<T>::resize(const label newSize)
{
@ -55,6 +83,7 @@ inline bool Foam::UPtrList<T>::set(const label i) const
return ptrs_[i] != NULL;
}
template<class T>
inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
{
@ -63,6 +92,7 @@ inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
return old;
}
template<class T>
inline Foam::Xfer<Foam::UPtrList<T> > Foam::UPtrList<T>::xfer()
{
@ -73,7 +103,7 @@ inline Foam::Xfer<Foam::UPtrList<T> > Foam::UPtrList<T>::xfer()
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class T>
const T& Foam::UPtrList<T>::operator[](const label i) const
inline const T& Foam::UPtrList<T>::operator[](const label i) const
{
if (!ptrs_[i])
{
@ -87,7 +117,7 @@ const T& Foam::UPtrList<T>::operator[](const label i) const
template<class T>
T& Foam::UPtrList<T>::operator[](const label i)
inline T& Foam::UPtrList<T>::operator[](const label i)
{
if (!ptrs_[i])
{
@ -101,7 +131,7 @@ T& Foam::UPtrList<T>::operator[](const label i)
template<class T>
const T* Foam::UPtrList<T>::operator()(const label i) const
inline const T* Foam::UPtrList<T>::operator()(const label i) const
{
return ptrs_[i];
}

22
src/OpenFOAM/db/Time/Time.C
View File

@ -129,7 +129,7 @@ void Foam::Time::setControls()
{
if (timeDirs.size())
{
startTime_ = timeDirs[timeDirs.size()-1].value();
startTime_ = timeDirs.last().value();
}
}
else
@ -419,9 +419,9 @@ Foam::instant Foam::Time::findClosestTime(const scalar t) const
{
return timeDirs[1];
}
else if (t > timeDirs[timeDirs.size()-1].value())
else if (t > timeDirs.last().value())
{
return timeDirs[timeDirs.size()-1];
return timeDirs.last();
}
label nearestIndex = -1;
@ -532,6 +532,22 @@ bool Foam::Time::end() const
}
void Foam::Time::stopAt(const stopAtControls sa) const
{
stopAt_ = sa;
// adjust endTime
if (sa == saEndTime)
{
controlDict_.lookup("endTime") >> endTime_;
}
else
{
endTime_ = GREAT;
}
}
void Foam::Time::setTime(const Time& t)
{
value() = t.value();

22
src/OpenFOAM/db/Time/Time.H
View File

@ -90,17 +90,17 @@ public:
//- Stop-run control options
enum stopAtControls
{
saEndTime,
saNoWriteNow,
saWriteNow,
saNextWrite
saEndTime, /*!< stop when Time reaches the prescribed endTime */
saNoWriteNow, /*!< set endTime to stop immediately w/o writing */
saWriteNow, /*!< set endTime to stop immediately w/ writing */
saNextWrite /*!< stop the next time data are written */
};
//- Suported time directory name formats
//- Supported time directory name formats
enum fmtflags
{
general = 0,
fixed = ios_base::fixed,
general = 0,
fixed = ios_base::fixed,
scientific = ios_base::scientific
};
@ -111,10 +111,10 @@ protected:
label startTimeIndex_;
scalar startTime_;
scalar endTime_;
mutable scalar endTime_;
static const NamedEnum<stopAtControls, 4> stopAtControlNames_;
stopAtControls stopAt_;
mutable stopAtControls stopAt_;
static const NamedEnum<writeControls, 5> writeControlNames_;
writeControls writeControl_;
@ -390,6 +390,10 @@ public:
// Edit
//- Adjust the current stopAtControl. Note that this value
// only persists until the next time the dictionary is read.
virtual void stopAt(const stopAtControls) const;
//- Reset the time and time-index to those of the given time
virtual void setTime(const Time&);

2
src/OpenFOAM/db/dictionary/dictionary.H
View File

@ -400,7 +400,7 @@ public:
//- Clear the dictionary
void clear();
//- Transfer the contents of the argument and annull the argument.
//- Transfer the contents of the argument and annul the argument.
void transfer(dictionary&);
//- Transfer contents to the Xfer container

2
src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
View File

@ -39,7 +39,7 @@ Foam::dictionaryEntry::dictionaryEntry
Istream& is
)
:
entry(is),
entry(keyType(is)),
dictionary(parentDict, is)
{
is.fatalCheck

1
src/OpenFOAM/db/dictionary/entry/entry.C
View File

@ -38,7 +38,6 @@ Foam::entry::entry(const keyType& keyword)
Foam::entry::entry(const entry& e)
:
IDLList<entry>::link(),
keyword_(e.keyword_)
{}

6
src/OpenFOAM/db/dictionary/entry/entry.H
View File

@ -77,7 +77,7 @@ class entry
// Private Member Functions
//- Get the next valid keyword otherwise return false
static bool getKeyword(keyType& keyword, Istream& is);
static bool getKeyword(keyType&, Istream&);
public:
@ -85,7 +85,7 @@ public:
// Constructors
//- Construct from keyword
entry(const keyType& keyword);
entry(const keyType&);
//- Construct as copy
entry(const entry&);
@ -102,7 +102,7 @@ public:
virtual autoPtr<entry> clone() const;
//- Construct from Istream and insert into dictionary
static bool New(dictionary& parentDict, Istream& is);
static bool New(dictionary& parentDict, Istream&);
//- Construct on freestore from Istream and return
static autoPtr<entry> New(Istream& is);

4
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
View File

@ -140,7 +140,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute()
ptr_->execute();
if (enabled_ && outputControl_.output())
if (outputControl_.output())
{
ptr_->write();
}
@ -167,7 +167,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
ptr_->end();
if (enabled_ && outputControl_.output())
if (outputControl_.output())
{
ptr_->write();
}

2
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
View File

@ -27,7 +27,7 @@ Class
Description
A functionObject wrapper around OutputFilter to allow them to be
created via the functions list within controlDict.
created via the functions entry within controlDict.
Note
Since the timeIndex is used directly from Foam::Time, it is unaffected

2
src/OpenFOAM/db/scalarRange/scalarRange.C
View File

@ -315,7 +315,7 @@ Foam::Istream& Foam::operator>>(Istream& is, scalarRange& range)
Info<< "rejected ill-formed range:";
for (label i=0; i<nTok; ++i)
{
Info << " " << toks[i];
Info<< " " << toks[i];
}
Info<< endl;
}

140
src/OpenFOAM/dimensionSet/dimensionSet.C
View File

@ -26,6 +26,7 @@ License
#include "dimensionSet.H"
#include "dimensionedScalar.H"
#include "OStringStream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -79,30 +80,109 @@ Foam::dimensionSet::dimensionSet
bool Foam::dimensionSet::dimensionless() const
{
bool Dimensionless = true;
for (int Dimension=0; Dimension<nDimensions; Dimension++)
for (int Dimension=0; Dimension<nDimensions; ++Dimension)
{
Dimensionless = Dimensionless &&
// ie, mag(exponents_[Dimension]) > smallExponent
if
(
exponents_[Dimension] < smallExponent
&& exponents_[Dimension] > -smallExponent
);
exponents_[Dimension] > smallExponent
|| exponents_[Dimension] < -smallExponent
)
{
return false;
}
}
return Dimensionless;
return true;
}
void Foam::dimensionSet::reset(const dimensionSet& ds)
{
for (int Dimension=0; Dimension<nDimensions; Dimension++)
for (int Dimension=0; Dimension<nDimensions; ++Dimension)
{
exponents_[Dimension] = ds.exponents_[Dimension];
}
}
Foam::string Foam::dimensionSet::asText() const
{
OStringStream buf;
bool Dimensionless = true;
for (int Dimension=0; Dimension < dimensionSet::nDimensions-1; ++Dimension)
{
const scalar& expt = exponents_[Dimension];
if (expt < smallExponent && expt > -smallExponent)
{
continue;
}
if (Dimensionless)
{
Dimensionless = false;
}
else
{
buf << ' ';
}
// note: currently only handle SI
switch (Dimension)
{
case MASS:
buf << "kg";
break;
case LENGTH:
buf << "m";
break;
case TIME:
buf << "s";
break;
case TEMPERATURE:
buf << "K";
break;
case MOLES:
buf << "mol";
break;
case CURRENT:
buf << "A";
break;
case LUMINOUS_INTENSITY:
buf << "Cd";
break;
default:
buf << "??"; // this shouldn't be - flag as being weird
break;
}
if (expt != 1)
{
buf << '^' << expt;
}
}
if (Dimensionless)
{
return "none";
}
else
{
return buf.str();
}
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
Foam::scalar Foam::dimensionSet::operator[](const dimensionType type) const
@ -119,16 +199,19 @@ Foam::scalar& Foam::dimensionSet::operator[](const dimensionType type)
bool Foam::dimensionSet::operator==(const dimensionSet& ds) const
{
bool equall = true;
for (int Dimension=0; Dimension<nDimensions; Dimension++)
for (int Dimension=0; Dimension < nDimensions; ++Dimension)
{
equall = equall &&
(mag(exponents_[Dimension] - ds.exponents_[Dimension])
< smallExponent);
if
(
mag(exponents_[Dimension] - ds.exponents_[Dimension])
> smallExponent
)
{
return false;
}
}
return equall;
return true;
}
@ -142,7 +225,7 @@ bool Foam::dimensionSet::operator=(const dimensionSet& ds) const
{
if (dimensionSet::debug && *this != ds)
{
FatalErrorIn("dimensionSet::operator=(const dimensionSet& ds) const")
FatalErrorIn("dimensionSet::operator=(const dimensionSet&) const")
<< "Different dimensions for =" << endl
<< " dimensions : " << *this << " = " << ds << endl
<< abort(FatalError);
@ -156,7 +239,7 @@ bool Foam::dimensionSet::operator+=(const dimensionSet& ds) const
{
if (dimensionSet::debug && *this != ds)
{
FatalErrorIn("dimensionSet::operator+=(const dimensionSet& ds) const")
FatalErrorIn("dimensionSet::operator+=(const dimensionSet&) const")
<< "Different dimensions for +=" << endl
<< " dimensions : " << *this << " = " << ds << endl
<< abort(FatalError);
@ -170,7 +253,7 @@ bool Foam::dimensionSet::operator-=(const dimensionSet& ds) const
{
if (dimensionSet::debug && *this != ds)
{
FatalErrorIn("dimensionSet::operator-=(const dimensionSet& ds) const")
FatalErrorIn("dimensionSet::operator-=(const dimensionSet&) const")
<< "Different dimensions for -=" << endl
<< " dimensions : " << *this << " = " << ds << endl
<< abort(FatalError);
@ -202,7 +285,7 @@ Foam::dimensionSet Foam::max(const dimensionSet& ds1, const dimensionSet& ds2)
{
if (dimensionSet::debug && ds1 != ds2)
{
FatalErrorIn("max(const dimensionSet& ds1, const dimensionSet& ds2)")
FatalErrorIn("max(const dimensionSet&, const dimensionSet&)")
<< "Arguments of max have different dimensions" << endl
<< " dimensions : " << ds1 << " and " << ds2 << endl
<< abort(FatalError);
@ -216,7 +299,7 @@ Foam::dimensionSet Foam::min(const dimensionSet& ds1, const dimensionSet& ds2)
{
if (dimensionSet::debug && ds1 != ds2)
{
FatalErrorIn("min(const dimensionSet& ds1, const dimensionSet& ds2)")
FatalErrorIn("min(const dimensionSet&, const dimensionSet&)")
<< "Arguments of min have different dimensions" << endl
<< " dimensions : " << ds1 << " and " << ds2 << endl
<< abort(FatalError);
@ -271,8 +354,8 @@ Foam::dimensionSet Foam::pow
{
if (dimensionSet::debug && !dS.dimensions().dimensionless())
{
FatalErrorIn("pow(const dimensionSet& ds, const dimensionedScalar& dS)")
<< "Exponent of pow are not dimensionless"
FatalErrorIn("pow(const dimensionSet&, const dimensionedScalar&)")
<< "Exponent of pow is not dimensionless"
<< abort(FatalError);
}
@ -301,9 +384,10 @@ Foam::dimensionSet Foam::pow
(
dimensionSet::debug
&& !dS.dimensions().dimensionless()
&& !ds.dimensionless())
&& !ds.dimensionless()
)
{
FatalErrorIn("pow(const dimensionedScalar& dS, const dimensionSet& ds)")
FatalErrorIn("pow(const dimensionedScalar&, const dimensionSet&)")
<< "Argument or exponent of pow not dimensionless" << endl
<< abort(FatalError);
}
@ -394,7 +478,7 @@ Foam::dimensionSet Foam::trans(const dimensionSet& ds)
{
if (dimensionSet::debug && !ds.dimensionless())
{
FatalErrorIn("trans(const dimensionSet& ds)")
FatalErrorIn("trans(const dimensionSet&)")
<< "Argument of trancendental function not dimensionless"
<< abort(FatalError);
}
@ -428,7 +512,7 @@ Foam::dimensionSet Foam::operator+
if (dimensionSet::debug && ds1 != ds2)
{
FatalErrorIn
("operator+(const dimensionSet& ds1, const dimensionSet& ds2)")
("operator+(const dimensionSet&, const dimensionSet&)")
<< "LHS and RHS of + have different dimensions" << endl
<< " dimensions : " << ds1 << " + " << ds2 << endl
<< abort(FatalError);
@ -449,7 +533,7 @@ Foam::dimensionSet Foam::operator-
if (dimensionSet::debug && ds1 != ds2)
{
FatalErrorIn
("operator-(const dimensionSet& ds1, const dimensionSet& ds2)")
("operator-(const dimensionSet&, const dimensionSet&)")
<< "LHS and RHS of - have different dimensions" << endl
<< " dimensions : " << ds1 << " - " << ds2 << endl
<< abort(FatalError);

8
src/OpenFOAM/dimensionSet/dimensionSet.H
View File

@ -27,6 +27,7 @@ Class
Description
Dimension set for the base types.
This type may be used to implement rigorous dimension checking
for algebraic manipulation.
@ -105,7 +106,7 @@ Ostream& operator<<(Ostream&, const dimensionSet&);
/*---------------------------------------------------------------------------*\
Class dimensionSet Declaration
Class dimensionSet Declaration
\*---------------------------------------------------------------------------*/
class dimensionSet
@ -184,9 +185,14 @@ public:
// Member functions
//- Return true if it is dimensionless
bool dimensionless() const;
void reset(const dimensionSet&);
//- Return a text representation for added readability
string asText() const;
// Member operators

6
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
View File

@ -412,7 +412,7 @@ template<template<class> class Field, class Type>
Type max(const FieldField<Field, Type>& f)
{
label i = 0;
while(i < f.size() && !f[i].size()) i++;
while (i < f.size() && !f[i].size()) i++;
if (i < f.size())
{
@ -440,12 +440,12 @@ template<template<class> class Field, class Type>
Type min(const FieldField<Field, Type>& f)
{
label i = 0;
while(i < f.size() && !f[i].size()) i++;
while (i < f.size() && !f[i].size()) i++;
if (i < f.size())
{
label i = 0;
while(!f[i].size()) i++;
while (!f[i].size()) i++;
Type Min(min(f[i]));

8
src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
View File

@ -63,7 +63,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
if (debug)
{
Info << "projecting points" << endl;
Info<< "projecting points" << endl;
}
List<objectHit> proj =
@ -139,7 +139,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
+ projectionDirection[pointI]*ph.distance()
- ph.missPoint()
);
// Calculate the local tolerance
scalar minEdgeLength = GREAT;
@ -244,7 +244,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
if (debug)
{
Info << "projecting face centres" << endl;
Info<< "projecting face centres" << endl;
}
const pointField& fromPatchPoints = fromPatch_.points();
@ -274,7 +274,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
);
faceAddressingPtr_ = new labelList(proj.size(), -1);
labelList& faceAddressing = *faceAddressingPtr_;
labelList& faceAddressing = *faceAddressingPtr_;
forAll (faceAddressing, faceI)
{

2
src/OpenFOAM/matrices/Matrix/Matrix.H
View File

@ -151,7 +151,7 @@ public:
void clear();
//- Transfer the contents of the argument Matrix into this Matrix
// and annull the argument Matrix.
// and annul the argument Matrix.
void transfer(Matrix<Form, Type>&);

10
src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
View File

@ -368,7 +368,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
{
if (S_[i] <= minS)
{
//Info << "Removing " << S_[i] << " < " << minS << endl;
//Info<< "Removing " << S_[i] << " < " << minS << endl;
S_[i] = 0;
nZeros_++;
}
@ -382,19 +382,19 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
multiply(SVDA, U_, S_, transpose(V_));
scalar maxDiff = 0;
scalar diff = 0;
for(label i = 0; i < A.n(); i++)
for (label i = 0; i < A.n(); i++)
{
for(label j = 0; j < A.m(); j++)
for (label j = 0; j < A.m(); j++)
{
diff = mag(A[i][j] - SVDA[i][j]);
if (diff > maxDiff) maxDiff = diff;
}
}
Info << "Maximum discrepancy between A and svd(A) = " << maxDiff << endl;
Info<< "Maximum discrepancy between A and svd(A) = " << maxDiff << endl;
if (maxDiff > 4)
{
Info << "singular values " << S_ << endl;
Info<< "singular values " << S_ << endl;
}
*/
}

2
src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
View File

@ -63,7 +63,7 @@ inline Foam::label Foam::SVD::nZeros() const
inline Foam::scalar Foam::SVD::minNonZeroS() const
{
scalar minS = S_[0];
for(label i = 1; i < S_.size(); i++)
for (label i = 1; i < S_.size(); i++)
{
scalar s = S_[i];
if (s > VSMALL && s < minS) minS = s;

20
src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
View File

@ -159,11 +159,11 @@ void Foam::multiply
ans = scalarRectangularMatrix(A.n(), B.m(), scalar(0));
for(register label i = 0; i < A.n(); i++)
for (register label i = 0; i < A.n(); i++)
{
for(register label j = 0; j < B.m(); j++)
for (register label j = 0; j < B.m(); j++)
{
for(register label l = 0; l < B.n(); l++)
for (register label l = 0; l < B.n(); l++)
{
ans[i][j] += A[i][l]*B[l][j];
}
@ -210,14 +210,14 @@ void Foam::multiply
ans = scalarRectangularMatrix(A.n(), C.m(), scalar(0));
for(register label i = 0; i < A.n(); i++)
for (register label i = 0; i < A.n(); i++)
{
for(register label g = 0; g < C.m(); g++)
for (register label g = 0; g < C.m(); g++)
{
for(register label l = 0; l < C.n(); l++)
for (register label l = 0; l < C.n(); l++)
{
scalar ab = 0;
for(register label j = 0; j < A.m(); j++)
for (register label j = 0; j < A.m(); j++)
{
ab += A[i][j]*B[j][l];
}
@ -266,11 +266,11 @@ void Foam::multiply
ans = scalarRectangularMatrix(A.n(), C.m(), scalar(0));
for(register label i = 0; i < A.n(); i++)
for (register label i = 0; i < A.n(); i++)
{
for(register label g = 0; g < C.m(); g++)
for (register label g = 0; g < C.m(); g++)
{
for(register label l = 0; l < C.n(); l++)
for (register label l = 0; l < C.n(); l++)
{
ans[i][g] += C[l][g] * A[i][l]*B[l];
}

2
src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
View File

@ -284,7 +284,7 @@ void Foam::cellMatcher::write(Foam::Ostream& os) const
{
os << " ";
for(label fp = 0; fp < faceSize_[faceI]; fp++)
for (label fp = 0; fp < faceSize_[faceI]; fp++)
{
os << ' ' << localFaces_[faceI][fp];
}

2
src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C
View File

@ -116,7 +116,7 @@ bool Foam::tetWedgeMatcher::matchShape
const face& face0 = localFaces_[face0I];
// Try all rotations of this face
for(label face0vert0 = 0; face0vert0 < faceSize_[face0I]; face0vert0++)
for (label face0vert0 = 0; face0vert0 < faceSize_[face0I]; face0vert0++)
{
//
// Try to follow prespecified path on faces of cell,

2
src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C
View File

@ -108,7 +108,7 @@ bool Foam::wedgeMatcher::matchShape
const face& face0 = localFaces_[face0I];
// Try all rotations of this face
for(label face0vert0 = 0; face0vert0 < faceSize_[face0I]; face0vert0++)
for (label face0vert0 = 0; face0vert0 < faceSize_[face0I]; face0vert0++)
{
//
// Try to follow prespecified path on faces of cell,

2
src/OpenFOAM/meshes/meshShapes/face/face.C
View File

@ -216,7 +216,7 @@ Foam::label Foam::face::split
label minIndex = index;
scalar minDiff = constant::mathematical::pi;
for(label i = 0; i < size() - 3; i++)
for (label i = 0; i < size() - 3; i++)
{
vector splitEdge
(

2
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
View File

@ -598,7 +598,7 @@ bool Foam::polyBoundaryMesh::checkDefinition(const bool report) const
}
else
{
Info << " Boundary definition OK." << endl;
Info<< " Boundary definition OK." << endl;
}
}

2
src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
View File

@ -614,7 +614,7 @@ Foam::polyMesh::polyMesh
{
if (checkMesh())
{
Info << "Mesh OK" << endl;
Info<< "Mesh OK" << endl;
}
}
}

8
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
View File

@ -89,7 +89,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Topological change
if (debug)
{
Info << "Topological change" << endl;
Info<< "Topological change" << endl;
}
clearOut();
@ -403,7 +403,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Points moved
if (debug)
{
Info << "Point motion" << endl;
Info<< "Point motion" << endl;
}
clearGeom();
@ -430,14 +430,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Rotation can cause direction vector to change
geometricD_ = Vector<label>::zero;
solutionD_ = Vector<label>::zero;
return polyMesh::POINTS_MOVED;
}
else
{
if (debug)
{
Info << "No change" << endl;
Info<< "No change" << endl;
}
return polyMesh::UNCHANGED;

4
src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
View File

@ -156,8 +156,8 @@ void Foam::faceZone::calcCellLayers() const
sc[faceI] = neiCellI;
}
}
//Info << "masterCells: " << mc << endl;
//Info << "slaveCells: " << sc << endl;
//Info<< "masterCells: " << mc << endl;
//Info<< "slaveCells: " << sc << endl;
}
}

6
src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
View File

@ -74,7 +74,7 @@ void Foam::preservePatchTypes
{
if (patchDictionary.found(patchNames[patchi]))
{
const dictionary& patchDict =
const dictionary& patchDict =
patchDictionary.subDict(patchNames[patchi]);
patchDict.lookup("type") >> patchTypes[patchi];
@ -90,14 +90,14 @@ void Foam::preservePatchTypes
if (patchDictionary.found(defaultFacesName))
{
const dictionary& patchDict =
const dictionary& patchDict =
patchDictionary.subDict(defaultFacesName);
patchDict.readIfPresent("geometricType", defaultFacesType);
}
}
Info << nl << "Default patch type set to " << defaultFacesType << endl;
Info<< nl << "Default patch type set to " << defaultFacesType << endl;
}

2
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsCheck.C
View File

@ -95,7 +95,7 @@ Foam::PatchTools::checkOrientation
const Face& f = p[faceI];
const point& p0 = p.points()[f[0]];
const point& p1 = p.points()[f[1]];
const point& p2 = p.points()[f[f.size()-1]];
const point& p2 = p.points()[f.last()];
const vector pointNormal((p1 - p0) ^ (p2 - p0));
if ((pointNormal & p.faceNormals()[faceI]) < 0)

4
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
View File

@ -262,7 +262,7 @@ projectPoints
if (debug)
{
Info << result[curLocalPointLabel] << nl;
Info<< result[curLocalPointLabel] << nl;
}
}
else
@ -505,7 +505,7 @@ projectFaceCentres
if (debug)
{
Info << result[curLocalFaceLabel] << nl;
Info<< result[curLocalFaceLabel] << nl;
}
}
else

8
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
View File

@ -175,7 +175,7 @@ bool Foam::primitiveMesh::checkClosedCells
{
scalar maxOpenness = 0;
for(direction cmpt=0; cmpt<vector::nComponents; cmpt++)
for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
{
maxOpenness = max
(
@ -654,7 +654,7 @@ bool Foam::primitiveMesh::checkFaceSkewness
nWarnSkew++;
}
if(skewness > maxSkew)
if (skewness > maxSkew)
{
maxSkew = skewness;
}
@ -703,7 +703,7 @@ bool Foam::primitiveMesh::checkFaceSkewness
nWarnSkew++;
}
if(skewness > maxSkew)
if (skewness > maxSkew)
{
maxSkew = skewness;
}
@ -857,7 +857,7 @@ bool Foam::primitiveMesh::checkFaceAngles
const face& f = fcs[faceI];
// Get edge from f[0] to f[size-1];
vector ePrev(p[f[0]] - p[f[f.size()-1]]);
vector ePrev(p[f.first()] - p[f.last()]);
scalar magEPrev = mag(ePrev);
ePrev /= magEPrev + VSMALL;

2
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
View File

@ -468,7 +468,7 @@ Foam::label Foam::primitiveMesh::findFirstCommonElementFromSortedLists
while (iter1 != list1.end() && iter2 != list2.end())
{
if( *iter1 < *iter2)
if (*iter1 < *iter2)
{
++iter1;
}

2
src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
View File

@ -114,7 +114,7 @@ void Foam::patchZones::markZone(label faceI)
// Zones on all edges.
labelList edgeZone(pp_.nEdges(), -1);
while(1)
while (true)
{
changedEdges = faceToEdge(changedFaces, edgeZone);

2
src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
View File

@ -223,7 +223,7 @@ Foam::SHA1::processBlock(const void *data, size_t len)
{ \
E += rol_uint32(A, 5) + F(B, C, D) + K + M; \
B = rol_uint32(B, 30); \
} while(0)
} while (0)
while (words < endp)
{

6
src/conversion/meshReader/meshReaderAux.C
View File

@ -58,15 +58,15 @@ void Foam::meshReader::warnDuplicates
// warn about duplicate names
if (duplicates)
{
Info << nl << "WARNING: " << context << " with identical names:";
Info<< nl << "WARNING: " << context << " with identical names:";
forAllConstIter(HashTable<label>, hashed, iter)
{
if (*iter > 1)
{
Info << " " << iter.key();
Info<< " " << iter.key();
}
}
Info << nl << endl;
Info<< nl << endl;
}
}

4
src/conversion/meshWriter/starcd/STARCDMeshWriter.C
View File

@ -554,7 +554,7 @@ bool Foam::meshWriters::STARCD::writeSurface
OFstream celFile(baseName + ".cel");
writeHeader(celFile, "CELL");
Info << "Writing " << celFile.name() << endl;
Info<< "Writing " << celFile.name() << endl;
// mesh and patch info
const pointField& points = mesh_.points();
@ -693,7 +693,7 @@ bool Foam::meshWriters::STARCD::writeSurface
vrtFile.precision(10);
vrtFile.setf(std::ios::showpoint); // force decimal point for Fortran
Info << "Writing " << vrtFile.name() << endl;
Info<< "Writing " << vrtFile.name() << endl;
// build sorted table of contents
SortableList<label> toc(pointHash.size());

4
src/conversion/polyDualMesh/polyDualMesh.C
View File

@ -1015,7 +1015,7 @@ void Foam::polyDualMesh::calcDual
{
// Check orientation.
const face& f = dynDualFaces[dynDualFaces.size()-1];
const face& f = dynDualFaces.last();
vector n = f.normal(dualPoints);
if (((mesh.points()[owner] - dualPoints[f[0]]) & n) > 0)
{
@ -1130,7 +1130,7 @@ void Foam::polyDualMesh::calcDual
{
// Check orientation.
const face& f = dynDualFaces[dynDualFaces.size()-1];
const face& f = dynDualFaces.last();
vector n = f.normal(dualPoints);
if (((mesh.points()[owner] - dualPoints[f[0]]) & n) > 0)
{

4
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
View File

@ -88,14 +88,14 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
<< exit(FatalError);
}
if (t > times_[times_.size()-1])
if (t > times_.last())
{
FatalErrorIn
(
"solidBodyMotionFunctions::tabulated6DoFMotion::transformation()"
) << "current time (" << t
<< ") is greater than the maximum in the data table ("
<< times_[times_.size()-1] << ')'
<< times_.last() << ')'
<< exit(FatalError);
}

2
src/dynamicMesh/boundaryMesh/boundaryMesh.C
View File

@ -390,7 +390,7 @@ void Foam::boundaryMesh::markZone
// Zones on all edges.
labelList edgeZone(mesh().nEdges(), -1);
while(1)
while (true)
{
changedEdges = faceToEdge
(

4
src/dynamicMesh/motionSmoother/motionSmoother.C
View File

@ -65,7 +65,7 @@ void Foam::motionSmoother::makePatchPatchAddressing()
forAll(bm, patchi)
{
if(!isA<emptyPolyPatch>(bm[patchi]))
if (!isA<emptyPolyPatch>(bm[patchi]))
{
nPatchPatchPoints += bm[patchi].boundaryPoints().size();
}
@ -83,7 +83,7 @@ void Foam::motionSmoother::makePatchPatchAddressing()
forAll(bm, patchi)
{
if(!isA<emptyPolyPatch>(bm[patchi]))
if (!isA<emptyPolyPatch>(bm[patchi]))
{
const labelList& bp = bm[patchi].boundaryPoints();
const labelList& meshPoints = bm[patchi].meshPoints();

10
src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
View File

@ -51,7 +51,7 @@ void Foam::motionSmoother::checkConstraints
forAll(bm, patchi)
{
if(!isA<emptyPolyPatch>(bm[patchi]))
if (!isA<emptyPolyPatch>(bm[patchi]))
{
nPatchPatchPoints += bm[patchi].boundaryPoints().size();
}
@ -81,7 +81,7 @@ void Foam::motionSmoother::checkConstraints
forAll(bm, patchi)
{
if(!isA<emptyPolyPatch>(bm[patchi]))
if (!isA<emptyPolyPatch>(bm[patchi]))
{
const labelList& bp = bm[patchi].boundaryPoints();
const labelList& meshPoints = bm[patchi].meshPoints();
@ -93,7 +93,7 @@ void Foam::motionSmoother::checkConstraints
}
}
}
// Forward evaluation
@ -106,7 +106,7 @@ void Foam::motionSmoother::checkConstraints
forAll(bm, patchi)
{
if(!isA<emptyPolyPatch>(bm[patchi]))
if (!isA<emptyPolyPatch>(bm[patchi]))
{
const labelList& bp = bm[patchi].boundaryPoints();
const labelList& meshPoints = bm[patchi].meshPoints();
@ -246,7 +246,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
else
{
res[pointI] /= sumWeight[pointI];
}
}
}
res.correctBoundaryConditions();

2
src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
View File

@ -1276,7 +1276,7 @@ bool Foam::polyMeshGeometry::checkFaceAngles
faceNormal /= mag(faceNormal) + VSMALL;
// Get edge from f[0] to f[size-1];
vector ePrev(p[f[0]] - p[f[f.size()-1]]);
vector ePrev(p[f.first()] - p[f.last()]);
scalar magEPrev = mag(ePrev);
ePrev /= magEPrev + VSMALL;

2
src/dynamicMesh/motionSolver/motionSolver.C
View File

@ -78,7 +78,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
word solverTypeName(msData);
Info << "Selecting motion solver: " << solverTypeName << endl;
Info<< "Selecting motion solver: " << solverTypeName << endl;
dlLibraryTable::open
(

2
src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
View File

@ -1790,7 +1790,7 @@ void Foam::faceCoupleInfo::subDivisionMatch
cutPointI = cutEdges[cutEdgeI].otherVertex(cutPointI);
} while(cutPointI != cutPoint1);
} while (cutPointI != cutPoint1);
}
if (debug)

8
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
View File

@ -262,7 +262,7 @@ Foam::labelPair Foam::addPatchCellLayer::getEdgeString
// - which hasn't been handled yet
// - with same neighbour
// - that needs extrusion
while(true)
while (true)
{
label prevFp = fEdges.rcIndex(startFp);
@ -286,7 +286,7 @@ Foam::labelPair Foam::addPatchCellLayer::getEdgeString
// Search forward for end of string
endFp = startFp;
while(true)
while (true)
{
label nextFp = fEdges.fcIndex(endFp);
@ -1278,7 +1278,7 @@ void Foam::addPatchCellLayer::setRefinement
doneEdge[fEdges[fp]] = true;
fp = f.fcIndex(fp);
}
stringedVerts[stringedVerts.size()-1] = f[fp];
stringedVerts.last() = f[fp];
// Now stringedVerts contains the vertices in order of face f.
@ -1296,7 +1296,7 @@ void Foam::addPatchCellLayer::setRefinement
for (label i = 0; i < numEdgeSideFaces; i++)
{
label vEnd = stringedVerts[stringedVerts.size()-1];
label vEnd = stringedVerts.last();
label vStart = stringedVerts[0];
// calculate number of points making up a face

2
src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
View File

@ -62,7 +62,7 @@ bool Foam::combineFaces::convexFace
n /= mag(n);
// Get edge from f[0] to f[size-1];
vector ePrev(points[f[0]] - points[f[f.size()-1]]);
vector ePrev(points[f.first()] - points[f.last()]);
scalar magEPrev = mag(ePrev);
ePrev /= magEPrev + VSMALL;

2
src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
View File

@ -456,7 +456,7 @@ bool Foam::edgeCollapser::setRefinement(polyTopoChange& meshMod)
{
break;
}
} while(true);
} while (true);
// Keep track of faces that have been done already.

6
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
View File

@ -2222,7 +2222,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
faceCount
)
);
allFaceInfo[faceI] = seedFacesInfo[seedFacesInfo.size()-1];
allFaceInfo[faceI] = seedFacesInfo.last();
}
else
{
@ -2238,7 +2238,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
faceCount
)
);
allFaceInfo[faceI] = seedFacesInfo[seedFacesInfo.size()-1];
allFaceInfo[faceI] = seedFacesInfo.last();
}
}
@ -2319,7 +2319,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
allCellInfo
);
while(true)
while (true)
{
if (debug)
{

2
src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
View File

@ -745,7 +745,7 @@ Pout<< "refinementHistory::distribute :"
newSplitCells.append(splitCells_[index]);
Pout<< "Added oldCell " << index
<< " info " << newSplitCells[newSplitCells.size()-1]
<< " info " << newSplitCells.last()
<< " at position " << newSplitCells.size()-1
<< endl;
}

10
src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
View File

@ -174,14 +174,14 @@ bool Foam::polyTopoChanger::changeTopology() const
{
Info<< "Modifier " << morphI << " named "
<< topoChanges[morphI].name();
if (curTriggerChange)
{
Info << " morphing" << endl;
Info<< " morphing" << endl;
}
else
{
Info << " unchanged" << endl;
Info<< " unchanged" << endl;
}
}
@ -195,7 +195,7 @@ bool Foam::polyTopoChanger::changeTopology() const
<< topoChanges[morphI].name() << " inactive" << endl;
}
}
}
return triggerChange;
@ -252,7 +252,7 @@ void Foam::polyTopoChanger::update(const mapPolyMesh& m)
// Force the mesh modifiers to auto-write. This allows us to
// preserve the current state of modifiers corresponding with
// the mesh.
// the mesh.
writeOpt() = IOobject::AUTO_WRITE;
instance() = mesh_.time().timeName();
}

6
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
View File

@ -91,7 +91,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
{
const face oldFace = slavePatch_[faceI];
const face oldLocalFace = slaveLocalFaces[faceI];
// Info << "old slave face " << faceI << ": " << oldFace << endl;
// Info<< "old slave face " << faceI << ": " << oldFace << endl;
const labelList& curEdges = slaveFaceEdges[faceI];
DynamicList<label> newFace(oldFace.size()*enrichedFaceRatio_);
@ -133,7 +133,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
const labelList& slavePointsOnEdge =
pointsIntoSlaveEdges[curEdges[i]];
// Info << "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl;
// Info<< "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl;
// If there are no points on the edge, skip everything
// If there is only one point, no need for sorting
if (slavePointsOnEdge.size())
@ -246,7 +246,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
{
const face& oldFace = masterPatch_[faceI];
const face& oldLocalFace = masterLocalFaces[faceI];
// Info << "old master face: " << oldFace << endl;
// Info<< "old master face: " << oldFace << endl;
const labelList& curEdges = masterFaceEdges[faceI];
DynamicList<label> newFace(oldFace.size()*enrichedFaceRatio_);

16
src/dynamicMesh/slidingInterface/slidingInterface.C
View File

@ -420,7 +420,7 @@ void Foam::slidingInterface::setRefinement(polyTopoChange& ref) const
}
coupleInterface(ref);
trigger_ = false;
}
}
@ -430,7 +430,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
{
if (debug)
{
Pout<< "void slidingInterface::modifyMotionPoints("
Pout<< "void slidingInterface::modifyMotionPoints("
<< "pointField& motionPoints) const for object " << name() << " : "
<< "Adjusting motion points." << endl;
}
@ -485,7 +485,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
else
{
// A cut point is not a projected slave point. Therefore, it
// must be an edge-to-edge intersection.
// must be an edge-to-edge intersection.
Map<Pair<edge> >::const_iterator cpepmIter =
cpepm.find(cutPoints[pointI]);
@ -499,7 +499,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
// slidingInterface::coupleInterface. This is done for
// efficiency reasons and avoids multiple creation of
// cutting planes. Please update both simultaneously.
//
//
const edge& globalMasterEdge = cpepmIter().first();
const label curMasterEdgeIndex =
@ -582,7 +582,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
if (slaveCut.hit())
{
// Strict checking of slave cut to avoid capturing
// end points.
// end points.
scalar cutOnSlave =
(
(
@ -615,7 +615,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
<< cme.line(masterLocalPoints)
<< " slave edge: " << curSlaveLine
<< " point: " << masterCutPoint
<< " weight: " <<
<< " weight: " <<
(
(
slaveCut.missPoint()
@ -657,7 +657,7 @@ void Foam::slidingInterface::updateMesh(const mapPolyMesh& m)
{
if (debug)
{
Pout<< "void slidingInterface::updateMesh(const mapPolyMesh& m)"
Pout<< "void slidingInterface::updateMesh(const mapPolyMesh& m)"
<< " const for object " << name() << " : "
<< "Updating topology." << endl;
}
@ -771,7 +771,7 @@ void Foam::slidingInterface::write(Ostream& os) const
// To write out all those tolerances
#define WRITE_NON_DEFAULT(name) \
if( name ## _ != name ## Default_ )\
if ( name ## _ != name ## Default_ )\
{ \
os << " " #name " " << name ## _ << token::END_STATEMENT << nl; \
}

2
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
View File

@ -107,7 +107,7 @@ bool Foam::adjustPhi
{
massCorr = (massIn - fixedMassOut)/adjustableMassOut;
}
else if(mag(fixedMassOut - massIn)/totalFlux > 1e-10)
else if (mag(fixedMassOut - massIn)/totalFlux > 1e-10)
{
FatalErrorIn
(

2
src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
View File

@ -1,4 +1,4 @@
Info << "\nReading g" << endl;
Info<< "\nReading g" << endl;
uniformDimensionedVectorField g
(
IOobject

2
src/finiteVolume/cfdTools/general/porousMedia/porousZone.H
View File

@ -42,7 +42,7 @@ Description
Darcy-Forchheimer (@e d and @e f parameters)
@f[
S = - (\mu \, d \, U + \frac{\rho |U|}{2} \, f) U
S = - (\mu \, d + \frac{\rho |U|}{2} \, f) U
@f]

2
src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
View File

@ -74,7 +74,7 @@ void Foam::fanFvPatchField<Foam::scalar>::updateCoeffs()
);
}
for(label i=1; i<f_.size(); i++)
for (label i=1; i<f_.size(); i++)
{
jump_ += f_[i]*pow(Un, i);
}

2
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
View File

@ -162,7 +162,7 @@ inline void cellLimitedGrad<Type>::limitFace
const Type& extrapolate
)
{
for(direction cmpt=0; cmpt<Type::nComponents; cmpt++)
for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
{
cellLimitedGrad<scalar>::limitFace
(

2
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
View File

@ -164,7 +164,7 @@ inline void cellMDLimitedGrad<Type>::limitFace
const vector& dcf
)
{
for(direction cmpt=0; cmpt<Type::nComponents; cmpt++)
for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
{
vector gi(g[cmpt], g[cmpt+3], g[cmpt+6]);
cellMDLimitedGrad<scalar>::limitFace

14
src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
View File

@ -64,7 +64,7 @@ Foam::quadraticFitSnGradData::quadraticFitSnGradData
{
if (debug)
{
Info << "Contructing quadraticFitSnGradData" << endl;
Info<< "Contructing quadraticFitSnGradData" << endl;
}
// check input
@ -108,7 +108,7 @@ Foam::quadraticFitSnGradData::quadraticFitSnGradData
// find the fit coefficients for every face in the mesh
for(label faci = 0; faci < mesh.nInternalFaces(); faci++)
for (label faci = 0; faci < mesh.nInternalFaces(); faci++)
{
snGradPolySize[faci] = calcFit(stencilPoints[faci], faci);
}
@ -206,7 +206,7 @@ Foam::label Foam::quadraticFitSnGradData::calcFit
// calculate the matrix of the polynomial components
scalarRectangularMatrix B(C.size(), minSize_, scalar(0));
for(label ip = 0; ip < C.size(); ip++)
for (label ip = 0; ip < C.size(); ip++)
{
const point& p = C[ip];
@ -254,7 +254,7 @@ Foam::label Foam::quadraticFitSnGradData::calcFit
const scalar deltaCoeff = mesh().deltaCoeffs()[faci];
bool goodFit = false;
for(int iIt = 0; iIt < 10 && !goodFit; iIt++)
for (int iIt = 0; iIt < 10 && !goodFit; iIt++)
{
SVD svd(B, SMALL);
@ -270,7 +270,7 @@ Foam::label Foam::quadraticFitSnGradData::calcFit
{
fit_[faci][0] = fit0;
fit_[faci][1] = fit1;
for(label i = 2; i < stencilSize; i++)
for (label i = 2; i < stencilSize; i++)
{
fit_[faci][i] = wts[0]*wts[i]*svd.VSinvUt()[1][i]/scale;
}
@ -282,13 +282,13 @@ Foam::label Foam::quadraticFitSnGradData::calcFit
wts[0] *= 10;
wts[1] *= 10;
for(label i = 0; i < B.n(); i++)
for (label i = 0; i < B.n(); i++)
{
B[i][0] *= 10;
B[i][1] *= 10;
}
for(label j = 0; j < B.m(); j++)
for (label j = 0; j < B.m(); j++)
{
B[0][j] *= 10;
B[1][j] *= 10;

2
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -725,7 +725,7 @@ Foam::fvMatrix<Type>::H() const
)
);
for(direction cmpt=0; cmpt<Type::nComponents; cmpt++)
for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
{
if (validComponents[cmpt] == -1)
{

2
src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
View File

@ -90,7 +90,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
)
);
for(direction cmpt=0; cmpt<Type::nComponents; cmpt++)
for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
{
if (validComponents[cmpt] == -1) continue;

2
src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
View File

@ -478,7 +478,7 @@ void Foam::MULES::limiter
scalarField sumlPhip(psiIf.size());
scalarField mSumlPhim(psiIf.size());
for(int j=0; j<nLimiterIter; j++)
for (int j=0; j<nLimiterIter; j++)
{
sumlPhip = 0.0;
mSumlPhim = 0.0;

8
src/finiteVolume/fvMesh/fvMesh.C
View File

@ -356,7 +356,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "Boundary and topological update" << endl;
Info<< "Boundary and topological update" << endl;
}
boundary_.readUpdate(boundaryMesh());
@ -368,7 +368,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "Topological update" << endl;
Info<< "Topological update" << endl;
}
clearOut();
@ -377,7 +377,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "Point motion update" << endl;
Info<< "Point motion update" << endl;
}
clearGeom();
@ -386,7 +386,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "No update" << endl;
Info<< "No update" << endl;
}
}

2
src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
View File

@ -1341,7 +1341,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
{
labelList region(baseMesh().nCells(), 0);
forAllConstIter (labelHashSet, globalCellMap, iter)
forAllConstIter(labelHashSet, globalCellMap, iter)
{
region[iter.key()] = 1;
}

8
src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/findCellPointFaceTriangle.H
View File

@ -45,7 +45,7 @@ bool interpolationCellPointFace<Type>::findTriangle
// calculate triangle edge vectors and triangle face normal
// the 'i':th edge is opposite node i
vector edge[3], normal[3];
for(label i=0; i<3; i++)
for (label i=0; i<3; i++)
{
label ip0 = (i+1) % 3;
label ipp = (i+2) % 3;
@ -55,7 +55,7 @@ bool interpolationCellPointFace<Type>::findTriangle
vector triangleFaceNormal = edge[1] ^ edge[2];
// calculate edge normal (pointing inwards)
for(label i=0; i<3; i++)
for (label i=0; i<3; i++)
{
normal[i] = triangleFaceNormal ^ edge[i];
normal[i] /= mag(normal[i]) + VSMALL;
@ -63,7 +63,7 @@ bool interpolationCellPointFace<Type>::findTriangle
// check if position is inside triangle
bool inside = true;
for(label i=0; i<3; i++)
for (label i=0; i<3; i++)
{
label ip = (i+1) % 3;
inside = inside && (((newPos - tetPoints[ip]) & edge[i]) >= 0);
@ -74,7 +74,7 @@ bool interpolationCellPointFace<Type>::findTriangle
foundTriangle = true;
// calculate phi-values
for(label i=0; i<3; i++)
for (label i=0; i<3; i++)
{
label ip = (i+1) % 3;
scalar phiMax = max(VSMALL, normal[i] & edge[ip]);

2
src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
View File

@ -86,7 +86,7 @@ void Foam::CentredFitData<Polynomial>::calcFit()
const surfaceScalarField& w = mesh.surfaceInterpolation::weights();
for(label facei = 0; facei < mesh.nInternalFaces(); facei++)
for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
FitData
<

16
src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
View File

@ -153,7 +153,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
// Reference point
point p0 = this->mesh().faceCentres()[facei];
// Info << "Face " << facei << " at " << p0 << " stencil points at:\n"
// Info<< "Face " << facei << " at " << p0 << " stencil points at:\n"
// << C - p0 << endl;
// p0 -> p vector in the face-local coordinate system
@ -165,7 +165,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
// Matrix of the polynomial components
scalarRectangularMatrix B(C.size(), minSize_, scalar(0));
for(label ip = 0; ip < C.size(); ip++)
for (label ip = 0; ip < C.size(); ip++)
{
const point& p = C[ip];
@ -195,7 +195,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
}
// Additional weighting for constant and linear terms
for(label i = 0; i < B.n(); i++)
for (label i = 0; i < B.n(); i++)
{
B[i][0] *= wts[0];
B[i][1] *= wts[0];
@ -206,14 +206,14 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
coeffsi.setSize(stencilSize);
bool goodFit = false;
for(int iIt = 0; iIt < 8 && !goodFit; iIt++)
for (int iIt = 0; iIt < 8 && !goodFit; iIt++)
{
SVD svd(B, SMALL);
scalar maxCoeff = 0;
label maxCoeffi = 0;
for(label i=0; i<stencilSize; i++)
for (label i=0; i<stencilSize; i++)
{
coeffsi[i] = wts[0]*wts[i]*svd.VSinvUt()[0][i];
if (mag(coeffsi[i]) > maxCoeff)
@ -240,7 +240,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
// if (goodFit && iIt > 0)
// {
// Info << "FitData<Polynomial>::calcFit"
// Info<< "FitData<Polynomial>::calcFit"
// << "(const List<point>& C, const label facei" << nl
// << "Can now fit face " << facei << " iteration " << iIt
// << " with sum of weights " << sum(coeffsi) << nl
@ -271,13 +271,13 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
wts[1] *= 10;
}
for(label j = 0; j < B.m(); j++)
for (label j = 0; j < B.m(); j++)
{
B[0][j] *= 10;
B[1][j] *= 10;
}
for(label i = 0; i < B.n(); i++)
for (label i = 0; i < B.n(); i++)
{
B[i][0] *= 10;
B[i][1] *= 10;

4
src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
View File

@ -97,7 +97,7 @@ void Foam::UpwindFitData<Polynomial>::calcFit()
// find the fit coefficients for every owner
//Pout<< "-- Owner --" << endl;
for(label facei = 0; facei < mesh.nInternalFaces(); facei++)
for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
FitData
<
@ -156,7 +156,7 @@ void Foam::UpwindFitData<Polynomial>::calcFit()
// find the fit coefficients for every neighbour
//Pout<< "-- Neighbour --" << endl;
for(label facei = 0; facei < mesh.nInternalFaces(); facei++)
for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
FitData
<

8
src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
View File

@ -63,7 +63,7 @@ void pointPatchInterpolation::makePatchPatchAddressing()
forAll(bm, patchi)
{
if(!isA<emptyFvPatch>(bm[patchi]) && !bm[patchi].coupled())
if (!isA<emptyFvPatch>(bm[patchi]) && !bm[patchi].coupled())
{
nPatchPatchPoints += bm[patchi].patch().boundaryPoints().size();
}
@ -81,7 +81,7 @@ void pointPatchInterpolation::makePatchPatchAddressing()
forAll(bm, patchi)
{
if(!isA<emptyFvPatch>(bm[patchi]) && !bm[patchi].coupled())
if (!isA<emptyFvPatch>(bm[patchi]) && !bm[patchi].coupled())
{
const labelList& bp = bm[patchi].patch().boundaryPoints();
const labelList& meshPoints = bm[patchi].patch().meshPoints();
@ -129,10 +129,10 @@ void pointPatchInterpolation::makePatchPatchAddressing()
{
if (patchPatchPointConstraints[i].first() != 0)
{
patchPatchPointConstraintPoints_[nConstraints] =
patchPatchPointConstraintPoints_[nConstraints] =
patchPatchPoints_[i];
patchPatchPointConstraintTensors_[nConstraints] =
patchPatchPointConstraintTensors_[nConstraints] =
patchPatchPointConstraints[i].constraintTransformation();
nConstraints++;

4
src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
View File

@ -179,7 +179,7 @@ displacementInterpolationFvMotionSolver
// Slightly tweak min and max face zone so points sort within
zoneCoordinates[0] -= SMALL;
zoneCoordinates[zoneCoordinates.size()-1] += SMALL;
zoneCoordinates.last() += SMALL;
// Check if we have static min and max mesh bounds
const scalarField meshCoords = points0().component(dir);
@ -237,7 +237,7 @@ displacementInterpolationFvMotionSolver
}
rangeI++;
}
if (maxCoord > zoneCoordinates[zoneCoordinates.size()-1])
if (maxCoord > zoneCoordinates.last())
{
label sz = rangeToCoord.size();
rangeToCoord.setSize(sz+1);

2
src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
View File

@ -54,7 +54,7 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
{
word diffTypeName(mdData);
Info << "Selecting motion diffusion: " << diffTypeName << endl;
Info<< "Selecting motion diffusion: " << diffTypeName << endl;
IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(diffTypeName);

2
src/lagrangian/basic/Particle/Particle.C
View File

@ -208,7 +208,7 @@ Foam::label Foam::Particle<ParticleType>::track
facei_ = -1;
// Tracks to endPosition or stop on boundary
while(!onBoundary() && stepFraction_ < 1.0 - SMALL)
while (!onBoundary() && stepFraction_ < 1.0 - SMALL)
{
stepFraction_ += trackToFace(endPosition, td)*(1.0 - stepFraction_);
}

Some files were not shown because too many files have changed in this diff Show More