From: amola Date: Fri, 8 Apr 2016 16:07:14 +0000 (+0200) Subject: added new option to read indicators in a abaqus file as manifold ids X-Git-Tag: v8.5.0-rc1~1125^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2459%2Fhead;p=dealii.git 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 30bf551332..5368ee6599 100644 --- 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 119c196546..d45513556e 100644 --- a/source/grid/grid_in.cc +++ b/source/grid/grid_in.cc @@ -844,7 +844,8 @@ namespace } template -void GridIn::read_abaqus (std::istream &in) +void GridIn::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::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 (...) {