From b8de33156e7a079136c9f9bdc5f5da079dae1d2e Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 26 Jun 2002 17:04:18 +0000 Subject: [PATCH] Make sure assertions trigger in a reasonable order. Also check for the correct fields! git-svn-id: https://svn.dealii.org/trunk@6193 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe_values.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 593347154a..68a5921889 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -1272,14 +1272,14 @@ const Tensor<1,dim> & FEValuesBase::shape_grad (const unsigned int i, const unsigned int j) const { - Assert (ishape_gradients.size(), - ExcIndexRange (i, 0, shape_gradients.size())); - Assert (jupdate_flags & update_gradients, ExcAccessToUninitializedField()); Assert (fe->is_primitive (i), ExcShapeFunctionNotPrimitive(i)); + Assert (ishape_gradients.size(), + ExcIndexRange (i, 0, shape_gradients.size())); + Assert (j::shape_grad_component (const unsigned int i, const unsigned int j, const unsigned int component) const { - Assert (this->update_flags & update_values, + Assert (this->update_flags & update_gradients, ExcAccessToUninitializedField()); Assert (component < fe->n_components(), ExcIndexRange(component, 0, fe->n_components())); @@ -1369,14 +1369,14 @@ const Tensor<2,dim> & FEValuesBase::shape_2nd_derivative (const unsigned int i, const unsigned int j) const { - Assert (ishape_2nd_derivatives.size(), - ExcIndexRange (i, 0, shape_2nd_derivatives.size())); - Assert (jshape_2nd_derivatives[i].size(), - ExcIndexRange (j, 0, shape_2nd_derivatives[i].size())); Assert (this->update_flags & update_second_derivatives, ExcAccessToUninitializedField()); Assert (fe->is_primitive (i), ExcShapeFunctionNotPrimitive(i)); + Assert (ishape_2nd_derivatives.size(), + ExcIndexRange (i, 0, shape_2nd_derivatives.size())); + Assert (jshape_2nd_derivatives[i].size(), + ExcIndexRange (j, 0, shape_2nd_derivatives[i].size())); // if the entire FE is primitive, // then we can take a short-cut: @@ -1404,7 +1404,7 @@ FEValuesBase::shape_2nd_derivative_component (const unsigned int i, const unsigned int j, const unsigned int component) const { - Assert (this->update_flags & update_values, + Assert (this->update_flags & update_second_derivatives, ExcAccessToUninitializedField()); Assert (component < fe->n_components(), ExcIndexRange(component, 0, fe->n_components())); -- 2.39.5