From c60e8e6da4addb06e870b4a70ea160980d446423 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 13 Sep 2015 13:57:30 -0500 Subject: [PATCH] Remove member variables now no longer necessary. --- include/deal.II/fe/mapping_q.h | 17 ----------------- source/fe/mapping_q.cc | 17 ++--------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h index 81f16ea5bf..d6695f5fb7 100644 --- a/include/deal.II/fe/mapping_q.h +++ b/include/deal.II/fe/mapping_q.h @@ -263,23 +263,6 @@ protected: protected: - /** - * Exception. - */ - DeclException1 (ExcLaplaceVectorNotSet, - int, - << "laplace_vector not set for degree=" << arg1 << "."); - - /** - * Number of inner mapping shape functions. - */ - const unsigned int n_inner; - - /** - * Number of mapping shape functions on the boundary. - */ - const unsigned int n_outer; - /** * If this flag is set @p true then @p MappingQ is used on all cells, not * only on boundary cells. diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 6ac2a071d5..cb7e706b7f 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -57,11 +57,6 @@ MappingQ::MappingQ (const unsigned int degree, const bool use_mapping_q_on_all_cells) : MappingQ1(degree), - n_inner(Utilities::fixed_power(degree-1)), - n_outer((dim==1) ? 2 : - ((dim==2) ? - 4+4*(degree-1) : - 8+12*(degree-1)+6*(degree-1)*(degree-1))), // see whether we want to use *this* mapping objects on *all* cells, // or defer to an explicit Q1 mapping on interior cells. if @@ -76,10 +71,7 @@ MappingQ::MappingQ (const unsigned int degree, // create a Q1 mapping for use on interior cells (if necessary) // or to create a good initial guess in transform_real_to_unit_cell() q1_mapping (new MappingQ1()) -{ - Assert(n_inner+n_outer==Utilities::fixed_power(degree+1), - ExcInternalError()); -} +{} @@ -87,16 +79,11 @@ template MappingQ::MappingQ (const MappingQ &mapping) : MappingQ1(mapping.get_degree()), - n_inner(mapping.n_inner), - n_outer(mapping.n_outer), use_mapping_q_on_all_cells (mapping.use_mapping_q_on_all_cells), // clone the Q1 mapping for use on interior cells (if necessary) // or to create a good initial guess in transform_real_to_unit_cell() q1_mapping (dynamic_cast*>(mapping.q1_mapping->clone())) -{ - Assert(n_inner+n_outer==Utilities::fixed_power(this->polynomial_degree+1), - ExcInternalError()); -} +{} -- 2.39.5