diff --git a/applications/solvers/electromagnetics/magneticFoam/magnet.H b/applications/solvers/electromagnetics/magneticFoam/magnet.H index 7e9b04a4c5..8f15c69635 100644 --- a/applications/solvers/electromagnetics/magneticFoam/magnet.H +++ b/applications/solvers/electromagnetics/magneticFoam/magnet.H @@ -138,9 +138,7 @@ public: >> m.orientation_; is.readEnd("magnet"); - // Check state of Istream - is.check("operator>>(Istream&, magnet&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/etc/codeTemplates/source/_TemplateIO.C b/etc/codeTemplates/source/_TemplateIO.C index f1e498671e..4097eaa24f 100644 --- a/etc/codeTemplates/source/_TemplateIO.C +++ b/etc/codeTemplates/source/_TemplateIO.C @@ -35,8 +35,7 @@ Foam::CLASSNAME::CLASSNAME(Istream& is) member1(is), member2(is) { - // Check state of Istream - is.check("Foam::CLASSNAME::CLASSNAME(Foam::Istream&)"); + is.check(FUNCTION_NAME); } @@ -44,25 +43,14 @@ Foam::CLASSNAME::CLASSNAME(Istream& is) Foam::Istream& Foam::operator>>(Istream& is, CLASSNAME&) { - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::CLASSNAME&)" - ); - + is.check(FUNCTION_NAME); return is; } Foam::Ostream& Foam::operator<<(Ostream& os, const CLASSNAME&) { - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::CLASSNAME&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/etc/codeTemplates/template/_TemplateTemplateIO.C b/etc/codeTemplates/template/_TemplateTemplateIO.C index 05921c9645..f17a357c97 100644 --- a/etc/codeTemplates/template/_TemplateTemplateIO.C +++ b/etc/codeTemplates/template/_TemplateTemplateIO.C @@ -36,8 +36,7 @@ Foam::CLASSNAME::CLASSNAME(Istream& is) member1(is), member2(is) { - // Check state of Istream - is.check("Foam::CLASSNAME::CLASSNAME(Foam::Istream&)"); + is.check(FUNCTION_NAME); } @@ -50,13 +49,7 @@ Foam::Istream& Foam::operator>> CLASSNAME& ) { - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::CLASSNAME&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -68,13 +61,7 @@ Foam::Ostream& Foam::operator<< const CLASSNAME& ) { - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Ostream&, const CLASSNAME&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OSspecific/POSIX/fileStat.C b/src/OSspecific/POSIX/fileStat.C index f40192f03b..afb955bfe2 100644 --- a/src/OSspecific/POSIX/fileStat.C +++ b/src/OSspecific/POSIX/fileStat.C @@ -123,9 +123,7 @@ Foam::Istream& Foam::operator>>(Istream& is, fileStat& fStat) fStat.status_.st_mtime = stat[11]; fStat.status_.st_ctime = stat[12]; - // Check state of Istream - is.check("Istream& operator>>(Istream&, fileStat&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OSspecific/POSIX/memInfo/memInfo.C b/src/OSspecific/POSIX/memInfo/memInfo.C index 43037b5c79..c0ff2dd99b 100644 --- a/src/OSspecific/POSIX/memInfo/memInfo.C +++ b/src/OSspecific/POSIX/memInfo/memInfo.C @@ -118,12 +118,7 @@ Foam::Istream& Foam::operator>>(Istream& is, memInfo& m) is.readEnd("memInfo"); - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::memInfo&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -136,12 +131,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const memInfo& m) << m.rss_ << token::END_LIST; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, const Foam::memInfo&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/algorithms/indexedOctree/volumeType.C b/src/OpenFOAM/algorithms/indexedOctree/volumeType.C index 95868f6c0c..1bb1356b96 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/volumeType.C +++ b/src/OpenFOAM/algorithms/indexedOctree/volumeType.C @@ -61,9 +61,7 @@ Foam::Istream& Foam::operator>>(Istream& is, volumeType& vt) // Read end of volumeType is.readEnd("volumeType"); - // Check state of Istream - is.check("operator>>(Istream&, volumeType&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C index 0eb3fadb45..54cd7ed922 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C @@ -129,9 +129,7 @@ Foam::Ostream& Foam::HashTable::writeKeys os << token::END_LIST << nl; // End delimiter } - // Check state of IOstream os.check(FUNCTION_NAME); - return os; } @@ -145,12 +143,12 @@ Foam::Istream& Foam::operator>> HashTable& L ) { - is.fatalCheck("operator>>(Istream&, HashTable&)"); + is.fatalCheck(FUNCTION_NAME); // Anull list L.clear(); - is.fatalCheck("operator>>(Istream&, HashTable&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); @@ -251,7 +249,7 @@ Foam::Istream& Foam::operator>> << exit(FatalIOError); } - is.fatalCheck("operator>>(Istream&, HashTable&)"); + is.fatalCheck(FUNCTION_NAME); return is; } @@ -278,9 +276,7 @@ Foam::Ostream& Foam::operator<< // Write end delimiter os << token::END_LIST; - // Check state of IOstream os.check(FUNCTION_NAME); - return os; } diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C index 7e4b383261..c7e0672453 100644 --- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C +++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C @@ -94,12 +94,12 @@ Foam::StaticHashTable::printInfo(Ostream& os) const template Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable& L) { - is.fatalCheck("operator>>(Istream&, StaticHashTable&)"); + is.fatalCheck(FUNCTION_NAME); // Anull list L.clear(); - is.fatalCheck("operator>>(Istream&, StaticHashTable&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); @@ -200,7 +200,7 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable& L) << exit(FatalIOError); } - is.fatalCheck("operator>>(Istream&, StaticHashTable&)"); + is.fatalCheck(FUNCTION_NAME); return is; } @@ -229,9 +229,7 @@ Foam::Ostream& Foam::operator<< // Write end delimiter os << token::END_LIST; - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const StaticHashTable&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H index d07aeb0f6a..59f4940687 100644 --- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H +++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H @@ -125,9 +125,7 @@ inline Foam::Istream& Foam::operator>>(Istream& is, Keyed& item) // Read end of Keyed item/key pair is.readEnd("Keyed"); - // Check state of Ostream - is.check("Istream& operator>>(Istream&, Keyed&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C index 5b398198e5..961569aea7 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C @@ -33,7 +33,7 @@ template template void Foam::ILList::read(Istream& is, const INew& iNew) { - is.fatalCheck("operator>>(Istream&, ILList&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); @@ -97,7 +97,7 @@ void Foam::ILList::read(Istream& is, const INew& iNew) } token lastToken(is); - is.fatalCheck("operator>>(Istream&, ILList&)"); + is.fatalCheck(FUNCTION_NAME); while ( @@ -111,7 +111,7 @@ void Foam::ILList::read(Istream& is, const INew& iNew) this->append(iNew(is).ptr()); is >> lastToken; - is.fatalCheck("operator>>(Istream&, ILList&)"); + is.fatalCheck(FUNCTION_NAME); } } else @@ -122,7 +122,7 @@ void Foam::ILList::read(Istream& is, const INew& iNew) << exit(FatalIOError); } - is.fatalCheck("operator>>(Istream&, ILList&)"); + is.fatalCheck(FUNCTION_NAME); } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C index 0289014528..11ce9dd852 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C @@ -44,7 +44,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList& L) // Anull list L.clear(); - is.fatalCheck(" operator>>(Istream&, LList&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); @@ -98,7 +98,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList& L) } token lastToken(is); - is.fatalCheck(" operator>>(Istream&, LList&)"); + is.fatalCheck(FUNCTION_NAME); while ( @@ -114,7 +114,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList& L) L.append(element); is >> lastToken; - is.fatalCheck(" operator>>(Istream&, LList&)"); + is.fatalCheck(FUNCTION_NAME); } } else @@ -126,7 +126,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList& L) } // Check state of IOstream - is.fatalCheck(" operator>>(Istream&, LList&)"); + is.fatalCheck(FUNCTION_NAME); return is; } @@ -152,9 +152,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const LList& lst) // Write end of contents os << token::END_LIST; - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const LList&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C index e23b2ddae1..1db2a59a50 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C @@ -34,10 +34,7 @@ template template void Foam::LPtrList::read(Istream& is, const INew& iNew) { - is.fatalCheck - ( - "LPtrList::read(Istream&, const INew&)" - ); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); @@ -102,7 +99,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) } token lastToken(is); - is.fatalCheck("LPtrList::read(Istream&, const INew&)"); + is.fatalCheck(FUNCTION_NAME); while ( @@ -116,10 +113,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) this->append(iNew(is).ptr()); is >> lastToken; - is.fatalCheck - ( - "LPtrList::read(Istream&, const INew&)" - ); + is.fatalCheck(FUNCTION_NAME); } } else @@ -132,7 +126,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) << exit(FatalIOError); } - is.fatalCheck("LPtrList::read(Istream&, const INew&)"); + is.fatalCheck(FUNCTION_NAME); } @@ -190,9 +184,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const LPtrList& lst) // Write end of contents os << token::END_LIST; - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const LPtrList&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILListIO.C index 137affd92b..3f34eb8311 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILListIO.C @@ -52,9 +52,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const UILList& lst) // Write end of contents os << token::END_LIST; - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const UILList&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C index e6d4524995..a6f960db6e 100644 --- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C +++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C @@ -591,9 +591,7 @@ Foam::Istream& Foam::operator>> >> d.binWidth_ >> d.listStarts_; - // Check state of Istream - is.check("Istream& operator>>(Istream&, Distribution&)"); - + is.check(FUNCTION_NAME); return is; } @@ -609,9 +607,7 @@ Foam::Ostream& Foam::operator<< << d.binWidth_ << token::SPACE << d.listStarts_; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, " "const Distribution&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C index 895e373488..6d1d65b20e 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C @@ -139,9 +139,7 @@ Foam::Ostream& Foam::FixedList::writeList os.write(reinterpret_cast(L.cdata()), Size*sizeof(T)); } - // Check state of IOstream - os.check("const FixedList::writeList(Ostream&)"); - + os.check(FUNCTION_NAME); return os; } @@ -158,7 +156,7 @@ Foam::FixedList::FixedList(Istream& is) template Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList& L) { - is.fatalCheck("operator>>(Istream&, FixedList&)"); + is.fatalCheck(FUNCTION_NAME); if (is.format() == IOstream::ASCII || !contiguous()) { diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C index 46183bb45b..b21b6a8664 100644 --- a/src/OpenFOAM/containers/Lists/List/ListIO.C +++ b/src/OpenFOAM/containers/Lists/List/ListIO.C @@ -46,11 +46,11 @@ Foam::Istream& Foam::operator>>(Istream& is, List& L) // Anull list L.setSize(0); - is.fatalCheck("operator>>(Istream&, List&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); - is.fatalCheck("operator>>(Istream&, List&) : reading first token"); + is.fatalCheck(FUNCTION_NAME); if (firstToken.isCompound()) { diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C index 53889b02ad..b862792b12 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C @@ -266,7 +266,7 @@ Foam::Istream& Foam::PackedList::read(Istream& is) PackedList& lst = *this; lst.clear(); - is.fatalCheck("PackedList::read(Istream&)"); + is.fatalCheck(FUNCTION_NAME); token firstTok(is); is.fatalCheck @@ -349,7 +349,7 @@ Foam::Istream& Foam::PackedList::read(Istream& is) if (firstTok.pToken() == token::BEGIN_LIST) { token nextTok(is); - is.fatalCheck("PackedList::read(Istream&)"); + is.fatalCheck(FUNCTION_NAME); while ( @@ -362,13 +362,13 @@ Foam::Istream& Foam::PackedList::read(Istream& is) lst.append(lst.readValue(is)); is >> nextTok; - is.fatalCheck("PackedList::read(Istream&)"); + is.fatalCheck(FUNCTION_NAME); } } else if (firstTok.pToken() == token::BEGIN_BLOCK) { token nextTok(is); - is.fatalCheck("PackedList::read(Istream&)"); + is.fatalCheck(FUNCTION_NAME); while ( @@ -381,7 +381,7 @@ Foam::Istream& Foam::PackedList::read(Istream& is) lst.setPair(is); is >> nextTok; - is.fatalCheck("PackedList::read(Istream&)"); + is.fatalCheck(FUNCTION_NAME); } } else diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H index 2397a45768..7849d5a792 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H @@ -137,8 +137,7 @@ inline void Foam::PackedList::setPair(Istream& is) set(ind, val); - // Check state of Istream - is.check("PackedList::setPair(Istream&)"); + is.check(FUNCTION_NAME); } diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C index a9ce86e43c..6aff9ed81e 100644 --- a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C +++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C @@ -35,7 +35,7 @@ template template void Foam::PtrList::read(Istream& is, const INew& inewt) { - is.fatalCheck("PtrList::read(Istream&, const INew&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C index f6a82069c2..5e711c0724 100644 --- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C +++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C @@ -120,9 +120,7 @@ Foam::Ostream& Foam::UIndirectList::writeList } } - // Check state of IOstream - os.check("UIndirectList::writeList(Ostream&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C index cd6d8cd6bf..efb2ad3ffc 100644 --- a/src/OpenFOAM/containers/Lists/UList/UListIO.C +++ b/src/OpenFOAM/containers/Lists/UList/UListIO.C @@ -150,9 +150,7 @@ Foam::Ostream& Foam::UList::writeList } } - // Check state of IOstream - os.check("UList::writeList(Ostream&)"); - + os.check(FUNCTION_NAME); return os; } @@ -169,7 +167,7 @@ Foam::Ostream& Foam::operator<<(Foam::Ostream& os, const Foam::UList& L) template Foam::Istream& Foam::operator>>(Istream& is, UList& L) { - is.fatalCheck("operator>>(Istream&, UList&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListIO.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListIO.C index 5965767613..2852654dda 100644 --- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListIO.C +++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListIO.C @@ -44,9 +44,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const UPtrList& L) // Write end delimiter os << nl << decrIndent << indent << token::END_LIST << nl; - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const UPtrList&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C index 10d8dd993e..3bce29637a 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C @@ -117,11 +117,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const UPstream::commsStruct& comm) << comm.allBelow_ << token::SPACE << comm.allNotBelow_; - os.check - ( - "Ostream& operator<<(Ostream&, const commsStruct&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/db/IOstreams/token/tokenIO.C b/src/OpenFOAM/db/IOstreams/token/tokenIO.C index 2a2a8a7006..c350474080 100644 --- a/src/OpenFOAM/db/IOstreams/token/tokenIO.C +++ b/src/OpenFOAM/db/IOstreams/token/tokenIO.C @@ -105,9 +105,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token& t) << endl; } - // Check state of stream - os.check("Ostream& operator<<(Ostream&, const token&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C index 0b2c5315ec..5a4feda30e 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C @@ -38,11 +38,7 @@ Foam::dictionaryEntry::dictionaryEntry entry(keyType(is)), dictionary(parentDict, is) { - is.fatalCheck - ( - "dictionaryEntry::dictionaryEntry" - "(const dictionary& parentDict, Istream&)" - ); + is.fatalCheck(FUNCTION_NAME); } @@ -56,11 +52,7 @@ Foam::dictionaryEntry::dictionaryEntry entry(key), dictionary(key, parentDict, is) { - is.fatalCheck - ( - "dictionaryEntry::dictionaryEntry" - "(const keyType&, const dictionary& parentDict, Istream&)" - ); + is.fatalCheck(FUNCTION_NAME); } diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C index 7d31932e9a..5043a206c2 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C @@ -115,8 +115,7 @@ void Foam::dictionaryListEntry::write(Ostream& os) const // Write end delimiter os << decrIndent << indent << token::END_LIST << nl; - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const dictionaryListEntry&)"); + os.check(FUNCTION_NAME); } diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C index f91ee70bf6..d72a67791f 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C @@ -84,11 +84,7 @@ bool Foam::functionEntry::execute Istream& is ) { - is.fatalCheck - ( - "functionEntry::execute" - "(const word& functionName, dictionary& parentDict, Istream&)" - ); + is.fatalCheck(FUNCTION_NAME); if (!executedictionaryIstreamMemberFunctionTablePtr_) { @@ -127,11 +123,7 @@ bool Foam::functionEntry::execute Istream& is ) { - is.fatalCheck - ( - "functionEntry::execute" - "(const word&, const dictionary&, primitiveEntry&, Istream&)" - ); + is.fatalCheck(FUNCTION_NAME); if (!executeprimitiveEntryIstreamMemberFunctionTablePtr_) { diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C index 1c447e88ab..39580f5a4f 100644 --- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C +++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C @@ -91,10 +91,7 @@ bool Foam::primitiveEntry::expandFunction bool Foam::primitiveEntry::read(const dictionary& dict, Istream& is) { - is.fatalCheck - ( - "primitiveEntry::readData(const dictionary&, Istream&)" - ); + is.fatalCheck(FUNCTION_NAME); label blockCount = 0; token currToken; @@ -145,10 +142,7 @@ bool Foam::primitiveEntry::read(const dictionary& dict, Istream& is) } } - is.fatalCheck - ( - "primitiveEntry::readData(const dictionary&, Istream&)" - ); + is.fatalCheck(FUNCTION_NAME); if (currToken.good()) { diff --git a/src/OpenFOAM/dimensionSet/dimensionSetIO.C b/src/OpenFOAM/dimensionSet/dimensionSetIO.C index 7f7648e10d..768acc8efc 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSetIO.C +++ b/src/OpenFOAM/dimensionSet/dimensionSetIO.C @@ -477,9 +477,8 @@ Foam::Istream& Foam::dimensionSet::read << exit(FatalIOError); } } - // Check state of Istream - is.check("Istream& operator>>(Istream&, dimensionSet&)"); + is.check(FUNCTION_NAME); return is; } @@ -617,9 +616,7 @@ Foam::Istream& Foam::dimensionSet::read } } - // Check state of Istream - is.check("Istream& operator>>(Istream&, dimensionSet&)"); - + is.check(FUNCTION_NAME); return is; } @@ -691,9 +688,7 @@ Foam::Ostream& Foam::dimensionSet::write os << token::END_SQR; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const dimensionSet&)"); - + os.check(FUNCTION_NAME); return os; } @@ -722,9 +717,7 @@ Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset) << exit(FatalIOError); } - // Check state of Istream - is.check("Istream& operator>>(Istream&, dimensionSet&)"); - + is.check(FUNCTION_NAME); return is; } @@ -734,9 +727,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const dimensionSet& dset) scalar multiplier; dset.write(os, multiplier); - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const dimensionSet&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C index dca595c6a3..d281845b92 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C +++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C @@ -339,12 +339,7 @@ Foam::dimensioned::read(Istream& is, const dictionary& readSet) is >> value_; value_ *= mult; - // Check state of Istream - is.check - ( - "Istream& dimensioned::read(Istream& is, const dictionary&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -367,13 +362,7 @@ Foam::Istream& Foam::dimensioned::read is >> value_; value_ *= mult; - // Check state of Istream - is.check - ( - "Istream& dimensioned::read" - "(Istream& is, const HashTable&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -392,12 +381,7 @@ Foam::Istream& Foam::dimensioned::read(Istream& is) is >> value_; value_ *= mult; - // Check state of Istream - is.check - ( - "Istream& dimensioned::read(Istream& is)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -612,9 +596,7 @@ Foam::Istream& Foam::operator>>(Istream& is, dimensioned& dt) is >> dt.value_; dt.value_ *= multiplier; - // Check state of Istream - is.check("Istream& operator>>(Istream&, dimensioned&)"); - + is.check(FUNCTION_NAME); return is; } @@ -634,9 +616,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const dimensioned& dt) // Write the value os << dt.value()/mult; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const dimensioned&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C index 7bbd460d36..9ecc2a0ff4 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C @@ -117,10 +117,8 @@ bool Foam::DimensionedField::writeData Field::writeEntry(fieldDictEntry, os); - // Check state of Ostream os.check(FUNCTION_NAME); - - return (os.good()); + return os.good(); } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C index 38a8b94efa..c37fcf3fda 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C @@ -573,12 +573,7 @@ writeEntry(const word& keyword, Ostream& os) const this->writeEntries(os); os.endBlock() << flush; - // Check state of IOstream - os.check - ( - "GeometricField::Boundary::" - "writeEntry(const word& keyword, Ostream& os) const" - ); + os.check(FUNCTION_NAME); } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index 74ba7e39e2..c985a3135f 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -1292,14 +1292,8 @@ Foam::Ostream& Foam::operator<< os << nl; gf.boundaryField().writeEntry("boundaryField", os); - // Check state of IOstream - os.check - ( - "Ostream& operator<<(Ostream&, " - "const GeometricField&)" - ); - - return (os); + os.check(FUNCTION_NAME); + return os; } diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C index 53a26f00ba..2c98caa0e5 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C @@ -329,7 +329,7 @@ Foam::Ostream& Foam::operator<< { ptf.write(os); - os.check("Ostream& operator<<(Ostream&, const pointPatchField&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/graph/curve/curve.C b/src/OpenFOAM/graph/curve/curve.C index aadff19fce..8726064976 100644 --- a/src/OpenFOAM/graph/curve/curve.C +++ b/src/OpenFOAM/graph/curve/curve.C @@ -63,7 +63,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const curve& c) << c.style_ << nl << static_cast(c); - os.check("Ostream& operator>>(Ostream&, const curve&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C index e21540d185..105c69bcd5 100644 --- a/src/OpenFOAM/graph/graph.C +++ b/src/OpenFOAM/graph/graph.C @@ -298,7 +298,7 @@ void Foam::graph::write Foam::Ostream& Foam::operator<<(Ostream& os, const graph& g) { g.writeTable(os); - os.check("Ostream& operator<<(Ostream&, const graph&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C index 0e944bd3ad..b7cf4836c0 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C @@ -363,7 +363,7 @@ Foam::Ostream& Foam::operator<< << endl << endl; } - os.check("Ostream& operator<<(Ostream&, const LduMatrix&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C index fc315f4ca4..46b0b29f12 100644 --- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C +++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C @@ -48,7 +48,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix& M) // Anull matrix M.clear(); - is.fatalCheck("operator>>(Istream&, Matrix&)"); + is.fatalCheck(FUNCTION_NAME); token firstToken(is); @@ -250,9 +250,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Matrix& M) } } - // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const Matrix&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C index e9eb25143a..922f9b8c59 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C @@ -338,7 +338,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const lduMatrix& ldum) os << ldum.upper(); } - os.check("Ostream& operator<<(Ostream&, const lduMatrix&"); + os.check(FUNCTION_NAME); return os; } @@ -398,7 +398,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy& ip) // os << endl; //} - os.check("Ostream& operator<<(Ostream&, const lduMatrix&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/Identifiers/DynamicID/DynamicID.H b/src/OpenFOAM/meshes/Identifiers/DynamicID/DynamicID.H index 03942bb9ad..a0d82fb779 100644 --- a/src/OpenFOAM/meshes/Identifiers/DynamicID/DynamicID.H +++ b/src/OpenFOAM/meshes/Identifiers/DynamicID/DynamicID.H @@ -142,9 +142,7 @@ Ostream& operator<<(Ostream& os, const DynamicID& dynId) << dynId.name() << token::SPACE << dynId.index() << token::END_LIST; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const DynamicID&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C index 08da5b207a..a03a7e7597 100644 --- a/src/OpenFOAM/meshes/boundBox/boundBox.C +++ b/src/OpenFOAM/meshes/boundBox/boundBox.C @@ -259,8 +259,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const boundBox& bb) ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const boundBox&)"); + os.check(FUNCTION_NAME); return os; } @@ -280,8 +279,7 @@ Foam::Istream& Foam::operator>>(Istream& is, boundBox& bb) ); } - // Check state of Istream - is.check("Istream& operator>>(Istream&, boundBox&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.C b/src/OpenFOAM/meshes/lduMesh/lduMesh.C index 1717be26c6..911cf0a93b 100644 --- a/src/OpenFOAM/meshes/lduMesh/lduMesh.C +++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.C @@ -139,7 +139,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy& ip) } } - os.check("Ostream& operator<<(Ostream&, const lduMesh&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H index ce807528c6..d312560843 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H +++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H @@ -176,9 +176,7 @@ inline Foam::Istream& Foam::operator>>(Istream& is, face& f) is >> static_cast(f); } - // Check state of Ostream - is.check("Istream& operator>>(Istream&, face&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H index 861be7665a..3975314e00 100644 --- a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H +++ b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H @@ -137,9 +137,7 @@ inline Foam::Istream& Foam::operator>>(Istream& is, labelledTri& t) is.read(reinterpret_cast(&t), sizeof(labelledTri)); } - // Check state of Ostream - is.check("Istream& operator>>(Istream&, labelledTri&)"); - + is.check(FUNCTION_NAME); return is; } @@ -161,9 +159,7 @@ inline Foam::Ostream& Foam::operator<<(Ostream& os, const labelledTri& t) ); } - // Check state of Ostream os.check(FUNCTION_NAME); - return os; } diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C index 800dfd4d80..d1fc64caea 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C @@ -545,7 +545,7 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs) Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map) { - is.fatalCheck("operator>>(Istream&, mapDistribute&)"); + is.fatalCheck(FUNCTION_NAME); is >> static_cast(map) >> map.transformElements_ >> map.transformStart_; diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C index ac970965c8..fce5b416c3 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C @@ -1248,7 +1248,7 @@ void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs) Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map) { - is.fatalCheck("operator>>(Istream&, mapDistributeBase&)"); + is.fatalCheck(FUNCTION_NAME); is >> map.constructSize_ >> map.subMap_ >> map.constructMap_ >> map.subHasFlip_ >> map.constructHasFlip_; diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C index 4adda18a49..2f44c1d9a6 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C @@ -309,7 +309,7 @@ void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs) Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map) { - is.fatalCheck("operator>>(Istream&, mapDistributePolyMesh&)"); + is.fatalCheck(FUNCTION_NAME); is >> map.nOldPoints_ >> map.nOldFaces_ diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H index 878452a62a..1563a11fcc 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMapI.H @@ -58,8 +58,7 @@ inline objectMap::objectMap(Istream& is) // Read master of objectMap is.readEnd("objectMap"); - // Check state of Istream - is.check("objectMap::objectMap(Istream&)"); + is.check(FUNCTION_NAME); } @@ -115,9 +114,7 @@ inline Ostream& operator<<(Ostream& os, const objectMap& a) << a.masterObjects_ << token::END_LIST; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const objectMap&)"); - + os.check(FUNCTION_NAME); return os; } @@ -128,9 +125,7 @@ inline Istream& operator>>(Istream& is, objectMap& a) is >> a.index_ >> a.masterObjects_; is.readEnd("objectMap"); - // Check state of Istream - is.check("Istream& operator>>(Istream&, objectMap&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C index dfebcf0d30..4790770647 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C @@ -86,12 +86,7 @@ Foam::polyBoundaryMesh::polyBoundaryMesh ); } - // Check state of IOstream - is.check - ( - "polyBoundaryMesh::polyBoundaryMesh" - "(const IOobject&, const polyMesh&)" - ); + is.check(FUNCTION_NAME); close(); } @@ -155,12 +150,7 @@ Foam::polyBoundaryMesh::polyBoundaryMesh ); } - // Check state of IOstream - is.check - ( - "polyBoundaryMesh::polyBoundaryMesh" - "(const IOobject&, const polyMesh&, const polyPatchList&)" - ); + is.check(FUNCTION_NAME); close(); } @@ -1121,9 +1111,7 @@ bool Foam::polyBoundaryMesh::writeData(Ostream& os) const os << decrIndent << token::END_LIST; - // Check state of IOstream - os.check("polyBoundaryMesh::writeData(Ostream& os) const"); - + os.check(FUNCTION_NAME); return os.good(); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.C index 8e0d4f3581..bfe4e2088e 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/tetIndices.C @@ -114,12 +114,7 @@ Foam::Istream& Foam::operator>>(Istream& is, tetIndices& tI) >> tI.facePtB() >> tI.tetPt(); - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::tetIndices&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -134,13 +129,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const tetIndices& tI) << tI.tetPt() << token::SPACE << endl; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::tetIndices&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C index 546702bb54..7a26581fe7 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C @@ -421,7 +421,7 @@ void Foam::polyPatch::operator=(const polyPatch& p) Foam::Ostream& Foam::operator<<(Ostream& os, const polyPatch& p) { p.write(os); - os.check("Ostream& operator<<(Ostream& os, const polyPatch& p"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C index a408ec87a7..c59ec22091 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C @@ -173,7 +173,7 @@ void Foam::cellZone::operator=(const Xfer& addr) Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& zn) { zn.write(os); - os.check("Ostream& operator<<(Ostream&, const cellZone&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C index 9a6238c733..459e8002d7 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C @@ -544,7 +544,7 @@ void Foam::faceZone::writeDict(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& zn) { zn.write(os); - os.check("Ostream& operator<<(Ostream&, const faceZone&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C index ccb109025d..31680ccf1a 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C @@ -225,7 +225,7 @@ void Foam::pointZone::operator=(const Xfer& addr) Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& zn) { zn.write(os); - os.check("Ostream& operator<<(Ostream&, const pointZone&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C index 8e26d4e819..5ff0eebb7b 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C @@ -242,7 +242,7 @@ void Foam::zone::write(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream& os, const zone& z) { z.write(os); - os.check("Ostream& operator<<(Ostream& f, const zone& z"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H b/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H index c4757716cf..034f868780 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H +++ b/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H @@ -280,7 +280,7 @@ inline Foam::Istream& Foam::operator>> is >> l.a_ >> l.b_; is.readEnd("line"); - is.check("Istream& operator>>(Istream&, line&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H index 13118adb01..63a8068cb5 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H +++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H @@ -212,12 +212,11 @@ public: ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const PointIndexHit&)"); - + os.check(FUNCTION_NAME); return os; } + friend Istream& operator>>(Istream& is, PointIndexHit& pHit) { if (is.format() == IOstream::ASCII) @@ -233,9 +232,7 @@ public: ); } - // Check state of Istream - is.check("Istream& operator>>(Istream&, PointIndexHit&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H b/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H index 636990dcc6..a657a889f8 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H +++ b/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H @@ -45,7 +45,7 @@ template inline Foam::pyramid::pyramid(Istream& is) { is >> base_ >> apex_; - is.check("pyramid::pyramid(Istream&)"); + is.check(FUNCTION_NAME); } @@ -105,7 +105,7 @@ inline Foam::Istream& Foam::operator>> ) { is >> p.base_ >> p.apex_; - is.check("Istream& operator>>(Istream&, pyramid&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H index d95f42dc1e..b98fc15bb8 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H +++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H @@ -967,7 +967,7 @@ inline Foam::Istream& Foam::operator>> is >> t.a_ >> t.b_ >> t.c_ >> t.d_; is.readEnd("tetrahedron"); - is.check("Istream& operator>>(Istream&, tetrahedron&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H index 605e10589b..7608c1ceb4 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H +++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H @@ -869,7 +869,7 @@ inline Foam::Istream& Foam::operator>> is >> t.a_ >> t.b_ >> t.c_; is.readEnd("triangle"); - is.check("Istream& operator>>(Istream&, triangle&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C index a801378b21..941349cce6 100644 --- a/src/OpenFOAM/primitives/Scalar/Scalar.C +++ b/src/OpenFOAM/primitives/Scalar/Scalar.C @@ -111,9 +111,7 @@ Istream& operator>>(Istream& is, Scalar& s) return is; } - // Check state of Istream - is.check("Istream& operator>>(Istream&, Scalar&)"); - + is.check(FUNCTION_NAME); return is; } @@ -121,7 +119,7 @@ Istream& operator>>(Istream& is, Scalar& s) Ostream& operator<<(Ostream& os, const Scalar s) { os.write(s); - os.check("Ostream& operator<<(Ostream&, const Scalar&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H index c19b645ddf..bf911ebc56 100644 --- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H +++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H @@ -234,9 +234,7 @@ inline Istream& operator>>(Istream& is, Tuple2& t2) is >> t2.f_ >> t2.s_; is.readEnd("Tuple2"); - // Check state of Istream - is.check("operator>>(Istream&, Tuple2&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C index baba05c6ec..27b68c5010 100644 --- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C +++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C @@ -48,7 +48,7 @@ Foam::VectorSpace::VectorSpace is.readEnd("VectorSpace"); // Check state of Istream - is.check("VectorSpace::VectorSpace(Istream&)"); + is.check(FUNCTION_NAME); } @@ -94,7 +94,7 @@ Foam::Istream& Foam::operator>> is.readEnd("VectorSpace"); // Check state of Istream - is.check("operator>>(Istream&, VectorSpace&)"); + is.check(FUNCTION_NAME); return is; } @@ -116,9 +116,7 @@ Foam::Ostream& Foam::operator<< os << token::END_LIST; - // Check state of Ostream - os.check("operator<<(Ostream&, const VectorSpace&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/chars/char/charIO.C b/src/OpenFOAM/primitives/chars/char/charIO.C index ca69b91e05..583cd24b0c 100644 --- a/src/OpenFOAM/primitives/chars/char/charIO.C +++ b/src/OpenFOAM/primitives/chars/char/charIO.C @@ -39,7 +39,7 @@ char Foam::readChar(Istream& is) Foam::Istream& Foam::operator>>(Istream& is, char& c) { is.read(c); - is.check("Istream& operator>>(Istream&, char&)"); + is.check(FUNCTION_NAME); return is; } @@ -47,7 +47,7 @@ Foam::Istream& Foam::operator>>(Istream& is, char& c) Foam::Ostream& Foam::operator<<(Ostream& os, const char c) { os.write(c); - os.check("Ostream& operator<<(Ostream&, const char)"); + os.check(FUNCTION_NAME); return os; } @@ -55,7 +55,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const char c) Foam::Ostream& Foam::operator<<(Ostream& os, const char* s) { os.write(s); - os.check("Ostream& operator<<(Ostream&, const char*)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/chars/wchar/wcharIO.C b/src/OpenFOAM/primitives/chars/wchar/wcharIO.C index a7bf57cddf..fc710a52dd 100644 --- a/src/OpenFOAM/primitives/chars/wchar/wcharIO.C +++ b/src/OpenFOAM/primitives/chars/wchar/wcharIO.C @@ -95,7 +95,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const wchar_t wc) os.write(char(0xBD)); } - os.check("Ostream& operator<<(Ostream&, const wchar_t)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/complex/complex.C b/src/OpenFOAM/primitives/complex/complex.C index 91f9a529ee..959659c76b 100644 --- a/src/OpenFOAM/primitives/complex/complex.C +++ b/src/OpenFOAM/primitives/complex/complex.C @@ -64,9 +64,7 @@ Foam::Istream& Foam::operator>>(Istream& is, complex& c) // Read end of complex is.readEnd("complex"); - // Check state of Istream - is.check("operator>>(Istream&, complex&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C index bccc14d7f5..c551c91271 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C @@ -133,11 +133,7 @@ Foam::Ostream& Foam::operator<< const Function1& f1 ) { - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const Function1&)" - ); + os.check(FUNCTION_NAME); os << f1.name_; f1.writeData(os); diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C index 0b24c9578f..7af8e6e5b3 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C @@ -37,12 +37,7 @@ Foam::Ostream& Foam::operator<< os << static_cast , scalar, PolySize>>(poly); - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const Polynomial&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C b/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C index e10d5a7c97..c93c1d1256 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C @@ -320,7 +320,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const polynomialFunction& poly) // Check state of Ostream - os.check("operator<<(Ostream&, const polynomialFunction&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C index b0b7df27ef..488d6dc366 100644 --- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C +++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C @@ -107,7 +107,7 @@ Foam::Istream& Foam::operator>>(Istream& is, vectorTensorTransform& tr) is.readEnd("vectorTensorTransform"); // Check state of Istream - is.check("operator>>(Istream&, vectorTensorTransform&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C index 478681b204..6fe25953b1 100644 --- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C +++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C @@ -147,7 +147,7 @@ Foam::Ostream& Foam::SHA1Digest::write(Ostream& os, const bool prefixed) const os.write(hexChars[(v_[i] & 0xF)]); } - os.check("SHA1Digest::write(Ostream&, const bool)"); + os.check(FUNCTION_NAME); return os; } @@ -268,7 +268,7 @@ Foam::Istream& Foam::operator>>(Istream& is, SHA1Digest& dig) v[i] = (c1 << 4) + c2; } - is.check("Istream& operator>>(Istream&, SHA1Digest&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/ints/int32/int32IO.C b/src/OpenFOAM/primitives/ints/int32/int32IO.C index c5023315f0..1759f87daa 100644 --- a/src/OpenFOAM/primitives/ints/int32/int32IO.C +++ b/src/OpenFOAM/primitives/ints/int32/int32IO.C @@ -71,9 +71,7 @@ Foam::Istream& Foam::operator>>(Istream& is, int32_t& i) return is; } - // Check state of Istream - is.check("Istream& operator>>(Istream&, int32_t&)"); - + is.check(FUNCTION_NAME); return is; } @@ -102,7 +100,7 @@ bool Foam::read(const char* buf, int32_t& s) Foam::Ostream& Foam::operator<<(Ostream& os, const int32_t i) { os.write(label(i)); - os.check("Ostream& operator<<(Ostream&, const int32_t)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/ints/int64/int64IO.C b/src/OpenFOAM/primitives/ints/int64/int64IO.C index 0523bb94cb..fe6ce5f568 100644 --- a/src/OpenFOAM/primitives/ints/int64/int64IO.C +++ b/src/OpenFOAM/primitives/ints/int64/int64IO.C @@ -71,9 +71,7 @@ Foam::Istream& Foam::operator>>(Istream& is, int64_t& i) return is; } - // Check state of Istream - is.check("Istream& operator>>(Istream&, int64_t&)"); - + is.check(FUNCTION_NAME); return is; } @@ -100,7 +98,7 @@ bool Foam::read(const char* buf, int64_t& s) Foam::Ostream& Foam::operator<<(Ostream& os, const int64_t i) { os.write(label(i)); - os.check("Ostream& operator<<(Ostream&, const int64_t)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32IO.C b/src/OpenFOAM/primitives/ints/uint32/uint32IO.C index f88f5b1ad8..9c46c5d649 100644 --- a/src/OpenFOAM/primitives/ints/uint32/uint32IO.C +++ b/src/OpenFOAM/primitives/ints/uint32/uint32IO.C @@ -69,9 +69,7 @@ Foam::Istream& Foam::operator>>(Istream& is, uint32_t& i) return is; } - // Check state of Istream - is.check("Istream& operator>>(Istream&, uint32_t&)"); - + is.check(FUNCTION_NAME); return is; } @@ -97,7 +95,7 @@ bool Foam::read(const char* buf, uint32_t& s) Foam::Ostream& Foam::operator<<(Ostream& os, const uint32_t i) { os.write(label(i)); - os.check("Ostream& operator<<(Ostream&, const uint32_t)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64IO.C b/src/OpenFOAM/primitives/ints/uint64/uint64IO.C index 3e110d933a..02e8d2284d 100644 --- a/src/OpenFOAM/primitives/ints/uint64/uint64IO.C +++ b/src/OpenFOAM/primitives/ints/uint64/uint64IO.C @@ -69,9 +69,7 @@ Foam::Istream& Foam::operator>>(Istream& is, uint64_t& i) return is; } - // Check state of Istream - is.check("Istream& operator>>(Istream&, uint64_t&)"); - + is.check(FUNCTION_NAME); return is; } @@ -97,7 +95,7 @@ bool Foam::read(const char* buf, uint64_t& s) Foam::Ostream& Foam::operator<<(Ostream& os, const uint64_t i) { os.write(label(i)); - os.check("Ostream& operator<<(Ostream&, const uint64_t)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C index fa509113e0..18cfda5a60 100644 --- a/src/OpenFOAM/primitives/quaternion/quaternion.C +++ b/src/OpenFOAM/primitives/quaternion/quaternion.C @@ -159,9 +159,7 @@ Foam::Istream& Foam::operator>>(Istream& is, quaternion& q) // Read end of quaternion is.readEnd("quaternion"); - // Check state of Istream - is.check("operator>>(Istream&, quaternion&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C index 38349e92b2..b0715f8b40 100644 --- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C +++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C @@ -185,7 +185,7 @@ Foam::Istream& Foam::operator>>(Istream& is, labelRange& range) is >> range.start_ >> range.size_; is.readEnd("labelRange"); - is.check("operator>>(Istream&, labelRange&)"); + is.check(FUNCTION_NAME); // Disallow invalid sizes if (range.size_ < 0) @@ -204,7 +204,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const labelRange& range) << range.start() << token::SPACE << range.size() << token::END_LIST; - os.check("operator<<(Ostream&, const labelRange&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/septernion/septernion.C b/src/OpenFOAM/primitives/septernion/septernion.C index 33cdf44c7c..6e786ce7a0 100644 --- a/src/OpenFOAM/primitives/septernion/septernion.C +++ b/src/OpenFOAM/primitives/septernion/septernion.C @@ -111,9 +111,7 @@ Foam::Istream& Foam::operator>>(Istream& is, septernion& s) // Read end of septernion is.readEnd("septernion"); - // Check state of Istream - is.check("operator>>(Istream&, septernion&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C b/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C index 3e193ecf99..42ab4f6936 100644 --- a/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C +++ b/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C @@ -62,9 +62,7 @@ Foam::Istream& Foam::operator>>(Istream& is, fileName& fn) fn.stripInvalid(); - // Check state of Istream - is.check("Istream& operator>>(Istream&, fileName&)"); - + is.check(FUNCTION_NAME); return is; } @@ -72,7 +70,7 @@ Foam::Istream& Foam::operator>>(Istream& is, fileName& fn) Foam::Ostream& Foam::operator<<(Ostream& os, const fileName& fn) { os.write(fn); - os.check("Ostream& operator<<(Ostream&, const fileName&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.C b/src/OpenFOAM/primitives/strings/keyType/keyType.C index 05f54c2554..e9b120e8e9 100644 --- a/src/OpenFOAM/primitives/strings/keyType/keyType.C +++ b/src/OpenFOAM/primitives/strings/keyType/keyType.C @@ -104,9 +104,7 @@ Foam::Istream& Foam::operator>>(Istream& is, keyType& kw) return is; } - // Check state of IOstream - is.check("Istream& operator>>(Istream&, keyType&)"); - + is.check(FUNCTION_NAME); return is; } @@ -114,7 +112,7 @@ Foam::Istream& Foam::operator>>(Istream& is, keyType& kw) Foam::Ostream& Foam::operator<<(Ostream& os, const keyType& kw) { os.write(kw); - os.check("Ostream& operator<<(Ostream&, const keyType&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/strings/string/stringIO.C b/src/OpenFOAM/primitives/strings/string/stringIO.C index 954290fff7..53c728b548 100644 --- a/src/OpenFOAM/primitives/strings/string/stringIO.C +++ b/src/OpenFOAM/primitives/strings/string/stringIO.C @@ -60,9 +60,7 @@ Foam::Istream& Foam::operator>>(Istream& is, string& s) return is; } - // Check state of Istream - is.check("Istream& operator>>(Istream&, string&)"); - + is.check(FUNCTION_NAME); return is; } @@ -70,7 +68,7 @@ Foam::Istream& Foam::operator>>(Istream& is, string& s) Foam::Ostream& Foam::operator<<(Ostream& os, const string& s) { os.write(s); - os.check("Ostream& operator<<(Ostream&, const string&)"); + os.check(FUNCTION_NAME); return os; } @@ -78,7 +76,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const string& s) Foam::Ostream& Foam::operator<<(Ostream& os, const std::string& s) { os.write(string(s)); - os.check("Ostream& operator<<(Ostream&, const std::string&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/strings/word/wordIO.C b/src/OpenFOAM/primitives/strings/word/wordIO.C index 19221fa2b7..476dde86fa 100644 --- a/src/OpenFOAM/primitives/strings/word/wordIO.C +++ b/src/OpenFOAM/primitives/strings/word/wordIO.C @@ -79,9 +79,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w) return is; } - // Check state of IOstream - is.check("Istream& operator>>(Istream&, word&)"); - + is.check(FUNCTION_NAME); return is; } @@ -89,7 +87,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w) Foam::Ostream& Foam::operator<<(Ostream& os, const word& w) { os.write(w); - os.check("Ostream& operator<<(Ostream&, const word&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.C b/src/OpenFOAM/primitives/strings/wordRe/wordRe.C index d7725323ca..cbee07ee73 100644 --- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.C +++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.C @@ -85,9 +85,7 @@ Foam::Istream& Foam::operator>>(Istream& is, wordRe& w) return is; } - // Check state of IOstream - is.check("Istream& operator>>(Istream&, wordRe&)"); - + is.check(FUNCTION_NAME); return is; } @@ -95,7 +93,7 @@ Foam::Istream& Foam::operator>>(Istream& is, wordRe& w) Foam::Ostream& Foam::operator<<(Ostream& os, const wordRe& w) { os.writeQuoted(w, w.isPattern()); - os.check("Ostream& operator<<(Ostream&, const wordRe&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.C b/src/dynamicMesh/boundaryPatch/boundaryPatch.C index b405ad517d..fe2f9796e4 100644 --- a/src/dynamicMesh/boundaryPatch/boundaryPatch.C +++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.C @@ -100,7 +100,7 @@ void Foam::boundaryPatch::write(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream& os, const boundaryPatch& p) { p.write(os); - os.check("Ostream& operator<<(Ostream& f, const boundaryPatch&)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C index 912132391a..3ef151d739 100644 --- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C +++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C @@ -218,10 +218,8 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const directionInfo&)"); + os.check(FUNCTION_NAME); return os; - } @@ -240,8 +238,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::directionInfo& wDist) ); } - // Check state of Istream - is.check("Istream& operator>>(Istream&, directionInfo&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.C b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.C index 819ebc99e0..9776a08cf7 100644 --- a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.C +++ b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.C @@ -46,11 +46,11 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const wallNormalInfo&)"); + os.check(FUNCTION_NAME); return os; } + Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::wallNormalInfo& wDist) { if (is.format() == IOstream::ASCII) @@ -66,9 +66,9 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::wallNormalInfo& wDist) ); } - // Check state of Istream - is.check("Istream& operator>>(Istream&, wallNormalInfo&)"); + is.check(FUNCTION_NAME); return is; } + // ************************************************************************* // diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C index ecad881894..13eb5c6ee9 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C @@ -77,7 +77,7 @@ const Foam::polyTopoChanger& Foam::polyMeshModifier::topoChanger() const Foam::Ostream& Foam::operator<<(Ostream& os, const polyMeshModifier& pmm) { pmm.write(os); - os.check("Ostream& operator<<(Ostream& f, const polyMeshModifier& pmm)"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementData.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementData.C index 66c70841ed..e6411fb94e 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementData.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementData.C @@ -46,8 +46,7 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const refinementData&)"); + os.check(FUNCTION_NAME); return os; } @@ -67,8 +66,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::refinementData& wDist) ); } - // Check state of Istream - is.check("Istream& operator>>(Istream&, refinementData&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C index b2e5955f69..8023a5d98b 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C @@ -74,7 +74,7 @@ void Foam::polyTopoChanger::readModifiers() } // Check state of IOstream - is.check("polyTopoChanger::readModifiers()"); + is.check(FUNCTION_NAME); close(); } diff --git a/src/engine/ignition/ignitionSiteIO.C b/src/engine/ignition/ignitionSiteIO.C index 5e8c3d53d4..588a03898b 100644 --- a/src/engine/ignition/ignitionSiteIO.C +++ b/src/engine/ignition/ignitionSiteIO.C @@ -58,7 +58,7 @@ Foam::ignitionSite::ignitionSite timeIndex_(db_.timeIndex()) { // Check state of Istream - is.check("ignitionSite::ignitionSite(Istream&)"); + is.check(FUNCTION_NAME); findIgnitionCells(mesh_); } @@ -94,7 +94,7 @@ Foam::ignitionSite::ignitionSite timeIndex_(db_.timeIndex()) { // Check state of Istream - is.check("ignitionSite::ignitionSite(Istream&)"); + is.check(FUNCTION_NAME); findIgnitionCells(mesh_); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C index cb5a49bbae..a9009dc03f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyIO.C @@ -39,7 +39,7 @@ Foam::eddy::eddy(Istream& is) c1_(readScalar(is)), dir1_(readLabel(is)) { - is.check("Foam::eddy::eddy(Foam::Istream&)"); + is.check(FUNCTION_NAME); } @@ -62,11 +62,7 @@ void Foam::eddy::operator=(const eddy& e) Foam::Istream& Foam::operator>>(Istream& is, eddy& e) { - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::eddy&)" - ); + is.check(FUNCTION_NAME); is >> e.patchFaceI_ >> e.position0_ @@ -77,23 +73,14 @@ Foam::Istream& Foam::operator>>(Istream& is, eddy& e) >> e.c1_ >> e.dir1_; - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::eddy&)" - ); - + is.check(FUNCTION_NAME); return is; } Foam::Ostream& Foam::operator<<(Ostream& os, const eddy& e) { - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::eddy&)" - ); + os.check(FUNCTION_NAME); os << e.patchFaceI_ << token::SPACE << e.position0_ << token::SPACE @@ -104,12 +91,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const eddy& e) << e.c1_ << token::SPACE << e.dir1_; - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::eddy&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index f44f574a7c..52bd26e809 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C @@ -594,7 +594,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvPatchField& ptf) { ptf.write(os); - os.check("Ostream& operator<<(Ostream&, const fvPatchField&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C index f1ebd2e690..8a8c96244c 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C @@ -376,7 +376,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvsPatchField& ptf) { ptf.write(os); - os.check("Ostream& operator<<(Ostream&, const fvsPatchField&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 262444193c..db21f33d45 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -2387,7 +2387,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvMatrix& fvm) << fvm.internalCoeffs_ << nl << fvm.boundaryCoeffs_ << endl; - os.check("Ostream& operator<<(Ostream&, fvMatrix&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C index 7aaf5b4946..65e4e21abc 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C +++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C @@ -40,11 +40,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem(Istream& is) base_(ITER), window_(-1.0) { - is.check - ( - "Foam::functionObjects::fieldAverageItem::fieldAverageItem" - "(Foam::Istream&)" - ); + is.check(FUNCTION_NAME); const dictionaryEntry entry(dictionary::null, is); @@ -73,11 +69,7 @@ Foam::Istream& Foam::functionObjects::operator>> fieldAverageItem& faItem ) { - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::functionObjects::fieldAverageItem&)" - ); + is.check(FUNCTION_NAME); const dictionaryEntry entry(dictionary::null, is); @@ -111,11 +103,7 @@ Foam::Ostream& Foam::functionObjects::operator<< const fieldAverageItem& faItem ) { - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::functionObjects::fieldAverageItem&)" - ); + os.check(FUNCTION_NAME); os << faItem.fieldName_ << nl << token::BEGIN_BLOCK << nl; os.writeKeyword("mean") << faItem.mean_ << token::END_STATEMENT << nl; @@ -138,12 +126,7 @@ Foam::Ostream& Foam::functionObjects::operator<< os << token::END_BLOCK << nl; - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::functionObjects::fieldAverageItem&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/functionObjects/field/nearWallFields/findCellParticle.C b/src/functionObjects/field/nearWallFields/findCellParticle.C index 5f57285a26..6c69be4f18 100644 --- a/src/functionObjects/field/nearWallFields/findCellParticle.C +++ b/src/functionObjects/field/nearWallFields/findCellParticle.C @@ -70,12 +70,7 @@ Foam::findCellParticle::findCellParticle } } - // Check state of Istream - is.check - ( - "findCellParticle::findCellParticle" - "(const Cloud&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -227,9 +222,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const findCellParticle& p) ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const findCellParticle&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/functionObjects/field/streamLine/streamLineParticle.C b/src/functionObjects/field/streamLine/streamLineParticle.C index e88f903f8a..04189af71e 100644 --- a/src/functionObjects/field/streamLine/streamLineParticle.C +++ b/src/functionObjects/field/streamLine/streamLineParticle.C @@ -148,12 +148,7 @@ Foam::streamLineParticle::streamLineParticle } } - // Check state of Istream - is.check - ( - "streamLineParticle::streamLineParticle" - "(const Cloud&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -497,9 +492,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const streamLineParticle& p) << token::SPACE << p.sampledScalars_ << token::SPACE << p.sampledVectors_; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const streamLineParticle&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C index f27d860322..8166029dbd 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C @@ -331,12 +331,7 @@ Foam::wallBoundedParticle::wallBoundedParticle } } - // Check state of Istream - is.check - ( - "wallBoundedParticle::wallBoundedParticle" - "(const Cloud&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C index 82fccd4115..d626c63fcb 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C @@ -185,12 +185,7 @@ Foam::wallBoundedStreamLineParticle::wallBoundedStreamLineParticle } } - // Check state of Istream - is.check - ( - "wallBoundedStreamLineParticle::wallBoundedStreamLineParticle" - "(const Cloud&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -422,12 +417,7 @@ Foam::Ostream& Foam::operator<< << token::SPACE << p.sampledScalars_ << token::SPACE << p.sampledVectors_; - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const wallBoundedStreamLineParticle&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C index 292f445f93..155280d17c 100644 --- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C +++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C @@ -66,12 +66,7 @@ Foam::DSMCParcel::DSMCParcel } } - // Check state of Istream - is.check - ( - "DSMCParcel::DSMCParcel" - "(const Cloud&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -164,12 +159,7 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const DSMCParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C index 33e2608786..83369d1a4f 100644 --- a/src/lagrangian/basic/Cloud/CloudIO.C +++ b/src/lagrangian/basic/Cloud/CloudIO.C @@ -262,9 +262,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Cloud& pc) { pc.writeData(os); - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const Cloud&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C index b89b2c0b4c..5c977b54d2 100644 --- a/src/lagrangian/basic/IOPosition/IOPosition.C +++ b/src/lagrangian/basic/IOPosition/IOPosition.C @@ -139,11 +139,7 @@ void Foam::IOPosition::readData(CloudType& c, bool checkClass) << firstToken.info() << exit(FatalIOError); } - // Check state of IOstream - is.check - ( - "void IOPosition::readData(CloudType&, bool)" - ); + is.check(FUNCTION_NAME); } diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C index e8ce9f9da0..25550be990 100644 --- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C +++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C @@ -101,13 +101,7 @@ Foam::Istream& Foam::operator>>(Istream& is, referredWallFace& rWF) { is >> static_cast(rWF) >> rWF.pts_ >> rWF.patchi_; - // Check state of Istream - is.check - ( - "Foam::Istream& " - "Foam::operator>>(Foam::Istream&, Foam::referredWallFace&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -118,13 +112,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const referredWallFace& rWF) << rWF.pts_ << token::SPACE << rWF.patchi_; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::referredWallFace&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C index 3ae1edd168..39313222c9 100644 --- a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C +++ b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C @@ -72,12 +72,7 @@ Foam::injectedParticle::injectedParticle } } - // Check state of Istream - is.check - ( - "injectedParticle::injectedParticle" - "(const polyMesh&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -207,12 +202,7 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const injectedParticle&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/basic/particle/particleIO.C b/src/lagrangian/basic/particle/particleIO.C index 3c9513f898..b9e40bc3d9 100644 --- a/src/lagrangian/basic/particle/particleIO.C +++ b/src/lagrangian/basic/particle/particleIO.C @@ -83,7 +83,7 @@ Foam::particle::particle(const polyMesh& mesh, Istream& is, bool readFields) } // Check state of Istream - is.check("particle::particle(Istream&, bool)"); + is.check(FUNCTION_NAME); } @@ -99,7 +99,7 @@ void Foam::particle::writePosition(Ostream& os) const } // Check state of Ostream - os.check("particle::writePosition(Ostream& os, bool) const"); + os.check(FUNCTION_NAME); } diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C index a5d5074f52..f63e02daf0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C @@ -73,12 +73,7 @@ Foam::CollidingParcel::CollidingParcel is >> collisionRecords_; } - // Check state of Istream - is.check - ( - "CollidingParcel::Collisions" - "(const polyMesh&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -335,12 +330,7 @@ Foam::Ostream& Foam::operator<< os << p.collisionRecords(); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const CollidingParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C index d8622ad69a..06f0f24da9 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C @@ -42,12 +42,7 @@ Foam::CollisionRecordList::CollisionRecordList(Istream& is) pairRecords_(is), wallRecords_(is) { - // Check state of Istream - is.check - ( - "Foam::CollisionRecordList::" - "CollisionRecordList(Foam::Istream&)" - ); + is.check(FUNCTION_NAME); } @@ -448,13 +443,7 @@ Foam::Istream& Foam::operator>> { is >> cRL.pairRecords_ >> cRL.wallRecords_; - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::CollisionRecordList&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -468,13 +457,7 @@ Foam::Ostream& Foam::operator<< { os << cRL.pairRecords_ << cRL.wallRecords_; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::CollisionRecordList&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C index 880febc613..56e5195d7c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C @@ -35,11 +35,7 @@ Foam::PairCollisionRecord::PairCollisionRecord(Istream& is) origIdOfOther_(readLabel(is)), data_(is) { - // Check state of Istream - is.check - ( - "Foam::PairCollisionRecord::PairCollisionRecord(Foam::Istream&)" - ); + is.check(FUNCTION_NAME); } @@ -50,13 +46,7 @@ Foam::Istream& Foam::operator>>(Istream& is, PairCollisionRecord& pCR) { is >> pCR.origProcOfOther_ >> pCR.origIdOfOther_ >> pCR.data_; - // Check state of Istream - is.check - ( - "Foam::Istream&" - "Foam::operator>>(Foam::Istream&, Foam::PairCollisionRecord&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -72,13 +62,7 @@ Foam::Ostream& Foam::operator<< << token::SPACE << pCR.origIdOfOther_ << token::SPACE << pCR.data_; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::PairCollisionRecord&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C index 48159c01b4..767aee8cce 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C @@ -35,11 +35,7 @@ Foam::WallCollisionRecord::WallCollisionRecord(Istream& is) pRel_(is), data_(is) { - // Check state of Istream - is.check - ( - "Foam::WallCollisionRecord::WallCollisionRecord(Foam::Istream&)" - ); + is.check(FUNCTION_NAME); } @@ -50,13 +46,7 @@ Foam::Istream& Foam::operator>>(Istream& is, WallCollisionRecord& wCR) { is >> wCR.accessed_ >> wCR.pRel_ >> wCR.data_; - // Check state of Istream - is.check - ( - "Foam::Istream&" - "Foam::operator>>(Foam::Istream&, Foam::WallCollisionRecord&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -72,13 +62,7 @@ Foam::Ostream& Foam::operator<< << token::SPACE << wCR.pRel_ << token::SPACE << wCR.data_; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::WallCollisionRecord&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C index 2e44545ca5..7e3b838d7c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C @@ -92,12 +92,7 @@ Foam::KinematicParcel::KinematicParcel } } - // Check state of Istream - is.check - ( - "KinematicParcel::KinematicParcel" - "(const polyMesh&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -302,12 +297,7 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const KinematicParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C index 452b5b0eab..ec582209c6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C @@ -69,11 +69,7 @@ Foam::MPPICParcel::MPPICParcel } } - is.check - ( - "MPPICParcel::Collisions" - "(const polyMesh&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -182,11 +178,7 @@ Foam::Ostream& Foam::operator<< ); } - os.check - ( - "Ostream& operator<<(Ostream&, const MPPICParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C index cf15a6d497..399f67879d 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C @@ -78,16 +78,7 @@ Foam::ReactingMultiphaseParcel::ReactingMultiphaseParcel YSolid_ /= YMix[SLD] + ROOTVSMALL; } - // Check state of Istream - is.check - ( - "ReactingMultiphaseParcel::ReactingMultiphaseParcel" - "(" - "const polyMesh&, " - "Istream&, " - "bool" - ")" - ); + is.check(FUNCTION_NAME); } @@ -454,16 +445,7 @@ Foam::Ostream& Foam::operator<< os << YGasLoc << YLiquidLoc << YSolidLoc; } - // Check state of Ostream - os.check - ( - "Ostream& operator<<" - "(" - "Ostream&, " - "const ReactingMultiphaseParcel&" - ")" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C index 1b6e90cbe3..6574af96cf 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C @@ -75,16 +75,7 @@ Foam::ReactingParcel::ReactingParcel Y_.transfer(Ymix); } - // Check state of Istream - is.check - ( - "ReactingParcel::ReactingParcel" - "(" - "const polyMesh&, " - "Istream&, " - "bool" - ")" - ); + is.check(FUNCTION_NAME); } @@ -328,12 +319,7 @@ Foam::Ostream& Foam::operator<< os << p.Y(); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const ReactingParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C index 60f2e82d69..f23059e22f 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C @@ -73,11 +73,7 @@ Foam::ThermoParcel::ThermoParcel } } - // Check state of Istream - is.check - ( - "ThermoParcel::ThermoParcel(const polyMesh&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -189,12 +185,7 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const ThermoParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C index eded687e41..e981fc903b 100644 --- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C +++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C @@ -36,7 +36,7 @@ Foam::phaseProperties::phaseProperties(Istream& is) Y_(0), carrierIds_(0) { - is.check("Foam::phaseProperties::phaseProperties(Istream& is)"); + is.check(FUNCTION_NAME); dictionaryEntry phaseInfo(dictionary::null, is); @@ -67,10 +67,7 @@ Foam::phaseProperties::phaseProperties(Istream& is) Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp) { - is.check - ( - "Foam::Istream& Foam::operator>>(Istream&, phaseProperties&)" - ); + is.check(FUNCTION_NAME); dictionaryEntry phaseInfo(dictionary::null, is); @@ -102,10 +99,7 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp) Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp) { - os.check - ( - "Foam::Ostream& Foam::operator<<(Ostream&, const phaseProperties&)" - ); + os.check(FUNCTION_NAME); os << pp.phaseTypeNames[pp.phase_] << nl << token::BEGIN_BLOCK << nl << incrIndent; @@ -118,11 +112,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp) os << decrIndent << token::END_BLOCK << nl; - os.check - ( - "Foam::Ostream& Foam::operator<<(Ostream&, const phaseProperties&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C index f14910bb90..e70bfc03cb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C @@ -87,13 +87,7 @@ Foam::Istream& Foam::operator>> { is >> wIS.patchi_ >> wIS.wallData_; - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::WallSiteData&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -107,13 +101,7 @@ Foam::Ostream& Foam::operator<< { os << wIS.patchi_ << token::SPACE << wIS.wallData_; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Ostream&, const WallSiteData&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C index 95e598629c..6c93eee808 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C @@ -44,7 +44,7 @@ Foam::kinematicParcelInjectionData::kinematicParcelInjectionData(Istream& is) is.check("reading mDot"); is >> mDot_; - is.check("kinematicParcelInjectionData(Istream& is)"); + is.check(FUNCTION_NAME); } @@ -79,7 +79,7 @@ Foam::Istream& Foam::operator>>(Istream& is, kinematicParcelInjectionData& data) is.check("reading mDot"); is >> data.mDot_; - is.check("operator(Istream&, kinematicParcelInjectionData&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C index 145d7590a5..2f6d4f3f21 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C @@ -72,7 +72,7 @@ Foam::Istream& Foam::operator>> patchInteractionData& pid ) { - is.check("Istream& operator>>(Istream&, patchInteractionData&)"); + is.check(FUNCTION_NAME); const dictionaryEntry entry(dictionary::null, is); diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C index 146543c7df..afc9de8766 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C +++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C @@ -34,7 +34,7 @@ Foam::reactingParcelInjectionData::reactingParcelInjectionData(Istream& is) is.check("reading Y's"); is >> Y_; - is.check("reactingParcelInjectionData(Istream& is)"); + is.check(FUNCTION_NAME); } @@ -61,7 +61,7 @@ Foam::Istream& Foam::operator>>(Istream& is, reactingParcelInjectionData& data) is.check("reading Y's"); is >> data.Y_; - is.check("operator(Istream&, reactingParcelInjectionData&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C index cf0244e52f..c455b08d22 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C @@ -41,7 +41,7 @@ reactingMultiphaseParcelInjectionData(Istream& is) is.check("reading YSolid's"); is >> YSolid_; - is.check("reactingMultiphaseParcelInjectionData(Istream& is)"); + is.check(FUNCTION_NAME); } @@ -78,7 +78,7 @@ Foam::Istream& Foam::operator>> is.check("reading YSolid's"); is >> data.YSolid_; - is.check("operator(Istream&, reactingMultiphaseParcelInjectionData&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C index 259c7c53b4..67c88f5e80 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C @@ -37,7 +37,7 @@ Foam::thermoParcelInjectionData::thermoParcelInjectionData(Istream& is) is.check("reading Cp"); is >> Cp_; - is.check("thermoParcelInjectionData(Istream& is)"); + is.check(FUNCTION_NAME); } @@ -67,7 +67,7 @@ Foam::Istream& Foam::operator>>(Istream& is, thermoParcelInjectionData& data) is.check("reading Cp"); is >> data.Cp_; - is.check("operator(Istream&, thermoParcelInjectionData&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C index 88d8888a49..228b5b05d8 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C @@ -37,13 +37,7 @@ Foam::operator<<(Ostream& os, const bufferedAccumulator& bA) << static_cast>&>(bA) << bA.bufferOffsets(); - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::bufferedAccumulator&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C index 63d7b68c88..0886797ea1 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C @@ -57,13 +57,7 @@ Foam::Ostream& Foam::operator<< << nl << cF.tZeroBuffers() << nl << static_cast&>(cF); - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Ostream&, const correlationFunction&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C index da37720b9c..2091a519ad 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C @@ -464,13 +464,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const distribution& d) os << d.binWidth_ << static_cast&>(d); - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, " - "const distribution&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C index 9b15c28c18..d0fe212e6c 100644 --- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C +++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C @@ -82,12 +82,7 @@ Foam::molecule::molecule } } - // Check state of Istream - is.check - ( - "Foam::molecule::molecule" - "(const Cloud& cloud, Foam::Istream&), bool" - ); + is.check(FUNCTION_NAME); } @@ -281,13 +276,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const molecule& mol) os << mol.siteForces_ << mol.sitePositions_; } - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Foam::Ostream&, const Foam::molecule&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C index 7ee1f39bd0..0524db861a 100644 --- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C +++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C @@ -46,13 +46,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const reducedUnits& rU) << tab << "refNumberDensity = " << rU.refNumberDensity() << " m^-3" << endl; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::reducedUnits&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C index c27cdbb94d..7cecee7418 100644 --- a/src/lagrangian/solidParticle/solidParticleIO.C +++ b/src/lagrangian/solidParticle/solidParticleIO.C @@ -58,8 +58,7 @@ Foam::solidParticle::solidParticle } } - // Check state of Istream - is.check("solidParticle::solidParticle(Istream&)"); + is.check(FUNCTION_NAME); } @@ -134,9 +133,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const solidParticle& p) ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const solidParticle&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C index 1afeb4d32b..4f421eed0f 100644 --- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C +++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C @@ -93,16 +93,7 @@ Foam::SprayParcel::SprayParcel } } - // Check state of Istream - is.check - ( - "SprayParcel::SprayParcel" - "(" - "const polyMesh&, " - "Istream&, " - "bool" - ")" - ); + is.check(FUNCTION_NAME); } @@ -389,12 +380,7 @@ Foam::Ostream& Foam::operator<< ); } - // Check state of Ostream - os.check - ( - "Ostream& operator<<(Ostream&, const SprayParcel&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C b/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C index 465998ce9d..45eebc4956 100644 --- a/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C +++ b/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C @@ -69,10 +69,7 @@ void Foam::blockMeshTools::read << exit(FatalIOError); } - is.fatalCheck - ( - "operator>>(Istream&, List&) : reading entry" - ); + is.fatalCheck(FUNCTION_NAME); } diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.C b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.C index 6c54e2c4f5..ea58a0495e 100644 --- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.C +++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.C @@ -122,9 +122,7 @@ Foam::Istream& Foam::operator>>(Istream& is, gradingDescriptor& gd) is.readEnd("gradingDescriptor"); } - // Check state of Istream - is.check("operator>>(Istream&, gradingDescriptor&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C index 6e6418af3d..439707ddff 100644 --- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C +++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C @@ -73,7 +73,7 @@ Foam::Istream& Foam::operator>>(Istream& is, gradingDescriptors& gds) is >> static_cast& >(gds); // Check state of Istream - is.check("operator>>(Istream&, gradingDescriptor&)"); + is.check(FUNCTION_NAME); // Normalize the blockFractions and nDivFractions // of the list of gradingDescriptors diff --git a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C index dec8a9f47f..e4ba1c5409 100644 --- a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C +++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C @@ -81,12 +81,7 @@ Foam::trackedParticle::trackedParticle } } - // Check state of Istream - is.check - ( - "trackedParticle::trackedParticle" - "(const Cloud&, Istream&, bool)" - ); + is.check(FUNCTION_NAME); } @@ -270,9 +265,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const trackedParticle& p) ); } - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const trackedParticle&)"); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/meshTools/AABBTree/AABBTree.C b/src/meshTools/AABBTree/AABBTree.C index 19c11f33a9..a8f02d3aa2 100644 --- a/src/meshTools/AABBTree/AABBTree.C +++ b/src/meshTools/AABBTree/AABBTree.C @@ -492,7 +492,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const AABBTree& tree) << tree.addressing_; } - os.check("Ostream& operator<<(Ostream&, const AABBTree&)"); + os.check(FUNCTION_NAME); return os; } @@ -519,7 +519,7 @@ Foam::Istream& Foam::operator>>(Istream& is, AABBTree& tree) >> tree.addressing_; } - is.check("Istream& operator>>(Istream&, AABBTree&)"); + is.check(FUNCTION_NAME); return is; } diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C index e3150ff8f5..e8c507a7f8 100644 --- a/src/meshTools/coordinateSystems/coordinateSystem.C +++ b/src/meshTools/coordinateSystems/coordinateSystem.C @@ -378,7 +378,7 @@ bool Foam::operator!=(const coordinateSystem& a, const coordinateSystem& b) Foam::Ostream& Foam::operator<<(Ostream& os, const coordinateSystem& cs) { cs.write(os); - os.check("Ostream& operator<<(Ostream&, const coordinateSystem&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C index 59771b4d70..d8b14d5a9c 100644 --- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C @@ -144,13 +144,7 @@ Foam::Ostream& Foam::fileFormats::edgeMeshFormat::write IOobject::writeDivider(os); - // Check state of Ostream - os.check - ( - "edgeMeshFormat::write" - "(Ostream&, const pointField&, const edgeList&)" - ); - + os.check(FUNCTION_NAME); return os; } @@ -208,8 +202,7 @@ void Foam::fileFormats::edgeMeshFormat::write write(os, mesh.points(), mesh.edges()); - // Check state of Ostream - os.check("edgeMeshFormat::write(Ostream&)"); + os.check(FUNCTION_NAME); } diff --git a/src/meshTools/edgeMesh/edgeMeshIO.C b/src/meshTools/edgeMesh/edgeMeshIO.C index f57ddb5a3c..a187cb2d6c 100644 --- a/src/meshTools/edgeMesh/edgeMeshIO.C +++ b/src/meshTools/edgeMesh/edgeMeshIO.C @@ -128,9 +128,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const edgeMesh& em) { fileFormats::edgeMeshFormat::write(os, em.points_, em.edges_); - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const edgeMesh&)"); - + os.check(FUNCTION_NAME); return os; } @@ -141,9 +139,7 @@ Foam::Istream& Foam::operator>>(Istream& is, edgeMesh& em) em.pointEdgesPtr_.clear(); - // Check state of Istream - is.check("Istream& operator>>(Istream&, edgeMesh&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C index a13061b7ff..977cb457ca 100644 --- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C @@ -2446,9 +2446,7 @@ Foam::Istream& Foam::operator>> vt = static_cast(type); - // Check state of Istream - is.check("operator>>(Istream&, sideVolumeType&)"); - + is.check(FUNCTION_NAME); return is; } @@ -2497,9 +2495,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const extendedEdgeMesh& em) << em.regionEdges_ << endl; - // Check state of Ostream - os.check("Ostream& operator<<(Ostream&, const extendedEdgeMesh&)"); - + os.check(FUNCTION_NAME); return os; } @@ -2523,9 +2519,7 @@ Foam::Istream& Foam::operator>>(Istream& is, extendedEdgeMesh& em) >> em.featurePointEdges_ >> em.regionEdges_; - // Check state of Istream - is.check("Istream& operator>>(Istream&, extendedEdgeMesh&)"); - + is.check(FUNCTION_NAME); return is; } diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C index 08a688bfa5..3df1a97fb4 100644 --- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C @@ -250,9 +250,7 @@ bool Foam::extendedFeatureEdgeMesh::writeData(Ostream& os) const // // vt = static_cast(type); // -// // Check state of Istream -// is.check("operator>>(Istream&, sideVolumeType&)"); -// +// is.check(FUNCTION_NAME); // return is; //} // diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C index c17819b410..038d42a31a 100644 --- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C +++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C @@ -59,13 +59,7 @@ Foam::Istream& Foam::RBD::operator>> >> state.qDdot_ >> state.deltaT_; - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::RBD::rigidBodyModelState&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -81,13 +75,7 @@ Foam::Ostream& Foam::RBD::operator<< << token::SPACE << state.qDdot_ << token::SPACE << state.deltaT_; - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::RBD::rigidBodyModelState&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C index 0901dc4c94..b075331031 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C @@ -244,7 +244,7 @@ void Foam::sampledSurface::print(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream &os, const sampledSurface& s) { s.print(os); - os.check("Ostream& operator<<(Ostream&, const sampledSurface&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C index 24984eec5b..e24f81f448 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateIO.C @@ -70,13 +70,7 @@ Foam::Istream& Foam::operator>> >> sDoFRBMS.pi_ >> sDoFRBMS.tau_; - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::sixDoFRigidBodyMotionState&)" - ); - + is.check(FUNCTION_NAME); return is; } @@ -94,13 +88,7 @@ Foam::Ostream& Foam::operator<< << token::SPACE << sDoFRBMS.pi() << token::SPACE << sDoFRBMS.tau(); - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::sixDoFRigidBodyMotionState&)" - ); - + os.check(FUNCTION_NAME); return os; } diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C index a8c8e4c7a3..296a93db1e 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C @@ -38,7 +38,7 @@ Foam::Istream& Foam::MeshedSurface::read(Istream& is) >> this->storedPoints() >> this->storedFaces(); - is.check("MeshedSurface::read(Istream&)"); + is.check(FUNCTION_NAME); return is; } @@ -50,7 +50,7 @@ Foam::Ostream& Foam::MeshedSurface::write(Ostream& os) const << this->points() << this->surfFaces(); - os.check("MeshedSurface::write(Ostream&) const"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C index c156793124..b54f3c4ce1 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C @@ -445,7 +445,7 @@ Foam::Istream& Foam::UnsortedMeshedSurface::read(Istream& is) >> this->storedPoints() >> this->storedFaces(); - is.check("UnsortedMeshedSurface::read(Istream&)"); + is.check(FUNCTION_NAME); return is; } @@ -457,7 +457,7 @@ Foam::Ostream& Foam::UnsortedMeshedSurface::write(Ostream& os) const << this->points() << this->surfFaces(); - os.check("UnsortedMeshedSurface::write(Ostream&) const"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C index 2620f2b4fb..e2699243b5 100644 --- a/src/surfMesh/surfZone/surfZone/surfZone.C +++ b/src/surfMesh/surfZone/surfZone/surfZone.C @@ -148,7 +148,7 @@ Foam::Istream& Foam::operator>>(Istream& is, surfZone& zone) { zone = surfZone(is, 0); - is.check("Istream& operator>>(Istream&, surfZone&)"); + is.check(FUNCTION_NAME); return is; } @@ -156,7 +156,7 @@ Foam::Istream& Foam::operator>>(Istream& is, surfZone& zone) Foam::Ostream& Foam::operator<<(Ostream& os, const surfZone& zone) { zone.write(os); - os.check("Ostream& operator<<(Ostream&, const surfZone&"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/surfMesh/triSurface/patches/surfacePatch.C b/src/surfMesh/triSurface/patches/surfacePatch.C index 6b09d55623..f3cbc76dea 100644 --- a/src/surfMesh/triSurface/patches/surfacePatch.C +++ b/src/surfMesh/triSurface/patches/surfacePatch.C @@ -158,7 +158,7 @@ bool Foam::surfacePatch::operator==(const surfacePatch& p) const Foam::Ostream& Foam::operator<<(Ostream& os, const surfacePatch& p) { p.write(os); - os.check("Ostream& operator<<(Ostream& f, const surfacePatch& p"); + os.check(FUNCTION_NAME); return os; } diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C index 7590bba3a8..29aae79aed 100644 --- a/src/surfMesh/triSurface/triSurface.C +++ b/src/surfMesh/triSurface/triSurface.C @@ -1157,7 +1157,7 @@ void Foam::triSurface::write(Ostream& os) const << static_cast&>(*this) << endl; // Check state of Ostream - os.check("triSurface::write(Ostream&)"); + os.check(FUNCTION_NAME); } diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C index 508d755626..a0e81f0a0b 100644 --- a/src/thermophysicalModels/specie/specie/specie.C +++ b/src/thermophysicalModels/specie/specie/specie.C @@ -63,7 +63,7 @@ void Foam::specie::write(Ostream& os) const Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st) { st.write(os); - os.check("Ostream& operator<<(Ostream& os, const specie& st)"); + os.check(FUNCTION_NAME); return os; }