Make output of distorted mapped cells a bit more extensive.

git-svn-id: https://svn.dealii.org/trunk@29310 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/fe/mapping.h b/deal.II/include/deal.II/fe/mapping.h
index bbae280d1d6e58e9785a5412b72a51af5315e977..74906f3107f4fed836119b33e204404ec340c05a 100644 (file)
--- 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<spacedim>, int,
+  DeclException3 (ExcDistortedMappedCell,
+                  Point<spacedim>, 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 cde648c0752546a317cb89b361167113daf3df27..e141e0a3a673923b21320bc9c46ce08ce636c8cc 100644 (file)
--- a/deal.II/source/fe/mapping_q1.cc
+++ b/deal.II/source/fe/mapping_q1.cc
@@ -781,7 +781,7 @@ MappingQ1<dim,spacedim>::fill_fe_values (
                 // (dimension-independent) criterion
                 Assert (det > 1e-12*Utilities::fixed_power<dim>(cell->diameter()/
                                                                 std::sqrt(double(dim))),
-                        (typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point)));
+                        (typename Mapping<dim,spacedim>::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 f3fc57530357076c85df68cc3fb5c656f26f5311..9314a3de34a661654998468710ab6bd3332d824e 100644 (file)
--- 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<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
+DEAL::(typename Mapping<dim,spacedim>::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 f3fc57530357076c85df68cc3fb5c656f26f5311..9314a3de34a661654998468710ab6bd3332d824e 100644 (file)
--- 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<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
+DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), det, point))
 DEAL::Integral = 0