From 1c23a963785bb78bc3e0059b62877fb605908dce Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 3 May 2011 16:29:06 +0100 Subject: [PATCH] STYLE: Correcting coding style of commit 6217691 --- .../tableReaders/csv/csvTableReader.C | 2 +- .../tableReaders/csv/csvTableReader.H | 34 ++++++++++--------- .../tableReaders/csv/csvTableReaders.C | 2 +- .../openFoam/openFoamTableReader.C | 2 +- .../openFoam/openFoamTableReader.H | 13 ++++--- .../openFoam/openFoamTableReaders.C | 2 +- .../tableReaders/tableReader.C | 2 +- .../tableReaders/tableReader.H | 8 ++--- .../tableReaders/tableReaders.C | 2 +- .../tableReaders/tableReaders.H | 2 +- .../sampledSet/writers/csv/csvSetWriter.C | 2 +- .../sampledSet/writers/csv/csvSetWriter.H | 8 +++-- .../writers/csv/csvSetWriterRunTime.C | 2 +- src/sampling/sampledSet/writers/writer.H | 1 + 14 files changed, 42 insertions(+), 40 deletions(-) diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C index 3e8618c17f..fc500af4aa 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H index 3c823f2e19..30c9e8d9eb 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::tableReader + Foam::csvTableReader Description Reads an interpolation table from a file - CSV-format @@ -44,7 +44,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class csvTableReader Declaration + Class csvTableReader Declaration \*---------------------------------------------------------------------------*/ template @@ -52,26 +52,30 @@ class csvTableReader : public tableReader { - //- does the file have a header line? - const bool headerLine_; + // Private data - //- column of the time - const label timeColumn_; + //- Does the file have a header line? + const bool headerLine_; - //- labels of the components - const labelList componentColumns_; + //- Column of the time + const label timeColumn_; - //- read the next value from the splitted string - Type readValue(const List&); + //- Labels of the components + const labelList componentColumns_; + + //- Read the next value from the splitted string + Type readValue(const List&); + + //- Separator character + const char separator_; - //- separator character - const char separator_; public: //- Runtime type information TypeName("csv"); + // Constructors //- Construct from dictionary @@ -91,8 +95,7 @@ public: //- Destructor - - virtual ~csvTableReader(); + virtual ~csvTableReader(); // Member Functions @@ -102,7 +105,6 @@ public: //- write the remaining parameters virtual void write(Ostream& os) const; - }; diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C index 5893436dd9..a6ffe258d6 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C index 3ad1a87510..10a04b2bb1 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H index dd04df78d6..b62ef62f5d 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::tableReader + Foam::openFoamTableReader Description Reads an interpolation table from a file - OpenFOAM-format @@ -32,7 +32,7 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef openFoamTableReader_H +#ifndef TTableReader_H #define openFoamTableReader_H #include "tableReader.H" @@ -43,7 +43,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class openFoamTableReader Declaration + Class openFoamTableReader Declaration \*---------------------------------------------------------------------------*/ template @@ -57,6 +57,7 @@ public: //- Runtime type information TypeName("openFoam"); + // Constructors //- Construct from dictionary @@ -76,15 +77,13 @@ public: //- Destructor - - virtual ~openFoamTableReader(); + virtual ~openFoamTableReader(); // Member functions //- Read the table virtual void operator()(const fileName&, List > &); - }; diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C index 8dd7db0a9f..847ac1dabb 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C index bcad2aa965..8f8a5548a6 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H index b85af66c10..9020fbd133 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class tableReader Declaration + Class tableReader Declaration \*---------------------------------------------------------------------------*/ template @@ -91,8 +91,7 @@ public: //- Destructor - - virtual ~tableReader(); + virtual ~tableReader(); // Member functions @@ -106,7 +105,6 @@ public: //- Write additional information virtual void write(Ostream& os) const; - }; diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C index a28c83218f..2500070484 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H index 9507ac2bfb..8e1c8a0561 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.C b/src/sampling/sampledSet/writers/csv/csvSetWriter.C index c0b0b694ed..a102057626 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriter.C +++ b/src/sampling/sampledSet/writers/csv/csvSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.H b/src/sampling/sampledSet/writers/csv/csvSetWriter.H index 04987fea2a..1bbff35435 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriter.H +++ b/src/sampling/sampledSet/writers/csv/csvSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ Class Foam::csvSetWriter Description + Write set in csv format SourceFiles csvSetWriter.C @@ -57,10 +58,12 @@ class csvSetWriter void writeHeader(const coordSet&, const wordList&, Ostream&) const; + protected: virtual void writeSeparator(Ostream&) const; + public: //- Runtime type information @@ -74,8 +77,7 @@ public: //- Destructor - - virtual ~csvSetWriter(); + virtual ~csvSetWriter(); // Member Functions diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C b/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C index 2c22b5f227..5618e4abf3 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C +++ b/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/writer.H b/src/sampling/sampledSet/writers/writer.H index 6fb810dc1f..c239312656 100644 --- a/src/sampling/sampledSet/writers/writer.H +++ b/src/sampling/sampledSet/writers/writer.H @@ -110,6 +110,7 @@ protected: //- Writes a separator. Used by write functions. virtual void writeSeparator(Ostream& os) const; + public: //- Runtime type information