From: bangerth Date: Wed, 28 Jan 2009 01:19:28 +0000 (+0000) Subject: A patch by Victor Prosolin that fixes an oversight: When... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=707ddf4ae49d4e580879d174c6951212bb9df31f;p=dealii-svn.git A patch by Victor Prosolin that fixes an oversight: When we write GMSH version 2 files, we also need to treat vertices properly. git-svn-id: https://svn.dealii.org/trunk@18305 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index b059e10167..cd435d6023 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -806,8 +806,20 @@ void GridIn::read_msh (std::istream &in) // but read the // number of nodes // given - for (unsigned int i=0; i> dummy; + switch (gmsh_file_format) + { + case 1: + { + for (unsigned int i=0; i> dummy; + break; + } + case 2: + { + in >> dummy; + break; + } + } } else // cannot read this diff --git a/tests/deal.II/grid_in_msh_version_1.cc b/tests/deal.II/grid_in_msh_version_1.cc new file mode 100644 index 0000000000..3b6b4c291e --- /dev/null +++ b/tests/deal.II/grid_in_msh_version_1.cc @@ -0,0 +1,71 @@ +//---------------------------- grid_in_msh_version_1.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 2009 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_in_msh_version_1.cc --------------------------- + +// in implementing GMSH version 2 input, we forgot reading vertices in +// version 2 format as well. A fix by Victor Prosolin helped this +// problem + +#include "../tests.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +std::ofstream logfile("grid_in_msh_version_1/output"); + + +template +void check_file (const std::string name, + typename GridIn::Format format) +{ + Triangulation tria; + GridIn gi; + gi.attach_triangulation (tria); + gi.read(name, format); + deallog << name + << '\t' << tria.n_vertices() + << '\t' << tria.n_cells() + << std::endl; + + GridOut grid_out; + grid_out.write_gnuplot (tria, deallog.get_file_stream()); +} + +void filename_resolution() +{ + check_file<2> (std::string("grid_in_msh_version_1/input_v1"), GridIn<2>::msh); + check_file<2> (std::string("grid_in_msh_version_1/input_v2"), GridIn<2>::msh); +} + + +int main () +{ + deallog << std::setprecision (5); + logfile << std::setprecision (5); + deallog.attach(logfile); + deallog.depth_console(0); + deallog.threshold_double(1.e-10); + + filename_resolution(); +} + diff --git a/tests/deal.II/grid_in_msh_version_1/cmp/generic b/tests/deal.II/grid_in_msh_version_1/cmp/generic new file mode 100644 index 0000000000..1dbaa89cba --- /dev/null +++ b/tests/deal.II/grid_in_msh_version_1/cmp/generic @@ -0,0 +1,689 @@ + +DEAL::grid_in_msh_version_1/input_v1 64 49 +-1.0000 -1.0000 0 0 +-0.71429 -1.0000 0 0 +-0.71429 -0.71429 0 0 +-1.0000 -0.71429 0 0 +-1.0000 -1.0000 0 0 + + +-1.0000 -0.71429 0 0 +-0.71429 -0.71429 0 0 +-0.71429 -0.42857 0 0 +-1.0000 -0.42857 0 0 +-1.0000 -0.71429 0 0 + + +-1.0000 -0.42857 0 0 +-0.71429 -0.42857 0 0 +-0.71429 -0.14286 0 0 +-1.0000 -0.14286 0 0 +-1.0000 -0.42857 0 0 + + +-1.0000 -0.14286 0 0 +-0.71429 -0.14286 0 0 +-0.71429 0.14286 0 0 +-1.0000 0.14286 0 0 +-1.0000 -0.14286 0 0 + + +-1.0000 0.14286 0 0 +-0.71429 0.14286 0 0 +-0.71429 0.42857 0 0 +-1.0000 0.42857 0 0 +-1.0000 0.14286 0 0 + + +-1.0000 0.42857 0 0 +-0.71429 0.42857 0 0 +-0.71429 0.71429 0 0 +-1.0000 0.71429 0 0 +-1.0000 0.42857 0 0 + + +-1.0000 0.71429 0 0 +-0.71429 0.71429 0 0 +-0.71429 1.0000 0 0 +-1.0000 1.0000 0 0 +-1.0000 0.71429 0 0 + + +-0.71429 -1.0000 0 0 +-0.42857 -1.0000 0 0 +-0.42857 -0.71429 0 0 +-0.71429 -0.71429 0 0 +-0.71429 -1.0000 0 0 + + +-0.71429 -0.71429 0 0 +-0.42857 -0.71429 0 0 +-0.42857 -0.42857 0 0 +-0.71429 -0.42857 0 0 +-0.71429 -0.71429 0 0 + + +-0.71429 -0.42857 0 0 +-0.42857 -0.42857 0 0 +-0.42857 -0.14286 0 0 +-0.71429 -0.14286 0 0 +-0.71429 -0.42857 0 0 + + +-0.71429 -0.14286 0 0 +-0.42857 -0.14286 0 0 +-0.42857 0.14286 0 0 +-0.71429 0.14286 0 0 +-0.71429 -0.14286 0 0 + + +-0.71429 0.14286 0 0 +-0.42857 0.14286 0 0 +-0.42857 0.42857 0 0 +-0.71429 0.42857 0 0 +-0.71429 0.14286 0 0 + + +-0.71429 0.42857 0 0 +-0.42857 0.42857 0 0 +-0.42857 0.71429 0 0 +-0.71429 0.71429 0 0 +-0.71429 0.42857 0 0 + + +-0.71429 0.71429 0 0 +-0.42857 0.71429 0 0 +-0.42857 1.0000 0 0 +-0.71429 1.0000 0 0 +-0.71429 0.71429 0 0 + + +-0.42857 -1.0000 0 0 +-0.14286 -1.0000 0 0 +-0.14286 -0.71429 0 0 +-0.42857 -0.71429 0 0 +-0.42857 -1.0000 0 0 + + +-0.42857 -0.71429 0 0 +-0.14286 -0.71429 0 0 +-0.14286 -0.42857 0 0 +-0.42857 -0.42857 0 0 +-0.42857 -0.71429 0 0 + + +-0.42857 -0.42857 0 0 +-0.14286 -0.42857 0 0 +-0.14286 -0.14286 0 0 +-0.42857 -0.14286 0 0 +-0.42857 -0.42857 0 0 + + +-0.42857 -0.14286 0 0 +-0.14286 -0.14286 0 0 +-0.14286 0.14286 0 0 +-0.42857 0.14286 0 0 +-0.42857 -0.14286 0 0 + + +-0.42857 0.14286 0 0 +-0.14286 0.14286 0 0 +-0.14286 0.42857 0 0 +-0.42857 0.42857 0 0 +-0.42857 0.14286 0 0 + + +-0.42857 0.42857 0 0 +-0.14286 0.42857 0 0 +-0.14286 0.71429 0 0 +-0.42857 0.71429 0 0 +-0.42857 0.42857 0 0 + + +-0.42857 0.71429 0 0 +-0.14286 0.71429 0 0 +-0.14286 1.0000 0 0 +-0.42857 1.0000 0 0 +-0.42857 0.71429 0 0 + + +-0.14286 -1.0000 0 0 +0.14286 -1.0000 0 0 +0.14286 -0.71429 0 0 +-0.14286 -0.71429 0 0 +-0.14286 -1.0000 0 0 + + +-0.14286 -0.71429 0 0 +0.14286 -0.71429 0 0 +0.14286 -0.42857 0 0 +-0.14286 -0.42857 0 0 +-0.14286 -0.71429 0 0 + + +-0.14286 -0.42857 0 0 +0.14286 -0.42857 0 0 +0.14286 -0.14286 0 0 +-0.14286 -0.14286 0 0 +-0.14286 -0.42857 0 0 + + +-0.14286 -0.14286 0 0 +0.14286 -0.14286 0 0 +0.14286 0.14286 0 0 +-0.14286 0.14286 0 0 +-0.14286 -0.14286 0 0 + + +-0.14286 0.14286 0 0 +0.14286 0.14286 0 0 +0.14286 0.42857 0 0 +-0.14286 0.42857 0 0 +-0.14286 0.14286 0 0 + + +-0.14286 0.42857 0 0 +0.14286 0.42857 0 0 +0.14286 0.71429 0 0 +-0.14286 0.71429 0 0 +-0.14286 0.42857 0 0 + + +-0.14286 0.71429 0 0 +0.14286 0.71429 0 0 +0.14286 1.0000 0 0 +-0.14286 1.0000 0 0 +-0.14286 0.71429 0 0 + + +0.14286 -1.0000 0 0 +0.42857 -1.0000 0 0 +0.42857 -0.71429 0 0 +0.14286 -0.71429 0 0 +0.14286 -1.0000 0 0 + + +0.14286 -0.71429 0 0 +0.42857 -0.71429 0 0 +0.42857 -0.42857 0 0 +0.14286 -0.42857 0 0 +0.14286 -0.71429 0 0 + + +0.14286 -0.42857 0 0 +0.42857 -0.42857 0 0 +0.42857 -0.14286 0 0 +0.14286 -0.14286 0 0 +0.14286 -0.42857 0 0 + + +0.14286 -0.14286 0 0 +0.42857 -0.14286 0 0 +0.42857 0.14286 0 0 +0.14286 0.14286 0 0 +0.14286 -0.14286 0 0 + + +0.14286 0.14286 0 0 +0.42857 0.14286 0 0 +0.42857 0.42857 0 0 +0.14286 0.42857 0 0 +0.14286 0.14286 0 0 + + +0.14286 0.42857 0 0 +0.42857 0.42857 0 0 +0.42857 0.71429 0 0 +0.14286 0.71429 0 0 +0.14286 0.42857 0 0 + + +0.14286 0.71429 0 0 +0.42857 0.71429 0 0 +0.42857 1.0000 0 0 +0.14286 1.0000 0 0 +0.14286 0.71429 0 0 + + +0.42857 -1.0000 0 0 +0.71429 -1.0000 0 0 +0.71429 -0.71429 0 0 +0.42857 -0.71429 0 0 +0.42857 -1.0000 0 0 + + +0.42857 -0.71429 0 0 +0.71429 -0.71429 0 0 +0.71429 -0.42857 0 0 +0.42857 -0.42857 0 0 +0.42857 -0.71429 0 0 + + +0.42857 -0.42857 0 0 +0.71429 -0.42857 0 0 +0.71429 -0.14286 0 0 +0.42857 -0.14286 0 0 +0.42857 -0.42857 0 0 + + +0.42857 -0.14286 0 0 +0.71429 -0.14286 0 0 +0.71429 0.14286 0 0 +0.42857 0.14286 0 0 +0.42857 -0.14286 0 0 + + +0.42857 0.14286 0 0 +0.71429 0.14286 0 0 +0.71429 0.42857 0 0 +0.42857 0.42857 0 0 +0.42857 0.14286 0 0 + + +0.42857 0.42857 0 0 +0.71429 0.42857 0 0 +0.71429 0.71429 0 0 +0.42857 0.71429 0 0 +0.42857 0.42857 0 0 + + +0.42857 0.71429 0 0 +0.71429 0.71429 0 0 +0.71429 1.0000 0 0 +0.42857 1.0000 0 0 +0.42857 0.71429 0 0 + + +0.71429 -1.0000 0 0 +1.0000 -1.0000 0 0 +1.0000 -0.71429 0 0 +0.71429 -0.71429 0 0 +0.71429 -1.0000 0 0 + + +0.71429 -0.71429 0 0 +1.0000 -0.71429 0 0 +1.0000 -0.42857 0 0 +0.71429 -0.42857 0 0 +0.71429 -0.71429 0 0 + + +0.71429 -0.42857 0 0 +1.0000 -0.42857 0 0 +1.0000 -0.14286 0 0 +0.71429 -0.14286 0 0 +0.71429 -0.42857 0 0 + + +0.71429 -0.14286 0 0 +1.0000 -0.14286 0 0 +1.0000 0.14286 0 0 +0.71429 0.14286 0 0 +0.71429 -0.14286 0 0 + + +0.71429 0.14286 0 0 +1.0000 0.14286 0 0 +1.0000 0.42857 0 0 +0.71429 0.42857 0 0 +0.71429 0.14286 0 0 + + +0.71429 0.42857 0 0 +1.0000 0.42857 0 0 +1.0000 0.71429 0 0 +0.71429 0.71429 0 0 +0.71429 0.42857 0 0 + + +0.71429 0.71429 0 0 +1.0000 0.71429 0 0 +1.0000 1.0000 0 0 +0.71429 1.0000 0 0 +0.71429 0.71429 0 0 + + +DEAL::grid_in_msh_version_1/input_v2 64 49 +-1.0000 -1.0000 0 0 +-0.71429 -1.0000 0 0 +-0.71429 -0.71429 0 0 +-1.0000 -0.71429 0 0 +-1.0000 -1.0000 0 0 + + +-1.0000 -0.71429 0 0 +-0.71429 -0.71429 0 0 +-0.71429 -0.42857 0 0 +-1.0000 -0.42857 0 0 +-1.0000 -0.71429 0 0 + + +-1.0000 -0.42857 0 0 +-0.71429 -0.42857 0 0 +-0.71429 -0.14286 0 0 +-1.0000 -0.14286 0 0 +-1.0000 -0.42857 0 0 + + +-1.0000 -0.14286 0 0 +-0.71429 -0.14286 0 0 +-0.71429 0.14286 0 0 +-1.0000 0.14286 0 0 +-1.0000 -0.14286 0 0 + + +-1.0000 0.14286 0 0 +-0.71429 0.14286 0 0 +-0.71429 0.42857 0 0 +-1.0000 0.42857 0 0 +-1.0000 0.14286 0 0 + + +-1.0000 0.42857 0 0 +-0.71429 0.42857 0 0 +-0.71429 0.71429 0 0 +-1.0000 0.71429 0 0 +-1.0000 0.42857 0 0 + + +-1.0000 0.71429 0 0 +-0.71429 0.71429 0 0 +-0.71429 1.0000 0 0 +-1.0000 1.0000 0 0 +-1.0000 0.71429 0 0 + + +-0.71429 -1.0000 0 0 +-0.42857 -1.0000 0 0 +-0.42857 -0.71429 0 0 +-0.71429 -0.71429 0 0 +-0.71429 -1.0000 0 0 + + +-0.71429 -0.71429 0 0 +-0.42857 -0.71429 0 0 +-0.42857 -0.42857 0 0 +-0.71429 -0.42857 0 0 +-0.71429 -0.71429 0 0 + + +-0.71429 -0.42857 0 0 +-0.42857 -0.42857 0 0 +-0.42857 -0.14286 0 0 +-0.71429 -0.14286 0 0 +-0.71429 -0.42857 0 0 + + +-0.71429 -0.14286 0 0 +-0.42857 -0.14286 0 0 +-0.42857 0.14286 0 0 +-0.71429 0.14286 0 0 +-0.71429 -0.14286 0 0 + + +-0.71429 0.14286 0 0 +-0.42857 0.14286 0 0 +-0.42857 0.42857 0 0 +-0.71429 0.42857 0 0 +-0.71429 0.14286 0 0 + + +-0.71429 0.42857 0 0 +-0.42857 0.42857 0 0 +-0.42857 0.71429 0 0 +-0.71429 0.71429 0 0 +-0.71429 0.42857 0 0 + + +-0.71429 0.71429 0 0 +-0.42857 0.71429 0 0 +-0.42857 1.0000 0 0 +-0.71429 1.0000 0 0 +-0.71429 0.71429 0 0 + + +-0.42857 -1.0000 0 0 +-0.14286 -1.0000 0 0 +-0.14286 -0.71429 0 0 +-0.42857 -0.71429 0 0 +-0.42857 -1.0000 0 0 + + +-0.42857 -0.71429 0 0 +-0.14286 -0.71429 0 0 +-0.14286 -0.42857 0 0 +-0.42857 -0.42857 0 0 +-0.42857 -0.71429 0 0 + + +-0.42857 -0.42857 0 0 +-0.14286 -0.42857 0 0 +-0.14286 -0.14286 0 0 +-0.42857 -0.14286 0 0 +-0.42857 -0.42857 0 0 + + +-0.42857 -0.14286 0 0 +-0.14286 -0.14286 0 0 +-0.14286 0.14286 0 0 +-0.42857 0.14286 0 0 +-0.42857 -0.14286 0 0 + + +-0.42857 0.14286 0 0 +-0.14286 0.14286 0 0 +-0.14286 0.42857 0 0 +-0.42857 0.42857 0 0 +-0.42857 0.14286 0 0 + + +-0.42857 0.42857 0 0 +-0.14286 0.42857 0 0 +-0.14286 0.71429 0 0 +-0.42857 0.71429 0 0 +-0.42857 0.42857 0 0 + + +-0.42857 0.71429 0 0 +-0.14286 0.71429 0 0 +-0.14286 1.0000 0 0 +-0.42857 1.0000 0 0 +-0.42857 0.71429 0 0 + + +-0.14286 -1.0000 0 0 +0.14286 -1.0000 0 0 +0.14286 -0.71429 0 0 +-0.14286 -0.71429 0 0 +-0.14286 -1.0000 0 0 + + +-0.14286 -0.71429 0 0 +0.14286 -0.71429 0 0 +0.14286 -0.42857 0 0 +-0.14286 -0.42857 0 0 +-0.14286 -0.71429 0 0 + + +-0.14286 -0.42857 0 0 +0.14286 -0.42857 0 0 +0.14286 -0.14286 0 0 +-0.14286 -0.14286 0 0 +-0.14286 -0.42857 0 0 + + +-0.14286 -0.14286 0 0 +0.14286 -0.14286 0 0 +0.14286 0.14286 0 0 +-0.14286 0.14286 0 0 +-0.14286 -0.14286 0 0 + + +-0.14286 0.14286 0 0 +0.14286 0.14286 0 0 +0.14286 0.42857 0 0 +-0.14286 0.42857 0 0 +-0.14286 0.14286 0 0 + + +-0.14286 0.42857 0 0 +0.14286 0.42857 0 0 +0.14286 0.71429 0 0 +-0.14286 0.71429 0 0 +-0.14286 0.42857 0 0 + + +-0.14286 0.71429 0 0 +0.14286 0.71429 0 0 +0.14286 1.0000 0 0 +-0.14286 1.0000 0 0 +-0.14286 0.71429 0 0 + + +0.14286 -1.0000 0 0 +0.42857 -1.0000 0 0 +0.42857 -0.71429 0 0 +0.14286 -0.71429 0 0 +0.14286 -1.0000 0 0 + + +0.14286 -0.71429 0 0 +0.42857 -0.71429 0 0 +0.42857 -0.42857 0 0 +0.14286 -0.42857 0 0 +0.14286 -0.71429 0 0 + + +0.14286 -0.42857 0 0 +0.42857 -0.42857 0 0 +0.42857 -0.14286 0 0 +0.14286 -0.14286 0 0 +0.14286 -0.42857 0 0 + + +0.14286 -0.14286 0 0 +0.42857 -0.14286 0 0 +0.42857 0.14286 0 0 +0.14286 0.14286 0 0 +0.14286 -0.14286 0 0 + + +0.14286 0.14286 0 0 +0.42857 0.14286 0 0 +0.42857 0.42857 0 0 +0.14286 0.42857 0 0 +0.14286 0.14286 0 0 + + +0.14286 0.42857 0 0 +0.42857 0.42857 0 0 +0.42857 0.71429 0 0 +0.14286 0.71429 0 0 +0.14286 0.42857 0 0 + + +0.14286 0.71429 0 0 +0.42857 0.71429 0 0 +0.42857 1.0000 0 0 +0.14286 1.0000 0 0 +0.14286 0.71429 0 0 + + +0.42857 -1.0000 0 0 +0.71429 -1.0000 0 0 +0.71429 -0.71429 0 0 +0.42857 -0.71429 0 0 +0.42857 -1.0000 0 0 + + +0.42857 -0.71429 0 0 +0.71429 -0.71429 0 0 +0.71429 -0.42857 0 0 +0.42857 -0.42857 0 0 +0.42857 -0.71429 0 0 + + +0.42857 -0.42857 0 0 +0.71429 -0.42857 0 0 +0.71429 -0.14286 0 0 +0.42857 -0.14286 0 0 +0.42857 -0.42857 0 0 + + +0.42857 -0.14286 0 0 +0.71429 -0.14286 0 0 +0.71429 0.14286 0 0 +0.42857 0.14286 0 0 +0.42857 -0.14286 0 0 + + +0.42857 0.14286 0 0 +0.71429 0.14286 0 0 +0.71429 0.42857 0 0 +0.42857 0.42857 0 0 +0.42857 0.14286 0 0 + + +0.42857 0.42857 0 0 +0.71429 0.42857 0 0 +0.71429 0.71429 0 0 +0.42857 0.71429 0 0 +0.42857 0.42857 0 0 + + +0.42857 0.71429 0 0 +0.71429 0.71429 0 0 +0.71429 1.0000 0 0 +0.42857 1.0000 0 0 +0.42857 0.71429 0 0 + + +0.71429 -1.0000 0 0 +1.0000 -1.0000 0 0 +1.0000 -0.71429 0 0 +0.71429 -0.71429 0 0 +0.71429 -1.0000 0 0 + + +0.71429 -0.71429 0 0 +1.0000 -0.71429 0 0 +1.0000 -0.42857 0 0 +0.71429 -0.42857 0 0 +0.71429 -0.71429 0 0 + + +0.71429 -0.42857 0 0 +1.0000 -0.42857 0 0 +1.0000 -0.14286 0 0 +0.71429 -0.14286 0 0 +0.71429 -0.42857 0 0 + + +0.71429 -0.14286 0 0 +1.0000 -0.14286 0 0 +1.0000 0.14286 0 0 +0.71429 0.14286 0 0 +0.71429 -0.14286 0 0 + + +0.71429 0.14286 0 0 +1.0000 0.14286 0 0 +1.0000 0.42857 0 0 +0.71429 0.42857 0 0 +0.71429 0.14286 0 0 + + +0.71429 0.42857 0 0 +1.0000 0.42857 0 0 +1.0000 0.71429 0 0 +0.71429 0.71429 0 0 +0.71429 0.42857 0 0 + + +0.71429 0.71429 0 0 +1.0000 0.71429 0 0 +1.0000 1.0000 0 0 +0.71429 1.0000 0 0 +0.71429 0.71429 0 0 + + diff --git a/tests/deal.II/grid_in_msh_version_1/input_v1.msh b/tests/deal.II/grid_in_msh_version_1/input_v1.msh new file mode 100644 index 0000000000..09e2f0cb05 --- /dev/null +++ b/tests/deal.II/grid_in_msh_version_1/input_v1.msh @@ -0,0 +1,151 @@ +$NOD +64 +1 -1 -1 0 +2 1 -1 0 +3 -1 1 0 +4 1 1 0 +5 -0.7142857142865073 -1 0 +6 -0.4285714285729154 -1 0 +7 -0.1428571428590263 -1 0 +8 0.1428571428552594 -1 0 +9 0.4285714285699418 -1 0 +10 0.7142857142849213 -1 0 +11 -0.7142857142865073 1 0 +12 -0.4285714285729154 1 0 +13 -0.1428571428590263 1 0 +14 0.1428571428552594 1 0 +15 0.4285714285699418 1 0 +16 0.7142857142849213 1 0 +17 -1 -0.7142857142865073 0 +18 -1 -0.4285714285729154 0 +19 -1 -0.1428571428590263 0 +20 -1 0.1428571428552594 0 +21 -1 0.4285714285699418 0 +22 -1 0.7142857142849213 0 +23 1 -0.7142857142865073 0 +24 1 -0.4285714285729154 0 +25 1 -0.1428571428590263 0 +26 1 0.1428571428552594 0 +27 1 0.4285714285699418 0 +28 1 0.7142857142849213 0 +29 -0.7142857142865072 -0.7142857142865073 0 +30 -0.7142857142865072 -0.4285714285729154 0 +31 -0.7142857142865072 -0.1428571428590263 0 +32 -0.7142857142865073 0.1428571428552594 0 +33 -0.7142857142865073 0.4285714285699418 0 +34 -0.7142857142865073 0.7142857142849213 0 +35 -0.4285714285729154 -0.7142857142865073 0 +36 -0.4285714285729154 -0.4285714285729154 0 +37 -0.4285714285729154 -0.1428571428590263 0 +38 -0.4285714285729154 0.1428571428552594 0 +39 -0.4285714285729154 0.4285714285699418 0 +40 -0.4285714285729154 0.7142857142849213 0 +41 -0.1428571428590263 -0.7142857142865073 0 +42 -0.1428571428590263 -0.4285714285729154 0 +43 -0.1428571428590263 -0.1428571428590263 0 +44 -0.1428571428590263 0.1428571428552594 0 +45 -0.1428571428590263 0.4285714285699418 0 +46 -0.1428571428590263 0.7142857142849213 0 +47 0.1428571428552594 -0.7142857142865073 0 +48 0.1428571428552594 -0.4285714285729154 0 +49 0.1428571428552594 -0.1428571428590263 0 +50 0.1428571428552594 0.1428571428552594 0 +51 0.1428571428552594 0.4285714285699418 0 +52 0.1428571428552594 0.7142857142849213 0 +53 0.4285714285699418 -0.7142857142865073 0 +54 0.4285714285699418 -0.4285714285729154 0 +55 0.4285714285699418 -0.1428571428590263 0 +56 0.4285714285699418 0.1428571428552594 0 +57 0.4285714285699418 0.4285714285699418 0 +58 0.4285714285699418 0.7142857142849213 0 +59 0.7142857142849213 -0.7142857142865073 0 +60 0.7142857142849213 -0.4285714285729154 0 +61 0.7142857142849213 -0.1428571428590263 0 +62 0.7142857142849213 0.1428571428552594 0 +63 0.7142857142849213 0.4285714285699418 0 +64 0.7142857142849213 0.7142857142849213 0 +$ENDNOD +$ELM +81 +1 15 0 1 1 1 +2 15 0 2 1 2 +3 15 0 3 1 3 +4 15 0 4 1 4 +5 1 0 1 2 1 5 +6 1 0 1 2 5 6 +7 1 0 1 2 6 7 +8 1 0 1 2 7 8 +9 1 0 1 2 8 9 +10 1 0 1 2 9 10 +11 1 0 1 2 10 2 +12 1 0 2 2 3 11 +13 1 0 2 2 11 12 +14 1 0 2 2 12 13 +15 1 0 2 2 13 14 +16 1 0 2 2 14 15 +17 1 0 2 2 15 16 +18 1 0 2 2 16 4 +19 1 0 3 2 1 17 +20 1 0 3 2 17 18 +21 1 0 3 2 18 19 +22 1 0 3 2 19 20 +23 1 0 3 2 20 21 +24 1 0 3 2 21 22 +25 1 0 3 2 22 3 +26 1 0 4 2 2 23 +27 1 0 4 2 23 24 +28 1 0 4 2 24 25 +29 1 0 4 2 25 26 +30 1 0 4 2 26 27 +31 1 0 4 2 27 28 +32 1 0 4 2 28 4 +33 3 0 5 4 1 5 29 17 +34 3 0 5 4 17 29 30 18 +35 3 0 5 4 18 30 31 19 +36 3 0 5 4 19 31 32 20 +37 3 0 5 4 20 32 33 21 +38 3 0 5 4 21 33 34 22 +39 3 0 5 4 22 34 11 3 +40 3 0 5 4 5 6 35 29 +41 3 0 5 4 29 35 36 30 +42 3 0 5 4 30 36 37 31 +43 3 0 5 4 31 37 38 32 +44 3 0 5 4 32 38 39 33 +45 3 0 5 4 33 39 40 34 +46 3 0 5 4 34 40 12 11 +47 3 0 5 4 6 7 41 35 +48 3 0 5 4 35 41 42 36 +49 3 0 5 4 36 42 43 37 +50 3 0 5 4 37 43 44 38 +51 3 0 5 4 38 44 45 39 +52 3 0 5 4 39 45 46 40 +53 3 0 5 4 40 46 13 12 +54 3 0 5 4 7 8 47 41 +55 3 0 5 4 41 47 48 42 +56 3 0 5 4 42 48 49 43 +57 3 0 5 4 43 49 50 44 +58 3 0 5 4 44 50 51 45 +59 3 0 5 4 45 51 52 46 +60 3 0 5 4 46 52 14 13 +61 3 0 5 4 8 9 53 47 +62 3 0 5 4 47 53 54 48 +63 3 0 5 4 48 54 55 49 +64 3 0 5 4 49 55 56 50 +65 3 0 5 4 50 56 57 51 +66 3 0 5 4 51 57 58 52 +67 3 0 5 4 52 58 15 14 +68 3 0 5 4 9 10 59 53 +69 3 0 5 4 53 59 60 54 +70 3 0 5 4 54 60 61 55 +71 3 0 5 4 55 61 62 56 +72 3 0 5 4 56 62 63 57 +73 3 0 5 4 57 63 64 58 +74 3 0 5 4 58 64 16 15 +75 3 0 5 4 10 2 23 59 +76 3 0 5 4 59 23 24 60 +77 3 0 5 4 60 24 25 61 +78 3 0 5 4 61 25 26 62 +79 3 0 5 4 62 26 27 63 +80 3 0 5 4 63 27 28 64 +81 3 0 5 4 64 28 4 16 +$ENDELM diff --git a/tests/deal.II/grid_in_msh_version_1/input_v2.msh b/tests/deal.II/grid_in_msh_version_1/input_v2.msh new file mode 100644 index 0000000000..c69d9b066e --- /dev/null +++ b/tests/deal.II/grid_in_msh_version_1/input_v2.msh @@ -0,0 +1,154 @@ +$MeshFormat +2 0 8 +$EndMeshFormat +$Nodes +64 +1 -1 -1 0 +2 1 -1 0 +3 -1 1 0 +4 1 1 0 +5 -0.7142857142865073 -1 0 +6 -0.4285714285729154 -1 0 +7 -0.1428571428590263 -1 0 +8 0.1428571428552594 -1 0 +9 0.4285714285699418 -1 0 +10 0.7142857142849213 -1 0 +11 -0.7142857142865073 1 0 +12 -0.4285714285729154 1 0 +13 -0.1428571428590263 1 0 +14 0.1428571428552594 1 0 +15 0.4285714285699418 1 0 +16 0.7142857142849213 1 0 +17 -1 -0.7142857142865073 0 +18 -1 -0.4285714285729154 0 +19 -1 -0.1428571428590263 0 +20 -1 0.1428571428552594 0 +21 -1 0.4285714285699418 0 +22 -1 0.7142857142849213 0 +23 1 -0.7142857142865073 0 +24 1 -0.4285714285729154 0 +25 1 -0.1428571428590263 0 +26 1 0.1428571428552594 0 +27 1 0.4285714285699418 0 +28 1 0.7142857142849213 0 +29 -0.7142857142865072 -0.7142857142865073 0 +30 -0.7142857142865072 -0.4285714285729154 0 +31 -0.7142857142865072 -0.1428571428590263 0 +32 -0.7142857142865073 0.1428571428552594 0 +33 -0.7142857142865073 0.4285714285699418 0 +34 -0.7142857142865073 0.7142857142849213 0 +35 -0.4285714285729154 -0.7142857142865073 0 +36 -0.4285714285729154 -0.4285714285729154 0 +37 -0.4285714285729154 -0.1428571428590263 0 +38 -0.4285714285729154 0.1428571428552594 0 +39 -0.4285714285729154 0.4285714285699418 0 +40 -0.4285714285729154 0.7142857142849213 0 +41 -0.1428571428590263 -0.7142857142865073 0 +42 -0.1428571428590263 -0.4285714285729154 0 +43 -0.1428571428590263 -0.1428571428590263 0 +44 -0.1428571428590263 0.1428571428552594 0 +45 -0.1428571428590263 0.4285714285699418 0 +46 -0.1428571428590263 0.7142857142849213 0 +47 0.1428571428552594 -0.7142857142865073 0 +48 0.1428571428552594 -0.4285714285729154 0 +49 0.1428571428552594 -0.1428571428590263 0 +50 0.1428571428552594 0.1428571428552594 0 +51 0.1428571428552594 0.4285714285699418 0 +52 0.1428571428552594 0.7142857142849213 0 +53 0.4285714285699418 -0.7142857142865073 0 +54 0.4285714285699418 -0.4285714285729154 0 +55 0.4285714285699418 -0.1428571428590263 0 +56 0.4285714285699418 0.1428571428552594 0 +57 0.4285714285699418 0.4285714285699418 0 +58 0.4285714285699418 0.7142857142849213 0 +59 0.7142857142849213 -0.7142857142865073 0 +60 0.7142857142849213 -0.4285714285729154 0 +61 0.7142857142849213 -0.1428571428590263 0 +62 0.7142857142849213 0.1428571428552594 0 +63 0.7142857142849213 0.4285714285699418 0 +64 0.7142857142849213 0.7142857142849213 0 +$EndNodes +$Elements +81 +1 15 3 0 1 0 1 +2 15 3 0 2 0 2 +3 15 3 0 3 0 3 +4 15 3 0 4 0 4 +5 1 3 0 1 0 1 5 +6 1 3 0 1 0 5 6 +7 1 3 0 1 0 6 7 +8 1 3 0 1 0 7 8 +9 1 3 0 1 0 8 9 +10 1 3 0 1 0 9 10 +11 1 3 0 1 0 10 2 +12 1 3 0 2 0 3 11 +13 1 3 0 2 0 11 12 +14 1 3 0 2 0 12 13 +15 1 3 0 2 0 13 14 +16 1 3 0 2 0 14 15 +17 1 3 0 2 0 15 16 +18 1 3 0 2 0 16 4 +19 1 3 0 3 0 1 17 +20 1 3 0 3 0 17 18 +21 1 3 0 3 0 18 19 +22 1 3 0 3 0 19 20 +23 1 3 0 3 0 20 21 +24 1 3 0 3 0 21 22 +25 1 3 0 3 0 22 3 +26 1 3 0 4 0 2 23 +27 1 3 0 4 0 23 24 +28 1 3 0 4 0 24 25 +29 1 3 0 4 0 25 26 +30 1 3 0 4 0 26 27 +31 1 3 0 4 0 27 28 +32 1 3 0 4 0 28 4 +33 3 3 0 5 0 1 5 29 17 +34 3 3 0 5 0 17 29 30 18 +35 3 3 0 5 0 18 30 31 19 +36 3 3 0 5 0 19 31 32 20 +37 3 3 0 5 0 20 32 33 21 +38 3 3 0 5 0 21 33 34 22 +39 3 3 0 5 0 22 34 11 3 +40 3 3 0 5 0 5 6 35 29 +41 3 3 0 5 0 29 35 36 30 +42 3 3 0 5 0 30 36 37 31 +43 3 3 0 5 0 31 37 38 32 +44 3 3 0 5 0 32 38 39 33 +45 3 3 0 5 0 33 39 40 34 +46 3 3 0 5 0 34 40 12 11 +47 3 3 0 5 0 6 7 41 35 +48 3 3 0 5 0 35 41 42 36 +49 3 3 0 5 0 36 42 43 37 +50 3 3 0 5 0 37 43 44 38 +51 3 3 0 5 0 38 44 45 39 +52 3 3 0 5 0 39 45 46 40 +53 3 3 0 5 0 40 46 13 12 +54 3 3 0 5 0 7 8 47 41 +55 3 3 0 5 0 41 47 48 42 +56 3 3 0 5 0 42 48 49 43 +57 3 3 0 5 0 43 49 50 44 +58 3 3 0 5 0 44 50 51 45 +59 3 3 0 5 0 45 51 52 46 +60 3 3 0 5 0 46 52 14 13 +61 3 3 0 5 0 8 9 53 47 +62 3 3 0 5 0 47 53 54 48 +63 3 3 0 5 0 48 54 55 49 +64 3 3 0 5 0 49 55 56 50 +65 3 3 0 5 0 50 56 57 51 +66 3 3 0 5 0 51 57 58 52 +67 3 3 0 5 0 52 58 15 14 +68 3 3 0 5 0 9 10 59 53 +69 3 3 0 5 0 53 59 60 54 +70 3 3 0 5 0 54 60 61 55 +71 3 3 0 5 0 55 61 62 56 +72 3 3 0 5 0 56 62 63 57 +73 3 3 0 5 0 57 63 64 58 +74 3 3 0 5 0 58 64 16 15 +75 3 3 0 5 0 10 2 23 59 +76 3 3 0 5 0 59 23 24 60 +77 3 3 0 5 0 60 24 25 61 +78 3 3 0 5 0 61 25 26 62 +79 3 3 0 5 0 62 26 27 63 +80 3 3 0 5 0 63 27 28 64 +81 3 3 0 5 0 64 28 4 16 +$EndElements