From 042cc275e72ac02f037a90842adba45f29e89ec6 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@localhost.localdomain>
Date: Tue, 15 Mar 2016 15:10:00 +0100
Subject: [PATCH] Small Fix in the VTKWriter
---
src/Makefile.am | 2 +-
src/VTKWriter/VTKWriter_dist_graph.hpp | 5 ++---
src/VTKWriter/VTKWriter_graph.hpp | 3 +++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a51c04f2..5883a8b6 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ io_LDADD = $(LINKLIBS)
nobase_include_HEADERS = CSVWriter/csv_multiarray.hpp CSVWriter/CSVWriter.hpp \
GraphMLWriter/GraphMLWriter.hpp util.hpp \
-VTKWriter/VTKWriter.hpp VTKWriter/VTKWriter_graph.hpp VTKWriter/VTKWriter_point_set.hpp VTKWriter/VTKWriter_grids.hpp VTKWriter/VTKWriter_grids_st.hpp VTKWriter/VTKWriter_grids_util.hpp VTKWriter/VTKWriter_vector_box.hpp HDF5_XdmfWriter/HDF5_XdmfWriter.hpp HDF5_XdmfWriter/HDF5_XdmfWriter_point_set.hpp HDF5_XdmfWriter/HDF5_XdmfWriter_util.hpp \
+VTKWriter/VTKWriter.hpp VTKWriter/VTKWriter_dist_graph.hpp VTKWriter/VTKWriter_graph.hpp VTKWriter/VTKWriter_point_set.hpp VTKWriter/VTKWriter_grids.hpp VTKWriter/VTKWriter_grids_st.hpp VTKWriter/VTKWriter_grids_util.hpp VTKWriter/VTKWriter_vector_box.hpp HDF5_XdmfWriter/HDF5_XdmfWriter.hpp HDF5_XdmfWriter/HDF5_XdmfWriter_point_set.hpp HDF5_XdmfWriter/HDF5_XdmfWriter_util.hpp \
Plot/GoogleChart.hpp Plot/util.hpp
diff --git a/src/VTKWriter/VTKWriter_dist_graph.hpp b/src/VTKWriter/VTKWriter_dist_graph.hpp
index b070fa6c..cb5834bc 100644
--- a/src/VTKWriter/VTKWriter_dist_graph.hpp
+++ b/src/VTKWriter/VTKWriter_dist_graph.hpp
@@ -111,11 +111,10 @@ struct vtk_dist_vertex_node
* \param n_obj object container to access its properties for example encapc<...>
*
*/
- vtk_dist_vertex_node(std::string & v_node, typename G::V_container & n_obj, s_type (&x)[3]) :
- x(x), vo(n_obj), v_node(v_node), z_set(false)
+ vtk_dist_vertex_node(std::string & v_node, typename G::V_container & n_obj, s_type (&x)[3])
+ :z_set(false),x(x), vo(n_obj), v_node(v_node)
{
}
- ;
//! \brief Write collected information
void write()
diff --git a/src/VTKWriter/VTKWriter_graph.hpp b/src/VTKWriter/VTKWriter_graph.hpp
index f896a2d3..7eda69ae 100644
--- a/src/VTKWriter/VTKWriter_graph.hpp
+++ b/src/VTKWriter/VTKWriter_graph.hpp
@@ -64,6 +64,9 @@ struct vtk_vertex_node_array_scalar_selector<true>
template<typename T, typename ele_v, typename G, typename s_type>
static inline void move(typename G::V_container &vo, s_type (&x)[3], bool &z_set)
{
+ if (G::V_type::attributes::name[T::value] != "x")
+ return;
+
if (std::extent<ele_v>::value == 3)
z_set = true;
--
GitLab