From 02e9a4d99a4c8fdac9e0503bf4174f69dd5ac550 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 31 May 2013 23:08:39 +0000 Subject: [PATCH] make test work git-svn-id: https://svn.dealii.org/trunk@29704 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/grid/subdomain_id_01.cc | 15 +++++++- tests/grid/subdomain_id_01/cmp/generic | 53 +++++++++++++++++++++----- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/tests/grid/subdomain_id_01.cc b/tests/grid/subdomain_id_01.cc index 49bac53331..ab012a8c02 100644 --- a/tests/grid/subdomain_id_01.cc +++ b/tests/grid/subdomain_id_01.cc @@ -39,8 +39,17 @@ void check (TRIA & tr) for (; cell!=endc; ++cell) { - deallog << cell->level_subdomain_id() - << " " << cell->subdomain_id() << std::endl; + deallog << cell->level_subdomain_id() << " "; + try + { + deallog << cell->subdomain_id(); + } + catch (...) + { + deallog << "."; + + } + deallog << std::endl; } deallog << "OK" << std::endl; @@ -49,6 +58,8 @@ void check (TRIA & tr) 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("subdomain_id_01/output"); deallog.attach(logfile); diff --git a/tests/grid/subdomain_id_01/cmp/generic b/tests/grid/subdomain_id_01/cmp/generic index 521a63a515..1ec04caf80 100644 --- a/tests/grid/subdomain_id_01/cmp/generic +++ b/tests/grid/subdomain_id_01/cmp/generic @@ -1,10 +1,45 @@ -DEAL::n_active_cells: 4 -DEAL::n_active_cells: 5 -DEAL::OK for 1d -DEAL::n_active_cells: 16 -DEAL::n_active_cells: 28 -DEAL::OK for 2d -DEAL::n_active_cells: 64 -DEAL::n_active_cells: 176 -DEAL::OK for 3d +DEAL::0 . +DEAL::0 . +DEAL::0 . +DEAL::0 . +DEAL::0 . +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::OK +DEAL::0 . +DEAL::0 . +DEAL::0 . +DEAL::0 . +DEAL::0 . +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::0 0 +DEAL::OK -- 2.39.5