From: Bruno Turcksin Date: Thu, 2 May 2013 14:24:19 +0000 (+0000) Subject: Merge from mainline. X-Git-Tag: v8.0.0~316^2~30 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b564b539d0430f66f77cd4bb44e54f52031c217;p=dealii.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29430 0785d39b-7218-0410-832d-ea1e28bc413d --- 1b564b539d0430f66f77cd4bb44e54f52031c217 diff --cc deal.II/source/lac/block_sparsity_pattern.cc index 3df0ecb92c,b09aeb3df9..cf8e5f3ba8 --- a/deal.II/source/lac/block_sparsity_pattern.cc +++ b/deal.II/source/lac/block_sparsity_pattern.cc @@@ -296,18 -296,18 +296,18 @@@ template ::print_gnuplot(std::ostream &out) const { - unsigned int k=0; - for (unsigned int ib=0; ib(i+k) << std::endl;; + out << l+j << " " << -static_cast(i+k) << std::endl; l += b.n_cols(); } } diff --cc tests/distributed_grids/2d_refinement_07.cc index 0000000000,61292d4e6f..6e2fc3afee mode 000000,100644..100644 --- a/tests/distributed_grids/2d_refinement_07.cc +++ b/tests/distributed_grids/2d_refinement_07.cc @@@ -1,0 -1,74 +1,74 @@@ + //--------------------------------------------------------------------------- + // $Id: 3d_refinement_01.cc 29075 2013-03-27 15:07:57Z heister $ + // Version: $Name$ + // + // Copyright (C) 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 + // to the file deal.II/doc/license.html for the text and + // further information on this license. + // + //--------------------------------------------------------------------------- + + + // Test that we abort if you refine further than p4est::max_level + + #include "../tests.h" + #include "coarse_grid_common.h" + #include + #include + #include + #include + #include + #include + #include + #include + + #include + + + template + void test(std::ostream& /*out*/) + { + parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + + GridGenerator::hyper_cube(tr); - for (unsigned int i=0;i<35;++i) ++ for (unsigned int i=0;i<30;++i) + { - std::cout << "cells: " << tr.n_active_cells() << " level:" << tr.n_levels() << std::endl; ++ deallog << "cells: " << tr.n_active_cells() << " level:" << tr.n_levels() << std::endl; + + typename parallel::distributed::Triangulation::cell_iterator it; + it=tr.begin_active(); + while (it->level()(tr.n_levels()-1)) + ++it; + + + it->set_refine_flag(); + try + { + tr.execute_coarsening_and_refinement (); + } + catch (ExceptionBase &e) + { + deallog << e.get_exc_name() << std::endl; + } + } + + } + + + int main(int argc, char *argv[]) + { + deal_II_exceptions::disable_abort_on_exception(); + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); + + std::ofstream logfile("2d_refinement_07/output"); + deallog.attach(logfile); + deallog.depth_console(0); + deallog.threshold_double(1.e-10); + + deallog.push("2d"); + test<2>(logfile); + deallog.pop(); + } diff --cc tests/distributed_grids/2d_refinement_07/cmp/generic index 0000000000,eb291e1225..909caf44e7 mode 000000,100644..100644 --- a/tests/distributed_grids/2d_refinement_07/cmp/generic +++ b/tests/distributed_grids/2d_refinement_07/cmp/generic @@@ -1,0 -1,21 +1,32 @@@ + -DEAL:3d::cells: 1 level:1 -DEAL:3d::cells: 8 level:2 -DEAL:3d::cells: 15 level:3 -DEAL:3d::cells: 22 level:4 -DEAL:3d::cells: 29 level:5 -DEAL:3d::cells: 36 level:6 -DEAL:3d::cells: 43 level:7 -DEAL:3d::cells: 50 level:8 -DEAL:3d::cells: 57 level:9 -DEAL:3d::cells: 64 level:10 -DEAL:3d::cells: 71 level:11 -DEAL:3d::cells: 78 level:12 -DEAL:3d::cells: 85 level:13 -DEAL:3d::cells: 92 level:14 -DEAL:3d::cells: 99 level:15 -DEAL:3d::cells: 106 level:16 -DEAL:3d::cells: 113 level:17 -DEAL:3d::cells: 120 level:18 -DEAL:3d::cells: 127 level:19 -DEAL:3d::ExcMessage("Fatal Error: maximum refinement level of p4est reached.") ++DEAL:2d::cells: 1 level:1 ++DEAL:2d::cells: 4 level:2 ++DEAL:2d::cells: 7 level:3 ++DEAL:2d::cells: 10 level:4 ++DEAL:2d::cells: 13 level:5 ++DEAL:2d::cells: 16 level:6 ++DEAL:2d::cells: 19 level:7 ++DEAL:2d::cells: 22 level:8 ++DEAL:2d::cells: 25 level:9 ++DEAL:2d::cells: 28 level:10 ++DEAL:2d::cells: 31 level:11 ++DEAL:2d::cells: 34 level:12 ++DEAL:2d::cells: 37 level:13 ++DEAL:2d::cells: 40 level:14 ++DEAL:2d::cells: 43 level:15 ++DEAL:2d::cells: 46 level:16 ++DEAL:2d::cells: 49 level:17 ++DEAL:2d::cells: 52 level:18 ++DEAL:2d::cells: 55 level:19 ++DEAL:2d::cells: 58 level:20 ++DEAL:2d::cells: 61 level:21 ++DEAL:2d::cells: 64 level:22 ++DEAL:2d::cells: 67 level:23 ++DEAL:2d::cells: 70 level:24 ++DEAL:2d::cells: 73 level:25 ++DEAL:2d::cells: 76 level:26 ++DEAL:2d::cells: 79 level:27 ++DEAL:2d::cells: 82 level:28 ++DEAL:2d::cells: 85 level:29 ++DEAL:2d::cells: 88 level:30 ++DEAL:2d::ExcMessage("Fatal Error: maximum refinement level of p4est reached.")