From 81e0a85fd3e149974856e3b5ed84e6ee7bc51ca3 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 11 Apr 2009 21:45:09 +0000 Subject: [PATCH] Do away with the distinction between quadrature and quadrature_pointer -- simply always use the pointer. git-svn-id: https://svn.dealii.org/trunk@18586 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-34/step-34.cc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/deal.II/examples/step-34/step-34.cc b/deal.II/examples/step-34/step-34.cc index 5adb96c093..8c44870194 100644 --- a/deal.II/examples/step-34/step-34.cc +++ b/deal.II/examples/step-34/step-34.cc @@ -227,7 +227,7 @@ private: Functions::ParsedFunction wind; Functions::ParsedFunction exact_solution; - std_cxx0x::shared_ptr > quadrature_pointer; + std_cxx0x::shared_ptr > quadrature; unsigned int singular_quadrature_order; unsigned int n_cycles; @@ -414,7 +414,7 @@ void BEMProblem::read_parameters (const std::string filename) { prm.enter_subsection("Quadrature rules"); { - quadrature_pointer = + quadrature = std_cxx0x::shared_ptr > (new QuadratureSelector (prm.get("Quadrature type"), prm.get_integer("Quadrature order"))); @@ -558,12 +558,6 @@ void BEMProblem::assemble_system() { cell = dh.begin_active(), endc = dh.end(); - // Quadrature formula for the integration of the kernel in non - // singular cells. This quadrature is selected with the parameter - // file, and should be quite precise, since the functions we are - // integrating are not polynomial functions. - Quadrature &quadrature = *quadrature_pointer; - // We create initially the singular quadratures for the // threedimensional problem, since in this case they only // dependent on the reference element. This quadrature is a @@ -578,7 +572,11 @@ void BEMProblem::assemble_system() { (QGaussOneOverR<2>(singular_quadrature_order, i, true)); } - FEValues fe_v(fe, quadrature, + // Initialize an FEValues object with the quadrature formula for the + // integration of the kernel in non singular cells. This quadrature is + // selected with the parameter file, and should be quite precise, since + // the functions we are integrating are not polynomial functions. + FEValues fe_v(fe, *quadrature, update_values | update_cell_normal_vectors | update_quadrature_points | @@ -862,9 +860,7 @@ void BEMProblem::interpolate() { endc = dh.end(); - Quadrature &quadrature = *quadrature_pointer; - - FEValues fe_v(fe, quadrature, + FEValues fe_v(fe, *quadrature, update_values | update_cell_normal_vectors | update_quadrature_points | -- 2.39.5