DEFEATURE: remove support for jplot (defunct)

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

etc/controlDict

@@ -656,7 +656,6 @@ DebugSwitches
     isoSurfaceCell      0;
     isoSurfacePoint     0;
     isoSurfaceTopo      0;
-    jplot               0;
     jumpCyclic          0;
     kEpsilon            0;
     kOmega              0;

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
 

src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C

@@ -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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#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);
-}
-
-
-// ************************************************************************* //

src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H

@@ -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 <http://www.gnu.org/licenses/>.
-
-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
-
-// ************************************************************************* //

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

src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C

@@ -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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "jplotSetWriter.H"
-#include "clock.H"
-#include "coordSet.H"
-#include "fileName.H"
-#include "OFstream.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::jplotSetWriter<Type>::writeHeader(Ostream& os) const
-{
-    return os
-        << "# JPlot input file" << nl
-        << "#" << nl << nl
-        << "# Generated by sample on " << clock::date().c_str() << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::jplotSetWriter<Type>::jplotSetWriter()
-:
-    writer<Type>()
-{}
-
-
-template<class Type>
-Foam::jplotSetWriter<Type>::jplotSetWriter(const dictionary& dict)
-:
-    writer<Type>(dict)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::fileName Foam::jplotSetWriter<Type>::getFileName
-(
-    const coordSet& points,
-    const wordList& valueSetNames
-) const
-{
-    return this->getBaseName(points, valueSetNames) + ".dat";
-}
-
-
-template<class Type>
-void Foam::jplotSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& 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<const List<Type>*> columns(valueSets.size());
-
-    forAll(valueSets, i)
-    {
-        columns[i] = valueSets[i];
-    }
-
-    this->writeTable(points, columns, os);
-}
-
-
-// ************************************************************************* //

src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H

@@ -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 <http://www.gnu.org/licenses/>.
-
-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 Type>
-class jplotSetWriter
-:
-    public writer<Type>
-{
-
-    // 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<const Field<Type>*>&,
-            Ostream&
-        ) const;
-
-        virtual void write
-        (
-            const bool writeTracks,
-            const List<scalarField>& times,
-            const PtrList<coordSet>& tracks,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>& valueSets,
-            Ostream&
-        ) const
-        {
-            NotImplemented;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "jplotSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C

@@ -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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "jplotSetWriter.H"
-#include "writers.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(jplotSetWriter);
-}
-
-// ************************************************************************* //

src/functionObjects/field/streamLine/streamLine.H

@@ -112,7 +112,6 @@ Usage
         csv
         ensight
         gnuplot
-        jplot
         nastran
         raw
         vtk

src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H

@@ -112,7 +112,6 @@ Usage
         csv
         ensight
         gnuplot
-        jplot
         nastran
         raw
         vtk

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'.

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;

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;

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;

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;