Add read_assimp inside GridIn<dim,spacedim>::read(std::string)

diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 421e30db9c2287bc95478b86e7b72ba19d491884..84eec6bef3d221ef548b2d35b9d97bb117b50474 100644 (file)
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -3036,7 +3036,6 @@ GridIn<dim, spacedim>::read(const std::string &filename, Format format)
   else
     name = search.find(filename, default_suffix(format));
 
-  std::ifstream in(name.c_str());
 
   if (format == Default)
     {
@@ -3049,7 +3048,16 @@ GridIn<dim, spacedim>::read(const std::string &filename, Format format)
           format          = parse_format(ext);
         }
     }
-  read(in, format);
+
+  if (format == assimp)
+    {
+      read_assimp(name);
+    }
+  else
+    {
+      std::ifstream in(name.c_str());
+      read(in, format);
+    }
 }