diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files
index 2c10cfe30313c3d88db8db75fec5012e069350da..f10482758a05b8e8333e0cea08e1c2c52d71edf4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/files
@@ -1,15 +1,3 @@
-surfaceMeshWriter.C
-
foamToVTK.C
-internalWriter.C
-lagrangianWriter.C
-patchWriter.C
-writeFuns.C
-writeFaceSet.C
-writePointSet.C
-writeSurfFields.C
-
-vtkMesh.C
-vtkTopo.C
EXE = $(FOAM_APPBIN)/foamToVTK
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
index 2b32e21ed08c9f90f72f311484face64c6685cd1..5980905c0679a8745d7d460b0895613561dc065e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
@@ -1,11 +1,12 @@
EXE_INC = \
+ -IfoamToVTK/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lfoamToVTK \
-lfiniteVolume \
-llagrangian \
-lgenericPatchFields \
-lmeshTools
-
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..9dee50c90d28409b59ea59484ee44fde7382add3
--- /dev/null
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files
@@ -0,0 +1,12 @@
+surfaceMeshWriter.C
+internalWriter.C
+lagrangianWriter.C
+patchWriter.C
+writeFuns.C
+writeFaceSet.C
+writePointSet.C
+writeSurfFields.C
+vtkMesh.C
+vtkTopo.C
+
+LIB = $(FOAM_LIBBIN)/libfoamToVTK
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..12747a2730c7b53bc8ed7b013df51acc783adf5a
--- /dev/null
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+ -lfiniteVolume \
+ -llagrangian \
+ -lgenericPatchFields \
+ -lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
similarity index 97%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
index 93d82aa5d08c7b82e61a2d4c99c34f43a2b62b8d..6c168a22805b4218ecf89f1366cb15ffb77d3815 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
similarity index 97%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
index ec73f5e5c11498ada70fe6e838d193782c5f1546..113bfe43b0a399554f61dd0d1614491554d91d0a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
similarity index 96%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
index da660b779ca2b4c53d21472789eef70e1a7e7891..b9660896bc85667d19a0999244a17976c3827570 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C
similarity index 97%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C
index 3c4dc340f1f53d8ebde5dc0b32d6cf6fe27ffddf..6c27883787f387c37513354e0e46fec20505289e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H
similarity index 96%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H
index b25c56755c2f2559bf4076ce57057268cad5b131..118801a3099428245098c6139199fb2d37f628dd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.C
similarity index 97%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.C
index 02c1837d1877659da6e76fb920ca2e6e6aa8012f..d13a96df3d4753375cdbfc514c4f6571ca82fa2c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H
similarity index 98%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H
index 451c5c7cebe7a14cb38aaf3b478fff77fec6f23f..c6f9a4eea9ab2fc45c7cc599a2c69d89938fa43c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkTopo.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H
similarity index 96%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H
index 75f94bbb8aafa795c0c6a92e546d5fb8668fa9f3..eb7c45203169a0a46c43fcd713c5e0cb4609effe 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C
similarity index 97%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C
index dfa177aa82623fb479a0db133feef7046955e508..4cafa01f0a0879ad1e40b5d3039042b18bc37f7d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H
similarity index 96%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H
index d2c97874477e1dc95e9fb909ebca37032d28ac90..32ffd981f6bedc4a3c5b14a92d1986528249a664 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointSet.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C
similarity index 100%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.C
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H
similarity index 96%
rename from applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H
rename to applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H
index da3dee09c84664da60972ee8f2aba46d0bccb585..0d1f5ecd4cb95bce6eb4831156c8525a5e0ccc17 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License