From d57bfd2f9eb331d11d7d50d33ba699070ca18f98 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 20 Dec 2011 03:07:38 +0000 Subject: [PATCH] Accept gmsh format 2.2. git-svn-id: https://svn.dealii.org/trunk@24841 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 5 +++++ deal.II/source/grid/grid_in.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 30fbab4827..8908433cfe 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -73,6 +73,11 @@ enabled due to a missing include file in file

Specific improvements

    +
  1. New: The GridIn class now also reads the GMSH format 2.2 as written by +GMSH 2.5. +
    +(Vijay Mahadevan, Wolfgang Bangerth, 2011/12/19) +
  2. Fixed: When ./configure does not detect the presence of zlib, writing output in VTU format failed to produce a valid output file. diff --git a/deal.II/source/grid/grid_in.cc b/deal.II/source/grid/grid_in.cc index 8579f3d731..a371e6aaed 100644 --- a/deal.II/source/grid/grid_in.cc +++ b/deal.II/source/grid/grid_in.cc @@ -575,7 +575,7 @@ void GridIn::read_msh (std::istream &in) in >> version >> file_type >> data_size; Assert ( (version >= 2.0) && - (version <= 2.1), ExcNotImplemented()); + (version <= 2.2), ExcNotImplemented()); Assert (file_type == 0, ExcNotImplemented()); Assert (data_size == sizeof(double), ExcNotImplemented()); -- 2.39.5