From 3ac086402d4b2cdb6c8b15cfa6b867e22257faf7 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 16 Nov 2012 13:11:17 +0000 Subject: [PATCH] COMP: sampling: moved sampledSet writers to fileFormats library --- src/engine/Make/options | 6 ++---- src/fileFormats/Make/files | 13 +++++++++++++ src/fvMotionSolver/Make/options | 3 ++- src/lagrangian/coalCombustion/Make/options | 6 ++---- src/mesh/autoMesh/Make/options | 3 ++- src/meshTools/Make/options | 5 +++-- src/postProcessing/functionObjects/IO/Make/options | 6 ++---- .../functionObjects/field/Make/options | 2 ++ .../functionObjects/forces/Make/options | 4 ++-- .../functionObjects/jobControl/Make/options | 9 --------- .../functionObjects/systemCall/Make/options | 9 --------- src/randomProcesses/Make/options | 6 ++---- src/regionModels/regionCoupling/Make/options | 1 - src/regionModels/thermoBaffleModels/Make/options | 1 - src/sampling/Make/files | 12 ------------ src/sampling/Make/options | 2 ++ 16 files changed, 34 insertions(+), 54 deletions(-) diff --git a/src/engine/Make/options b/src/engine/Make/options index 6862a106f6..0929e2bc8f 100644 --- a/src/engine/Make/options +++ b/src/engine/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/fvMotionSolver/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/fvMotionSolver/lnInclude LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -ldynamicMesh \ - -lfvMotionSolvers \ - -lsampling + -lfvMotionSolvers diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files index 7845ac9312..37f3bc0098 100644 --- a/src/fileFormats/Make/files +++ b/src/fileFormats/Make/files @@ -2,4 +2,17 @@ vtk/vtkUnstructuredReader.C nas/NASCore.C starcd/STARCDCore.C +coordSet/coordSet.C + +setWriters = sampledSetWriters + +$(setWriters)/writers.C +$(setWriters)/ensight/ensightSetWriterRunTime.C +$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C +$(setWriters)/jplot/jplotSetWriterRunTime.C +$(setWriters)/raw/rawSetWriterRunTime.C +$(setWriters)/vtk/vtkSetWriterRunTime.C +$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C +$(setWriters)/csv/csvSetWriterRunTime.C + LIB = $(FOAM_LIBBIN)/libfileFormats diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options index fa13513b50..29e4469610 100644 --- a/src/fvMotionSolver/Make/options +++ b/src/fvMotionSolver/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ LIB_LIBS = \ @@ -11,4 +11,5 @@ LIB_LIBS = \ -lmeshTools \ -ldynamicMesh \ -lfiniteVolume \ + -lfileFormats /*-lforces include in controlDict if needed */ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 34a2babd73..0d7eb0e13b 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -17,8 +17,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/dynamicFvMesh/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -42,5 +41,4 @@ LIB_LIBS = \ -lincompressibleTransportModels \ -lregionModels \ -lsurfaceFilmModels \ - -ldynamicFvMesh \ - -lsampling + -ldynamicFvMesh diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index 0ee4f07bb0..d37a26a9dd 100644 --- a/src/mesh/autoMesh/Make/options +++ b/src/mesh/autoMesh/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude @@ -14,6 +14,7 @@ LIB_LIBS = \ -lfiniteVolume \ -llagrangian \ -lmeshTools \ + -lfileFormats \ -ledgeMesh \ -lsurfMesh \ -ltriSurface \ diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index ac717c7516..1b22dab2a0 100644 --- a/src/meshTools/Make/options +++ b/src/meshTools/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/fileFormats/lnInclude LIB_LIBS = \ - -ltriSurface + -ltriSurface \ + -lfileFormats diff --git a/src/postProcessing/functionObjects/IO/Make/options b/src/postProcessing/functionObjects/IO/Make/options index 5166bcc9e3..a3ae8da833 100644 --- a/src/postProcessing/functionObjects/IO/Make/options +++ b/src/postProcessing/functionObjects/IO/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lfiniteVolume \ - -lmeshTools \ - -lsampling + -lmeshTools diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options index d7c5f944c6..e95ea37c78 100644 --- a/src/postProcessing/functionObjects/field/Make/options +++ b/src/postProcessing/functionObjects/field/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/turbulenceModels \ @@ -11,6 +12,7 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -llagrangian \ + -lfileFormats \ -lsampling \ -lincompressibleTransportModels \ -lcompressibleTurbulenceModel \ diff --git a/src/postProcessing/functionObjects/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options index afc10fb1aa..5952c6b6cb 100644 --- a/src/postProcessing/functionObjects/forces/Make/options +++ b/src/postProcessing/functionObjects/forces/Make/options @@ -1,7 +1,7 @@ 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)/transportModels \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ @@ -17,4 +17,4 @@ LIB_LIBS = \ -lcompressibleLESModels \ -lfiniteVolume \ -lmeshTools \ - -lsampling + -lfileFormats diff --git a/src/postProcessing/functionObjects/jobControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options index 5166bcc9e3..e69de29bb2 100644 --- a/src/postProcessing/functionObjects/jobControl/Make/options +++ b/src/postProcessing/functionObjects/jobControl/Make/options @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling diff --git a/src/postProcessing/functionObjects/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options index 5166bcc9e3..e69de29bb2 100644 --- a/src/postProcessing/functionObjects/systemCall/Make/options +++ b/src/postProcessing/functionObjects/systemCall/Make/options @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options index 61fc018ad9..71b7873964 100644 --- a/src/randomProcesses/Make/options +++ b/src/randomProcesses/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lsampling + -lfiniteVolume diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options index 4eaef77e23..28569ccda6 100644 --- a/src/regionModels/regionCoupling/Make/options +++ b/src/regionModels/regionCoupling/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/AMIInterpolation/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options index 2c0e2cf57c..21a54595be 100644 --- a/src/regionModels/thermoBaffleModels/Make/options +++ b/src/regionModels/thermoBaffleModels/Make/options @@ -3,7 +3,6 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/AMIInterpolation/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/sampling/Make/files b/src/sampling/Make/files index 8c5227dbf2..ef0415f0f2 100644 --- a/src/sampling/Make/files +++ b/src/sampling/Make/files @@ -5,7 +5,6 @@ probes/probesFunctionObject/probesFunctionObject.C sampledSet/circle/circleSet.C sampledSet/cloud/cloudSet.C -sampledSet/coordSet/coordSet.C sampledSet/patchCloud/patchCloudSet.C sampledSet/polyLine/polyLineSet.C sampledSet/face/faceOnlySet.C @@ -20,17 +19,6 @@ sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C sampledSet/uniform/uniformSet.C sampledSet/array/arraySet.C -setWriters = sampledSet/writers - -$(setWriters)/writers.C -$(setWriters)/ensight/ensightSetWriterRunTime.C -$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C -$(setWriters)/jplot/jplotSetWriterRunTime.C -$(setWriters)/raw/rawSetWriterRunTime.C -$(setWriters)/vtk/vtkSetWriterRunTime.C -$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C -$(setWriters)/csv/csvSetWriterRunTime.C - cuttingPlane/cuttingPlane.C sampledSurface/sampledPatch/sampledPatch.C diff --git a/src/sampling/Make/options b/src/sampling/Make/options index 3fbc509d54..23e6bc81a7 100644 --- a/src/sampling/Make/options +++ b/src/sampling/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude @@ -10,6 +11,7 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsurfMesh \ + -lfileFormats \ -ltriSurface \ -llagrangian \ -lconversion