@@ -32,11 +32,20 @@ class VtkData {
3232 virtual void set_points (const Array<double >& points) = 0;
3333 virtual void set_connectivity (const int nsd, const Array<int >& conn, const int pid = 0 ) = 0;
3434
35+ virtual bool has_cell_data (const std::string& data_name) = 0;
3536 virtual bool has_point_data (const std::string& data_name) = 0;
3637
3738 virtual void copy_points (Array<double >& points) = 0;
39+
3840 virtual void copy_point_data (const std::string& data_name, Array<double >& mesh_data) = 0;
3941 virtual void copy_point_data (const std::string& data_name, Vector<double >& mesh_data) = 0;
42+ virtual void copy_point_data (const std::string& data_name, Vector<int >& mesh_data) = 0;
43+
44+ virtual void copy_cell_data (const std::string& data_name, Vector<int >& mesh_data) = 0;
45+
46+ virtual Array<double > get_point_data (const std::string& data_name) = 0;
47+ virtual std::vector<std::string> get_point_data_names () = 0;
48+
4049 virtual void write () = 0;
4150
4251 static VtkData* create_reader (const std::string& file_name);
@@ -64,13 +73,20 @@ class VtkVtpData : public VtkData {
6473 virtual int num_points () const override ;
6574 virtual void read_file (const std::string& file_name) override ;
6675
67- void copy_points (Array<double >& points) override ;
68- void copy_point_data (const std::string& data_name, Array<double >& mesh_data) override ;
69- void copy_point_data (const std::string& data_name, Vector<double >& mesh_data) override ;
70- void copy_point_data (const std::string& data_name, Vector<int >& mesh_data);
71- Array<double > get_point_data (const std::string& data_name);
72- std::vector<std::string> get_point_data_names ();
73- bool has_point_data (const std::string& data_name) override ;
76+ virtual void copy_points (Array<double >& points) override ;
77+
78+ virtual void copy_point_data (const std::string& data_name, Array<double >& mesh_data) override ;
79+ virtual void copy_point_data (const std::string& data_name, Vector<double >& mesh_data) override ;
80+ virtual void copy_point_data (const std::string& data_name, Vector<int >& mesh_data) override ;
81+
82+ virtual void copy_cell_data (const std::string& data_name, Vector<int >& mesh_data) override ;
83+
84+ virtual Array<double > get_point_data (const std::string& data_name) override ;
85+ virtual std::vector<std::string> get_point_data_names () override ;
86+
87+ virtual bool has_cell_data (const std::string& data_name) override ;
88+ virtual bool has_point_data (const std::string& data_name) override ;
89+
7490 virtual void set_connectivity (const int nsd, const Array<int >& conn, const int pid = 0 ) override ;
7591
7692 virtual void set_element_data (const std::string& data_name, const Array<double >& data) override ;
@@ -101,15 +117,22 @@ class VtkVtuData : public VtkData {
101117 virtual int num_points () const override ;
102118 virtual void read_file (const std::string& file_name) override ;
103119
104- void copy_points (Array<double >& points) override ;
105- void copy_point_data (const std::string& data_name, Array<double >& mesh_data) override ;
106- void copy_point_data (const std::string& data_name, Vector<double >& mesh_data) override ;
107- void copy_point_data (const std::string& data_name, Vector<int >& mesh_data);
120+ virtual void copy_points (Array<double >& points) override ;
121+
122+ virtual void copy_point_data (const std::string& data_name, Array<double >& mesh_data) override ;
123+ virtual void copy_point_data (const std::string& data_name, Vector<double >& mesh_data) override ;
124+ virtual void copy_point_data (const std::string& data_name, Vector<int >& mesh_data) override ;
125+
126+ virtual void copy_cell_data (const std::string& data_name, Vector<int >& mesh_data) override ;
127+
128+ virtual Array<double > get_point_data (const std::string& data_name) override ;
129+ virtual std::vector<std::string> get_point_data_names () override ;
108130
109- Array<double > get_point_data (const std::string& data_name);
110- std::vector<std::string> get_point_data_names ();
111131 virtual Array<double > get_points () const override ;
112- bool has_point_data (const std::string& data_name) override ;
132+
133+ virtual bool has_cell_data (const std::string& data_name) override ;
134+ virtual bool has_point_data (const std::string& data_name) override ;
135+
113136 virtual void set_connectivity (const int nsd, const Array<int >& conn, const int pid = 0 ) override ;
114137
115138 virtual void set_element_data (const std::string& data_name, const Array<double >& data) override ;
0 commit comments