Merge branch 'dev'

Author: guo.2154

include/ftk/filters/json_interface.hh

@@ -417,32 +417,17 @@ void json_interface::consume_unstructured(ndarray_stream<> &stream, diy::mpi::co
       vtkSmartPointer<vtkXMLUnstructuredGridReader> reader = vtkXMLUnstructuredGridReader::New();
       reader->SetFileName(filename.c_str());
       reader->Update();
-      // vtkSmartPointer<vtkUnstructuredGrid> grid = reader->GetOutput();
       grid = reader->GetOutput();
-      // return new_from_vtu(grid);
-
-      vtkSmartPointer<vtkUnsignedCharArray> types = grid->GetDistinctCellTypesArray();
-      const int ntypes = types->GetNumberOfValues();
-
-      if (ntypes == 1) {
-        unsigned char type = types->GetValue(0);
-        if (type == VTK_TRIANGLE) {
-          nd = 2;
-          // m.reset(new simplicial_unstructured_2d_mesh<>());
-        } else if (type == VTK_TETRA) { 
-          nd = 3;
-          // m.reset(new simplicial_unstructured_3d_mesh<>());
-        } else
-          fatal(FTK_ERR_MESH_NONSIMPLICIAL);
-      } else
-        fatal(FTK_ERR_MESH_NONSIMPLICIAL);
+      nd = simplicial_unstructured_mesh<>::check_simplicial_mesh_dims(grid);
     }
 
     diy::mpi::broadcast(comm, nd, get_root_proc());
     if (nd == 2) 
       m.reset(new simplicial_unstructured_2d_mesh<>());
     else if (nd == 3) 
       m.reset(new simplicial_unstructured_3d_mesh<>());
+    else 
+      fatal(FTK_ERR_MESH_NONSIMPLICIAL);
 
     m->from_vtu(grid);
 #else

include/ftk/mesh/simplicial_unstructured_mesh.hh

@@ -58,6 +58,8 @@ public: // io
 
   virtual vtkSmartPointer<vtkUnstructuredGrid> to_vtu() const = 0;
   virtual void from_vtu(vtkSmartPointer<vtkUnstructuredGrid> grid) = 0;
+
+  static int check_simplicial_mesh_dims(vtkSmartPointer<vtkUnstructuredGrid> grid); // 0: nonsimplicial, 2 or 3: 2D or 3D
 #endif
 };
 
@@ -177,6 +179,37 @@ vtkSmartPointer<vtkUnstructuredGrid> simplicial_unstructured_mesh<I, F>::vector_
 
   return grid;
 }
+
+template <typename I, typename F>
+int simplicial_unstructured_mesh<I, F>::check_simplicial_mesh_dims(vtkSmartPointer<vtkUnstructuredGrid> grid)
+{
+  int nd = 0;
+#if (VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 0))
+  vtkSmartPointer<vtkUnsignedCharArray> types = grid->GetDistinctCellTypesArray();
+  const int ntypes = types->GetNumberOfValues();
+
+  if (ntypes == 1) {
+    unsigned char type = types->GetValue(0);
+    if (type == VTK_TRIANGLE) nd = 2;
+    else if (type == VTK_TETRA) nd = 3;
+    else nd = 0; // nonsimplicial
+  } else 
+    nd = 0; // nonsimplicial
+#else 
+  vtkSmartPointer<vtkCellTypes> types = vtkSmartPointer<vtkCellTypes>::New();
+  grid->GetCellTypes(types);
+  const int ntypes = types->GetNumberOfTypes();
+
+  if (ntypes == 1) {
+    unsigned char type = types->GetCellType(0);
+    if (type == VTK_TRIANGLE) nd = 2;
+    else if (type == VTK_TETRA) nd = 3;
+    else nd = 0; // nonsimplicial
+  } else 
+    nd = 0; // nonsimplicial
+#endif
+  return nd;
+}
 #endif
 
 } // namespace ftk