zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Info -> InfoInFunction and updated comments

Browse Source
This commit is contained in:
Henry Weller
2016-01-20 10:18:13 +00:00
parent f9a8134c74
commit 4426006d69
45 changed files with 234 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
View File

@ -121,13 +121,12 @@ bool Foam::HashTable<T, Key, Hash>::found(const Key& key) const
} }
} }
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "HashTable<T, Key, Hash>::found(const Key& key) : " InfoInFunction << "Entry " << key << " not found in hash table\n";
<< "Entry " << key << " not found in hash table\n";
} }
# endif #endif
return false; return false;
} }
@ -153,13 +152,12 @@ Foam::HashTable<T, Key, Hash>::find
} }
} }
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "HashTable<T, Key, Hash>::find(const Key& key) : " InfoInFunction << "Entry " << key << " not found in hash table\n";
<< "Entry " << key << " not found in hash table\n";
} }
# endif #endif
return iterator(); return iterator();
} }
@ -185,13 +183,12 @@ Foam::HashTable<T, Key, Hash>::find
} }
} }
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "HashTable<T, Key, Hash>::find(const Key& key) const : " InfoInFunction << "Entry " << key << " not found in hash table\n";
<< "Entry " << key << " not found in hash table\n";
} }
# endif #endif
return const_iterator(); return const_iterator();
} }
@ -250,7 +247,7 @@ bool Foam::HashTable<T, Key, Hash>::set
prev = ep; prev = ep;
} }
// not found, insert it at the head // Not found, insert it at the head
if (!existing) if (!existing)
{ {
table_[hashIdx] = new hashedEntry(key, table_[hashIdx], newEntry); table_[hashIdx] = new hashedEntry(key, table_[hashIdx], newEntry);
@ -258,39 +255,36 @@ bool Foam::HashTable<T, Key, Hash>::set
if (double(nElmts_)/tableSize_ > 0.8 && tableSize_ < maxTableSize) if (double(nElmts_)/tableSize_ > 0.8 && tableSize_ < maxTableSize)
{ {
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "HashTable<T, Key, Hash>::set" InfoInFunction << "Doubling table size\n";
"(const Key& key, T newEntry) : "
"Doubling table size\n";
} }
# endif #endif
resize(2*tableSize_); resize(2*tableSize_);
} }
} }
else if (protect) else if (protect)
{ {
// found - but protected from overwriting // Found - but protected from overwriting
// this corresponds to the STL 'insert' convention // this corresponds to the STL 'insert' convention
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "HashTable<T, Key, Hash>::set" InfoInFunction
"(const Key& key, T newEntry, true) : " << "Cannot insert " << key << " already in hash table\n";
"Cannot insert " << key << " already in hash table\n";
} }
# endif #endif
return false; return false;
} }
else else
{ {
// found - overwrite existing entry // Found - overwrite existing entry
// this corresponds to the Perl convention // this corresponds to the Perl convention
hashedEntry* ep = new hashedEntry(key, existing->next_, newEntry); hashedEntry* ep = new hashedEntry(key, existing->next_, newEntry);
// replace existing element - within list or insert at the head // Replace existing element - within list or insert at the head
if (prev) if (prev)
{ {
prev->next_ = ep; prev->next_ = ep;
@ -310,7 +304,7 @@ bool Foam::HashTable<T, Key, Hash>::set
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase() bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
{ {
// note: entryPtr_ is NULL for end(), so this catches that too // Note: entryPtr_ is NULL for end(), so this catches that too
if (entryPtr_) if (entryPtr_)
{ {
// Search element before entryPtr_ // Search element before entryPtr_
@ -332,7 +326,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
if (prev) if (prev)
{ {
// has an element before entryPtr - reposition to there // Has an element before entryPtr - reposition to there
prev->next_ = entryPtr_->next_; prev->next_ = entryPtr_->next_;
delete entryPtr_; delete entryPtr_;
entryPtr_ = prev; entryPtr_ = prev;
@ -343,7 +337,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
hashTable_->table_[hashIndex_] = entryPtr_->next_; hashTable_->table_[hashIndex_] = entryPtr_->next_;
delete entryPtr_; delete entryPtr_;
// assign any non-NULL pointer value so it doesn't look // Assign any non-NULL pointer value so it doesn't look
// like end()/cend() // like end()/cend()
entryPtr_ = reinterpret_cast<hashedEntry*>(this); entryPtr_ = reinterpret_cast<hashedEntry*>(this);
@ -378,7 +372,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter) bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
{ {
// adjust iterator after erase // Adjust iterator after erase
return const_cast<iterator&>(iter).erase(); return const_cast<iterator&>(iter).erase();
} }
@ -439,13 +433,12 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
if (newSize == tableSize_) if (newSize == tableSize_)
{ {
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "HashTable<T, Key, Hash>::resize(const label) : " InfoInFunction << "New table size == old table size\n";
<< "new table size == old table size\n";
} }
# endif #endif
return; return;
} }
@ -508,7 +501,7 @@ void Foam::HashTable<T, Key, Hash>::shrink()
if (newSize < tableSize_) if (newSize < tableSize_)
{ {
// avoid having the table disappear on us // Avoid having the table disappear on us
resize(newSize ? newSize : 2); resize(newSize ? newSize : 2);
} }
} }
@ -517,7 +510,7 @@ void Foam::HashTable<T, Key, Hash>::shrink()
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
void Foam::HashTable<T, Key, Hash>::transfer(HashTable<T, Key, Hash>& ht) void Foam::HashTable<T, Key, Hash>::transfer(HashTable<T, Key, Hash>& ht)
{ {
// as per the Destructor // As per the Destructor
if (table_) if (table_)
{ {
clear(); clear();
@ -551,7 +544,7 @@ void Foam::HashTable<T, Key, Hash>::operator=
<< abort(FatalError); << abort(FatalError);
} }
// could be zero-sized from a previous transfer() // Could be zero-sized from a previous transfer()
if (!tableSize_) if (!tableSize_)
{ {
resize(rhs.tableSize_); resize(rhs.tableSize_);
@ -574,7 +567,7 @@ bool Foam::HashTable<T, Key, Hash>::operator==
const HashTable<T, Key, Hash>& rhs const HashTable<T, Key, Hash>& rhs
) const ) const
{ {
// sizes (number of keys) must match // Sizes (number of keys) must match
if (size() != rhs.size()) if (size() != rhs.size())
{ {
return false; return false;

69
src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
View File

@ -39,12 +39,12 @@ Foam::label Foam::StaticHashTableCore::canonicalSize(const label size)
return 0; return 0;
} }
// enforce power of two // Enforce power of two
unsigned int goodSize = size; unsigned int goodSize = size;
if (goodSize & (goodSize - 1)) if (goodSize & (goodSize - 1))
{ {
// brute-force is fast enough // Brute-force is fast enough
goodSize = 1; goodSize = 1;
while (goodSize < unsigned(size)) while (goodSize < unsigned(size))
{ {
@ -58,7 +58,6 @@ Foam::label Foam::StaticHashTableCore::canonicalSize(const label size)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct given initial table size
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size) Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)
: :
@ -78,7 +77,6 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)
} }
// Construct as copy
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
Foam::StaticHashTable<T, Key, Hash>::StaticHashTable Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
( (
@ -137,13 +135,12 @@ bool Foam::StaticHashTable<T, Key, Hash>::found(const Key& key) const
} }
} }
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::found(const Key&) : " InfoInFunction << "Entry " << key << " not found in hash table\n";
<< "Entry " << key << " not found in hash table\n";
} }
# endif #endif
return false; return false;
} }
@ -170,13 +167,12 @@ Foam::StaticHashTable<T, Key, Hash>::find
} }
} }
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::find(const Key&) : " InfoInFunction << "Entry " << key << " not found in hash table\n";
<< "Entry " << key << " not found in hash table\n";
} }
# endif #endif
return end(); return end();
} }
@ -203,19 +199,17 @@ Foam::StaticHashTable<T, Key, Hash>::find
} }
} }
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::find(const Key&) const : " InfoInFunction << "Entry " << key << " not found in hash table\n";
<< "Entry " << key << " not found in hash table\n";
} }
# endif #endif
return cend(); return cend();
} }
// Return the table of contents
template<class T, class Key, class Hash> template<class T, class Key, class Hash>
Foam::List<Key> Foam::StaticHashTable<T, Key, Hash>::toc() const Foam::List<Key> Foam::StaticHashTable<T, Key, Hash>::toc() const
{ {
@ -254,7 +248,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
if (existing == localKeys.size()) if (existing == localKeys.size())
{ {
// not found, append // Not found, append
List<T>& localObjects = objects_[hashIdx]; List<T>& localObjects = objects_[hashIdx];
localKeys.setSize(existing+1); localKeys.setSize(existing+1);
@ -267,21 +261,20 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
} }
else if (protect) else if (protect)
{ {
// found - but protected from overwriting // Found - but protected from overwriting
// this corresponds to the STL 'insert' convention // this corresponds to the STL 'insert' convention
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::set" InfoInFunction
"(const Key& key, T newEntry, true) : " << "Cannot insert " << key << " already in hash table\n";
"Cannot insert " << key << " already in hash table\n";
} }
# endif #endif
return false; return false;
} }
else else
{ {
// found - overwrite existing entry // Found - overwrite existing entry
// this corresponds to the Perl convention // this corresponds to the Perl convention
objects_[hashIdx][existing] = newEntry; objects_[hashIdx][existing] = newEntry;
} }
@ -307,7 +300,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
localKeys.setSize(localKeys.size()-1); localKeys.setSize(localKeys.size()-1);
localObjects.setSize(localObjects.size()-1); localObjects.setSize(localObjects.size()-1);
// adjust iterator after erase // Adjust iterator after erase
iterator& it = const_cast<iterator&>(cit); iterator& it = const_cast<iterator&>(cit);
it.elemIndex_--; it.elemIndex_--;
@ -321,25 +314,24 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
nElmts_--; nElmts_--;
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::erase(iterator&) : " InfoInFunction << "hashedEntry removed.\n";
<< "hashedEntry removed.\n";
} }
# endif #endif
return true; return true;
} }
else else
{ {
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::erase(iterator&) : " InfoInFunction
<< "cannot remove hashedEntry from hash table\n"; << "Cannot remove hashedEntry from hash table\n";
} }
# endif #endif
return false; return false;
} }
@ -391,13 +383,12 @@ void Foam::StaticHashTable<T, Key, Hash>::resize(const label sz)
if (newSize == keys_.size()) if (newSize == keys_.size())
{ {
# ifdef FULLDEBUG #ifdef FULLDEBUG
if (debug) if (debug)
{ {
Info<< "StaticHashTable<T, Key, Hash>::resize(const label) : " InfoInFunction << "New table size == old table size\n";
<< "new table size == old table size\n";
} }
# endif #endif
return; return;
} }
@ -517,7 +508,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::operator==
const StaticHashTable<T, Key, Hash>& rhs const StaticHashTable<T, Key, Hash>& rhs
) const ) const
{ {
// sizes (number of keys) must match // Sizes (number of keys) must match
for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter) for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
{ {

17
src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,7 +31,7 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(IFstream, 0); defineTypeNameAndDebug(IFstream, 0);
} }
@ -46,8 +46,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
{ {
if (IFstream::debug) if (IFstream::debug)
{ {
Info<< "IFstreamAllocator::IFstreamAllocator(const fileName&) : " InfoInFunction << "Cannot open null file " << endl;
"cannot open null file " << endl;
} }
} }
@ -58,8 +57,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
{ {
if (IFstream::debug) if (IFstream::debug)
{ {
Info<< "IFstreamAllocator::IFstreamAllocator(const fileName&) : " InfoInFunction << "Decompressing " << pathname + ".gz" << endl;
"decompressing " << pathname + ".gz" << endl;
} }
delete ifPtr_; delete ifPtr_;
@ -108,11 +106,8 @@ Foam::IFstream::IFstream
{ {
if (debug) if (debug)
{ {
Info<< "IFstream::IFstream(const fileName&," InfoInFunction
"streamFormat=ASCII," << "Could not open file for input" << endl << info() << endl;
"versionNumber=currentVersion) : "
"could not open file for input"
<< endl << info() << endl;
} }
setBad(); setBad();

5
src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -49,8 +49,7 @@ Foam::OFstreamAllocator::OFstreamAllocator
{ {
if (OFstream::debug) if (OFstream::debug)
{ {
Info<< "OFstreamAllocator::OFstreamAllocator(const fileName&) : " InfoInFunction << "Cannot open null file " << endl;
"cannot open null file " << endl;
} }
} }

5
src/OpenFOAM/db/Time/findTimes.C
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) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,8 +42,7 @@ Foam::instantList Foam::Time::findTimes
{ {
if (debug) if (debug)
{ {
Info<< "Time::findTimes(const fileName&): finding times in directory " InfoInFunction << "Finding times in directory " << directory << endl;
<< directory << endl;
} }
// Read directory entries into a list // Read directory entries into a list

4
src/OpenFOAM/db/dictionary/dictionaryIO.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -112,7 +112,7 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
if (is.bad()) if (is.bad())
{ {
Info<< "dictionary::read(Istream&, bool) : " InfoInFunction
<< "Istream not OK after reading dictionary " << name() << "Istream not OK after reading dictionary " << name()
<< endl; << endl;

12
src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -61,8 +61,8 @@ Foam::dlLibraryTable::~dlLibraryTable()
{ {
if (debug) if (debug)
{ {
Info<< "dlLibraryTable::~dlLibraryTable() : closing " InfoInFunction
<< libNames_[i] << "Closing " << libNames_[i]
<< " with handle " << uintptr_t(libPtrs_[i]) << endl; << " with handle " << uintptr_t(libPtrs_[i]) << endl;
} }
dlClose(libPtrs_[i]); dlClose(libPtrs_[i]);
@ -85,7 +85,8 @@ bool Foam::dlLibraryTable::open
if (debug) if (debug)
{ {
Info<< "dlLibraryTable::open : opened " << functionLibName InfoInFunction
<< "Opened " << functionLibName
<< " resulting in handle " << uintptr_t(functionLibPtr) << endl; << " resulting in handle " << uintptr_t(functionLibPtr) << endl;
} }
@ -134,7 +135,8 @@ bool Foam::dlLibraryTable::close
{ {
if (debug) if (debug)
{ {
Info<< "dlLibraryTable::close : closing " << functionLibName InfoInFunction
<< "Closing " << functionLibName
<< " with handle " << uintptr_t(libPtrs_[index]) << endl; << " with handle " << uintptr_t(libPtrs_[index]) << endl;
} }

18
src/OpenFOAM/db/regIOobject/regIOobjectRead.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,15 +28,14 @@ License
#include "Time.H" #include "Time.H"
#include "Pstream.H" #include "Pstream.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::Istream& Foam::regIOobject::readStream() Foam::Istream& Foam::regIOobject::readStream()
{ {
if (IFstream::debug) if (IFstream::debug)
{ {
Info<< "regIOobject::readStream() : " InfoInFunction
<< "reading object " << name() << "Reading object " << name()
<< " from file " << objectPath() << " from file " << objectPath()
<< endl; << endl;
} }
@ -112,8 +111,8 @@ Foam::Istream& Foam::regIOobject::readStream(const word& expectName)
{ {
if (IFstream::debug) if (IFstream::debug)
{ {
Info<< "regIOobject::readStream(const word&) : " InfoInFunction
<< "reading object " << name() << "Reading object " << name()
<< " from file " << objectPath() << " from file " << objectPath()
<< endl; << endl;
} }
@ -149,8 +148,8 @@ void Foam::regIOobject::close()
{ {
if (IFstream::debug) if (IFstream::debug)
{ {
Info<< "regIOobject::close() : " InfoInFunction
<< "finished reading " << filePath() << "Finished reading " << filePath()
<< endl; << endl;
} }
@ -288,7 +287,8 @@ bool Foam::regIOobject::readIfModified()
if (modified()) if (modified())
{ {
const fileName& fName = time().getFile(watchIndex_); const fileName& fName = time().getFile(watchIndex_);
Info<< "regIOobject::readIfModified() : " << nl InfoInFunction
<< nl
<< " Re-reading object " << name() << " Re-reading object " << name()
<< " from file " << fName << endl; << " from file " << fName << endl;
return read(); return read();

5
src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -74,8 +74,7 @@ bool Foam::regIOobject::writeObject
if (OFstream::debug) if (OFstream::debug)
{ {
Info<< "regIOobject::write() : " InfoInFunction << "Writing file " << objectPath();
<< "writing file " << objectPath();
} }

9
src/OpenFOAM/meshes/polyMesh/polyMesh.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1051,8 +1051,8 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
{ {
if (debug) if (debug)
{ {
Info<< "tmp<scalarField> polyMesh::movePoints(const pointField&) : " InfoInFunction
<< " Moving points for time " << time().value() << "Moving points for time " << time().value()
<< " index " << time().timeIndex() << endl; << " index " << time().timeIndex() << endl;
} }
@ -1077,8 +1077,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
{ {
moveError = true; moveError = true;
Info<< "tmp<scalarField> polyMesh::movePoints" InfoInFunction
<< "(const pointField&) : "
<< "Moving the mesh with given points will " << "Moving the mesh with given points will "
<< "invalidate the mesh." << nl << "invalidate the mesh." << nl
<< "Mesh motion should not be executed." << endl; << "Mesh motion should not be executed." << endl;

23
src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
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) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,9 +37,7 @@ void Foam::polyMesh::removeBoundary()
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::removeBoundary(): " InfoInFunction << "Removing boundary patches." << endl;
<< "Removing boundary patches."
<< endl;
} }
// Remove the point zones // Remove the point zones
@ -56,9 +54,7 @@ void Foam::polyMesh::clearGeom()
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::clearGeom() : " InfoInFunction << "Clearing geometric data" << endl;
<< "clearing geometric data"
<< endl;
} }
// Clear all geometric mesh objects // Clear all geometric mesh objects
@ -84,9 +80,7 @@ void Foam::polyMesh::clearAdditionalGeom()
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::clearAdditionalGeom() : " InfoInFunction << "Clearing additional geometric data" << endl;
<< "clearing additional geometric data"
<< endl;
} }
// Remove the stored tet base points // Remove the stored tet base points
@ -100,9 +94,8 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::clearAddressing() : " InfoInFunction
<< "clearing topology isMeshUpdate:" << isMeshUpdate << "Clearing topology isMeshUpdate:" << isMeshUpdate << endl;
<< endl;
} }
if (isMeshUpdate) if (isMeshUpdate)
@ -181,9 +174,7 @@ void Foam::polyMesh::clearCellTree()
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::clearCellTree() : " InfoInFunction << "Clearing cell tree" << endl;
<< "clearing cell tree"
<< endl;
} }
cellTreePtr_.clear(); cellTreePtr_.clear();

54
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,8 +33,7 @@ void Foam::polyMesh::setInstance(const fileName& inst)
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::setInstance(const fileName& inst) : " InfoInFunction << "Resetting file instance to " << inst << endl;
<< "Resetting file instance to " << inst << endl;
} }
points_.writeOpt() = IOobject::AUTO_WRITE; points_.writeOpt() = IOobject::AUTO_WRITE;
@ -67,8 +66,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
{ {
if (debug) if (debug)
{ {
Info<< "polyMesh::readUpdateState polyMesh::readUpdate() : " InfoInFunction << "Updating mesh based on saved data." << endl;
<< "Updating mesh based on saved data." << endl;
} }
// Find the point and cell instance // Find the point and cell instance
@ -80,8 +78,6 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
{ {
Info<< "Faces instance: old = " << facesInstance() Info<< "Faces instance: old = " << facesInstance()
<< " new = " << facesInst << nl << " new = " << facesInst << nl
//<< "Boundary instance: old = " << boundary_.instance()
//<< " new = " << boundaryInst << nl
<< "Points instance: old = " << pointsInstance() << "Points instance: old = " << pointsInstance()
<< " new = " << pointsInst << endl; << " new = " << pointsInst << endl;
} }
@ -449,50 +445,6 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
geometricD_ = Vector<label>::zero; geometricD_ = Vector<label>::zero;
solutionD_ = Vector<label>::zero; solutionD_ = Vector<label>::zero;
//if (boundaryInst != boundary_.instance())
//{
// // Boundary file but no topology change
// if (debug)
// {
// Info<< "Boundary state change" << endl;
// }
//
// // Reset the boundary patches
// polyBoundaryMesh newBoundary
// (
// IOobject
// (
// "boundary",
// facesInst,
// meshSubDir,
// *this,
// IOobject::MUST_READ,
// IOobject::NO_WRITE,
// false
// ),
// *this
// );
//
//
//
//
// boundary_.clear();
// boundary_.setSize(newBoundary.size());
//
// forAll(newBoundary, patchI)
// {
// boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
// }
// // Calculate topology for the patches (processor-processor comms
// // etc.)
// boundary_.updateMesh();
//
// // Calculate the geometry for the patches (transformation tensors
// // etc.)
// boundary_.calcGeometry();
//}
return polyMesh::POINTS_MOVED; return polyMesh::POINTS_MOVED;
} }
else else

9
src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,8 +31,7 @@ void Foam::polyMesh::initMesh()
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::initMesh() : " InfoInFunction << "initialising primitiveMesh" << endl;
<< "initialising primitiveMesh" << endl;
} }
// For backward compatibility check if the neighbour array is the same // For backward compatibility check if the neighbour array is the same
@ -109,8 +108,7 @@ void Foam::polyMesh::initMesh(cellList& c)
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::initMesh(cellList& c) : " InfoInFunction << "Calculating owner-neighbour arrays" << endl;
<< "calculating owner-neighbour arrays" << endl;
} }
owner_.setSize(faces_.size(), -1); owner_.setSize(faces_.size(), -1);
@ -175,4 +173,5 @@ void Foam::polyMesh::initMesh(cellList& c)
neighbour_.note() = meshInfo; neighbour_.note() = meshInfo;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
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) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,8 +40,8 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
{ {
if (debug) if (debug)
{ {
Info<< "void polyMesh::updateMesh(const mapPolyMesh&) : " InfoInFunction
<< "updating addressing and (optional) pointMesh/pointFields" << "Updating addressing and (optional) pointMesh/pointFields"
<< endl; << endl;
} }

2
src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
View File

@ -362,7 +362,7 @@ Foam::label Foam::ZoneMesh<ZoneType, MeshType>::findZoneID
// Zone not found // Zone not found
if (debug) if (debug)
{ {
Info<< "label ZoneMesh<ZoneType>::findZoneID(const word&) const : " InfoInFunction
<< "Zone named " << zoneName << " not found. " << "Zone named " << zoneName << " not found. "
<< "List of available zone names: " << names() << endl; << "List of available zone names: " << names() << endl;
} }

39
src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -49,9 +49,7 @@ void Foam::faceZone::calcFaceZonePatch() const
{ {
if (debug) if (debug)
{ {
Info<< "void faceZone::calcFaceZonePatch() const : " InfoInFunction << "Calculating primitive patch" << endl;
<< "Calculating primitive patch"
<< endl;
} }
if (patchPtr_) if (patchPtr_)
@ -89,9 +87,7 @@ void Foam::faceZone::calcFaceZonePatch() const
if (debug) if (debug)
{ {
Info<< "void faceZone::calcFaceZonePatch() const : " InfoInFunction << "Finished calculating primitive patch" << endl;
<< "Finished calculating primitive patch"
<< endl;
} }
} }
@ -100,9 +96,7 @@ void Foam::faceZone::calcCellLayers() const
{ {
if (debug) if (debug)
{ {
Info<< "void Foam::faceZone::calcCellLayers() const : " InfoInFunction << "Calculating master cells" << endl;
<< "calculating master cells"
<< endl;
} }
// It is an error to attempt to recalculate edgeCells // It is an error to attempt to recalculate edgeCells
@ -153,8 +147,6 @@ void Foam::faceZone::calcCellLayers() const
sc[faceI] = neiCellI; sc[faceI] = neiCellI;
} }
} }
//Info<< "masterCells: " << mc << endl;
//Info<< "slaveCells: " << sc << endl;
} }
} }
@ -190,7 +182,6 @@ void Foam::faceZone::checkAddressing() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::faceZone::faceZone Foam::faceZone::faceZone
( (
const word& name, const word& name,
@ -354,28 +345,6 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
{ {
if (!mePtr_) if (!mePtr_)
{ {
//labelList faceCells(size());
//
//const labelList& own = zoneMesh().mesh().faceOwner();
//
//const labelList& faceLabels = *this;
//
//forAll(faceCells, faceI)
//{
// faceCells[faceI] = own[faceLabels[faceI]];
//}
//
//mePtr_ =
// new labelList
// (
// operator()().meshEdges
// (
// zoneMesh().mesh().edges(),
// zoneMesh().mesh().cellEdges(),
// faceCells
// )
// );
mePtr_ = mePtr_ =
new labelList new labelList
( (

12
src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,7 +32,7 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(zone, 0); defineTypeNameAndDebug(zone, 0);
} }
@ -53,9 +53,7 @@ void Foam::zone::calcLookupMap() const
{ {
if (debug) if (debug)
{ {
Info<< "void zone::calcLookupMap() const: " InfoInFunction << "Calculating lookup map" << endl;
<< "Calculating lookup map"
<< endl;
} }
if (lookupMapPtr_) if (lookupMapPtr_)
@ -77,9 +75,7 @@ void Foam::zone::calcLookupMap() const
if (debug) if (debug)
{ {
Info<< "void zone::calcLookupMap() const: " InfoInFunction << "Finished calculating lookup map" << endl;
<< "Finished calculating lookup map"
<< endl;
} }
} }

67
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,9 +51,8 @@ bool Foam::primitiveMesh::checkClosedBoundary
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkClosedBoundary(" InfoInFunction
<< "const bool) const: " << "Checking whether the boundary is closed" << endl;
<< "checking whether the boundary is closed" << endl;
} }
// Loop through all boundary faces and sum up the face area vectors. // Loop through all boundary faces and sum up the face area vectors.
@ -112,10 +111,8 @@ bool Foam::primitiveMesh::checkClosedCells
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkClosedCells(" InfoInFunction
<< "const bool, labelHashSet*, labelHashSet*" << "Checking whether cells are closed" << endl;
<< ", const Vector<label>&) const: "
<< "checking whether cells are closed" << endl;
} }
// Check that all cells labels are valid // Check that all cells labels are valid
@ -244,9 +241,7 @@ bool Foam::primitiveMesh::checkFaceAreas
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceAreas(" InfoInFunction << "Checking face area magnitudes" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking face area magnitudes" << endl;
} }
const scalarField magFaceAreas(mag(faceAreas)); const scalarField magFaceAreas(mag(faceAreas));
@ -324,9 +319,7 @@ bool Foam::primitiveMesh::checkCellVolumes
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkCellVolumes(" InfoInFunction << "Checking cell volumes" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking cell volumes" << endl;
} }
scalar minVolume = GREAT; scalar minVolume = GREAT;
@ -396,9 +389,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceOrthogonality(" InfoInFunction << "Checking mesh non-orthogonality" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking mesh non-orthogonality" << endl;
} }
@ -510,9 +501,7 @@ bool Foam::primitiveMesh::checkFacePyramids
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFacePyramids(" InfoInFunction << "Checking face orientation" << endl;
<< "const bool, const scalar, labelHashSet*) const: "
<< "checking face orientation" << endl;
} }
const labelList& own = faceOwner(); const labelList& own = faceOwner();
@ -614,9 +603,7 @@ bool Foam::primitiveMesh::checkFaceSkewness
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceSkewnesss(" InfoInFunction << "Checking face skewness" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking face skewness" << endl;
} }
// Warn if the skew correction vector is more than skewWarning times // Warn if the skew correction vector is more than skewWarning times
@ -692,9 +679,7 @@ bool Foam::primitiveMesh::checkFaceAngles
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceAngles" InfoInFunction << "Checking face angles" << endl;
<< "(const bool, const scalar, labelHashSet*) const: "
<< "checking face angles" << endl;
} }
if (maxDeg < -SMALL || maxDeg > 180+SMALL) if (maxDeg < -SMALL || maxDeg > 180+SMALL)
@ -775,9 +760,7 @@ bool Foam::primitiveMesh::checkFaceFlatness
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceFlatness" InfoInFunction << "Checking face flatness" << endl;
<< "(const bool, const scalar, labelHashSet*) const: "
<< "checking face flatness" << endl;
} }
if (warnFlatness < 0 || warnFlatness > 1) if (warnFlatness < 0 || warnFlatness > 1)
@ -880,9 +863,7 @@ bool Foam::primitiveMesh::checkConcaveCells
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkConcaveCells(const bool" InfoInFunction << "Checking for concave cells" << endl;
<< ", labelHashSet*) const: "
<< "checking for concave cells" << endl;
} }
const cellList& c = cells(); const cellList& c = cells();
@ -995,9 +976,7 @@ bool Foam::primitiveMesh::checkUpperTriangular
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkUpperTriangular(" InfoInFunction << "Checking face ordering" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking face ordering" << endl;
} }
// Check whether internal faces are ordered in the upper triangular order // Check whether internal faces are ordered in the upper triangular order
@ -1160,9 +1139,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkCellsZipUp(" InfoInFunction << "Checking topological cell openness" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking topological cell openness" << endl;
} }
label nOpenCells = 0; label nOpenCells = 0;
@ -1261,9 +1238,7 @@ bool Foam::primitiveMesh::checkFaceVertices
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceVertices(" InfoInFunction << "Checking face vertices" << endl;
<< "const bool, labelHashSet*) const: "
<< "checking face vertices" << endl;
} }
// Check that all vertex labels are valid // Check that all vertex labels are valid
@ -1336,9 +1311,7 @@ bool Foam::primitiveMesh::checkPoints
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkPoints" InfoInFunction << "Checking points" << endl;
<< "(const bool, labelHashSet*) const: "
<< "checking points" << endl;
} }
label nFaceErrors = 0; label nFaceErrors = 0;
@ -1616,8 +1589,7 @@ bool Foam::primitiveMesh::checkFaceFaces
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkFaceFaces(const bool, labelHashSet*)" InfoInFunction << "Checking face-face connectivity" << endl;
<< " const: " << "checking face-face connectivity" << endl;
} }
const labelListList& pf = pointFaces(); const labelListList& pf = pointFaces();
@ -1954,8 +1926,7 @@ bool Foam::primitiveMesh::checkMesh(const bool report) const
{ {
if (debug) if (debug)
{ {
Info<< "bool primitiveMesh::checkMesh(const bool report) const: " InfoInFunction << "Checking primitiveMesh" << endl;
<< "checking primitiveMesh" << endl;
} }
label noFailedChecks = checkTopology(report) + checkGeometry(report); label noFailedChecks = checkTopology(report) + checkGeometry(report);

10
src/conversion/meshReader/createPolyBoundary.C
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) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,7 +62,7 @@ void Foam::meshReader::addPolyBoundaryFace
// Debugging // Debugging
if (cellPolys_[cellId][cellFaceId] > nInternalFaces_) if (cellPolys_[cellId][cellFaceId] > nInternalFaces_)
{ {
Info<< "meshReader::createPolyBoundary(): " InfoInFunction
<< "Problem with face: " << thisFace << endl << "Problem with face: " << thisFace << endl
<< "Probably multiple definitions " << "Probably multiple definitions "
<< "of a single boundary face." << endl << "of a single boundary face." << endl
@ -70,7 +70,7 @@ void Foam::meshReader::addPolyBoundaryFace
} }
else if (cellPolys_[cellId][cellFaceId] >= 0) else if (cellPolys_[cellId][cellFaceId] >= 0)
{ {
Info<< "meshReader::createPolyBoundary(): " InfoInFunction
<< "Problem with face: " << thisFace << endl << "Problem with face: " << thisFace << endl
<< "Probably trying to define a boundary face " << "Probably trying to define a boundary face "
<< "on a previously matched internal face." << endl << "on a previously matched internal face." << endl
@ -340,8 +340,8 @@ void Foam::meshReader::createPolyBoundary()
{ {
const face& problemFace = meshFaces_[faceI]; const face& problemFace = meshFaces_[faceI];
Info<< "meshReader::createPolyBoundary() : " InfoInFunction
<< "problem with face " << faceI << ": addressed " << "Problem with face " << faceI << ": addressed "
<< markupFaces[faceI] << " times (should be 2!). Face: " << markupFaces[faceI] << " times (should be 2!). Face: "
<< problemFace << endl; << problemFace << endl;

4
src/conversion/meshReader/starcd/STARCDMeshReader.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1041,8 +1041,6 @@ void Foam::meshReaders::STARCD::cullPoints()
bool Foam::meshReaders::STARCD::readGeometry(const scalar scaleFactor) bool Foam::meshReaders::STARCD::readGeometry(const scalar scaleFactor)
{ {
// Info<< "called meshReaders::STARCD::readGeometry" << endl;
readPoints(geometryFile_ + ".vrt", scaleFactor); readPoints(geometryFile_ + ".vrt", scaleFactor);
readCells(geometryFile_ + ".cel"); readCells(geometryFile_ + ".cel");
cullPoints(); cullPoints();

5
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -93,8 +93,7 @@ Foam::septernion Foam::solidBodyMotionFunctions::SDA::transformation() const
quaternion R(rollA*sin(wr*time + phr), 0, 0); quaternion R(rollA*sin(wr*time + phr), 0, 0);
septernion TR(septernion(CofG_ + T)*R*septernion(-CofG_)); septernion TR(septernion(CofG_ + T)*R*septernion(-CofG_));
Info<< "solidBodyMotionFunctions::SDA::transformation(): " InfoInFunction << "Time = " << time << " transformation: " << TR << endl;
<< "Time = " << time << " transformation: " << TR << endl;
return TR; return TR;
} }

6
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
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) 2012-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -85,8 +85,7 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::transformation() const
quaternion R(omega/magOmega, magOmega); quaternion R(omega/magOmega, magOmega);
septernion TR(septernion(origin_)*R*septernion(-origin_)); septernion TR(septernion(origin_)*R*septernion(-origin_));
Info<< "solidBodyMotionFunctions::axisRotationMotion::transformation(): " InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
@ -105,4 +104,5 @@ bool Foam::solidBodyMotionFunctions::axisRotationMotion::read
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,8 +76,7 @@ Foam::solidBodyMotionFunctions::linearMotion::transformation() const
quaternion R(0, 0, 0); quaternion R(0, 0, 0);
septernion TR(septernion(displacement)*R); septernion TR(septernion(displacement)*R);
Info<< "solidBodyMotionFunctions::linearMotion::transformation(): " InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
@ -95,4 +94,5 @@ bool Foam::solidBodyMotionFunctions::linearMotion::read
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -77,8 +77,7 @@ Foam::solidBodyMotionFunctions::multiMotion::transformation() const
TR *= SBMFs_[i].transformation(); TR *= SBMFs_[i].transformation();
} }
Info<< "solidBodyMotionFunctions::multiMotion::transformation(): " InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
@ -116,4 +115,5 @@ bool Foam::solidBodyMotionFunctions::multiMotion::read
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

7
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,9 +76,7 @@ Foam::solidBodyMotionFunctions::oscillatingLinearMotion::transformation() const
quaternion R(0, 0, 0); quaternion R(0, 0, 0);
septernion TR(septernion(displacement)*R); septernion TR(septernion(displacement)*R);
Info<< "solidBodyMotionFunctions::oscillatingLinearMotion::" InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "transformation(): "
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
@ -97,4 +95,5 @@ bool Foam::solidBodyMotionFunctions::oscillatingLinearMotion::read
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

7
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -84,9 +84,7 @@ transformation() const
quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z());
septernion TR(septernion(origin_)*R*septernion(-origin_)); septernion TR(septernion(origin_)*R*septernion(-origin_));
Info<< "solidBodyMotionFunctions::oscillatingRotatingMotion::" InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "transformation(): "
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
@ -106,4 +104,5 @@ bool Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::read
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

6
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -80,8 +80,7 @@ Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const
quaternion R(axis_, angle); quaternion R(axis_, angle);
septernion TR(septernion(origin_)*R*septernion(-origin_)); septernion TR(septernion(origin_)*R*septernion(-origin_));
Info<< "solidBodyMotionFunctions::rotatingMotion::transformation(): " InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }
@ -102,4 +101,5 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

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

