From 7ac2d2634e8711a95e56cfc9b9921b63288ee0b3 Mon Sep 17 00:00:00 2001 From: kanschat Date: Fri, 12 Nov 2010 03:00:06 +0000 Subject: [PATCH] be less strict to enable formulas with many iterations git-svn-id: https://svn.dealii.org/trunk@22705 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/base/quadrature.cc | 114 +++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/deal.II/source/base/quadrature.cc b/deal.II/source/base/quadrature.cc index 764e145b16..89b43f7bdb 100644 --- a/deal.II/source/base/quadrature.cc +++ b/deal.II/source/base/quadrature.cc @@ -1469,6 +1469,109 @@ QIterated<1>::uses_both_endpoints (const Quadrature<1> &base_quadrature) } +// template<> +// void +// QIterated<1>::fill(Quadrature<1>& dst, +// const Quadrature<1> &base_quadrature, +// const unsigned int n_copies) +// { +// Assert (n_copies > 0, ExcZero()); +// Assert (base_quadrature.size() > 0, ExcZero()); + +// const unsigned int np = +// uses_both_endpoints(base_quadrature) +// ? (base_quadrature.size()-1) * n_copies + 1 +// : base_quadrature.size() * n_copies; + +// dst.quadrature_points.resize(np); +// dst.weights.resize(np); + +// if (!uses_both_endpoints(base_quadrature)) +// // we don't have to skip some +// // points in order to get a +// // reasonable quadrature formula +// { +// unsigned int next_point = 0; +// for (unsigned int copy=0; copy 0) && +// (base_quadrature.point(q_point)(0) == 0.)) +// continue; + +// dst.quadrature_points[next_point](0) +// = (copy+base_quadrature.point(q_point)(0)) / n_copies; + +// // if this is the +// // rightmost point of one +// // of the non-last +// // copies: give it the +// // double weight +// if ((copy != n_copies-1) && +// (base_quadrature.point(q_point)(0) == 1.)) +// dst.weights[next_point] = double_point_weight; +// else +// dst.weights[next_point] = base_quadrature.weight(q_point) / +// n_copies; + +// ++next_point; +// }; +// }; + +// #if DEBUG +// double sum_of_weights = 0; +// for (unsigned int i=0; i QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, @@ -1478,6 +1581,8 @@ QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, (base_quadrature.size()-1) * n_copies + 1 : base_quadrature.size() * n_copies) { +// fill(*this, base_quadrature, n_copies); + Assert (base_quadrature.size() > 0, ExcNotInitialized()); Assert (n_copies > 0, ExcZero()); if (!uses_both_endpoints(base_quadrature)) @@ -1565,12 +1670,19 @@ QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, double sum_of_weights = 0; for (unsigned int i=0; isize(); ++i) sum_of_weights += this->weight(i); - Assert (std::fabs(sum_of_weights-1) < 1e-15, + Assert (std::fabs(sum_of_weights-1) < 1e-13, ExcInternalError()); #endif } +// template +// void +// QIterated::fill(Quadrature&, const Quadrature<1>&, unsigned int) +// { +// Assert(false, ExcNotImplemented()); +// } + // construct higher dimensional quadrature formula by tensor product // of lower dimensional iterated quadrature formulae -- 2.39.5