From d3ab1df730acb4b34a0ddbaffe1072717b564dfa Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 19 Dec 2008 19:04:09 +0100 Subject: [PATCH 01/20] fixed silly mistakes in wmakePrintBuild --- wmake/wmakePrintBuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild index 868357fe58..65a5d83671 100755 --- a/wmake/wmakePrintBuild +++ b/wmake/wmakePrintBuild @@ -61,15 +61,15 @@ do -h | -help) usage ;; - -check) + -c | -check) checkOnly=true shift ;; - -update) + -u | -update) update=true shift ;; - -version) + -v | -version) [ "$#" -ge 2 ] || usage "'$1' option requires an argument" version=$2 shift 2 @@ -108,14 +108,14 @@ fi # update persistent build tag if possible if [ $rc -eq 0 -a -n "$update" -a "$version" != "$previous" ] then - if [ -w "$build" -a \( -w "$WM_PROJECT_DIR" -o ! -e "$build" \) ] + if [ -w "$build" -o \( -w "$WM_PROJECT_DIR" -a ! -e "$build" \) ] then echo $version >| "$build" 2>/dev/null fi fi -# check git vs. persistent build tag - no output +# check git vs. persistent build tag if [ -n "$checkOnly" ] then if [ $rc -eq 0 ] From 1389f61287a8dddfea97183bdc6ecab54bbc26d4 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 31 Dec 2008 14:55:00 +0100 Subject: [PATCH 02/20] rename PrimitiveMeshedSurface -> BasicMeshedSurface --- .../BasicMeshedSurface.C} | 46 +++++++++---------- .../BasicMeshedSurface.H} | 28 +++++------ src/surfMesh/MeshedSurface/MeshedSurface.H | 6 +-- .../UnsortedMeshedSurface.H | 6 +-- 4 files changed, 43 insertions(+), 43 deletions(-) rename src/surfMesh/{PrimitiveMeshedSurface/PrimitiveMeshedSurface.C => BasicMeshedSurface/BasicMeshedSurface.C} (89%) rename src/surfMesh/{PrimitiveMeshedSurface/PrimitiveMeshedSurface.H => BasicMeshedSurface/BasicMeshedSurface.H} (89%) diff --git a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C similarity index 89% rename from src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C rename to src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C index 6c4337e3b2..1a5659a5e9 100644 --- a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C +++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C @@ -24,13 +24,13 @@ License \*---------------------------------------------------------------------------*/ -#include "PrimitiveMeshedSurface.H" +#include "BasicMeshedSurface.H" #include "boundBox.H" #include "mergePoints.H" // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // template -inline bool Foam::PrimitiveMeshedSurface::isTri() +inline bool Foam::BasicMeshedSurface::isTri() { return false; } @@ -39,14 +39,14 @@ inline bool Foam::PrimitiveMeshedSurface::isTri() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::PrimitiveMeshedSurface::PrimitiveMeshedSurface() +Foam::BasicMeshedSurface::BasicMeshedSurface() : ParentType(List(), pointField()) {} template -Foam::PrimitiveMeshedSurface::PrimitiveMeshedSurface +Foam::BasicMeshedSurface::BasicMeshedSurface ( const xfer& pointLst, const xfer >& faceLst @@ -61,14 +61,14 @@ Foam::PrimitiveMeshedSurface::PrimitiveMeshedSurface // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::PrimitiveMeshedSurface::~PrimitiveMeshedSurface() +Foam::BasicMeshedSurface::~BasicMeshedSurface() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void Foam::PrimitiveMeshedSurface::clear() +void Foam::BasicMeshedSurface::clear() { ParentType::clearOut(); @@ -78,7 +78,7 @@ void Foam::PrimitiveMeshedSurface::clear() template -void Foam::PrimitiveMeshedSurface::movePoints(const pointField& newPoints) +void Foam::BasicMeshedSurface::movePoints(const pointField& newPoints) { // Remove all geometry dependent data ParentType::clearTopology(); @@ -92,7 +92,7 @@ void Foam::PrimitiveMeshedSurface::movePoints(const pointField& newPoints) template -void Foam::PrimitiveMeshedSurface::scalePoints(const scalar& scaleFactor) +void Foam::BasicMeshedSurface::scalePoints(const scalar& scaleFactor) { // avoid bad scaling if (scaleFactor > 0 && scaleFactor != 1.0) @@ -109,7 +109,7 @@ void Foam::PrimitiveMeshedSurface::scalePoints(const scalar& scaleFactor) template -void Foam::PrimitiveMeshedSurface::reset +void Foam::BasicMeshedSurface::reset ( const xfer& pointLst, const xfer >& faceLst @@ -133,7 +133,7 @@ void Foam::PrimitiveMeshedSurface::reset // Remove badly degenerate faces, double faces. template -void Foam::PrimitiveMeshedSurface::cleanup(const bool verbose) +void Foam::BasicMeshedSurface::cleanup(const bool verbose) { // merge points (already done for STL, TRI) stitchFaces(SMALL, verbose); @@ -144,7 +144,7 @@ void Foam::PrimitiveMeshedSurface::cleanup(const bool verbose) template -bool Foam::PrimitiveMeshedSurface::stitchFaces +bool Foam::BasicMeshedSurface::stitchFaces ( const scalar tol, const bool verbose @@ -165,7 +165,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces if (verbose) { - Info<< "PrimitiveMeshedSurface::stitchFaces : Renumbering all faces" + Info<< "BasicMeshedSurface::stitchFaces : Renumbering all faces" << endl; } @@ -198,7 +198,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces } else if (verbose) { - Pout<< "PrimitiveMeshedSurface::stitchFaces : " + Pout<< "BasicMeshedSurface::stitchFaces : " << "Removing collapsed face " << faceI << endl << " vertices :" << f << endl; } @@ -209,7 +209,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces { if (verbose) { - Pout<< "PrimitiveMeshedSurface::stitchFaces : " + Pout<< "BasicMeshedSurface::stitchFaces : " << "Removed " << faceLst.size() - newFaceI << " faces" << endl; } @@ -226,7 +226,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces // Remove badly degenerate faces and double faces. template -bool Foam::PrimitiveMeshedSurface::checkFaces +bool Foam::BasicMeshedSurface::checkFaces ( const bool verbose ) @@ -250,7 +250,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { if (f[fp] < 0 || f[fp] > maxPointI) { - FatalErrorIn("PrimitiveMeshedSurface::checkFaces(bool)") + FatalErrorIn("BasicMeshedSurface::checkFaces(bool)") << "face " << f << " uses point indices outside point range 0.." << maxPointI @@ -271,7 +271,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { WarningIn ( - "PrimitiveMeshedSurface::checkFaces(bool verbose)" + "BasicMeshedSurface::checkFaces(bool verbose)" ) << "face[" << faceI << "] = " << f << " does not have three unique vertices" << endl; } @@ -319,7 +319,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { WarningIn ( - "PrimitiveMeshedSurface::checkFaces(bool verbose)" + "BasicMeshedSurface::checkFaces(bool verbose)" ) << "faces share the same vertices:" << nl << " face[" << faceI << "] : " << f << nl << " face[" << neiFaceI << "] : " << nei << endl; @@ -353,7 +353,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { WarningIn ( - "PrimitiveMeshedSurface::checkFaces(bool verbose)" + "BasicMeshedSurface::checkFaces(bool verbose)" ) << "Removed " << faceLst.size() - newFaceI << " illegal faces." << endl; } @@ -385,7 +385,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces template -Foam::label Foam::PrimitiveMeshedSurface::triangulate() +Foam::label Foam::BasicMeshedSurface::triangulate() { return triangulate ( @@ -395,7 +395,7 @@ Foam::label Foam::PrimitiveMeshedSurface::triangulate() template -Foam::label Foam::PrimitiveMeshedSurface::triangulate +Foam::label Foam::BasicMeshedSurface::triangulate ( List