From ed75cef3075b066c97d55a6dfa43d5bd89be692c Mon Sep 17 00:00:00 2001 From: heister Date: Wed, 29 Aug 2012 21:26:11 +0000 Subject: [PATCH] update tests git-svn-id: https://svn.dealii.org/trunk@26167 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/fail/constraints_c1.cc | 3 ++ tests/fail/constraints_c1/cmp/generic | 58 ++++++++++++++++++++++++ tests/fail/constraints_c1_02.cc | 2 + tests/fail/constraints_c1_02/cmp/generic | 4 ++ 4 files changed, 67 insertions(+) create mode 100644 tests/fail/constraints_c1/cmp/generic create mode 100644 tests/fail/constraints_c1_02/cmp/generic diff --git a/tests/fail/constraints_c1.cc b/tests/fail/constraints_c1.cc index dcec5fdb84..7ad414bb6a 100644 --- a/tests/fail/constraints_c1.cc +++ b/tests/fail/constraints_c1.cc @@ -8,6 +8,8 @@ // H2-elements implemented through constraints on the degrees of // freedom. After adding all constrained lines, the program hangs in // constraints.close(). +// This is because it contains a cycle. The test now checks that this +// is detected. #include @@ -123,6 +125,7 @@ setup_constraints(const DoFHandler& dof_handler) } deallog << "Closing" << std::endl; + deal_II_exceptions::disable_abort_on_exception(); constraints.close(); deallog << "Closed" << std::endl; } diff --git a/tests/fail/constraints_c1/cmp/generic b/tests/fail/constraints_c1/cmp/generic new file mode 100644 index 0000000000..227ad2e351 --- /dev/null +++ b/tests/fail/constraints_c1/cmp/generic @@ -0,0 +1,58 @@ + +DEAL::Element: FE_Q<2>(3) +DEAL::Triangulation 16 cells, 3 levels +DEAL::New cell +DEAL::New cell +DEAL:: v2 f0 o3 d1 l5 g7 rhs 1 17 3 40 6 41 42 +DEAL::New cell +DEAL:: v1 f2 o1 d0 l9 g11 rhs 2 3 29 40 10 43 44 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g32 rhs 3 1 29 3 6 33 7 +DEAL:: v2 f0 o3 d1 l5 g33 rhs 3 40 29 103 32 104 105 +DEAL:: v0 f2 o0 d0 l8 g22 rhs 3 2 17 3 10 23 11 +DEAL:: v1 f2 o1 d0 l9 g23 rhs 3 17 40 73 22 76 77 +DEAL::New cell +DEAL:: v2 f0 o3 d1 l5 g19 rhs 16 50 17 73 18 74 75 +DEAL::New cell +DEAL:: v2 f0 o3 d1 l5 g52 rhs 49 62 50 82 51 83 84 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g41 rhs 17 16 40 17 18 42 19 +DEAL:: v2 f0 o3 d1 l5 g42 rhs 17 73 40 133 41 134 135 +DEAL:: v0 f2 o0 d0 l8 g55 rhs 17 3 50 17 22 56 23 +DEAL:: v1 f2 o1 d0 l9 g56 rhs 17 50 73 82 55 85 86 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g74 rhs 50 49 73 50 51 75 52 +DEAL:: v2 f0 o3 d1 l5 g75 rhs 50 82 73 142 74 143 144 +DEAL:: v0 f2 o0 d0 l8 g67 rhs 50 17 62 50 55 68 56 +DEAL::New cell +DEAL:: v1 f2 o1 d0 l9 g35 rhs 28 29 92 103 34 106 107 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g95 rhs 29 3 92 29 32 96 33 +DEAL:: v2 f0 o3 d1 l5 g96 rhs 29 103 92 124 95 125 126 +DEAL:: v0 f2 o0 d0 l8 g43 rhs 29 28 40 29 34 44 35 +DEAL:: v1 f2 o1 d0 l9 g44 rhs 29 40 103 133 43 136 137 +DEAL::New cell +DEAL:: v1 f2 o1 d0 l9 g98 rhs 91 92 113 124 97 127 128 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g116 rhs 92 29 113 92 95 117 96 +DEAL:: v0 f2 o0 d0 l8 g106 rhs 92 91 103 92 97 107 98 +DEAL:: v1 f2 o1 d0 l9 g107 rhs 92 103 124 151 106 154 155 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g104 rhs 40 17 103 40 41 105 42 +DEAL:: v2 f0 o3 d1 l5 g105 rhs 40 133 103 151 104 152 153 +DEAL:: v0 f2 o0 d0 l8 g76 rhs 40 29 73 40 43 77 44 +DEAL:: v1 f2 o1 d0 l9 g77 rhs 40 73 133 142 76 145 146 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g134 rhs 73 50 133 73 74 135 75 +DEAL:: v2 f0 o3 d1 l5 g135 rhs 73 142 133 160 134 161 162 +DEAL:: v0 f2 o0 d0 l8 g85 rhs 73 40 82 73 76 86 77 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g125 rhs 103 40 124 103 104 126 105 +DEAL:: v0 f2 o0 d0 l8 g136 rhs 103 92 133 103 106 137 107 +DEAL:: v1 f2 o1 d0 l9 g137 rhs 103 133 151 160 136 163 164 +DEAL::New cell +DEAL:: v0 f0 o2 d1 l4 g152 rhs 133 73 151 133 134 153 135 +DEAL:: v0 f2 o0 d0 l8 g145 rhs 133 103 142 133 136 146 137 +DEAL::Closing +DEAL::ExcMessage("Cycle in constraints detected!") +DEAL::Closed diff --git a/tests/fail/constraints_c1_02.cc b/tests/fail/constraints_c1_02.cc index ecf2898d67..09f25121ec 100644 --- a/tests/fail/constraints_c1_02.cc +++ b/tests/fail/constraints_c1_02.cc @@ -48,7 +48,9 @@ run() } deallog << "Closing" << std::endl; + deal_II_exceptions::disable_abort_on_exception(); constraints.close(); + deallog << "Closed" << std::endl; } diff --git a/tests/fail/constraints_c1_02/cmp/generic b/tests/fail/constraints_c1_02/cmp/generic new file mode 100644 index 0000000000..43dd6a4f6e --- /dev/null +++ b/tests/fail/constraints_c1_02/cmp/generic @@ -0,0 +1,4 @@ + +DEAL::Closing +DEAL::ExcMessage("Cycle in constraints detected!") +DEAL::Closed -- 2.39.5