From 7467c891bbd999fe0e72b6247e3b7cd1eb7804a8 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Thu, 11 Dec 2008 10:12:06 +0100 Subject: [PATCH] minor tweak for matching MPI types, documentation cosmetics --- etc/bashrc | 2 +- src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H | 4 ++-- src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H | 8 ++++---- src/Pstream/Allwmake | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index ec96457be24..35044f5b019 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -91,7 +91,7 @@ export WM_COMPILER_LIB_ARCH= # WM_JAVAC_OPTION = Opt | Debug : ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION -# WM_MPLIB = | OPENMPI| LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI +# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H index 6041ba202a5..386781c35bb 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H +++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H @@ -47,7 +47,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class OPstream Declaration + Class OPstream Declaration \*---------------------------------------------------------------------------*/ class OPstream @@ -160,7 +160,7 @@ public: void flush() {} - //- Add '\n' and flush stream + //- Add newline and flush stream void endl() {} diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H index cd3a03ec0cb..9fd9d988246 100644 --- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H +++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H @@ -48,7 +48,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class OSstream Declaration + Class OSstream Declaration \*---------------------------------------------------------------------------*/ class OSstream @@ -162,20 +162,20 @@ public: //- Flush stream virtual void flush(); - //- Add '\n' and flush stream + //- Add newline and flush stream virtual void endl(); //- Get width of output field virtual int width() const; //- Set width of output field (and return old width) - virtual int width(const int w); + virtual int width(const int); //- Get precision of output field virtual int precision() const; //- Set precision of output field (and return old precision) - virtual int precision(const int p); + virtual int precision(const int); // Print diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index 3083370ad76..f43c2b1a30a 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -5,7 +5,11 @@ set -x wmake libso dummy case "$WM_MPLIB" in -LAM | OPENMPI | MPI | MPICH | MPICH-GM | HPMPI | MPIGAMMA ) +GAMMA) + wmake libso gamma + ;; + +LAM | *MPI* ) export WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB set +x echo @@ -13,10 +17,6 @@ LAM | OPENMPI | MPI | MPICH | MPICH-GM | HPMPI | MPIGAMMA ) set -x wmake libso mpi ;; - -GAMMA) - wmake libso gamma - ;; esac # ----------------------------------------------------------------- end-of-file -- GitLab