From e65512be4ebf5b1f29ab9e1ac3893acb167e3fd4 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 16 Nov 2012 13:13:39 +0000 Subject: [PATCH] COMP: sampling: moved sampledSet writing to fileFormats --- applications/solvers/DNS/dnsFoam/Make/options | 7 +- .../solvers/combustion/PDRFoam/Make/options | 1 - .../solvers/combustion/XiFoam/Make/options | 6 +- .../combustion/coldEngineFoam/Make/options | 3 - .../incompressible/icoFoam/Make/options | 6 +- .../mesh/generation/cvMesh/Make/options | 4 +- .../cvMesh/conformalVoronoiMesh/Make/options | 3 +- .../cvMesh/cvMeshBackgroundMesh/Make/options | 6 +- .../cvMesh/cvMeshSurfaceSimplify/Make/options | 4 +- .../generation/snappyHexMesh/Make/options | 4 +- .../dataConversion/foamToGMV/Make/options | 6 - .../lagrangian/particleTracks/Make/options | 4 +- .../sampling/sample/Make/options | 2 + .../velocityField/Pe/Make/options | 3 +- .../preProcessing/boxTurb/Make/options | 5 +- .../coordSet/coordSet.C | 2 +- .../coordSet/coordSet.H | 2 +- .../sampledSetWriters}/csv/csvSetWriter.C | 2 +- .../sampledSetWriters}/csv/csvSetWriter.H | 2 +- .../csv/csvSetWriterRunTime.C | 2 +- .../ensight/ensightSetWriter.C | 2 +- .../ensight/ensightSetWriter.H | 2 +- .../ensight/ensightSetWriterRunTime.C | 2 +- .../gnuplot/gnuplotSetWriter.H | 2 +- .../gnuplot/gnuplotSetWriterRunTime.C | 2 +- .../sampledSetWriters}/jplot/jplotSetWriter.C | 2 +- .../sampledSetWriters}/jplot/jplotSetWriter.H | 2 +- .../jplot/jplotSetWriterRunTime.C | 2 +- .../sampledSetWriters}/raw/rawSetWriter.C | 2 +- .../sampledSetWriters}/raw/rawSetWriter.H | 2 +- .../raw/rawSetWriterRunTime.C | 2 +- .../sampledSetWriters}/vtk/vtkSetWriter.C | 2 +- .../sampledSetWriters}/vtk/vtkSetWriter.H | 2 +- .../vtk/vtkSetWriterRunTime.C | 2 +- .../sampledSetWriters}/writer.C | 1 - .../sampledSetWriters}/writer.H | 0 .../sampledSetWriters}/writers.C | 2 +- .../sampledSetWriters}/writers.H | 2 +- .../xmgrace/xmgraceSetWriter.C | 2 +- .../xmgrace/xmgraceSetWriter.H | 2 +- .../xmgrace/xmgraceSetWriterRunTime.C | 2 +- .../writers/gnuplot/gnuplotSetWriter.C | 142 ------------------ 42 files changed, 51 insertions(+), 204 deletions(-) rename src/{sampling/sampledSet => fileFormats}/coordSet/coordSet.C (97%) rename src/{sampling/sampledSet => fileFormats}/coordSet/coordSet.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/csv/csvSetWriter.C (98%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/csv/csvSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/csv/csvSetWriterRunTime.C (94%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/ensight/ensightSetWriter.C (99%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/ensight/ensightSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/ensight/ensightSetWriterRunTime.C (94%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/gnuplot/gnuplotSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/gnuplot/gnuplotSetWriterRunTime.C (94%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/jplot/jplotSetWriter.C (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/jplot/jplotSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/jplot/jplotSetWriterRunTime.C (94%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/raw/rawSetWriter.C (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/raw/rawSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/raw/rawSetWriterRunTime.C (94%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/vtk/vtkSetWriter.C (98%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/vtk/vtkSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/vtk/vtkSetWriterRunTime.C (94%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writer.C (99%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writer.H (100%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writers.C (96%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writers.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/xmgrace/xmgraceSetWriter.C (98%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/xmgrace/xmgraceSetWriter.H (97%) rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/xmgrace/xmgraceSetWriterRunTime.C (94%) delete mode 100644 src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C diff --git a/applications/solvers/DNS/dnsFoam/Make/options b/applications/solvers/DNS/dnsFoam/Make/options index 34c3503a51..e0e7a30d72 100644 --- a/applications/solvers/DNS/dnsFoam/Make/options +++ b/applications/solvers/DNS/dnsFoam/Make/options @@ -1,10 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/randomProcesses/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/randomProcesses/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -lrandomProcesses \ - -lsampling \ - -lmeshTools + -lrandomProcesses diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 135659c276..b6c6398fde 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -5,7 +5,6 @@ EXE_INC = \ -IPDRModels/dragModels/PDRDragModel \ -IlaminarFlameSpeed/SCOPE \ -I$(LIB_SRC)/engine/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 0812df5e3b..3a07a7de58 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ @@ -17,5 +17,5 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ - -lfiniteVolume \ - -lmeshTools + -lmeshTools \ + -lfiniteVolume diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index 25217ab23f..7e8eb378be 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -9,7 +9,6 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fieldSources/lnInclude EXE_LIBS = \ @@ -20,6 +19,4 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ - -lsampling \ - -lmeshTools \ -lfieldSources diff --git a/applications/solvers/incompressible/icoFoam/Make/options b/applications/solvers/incompressible/icoFoam/Make/options index fa15f12452..d38cd8b180 100644 --- a/applications/solvers/incompressible/icoFoam/Make/options +++ b/applications/solvers/incompressible/icoFoam/Make/options @@ -1,5 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lfiniteVolume + -lfiniteVolume \ + -lsampling diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options index 2228fc2b12..27241b2965 100644 --- a/applications/utilities/mesh/generation/cvMesh/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/Make/options @@ -17,7 +17,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude @@ -30,6 +30,6 @@ EXE_LIBS = \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ -ledgeMesh \ - -lsampling \ + -lfileFormats \ -ltriSurface \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options index 62649cf232..2082f88ff0 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options @@ -17,7 +17,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I../vectorTools @@ -25,5 +25,6 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ -ledgeMesh \ + -lfileFormats \ -ltriSurface \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options index 2d1ad7bfda..ed71a80029 100644 --- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options @@ -11,10 +11,11 @@ EXE_INC = \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude EXE_LIBS = \ @@ -24,8 +25,9 @@ EXE_LIBS = \ -lconformalVoronoiMesh \ -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \ -ledgeMesh \ - -lsampling \ -ltriSurface \ -lmeshTools \ + -lfileFormats \ + -lsampling \ -ldynamicMesh \ -lfiniteVolume diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options index 35c90b1f48..7bd92a24ab 100644 --- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(FASTDUALOCTREE_SRC_PATH) \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -22,7 +22,7 @@ EXE_LIBS = \ -lconformalVoronoiMesh \ -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \ -ledgeMesh \ - -lsampling \ + -lfileFormats \ -ltriSurface \ -lmeshTools \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index 94ff17ee99..af056ec7cb 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ @@ -14,6 +14,6 @@ EXE_LIBS = \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ -lmeshTools \ - -lsampling \ + -lfileFormats \ -ldynamicMesh \ -lautoMesh diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options index 5c515d8f95..87b4324810 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options @@ -1,15 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/lagrangian/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/browser/lnInclude \ - -I$(LIB_SRC)/foam/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options index 3bcea78b3b..b653926f93 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options @@ -1,12 +1,12 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lsampling \ + -lfileFormats \ -lgenericPatchFields \ -llagrangian diff --git a/applications/utilities/postProcessing/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options index 88c6039b4e..4de726a20f 100644 --- a/applications/utilities/postProcessing/sampling/sample/Make/options +++ b/applications/utilities/postProcessing/sampling/sample/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude @@ -9,6 +10,7 @@ EXE_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -lmeshTools \ + -lfileFormats \ -lsampling \ -lsurfMesh \ -llagrangian diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options index 29d9b4d8c3..1d984aa9b5 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Make/options +++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options @@ -5,8 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ $(FOAM_LIBBIN)/postCalc.o \ diff --git a/applications/utilities/preProcessing/boxTurb/Make/options b/applications/utilities/preProcessing/boxTurb/Make/options index 749a3d5124..e24cee9cb9 100644 --- a/applications/utilities/preProcessing/boxTurb/Make/options +++ b/applications/utilities/preProcessing/boxTurb/Make/options @@ -1,10 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/randomProcesses/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -lrandomProcesses \ - -lsampling \ - -lmeshTools \ -lfiniteVolume diff --git a/src/sampling/sampledSet/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C similarity index 97% rename from src/sampling/sampledSet/coordSet/coordSet.C rename to src/fileFormats/coordSet/coordSet.C index fed58fc86f..d8b37c5fdd 100644 --- a/src/sampling/sampledSet/coordSet/coordSet.C +++ b/src/fileFormats/coordSet/coordSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/coordSet/coordSet.H b/src/fileFormats/coordSet/coordSet.H similarity index 97% rename from src/sampling/sampledSet/coordSet/coordSet.H rename to src/fileFormats/coordSet/coordSet.H index 8629f78bbe..5492f37b43 100644 --- a/src/sampling/sampledSet/coordSet/coordSet.H +++ b/src/fileFormats/coordSet/coordSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C similarity index 98% rename from src/sampling/sampledSet/writers/csv/csvSetWriter.C rename to src/fileFormats/sampledSetWriters/csv/csvSetWriter.C index 4cbb51a597..c1ed54b1cd 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriter.C +++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.H b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/csv/csvSetWriter.H rename to src/fileFormats/sampledSetWriters/csv/csvSetWriter.H index 9c494320cb..8e4b9c7d70 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriter.H +++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C index 2d326f8efa..ac588e3957 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C similarity index 99% rename from src/sampling/sampledSet/writers/ensight/ensightSetWriter.C rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C index d481a41532..4b874e201d 100644 --- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C +++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/ensight/ensightSetWriter.H rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H index 5118c85faa..14a735b2ed 100644 --- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H +++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C index b987035b33..c529cb02e4 100644 --- a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H index 88e9414c85..74688771e8 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H +++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C index 90ee219888..4e57426359 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C similarity index 97% rename from src/sampling/sampledSet/writers/jplot/jplotSetWriter.C rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C index 98dc34bad9..d71d860a26 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C +++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/jplot/jplotSetWriter.H rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H index bd7bc8c783..5b09456642 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H +++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C index e0e9ac2b52..7e54146fe7 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C similarity index 97% rename from src/sampling/sampledSet/writers/raw/rawSetWriter.C rename to src/fileFormats/sampledSetWriters/raw/rawSetWriter.C index e259c78eaa..403b9e7111 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriter.C +++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.H b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/raw/rawSetWriter.H rename to src/fileFormats/sampledSetWriters/raw/rawSetWriter.H index 418549d01b..89c857d779 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriter.H +++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C index c4376c9140..92a8a83354 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C similarity index 98% rename from src/sampling/sampledSet/writers/vtk/vtkSetWriter.C rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C index b865e704d4..3ab2736175 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C +++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/vtk/vtkSetWriter.H rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H index 9507fd1dc7..21bd80ef1e 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H +++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C index 3c30764d86..e9320e5b55 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/writer.C b/src/fileFormats/sampledSetWriters/writer.C similarity index 99% rename from src/sampling/sampledSet/writers/writer.C rename to src/fileFormats/sampledSetWriters/writer.C index 69dbdec6fe..e031615ff6 100644 --- a/src/sampling/sampledSet/writers/writer.C +++ b/src/fileFormats/sampledSetWriters/writer.C @@ -166,7 +166,6 @@ void Foam::writer::write { valueSetPtrs[i] = &valueSets[i]; } - write(points, valueSetNames, valueSetPtrs, os); } diff --git a/src/sampling/sampledSet/writers/writer.H b/src/fileFormats/sampledSetWriters/writer.H similarity index 100% rename from src/sampling/sampledSet/writers/writer.H rename to src/fileFormats/sampledSetWriters/writer.H diff --git a/src/sampling/sampledSet/writers/writers.C b/src/fileFormats/sampledSetWriters/writers.C similarity index 96% rename from src/sampling/sampledSet/writers/writers.C rename to src/fileFormats/sampledSetWriters/writers.C index 2815bcda03..4bcc1b39b2 100644 --- a/src/sampling/sampledSet/writers/writers.C +++ b/src/fileFormats/sampledSetWriters/writers.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/writers.H b/src/fileFormats/sampledSetWriters/writers.H similarity index 97% rename from src/sampling/sampledSet/writers/writers.H rename to src/fileFormats/sampledSetWriters/writers.H index 3adaab13fa..601e7bcd16 100644 --- a/src/sampling/sampledSet/writers/writers.H +++ b/src/fileFormats/sampledSetWriters/writers.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C similarity index 98% rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C index 9cc44a10c3..3825868196 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C +++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H index 8e8dc67ead..47c3628936 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H +++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C index 8e7ab61c8e..583855fc83 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C deleted file mode 100644 index f6198d3f5a..0000000000 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C +++ /dev/null @@ -1,142 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -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 "gnuplotSetWriter.H" -#include "clock.H" -#include "coordSet.H" -#include "fileName.H" -#include "OFstream.H" -#include "addToRunTimeSelectionTable.H" - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::gnuplotSetWriter::gnuplotSetWriter() -: - writer() -{} - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::gnuplotSetWriter::~gnuplotSetWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -Foam::fileName Foam::gnuplotSetWriter::getFileName -( - const coordSet& points, - const wordList& valueSetNames -) const -{ - return this->getBaseName(points, valueSetNames) + ".gplt"; -} - - -template -void Foam::gnuplotSetWriter::write -( - const coordSet& points, - const wordList& valueSetNames, - const List*>& valueSets, - Ostream& os -) const -{ - os << "set term postscript color" << nl - << "set output \"" << points.name() << ".ps\"" << nl - << "plot"; - - forAll(valueSets, i) - { - if (i != 0) - { - os << ','; - } - - os << " \"-\" title \"" << valueSetNames[i] << "\" with lines"; - } - os << nl; - - - forAll(valueSets, i) - { - this->writeTable(points, *valueSets[i], os); - os << "e" << nl; - } -} - - -template -void Foam::gnuplotSetWriter::write -( - const bool writeTracks, - const PtrList& trackPoints, - const wordList& valueSetNames, - const List > >& valueSets, - Ostream& os -) const -{ - if (valueSets.size() != valueSetNames.size()) - { - FatalErrorIn("gnuplotSetWriter::write(..)") - << "Number of variables:" << valueSetNames.size() << endl - << "Number of valueSets:" << valueSets.size() - << exit(FatalError); - } - if (trackPoints.size() > 0) - { - os << "set term postscript color" << nl - << "set output \"" << trackPoints[0].name() << ".ps\"" << nl; - - forAll(trackPoints, trackI) - { - os << "plot"; - - forAll(valueSets, i) - { - if (i != 0) - { - os << ','; - } - - os << " \"-\" title \"" << valueSetNames[i] << "\" with lines"; - } - os << nl; - - forAll(valueSets, i) - { - this->writeTable(trackPoints[trackI], valueSets[i][trackI], os); - os << "e" << nl; - } - } - } -} - - -// ************************************************************************* //