From: bangerth Date: Wed, 25 Oct 2006 01:59:15 +0000 (+0000) Subject: Undo previous accidental commit. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a97b7e0e470512086c72ed9ccc4a9e7023cf7e5;p=dealii-svn.git Undo previous accidental commit. git-svn-id: https://svn.dealii.org/trunk@14083 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 fc284daade..ceb3474d86 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -1243,7 +1243,7 @@ FE_Q::initialize_embedding () // value is somewhat // fuzzy, but it works // for - // 1e-14*(degree^dim)*dim, + // 1e-14*degree*dim, // which is kind of // reasonable given // that we compute the @@ -1257,15 +1257,15 @@ FE_Q::initialize_embedding () // growth in // degree*dim, times a // small constant. - if (std::fabs(cell_value) < 2e-14*std::pow(1.*this->degree,dim)*dim) + if (std::fabs(cell_value) < 2e-14*this->degree*dim) cell_interpolation(j, i) = 0.; else cell_interpolation(j, i) = cell_value; - if (std::fabs(subcell_value) < 2e-14*std::pow(1.*this->degree,dim)*dim) + if (std::fabs(subcell_value) < 2e-14*this->degree*dim) subcell_interpolation(j, i) = 0.; else - if (std::fabs(subcell_value-1) < 2e-14*std::pow(1.*this->degree,dim)*dim) + if (std::fabs(subcell_value-1) < 2e-14*this->degree*dim) subcell_interpolation(j, i) = 1.; else // we have put our @@ -1317,7 +1317,7 @@ FE_Q::initialize_embedding () double sum = 0; for (unsigned int col=0; coldofs_per_cell; ++col) sum += this->prolongation[child](row,col); - Assert (std::fabs(sum-1.) < 2e-14*std::pow(1.*this->degree,dim)*dim, + Assert (std::fabs(sum-1.) < 2e-14*this->degree*dim, ExcInternalError()); } }