From: maier Date: Wed, 30 Oct 2013 19:10:29 +0000 (+0000) Subject: Merge trunk into branch_manifold_id X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d02729b446b1a0cf1bd3e7ff31633b310d8b8c4e;p=dealii-svn.git Merge trunk into branch_manifold_id Set merge property, resolve merge inconsistencies Conflicts: deal.II/cmake/config/CMakeLists.txt deal.II/source/grid/manifold.inst.in deal.II/source/grid/tria_objects.cc tests/base/reference.debug.output tests/bits/data_out_08.output tests/distributed_grids/3d_refinement_08.output git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@31489 0785d39b-7218-0410-832d-ea1e28bc413d --- d02729b446b1a0cf1bd3e7ff31633b310d8b8c4e diff --cc deal.II/cmake/config/CMakeLists.txt index 0e46258b42,eea6fdf8f0..c8b3e75f92 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@@ -164,6 -164,6 +164,7 @@@ CONFIGURE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake @ONLY ) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake diff --cc deal.II/examples/step-1/step-1.cc index 96c701da2a,96da272b2b..f130c508d5 --- a/deal.II/examples/step-1/step-1.cc +++ b/deal.II/examples/step-1/step-1.cc @@@ -1,20 -1,21 +1,19 @@@ -/* --------------------------------------------------------------------- - * $Id$ - * - * Copyright (C) 1999 - 2013 by the deal.II authors - * - * This file is part of the deal.II library. - * - * The deal.II library is free software; you can use it, redistribute - * it, and/or modify it under the terms of the GNU Lesser General - * Public License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * The full text of the license can be found in the file LICENSE at - * the top level of the deal.II distribution. - * - * --------------------------------------------------------------------- - - */ +// --------------------------------------------------------------------- +// $Id$ +// +// Copyright (C) 1999 - 2013 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- - // @sect3{Include files} // The most fundamental class in the library is the Triangulation class, which diff --cc deal.II/source/grid/tria_objects.cc index 2db7e48852,308f55033c..ff6b22a296 --- a/deal.II/source/grid/tria_objects.cc +++ b/deal.II/source/grid/tria_objects.cc @@@ -192,15 -192,7 +192,13 @@@ namespace interna RefinementCase::no_refinement); } - boundary_or_material_id.resize (new_size); + boundary_or_material_id.resize (new_size); + + manifold_id.reserve (new_size); + manifold_id.insert (manifold_id.end(), + new_size-manifold_id.size(), + numbers::flat_manifold_id); + - - user_data.resize (new_size); } @@@ -280,12 -272,6 +278,11 @@@ boundary_or_material_id.reserve (new_size); boundary_or_material_id.resize (new_size); + manifold_id.reserve (new_size); + manifold_id.insert (manifold_id.end(), + new_size-manifold_id.size(), + numbers::flat_manifold_id); - + user_data.reserve (new_size); user_data.resize (new_size); diff --cc tests/bits/data_out_08.output index 4725e3bc01,bd4f3f7361..1e6f92e4e3 --- a/tests/bits/data_out_08.output +++ b/tests/bits/data_out_08.output @@@ -12,7 -12,7 +12,11 @@@ cell_dat 0 1 0 1 4 ++<<<<<<< HEAD +0.0 0.0 0.0 0.0 ++======= + 1.0 1.0 1.0 1.0 ++>>>>>>> mirror/trunk [deal.II intermediate Patch<2,2>] @@@ -21,7 -21,7 +25,11 @@@ 1 1 0 1 4 ++<<<<<<< HEAD +1.0 1.0 1.0 1.0 ++======= + 2.0 2.0 2.0 2.0 ++>>>>>>> mirror/trunk [deal.II intermediate Patch<2,2>] @@@ -30,7 -30,7 +38,11 @@@ 2 1 0 1 4 ++<<<<<<< HEAD +2.0 2.0 2.0 2.0 ++======= + 3.0 3.0 3.0 3.0 ++>>>>>>> mirror/trunk 0