From 65e56915fcda191f0bf6a69fdf61bfaf800c4aa8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 4 Dec 2009 13:02:34 +0100
Subject: [PATCH] add single-line version/build info to argList::printUsage
---
src/OSspecific/POSIX/signals/sigInt.C | 6 +++---
src/OSspecific/POSIX/signals/sigQuit.C | 6 +++---
src/OSspecific/POSIX/signals/sigSegv.C | 6 +++---
src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C | 2 +-
src/OpenFOAM/global/argList/argList.C | 6 +++++-
src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C | 2 +-
.../meshes/meshShapes/cellMatcher/prismMatcher.C | 9 ++++-----
.../meshes/meshShapes/cellMatcher/tetWedgeMatcher.C | 3 +--
.../meshes/meshShapes/cellMatcher/wedgeMatcher.C | 3 +--
9 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/OSspecific/POSIX/signals/sigInt.C b/src/OSspecific/POSIX/signals/sigInt.C
index 1f3555ec874..770cba0f569 100644
--- a/src/OSspecific/POSIX/signals/sigInt.C
+++ b/src/OSspecific/POSIX/signals/sigInt.C
@@ -44,7 +44,7 @@ void Foam::sigInt::sigIntHandler(int)
(
"Foam::sigInt::sigIntHandler()"
) << "Cannot reset SIGINT trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
// Update jobInfo file
@@ -74,7 +74,7 @@ Foam::sigInt::~sigInt()
(
"Foam::sigInt::~sigInt()"
) << "Cannot reset SIGINT trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
}
@@ -102,7 +102,7 @@ void Foam::sigInt::set(const bool verbose)
(
"Foam::sigInt::set()"
) << "Cannot set SIGINT trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
}
diff --git a/src/OSspecific/POSIX/signals/sigQuit.C b/src/OSspecific/POSIX/signals/sigQuit.C
index 7c67c903bc9..0bf302f78e6 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.C
+++ b/src/OSspecific/POSIX/signals/sigQuit.C
@@ -44,7 +44,7 @@ void Foam::sigQuit::sigQuitHandler(int)
(
"Foam::sigQuit::sigQuitHandler()"
) << "Cannot reset SIGQUIT trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
// Update jobInfo file
@@ -76,7 +76,7 @@ Foam::sigQuit::~sigQuit()
(
"Foam::sigQuit::~sigQuit()"
) << "Cannot reset SIGQUIT trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
}
@@ -104,7 +104,7 @@ void Foam::sigQuit::set(const bool verbose)
(
"Foam::sigQuit::set()"
) << "Cannot set SIGQUIT trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
}
diff --git a/src/OSspecific/POSIX/signals/sigSegv.C b/src/OSspecific/POSIX/signals/sigSegv.C
index 14ab77ffe32..89c750acca4 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.C
+++ b/src/OSspecific/POSIX/signals/sigSegv.C
@@ -44,7 +44,7 @@ void Foam::sigSegv::sigSegvHandler(int)
(
"Foam::sigSegv::sigSegvHandler()"
) << "Cannot reset SIGSEGV trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
// Update jobInfo file
@@ -76,7 +76,7 @@ Foam::sigSegv::~sigSegv()
(
"Foam::sigSegv::~sigSegv()"
) << "Cannot reset SIGSEGV trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
}
@@ -104,7 +104,7 @@ void Foam::sigSegv::set(const bool verbose)
(
"Foam::sigSegv::set()"
) << "Cannot set SIGSEGV trapping"
- << abort(FatalError);
+ << abort(FatalError);
}
}
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
index 96515eb22aa..81dcaf5919a 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
@@ -68,7 +68,7 @@ bool Foam::dlLibraryTable::open(const fileName& functionLibName)
{
if (functionLibName.size())
{
- void* functionLibPtr =
+ void* functionLibPtr =
dlopen(functionLibName.c_str(), RTLD_LAZY|RTLD_GLOBAL);
if (!functionLibPtr)
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 94916f08a69..ef9ce59f802 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -807,7 +807,11 @@ void Foam::argList::printUsage() const
7,
"print the usage"
);
- Info<< endl;
+
+ Info<< nl
+ <<"Using OpenFOAM-" << Foam::FOAMversion
+ <<" (build: " << Foam::FOAMbuild << ") - see www.OpenFOAM.org"
+ << nl << endl;
}
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
index a103772bb0d..ed9c7057cc9 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
@@ -99,7 +99,7 @@ Foam::label Foam::cell::opposingFaceLabel
{
// There has already been an opposite face.
// Non-prismatic cell
- Info<< "Multiple faces not sharing vertex: "
+ Info<< "Multiple faces not sharing vertex: "
<< oppositeFaceLabel << " and "
<< curFaceLabels[faceI] << endl;
return -1;
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C
index d3b235cab03..76be6969b1d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C
@@ -37,7 +37,6 @@ const Foam::label Foam::prismMatcher::maxVertPerFace = 4;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::prismMatcher::prismMatcher()
:
cellMatcher
@@ -89,7 +88,7 @@ bool Foam::prismMatcher::matchShape
faceLabels_.setSize(facePerCell);
//
- // Try first triangular face.
+ // Try first triangular face.
// Only need to try one orientation of this face since prism is
// rotation symmetric
//
@@ -223,7 +222,7 @@ bool Foam::prismMatcher::matchShape
// Walk face 0 from vertex 1 to 2
- label face0vert2 =
+ label face0vert2 =
nextVert
(
face0vert1,
@@ -257,7 +256,7 @@ bool Foam::prismMatcher::matchShape
// << " at position " << face3vert2 << " in face " << face3
// << endl;
- label face3vert5 =
+ label face3vert5 =
nextVert
(
face3vert2,
@@ -313,7 +312,7 @@ bool Foam::prismMatcher::faceSizeMatch
label nTris = 0;
label nQuads = 0;
-
+
forAll(myFaces, myFaceI)
{
label size = faces[myFaces[myFaceI]].size();
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C
index 804f9ee4d47..b917573b3b7 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C
@@ -40,7 +40,6 @@ const Foam::label Foam::tetWedgeMatcher::maxVertPerFace = 4;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct null
Foam::tetWedgeMatcher::tetWedgeMatcher()
:
cellMatcher
@@ -241,7 +240,7 @@ bool Foam::tetWedgeMatcher::faceSizeMatch
label nTris = 0;
label nQuads = 0;
-
+
forAll(myFaces, myFaceI)
{
label size = faces[myFaces[myFaceI]].size();
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C
index ee29cae3288..d04a1a45f1d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C
@@ -37,7 +37,6 @@ const Foam::label Foam::wedgeMatcher::maxVertPerFace = 4;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct null
Foam::wedgeMatcher::wedgeMatcher()
:
cellMatcher
@@ -340,7 +339,7 @@ bool Foam::wedgeMatcher::faceSizeMatch
label nTris = 0;
label nQuads = 0;
-
+
forAll(myFaces, myFaceI)
{
label size = faces[myFaces[myFaceI]].size();
--
GitLab