From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Fri, 11 Sep 2020 21:01:43 +0000 (+0000)
Subject: Add read_assimp inside GridIn<dim,spacedim>::read(std::string)
X-Git-Tag: v9.3.0-rc1~1122^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10907%2Fhead;p=dealii.git

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 421e30db9c..84eec6bef3 100644
--- 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);
+    }
 }