@ -107,8 +107,7 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
quaternion R(TRV[1].x(), TRV[1].y(), TRV[1].z()); quaternion R(TRV[1].x(), TRV[1].y(), TRV[1].z());
septernion TR(septernion(CofG_ + TRV[0])*R*septernion(-CofG_)); septernion TR(septernion(CofG_ + TRV[0])*R*septernion(-CofG_));
Info<< "solidBodyMotionFunctions::tabulated6DoFMotion::transformation(): " InfoInFunction << "Time = " << t << " transformation: " << TR << endl;
<< "Time = " << t << " transformation: " << TR << endl;
return TR; return TR;
} }

11
src/dynamicMesh/meshCut/wallLayerCells/wallLayerCells.C
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) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,14 +29,11 @@ License
#include "wallNormalInfo.H" #include "wallNormalInfo.H"
#include "OFstream.H" #include "OFstream.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(wallLayerCells, 0);
defineTypeNameAndDebug(wallLayerCells, 0);
} }
@ -64,7 +61,6 @@ bool Foam::wallLayerCells::usesCoupledPatch(const label cellI) const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::wallLayerCells::wallLayerCells Foam::wallLayerCells::wallLayerCells
( (
const polyMesh& mesh, const polyMesh& mesh,
@ -160,8 +156,7 @@ Foam::wallLayerCells::wallLayerCells
if (debug) if (debug)
{ {
Info<< "wallLayerCells::getRefinement : dumping selected faces to " InfoInFunction << "Dumping selected faces to selectedFaces.obj" << endl;
<< "selectedFaces.obj" << endl;
OFstream fcStream("selectedFaces.obj"); OFstream fcStream("selectedFaces.obj");

58
src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,15 +36,13 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(faceCoupleInfo, 0); defineTypeNameAndDebug(faceCoupleInfo, 0);
const scalar faceCoupleInfo::angleTol_ = 1e-3;
const scalar faceCoupleInfo::angleTol_ = 1e-3;
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
//- Write edges
void Foam::faceCoupleInfo::writeOBJ void Foam::faceCoupleInfo::writeOBJ
( (
const fileName& fName, const fileName& fName,
@ -97,7 +95,6 @@ void Foam::faceCoupleInfo::writeOBJ
} }
//- Writes edges.
void Foam::faceCoupleInfo::writeOBJ void Foam::faceCoupleInfo::writeOBJ
( (
const fileName& fName, const fileName& fName,
@ -122,7 +119,6 @@ void Foam::faceCoupleInfo::writeOBJ
} }
//- Writes face and point connectivity as .obj files.
void Foam::faceCoupleInfo::writePointsFaces() const void Foam::faceCoupleInfo::writePointsFaces() const
{ {
const indirectPrimitivePatch& m = masterPatch(); const indirectPrimitivePatch& m = masterPatch();
@ -303,8 +299,6 @@ void Foam::faceCoupleInfo::writeEdges
} }
// Given an edgelist and a map for the points on the edges it tries to find
// the corresponding patch edges.
Foam::labelList Foam::faceCoupleInfo::findMappedEdges Foam::labelList Foam::faceCoupleInfo::findMappedEdges
( (
const edgeList& edges, const edgeList& edges,
@ -334,8 +328,6 @@ Foam::labelList Foam::faceCoupleInfo::findMappedEdges
} }
// Detect a cut edge which originates from two boundary faces having different
// polyPatches.
bool Foam::faceCoupleInfo::regionEdge bool Foam::faceCoupleInfo::regionEdge
( (
const polyMesh& slaveMesh, const polyMesh& slaveMesh,
@ -377,9 +369,6 @@ bool Foam::faceCoupleInfo::regionEdge
} }
// Find edge using pointI that is most aligned with vector between
// master points. Patchdivision tells us whether or not to use
// patch information to match edges.
Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
( (
const bool report, const bool report,
@ -392,6 +381,10 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
const label edgeEnd const label edgeEnd
) const ) const
{ {
// Find edge using pointI that is most aligned with vector between master
// points. Patchdivision tells us whether or not to use patch information to
// match edges.
const pointField& localPoints = cutFaces().localPoints(); const pointField& localPoints = cutFaces().localPoints();
const labelList& pEdges = cutFaces().pointEdges()[pointI]; const labelList& pEdges = cutFaces().pointEdges()[pointI];
@ -499,7 +492,6 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
} }
// Construct points to split points map (in cut addressing)
void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges) void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
{ {
labelListList masterToCutEdges labelListList masterToCutEdges
@ -632,8 +624,6 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
} }
// Determines rotation for f1 to match up with f0, i.e. the index in f0 of
// the first point of f1.
Foam::label Foam::faceCoupleInfo::matchFaces Foam::label Foam::faceCoupleInfo::matchFaces
( (
const scalar absTol, const scalar absTol,
@ -713,11 +703,6 @@ Foam::label Foam::faceCoupleInfo::matchFaces
} }
// Find correspondence from patch points to cut points. This might
// detect shared points so the output is a patch-to-cut point list
// and a compaction list for the cut points (which will always be equal or more
// connected than the patch).
// Returns true if there are any duplicates.
bool Foam::faceCoupleInfo::matchPointsThroughFaces bool Foam::faceCoupleInfo::matchPointsThroughFaces
( (
const scalar absTol, const scalar absTol,
@ -732,6 +717,10 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
labelList& compactToCut // inverse ,, labelList& compactToCut // inverse ,,
) )
{ {
// Find correspondence from patch points to cut points. This might detect
// shared points so the output is a patch-to-cut point list and a compaction
// list for the cut points (which will always be equal or more connected
// than the patch). Returns true if there are any duplicates.
// From slave to cut point // From slave to cut point
patchToCutPoints.setSize(patchPoints.size()); patchToCutPoints.setSize(patchPoints.size());
@ -865,7 +854,6 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
} }
// Return max distance from any point on cutF to masterF
Foam::scalar Foam::faceCoupleInfo::maxDistance Foam::scalar Foam::faceCoupleInfo::maxDistance
( (
const face& cutF, const face& cutF,
@ -943,8 +931,7 @@ void Foam::faceCoupleInfo::findPerfectMatchingFaces
if (matchedAllFaces) if (matchedAllFaces)
{ {
Warning WarningInFunction
<< "faceCoupleInfo::faceCoupleInfo : "
<< "Matched ALL " << fc1.size() << "Matched ALL " << fc1.size()
<< " boundary faces of mesh0 to boundary faces of mesh1." << endl << " boundary faces of mesh0 to boundary faces of mesh1." << endl
<< "This is only valid if the mesh to add is fully" << "This is only valid if the mesh to add is fully"
@ -1073,7 +1060,6 @@ void Foam::faceCoupleInfo::findSlavesCoveringMaster
} }
// Grow cutToMasterFace across 'internal' edges.
Foam::label Foam::faceCoupleInfo::growCutFaces Foam::label Foam::faceCoupleInfo::growCutFaces
( (
const labelList& cutToMasterEdges, const labelList& cutToMasterEdges,
@ -1243,15 +1229,16 @@ void Foam::faceCoupleInfo::checkMatch(const labelList& cutToMasterEdges) const
} }
// Extends matching information by elimination across cutFaces using more
// than one region edge. Updates cutToMasterFaces_ and sets candidates
// which is for every cutface on a region edge the possible master faces.
Foam::label Foam::faceCoupleInfo::matchEdgeFaces Foam::label Foam::faceCoupleInfo::matchEdgeFaces
( (
const labelList& cutToMasterEdges, const labelList& cutToMasterEdges,
Map<labelList>& candidates Map<labelList>& candidates
) )
{ {
// Extends matching information by elimination across cutFaces using more
// than one region edge. Updates cutToMasterFaces_ and sets candidates which
// is for every cutface on a region edge the possible master faces.
// For every unassigned cutFaceI the possible list of master faces. // For every unassigned cutFaceI the possible list of master faces.
candidates.clear(); candidates.clear();
candidates.resize(cutFaces().size()); candidates.resize(cutFaces().size());
@ -1348,9 +1335,6 @@ Foam::label Foam::faceCoupleInfo::matchEdgeFaces
} }
// Gets a list of cutFaces (that use a master edge) and the candidate
// master faces.
// Finds most aligned master face.
Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces
( (
Map<labelList>& candidates Map<labelList>& candidates
@ -1438,14 +1422,15 @@ Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces
} }
// Calculate the set of cut faces inbetween master and slave patch
// assuming perfect match (and optional face ordering on slave)
void Foam::faceCoupleInfo::perfectPointMatch void Foam::faceCoupleInfo::perfectPointMatch
( (
const scalar absTol, const scalar absTol,
const bool slaveFacesOrdered const bool slaveFacesOrdered
) )
{ {
// Calculate the set of cut faces inbetween master and slave patch assuming
// perfect match (and optional face ordering on slave)
if (debug) if (debug)
{ {
Pout<< "perfectPointMatch :" Pout<< "perfectPointMatch :"
@ -1568,8 +1553,6 @@ void Foam::faceCoupleInfo::perfectPointMatch
} }
// Calculate the set of cut faces inbetween master and slave patch
// assuming that slave patch is subdivision of masterPatch.
void Foam::faceCoupleInfo::subDivisionMatch void Foam::faceCoupleInfo::subDivisionMatch
( (
const polyMesh& slaveMesh, const polyMesh& slaveMesh,
@ -1881,7 +1864,6 @@ void Foam::faceCoupleInfo::subDivisionMatch
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from mesh data
Foam::faceCoupleInfo::faceCoupleInfo Foam::faceCoupleInfo::faceCoupleInfo
( (
const polyMesh& masterMesh, const polyMesh& masterMesh,
@ -1970,8 +1952,6 @@ Foam::faceCoupleInfo::faceCoupleInfo
} }
// Slave is subdivision of master patch.
// (so -both cover the same area -all of master points are present in slave)
Foam::faceCoupleInfo::faceCoupleInfo Foam::faceCoupleInfo::faceCoupleInfo
( (
const polyMesh& masterMesh, const polyMesh& masterMesh,

6
src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
View File

@ -278,9 +278,9 @@ class faceCoupleInfo
// Face matching // Face matching
//- Matches two faces.Determines rotation for f1 to match up //- Matches two faces.
// with f0, i.e. the index in f0 of // Determines rotation for f1 to match up with f0,
// the first point of f1. // i.e. the index in f0 of the first point of f1.
static label matchFaces static label matchFaces
( (
const scalar absTol, const scalar absTol,

5
src/sampling/probes/patchProbes.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -26,7 +26,6 @@ License
#include "patchProbes.H" #include "patchProbes.H"
#include "volFields.H" #include "volFields.H"
#include "IOmanip.H" #include "IOmanip.H"
// For 'nearInfo' helper class only
#include "mappedPatchBase.H" #include "mappedPatchBase.H"
#include "treeBoundBox.H" #include "treeBoundBox.H"
#include "treeDataFace.H" #include "treeDataFace.H"
@ -152,7 +151,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
if (debug) if (debug)
{ {
Info<< "patchProbes::findElements" << " : " << endl; InfoInFunction << endl;
forAll(nearest, sampleI) forAll(nearest, sampleI)
{ {
label procI = nearest[sampleI].second().second(); label procI = nearest[sampleI].second().second();

28
src/sampling/sampledSet/sampledSet/sampledSet.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,7 +119,7 @@ Foam::scalar Foam::sampledSet::calcSign
if (magVec < VSMALL) if (magVec < VSMALL)
{ {
// sample on face centre. Regard as inside // Sample on face centre. Regard as inside
return -1; return -1;
} }
@ -133,7 +133,6 @@ Foam::scalar Foam::sampledSet::calcSign
} }
// Return face (or -1) of face which is within smallDist of sample
Foam::label Foam::sampledSet::findNearFace Foam::label Foam::sampledSet::findNearFace
( (
const label cellI, const label cellI,
@ -169,8 +168,6 @@ Foam::label Foam::sampledSet::findNearFace
} }
// 'Pushes' point facePt (which is almost on face) in direction of cell centre
// so it is clearly inside.
Foam::point Foam::sampledSet::pushIn Foam::point Foam::sampledSet::pushIn
( (
const point& facePt, const point& facePt,
@ -224,16 +221,10 @@ Foam::point Foam::sampledSet::pushIn
<< abort(FatalError); << abort(FatalError);
} }
//Info<< "pushIn : moved " << facePt << " to " << newPosition
// << endl;
return newPosition; return newPosition;
} }
// Calculates start of tracking given samplePt and first boundary intersection
// (bPoint, bFaceI). bFaceI == -1 if no boundary intersection.
// Returns true if trackPt is sampling point
bool Foam::sampledSet::getTrackingPoint bool Foam::sampledSet::getTrackingPoint
( (
const vector& offset, const vector& offset,
@ -268,9 +259,6 @@ bool Foam::sampledSet::getTrackingPoint
{ {
// Line samplePt - end_ does not intersect domain at all. // Line samplePt - end_ does not intersect domain at all.
// (or is along edge) // (or is along edge)
//Info<< "getTrackingPoint : samplePt outside domain : "
// << " samplePt:" << samplePt
// << endl;
trackCellI = -1; trackCellI = -1;
trackFaceI = -1; trackFaceI = -1;
@ -279,11 +267,7 @@ bool Foam::sampledSet::getTrackingPoint
} }
else else
{ {
// start is inside. Use it as tracking point // Start is inside. Use it as tracking point
//Info<< "getTrackingPoint : samplePt inside :"
// << " samplePt:" << samplePt
// << " trackCellI:" << trackCellI
// << endl;
trackPt = samplePt; trackPt = samplePt;
trackFaceI = -1; trackFaceI = -1;
@ -293,10 +277,6 @@ bool Foam::sampledSet::getTrackingPoint
} }
else if (mag(samplePt - bPoint) < smallDist) else if (mag(samplePt - bPoint) < smallDist)
{ {
//Info<< "getTrackingPoint : samplePt:" << samplePt
// << " close to bPoint:"
// << bPoint << endl;
// samplePt close to bPoint. Snap to it // samplePt close to bPoint. Snap to it
trackPt = pushIn(bPoint, bFaceI); trackPt = pushIn(bPoint, bFaceI);
trackFaceI = bFaceI; trackFaceI = bFaceI;
@ -330,7 +310,7 @@ bool Foam::sampledSet::getTrackingPoint
if (debug) if (debug)
{ {
Info<< "sampledSet::getTrackingPoint :" InfoInFunction
<< " offset:" << offset << " offset:" << offset
<< " samplePt:" << samplePt << " samplePt:" << samplePt
<< " bPoint:" << bPoint << " bPoint:" << bPoint

5
src/surfMesh/MeshedSurface/MeshedSurface.C
View File

@ -119,10 +119,7 @@ void Foam::MeshedSurface<Face>::write
{ {
if (debug) if (debug)
{ {
Info<< "MeshedSurface::write" InfoInFunction << "Writing to " << name << endl;
"(const fileName&, const MeshedSurface&) : "
"writing to " << name
<< endl;
} }
const word ext = name.ext(); const word ext = name.ext();

6
src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
View File

@ -28,16 +28,13 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face> template<class Face>
Foam::autoPtr<Foam::MeshedSurface<Face>> Foam::autoPtr<Foam::MeshedSurface<Face>>
Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext) Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
{ {
if (debug) if (debug)
{ {
Info<< "MeshedSurface::New(const fileName&, const word&) : " InfoInFunction << "Constructing MeshedSurface" << endl;
"constructing MeshedSurface"
<< endl;
} }
typename fileExtensionConstructorTable::iterator cstrIter = typename fileExtensionConstructorTable::iterator cstrIter =
@ -82,4 +79,5 @@ Foam::MeshedSurface<Face>::New(const fileName& name)
return New(name, ext); return New(name, ext);
} }
// ************************************************************************* // // ************************************************************************* //

4
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
View File

@ -33,9 +33,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
{ {
if (debug) if (debug)
{ {
Info<< "UnsortedMeshedSurface::New(const fileName&, const word&) : " InfoInFunction << "Constructing UnsortedMeshedSurface" << endl;
"constructing UnsortedMeshedSurface"
<< endl;
} }
typename fileExtensionConstructorTable::iterator cstrIter = typename fileExtensionConstructorTable::iterator cstrIter =

14
src/surfMesh/surfMesh/surfMeshClear.C
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) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,9 +33,7 @@ void Foam::surfMesh::removeZones()
{ {
if (debug) if (debug)
{ {
Info<< "void surfMesh::removeZones(): " InfoInFunction << "Removing surface zones." << endl;
<< "Removing surface zones."
<< endl;
} }
// Remove the surface zones // Remove the surface zones
@ -51,9 +49,7 @@ void Foam::surfMesh::clearGeom()
{ {
if (debug) if (debug)
{ {
Info<< "void surfMesh::clearGeom() : " InfoInFunction << "Clearing geometric data" << endl;
<< "clearing geometric data"
<< endl;
} }
MeshReference::clearGeom(); MeshReference::clearGeom();
@ -64,9 +60,7 @@ void Foam::surfMesh::clearAddressing()
{ {
if (debug) if (debug)
{ {
Info<< "void surfMesh::clearAddressing() : " InfoInFunction << "clearing topology" << endl;
<< "clearing topology"
<< endl;
} }
MeshReference::clearPatchMeshAddr(); MeshReference::clearPatchMeshAddr();

8
src/surfMesh/surfMesh/surfMeshIO.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,8 +32,7 @@ void Foam::surfMesh::setInstance(const fileName& inst)
{ {
if (debug) if (debug)
{ {
Info<< "void surfMesh::setInstance(const fileName& inst) : " InfoInFunction << "Resetting file instance to " << inst << endl;
<< "Resetting file instance to " << inst << endl;
} }
instance() = inst; instance() = inst;
@ -53,8 +52,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
{ {
if (debug) if (debug)
{ {
Info<< "surfMesh::readUpdateState surfMesh::readUpdate() : " InfoInFunction << "Updating mesh based on saved data." << endl;
<< "Updating mesh based on saved data." << endl;
} }
// Find point and face instances // Find point and face instances

8
src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -122,8 +122,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
{ {
if (debug) if (debug)
{ {
Info<< "liquidProperties::New(Istream&): " InfoInFunction << "Constructing liquidProperties" << endl;
<< "constructing liquidProperties" << endl;
} }
const word liquidPropertiesType(is); const word liquidPropertiesType(is);
@ -170,8 +169,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
{ {
if (debug) if (debug)
{ {
Info<< "liquidProperties::New(const dictionary&):" InfoInFunction << "Constructing liquidProperties" << endl;
<< "constructing liquidProperties" << endl;
} }
const word& liquidPropertiesTypeName = dict.dictName(); const word& liquidPropertiesTypeName = dict.dictName();

10
src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,8 +32,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
{ {
if (debug) if (debug)
{ {
Info<< "solidProperties::New(Istream&): constructing solid" InfoInFunction << "Constructing solid" << endl;
<< endl;
} }
const word solidType(is); const word solidType(is);
@ -79,8 +78,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
{ {
if (debug) if (debug)
{ {
Info<< "solidProperties::New(const dictionary&): constructing solid" InfoInFunction << "Constructing solid" << endl;
<< endl;
} }
const word solidType(dict.dictName()); const word solidType(dict.dictName());
@ -115,4 +113,4 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // ************************************************************************* //

12
src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "error.H"
#include "thermophysicalFunction.H" #include "thermophysicalFunction.H"
#include "HashTable.H" #include "HashTable.H"
@ -47,8 +45,8 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
{ {
if (debug) if (debug)
{ {
Info<< "thermophysicalFunction::New(Istream&) : " InfoInFunction
<< "constructing thermophysicalFunction" << "Constructing thermophysicalFunction"
<< endl; << endl;
} }
@ -79,8 +77,8 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
{ {
if (debug) if (debug)
{ {
Info<< "thermophysicalFunction::New(const dictionary&) : " InfoInFunction
<< "constructing thermophysicalFunction" << "Constructing thermophysicalFunction"
<< endl; << endl;
} }

4
src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -54,7 +54,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
|| topoChanger_.size() || topoChanger_.size()
) )
{ {
Info<< "void linearValveFvMesh::addZonesAndModifiers() : " InfoInFunction
<< "Zones and modifiers already present. Skipping." << "Zones and modifiers already present. Skipping."
<< endl; << endl;

11
src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,7 +60,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
|| topoChanger_.size() || topoChanger_.size()
) )
{ {
Info<< "void linearValveLayersFvMesh::addZonesAndModifiers() : " InfoInFunction
<< "Zones and modifiers already present. Skipping." << "Zones and modifiers already present. Skipping."
<< endl; << endl;
@ -417,13 +417,12 @@ void Foam::linearValveLayersFvMesh::update()
setMorphTimeIndex(3*time().timeIndex() + 2); setMorphTimeIndex(3*time().timeIndex() + 2);
updateMesh(); updateMesh();
Info<< "Moving points post slider attach" << endl; //Info<< "Moving points post slider attach" << endl;
// const pointField p = allPoints(); //const pointField p = allPoints();
// movePoints(p); //movePoints(p);
Info<< "Sliding interfaces coupled: " << attached() << endl; Info<< "Sliding interfaces coupled: " << attached() << endl;
} }
// ************************************************************************* // // ************************************************************************* //

8
src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
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) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -54,7 +54,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
|| topoChanger_.size() || topoChanger_.size()
) )
{ {
Info<< "void mixerFvMesh::addZonesAndModifiers() : " InfoInFunction
<< "Zones and modifiers already present. Skipping." << "Zones and modifiers already present. Skipping."
<< endl; << endl;
@ -196,7 +196,7 @@ void Foam::mixerFvMesh::calcMovingMasks() const
{ {
if (debug) if (debug)
{ {
Info<< "void mixerFvMesh::calcMovingMasks() const : " InfoInFunction
<< "Calculating point and cell masks" << "Calculating point and cell masks"
<< endl; << endl;
} }
@ -356,7 +356,7 @@ bool Foam::mixerFvMesh::update()
{ {
if (debug) if (debug)
{ {
Info<< "Mesh topology is changing" << endl; InfoInFunction << "Mesh topology is changing" << endl;
} }
deleteDemandDrivenData(movingPointsMaskPtr_); deleteDemandDrivenData(movingPointsMaskPtr_);

46
src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
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) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -93,7 +93,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
|| topoChanger_.size() || topoChanger_.size()
) )
{ {
Info<< "void movingConeTopoFvMesh::addZonesAndModifiers() : " InfoInFunction
<< "Zones and modifiers already present. Skipping." << "Zones and modifiers already present. Skipping."
<< endl; << endl;
@ -337,48 +337,6 @@ bool Foam::movingConeTopoFvMesh::update()
if (topoChangeMap().hasMotionPoints()) if (topoChangeMap().hasMotionPoints())
{ {
Info<< "Topology change. Has premotion points" << endl; Info<< "Topology change. Has premotion points" << endl;
//Info<< "preMotionPoints:" << topoChangeMap().preMotionPoints()
// << endl;
//mkDir(time().timePath());
//{
// OFstream str(time().timePath()/"meshPoints.obj");
// Pout<< "Writing mesh with meshPoints to " << str.name()
// << endl;
//
// const pointField& currentPoints = points();
// label vertI = 0;
// forAll(currentPoints, pointI)
// {
// meshTools::writeOBJ(str, currentPoints[pointI]);
// vertI++;
// }
// forAll(edges(), edgeI)
// {
// const edge& e = edges()[edgeI];
// str << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
// }
//}
//{
// OFstream str(time().timePath()/"preMotionPoints.obj");
// Pout<< "Writing mesh with preMotionPoints to " << str.name()
// << endl;
//
// const pointField& newPoints =
// topoChangeMap().preMotionPoints();
// label vertI = 0;
// forAll(newPoints, pointI)
// {
// meshTools::writeOBJ(str, newPoints[pointI]);
// vertI++;
// }
// forAll(edges(), edgeI)
// {
// const edge& e = edges()[edgeI];
// str << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
// }
//}
motionMask_ = motionMask_ =
vertexMarkup vertexMarkup