From 2a60fbe943574e850042133b76aa883be0477310 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Tue, 16 Apr 2013 16:20:56 +0000 Subject: [PATCH] Make output of distorted mapped cells a bit more extensive. git-svn-id: https://svn.dealii.org/trunk@29310 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/fe/mapping.h | 9 +++++---- deal.II/source/fe/mapping_q1.cc | 2 +- tests/bits/distorted_mapped_cells_01/cmp/generic | 2 +- tests/bits/distorted_mapped_cells_02/cmp/generic | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/deal.II/include/deal.II/fe/mapping.h b/deal.II/include/deal.II/fe/mapping.h index bbae280d1d..74906f3107 100644 --- a/deal.II/include/deal.II/fe/mapping.h +++ b/deal.II/include/deal.II/fe/mapping.h @@ -725,12 +725,13 @@ public: * * @ingroup Exceptions */ - DeclException2 (ExcDistortedMappedCell, - Point, int, + DeclException3 (ExcDistortedMappedCell, + Point, double, int, << "The image of the mapping applied to cell with center [" << arg1 << "] is distorted. The cell geometry or the " - << "mapping are invalid and yield non-positive volume " - << "fractions in quadrature point " << arg2 << "."); + << "mapping are invalid, giving a non-positive volume " + << "fraction of " << arg2 << " in quadrature point " + << arg3 << "."); private: diff --git a/deal.II/source/fe/mapping_q1.cc b/deal.II/source/fe/mapping_q1.cc index cde648c075..e141e0a3a6 100644 --- a/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/source/fe/mapping_q1.cc @@ -781,7 +781,7 @@ MappingQ1::fill_fe_values ( // (dimension-independent) criterion Assert (det > 1e-12*Utilities::fixed_power(cell->diameter()/ std::sqrt(double(dim))), - (typename Mapping::ExcDistortedMappedCell(cell->center(), point))); + (typename Mapping::ExcDistortedMappedCell(cell->center(), det, point))); JxW_values[point] = weights[point] * det; } diff --git a/tests/bits/distorted_mapped_cells_01/cmp/generic b/tests/bits/distorted_mapped_cells_01/cmp/generic index f3fc575303..9314a3de34 100644 --- a/tests/bits/distorted_mapped_cells_01/cmp/generic +++ b/tests/bits/distorted_mapped_cells_01/cmp/generic @@ -1,3 +1,3 @@ -DEAL::(typename Mapping::ExcDistortedMappedCell(cell->center(), point)) +DEAL::(typename Mapping::ExcDistortedMappedCell(cell->center(), det, point)) DEAL::Integral = 0 diff --git a/tests/bits/distorted_mapped_cells_02/cmp/generic b/tests/bits/distorted_mapped_cells_02/cmp/generic index f3fc575303..9314a3de34 100644 --- a/tests/bits/distorted_mapped_cells_02/cmp/generic +++ b/tests/bits/distorted_mapped_cells_02/cmp/generic @@ -1,3 +1,3 @@ -DEAL::(typename Mapping::ExcDistortedMappedCell(cell->center(), point)) +DEAL::(typename Mapping::ExcDistortedMappedCell(cell->center(), det, point)) DEAL::Integral = 0 -- 2.39.5