From 1a2fd4bea57f58c32abb8fb47c29b2775359bf84 Mon Sep 17 00:00:00 2001 From: kanschat Date: Thu, 17 Jan 2008 20:15:58 +0000 Subject: [PATCH] use Quadrature::size() instead of n_quadrature_points git-svn-id: https://svn.dealii.org/trunk@15625 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-13/step-13.cc | 6 +++--- deal.II/examples/step-14/step-14.cc | 12 ++++++------ deal.II/examples/step-15/step-15.cc | 14 +++++++------- deal.II/examples/step-16/step-16.cc | 6 +++--- deal.II/examples/step-17/step-17.cc | 4 ++-- deal.II/examples/step-18/step-18.cc | 16 ++++++++-------- deal.II/examples/step-20/step-20.cc | 6 +++--- deal.II/examples/step-21/step-21.cc | 12 ++++++------ deal.II/examples/step-22/step-22.cc | 12 ++++++------ deal.II/examples/step-24/step-24.cc | 4 ++-- deal.II/examples/step-25/step-25.cc | 6 +++--- deal.II/examples/step-27/step-27.cc | 4 ++-- deal.II/examples/step-28/step-28.cc | 10 +++++----- deal.II/examples/step-29/step-29.cc | 6 +++--- deal.II/examples/step-3/step-3.cc | 4 ++-- deal.II/examples/step-4/step-4.cc | 4 ++-- deal.II/examples/step-5/step-5.cc | 4 ++-- deal.II/examples/step-6/step-6.cc | 4 ++-- deal.II/examples/step-7/step-7.cc | 6 +++--- deal.II/examples/step-8/step-8.cc | 4 ++-- deal.II/examples/step-9/step-9.cc | 6 +++--- 21 files changed, 75 insertions(+), 75 deletions(-) diff --git a/deal.II/examples/step-13/step-13.cc b/deal.II/examples/step-13/step-13.cc index 645fb3e8e1..6779c7d52e 100644 --- a/deal.II/examples/step-13/step-13.cc +++ b/deal.II/examples/step-13/step-13.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -1254,7 +1254,7 @@ namespace LaplaceSolver update_gradients | update_JxW_values); const unsigned int dofs_per_cell = fe->dofs_per_cell; - const unsigned int n_q_points = quadrature->n_quadrature_points; + const unsigned int n_q_points = quadrature->size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); @@ -1584,7 +1584,7 @@ namespace LaplaceSolver update_JxW_values); const unsigned int dofs_per_cell = this->fe->dofs_per_cell; - const unsigned int n_q_points = this->quadrature->n_quadrature_points; + const unsigned int n_q_points = this->quadrature->size(); Vector cell_rhs (dofs_per_cell); std::vector rhs_values (n_q_points); diff --git a/deal.II/examples/step-14/step-14.cc b/deal.II/examples/step-14/step-14.cc index 34ac79d870..a364483e1a 100644 --- a/deal.II/examples/step-14/step-14.cc +++ b/deal.II/examples/step-14/step-14.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -234,7 +234,7 @@ namespace Evaluation vertex_quadrature, update_gradients | update_quadrature_points); std::vector > - solution_gradients (vertex_quadrature.n_quadrature_points); + solution_gradients (vertex_quadrature.size()); // ...and next loop over all cells // and their vertices, and count @@ -684,7 +684,7 @@ namespace LaplaceSolver update_gradients | update_JxW_values); const unsigned int dofs_per_cell = fe->dofs_per_cell; - const unsigned int n_q_points = quadrature->n_quadrature_points; + const unsigned int n_q_points = quadrature->size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); @@ -937,7 +937,7 @@ namespace LaplaceSolver update_JxW_values); const unsigned int dofs_per_cell = this->fe->dofs_per_cell; - const unsigned int n_q_points = this->quadrature->n_quadrature_points; + const unsigned int n_q_points = this->quadrature->size(); Vector cell_rhs (dofs_per_cell); std::vector rhs_values (n_q_points); @@ -2549,7 +2549,7 @@ namespace LaplaceSolver right_hand_side (&right_hand_side) { const unsigned int n_q_points - = quadrature.n_quadrature_points; + = quadrature.size(); cell_residual.resize(n_q_points); rhs_values.resize(n_q_points); @@ -2578,7 +2578,7 @@ namespace LaplaceSolver update_gradients) { const unsigned int n_face_q_points - = face_quadrature.n_quadrature_points; + = face_quadrature.size(); jump_residual.resize(n_face_q_points); dual_weights.resize(n_face_q_points); diff --git a/deal.II/examples/step-15/step-15.cc b/deal.II/examples/step-15/step-15.cc index 93420d8c9d..076e1a26e2 100644 --- a/deal.II/examples/step-15/step-15.cc +++ b/deal.II/examples/step-15/step-15.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -420,7 +420,7 @@ void MinimizationProblem::assemble_step () // hold the indices of the local degrees of // freedom on each cell: const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); @@ -903,9 +903,9 @@ void MinimizationProblem<1>::refine_grid () // at quadrature points. Here, we also need // second derivatives, which is simple, // however: - std::vector local_values (quadrature.n_quadrature_points); - std::vector > local_gradients (quadrature.n_quadrature_points); - std::vector > local_2nd_derivs (quadrature.n_quadrature_points); + std::vector local_values (quadrature.size()); + std::vector > local_gradients (quadrature.size()); + std::vector > local_2nd_derivs (quadrature.size()); // With all this, we can start the loop // over all cells. Since we need to write @@ -942,7 +942,7 @@ void MinimizationProblem<1>::refine_grid () // since we extract the gradient as a // scalar value. double cell_residual_norm = 0; - for (unsigned int q=0; q::energy (const DoFHandler &dof_handler, update_values | update_gradients | update_quadrature_points | update_JxW_values); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); // Then, just as when we integrated the // linear system, we need two variables diff --git a/deal.II/examples/step-16/step-16.cc b/deal.II/examples/step-16/step-16.cc index dd49e26a3a..3b5ff0c249 100644 --- a/deal.II/examples/step-16/step-16.cc +++ b/deal.II/examples/step-16/step-16.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2003, 2004, 2005, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -198,7 +198,7 @@ void LaplaceProblem::assemble_system () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); @@ -303,7 +303,7 @@ void LaplaceProblem::assemble_multigrid () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); diff --git a/deal.II/examples/step-17/step-17.cc b/deal.II/examples/step-17/step-17.cc index b27ed8c262..d34b682d31 100644 --- a/deal.II/examples/step-17/step-17.cc +++ b/deal.II/examples/step-17/step-17.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2000, 2004, 2005, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -518,7 +518,7 @@ void ElasticProblem::assemble_system () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/deal.II/examples/step-18/step-18.cc b/deal.II/examples/step-18/step-18.cc index 803cb04065..5a7f423831 100644 --- a/deal.II/examples/step-18/step-18.cc +++ b/deal.II/examples/step-18/step-18.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2000, 2004, 2005, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -1485,7 +1485,7 @@ namespace QuasiStaticElasticity update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); @@ -1998,7 +1998,7 @@ namespace QuasiStaticElasticity // points... SymmetricTensor<2,dim> accumulated_stress; for (unsigned int q=0; - q*>(cell->user_pointer())[q] @@ -2008,7 +2008,7 @@ namespace QuasiStaticElasticity // average to their destination: norm_of_stress(index) = (accumulated_stress / - quadrature_formula.n_quadrature_points).norm(); + quadrature_formula.size()).norm(); } // And on the cells that we are not // interested in, set the respective @@ -2543,7 +2543,7 @@ namespace QuasiStaticElasticity tmp.swap (quadrature_point_history); } quadrature_point_history.resize (our_cells * - quadrature_formula.n_quadrature_points); + quadrature_formula.size()); // Finally loop over all cells again and // set the user pointers from the cells @@ -2558,7 +2558,7 @@ namespace QuasiStaticElasticity if (cell->subdomain_id() == this_mpi_process) { cell->set_user_pointer (&quadrature_point_history[history_index]); - history_index += quadrature_formula.n_quadrature_points; + history_index += quadrature_formula.size(); } // At the end, for good measure make sure @@ -2687,7 +2687,7 @@ namespace QuasiStaticElasticity FEValues fe_values (fe, quadrature_formula, update_values | update_gradients); std::vector > > - displacement_increment_grads (quadrature_formula.n_quadrature_points, + displacement_increment_grads (quadrature_formula.size(), std::vector >(dim)); // Then loop over all cells and do the @@ -2725,7 +2725,7 @@ namespace QuasiStaticElasticity // Then loop over the quadrature // points of this cell: - for (unsigned int q=0; q::assemble_system () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); Vector local_rhs (dofs_per_cell); diff --git a/deal.II/examples/step-21/step-21.cc b/deal.II/examples/step-21/step-21.cc index 46cdeca903..b81f519fca 100644 --- a/deal.II/examples/step-21/step-21.cc +++ b/deal.II/examples/step-21/step-21.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -836,8 +836,8 @@ void TwoPhaseFlowProblem::assemble_system () const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); Vector local_rhs (dofs_per_cell); @@ -1008,8 +1008,8 @@ void TwoPhaseFlowProblem::assemble_rhs_S () update_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); Vector local_rhs (dofs_per_cell); @@ -1354,7 +1354,7 @@ TwoPhaseFlowProblem::get_maximal_velocity () const { QGauss quadrature_formula(degree+2); const unsigned int n_q_points - = quadrature_formula.n_quadrature_points; + = quadrature_formula.size(); FEValues fe_values (fe, quadrature_formula, update_values); diff --git a/deal.II/examples/step-22/step-22.cc b/deal.II/examples/step-22/step-22.cc index 245db29a1f..cfd44f6b53 100644 --- a/deal.II/examples/step-22/step-22.cc +++ b/deal.II/examples/step-22/step-22.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2007 by the deal.II authors */ +/* Copyright (C) 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -872,8 +872,8 @@ void BoussinesqFlowProblem::assemble_system () const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); Vector local_rhs (dofs_per_cell); @@ -1069,8 +1069,8 @@ void BoussinesqFlowProblem::assemble_rhs_T () update_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); Vector local_rhs (dofs_per_cell); @@ -1504,7 +1504,7 @@ BoussinesqFlowProblem::get_maximal_velocity () const { QGauss quadrature_formula(degree+2); const unsigned int n_q_points - = quadrature_formula.n_quadrature_points; + = quadrature_formula.size(); FEValues fe_values (fe, quadrature_formula, update_values); diff --git a/deal.II/examples/step-24/step-24.cc b/deal.II/examples/step-24/step-24.cc index 7c6f8597a3..cdeab1c4a2 100644 --- a/deal.II/examples/step-24/step-24.cc +++ b/deal.II/examples/step-24/step-24.cc @@ -1,7 +1,7 @@ /* $Id$ */ /* Version: $Name: $ */ /* */ -/* Copyright (C) 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */ /* Author: Xing Jin, Wolfgang Bangerth, Texas A&M University, 2006 */ /* */ /* This file is subject to QPL and may not be distributed */ @@ -438,7 +438,7 @@ void TATForwardProblem::setup_system () update_values | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); diff --git a/deal.II/examples/step-25/step-25.cc b/deal.II/examples/step-25/step-25.cc index 221b8442f9..c596e2d531 100644 --- a/deal.II/examples/step-25/step-25.cc +++ b/deal.II/examples/step-25/step-25.cc @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (C) 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */ /* Author: Ivan Christov, Wolfgang Bangerth, Texas A&M University, 2006 */ /* */ /* This file is subject to QPL and may not be distributed */ @@ -506,7 +506,7 @@ void SineGordonProblem::compute_nl_term (const Vector &old_data, update_quadrature_points); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); Vector local_nl_term (dofs_per_cell); std::vector local_dof_indices (dofs_per_cell); @@ -579,7 +579,7 @@ void SineGordonProblem::compute_nl_matrix (const Vector &old_data, update_values | update_JxW_values | update_quadrature_points); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix local_nl_matrix (dofs_per_cell, dofs_per_cell); std::vector local_dof_indices (dofs_per_cell); diff --git a/deal.II/examples/step-27/step-27.cc b/deal.II/examples/step-27/step-27.cc index e5603b5765..80211e7884 100644 --- a/deal.II/examples/step-27/step-27.cc +++ b/deal.II/examples/step-27/step-27.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -903,7 +903,7 @@ estimate_smoothness (Vector &smoothness_indicators) const for (unsigned int j=0; j sum = 0; - for (unsigned int q=0; q x_q = quadrature.point(q); sum += std::exp(std::complex(0,1) * diff --git a/deal.II/examples/step-28/step-28.cc b/deal.II/examples/step-28/step-28.cc index e633dc9037..af63ba5f36 100644 --- a/deal.II/examples/step-28/step-28.cc +++ b/deal.II/examples/step-28/step-28.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name: $ */ /* */ -/* Copyright (C) 2006, 2007 by the deal.II authors and Yaqi Wang */ +/* Copyright (C) 2006, 2007, 2008 by the deal.II authors and Yaqi Wang */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -929,7 +929,7 @@ EnergyGroup::assemble_system_matrix () update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); @@ -1015,7 +1015,7 @@ void EnergyGroup::assemble_ingroup_rhs (const Function &extraneous_sou const QGauss quadrature_formula (fe.degree + 1); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FEValues fe_values (fe, quadrature_formula, update_values | update_quadrature_points | @@ -1194,7 +1194,7 @@ assemble_cross_group_rhs_recursive (const EnergyGroup if (!cell_g->has_children() && !cell_g_prime->has_children()) { const QGauss quadrature_formula (fe.degree+1); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FEValues fe_values (fe, quadrature_formula, update_values | update_JxW_values); @@ -1341,7 +1341,7 @@ template double EnergyGroup::get_fission_source () const { const QGauss quadrature_formula (fe.degree + 1); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FEValues fe_values (fe, quadrature_formula, update_values | update_JxW_values); diff --git a/deal.II/examples/step-29/step-29.cc b/deal.II/examples/step-29/step-29.cc index 47c7598e38..576ffda741 100644 --- a/deal.II/examples/step-29/step-29.cc +++ b/deal.II/examples/step-29/step-29.cc @@ -2,7 +2,7 @@ /* Author: Moritz Allmaras, Texas A&M University, 2007 */ /* */ -/* Copyright (C) 2007 by the deal.II authors and M. Allmaras */ +/* Copyright (C) 2007, 2008 by the deal.II authors and M. Allmaras */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -824,8 +824,8 @@ void UltrasoundProblem::assemble_system () QGauss quadrature_formula(2); QGauss face_quadrature_formula(2); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points, - n_face_q_points = face_quadrature_formula.n_quadrature_points, + const unsigned int n_q_points = quadrature_formula.size(), + n_face_q_points = face_quadrature_formula.size(), dofs_per_cell = fe.dofs_per_cell; // The FEValues objects will diff --git a/deal.II/examples/step-3/step-3.cc b/deal.II/examples/step-3/step-3.cc index 19f6e2673f..b08d544078 100644 --- a/deal.II/examples/step-3/step-3.cc +++ b/deal.II/examples/step-3/step-3.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006 by the deal.II authors */ +/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -474,7 +474,7 @@ void LaplaceProblem::assemble_system () // more or less by convention the standard // names for these purposes: const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); // Now, we said that we wanted to assemble // the global matrix and vector diff --git a/deal.II/examples/step-4/step-4.cc b/deal.II/examples/step-4/step-4.cc index ec31942f14..9e7327d64c 100644 --- a/deal.II/examples/step-4/step-4.cc +++ b/deal.II/examples/step-4/step-4.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -428,7 +428,7 @@ void LaplaceProblem::assemble_system () // you and you don't have to care about the // dimension dependent parts: const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/deal.II/examples/step-5/step-5.cc b/deal.II/examples/step-5/step-5.cc index 9a1fd3530c..fe89bb22d4 100644 --- a/deal.II/examples/step-5/step-5.cc +++ b/deal.II/examples/step-5/step-5.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -440,7 +440,7 @@ void LaplaceProblem::assemble_system () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/deal.II/examples/step-6/step-6.cc b/deal.II/examples/step-6/step-6.cc index e7b88c8c87..6706b9e6cb 100644 --- a/deal.II/examples/step-6/step-6.cc +++ b/deal.II/examples/step-6/step-6.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -555,7 +555,7 @@ void LaplaceProblem::assemble_system () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/deal.II/examples/step-7/step-7.cc b/deal.II/examples/step-7/step-7.cc index 0fd500b68f..599622b797 100644 --- a/deal.II/examples/step-7/step-7.cc +++ b/deal.II/examples/step-7/step-7.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -811,8 +811,8 @@ void HelmholtzProblem::assemble_system () QGauss quadrature_formula(3); QGauss face_quadrature_formula(3); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); const unsigned int dofs_per_cell = fe->dofs_per_cell; diff --git a/deal.II/examples/step-8/step-8.cc b/deal.II/examples/step-8/step-8.cc index 8b875fccd7..ab7ebc6c04 100644 --- a/deal.II/examples/step-8/step-8.cc +++ b/deal.II/examples/step-8/step-8.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -544,7 +544,7 @@ void ElasticProblem::assemble_system () update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/deal.II/examples/step-9/step-9.cc b/deal.II/examples/step-9/step-9.cc index 9b2c4fe8ce..2c0cfd67ab 100644 --- a/deal.II/examples/step-9/step-9.cc +++ b/deal.II/examples/step-9/step-9.cc @@ -4,7 +4,7 @@ /* $Id$ */ /* Version: $Name$ */ /* */ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 by the deal.II authors */ +/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */ /* */ /* This file is subject to QPL and may not be distributed */ /* without copyright and license information. Please refer */ @@ -994,8 +994,8 @@ assemble_system_interval (const typename DoFHandler::active_cell_iterator & // abbreviations to avoid // unnecessarily long lines: const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); + const unsigned int n_face_q_points = face_quadrature_formula.size(); // We declare cell matrix and cell // right hand side... -- 2.39.5