diff --git a/src/sampling/Make/files b/src/sampling/Make/files index 9e4a5f1bb4..3029668f86 100644 --- a/src/sampling/Make/files +++ b/src/sampling/Make/files @@ -13,10 +13,10 @@ sampledSet/sampledSets/sampledSets.C sampledSet/sampledSetsFunctionObject/sampledSetsFunctionObject.C sampledSet/writers/writer/writers.C +sampledSet/writers/raw/rawWriters.C sampledSet/writers/xmgr/xmgrWriters.C sampledSet/writers/gnuplot/gnuplotWriters.C sampledSet/writers/jplot/jplotWriters.C -sampledSet/writers/raw/rawWriters.C cuttingPlane/cuttingPlane.C diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplot.H b/src/sampling/sampledSet/writers/gnuplot/gnuplot.H index 8e0dfd5582..d531ac4aeb 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplot.H +++ b/src/sampling/sampledSet/writers/gnuplot/gnuplot.H @@ -63,28 +63,26 @@ public: //- Construct null gnuplot(); - // Destructor - virtual ~gnuplot(); + //- Destructor + virtual ~gnuplot(); // Member Functions - // Write + virtual fileName getFileName + ( + const coordSet&, + const wordList& + ) const; - virtual fileName getFileName - ( - const coordSet&, - const wordList& - ) const; - - void write - ( - const coordSet&, - const wordList&, - const List*>&, - Ostream& os - ) const; + void write + ( + const coordSet&, + const wordList&, + const List*>&, + Ostream& os + ) const; }; diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.C b/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.C index d5e58405c7..7abc5c8fd0 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.C +++ b/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "gnuplotWriters.H" @@ -33,13 +31,7 @@ Description namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeWriters(gnuplot); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWriters(gnuplot) +} // ************************************************************************* // diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.H b/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.H index 4a8a456576..6f125366f2 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.H +++ b/src/sampling/sampledSet/writers/gnuplot/gnuplotWriters.H @@ -25,12 +25,9 @@ License InClass Foam::gnuplotWriters -Description - SourceFiles gnuplotWriters.C - \*---------------------------------------------------------------------------*/ #ifndef gnuplotWriters_H @@ -44,16 +41,8 @@ SourceFiles namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -typedef gnuplot gnuplotScalarWriter; -typedef gnuplot gnuplotVectorWriter; -typedef gnuplot gnuplotTensorWriter; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWritersTypedefs(gnuplot) +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSet/writers/jplot/jplot.H b/src/sampling/sampledSet/writers/jplot/jplot.H index 3fe254255a..45a39ebe16 100644 --- a/src/sampling/sampledSet/writers/jplot/jplot.H +++ b/src/sampling/sampledSet/writers/jplot/jplot.H @@ -25,8 +25,6 @@ License Class Foam::jplot -Description - SourceFiles jplot.C @@ -43,8 +41,6 @@ SourceFiles namespace Foam { -// Forward declaration of classes - /*---------------------------------------------------------------------------*\ Class jplot Declaration \*---------------------------------------------------------------------------*/ @@ -71,30 +67,26 @@ public: //- Construct null jplot(); - // Destructor - virtual ~jplot(); + //- Destructor + virtual ~jplot(); // Member Functions - // Access + virtual fileName getFileName + ( + const coordSet&, + const wordList& + ) const; - // Write - - virtual fileName getFileName - ( - const coordSet&, - const wordList& - ) const; - - void write - ( - const coordSet&, - const wordList&, - const List*>&, - Ostream& os - ) const; + void write + ( + const coordSet&, + const wordList&, + const List*>&, + Ostream& os + ) const; }; diff --git a/src/sampling/sampledSet/writers/jplot/jplotWriters.C b/src/sampling/sampledSet/writers/jplot/jplotWriters.C index 696f60b579..b117178971 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotWriters.C +++ b/src/sampling/sampledSet/writers/jplot/jplotWriters.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "jplotWriters.H" @@ -33,13 +31,7 @@ Description namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeWriters(jplot); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWriters(jplot) +} // ************************************************************************* // diff --git a/src/sampling/sampledSet/writers/jplot/jplotWriters.H b/src/sampling/sampledSet/writers/jplot/jplotWriters.H index 4971b1ce5d..21b0121ec0 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotWriters.H +++ b/src/sampling/sampledSet/writers/jplot/jplotWriters.H @@ -25,12 +25,9 @@ License InClass Foam::jplotWriters -Description - SourceFiles jplotWriters.C - \*---------------------------------------------------------------------------*/ #ifndef jplotWriters_H @@ -44,16 +41,8 @@ SourceFiles namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -typedef jplot jplotScalarWriter; -typedef jplot jplotVectorWriter; -typedef jplot jplotTensorWriter; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWritersTypedefs(jplot) +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSet/writers/raw/raw.H b/src/sampling/sampledSet/writers/raw/raw.H index e66a7fe83a..1f4b856f66 100644 --- a/src/sampling/sampledSet/writers/raw/raw.H +++ b/src/sampling/sampledSet/writers/raw/raw.H @@ -64,28 +64,25 @@ public: raw(); - // Destructor - - virtual ~raw(); + //- Destructor + virtual ~raw(); // Member Functions - // Write + virtual fileName getFileName + ( + const coordSet&, + const wordList& + ) const; - virtual fileName getFileName - ( - const coordSet&, - const wordList& - ) const; - - virtual void write - ( - const coordSet&, - const wordList&, - const List*>&, - Ostream& os - ) const; + virtual void write + ( + const coordSet&, + const wordList&, + const List*>&, + Ostream& os + ) const; }; diff --git a/src/sampling/sampledSet/writers/raw/rawWriters.C b/src/sampling/sampledSet/writers/raw/rawWriters.C index a8bf0df14e..0b3a28898c 100644 --- a/src/sampling/sampledSet/writers/raw/rawWriters.C +++ b/src/sampling/sampledSet/writers/raw/rawWriters.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "rawWriters.H" @@ -33,13 +31,7 @@ Description namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeWriters(raw); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWriters(raw) +} // ************************************************************************* // diff --git a/src/sampling/sampledSet/writers/raw/rawWriters.H b/src/sampling/sampledSet/writers/raw/rawWriters.H index e121a6dd6f..020b750fe2 100644 --- a/src/sampling/sampledSet/writers/raw/rawWriters.H +++ b/src/sampling/sampledSet/writers/raw/rawWriters.H @@ -25,12 +25,9 @@ License InClass Foam::rawWriters -Description - SourceFiles rawWriters.C - \*---------------------------------------------------------------------------*/ #ifndef rawWriters_H @@ -44,16 +41,8 @@ SourceFiles namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -typedef raw rawScalarWriter; -typedef raw rawVectorWriter; -typedef raw rawTensorWriter; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWritersTypedefs(raw) +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSet/writers/writer/writer.C b/src/sampling/sampledSet/writers/writer/writer.C index e629e546f0..b16cbd214f 100644 --- a/src/sampling/sampledSet/writers/writer/writer.C +++ b/src/sampling/sampledSet/writers/writer/writer.C @@ -31,11 +31,11 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -namespace Foam -{ - template -autoPtr > writer::New(const word& writeType) +Foam::autoPtr > Foam::writer::New +( + const word& writeType +) { typename wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_ @@ -60,7 +60,7 @@ autoPtr > writer::New(const word& writeType) // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -fileName writer::getBaseName +Foam::fileName Foam::writer::getBaseName ( const coordSet& points, const wordList& valueSets @@ -78,7 +78,7 @@ fileName writer::getBaseName template -void writer::writeCoord +void Foam::writer::writeCoord ( const coordSet& points, const label pointI, @@ -97,7 +97,7 @@ void writer::writeCoord template -void writer::writeTable +void Foam::writer::writeTable ( const coordSet& points, const List& values, @@ -109,16 +109,14 @@ void writer::writeTable writeCoord(points, pointI, os); os << token::SPACE; - write(values[pointI], os); - os << endl; } } template -void writer::writeTable +void Foam::writer::writeTable ( const coordSet& points, const List*>& valuesPtrList, @@ -132,9 +130,7 @@ void writer::writeTable forAll(valuesPtrList, i) { os << token::SPACE; - const List& values = *valuesPtrList[i]; - write(values[pointI], os); } os << endl; @@ -144,36 +140,44 @@ void writer::writeTable // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct null template -writer::writer() +Foam::writer::writer() {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -writer::~writer() +Foam::writer::~writer() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -Foam::Ostream& Foam::writer::write(const scalar value, Ostream& os) const +Foam::Ostream& Foam::writer::write +( + const scalar value, + Ostream& os +) const { return os << value; } template -Foam::Ostream& Foam::writer::write(const vector& value, Ostream& os) const +template +Foam::Ostream& Foam::writer::writeVS +( + const VSType& value, + Ostream& os +) const { - for (direction d=0; d::write(const vector& value, Ostream& os) const template -Foam::Ostream& Foam::writer::write(const tensor& value, Ostream& os) const +Foam::Ostream& Foam::writer::write +( + const vector& value, + Ostream& os +) const { - for (direction d=0; d +Foam::Ostream& Foam::writer::write +( + const sphericalTensor& value, + Ostream& os +) const +{ + return writeVS(value, os); +} + + +template +Foam::Ostream& Foam::writer::write +( + const symmTensor& value, + Ostream& os +) const +{ + return writeVS(value, os); +} + + +template +Foam::Ostream& Foam::writer::write +( + const tensor& value, + Ostream& os +) const +{ + return writeVS(value, os); +} -} // End namespace Foam // ************************************************************************* // diff --git a/src/sampling/sampledSet/writers/writer/writer.H b/src/sampling/sampledSet/writers/writer/writer.H index 3751df2f5e..73fe2fd10f 100644 --- a/src/sampling/sampledSet/writers/writer/writer.H +++ b/src/sampling/sampledSet/writers/writer/writer.H @@ -29,8 +29,8 @@ Description Base class for graphics format writing. Entry points are - write(..). \n Write to an Ostream a table of points with corresponding values. - - write(scalar/vector/tensor). \n - Write single scalar/vector/tensor. + - write(scalar/vector/sphericalTensor/symmTensor/tensor). \n + Write single scalar/vector/sphericalTensor/symmTensor/tensor. Default is to write space separated components. Example: @@ -151,43 +151,47 @@ public: writer(); - // Destructor - - virtual ~writer() = 0; + //- Destructor + virtual ~writer() = 0; // Member Functions - // Access + //- Generate file name with correct extension + virtual fileName getFileName + ( + const coordSet&, + const wordList& + ) const = 0; - // Write + //- General entry point for writing. + // The data is organized in a set of point with one or + // more values per point + virtual void write + ( + const coordSet&, + const wordList&, + const List*>&, + Ostream& + ) const = 0; - //- Generate file name with correct extension - virtual fileName getFileName - ( - const coordSet&, - const wordList& - ) const = 0; + //- Write scalar as ascii + virtual Ostream& write(const scalar, Ostream&) const; - //- General entry point for writing. - // The data is organized in a set of point with one or - // more values per point - virtual void write - ( - const coordSet&, - const wordList&, - const List*>&, - Ostream& - ) const = 0; + template + Ostream& writeVS(const VSType& value, Ostream& os) const; - //- Write scalar as ascii - virtual Ostream& write(const scalar, Ostream&) const; + //- Write vector. Tab separated ascii + virtual Ostream& write(const vector&, Ostream&) const; - //- Write vector. Tab separated ascii - virtual Ostream& write(const vector&, Ostream&) const; + //- Write sphericalTensor. Tab separated ascii + virtual Ostream& write(const sphericalTensor&, Ostream&) const; - //- Write tensor. Tab separated ascii - virtual Ostream& write(const tensor&, Ostream&) const; + //- Write symmTensor. Tab separated ascii + virtual Ostream& write(const symmTensor&, Ostream&) const; + + //- Write tensor. Tab separated ascii + virtual Ostream& write(const tensor&, Ostream&) const; }; @@ -202,34 +206,47 @@ public: #endif // Only used internally -#define makeTypeWritersTypeName(type) \ - \ +#define makeTypeWritersTypeName(type) \ + \ defineNamedTemplateTypeNameAndDebug(type, 0); // Used externally sometimes -#define makeWritersTypeName(typeWriter) \ - \ -makeTypeWritersTypeName(typeWriter##ScalarWriter); \ -makeTypeWritersTypeName(typeWriter##VectorWriter); \ +#define makeWritersTypeName(typeWriter) \ + \ +makeTypeWritersTypeName(typeWriter##ScalarWriter); \ +makeTypeWritersTypeName(typeWriter##VectorWriter); \ +makeTypeWritersTypeName(typeWriter##SphericalTensorWriter); \ +makeTypeWritersTypeName(typeWriter##SymmTensorWriter); \ makeTypeWritersTypeName(typeWriter##TensorWriter); // Define type info for single template instantiation (e.g. vector) -#define makeWriterTypes(WriterType, type) \ - \ -defineNamedTemplateTypeNameAndDebug(type, 0); \ - \ -addToRunTimeSelectionTable \ -( \ - WriterType, type, word \ +#define makeWriterTypes(WriterType, type) \ + \ +defineNamedTemplateTypeNameAndDebug(type, 0); \ + \ +addToRunTimeSelectionTable \ +( \ + WriterType, type, word \ ); // Define type info info for scalar, vector etc. instantiations -#define makeWriters(typeWriter) \ - \ -makeWriterTypes(scalarWriter, typeWriter##ScalarWriter); \ -makeWriterTypes(vectorWriter, typeWriter##VectorWriter); \ -makeWriterTypes(tensorWriter, typeWriter##TensorWriter); +#define makeWriters(typeWriter) \ + \ +makeWriterTypes(writerScalarWriter, typeWriter##ScalarWriter); \ +makeWriterTypes(writerVectorWriter, typeWriter##VectorWriter); \ +makeWriterTypes(writerSphericalTensorWriter, typeWriter##SphericalTensorWriter);\ +makeWriterTypes(writerSymmTensorWriter, typeWriter##SymmTensorWriter); \ +makeWriterTypes(writerTensorWriter, typeWriter##TensorWriter); + + +#define makeWritersTypedefs(typeWriter) \ + \ +typedef typeWriter typeWriter##ScalarWriter; \ +typedef typeWriter typeWriter##VectorWriter; \ +typedef typeWriter typeWriter##SphericalTensorWriter; \ +typedef typeWriter typeWriter##SymmTensorWriter; \ +typedef typeWriter typeWriter##TensorWriter; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSet/writers/writer/writers.C b/src/sampling/sampledSet/writers/writer/writers.C index 9c0598a9f9..8aaa5c4127 100644 --- a/src/sampling/sampledSet/writers/writer/writers.C +++ b/src/sampling/sampledSet/writers/writer/writers.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "writers.H" @@ -35,20 +33,20 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -defineNamedTemplateTypeNameAndDebug(scalarWriter, 0); -defineTemplateRunTimeSelectionTable(scalarWriter, word); +defineNamedTemplateTypeNameAndDebug(writerScalarWriter, 0); +defineTemplateRunTimeSelectionTable(writerScalarWriter, word); -defineNamedTemplateTypeNameAndDebug(vectorWriter, 0); -defineTemplateRunTimeSelectionTable(vectorWriter, word); +defineNamedTemplateTypeNameAndDebug(writerVectorWriter, 0); +defineTemplateRunTimeSelectionTable(writerVectorWriter, word); -defineNamedTemplateTypeNameAndDebug(sphericalTensorWriter, 0); -defineTemplateRunTimeSelectionTable(sphericalTensorWriter, word); +defineNamedTemplateTypeNameAndDebug(writerSphericalTensorWriter, 0); +defineTemplateRunTimeSelectionTable(writerSphericalTensorWriter, word); -defineNamedTemplateTypeNameAndDebug(symmTensorWriter, 0); -defineTemplateRunTimeSelectionTable(symmTensorWriter, word); +defineNamedTemplateTypeNameAndDebug(writerSymmTensorWriter, 0); +defineTemplateRunTimeSelectionTable(writerSymmTensorWriter, word); -defineNamedTemplateTypeNameAndDebug(tensorWriter, 0); -defineTemplateRunTimeSelectionTable(tensorWriter, word); +defineNamedTemplateTypeNameAndDebug(writerTensorWriter, 0); +defineTemplateRunTimeSelectionTable(writerTensorWriter, word); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSet/writers/writer/writers.H b/src/sampling/sampledSet/writers/writer/writers.H index 49979179d0..ba46c5880a 100644 --- a/src/sampling/sampledSet/writers/writer/writers.H +++ b/src/sampling/sampledSet/writers/writer/writers.H @@ -23,9 +23,10 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA InClass - Foam::writer + Foam::rawWriters -Description +SourceFiles + writers.C \*---------------------------------------------------------------------------*/ @@ -39,18 +40,8 @@ Description namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -typedef writer scalarWriter; -typedef writer vectorWriter; -typedef writer sphericalTensorWriter; -typedef writer symmTensorWriter; -typedef writer tensorWriter; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWritersTypedefs(writer) +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSet/writers/xmgr/xmgr.H b/src/sampling/sampledSet/writers/xmgr/xmgr.H index da4847f61c..4478730fd8 100644 --- a/src/sampling/sampledSet/writers/xmgr/xmgr.H +++ b/src/sampling/sampledSet/writers/xmgr/xmgr.H @@ -63,28 +63,26 @@ public: //- Construct null xmgr(); - // Destructor - virtual ~xmgr(); + //- Destructor + virtual ~xmgr(); // Member Functions - // Write + virtual fileName getFileName + ( + const coordSet&, + const wordList& + ) const; - virtual fileName getFileName - ( - const coordSet&, - const wordList& - ) const; - - void write - ( - const coordSet&, - const wordList&, - const List*>&, - Ostream& os - ) const; + void write + ( + const coordSet&, + const wordList&, + const List*>&, + Ostream& os + ) const; }; diff --git a/src/sampling/sampledSet/writers/xmgr/xmgrWriters.C b/src/sampling/sampledSet/writers/xmgr/xmgrWriters.C index 4512317393..90828ad64f 100644 --- a/src/sampling/sampledSet/writers/xmgr/xmgrWriters.C +++ b/src/sampling/sampledSet/writers/xmgr/xmgrWriters.C @@ -22,8 +22,6 @@ License along with OpenFOAM; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Description - \*---------------------------------------------------------------------------*/ #include "xmgrWriters.H" @@ -33,13 +31,7 @@ Description namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeWriters(xmgr); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWriters(xmgr) +} // ************************************************************************* // diff --git a/src/sampling/sampledSet/writers/xmgr/xmgrWriters.H b/src/sampling/sampledSet/writers/xmgr/xmgrWriters.H index 1889bfc312..b1b554409a 100644 --- a/src/sampling/sampledSet/writers/xmgr/xmgrWriters.H +++ b/src/sampling/sampledSet/writers/xmgr/xmgrWriters.H @@ -44,16 +44,8 @@ SourceFiles namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -typedef xmgr xmgrScalarWriter; -typedef xmgr xmgrVectorWriter; -typedef xmgr xmgrTensorWriter; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeWritersTypedefs(xmgr) +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //