From: bangerth Date: Fri, 11 Aug 2006 15:15:07 +0000 (+0000) Subject: Slight re-arrangements X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53238ab504dea806db80dfa963d648437f77672f;p=dealii-svn.git Slight re-arrangements git-svn-id: https://svn.dealii.org/trunk@13666 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index f90a33f340..7fc62790cc 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -247,17 +247,17 @@ get_interpolation_matrix (const FiniteElement &x_source_fe, typename FiniteElement:: ExcInterpolationNotImplemented()); - // ok, source is a Q element, so - // we will be able to do the work - const FE_Q &source_fe - = dynamic_cast&>(x_source_fe); - Assert (interpolation_matrix.m() == this->dofs_per_cell, ExcDimensionMismatch (interpolation_matrix.m(), this->dofs_per_cell)); - Assert (interpolation_matrix.n() == source_fe.dofs_per_cell, + Assert (interpolation_matrix.n() == x_source_fe.dofs_per_cell, ExcDimensionMismatch (interpolation_matrix.m(), - source_fe.dofs_per_cell)); + x_source_fe.dofs_per_cell)); + + // ok, source is a Q element, so + // we will be able to do the work + const FE_Q &source_fe + = dynamic_cast&>(x_source_fe); const std::vector &index_map= this->poly_space.get_numbering(); @@ -339,6 +339,9 @@ get_subface_interpolation_matrix (const FiniteElement<1> &/*x_source_fe*/, const unsigned int /*subface*/, FullMatrix &/*interpolation_matrix*/) const { + Assert (false, + FiniteElement<1>:: + ExcInterpolationNotImplemented ()); } #endif @@ -361,6 +364,13 @@ get_face_interpolation_matrix (const FiniteElement &x_source_fe, typename FiniteElement:: ExcInterpolationNotImplemented()); + Assert (interpolation_matrix.m() == this->dofs_per_face, + ExcDimensionMismatch (interpolation_matrix.m(), + this->dofs_per_face)); + Assert (interpolation_matrix.n() == x_source_fe.dofs_per_face, + ExcDimensionMismatch (interpolation_matrix.m(), + x_source_fe.dofs_per_face)); + // ok, source is a Q element, so // we will be able to do the work const FE_Q &source_fe @@ -381,13 +391,6 @@ get_face_interpolation_matrix (const FiniteElement &x_source_fe, typename FiniteElement:: ExcInterpolationNotImplemented ()); - Assert (interpolation_matrix.m() == this->dofs_per_face, - ExcDimensionMismatch (interpolation_matrix.m(), - this->dofs_per_face)); - Assert (interpolation_matrix.n() == source_fe.dofs_per_face, - ExcDimensionMismatch (interpolation_matrix.m(), - source_fe.dofs_per_face)); - // generate a quadrature // with the unit support points. // This is later based as a @@ -466,6 +469,13 @@ get_subface_interpolation_matrix (const FiniteElement &x_source_fe, typename FiniteElement:: ExcInterpolationNotImplemented()); + Assert (interpolation_matrix.m() == this->dofs_per_face, + ExcDimensionMismatch (interpolation_matrix.m(), + this->dofs_per_face)); + Assert (interpolation_matrix.n() == x_source_fe.dofs_per_face, + ExcDimensionMismatch (interpolation_matrix.m(), + x_source_fe.dofs_per_face)); + // ok, source is a Q element, so // we will be able to do the work const FE_Q &source_fe @@ -486,13 +496,6 @@ get_subface_interpolation_matrix (const FiniteElement &x_source_fe, typename FiniteElement:: ExcInterpolationNotImplemented ()); - Assert (interpolation_matrix.m() == this->dofs_per_face, - ExcDimensionMismatch (interpolation_matrix.m(), - this->dofs_per_face)); - Assert (interpolation_matrix.n() == source_fe.dofs_per_face, - ExcDimensionMismatch (interpolation_matrix.m(), - source_fe.dofs_per_face)); - // generate a point on this // cell and evaluate the // shape functions there