added new option to read indicators in a abaqus file as manifold ids

diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h
index 30bf5513320b7d7728a236bab758e91973ab29ab..5368ee6599ebe9a9488fe99088784c81a6a2a102 100644 (file)
--- a/include/deal.II/grid/grid_in.h
+++ b/include/deal.II/grid/grid_in.h
@@ -377,7 +377,10 @@ public:
 
   /**
    * Read grid data from an Abaqus file. Numerical and constitutive data is
-   * ignored.
+   * ignored. As in the case of the ucd file format, it is possible to use
+   * the flag apply_all_indicators_to_manifolds to decide if
+   * the indicators in the file refer to manifolds (flag set to true)
+   * or boundaries (flag set to false).
    *
    * @note The current implementation of this mesh reader is suboptimal, and
    * may therefore be slow for large meshes.
@@ -411,7 +414,8 @@ public:
    * ID's". An invalid file will encounter errors if this box is left checked.
    *     - Click apply.
    */
-  void read_abaqus (std::istream &in);
+  void read_abaqus (std::istream                                  &in,
+                    const bool apply_all_indicators_to_manifolds=false);
 
   /**
    * Read grid data from a file containing data in the DB mesh format.

diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 119c196546551c67407c5c59ed861ad38d9dff47..d45513556e281981028ad45594818039e6d85aca 100644 (file)
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -844,7 +844,8 @@ namespace
 }
 
 template <int dim, int spacedim>
-void GridIn<dim, spacedim>::read_abaqus (std::istream &in)
+void GridIn<dim, spacedim>::read_abaqus (std::istream                            &in,
+                                         const bool apply_all_indicators_to_manifolds)
 {
   Assert (tria != 0, ExcNoTriangulationSelected());
   Assert (dim==2 || dim==3, ExcNotImplemented());
@@ -864,7 +865,7 @@ void GridIn<dim, spacedim>::read_abaqus (std::istream &in)
   // and doesn't think that they've somehow called the wrong function.
   try
     {
-      read_ucd(in_ucd);
+      read_ucd(in_ucd, apply_all_indicators_to_manifolds);
     }
   catch (...)
     {