diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H index 9106264ac8..067dfc54af 100644 --- a/src/OSspecific/POSIX/regExp.H +++ b/src/OSspecific/POSIX/regExp.H @@ -62,6 +62,7 @@ class regExp //- Precompiled regular expression mutable regex_t* preg_; + // Private Member Functions //- Disallow default bitwise copy construct @@ -72,6 +73,8 @@ class regExp public: + // Static Member Functions + //- Is character a regular expression meta-character? // any character: '.' \n // quantifiers: '*', '+', '?' \n @@ -102,66 +105,69 @@ public: //- Construct from std::string (or string), optionally ignoring case regExp(const std::string&, const bool ignoreCase=false); + //- Destructor ~regExp(); // Member functions - //- Access + // Access - //- Return true if a precompiled expression does not exist - inline bool empty() const - { - return !preg_; - } + //- Return true if a precompiled expression does not exist + inline bool empty() const + { + return !preg_; + } - //- Does a precompiled expression exist? - inline bool exists() const - { - return preg_ ? true : false; - } + //- Does a precompiled expression exist? + inline bool exists() const + { + return preg_ ? true : false; + } - //- Return the number of (groups) - inline int ngroups() const - { - return preg_ ? preg_->re_nsub : 0; - } + //- Return the number of (groups) + inline int ngroups() const + { + return preg_ ? preg_->re_nsub : 0; + } - //- Editing + // Editing - //- Compile pattern into a regular expression, optionally ignoring case - void set(const char*, const bool ignoreCase=false) const; + //- Compile pattern into a regular expression, optionally ignoring + // case + void set(const char*, const bool ignoreCase=false) const; - //- Compile pattern into a regular expression, optionally ignoring case - void set(const std::string&, const bool ignoreCase=false) const; + //- Compile pattern into a regular expression, optionally ignoring + // case + void set(const std::string&, const bool ignoreCase=false) const; - //- Release precompiled expression. - // Returns true if precompiled expression existed before clear - bool clear() const; + //- Release precompiled expression. + // Returns true if precompiled expression existed before clear + bool clear() const; - //- Searching + // Searching - //- Find position within string. - // Returns the index where it begins or string::npos if not found - std::string::size_type find(const std::string& str) const; + //- Find position within string. + // Returns the index where it begins or string::npos if not found + std::string::size_type find(const std::string& str) const; - //- Return true if it matches the entire string - // The begin-of-line (^) and end-of-line ($) anchors are implicit - bool match(const std::string&) const; + //- Return true if it matches the entire string + // The begin-of-line (^) and end-of-line ($) anchors are implicit + bool match(const std::string&) const; - //- Return true if it matches and sets the sub-groups matched - // The begin-of-line (^) and end-of-line ($) anchors are implicit - bool match(const string&, List& groups) const; + //- Return true if it matches and sets the sub-groups matched + // The begin-of-line (^) and end-of-line ($) anchors are implicit + bool match(const string&, List& groups) const; - //- Return true if the regex was found within string - bool search(const std::string& str) const - { - return std::string::npos != find(str); - } + //- Return true if the regex was found within string + bool search(const std::string& str) const + { + return std::string::npos != find(str); + } // Member Operators @@ -173,7 +179,6 @@ public: //- Assign and compile pattern from string // Always case sensitive void operator=(const std::string&); - }; diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C index 81c1a50ceb..93d6ebbdd7 100644 --- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C +++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C @@ -46,7 +46,6 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict) const entry& codeEntry = dict.lookupEntry("code", false, false); code_ = stringOps::trim(codeEntry.stream()); stringOps::inplaceExpand(code_, dict); - addLineDirective(code_, codeEntry.startLineNumber(), dict.name()); } // note: removes any leading/trailing whitespace @@ -64,7 +63,6 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict) { include_ = stringOps::trim(includePtr->stream()); stringOps::inplaceExpand(include_, dict); - addLineDirective(include_, includePtr->startLineNumber(), dict.name()); } // optional @@ -92,6 +90,28 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict) OSHA1stream os; os << include_ << options_ << libs_ << localCode_ << code_; sha1_ = os.digest(); + + + + // Add line number after calculating sha1 since includes processorDDD + // in path which differs between processors. + + { + const entry& codeEntry = dict.lookupEntry("code", false, false); + addLineDirective(code_, codeEntry.startLineNumber(), dict.name()); + } + if (includePtr) + { + addLineDirective(include_, includePtr->startLineNumber(), dict.name()); + } + if (optionsPtr) + { + addLineDirective(options_, optionsPtr->startLineNumber(), dict.name()); + } + if (libsPtr) + { + addLineDirective(libs_, libsPtr->startLineNumber(), dict.name()); + } } diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C index c1a2b66f1e..85590cc5e2 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C +++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,7 +96,8 @@ void Foam::plane::calcPntAndVec " const point&,\n" " const point&\n" ")\n" - ) << "Bad points." << abort(FatalError); + ) << "Bad points:" << point1 << ' ' << point2 << ' ' << point3 + << abort(FatalError); } unitVector_ = line12 ^ line23; @@ -112,7 +113,8 @@ void Foam::plane::calcPntAndVec " const point&,\n" " const point&\n" ")\n" - ) << "Plane normal defined with zero length" + ) << "Plane normal defined with zero length" << nl + << "Bad points:" << point1 << ' ' << point2 << ' ' << point3 << abort(FatalError); } @@ -137,7 +139,7 @@ Foam::plane::plane(const vector& normalVector) else { FatalErrorIn("plane::plane(const vector&)") - << "plane normal has zero length" + << "plane normal has zero length. basePoint:" << basePoint_ << abort(FatalError); } } @@ -158,7 +160,7 @@ Foam::plane::plane(const point& basePoint, const vector& normalVector) else { FatalErrorIn("plane::plane(const point&, const vector&)") - << "plane normal has zero length" + << "plane normal has zero length. basePoint:" << basePoint_ << abort(FatalError); } } @@ -228,8 +230,7 @@ Foam::plane::plane(const dictionary& dict) ( "plane::plane(const dictionary&)", dict - ) - << "Invalid plane type: " << planeType + ) << "Invalid plane type: " << planeType << abort(FatalIOError); } } @@ -250,7 +251,7 @@ Foam::plane::plane(Istream& is) else { FatalErrorIn("plane::plane(Istream& is)") - << "plane normal has zero length" + << "plane normal has zero length. basePoint:" << basePoint_ << abort(FatalError); } } diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H index 566f42af6c..4136aa02cb 100644 --- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H +++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,7 @@ SourceFiles #include "word.H" #include "regExp.H" +#include "keyType.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,7 +61,6 @@ namespace Foam // Forward declaration of friend functions and operators class wordRe; - class Istream; class Ostream; @@ -110,6 +110,7 @@ public: //- Test string for regular expression meta characters static inline bool isPattern(const string&); + // Constructors //- Construct null @@ -118,71 +119,83 @@ public: //- Construct as copy inline wordRe(const wordRe&); + //- Construct from keyType + inline wordRe(const keyType&, const compOption=LITERAL); + //- Construct as copy of word inline wordRe(const word&); //- Construct as copy of character array // Optionally specify how it should be treated. - inline wordRe(const char*, const compOption=LITERAL); + inline wordRe(const char*, const compOption = LITERAL); //- Construct as copy of string. // Optionally specify how it should be treated. - inline wordRe(const string&, const compOption=LITERAL); + inline wordRe(const string&, const compOption = LITERAL); //- Construct as copy of std::string // Optionally specify how it should be treated. - inline wordRe(const std::string&, const compOption=LITERAL); + inline wordRe(const std::string&, const compOption = LITERAL); //- Construct from Istream // Words are treated as literals, strings with an auto-test wordRe(Istream&); + // Member functions - //- Access + // Access - //- Should be treated as a match rather than a literal string? - inline bool isPattern() const; + //- Should be treated as a match rather than a literal string? + inline bool isPattern() const; - //- Infrastructure - //- Compile the regular expression - inline bool compile() const; + // Infrastructure - //- Possibly compile the regular expression, with greater control - inline bool compile(const compOption) const; + //- Compile the regular expression + inline bool compile() const; - //- Recompile an existing regular expression - inline bool recompile() const; + //- Possibly compile the regular expression, with greater control + inline bool compile(const compOption) const; - //- Frees precompiled regular expression, making wordRe a literal. - // Optionally strips invalid word characters - inline void uncompile(const bool doStripInvalid=false) const; + //- Recompile an existing regular expression + inline bool recompile() const; - //- Editing + //- Frees precompiled regular expression, making wordRe a literal. + // Optionally strips invalid word characters + inline void uncompile(const bool doStripInvalid = false) const; - //- Copy string, auto-test for regular expression or other options - inline void set(const std::string&, const compOption=DETECT); - //- Copy string, auto-test for regular expression or other options - inline void set(const char*, const compOption=DETECT); + // Editing - //- Clear string and precompiled regular expression - inline void clear(); + //- Copy string, auto-test for regular expression or other options + inline void set(const std::string&, const compOption = DETECT); - //- Searching + //- Copy string, auto-test for regular expression or other options + inline void set(const char*, const compOption = DETECT); - //- Smart match as regular expression or as a string - // Optionally force a literal match only - inline bool match(const std::string&, bool literalMatch=false) const; + //- Clear string and precompiled regular expression + inline void clear(); - //- Miscellaneous - //- Return a string with quoted meta-characters - inline string quotemeta() const; + // Searching - //- Output some basic info - Ostream& info(Ostream&) const; + //- Smart match as regular expression or as a string + // Optionally force a literal match only + inline bool match + ( + const std::string&, + bool literalMatch = false + ) const; + + + // Miscellaneous + + //- Return a string with quoted meta-characters + inline string quotemeta() const; + + //- Output some basic info + Ostream& info(Ostream&) const; // Member operators @@ -196,6 +209,10 @@ public: //- Copy word, never a regular expression inline const wordRe& operator=(const word&); + //- Copy keyType, auto-test for regular expression + // Always case sensitive + inline const wordRe& operator=(const keyType&); + //- Copy string, auto-test for regular expression // Always case sensitive inline const wordRe& operator=(const string&); diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordReI.H b/src/OpenFOAM/primitives/strings/wordRe/wordReI.H index 713c003064..fcbd1c3845 100644 --- a/src/OpenFOAM/primitives/strings/wordRe/wordReI.H +++ b/src/OpenFOAM/primitives/strings/wordRe/wordReI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,6 +65,18 @@ inline Foam::wordRe::wordRe(const word& str) {} +inline Foam::wordRe::wordRe(const keyType& str, const compOption opt) +: + word(str, false), + re_() +{ + if (str.isPattern()) + { + compile(opt); + } +} + + inline Foam::wordRe::wordRe(const char* str, const compOption opt) : word(str, false), @@ -236,6 +248,17 @@ inline const Foam::wordRe& Foam::wordRe::operator=(const word& str) } +inline const Foam::wordRe& Foam::wordRe::operator=(const keyType& str) +{ + string::operator=(str); + if (str.isPattern()) + { + compile(); + } + return *this; +} + + inline const Foam::wordRe& Foam::wordRe::operator=(const string& str) { string::operator=(str); diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C index 0d5d6ef768..e10e44d1ef 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,6 +109,12 @@ bool Foam::combineFaces::validFace return false; } + bool isNonManifold = bigFace.checkPointManifold(false, NULL); + if (isNonManifold) + { + return false; + } + // Check for convexness face f(getOutsideFace(bigFace)); @@ -984,6 +990,7 @@ void Foam::combineFaces::setUnrefinement zoneFlip // face flip in zone ) ); + restoredFaces.insert(masterFaceI, masterFaceI); // Add the previously removed faces for (label i = 1; i < faces.size(); i++) @@ -991,7 +998,7 @@ void Foam::combineFaces::setUnrefinement //Pout<< "Restoring removed face with vertices " << faces[i] // << endl; - meshMod.setAction + label faceI = meshMod.setAction ( polyAddFace ( @@ -1007,6 +1014,7 @@ void Foam::combineFaces::setUnrefinement zoneFlip // zoneFlip ) ); + restoredFaces.insert(faceI, masterFaceI); } // Clear out restored set diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C index 9d8e9ba2ca..4441e3a00d 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -302,6 +302,35 @@ void Foam::polyTopoChange::getMergeSets } +bool Foam::polyTopoChange::hasValidPoints(const face& f) const +{ + forAll(f, fp) + { + if (f[fp] < 0 || f[fp] >= points_.size()) + { + return false; + } + } + return true; +} + + +Foam::pointField Foam::polyTopoChange::facePoints(const face& f) const +{ + pointField points(f.size()); + forAll(f, fp) + { + if (f[fp] < 0 && f[fp] >= points_.size()) + { + FatalErrorIn("polyTopoChange::facePoints(const face&) const") + << "Problem." << abort(FatalError); + } + points[fp] = points_[f[fp]]; + } + return points; +} + + void Foam::polyTopoChange::checkFace ( const face& f, @@ -329,7 +358,14 @@ void Foam::polyTopoChange::checkFace << "f:" << f << " faceI(-1 if added face):" << faceI << " own:" << own << " nei:" << nei - << " patchI:" << patchI << abort(FatalError); + << " patchI:" << patchI << nl; + if (hasValidPoints(f)) + { + FatalError + << "points (removed points marked with " + << vector::max << ") " << facePoints(f); + } + FatalError << abort(FatalError); } } else @@ -344,7 +380,14 @@ void Foam::polyTopoChange::checkFace << "f:" << f << " faceI(-1 if added face):" << faceI << " own:" << own << " nei:" << nei - << " patchI:" << patchI << abort(FatalError); + << " patchI:" << patchI << nl; + if (hasValidPoints(f)) + { + FatalError + << "points (removed points marked with " + << vector::max << ") : " << facePoints(f); + } + FatalError << abort(FatalError); } if (nei <= own) @@ -358,7 +401,14 @@ void Foam::polyTopoChange::checkFace << "f:" << f << " faceI(-1 if added face):" << faceI << " own:" << own << " nei:" << nei - << " patchI:" << patchI << abort(FatalError); + << " patchI:" << patchI << nl; + if (hasValidPoints(f)) + { + FatalError + << "points (removed points marked with " + << vector::max << ") : " << facePoints(f); + } + FatalError << abort(FatalError); } } @@ -373,7 +423,14 @@ void Foam::polyTopoChange::checkFace << "f:" << f << " faceI(-1 if added face):" << faceI << " own:" << own << " nei:" << nei - << " patchI:" << patchI << abort(FatalError); + << " patchI:" << patchI << nl; + if (hasValidPoints(f)) + { + FatalError + << "points (removed points marked with " + << vector::max << ") : " << facePoints(f); + } + FatalError << abort(FatalError); } if (faceI >= 0 && faceI < faces_.size() && faceRemoved(faceI)) { @@ -386,7 +443,14 @@ void Foam::polyTopoChange::checkFace << "f:" << f << " faceI(-1 if added face):" << faceI << " own:" << own << " nei:" << nei - << " patchI:" << patchI << abort(FatalError); + << " patchI:" << patchI << nl; + if (hasValidPoints(f)) + { + FatalError + << "points (removed points marked with " + << vector::max << ") : " << facePoints(f); + } + FatalError << abort(FatalError); } forAll(f, fp) { @@ -401,7 +465,14 @@ void Foam::polyTopoChange::checkFace << "f:" << f << " faceI(-1 if added face):" << faceI << " own:" << own << " nei:" << nei - << " patchI:" << patchI << abort(FatalError); + << " patchI:" << patchI << nl; + if (hasValidPoints(f)) + { + FatalError + << "points (removed points marked with " + << vector::max << ") : " << facePoints(f); + } + FatalError << abort(FatalError); } } } @@ -729,8 +800,16 @@ void Foam::polyTopoChange::getFaceOrder << " neighbour " << faceNeighbour_[faceI] << " region " << region_[faceI] << endl << "This is usually caused by not specifying a patch for" - << " a boundary face." - << abort(FatalError); + << " a boundary face." << nl + << "Switch on the polyTopoChange::debug flag to catch" + << " this error earlier." << nl; + if (hasValidPoints(faces_[faceI])) + { + FatalError + << "points (removed points marked with " + << vector::max << ") " << facePoints(faces_[faceI]); + } + FatalError << abort(FatalError); } } } diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H index 1e5ae305ff..48b7862646 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -239,6 +239,12 @@ class polyTopoChange List& cellsFromCells ); + //- Are all face vertices valid + bool hasValidPoints(const face&) const; + + //- Return face points + pointField facePoints(const face& f) const; + //- Check inputs to modFace or addFace void checkFace ( diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C index cdaa9f83c7..a1e274d2c0 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C @@ -2615,9 +2615,12 @@ void Foam::autoLayerDriver::addLayers extrudeStatus ); - Info<< "Extruding " << countExtrusion(pp, extrudeStatus) - << " out of " << returnReduce(pp().size(), sumOp