From 201fdf87d1d2adc4aa58a14bfb3c936849e86a28 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Mon, 17 Sep 2018 10:12:48 +0200 Subject: [PATCH] STYLE: relocate some vtk part handling from conversion to fileFormats - these parts work with a polyMesh (don't need fvMesh) --- src/conversion/Make/files | 4 ---- src/fileFormats/Make/files | 7 +++++++ src/{conversion => fileFormats}/vtk/part/foamVtkMeshMaps.C | 0 src/{conversion => fileFormats}/vtk/part/foamVtkMeshMaps.H | 0 .../vtk/part/foamVtkMeshMapsI.H | 0 src/{conversion => fileFormats}/vtk/part/foamVtuCells.C | 0 src/{conversion => fileFormats}/vtk/part/foamVtuCells.H | 0 src/{conversion => fileFormats}/vtk/part/foamVtuCellsI.H | 0 src/{conversion => fileFormats}/vtk/part/foamVtuSizing.C | 0 src/{conversion => fileFormats}/vtk/part/foamVtuSizing.H | 0 src/{conversion => fileFormats}/vtk/part/foamVtuSizingI.H | 0 .../vtk/part/foamVtuSizingTemplates.C | 0 12 files changed, 7 insertions(+), 4 deletions(-) rename src/{conversion => fileFormats}/vtk/part/foamVtkMeshMaps.C (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtkMeshMaps.H (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtkMeshMapsI.H (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuCells.C (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuCells.H (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuCellsI.H (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuSizing.C (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuSizing.H (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuSizingI.H (100%) rename src/{conversion => fileFormats}/vtk/part/foamVtuSizingTemplates.C (100%) diff --git a/src/conversion/Make/files b/src/conversion/Make/files index a5b3ffea227..ed8b65e68f4 100644 --- a/src/conversion/Make/files +++ b/src/conversion/Make/files @@ -29,8 +29,4 @@ vtk/output/foamVtkPatchWriter.H vtk/output/foamVtkSurfaceMeshWriter.C vtk/output/foamVtkWriteSurfFields.C -vtk/part/foamVtkMeshMaps.C -vtk/part/foamVtuCells.C -vtk/part/foamVtuSizing.C - LIB = $(FOAM_LIBBIN)/libconversion diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files index 989048f579f..baa36aca051 100644 --- a/src/fileFormats/Make/files +++ b/src/fileFormats/Make/files @@ -18,6 +18,7 @@ stl/STLAsciiParseRagel.C vtk/core/foamVtkCore.C vtk/core/foamVtkPTraits.C + vtk/format/foamVtkFormatter.C vtk/format/foamVtkAsciiFormatter.C vtk/format/foamVtkBase64Formatter.C @@ -26,8 +27,14 @@ vtk/format/foamVtkAppendRawFormatter.C vtk/format/foamVtkBase64Layer.C vtk/format/foamVtkLegacyAsciiFormatter.C vtk/format/foamVtkLegacyRawFormatter.C + vtk/output/foamVtkOutput.C vtk/output/foamVtkOutputOptions.C + +vtk/part/foamVtkMeshMaps.C +vtk/part/foamVtuCells.C +vtk/part/foamVtuSizing.C + vtk/read/vtkUnstructuredReader.C coordSet/coordSet.C diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.C b/src/fileFormats/vtk/part/foamVtkMeshMaps.C similarity index 100% rename from src/conversion/vtk/part/foamVtkMeshMaps.C rename to src/fileFormats/vtk/part/foamVtkMeshMaps.C diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.H b/src/fileFormats/vtk/part/foamVtkMeshMaps.H similarity index 100% rename from src/conversion/vtk/part/foamVtkMeshMaps.H rename to src/fileFormats/vtk/part/foamVtkMeshMaps.H diff --git a/src/conversion/vtk/part/foamVtkMeshMapsI.H b/src/fileFormats/vtk/part/foamVtkMeshMapsI.H similarity index 100% rename from src/conversion/vtk/part/foamVtkMeshMapsI.H rename to src/fileFormats/vtk/part/foamVtkMeshMapsI.H diff --git a/src/conversion/vtk/part/foamVtuCells.C b/src/fileFormats/vtk/part/foamVtuCells.C similarity index 100% rename from src/conversion/vtk/part/foamVtuCells.C rename to src/fileFormats/vtk/part/foamVtuCells.C diff --git a/src/conversion/vtk/part/foamVtuCells.H b/src/fileFormats/vtk/part/foamVtuCells.H similarity index 100% rename from src/conversion/vtk/part/foamVtuCells.H rename to src/fileFormats/vtk/part/foamVtuCells.H diff --git a/src/conversion/vtk/part/foamVtuCellsI.H b/src/fileFormats/vtk/part/foamVtuCellsI.H similarity index 100% rename from src/conversion/vtk/part/foamVtuCellsI.H rename to src/fileFormats/vtk/part/foamVtuCellsI.H diff --git a/src/conversion/vtk/part/foamVtuSizing.C b/src/fileFormats/vtk/part/foamVtuSizing.C similarity index 100% rename from src/conversion/vtk/part/foamVtuSizing.C rename to src/fileFormats/vtk/part/foamVtuSizing.C diff --git a/src/conversion/vtk/part/foamVtuSizing.H b/src/fileFormats/vtk/part/foamVtuSizing.H similarity index 100% rename from src/conversion/vtk/part/foamVtuSizing.H rename to src/fileFormats/vtk/part/foamVtuSizing.H diff --git a/src/conversion/vtk/part/foamVtuSizingI.H b/src/fileFormats/vtk/part/foamVtuSizingI.H similarity index 100% rename from src/conversion/vtk/part/foamVtuSizingI.H rename to src/fileFormats/vtk/part/foamVtuSizingI.H diff --git a/src/conversion/vtk/part/foamVtuSizingTemplates.C b/src/fileFormats/vtk/part/foamVtuSizingTemplates.C similarity index 100% rename from src/conversion/vtk/part/foamVtuSizingTemplates.C rename to src/fileFormats/vtk/part/foamVtuSizingTemplates.C -- GitLab