diff --git a/etc/caseDicts/annotated/sampleDict b/etc/caseDicts/annotated/sampleDict index 1ffbdeb52c..8dddbe902a 100644 --- a/etc/caseDicts/annotated/sampleDict +++ b/etc/caseDicts/annotated/sampleDict @@ -16,7 +16,6 @@ FoamFile // Set output format : choice of // xmgr -// jplot // gnuplot // raw // vtk @@ -25,7 +24,7 @@ FoamFile setFormat raw; // Surface output format. Choice of -// null : suppress output +// none : suppress output // ensight : Ensight Gold format, one field per case file // foamFile : separate points, faces and values file // dx : DX scalar or vector format diff --git a/etc/controlDict b/etc/controlDict index cdcb82566b..3cffa0a668 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -656,7 +656,6 @@ DebugSwitches isoSurfaceCell 0; isoSurfacePoint 0; isoSurfaceTopo 0; - jplot 0; jumpCyclic 0; kEpsilon 0; kOmega 0; diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 517293dbee..8b851be4fb 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -819,7 +819,6 @@ writers = graph/writers $(writers)/rawGraph/rawGraph.C $(writers)/gnuplotGraph/gnuplotGraph.C $(writers)/xmgrGraph/xmgrGraph.C -$(writers)/jplotGraph/jplotGraph.C meshes/data/data.C diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C deleted file mode 100644 index 2c2f1f7e92..0000000000 --- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | www.openfoam.com - \\/ M anipulation | -------------------------------------------------------------------------------- - Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "jplotGraph.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(jplotGraph, 0); - const word jplotGraph::ext_("dat"); - - typedef graph::writer graphWriter; - addToRunTimeSelectionTable(graphWriter, jplotGraph, word); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void Foam::jplotGraph::write(const graph& g, Ostream& os) const -{ - os << "# JPlot file" << nl - << "# column 1: " << g.xName() << endl; - - label fieldi = 0; - - forAllConstIters(g, iter) - { - os << "# column " << fieldi + 2 << ": " << (*iter()).name() << endl; - fieldi++; - } - - g.writeTable(os); -} - - -// ************************************************************************* // diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H deleted file mode 100644 index db77033e76..0000000000 --- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H +++ /dev/null @@ -1,103 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | www.openfoam.com - \\/ M anipulation | -------------------------------------------------------------------------------- - Copyright (C) 2011 OpenFOAM Foundation -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::jplotGraph - -Description - jplot graph output - -SourceFiles - jplotGraph.C - -\*---------------------------------------------------------------------------*/ - -#ifndef jplotGraph_H -#define jplotGraph_H - -#include "graph.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class jplotGraph Declaration -\*---------------------------------------------------------------------------*/ - -class jplotGraph -: - public graph::writer -{ - -public: - - //- Runtime type information - TypeName("jplot"); - - //- FileName extension for this graph format - static const word ext_; - - - // Constructors - - //- Construct null - jplotGraph() - {} - - - //- Destructor - ~jplotGraph() - {} - - - // Member Functions - - // Access - - //- Return the appropriate fileName extension - // for this graph format - const word& ext() const - { - return ext_; - } - - - // Write - - void write(const graph&, Ostream& os) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files index 9e4e434eb7..a223cb09dd 100644 --- a/src/fileFormats/Make/files +++ b/src/fileFormats/Make/files @@ -76,14 +76,13 @@ coordSet/coordSet.C setWriters = sampledSetWriters $(setWriters)/writers.C +$(setWriters)/csv/csvSetWriterRunTime.C $(setWriters)/ensight/ensightSetWriterRunTime.C +$(setWriters)/gltf/gltfSetWriterRunTime.C $(setWriters)/gnuplot/gnuplotSetWriterRunTime.C -$(setWriters)/jplot/jplotSetWriterRunTime.C +$(setWriters)/nastran/nastranSetWriterRunTime.C $(setWriters)/raw/rawSetWriterRunTime.C $(setWriters)/vtk/vtkSetWriterRunTime.C $(setWriters)/xmgrace/xmgraceSetWriterRunTime.C -$(setWriters)/csv/csvSetWriterRunTime.C -$(setWriters)/nastran/nastranSetWriterRunTime.C -$(setWriters)/gltf/gltfSetWriterRunTime.C LIB = $(FOAM_LIBBIN)/libfileFormats diff --git a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C deleted file mode 100644 index dcb841af45..0000000000 --- a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C +++ /dev/null @@ -1,105 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | www.openfoam.com - \\/ M anipulation | -------------------------------------------------------------------------------- - Copyright (C) 2011-2012 OpenFOAM Foundation - Copyright (C) 2021 OpenCFD Ltd. -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "jplotSetWriter.H" -#include "clock.H" -#include "coordSet.H" -#include "fileName.H" -#include "OFstream.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -Foam::Ostream& Foam::jplotSetWriter::writeHeader(Ostream& os) const -{ - return os - << "# JPlot input file" << nl - << "#" << nl << nl - << "# Generated by sample on " << clock::date().c_str() << nl; -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::jplotSetWriter::jplotSetWriter() -: - writer() -{} - - -template -Foam::jplotSetWriter::jplotSetWriter(const dictionary& dict) -: - writer(dict) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -Foam::fileName Foam::jplotSetWriter::getFileName -( - const coordSet& points, - const wordList& valueSetNames -) const -{ - return this->getBaseName(points, valueSetNames) + ".dat"; -} - - -template -void Foam::jplotSetWriter::write -( - const coordSet& points, - const wordList& valueSetNames, - const List*>& valueSets, - Ostream& os -) const -{ - os << "# JPlot file" << nl - << "# column 1: " << points.name() << nl; - - forAll(valueSets, i) - { - os << "# column " << i + 2 << ": " << valueSetNames[i] << nl; - } - - // Collect sets into columns - List*> columns(valueSets.size()); - - forAll(valueSets, i) - { - columns[i] = valueSets[i]; - } - - this->writeTable(points, columns, os); -} - - -// ************************************************************************* // diff --git a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H deleted file mode 100644 index 26c0c8f503..0000000000 --- a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H +++ /dev/null @@ -1,125 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | www.openfoam.com - \\/ M anipulation | -------------------------------------------------------------------------------- - Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2021 OpenCFD Ltd. -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::jplotSetWriter - -SourceFiles - jplotSetWriter.C - -\*---------------------------------------------------------------------------*/ - -#ifndef jplotSetWriter_H -#define jplotSetWriter_H - -#include "writer.H" -#include "vector.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class jplotSetWriter Declaration -\*---------------------------------------------------------------------------*/ - -template -class jplotSetWriter -: - public writer -{ - - // Private Member Functions - - //- Write header - Ostream& writeHeader(Ostream&) const; - -public: - - //- Runtime type information - TypeName("jplot"); - - - // Constructors - - //- Default construct - jplotSetWriter(); - - //- Construct with dictionary - explicit jplotSetWriter(const dictionary& dict); - - - //- Destructor - virtual ~jplotSetWriter() = default; - - - // Member Functions - - virtual fileName getFileName - ( - const coordSet&, - const wordList& - ) const; - - virtual void write - ( - const coordSet&, - const wordList&, - const List*>&, - Ostream& - ) const; - - virtual void write - ( - const bool writeTracks, - const List& times, - const PtrList& tracks, - const wordList& valueSetNames, - const List>>& valueSets, - Ostream& - ) const - { - NotImplemented; - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "jplotSetWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C deleted file mode 100644 index e5fa6d8055..0000000000 --- a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C +++ /dev/null @@ -1,39 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | www.openfoam.com - \\/ M anipulation | -------------------------------------------------------------------------------- - Copyright (C) 2011-2012 OpenFOAM Foundation -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "jplotSetWriter.H" -#include "writers.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeSetWriters(jplotSetWriter); -} - -// ************************************************************************* // diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H index 73f2b19b61..4d08615edb 100644 --- a/src/functionObjects/field/streamLine/streamLine.H +++ b/src/functionObjects/field/streamLine/streamLine.H @@ -112,7 +112,6 @@ Usage csv ensight gnuplot - jplot nastran raw vtk diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H index 7c66ba0b18..9361e1a3ee 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H @@ -112,7 +112,6 @@ Usage csv ensight gnuplot - jplot nastran raw vtk diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict index d2e7371bbf..8122dc3638 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict @@ -16,14 +16,13 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Set output format : choice of -// xmgr -// jplot -// gnuplot // raw +// gnuplot +// xmgr setFormat raw; // Surface output format. Choice of -// null : suppress output +// none : suppress output // foam : separate points, faces and values file // vtk : VTK ascii format // raw : x y z value format for use with e.g. gnuplot 'splot'. diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines index 68fba4c8bb..0317171b5e 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines @@ -13,7 +13,7 @@ streamLines // Time control etc ${_visualization}; - setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight; + setFormat vtk; // csv | raw | gnuplot | ensight | xmgr // Velocity field to use for tracking. U U; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines index 0afebc0063..a89c5ae00a 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines +++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines @@ -17,7 +17,7 @@ streamLines writeControl writeTime; // writeInterval 10; - setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight; + setFormat vtk; // csv | raw | gnuplot | ensight // Tracked forwards (+U) or backwards (-U) trackForward true; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines index bd89d2dd0c..83b7139620 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines +++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines @@ -44,7 +44,7 @@ wallBoundedStreamLines libs (fieldFunctionObjects); U UNear; // Velocity field to use for tracking. fields (p U k UNear); // Names of fields to sample. - setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; + setFormat vtk; // raw | gnuplot | xmgr direction forward; lifeTime 100; // Steps particles can travel before being removed cloud wallBoundedParticleTracks; diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict index 79ff42c907..1c1732ace9 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict @@ -57,7 +57,7 @@ functions writeControl writeTime; // writeInterval 10; - setFormat vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight; + setFormat vtk; // csv | raw | gnuplot | ensight | xmgr // Tracked forwards (+U) or backwards (-U) trackForward true;