Allow reading from inr file

luca-heltai · Sep 8, 2024 · 85aad81 · 85aad81
1 parent 9311397
commit 85aad81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/include/deal.II/cgal/triangulation.h b/include/deal.II/cgal/triangulation.h
@@ -34,6 +34,7 @@
 #  include <CGAL/Labeled_mesh_domain_3.h>
 #  include <CGAL/Mesh_complex_3_in_triangulation_3.h>
 #  include <CGAL/Mesh_criteria_3.h>
+# include <CGAL/Image_3.h>
 #  include <CGAL/Mesh_triangulation_3.h>
 #  include <CGAL/Polyhedron_3.h>
 #  include <CGAL/Surface_mesh.h>

diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h
@@ -21,7 +21,7 @@
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/point.h>
 #include <deal.II/base/smartpointer.h>
-
+#include <deal.II/cgal/additional_data.h>
 #include <iostream>
 #include <string>
 #include <vector>
@@ -415,6 +415,12 @@ class GridIn
   void
   read_vtk(std::istream &in);
 
+
+  void
+  read_inr(const std::string &                    filename,
+           const CGALWrappers::AdditionalData<3> &data =
+             CGALWrappers::AdditionalData<3>{});
+
   /**
    * Read grid data from a unstructured vtu file, saved by deal.II using
    * GridOut::write_vtu(), with the flag

diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt
@@ -24,7 +24,7 @@
 #
 if(DEAL_II_WITH_CGAL)
   enable_if_supported(_flag "-Wno-misleading-indentation")
-  set_property(SOURCE "grid_generator_cgal.cc" "grid_tools.cc"
+  set_property(SOURCE "grid_generator_cgal.cc" "grid_in_cgal.cc" "grid_tools.cc"
     APPEND PROPERTY COMPILE_OPTIONS "${_flag}"
     )
 endif()
@@ -50,6 +50,7 @@ set(_separate_src
   grid_generator_from_name.cc
   grid_generator_pipe_junction.cc
   grid_in.cc
+  grid_in_cgal.cc
   grid_out.cc
   grid_tools.cc
   grid_tools_cache.cc