From: kanschat Date: Thu, 11 Nov 2010 20:11:47 +0000 (+0000) Subject: do not use deprecated access to Quadrature::n_quadrature_points anymore X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6969801f1d6b609e7a0826c71321acac8bf27109;p=dealii-svn.git do not use deprecated access to Quadrature::n_quadrature_points anymore git-svn-id: https://svn.dealii.org/trunk@22693 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile b/tests/Makefile index dcea3d384c..b1ad499c51 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -11,12 +11,13 @@ nofail-dirs = a-framework \ lac \ fe \ deal.II \ + integrators \ multigrid \ bits \ hp \ - aniso \ - codim_one \ - serialization \ + aniso \ + codim_one \ + serialization \ $(if $(DEAL_II_USE_MPI:no=), $(if $(USE_CONTRIB_P4EST:no=),mpi,),) \ $(if $(USE_CONTRIB_P4EST:no=), distributed_grids,) \ $(if $(USE_CONTRIB_PETSC:no=), petsc,) \ diff --git a/tests/aniso/mesh_3d_21.cc b/tests/aniso/mesh_3d_21.cc index 601a257c17..22c732c78d 100644 --- a/tests/aniso/mesh_3d_21.cc +++ b/tests/aniso/mesh_3d_21.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005, 2007, 2008 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -71,7 +71,7 @@ void check_this (Triangulation<3> &tria) fe_face_values1.reinit (neighbor_child, neighbor_neighbor); fe_face_values2.reinit (cell, face_no, subface_no); - for (unsigned int q=0; q >& gradients, const unsigned int direction, const double order) { - std::vector derivatives(quadrature.n_quadrature_points); - std::vector differences(quadrature.n_quadrature_points); + std::vector derivatives(quadrature.size()); + std::vector differences(quadrature.size()); // Compute derivatives with one // step size and store errors @@ -73,8 +73,8 @@ check_hessian_order(const std::vector& values, const unsigned int direction, const double order) { - std::vector > derivatives(quadrature.n_quadrature_points); - std::vector > differences(quadrature.n_quadrature_points); + std::vector > derivatives(quadrature.size()); + std::vector > differences(quadrature.size()); const double h = (order < 3) ? 1.e-2 : 1.e-1 ; // Compute derivatives with one @@ -122,8 +122,8 @@ check_sine(unsigned int nquad) Functions::FourierSineFunction f(wave_vector); - std::vector values(quadrature.n_quadrature_points); - std::vector > gradients(quadrature.n_quadrature_points); + std::vector values(quadrature.size()); + std::vector > gradients(quadrature.size()); f.value_list(quadrature.get_points(), values); f.gradient_list(quadrature.get_points(), gradients); diff --git a/tests/base/gauss_lobatto.cc b/tests/base/gauss_lobatto.cc index 91c3d24d0b..ff64026aca 100644 --- a/tests/base/gauss_lobatto.cc +++ b/tests/base/gauss_lobatto.cc @@ -72,7 +72,7 @@ check_cells (std::vector*>& quadratures) quadrature_int=0; // Check the polynomial x^i*y^i - for (unsigned int x=0; x*>& quadratures) // check the ordering of // the quadrature points bool in_order=true; - for (unsigned int x=1; x*>& quadratures, const bool sub) // Check the polynomial // x^i*y^i*z^i - for (unsigned int x=0; x q(n); - for (unsigned int i=0; i patch; patch.n_subdivisions = n_sub; - for (unsigned int k=0;k p = trapez.point(k); if (dim>=1) p(0) += i1; diff --git a/tests/base/polynomial1d.cc b/tests/base/polynomial1d.cc index 9dc57908ef..3b31efe5d6 100644 --- a/tests/base/polynomial1d.cc +++ b/tests/base/polynomial1d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -36,7 +36,7 @@ double scalar_product (const Polynomial& p1, QGauss<1> gauss(degree); double sum = 0.; - for (unsigned int i=0;i >& p, void check_poly (const Quadrature<1>& q) { - deallog << "Points: " << q.n_quadrature_points << std::endl; + deallog << "Points: " << q.size() << std::endl; std::vector > p = generate_complete_Lagrange_basis(q.get_points()); check_interpolation(p, q.get_points()); } diff --git a/tests/base/polynomials_bdm_01.cc b/tests/base/polynomials_bdm_01.cc index 8e2473f24a..87768ff35c 100644 --- a/tests/base/polynomials_bdm_01.cc +++ b/tests/base/polynomials_bdm_01.cc @@ -36,7 +36,7 @@ void plot(const PolynomialsBDM& poly) std::vector > grads2; - for (unsigned int k=0;k' << std::endl; diff --git a/tests/base/polynomials_rt.cc b/tests/base/polynomials_rt.cc index b0923d10f4..cdde066afe 100644 --- a/tests/base/polynomials_rt.cc +++ b/tests/base/polynomials_rt.cc @@ -35,7 +35,7 @@ void plot(const PolynomialsRaviartThomas& poly) std::vector > grads2; - for (unsigned int k=0;k' << std::endl; diff --git a/tests/base/qprojector.cc b/tests/base/qprojector.cc index 47e24c8a25..46dbf00be1 100644 --- a/tests/base/qprojector.cc +++ b/tests/base/qprojector.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -43,7 +43,7 @@ void check_line(Quadrature<1>& quadrature) Quadrature q = QProjector::project_to_line(quadrature, p1, p2); double s = 0.; - for (unsigned int k=0;k void check_face(Quadrature<1>& q1) { deallog << "Checking dim " << dim - << " 1d-points " << q1.n_quadrature_points + << " 1d-points " << q1.size() << std::endl; Quadrature subquadrature(q1); @@ -66,7 +66,7 @@ void check_face(Quadrature<1>& q1) Quadrature quadrature = QProjector::project_to_face(subquadrature, f); - for (unsigned int k=0;k& q1) Quadrature quadrature = QProjector::project_to_face(subquadrature, f); - for (unsigned int k=0;k& q1) template void check_faces (Quadrature<1>& q1) { - const unsigned int nq = q1.n_quadrature_points; + const unsigned int nq = q1.size(); deallog << "Checking dim " << dim << " 1d-points " << nq @@ -94,7 +94,7 @@ void check_faces (Quadrature<1>& q1) Quadrature subquadrature(q1); - const unsigned int nqs = subquadrature.n_quadrature_points; + const unsigned int nqs = subquadrature.size(); Quadrature faces = QProjector::project_to_all_faces(subquadrature); diff --git a/tests/base/quadrature_test.cc b/tests/base/quadrature_test.cc index b67be09293..aa1ea1e777 100644 --- a/tests/base/quadrature_test.cc +++ b/tests/base/quadrature_test.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -72,7 +72,7 @@ check_cells (std::vector*>& quadratures) quadrature_int=0; // Check the polynomial x^i*y^i - for (unsigned int x=0; x*>& quadratures) // check the ordering of // the quadrature points bool in_order=true; - for (unsigned int x=1; x*>& quadratures, const bool sub) // Check the polynomial // x^i*y^i*z^i - for (unsigned int x=0; x &fe, QGauss q_rhs(fe.degree+1>2 ? fe.degree+1-2 : 1); FullMatrix X (fe.dofs_per_cell, - q_rhs.n_quadrature_points); + q_rhs.size()); FETools::compute_projection_from_quadrature_points_matrix (fe, q_lhs, q_rhs, diff --git a/tests/bits/fe_tools_cpfqpm_02.cc b/tests/bits/fe_tools_cpfqpm_02.cc index 815bc90e60..45e98b47a8 100644 --- a/tests/bits/fe_tools_cpfqpm_02.cc +++ b/tests/bits/fe_tools_cpfqpm_02.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -60,15 +60,15 @@ check_this (const FiniteElement &fe, // at least as many degrees of freedom in // the finite element as there are // quadrature points - if (fe.dofs_per_cell < q_rhs.n_quadrature_points) + if (fe.dofs_per_cell < q_rhs.size()) return; deallog << "dofs_per_cell=" << fe.dofs_per_cell - << ", n_q_points=" << q_rhs.n_quadrature_points + << ", n_q_points=" << q_rhs.size() << std::endl; FullMatrix X (fe.dofs_per_cell, - q_rhs.n_quadrature_points); + q_rhs.size()); FETools::compute_projection_from_quadrature_points_matrix (fe, q_lhs, q_rhs, @@ -77,12 +77,12 @@ check_this (const FiniteElement &fe, // then compute the matrix that // interpolates back to the quadrature // points - FullMatrix I_q (q_rhs.n_quadrature_points, fe.dofs_per_cell); + FullMatrix I_q (q_rhs.size(), fe.dofs_per_cell); FETools::compute_interpolation_to_quadrature_points_matrix (fe, q_rhs, I_q); - FullMatrix product (q_rhs.n_quadrature_points, - q_rhs.n_quadrature_points); + FullMatrix product (q_rhs.size(), + q_rhs.size()); I_q.mmult (product, X); // the product should be the identity diff --git a/tests/bits/fe_tools_cpfqpm_03.cc b/tests/bits/fe_tools_cpfqpm_03.cc index c8178f9815..9e075a709c 100644 --- a/tests/bits/fe_tools_cpfqpm_03.cc +++ b/tests/bits/fe_tools_cpfqpm_03.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -56,7 +56,7 @@ check_this (const FiniteElement &fe, QGauss q_rhs(fe.degree+3); FullMatrix X (fe.dofs_per_cell, - q_rhs.n_quadrature_points); + q_rhs.size()); FETools::compute_projection_from_quadrature_points_matrix (fe, q_lhs, q_rhs, diff --git a/tests/bits/fe_tools_cpfqpm_04.cc b/tests/bits/fe_tools_cpfqpm_04.cc index 8cbc834e9b..93bebb68d3 100644 --- a/tests/bits/fe_tools_cpfqpm_04.cc +++ b/tests/bits/fe_tools_cpfqpm_04.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -60,7 +60,7 @@ check_this (const FiniteElement &fe, 1./fe.dofs_per_cell)); FullMatrix X (fe.dofs_per_cell, - q_rhs.n_quadrature_points); + q_rhs.size()); Assert (X.m() == X.n(), ExcInternalError()); diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index 23348a12b1..5db3d9bd07 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -2,7 +2,7 @@ // joa_1.cc,v 1.3 2003/06/09 16:00:38 wolf Exp // Version: // -// Copyright (C) 2003, 2004, 2005, 2007 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2007, 2010 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_q_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/tests/bits/mesh_3d_14.cc b/tests/bits/mesh_3d_14.cc index 37d5ccc265..9b357e2dfd 100644 --- a/tests/bits/mesh_3d_14.cc +++ b/tests/bits/mesh_3d_14.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -72,7 +72,7 @@ void check_this (Triangulation<3> &tria) fe_face_values1.reinit (neighbor_child, neighbor_neighbor); fe_face_values2.reinit (cell, face_no, subface_no); - for (unsigned int q=0; q &tria) for (unsigned int f=0; f::faces_per_cell; ++f) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) fe_face_values1.reinit (cell, f); fe_face_values2.reinit (cell->neighbor(f), nn); - for (unsigned int q=0; q &tria) deallog << "Cell " << cell << ", face " << f << std::endl; - for (unsigned int q=0; q &tria) for (unsigned int f=0; f::faces_per_cell; ++f) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria, for (unsigned int f=0; f::faces_per_cell; ++f) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria, for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) for (unsigned int f=0; f::faces_per_cell; ++f) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) for (unsigned int f=0; f::faces_per_cell; ++f) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria, if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria, for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) deallog << "Cell " << cell << ", face " << f << std::endl; - for (unsigned int q=0; q &dof_handler, update_normal_vectors | update_JxW_values)); - const unsigned int n_q_face = quad.n_quadrature_points; + const unsigned int n_q_face = quad.size(); const unsigned int n_components = dof_handler.get_fe().n_components(); // Cell iterators diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc index 9bc6809010..ed34157c4a 100644 --- a/tests/bits/step-13.cc +++ b/tests/bits/step-13.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -402,7 +402,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); @@ -525,7 +525,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/tests/bits/step-14.cc b/tests/bits/step-14.cc index 1c5170ba6a..58665b850c 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -189,7 +189,7 @@ namespace Evaluation vertex_quadrature, update_gradients | update_q_points); std::vector > - solution_gradients (vertex_quadrature.n_quadrature_points); + solution_gradients (vertex_quadrature.size()); typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), @@ -489,7 +489,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); @@ -672,7 +672,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); @@ -1476,7 +1476,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); @@ -1505,7 +1505,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/tests/bits/step-15.cc b/tests/bits/step-15.cc index d9761a95d6..c5f1246802 100644 --- a/tests/bits/step-15.cc +++ b/tests/bits/step-15.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -191,7 +191,7 @@ void MinimizationProblem::assemble_step () update_q_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); @@ -400,9 +400,9 @@ void MinimizationProblem<1>::refine_grid () FEValues neighbor_fe_values (fe, quadrature, update_gradients); - 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()); DoFHandler::active_cell_iterator cell = dof_handler.begin_active (), @@ -415,7 +415,7 @@ void MinimizationProblem<1>::refine_grid () fe_values.get_function_2nd_derivatives (present_solution, local_2nd_derivs); double cell_residual_norm = 0; - for (unsigned int q=0; q::energy (const DoFHandler &dof_handler, update_values | update_gradients | update_q_points | update_JxW_values); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); std::vector local_solution_values (n_q_points); std::vector > local_solution_grads (n_q_points); diff --git a/tests/bits/step-16.cc b/tests/bits/step-16.cc index 9e51efaca4..106eca2829 100644 --- a/tests/bits/step-16.cc +++ b/tests/bits/step-16.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -139,7 +139,7 @@ void LaplaceProblem::assemble_system () update_q_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); @@ -196,7 +196,7 @@ void LaplaceProblem::assemble_multigrid () update_q_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/tests/bits/step-3.cc b/tests/bits/step-3.cc index fe72c0b3d9..ca323f91f1 100644 --- a/tests/bits/step-3.cc +++ b/tests/bits/step-3.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -120,7 +120,7 @@ void LaplaceProblem::assemble_system () update_values | update_gradients | 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/tests/bits/step-4.cc b/tests/bits/step-4.cc index bbb0fe6f64..af30712ed2 100644 --- a/tests/bits/step-4.cc +++ b/tests/bits/step-4.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -178,7 +178,7 @@ void LaplaceProblem::assemble_system () update_q_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/tests/bits/step-5.cc b/tests/bits/step-5.cc index 29ba8f1114..d012acd0fd 100644 --- a/tests/bits/step-5.cc +++ b/tests/bits/step-5.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -174,7 +174,7 @@ void LaplaceProblem::assemble_system () update_q_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/tests/bits/step-6.cc b/tests/bits/step-6.cc index 2815a27c29..24228a0da3 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -199,7 +199,7 @@ void LaplaceProblem::assemble_system () update_q_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/tests/bits/step-7.cc b/tests/bits/step-7.cc index 3336c0b02d..d784cb6298 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -266,8 +266,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/tests/bits/step-8.cc b/tests/bits/step-8.cc index 03758a5782..1474af9159 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -205,7 +205,7 @@ void ElasticProblem::assemble_system () update_q_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/tests/bits/volume_1.cc b/tests/bits/volume_1.cc index b836bac115..30435613cc 100644 --- a/tests/bits/volume_1.cc +++ b/tests/bits/volume_1.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -63,7 +63,7 @@ void check (const Triangulation &tria) if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria, if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria, for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q &tria) if (cell->at_boundary(f)) { fe_face_values.reinit (cell, f); - for (unsigned int q=0; q &tria) for (unsigned int sf=0; sf::max_children_per_face; ++sf) { fe_subface_values.reinit (cell, f, sf); - for (unsigned int q=0; q::solve() update_gradients | update_cell_normal_vectors ); - std::vector< Point > cell_normals(q_iterated.n_quadrature_points); - std::vector< Point > cell_tangentials(q_iterated.n_quadrature_points); + std::vector< Point > cell_normals(q_iterated.size()); + std::vector< Point > cell_tangentials(q_iterated.size()); std::vector local_dof_indices (fe_q.dofs_per_cell); typename DoFHandler::active_cell_iterator @@ -593,7 +593,7 @@ BEM::solve() cell_normals = fe_values_q.get_cell_normal_vectors(); - for(unsigned int i=0; i::solve() // factor (smooth_solution..) is taken // so that it is the coefficient of // the fun_th shape function of the cell. - std::vector< Tensor<1,spacedim> > gradient(q_iterated.n_quadrature_points); - for(unsigned int pnt=0; pnt > gradient(q_iterated.size()); + for(unsigned int pnt=0; pnt::solve() // std::cout // << "gradienti "<::solve() // << std::endl; - for(unsigned int pnt=0; pntindex())= contract( @@ -670,7 +670,7 @@ BEM::solve() } -// // for(unsigned int pnt=0; pntindex()) diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc index 81a0c0406c..9af95b8dd9 100644 --- a/tests/codim_one/gradients.cc +++ b/tests/codim_one/gradients.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2008, 2009 by the deal.II authors +// Copyright (C) 2005, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -121,8 +121,8 @@ void test(std::string filename) FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - std::vector< Point > cell_normals(q_midpoint.n_quadrature_points); - std::vector< Point > cell_tangentials(q_midpoint.n_quadrature_points); + std::vector< Point > cell_normals(q_midpoint.size()); + std::vector< Point > cell_tangentials(q_midpoint.size()); std::vector shape_directional_derivative(dofs_per_cell); Vector projected_directional_derivative(triangulation.n_cells()); diff --git a/tests/codim_one/mapping_q1.cc b/tests/codim_one/mapping_q1.cc index dd43a3935a..82bc5a943f 100644 --- a/tests/codim_one/mapping_q1.cc +++ b/tests/codim_one/mapping_q1.cc @@ -3,7 +3,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -54,7 +54,7 @@ void test(std::string filename) { for(;cell!=endc;++cell) { deallog<::assemble_system () 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/tests/deal.II/derivatives.cc b/tests/deal.II/derivatives.cc index 73dbcedcde..2752eb3896 100644 --- a/tests/deal.II/derivatives.cc +++ b/tests/deal.II/derivatives.cc @@ -75,7 +75,7 @@ check (const unsigned int level, | update_q_points | update_JxW_values); std::vector global_dofs (element.dofs_per_cell); - std::vector function (quadrature.n_quadrature_points); + std::vector function (quadrature.size()); Vector u (dof.n_dofs ()); Vector f (dof.n_dofs ()); @@ -96,7 +96,7 @@ check (const unsigned int level, cell->get_dof_indices (global_dofs); cosine.value_list (fe.get_quadrature_points(), function); - for (unsigned int k=0;k u_local (quadrature.n_quadrature_points); - std::vector > Du (quadrature.n_quadrature_points); - std::vector > Df (quadrature.n_quadrature_points); - std::vector > DDu (quadrature.n_quadrature_points); - std::vector > DDf (quadrature.n_quadrature_points); + std::vector u_local (quadrature.size()); + std::vector > Du (quadrature.size()); + std::vector > Df (quadrature.size()); + std::vector > DDu (quadrature.size()); + std::vector > DDf (quadrature.size()); for (cell = dof.begin_active(); cell != end;++cell) { @@ -149,7 +149,7 @@ check (const unsigned int level, fe2.get_function_grads (u, Du); fe2.get_function_2nd_derivatives (u,DDu); - for (unsigned int k=0;k& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector scalar_values (quadrature.n_quadrature_points); - std::vector > vector_values (quadrature.n_quadrature_points, + std::vector scalar_values (quadrature.size()); + std::vector > vector_values (quadrature.size(), Vector(fe.n_components())); fe_values.get_function_values (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_06.cc b/tests/deal.II/fe_values_view_06.cc index f3def27719..2af650b40c 100644 --- a/tests/deal.II/fe_values_view_06.cc +++ b/tests/deal.II/fe_values_view_06.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,9 +52,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_07.cc b/tests/deal.II/fe_values_view_07.cc index 0b86d9a677..7ef4e5a8ab 100644 --- a/tests/deal.II/fe_values_view_07.cc +++ b/tests/deal.II/fe_values_view_07.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,9 +52,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_08.cc b/tests/deal.II/fe_values_view_08.cc index 6f08f08483..c1a6af2830 100644 --- a/tests/deal.II/fe_values_view_08.cc +++ b/tests/deal.II/fe_values_view_08.cc @@ -54,8 +54,8 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector scalar_values (quadrature.n_quadrature_points); - std::vector > vector_values (quadrature.n_quadrature_points, + std::vector scalar_values (quadrature.size()); + std::vector > vector_values (quadrature.size(), Vector(fe.n_components())); fe_values.get_function_values (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_09.cc b/tests/deal.II/fe_values_view_09.cc index 892ae79598..f4ec9b4ed9 100644 --- a/tests/deal.II/fe_values_view_09.cc +++ b/tests/deal.II/fe_values_view_09.cc @@ -54,9 +54,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_10.cc b/tests/deal.II/fe_values_view_10.cc index dbbdc7f7a2..18456a53dc 100644 --- a/tests/deal.II/fe_values_view_10.cc +++ b/tests/deal.II/fe_values_view_10.cc @@ -54,9 +54,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_10_single_01.cc b/tests/deal.II/fe_values_view_10_single_01.cc index 5413dfae1c..a6aee7bf70 100644 --- a/tests/deal.II/fe_values_view_10_single_01.cc +++ b/tests/deal.II/fe_values_view_10_single_01.cc @@ -57,9 +57,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_10_single_02.cc b/tests/deal.II/fe_values_view_10_single_02.cc index 99cf715335..5fa6702355 100644 --- a/tests/deal.II/fe_values_view_10_single_02.cc +++ b/tests/deal.II/fe_values_view_10_single_02.cc @@ -57,9 +57,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_10_single_03.cc b/tests/deal.II/fe_values_view_10_single_03.cc index 88c359a8a3..5a5f5b5a24 100644 --- a/tests/deal.II/fe_values_view_10_single_03.cc +++ b/tests/deal.II/fe_values_view_10_single_03.cc @@ -57,9 +57,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > scalar_values (quadrature.n_quadrature_points); + std::vector > scalar_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_10_single_04.cc b/tests/deal.II/fe_values_view_10_single_04.cc index 2543902750..071c99b343 100644 --- a/tests/deal.II/fe_values_view_10_single_04.cc +++ b/tests/deal.II/fe_values_view_10_single_04.cc @@ -59,9 +59,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector scalar_values (quadrature.n_quadrature_points); + std::vector scalar_values (quadrature.size()); std::vector > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), Vector(fe.n_components())); fe_values.get_function_values (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_11.cc b/tests/deal.II/fe_values_view_11.cc index 8a1aba746c..ab091d0a10 100644 --- a/tests/deal.II/fe_values_view_11.cc +++ b/tests/deal.II/fe_values_view_11.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,8 +52,8 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); - std::vector > vector_values (quadrature.n_quadrature_points, + std::vector > selected_vector_values (quadrature.size()); + std::vector > vector_values (quadrature.size(), Vector(fe.n_components())); fe_values.get_function_values (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_12.cc b/tests/deal.II/fe_values_view_12.cc index 5bfe2c8da6..efdad29d6d 100644 --- a/tests/deal.II/fe_values_view_12.cc +++ b/tests/deal.II/fe_values_view_12.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,9 +52,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); + std::vector > selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_13.cc b/tests/deal.II/fe_values_view_13.cc index 8267200fb6..26dde699f6 100644 --- a/tests/deal.II/fe_values_view_13.cc +++ b/tests/deal.II/fe_values_view_13.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,9 +52,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); + std::vector > selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_14.cc b/tests/deal.II/fe_values_view_14.cc index 53f85f61af..e10223c2d0 100644 --- a/tests/deal.II/fe_values_view_14.cc +++ b/tests/deal.II/fe_values_view_14.cc @@ -54,8 +54,8 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); - std::vector > vector_values (quadrature.n_quadrature_points, + std::vector > selected_vector_values (quadrature.size()); + std::vector > vector_values (quadrature.size(), Vector(fe.n_components())); fe_values.get_function_values (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_15.cc b/tests/deal.II/fe_values_view_15.cc index db5774b1c3..de50ae94ad 100644 --- a/tests/deal.II/fe_values_view_15.cc +++ b/tests/deal.II/fe_values_view_15.cc @@ -54,9 +54,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); + std::vector > selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_16.cc b/tests/deal.II/fe_values_view_16.cc index 2a63ba31eb..fea3184986 100644 --- a/tests/deal.II/fe_values_view_16.cc +++ b/tests/deal.II/fe_values_view_16.cc @@ -54,9 +54,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); + std::vector > selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_hessians (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_17.cc b/tests/deal.II/fe_values_view_17.cc index ca8d025f94..823f27b511 100644 --- a/tests/deal.II/fe_values_view_17.cc +++ b/tests/deal.II/fe_values_view_17.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,9 +52,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); + std::vector > selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_18.cc b/tests/deal.II/fe_values_view_18.cc index 7786f9bf2e..c3dfa2e70a 100644 --- a/tests/deal.II/fe_values_view_18.cc +++ b/tests/deal.II/fe_values_view_18.cc @@ -54,9 +54,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector > selected_vector_values (quadrature.n_quadrature_points); + std::vector > selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_19.cc b/tests/deal.II/fe_values_view_19.cc index bafdab3686..a9b1b08235 100644 --- a/tests/deal.II/fe_values_view_19.cc +++ b/tests/deal.II/fe_values_view_19.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007, 2008 by the deal.II authors +// Copyright (C) 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,9 +52,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector selected_vector_values (quadrature.n_quadrature_points); + std::vector selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_20.cc b/tests/deal.II/fe_values_view_20.cc index fdf288d078..70dc0963df 100644 --- a/tests/deal.II/fe_values_view_20.cc +++ b/tests/deal.II/fe_values_view_20.cc @@ -54,9 +54,9 @@ void test (const Triangulation& tr, update_values | update_gradients | update_hessians); fe_values.reinit (dof.begin_active()); - std::vector selected_vector_values (quadrature.n_quadrature_points); + std::vector selected_vector_values (quadrature.size()); std::vector > > - vector_values (quadrature.n_quadrature_points, + vector_values (quadrature.size(), std::vector >(fe.n_components())); fe_values.get_function_gradients (fe_function, vector_values); diff --git a/tests/deal.II/fe_values_view_21.cc b/tests/deal.II/fe_values_view_21.cc index 738e483241..2769247fd0 100644 --- a/tests/deal.II/fe_values_view_21.cc +++ b/tests/deal.II/fe_values_view_21.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2009 by Andrew McBride and the deal.II authors +// Copyright (C) 2009, 2010 by Andrew McBride and the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -165,8 +165,7 @@ void MixedElastoPlasticity::assemble_system() const unsigned int dofs_per_cell = fe.dofs_per_cell; deallog << "dofs_per_cell: " << fe.dofs_per_cell << std::endl; - const unsigned int n_q_points = quadrature_formula.size(); - + FullMatrix local_matrix(dofs_per_cell, dofs_per_cell); Vector local_rhs(dofs_per_cell); diff --git a/tests/deal.II/filtered_matrix.cc b/tests/deal.II/filtered_matrix.cc index f2f3ed4a0d..0bc3d37d7f 100644 --- a/tests/deal.II/filtered_matrix.cc +++ b/tests/deal.II/filtered_matrix.cc @@ -122,7 +122,7 @@ check () | update_q_points | update_JxW_values); std::vector global_dofs (element.dofs_per_cell); - std::vector function (quadrature.n_quadrature_points); + std::vector function (quadrature.size()); Vector f (dof.n_dofs ()); @@ -142,7 +142,7 @@ check () cell->get_dof_indices (global_dofs); cosine.value_list (fe.get_quadrature_points(), function); - for (unsigned int k=0;k &mapping, update_JxW_values| update_contravariant_transformation)); - const unsigned int n_q_points = quad.n_quadrature_points; + const unsigned int n_q_points = quad.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); // Cell iterators @@ -452,7 +452,7 @@ int main () QGauss<2> quad_temp(6); sprintf (buf, "DoFs per Quad: %i per Line %i per Vert %i\n", fe.dofs_per_quad, fe.dofs_per_line, fe.dofs_per_vertex); deallog << buf; - sprintf (buf, "QPoints %i\n", quad_temp.n_quadrature_points); + sprintf (buf, "QPoints %i\n", quad_temp.size()); deallog << buf; // Create an deformation object for the Eulerian mapping diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index 71ce22a3c6..ea3783f6f7 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -371,7 +371,7 @@ estimate_smoothness (Vector &smoothness_indicators) const for (unsigned int i=0; i sum = 0; - for (unsigned int q=0; q x_q = quadrature.point(q); sum += std::exp(std::complex(0,1) * diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc index d310552290..515f683ec4 100644 --- a/tests/fail/hp-step-14.cc +++ b/tests/fail/hp-step-14.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -189,7 +189,7 @@ namespace Evaluation vertex_quadrature, update_gradients | update_q_points); std::vector > - solution_gradients (vertex_quadrature.n_quadrature_points); + solution_gradients (vertex_quadrature.size()); typename hp::DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), @@ -486,7 +486,7 @@ namespace LaplaceSolver update_gradients | update_JxW_values); const unsigned int dofs_per_cell = (*fe)[0].dofs_per_cell; - const unsigned int n_q_points = (*quadrature)[0].n_quadrature_points; + const unsigned int n_q_points = (*quadrature)[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); @@ -669,7 +669,7 @@ namespace LaplaceSolver update_JxW_values); const unsigned int dofs_per_cell = (*this->fe)[0].dofs_per_cell; - const unsigned int n_q_points = (*this->quadrature)[0].n_quadrature_points; + const unsigned int n_q_points = (*this->quadrature)[0].size(); Vector cell_rhs (dofs_per_cell); std::vector rhs_values (n_q_points); @@ -1473,7 +1473,7 @@ namespace LaplaceSolver right_hand_side (&right_hand_side) { const unsigned int n_q_points - = quadrature[0].n_quadrature_points; + = quadrature[0].size(); cell_residual.resize(n_q_points); rhs_values.resize(n_q_points); @@ -1502,7 +1502,7 @@ namespace LaplaceSolver update_gradients) { const unsigned int n_face_q_points - = face_quadrature[0].n_quadrature_points; + = face_quadrature[0].size(); jump_residual.resize(n_face_q_points); dual_weights.resize(n_face_q_points); diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc index d379f3f1b2..511c1ae233 100644 --- a/tests/fail/hp-step-15.cc +++ b/tests/fail/hp-step-15.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -192,7 +192,7 @@ void MinimizationProblem::assemble_step () update_q_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); @@ -402,9 +402,9 @@ void MinimizationProblem<1>::refine_grid () hp::FEValues neighbor_fe_values (fe, quadrature, update_gradients); - std::vector local_values (quadrature[0].n_quadrature_points); - std::vector > local_gradients (quadrature[0].n_quadrature_points); - std::vector > local_2nd_derivs (quadrature[0].n_quadrature_points); + std::vector local_values (quadrature[0].size()); + std::vector > local_gradients (quadrature[0].size()); + std::vector > local_2nd_derivs (quadrature[0].size()); hp::DoFHandler::active_cell_iterator cell = dof_handler.begin_active (), @@ -417,7 +417,7 @@ void MinimizationProblem<1>::refine_grid () fe_values.get_present_fe_values().get_function_2nd_derivatives (present_solution, local_2nd_derivs); double cell_residual_norm = 0; - for (unsigned int q=0; q::energy (const hp::DoFHandler &dof_handler, update_values | update_gradients | update_q_points | update_JxW_values); - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); std::vector local_solution_values (n_q_points); std::vector > local_solution_grads (n_q_points); diff --git a/tests/fail/rt_distorted_01.cc b/tests/fail/rt_distorted_01.cc index e1b51ed79b..18c7637725 100644 --- a/tests/fail/rt_distorted_01.cc +++ b/tests/fail/rt_distorted_01.cc @@ -2,7 +2,7 @@ // rt_distorted_01.cc,v 1.3 2003/06/09 16:00:38 wolf Exp // Version: // -// Copyright (C) 2003, 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 2003, 2005, 2006, 2007, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -273,7 +273,7 @@ double EvaluateArea (Mapping<2> &mapping, update_q_points | update_JxW_values)); - const unsigned int n_q_points = quad.n_quadrature_points; + const unsigned int n_q_points = quad.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); // Cell iterators diff --git a/tests/fail/rt_distorted_02.cc b/tests/fail/rt_distorted_02.cc index 47c1caa2e5..00a256d0e8 100644 --- a/tests/fail/rt_distorted_02.cc +++ b/tests/fail/rt_distorted_02.cc @@ -287,7 +287,7 @@ double EvaluateDiver (Mapping<2> &mapping, update_JxW_values| update_contravariant_transformation)); - const unsigned int n_q_points = quad.n_quadrature_points; + const unsigned int n_q_points = quad.size(); const unsigned int n_components = dof_handler.get_fe().n_components(); // Cell iterators @@ -347,7 +347,7 @@ int main () sprintf (buf,"DoFs per Quad: %i per Line %i per Vert %i\n", fe.dofs_per_quad, fe.dofs_per_line, fe.dofs_per_vertex); deallog << buf; - sprintf (buf,"QPoints %i\n", quad_temp.n_quadrature_points); + sprintf (buf,"QPoints %i\n", quad_temp.size()); deallog << buf; // Create an deformation object for the Eulerian mapping diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 4f183ff433..279c3e62e7 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -2,7 +2,7 @@ // abf_01.cc,v 1.3 2003/06/09 16:00:38 wolf Exp // Version: // -// Copyright (C) 2003, 2005, 2006, 2008 by the deal.II authors +// Copyright (C) 2003, 2005, 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -73,7 +73,7 @@ void EvaluateDerivative (DoFHandler<2> *dof_handler, update_gradients | update_JxW_values)); - const unsigned int n_q_points = quad.n_quadrature_points; + const unsigned int n_q_points = quad.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); const unsigned int dofs_per_cell = dof_handler->get_fe().dofs_per_cell; diff --git a/tests/fe/check_derivatives.cc b/tests/fe/check_derivatives.cc index e062974ef8..8c5938b924 100644 --- a/tests/fe/check_derivatives.cc +++ b/tests/fe/check_derivatives.cc @@ -41,7 +41,7 @@ void test (const FiniteElement &fe, deallog << fe.get_name() << ' ' << fe.dofs_per_cell << ' '; for (unsigned int i=0; i point = quadrature.point(q); diff --git a/tests/fe/deformed_projection.h b/tests/fe/deformed_projection.h index 149947ffb0..929ac99058 100644 --- a/tests/fe/deformed_projection.h +++ b/tests/fe/deformed_projection.h @@ -117,7 +117,7 @@ void EvaluateDerivative (DoFHandler<2> *dof_handler, update_gradients | update_JxW_values)); - const unsigned int n_q_points = quad.n_quadrature_points; + const unsigned int n_q_points = quad.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); const unsigned int dofs_per_cell = dof_handler->get_fe().dofs_per_cell; diff --git a/tests/fe/derivatives_face.cc b/tests/fe/derivatives_face.cc index 5237ca2594..32851350cb 100644 --- a/tests/fe/derivatives_face.cc +++ b/tests/fe/derivatives_face.cc @@ -43,7 +43,7 @@ plot_derivatives(Mapping& mapping, { fe.reinit(c, face); - for (unsigned int k=0; k& fe) v(i) = i; FEValues feval(fe, quadrature, update_values); - std::vector > local(quadrature.n_quadrature_points, + std::vector > local(quadrature.size(), Vector(fe.n_components())); typename DoFHandler::active_cell_iterator cell = dof.begin_active(); @@ -63,7 +63,7 @@ void vector_values(const FiniteElement& fe) for (unsigned int c=0;c quadrature(fe.degree+1); - std::vector f(quadrature.n_quadrature_points); + std::vector f(quadrature.size()); function.value_list(quadrature.get_points(), f); - for (unsigned int k=0;k quadrature(fe.degree+1); - std::vector > f(quadrature.n_quadrature_points, + std::vector > f(quadrature.size(), Vector(function.n_components)); function.vector_value_list(quadrature.get_points(), f); - for (unsigned int k=0;k &mapping, deallog.push(name); QGauss q(4); - const unsigned int nq = (unsigned int) (.01 + std::pow(q.n_quadrature_points, 1./(dim-1))); + const unsigned int nq = (unsigned int) (.01 + std::pow(q.size(), 1./(dim-1))); FEFaceValues fe_values(mapping, fe, q, UpdateFlags(update_q_points @@ -123,7 +123,7 @@ plot_subfaces(Mapping &mapping, deallog.push(name); QGauss q(4); - const unsigned int nq = (unsigned int) (.01 + std::pow(q.n_quadrature_points, 1./(dim-1))); + const unsigned int nq = (unsigned int) (.01 + std::pow(q.size(), 1./(dim-1))); FESubfaceValues fe_values(mapping, fe, q, UpdateFlags(update_q_points diff --git a/tests/fe/mapping_q1_eulerian.cc b/tests/fe/mapping_q1_eulerian.cc index a78f14cd40..2755cbf7ba 100644 --- a/tests/fe/mapping_q1_eulerian.cc +++ b/tests/fe/mapping_q1_eulerian.cc @@ -57,7 +57,7 @@ show_values(FiniteElement& fe, typename DoFHandler::cell_iterator c = dof.begin(); fe_values.reinit(c); - for (unsigned int k=0; k::compute_area () FEValues fe_values (mapping, fe, quadrature_formula, update_JxW_values); - const unsigned int n_q_points = quadrature_formula.n_quadrature_points; + const unsigned int n_q_points = quadrature_formula.size(); long double area = 0.; diff --git a/tests/fe/nedelec_2.cc b/tests/fe/nedelec_2.cc index ae5c8ee26b..c8580ce85a 100644 --- a/tests/fe/nedelec_2.cc +++ b/tests/fe/nedelec_2.cc @@ -91,9 +91,9 @@ plot (const Triangulation &tr, const unsigned int p) // function on each cell and on // each quadrature point QTrapez quadrature; - std::vector > shape_values1 (quadrature.n_quadrature_points, + std::vector > shape_values1 (quadrature.size(), Vector(dim)); - std::vector > shape_values2 (quadrature.n_quadrature_points, + std::vector > shape_values2 (quadrature.size(), Vector(dim)); MappingCartesian mapping; diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc index d386fedde0..7da6c1fb07 100644 --- a/tests/fe/nedelec_3.cc +++ b/tests/fe/nedelec_3.cc @@ -69,7 +69,7 @@ check (const unsigned int p) // quadrature points of all cells // of the finer grid QTrapez quadrature; - std::vector > shape_values (quadrature.n_quadrature_points, + std::vector > shape_values (quadrature.size(), Vector(dim)); FEValues fe(fe_ned, quadrature, update_values|update_q_points); @@ -82,7 +82,7 @@ check (const unsigned int p) fe.reinit(c); fe.get_function_values (values, shape_values); - for (unsigned int q=0; q &dof_handler, FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); QGauss quadrature (3); - const unsigned int n_q_points = quadrature.n_quadrature_points; + const unsigned int n_q_points = quadrature.size(); FEValues fe_values (fe, quadrature, update_values | update_gradients | @@ -131,7 +131,7 @@ create_stokes_matrix_2 (const DoFHandler &dof_handler, FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); QGauss quadrature (3); - const unsigned int n_q_points = quadrature.n_quadrature_points; + const unsigned int n_q_points = quadrature.size(); FEValues fe_values (fe, quadrature, update_values | update_gradients | @@ -207,7 +207,7 @@ create_stokes_matrix_3 (const DoFHandler &dof_handler, FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); QGauss quadrature (3); - const unsigned int n_q_points = quadrature.n_quadrature_points; + const unsigned int n_q_points = quadrature.size(); FEValues fe_values (fe, quadrature, update_values | update_gradients | diff --git a/tests/fe/non_primitive_2.cc b/tests/fe/non_primitive_2.cc index b32325b7f2..652614d0d4 100644 --- a/tests/fe/non_primitive_2.cc +++ b/tests/fe/non_primitive_2.cc @@ -2,7 +2,7 @@ // non_primitive_2.cc,v 1.5 2003/04/21 07:31:15 guido Exp // Version: // -// Copyright (C) 2001, 2002, 2003, 2005, 2007 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2005, 2007, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -61,7 +61,7 @@ create_stokes_matrix_2 (const DoFHandler &dof_handler, FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); QGauss quadrature (3); - const unsigned int n_q_points = quadrature.n_quadrature_points; + const unsigned int n_q_points = quadrature.size(); FEValues fe_values (fe, quadrature, update_values | update_gradients | @@ -137,7 +137,7 @@ create_stokes_matrix_3 (const DoFHandler &dof_handler, FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); QGauss quadrature (3); - const unsigned int n_q_points = quadrature.n_quadrature_points; + const unsigned int n_q_points = quadrature.size(); FEValues fe_values (fe, quadrature, update_values | update_gradients | diff --git a/tests/fe/rt_10.cc b/tests/fe/rt_10.cc index 25ae558d52..884428c716 100644 --- a/tests/fe/rt_10.cc +++ b/tests/fe/rt_10.cc @@ -2,7 +2,7 @@ // rt_10.cc,v 1.3 2003/06/09 16:00:38 wolf Exp // Version: // -// Copyright (C) 2003, 2005, 2006 by the deal.II authors +// Copyright (C) 2003, 2005, 2006, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -64,7 +64,7 @@ test (const unsigned int degree) FEValues fe_values (fe_rt, quadrature, update_values); fe_values.reinit (dof.begin_active()); - for (unsigned int q=0; q fe_values (fe_rt, quadrature, update_values); fe_values.reinit (dof.begin_active(), 0); - for (unsigned int q=0; q fe_values (fe_rt, quadrature, update_gradients); fe_values.reinit (dof.begin_active()); - for (unsigned int q=0; q fe_values (fe_rt, quadrature, update_gradients); fe_values.reinit (dof.begin_active(), 0); - for (unsigned int q=0; q fe_values (fe_rt, quadrature, update_values); fe_values.reinit (dof.begin_active(), 0, 0); - for (unsigned int q=0; q fe_values (fe_rt, quadrature, update_gradients); fe_values.reinit (dof.begin_active(), 0, 0); - for (unsigned int q=0; q(q_trapez,div).n_quadrature_points == 0) + if (q_point % QIterated<1>(q_trapez,div).size() == 0) deallog << std::endl; deallog << fe.quadrature_point(q_point) << " "; diff --git a/tests/fe/rt_8.cc b/tests/fe/rt_8.cc index 1984b7a97d..2d1de513e7 100644 --- a/tests/fe/rt_8.cc +++ b/tests/fe/rt_8.cc @@ -62,7 +62,7 @@ test (const unsigned int degree) Assert (fe.get_fe().n_components() == dim, ExcInternalError()); - for (unsigned int q_point=0; q_point &mapping, update_JxW_values| update_contravariant_transformation)); - const unsigned int n_q_points = quad.n_quadrature_points; + const unsigned int n_q_points = quad.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); // Cell iterators @@ -459,7 +459,7 @@ int main () << ", dofs per line: " << fe.dofs_per_line << ", dofs per vertex: " << fe.dofs_per_vertex << std::endl; - deallog << "n_q_points=" << quad_temp.n_quadrature_points + deallog << "n_q_points=" << quad_temp.size() << std::endl; // Create an deformation object for diff --git a/tests/fe/rt_normal_02.cc b/tests/fe/rt_normal_02.cc index c7a575c3ca..35f1e6284c 100644 --- a/tests/fe/rt_normal_02.cc +++ b/tests/fe/rt_normal_02.cc @@ -2,7 +2,7 @@ // rt_normal_02.cc,v 1.3 2003/06/09 16:00:38 wolf Exp // Version: // -// Copyright (C) 2003, 2005, 2006 by the deal.II authors +// Copyright (C) 2003, 2005, 2006, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -80,8 +80,8 @@ void EvaluateNormal2 (DoFHandler<2> *dof_handler, update_gradients | update_JxW_values)); - const unsigned int n_q_face = quad.n_quadrature_points; - const unsigned int n_q_proj = qproject.n_quadrature_points; + const unsigned int n_q_face = quad.size(); + const unsigned int n_q_proj = qproject.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); const unsigned int dofs_per_cell = dof_handler->get_fe().dofs_per_cell; @@ -110,7 +110,7 @@ void EvaluateNormal2 (DoFHandler<2> *dof_handler, cell->face_orientation(f), cell->face_flip(f), cell->face_rotation(f), - quad.n_quadrature_points)); + quad.size())); fe_v_face.reinit (cell, f); DoFHandler<2>::active_cell_iterator cell_n = cell->neighbor (f); @@ -123,7 +123,7 @@ void EvaluateNormal2 (DoFHandler<2> *dof_handler, cell_n->face_orientation(neighbor), cell_n->face_flip(neighbor), cell_n->face_rotation(neighbor), - quad.n_quadrature_points)); + quad.size())); // Get values from solution vector (For Trap.Rule) std::vector > this_value @@ -191,7 +191,7 @@ void EvaluateNormal (DoFHandler<2> *dof_handler, update_normal_vectors | update_JxW_values)); - const unsigned int n_q_face = quad.n_quadrature_points; + const unsigned int n_q_face = quad.size(); const unsigned int n_components = dof_handler->get_fe().n_components(); const unsigned int dofs_per_cell = dof_handler->get_fe().dofs_per_cell; diff --git a/tests/fe/rtdiff.cc b/tests/fe/rtdiff.cc index 6fe1632567..d9b8f38f02 100644 --- a/tests/fe/rtdiff.cc +++ b/tests/fe/rtdiff.cc @@ -2,7 +2,7 @@ // rt_1.cc,v 1.3 2003/06/09 16:00:38 wolf Exp // Version: // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -86,11 +86,11 @@ compare_shapes (const FiniteElement& other, FullMatrix& M) { QGauss quadrature(other.degree+1); - Table<3,double> other_values(quadrature.n_quadrature_points, other.dofs_per_cell, dim); - Table<3,double> nodes_values(quadrature.n_quadrature_points, other.dofs_per_cell, dim); - Table<3,Tensor<1,dim> > other_grads(quadrature.n_quadrature_points, other.dofs_per_cell, dim); - Table<3,Tensor<1,dim> > nodes_grads(quadrature.n_quadrature_points, other.dofs_per_cell, dim); - for (unsigned int k=0;k other_values(quadrature.size(), other.dofs_per_cell, dim); + Table<3,double> nodes_values(quadrature.size(), other.dofs_per_cell, dim); + Table<3,Tensor<1,dim> > other_grads(quadrature.size(), other.dofs_per_cell, dim); + Table<3,Tensor<1,dim> > nodes_grads(quadrature.size(), other.dofs_per_cell, dim); + for (unsigned int k=0;k& other, nodes_grads[k][i][d] = nodes.shape_grad_component(i,quadrature.point(k),d); } - for (unsigned int k=0;k fe(fe_rt, q, update_values|update_gradients|update_q_points); fe.reinit(c); - for (unsigned int q_point=0; q_point(q_trapez,div).n_quadrature_points == 0) + if (q_point % QIterated<1>(q_trapez,div).size() == 0) deallog << std::endl; deallog << fe.quadrature_point(q_point) << " "; diff --git a/tests/fe/shapes.cc b/tests/fe/shapes.cc index f439073847..a787a49583 100644 --- a/tests/fe/shapes.cc +++ b/tests/fe/shapes.cc @@ -259,7 +259,7 @@ check_values_and_derivatives (const FiniteElement &fe, const Quadrature &q) { // check values - for (unsigned int x=0; x &fe, }; // check gradients - for (unsigned int x=0; x &fe, // check second derivatives double max_diff=0.; - for (unsigned int x=0; x &smoothness_indicators) const for (unsigned int i=0; i sum = 0; - for (unsigned int q=0; q x_q = quadrature.point(q); sum += std::exp(std::complex(0,1) * diff --git a/tests/hp/crash_17_compressed_set_sparsity.cc b/tests/hp/crash_17_compressed_set_sparsity.cc index 0d98839d82..5adb2ce3e4 100644 --- a/tests/hp/crash_17_compressed_set_sparsity.cc +++ b/tests/hp/crash_17_compressed_set_sparsity.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 2006, 2007, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -373,7 +373,7 @@ estimate_smoothness (Vector &smoothness_indicators) const for (unsigned int i=0; i sum = 0; - for (unsigned int q=0; q x_q = quadrature.point(q); sum += std::exp(std::complex(0,1) * diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc index 86040c8150..5d72ecb3db 100644 --- a/tests/hp/crash_18.cc +++ b/tests/hp/crash_18.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -376,7 +376,7 @@ estimate_smoothness (Vector &smoothness_indicators) const for (unsigned int i=0; i sum = 0; - for (unsigned int q=0; q x_q = quadrature.point(q); sum += std::exp(std::complex(0,1) * diff --git a/tests/hp/crash_18_compressed_set_sparsity.cc b/tests/hp/crash_18_compressed_set_sparsity.cc index db902cd0e7..66c53a2ed1 100644 --- a/tests/hp/crash_18_compressed_set_sparsity.cc +++ b/tests/hp/crash_18_compressed_set_sparsity.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -379,7 +379,7 @@ estimate_smoothness (Vector &smoothness_indicators) const for (unsigned int i=0; i sum = 0; - for (unsigned int q=0; q x_q = quadrature.point(q); sum += std::exp(std::complex(0,1) * diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc index a5c5915eb6..8b3522a839 100644 --- a/tests/hp/step-13.cc +++ b/tests/hp/step-13.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -402,7 +402,7 @@ namespace LaplaceSolver update_gradients | update_JxW_values); const unsigned int dofs_per_cell = (*fe)[0].dofs_per_cell; - const unsigned int n_q_points = (*quadrature)[0].n_quadrature_points; + const unsigned int n_q_points = (*quadrature)[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); @@ -525,7 +525,7 @@ namespace LaplaceSolver update_JxW_values); const unsigned int dofs_per_cell = (*this->fe)[0].dofs_per_cell; - const unsigned int n_q_points = (*this->quadrature)[0].n_quadrature_points; + const unsigned int n_q_points = (*this->quadrature)[0].size(); Vector cell_rhs (dofs_per_cell); std::vector rhs_values (n_q_points); diff --git a/tests/hp/step-3.cc b/tests/hp/step-3.cc index b254ac30b7..b99eb1293c 100644 --- a/tests/hp/step-3.cc +++ b/tests/hp/step-3.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -120,7 +120,7 @@ void LaplaceProblem::assemble_system () update_values | update_gradients | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/tests/hp/step-3a.cc b/tests/hp/step-3a.cc index e742e9614b..ad6b53519e 100644 --- a/tests/hp/step-3a.cc +++ b/tests/hp/step-3a.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006 by the deal.II authors +// Copyright (C) 2005, 2006, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -154,7 +154,7 @@ void LaplaceProblem::assemble_system () update_values | update_gradients | update_JxW_values); const unsigned int max_dofs_per_cell = fe.max_dofs_per_cell (); - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (max_dofs_per_cell, max_dofs_per_cell); Vector cell_rhs (max_dofs_per_cell); diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc index c28e052f1a..d1e9ff3005 100644 --- a/tests/hp/step-3b.cc +++ b/tests/hp/step-3b.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006 by the deal.II authors +// Copyright (C) 2005, 2006, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -151,7 +151,7 @@ void LaplaceProblem::assemble_system () update_values | update_gradients | update_JxW_values); const unsigned int max_dofs_per_cell = fe.max_dofs_per_cell (); - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (max_dofs_per_cell, max_dofs_per_cell); Vector cell_rhs (max_dofs_per_cell); diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc index 2783cf0222..196f8c749a 100644 --- a/tests/hp/step-3c.cc +++ b/tests/hp/step-3c.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006 by the deal.II authors +// Copyright (C) 2005, 2006, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -173,7 +173,7 @@ void LaplaceProblem::assemble_system () cell_rhs = 0; const unsigned int dofs_per_cell = cell->get_fe ().dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[cell->active_fe_index ()].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[cell->active_fe_index ()].size(); for (unsigned int i=0; i::assemble_system () update_q_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc index 9046856fbb..a2213ac9d8 100644 --- a/tests/hp/step-5.cc +++ b/tests/hp/step-5.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -173,7 +173,7 @@ void LaplaceProblem::assemble_system () update_q_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index ead4eed476..bbc4fb09c6 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 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_q_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index 9085ab590e..f814069218 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -265,8 +265,8 @@ void HelmholtzProblem::assemble_system () hp::QCollection quadrature_formula(QGauss(3)); hp::QCollection face_quadrature_formula(QGauss(3)); - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; - const unsigned int n_face_q_points = face_quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); + const unsigned int n_face_q_points = face_quadrature_formula[0].size(); const unsigned int dofs_per_cell = (*fe)[0].dofs_per_cell; diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc index fc28e387e1..d615dc5643 100644 --- a/tests/hp/step-8.cc +++ b/tests/hp/step-8.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005, 2006, 2008 by the deal.II authors +// Copyright (C) 2005, 2006, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -204,7 +204,7 @@ void ElasticProblem::assemble_system () update_q_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; - const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; + const unsigned int n_q_points = quadrature_formula[0].size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); diff --git a/tests/integrators/cochain_01.cc b/tests/integrators/cochain_01.cc index c217acda52..fc5ce290a1 100644 --- a/tests/integrators/cochain_01.cc +++ b/tests/integrators/cochain_01.cc @@ -148,8 +148,10 @@ test_cochain(const Triangulation& tr, const FiniteElement& fe) MeshWorker::IntegrationInfoBox info_box; UpdateFlags update_flags = update_values | update_gradients; - info_box.add_update_flags(update_flags, true, true, true, true); + info_box.add_update_flags_cell(update_flags); info_box.initialize(fe, mapping, &dof.block_info()); + if (debugging) + deallog << "Infobox ready" << std::endl; MeshWorker::DoFInfo dof_info(dof.block_info()); @@ -166,7 +168,8 @@ test_cochain(const Triangulation& tr, const FiniteElement& fe) for (unsigned int i=0;i source(dof.block_info().global()); BlockVector result1(dof.block_info().global()); @@ -195,7 +198,10 @@ test_cochain(const Triangulation& tr, const FiniteElement& fe) matrices.matrix(m+2).vmult(result1.block(d+1), source.block(d)); - solver.solve(matrices.matrix(m+3), aux.block(d+1), result1.block(d+1), PreconditionIdentity()); + PreconditionSSOR > precondition; + precondition.initialize(matrices.matrix(m+3), 1.2); + + solver.solve(matrices.matrix(m+3), aux.block(d+1), result1.block(d+1), precondition); matrices.matrix(m+2).Tvmult(result1.block(d), aux.block(d+1)); matrices.matrix(m+1).vmult(result2.block(d), source.block(d)); @@ -289,6 +295,7 @@ int main() const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output"); std::ofstream logfile(logname.c_str()); deallog.attach(logfile); + deallog.log_execution_time(true); if (!debugging) { deallog.depth_console(0); diff --git a/tests/integrators/cochain_01/cmp/generic b/tests/integrators/cochain_01/cmp/generic index 58aefa2e74..9e3b07d615 100644 --- a/tests/integrators/cochain_01/cmp/generic +++ b/tests/integrators/cochain_01/cmp/generic @@ -1,91 +1,113 @@ -DEAL:d2-p0::Setup -DEAL:d2-p0::Triangulation hypercube 2D refinement 1 steps 4 active cells 5 total cells -DEAL:d2-p0::Form 0 -DEAL:d2-p0::Difference d*d 0 -DEAL:d2-p0::Form 1 -DEAL:d2-p0::d^2 0 -DEAL:d2-p0::d*d^2 0 -DEAL:d2-p0::Difference d*d 0 -DEAL:d2-p0::Triangulation hypercube 2D refinement 2 local steps 7 active cells 9 total cells -DEAL:d2-p0::Form 0 -DEAL:d2-p0::Difference d*d 0 -DEAL:d2-p0::Form 1 -DEAL:d2-p0::d^2 0 -DEAL:d2-p0::d*d^2 0 -DEAL:d2-p0::Difference d*d 0 -DEAL:d2-p0::Triangulation hypercube 2D refinement 3 local steps 25 active cells 33 total cells -DEAL:d2-p0::Form 0 -DEAL:d2-p0::Difference d*d 0 -DEAL:d2-p0::Form 1 -DEAL:d2-p0::d^2 0 -DEAL:d2-p0::d*d^2 0 -DEAL:d2-p0::Difference d*d 0 -DEAL:d2-p1::Setup -DEAL:d2-p1::Triangulation hypercube 2D refinement 1 steps 4 active cells 5 total cells -DEAL:d2-p1::Form 0 -DEAL:d2-p1::Difference d*d 0 -DEAL:d2-p1::Form 1 -DEAL:d2-p1::d^2 0 -DEAL:d2-p1::d*d^2 0 -DEAL:d2-p1::Difference d*d 0 -DEAL:d2-p1::Triangulation hypercube 2D refinement 2 local steps 7 active cells 9 total cells -DEAL:d2-p1::Form 0 -DEAL:d2-p1::Difference d*d 0 -DEAL:d2-p1::Form 1 -DEAL:d2-p1::d^2 0 -DEAL:d2-p1::d*d^2 0 -DEAL:d2-p1::Difference d*d 0 -DEAL:d2-p1::Triangulation hypercube 2D refinement 3 local steps 25 active cells 33 total cells -DEAL:d2-p1::Form 0 -DEAL:d2-p1::Difference d*d 0 -DEAL:d2-p1::Form 1 -DEAL:d2-p1::d^2 0 -DEAL:d2-p1::d*d^2 0 -DEAL:d2-p1::Difference d*d 0 -DEAL:d2-p2::Setup -DEAL:d2-p2::Triangulation hypercube 2D refinement 1 steps 4 active cells 5 total cells -DEAL:d2-p2::Form 0 -DEAL:d2-p2::Difference d*d 0 -DEAL:d2-p2::Form 1 -DEAL:d2-p2::d^2 0 -DEAL:d2-p2::d*d^2 0 -DEAL:d2-p2::Difference d*d 0 -DEAL:d2-p2::Triangulation hypercube 2D refinement 2 local steps 7 active cells 9 total cells -DEAL:d2-p2::Form 0 -DEAL:d2-p2::Difference d*d 0 -DEAL:d2-p2::Form 1 -DEAL:d2-p2::d^2 0 -DEAL:d2-p2::d*d^2 0 -DEAL:d2-p2::Difference d*d 0 -DEAL:d2-p2::Triangulation hypercube 2D refinement 3 local steps 25 active cells 33 total cells -DEAL:d2-p2::Form 0 -DEAL:d2-p2::Difference d*d 0 -DEAL:d2-p2::Form 1 -DEAL:d2-p2::d^2 0 -DEAL:d2-p2::d*d^2 0 -DEAL:d2-p2::Difference d*d 0 -DEAL:d3-p0::Setup -DEAL:d3-p0::Triangulation hypercube 3D refinement 1 steps 8 active cells 9 total cells -DEAL:d3-p0::Form 0 -DEAL:d3-p0::Difference d*d 0 -DEAL:d3-p0::Form 1 -DEAL:d3-p0::d^2 0 -DEAL:d3-p0::d*d^2 0 -DEAL:d3-p0::Difference d*d 0 -DEAL:d3-p0::Form 2 -DEAL:d3-p0::d^2 0 -DEAL:d3-p0::d*d^2 0 -DEAL:d3-p0::Difference d*d 0 -DEAL:d3-p1::Setup -DEAL:d3-p1::Triangulation hypercube 3D refinement 1 steps 8 active cells 9 total cells -DEAL:d3-p1::Form 0 -DEAL:d3-p1::Difference d*d 0 -DEAL:d3-p1::Form 1 -DEAL:d3-p1::d^2 0 -DEAL:d3-p1::d*d^2 0 -DEAL:d3-p1::Difference d*d 0 -DEAL:d3-p1::Form 2 -DEAL:d3-p1::d^2 0 -DEAL:d3-p1::d*d^2 0 -DEAL:d3-p1::Difference d*d 0 +0.0200000:DEAL:d2-p0::Setup +0.0600000:DEAL:d2-p0::Triangulation hypercube 2D refinement 1 steps 4 active cells 5 total cells +0.460000:DEAL:d2-p0::Form 0 +0.480000:DEAL:d2-p0::Difference d*d 0 +0.480000:DEAL:d2-p0::Form 1 +0.480000:DEAL:d2-p0::d^2 0 +0.480000:DEAL:d2-p0::d*d^2 0 +0.480000:DEAL:d2-p0::Difference d*d 0 +0.480000:DEAL:d2-p0::Triangulation hypercube 2D refinement 2 local steps 7 active cells 9 total cells +0.940000:DEAL:d2-p0::Form 0 +0.940000:DEAL:d2-p0::Difference d*d 0 +0.940000:DEAL:d2-p0::Form 1 +0.940000:DEAL:d2-p0::d^2 0 +0.940000:DEAL:d2-p0::d*d^2 0 +0.950000:DEAL:d2-p0::Difference d*d 0 +0.950000:DEAL:d2-p0::Triangulation hypercube 2D refinement 3 local steps 25 active cells 33 total cells +1.37000:DEAL:d2-p0::Form 0 +1.41000:DEAL:d2-p0::Difference d*d 0 +1.41000:DEAL:d2-p0::Form 1 +1.41000:DEAL:d2-p0::d^2 0 +1.41000:DEAL:d2-p0::d*d^2 0 +1.41000:DEAL:d2-p0::Difference d*d 0 +1.41000:DEAL:d2-p1::Setup +1.49000:DEAL:d2-p1::Triangulation hypercube 2D refinement 1 steps 4 active cells 5 total cells +1.95000:DEAL:d2-p1::Form 0 +1.95000:DEAL:d2-p1::Difference d*d 0 +1.95000:DEAL:d2-p1::Form 1 +1.95000:DEAL:d2-p1::d^2 0 +1.95000:DEAL:d2-p1::d*d^2 0 +1.95000:DEAL:d2-p1::Difference d*d 0 +1.95000:DEAL:d2-p1::Triangulation hypercube 2D refinement 2 local steps 7 active cells 9 total cells +2.46000:DEAL:d2-p1::Form 0 +2.48000:DEAL:d2-p1::Difference d*d 0 +2.49000:DEAL:d2-p1::Form 1 +2.49000:DEAL:d2-p1::d^2 0 +2.49000:DEAL:d2-p1::d*d^2 0 +2.49000:DEAL:d2-p1::Difference d*d 0 +2.50000:DEAL:d2-p1::Triangulation hypercube 2D refinement 3 local steps 25 active cells 33 total cells +3.07000:DEAL:d2-p1::Form 0 +3.12000:DEAL:d2-p1::Difference d*d 0 +3.12000:DEAL:d2-p1::Form 1 +3.12000:DEAL:d2-p1::d^2 0 +3.12000:DEAL:d2-p1::d*d^2 0 +3.12000:DEAL:d2-p1::Difference d*d 0 +3.12000:DEAL:d2-p2::Setup +3.36000:DEAL:d2-p2::Triangulation hypercube 2D refinement 1 steps 4 active cells 5 total cells +4.30000:DEAL:d2-p2::Form 0 +4.30000:DEAL:d2-p2::Difference d*d 0 +4.31000:DEAL:d2-p2::Form 1 +4.31000:DEAL:d2-p2::d^2 0 +4.31000:DEAL:d2-p2::d*d^2 0 +4.31000:DEAL:d2-p2::Difference d*d 0 +4.31000:DEAL:d2-p2::Triangulation hypercube 2D refinement 2 local steps 7 active cells 9 total cells +5.27000:DEAL:d2-p2::Form 0 +5.29000:DEAL:d2-p2::Difference d*d 0 +5.29000:DEAL:d2-p2::Form 1 +5.29000:DEAL:d2-p2::d^2 0 +5.29000:DEAL:d2-p2::d*d^2 0 +5.32000:DEAL:d2-p2::Difference d*d 0 +5.32000:DEAL:d2-p2::Triangulation hypercube 2D refinement 3 local steps 25 active cells 33 total cells +6.77000:DEAL:d2-p2::Form 0 +6.90000:DEAL:d2-p2::Difference d*d 0 +6.90000:DEAL:d2-p2::Form 1 +6.90000:DEAL:d2-p2::d^2 0 +6.91000:DEAL:d2-p2::d*d^2 0 +6.95000:DEAL:d2-p2::Difference d*d 0 +6.95000:DEAL:d3-p0::Setup +7.06000:DEAL:d3-p0::Triangulation hypercube 3D refinement 1 steps 8 active cells 9 total cells +8.44000:DEAL:d3-p0::Form 0 +8.44000:DEAL:d3-p0::Difference d*d 0 +8.44000:DEAL:d3-p0::Form 1 +8.45000:DEAL:d3-p0::d^2 0 +8.45000:DEAL:d3-p0::d*d^2 0 +8.46000:DEAL:d3-p0::Difference d*d 0 +8.46000:DEAL:d3-p0::Form 2 +8.46000:DEAL:d3-p0::d^2 0 +8.46000:DEAL:d3-p0::d*d^2 0 +8.46000:DEAL:d3-p0::Difference d*d 0 +8.47000:DEAL:d3-p0::Triangulation hypercube 3D refinement 2 local steps 15 active cells 17 total cells +9.94000:DEAL:d3-p0::Form 0 +9.98000:DEAL:d3-p0::Difference d*d 0 +9.98000:DEAL:d3-p0::Form 1 +9.98000:DEAL:d3-p0::d^2 0 +9.98000:DEAL:d3-p0::d*d^2 0 +9.99000:DEAL:d3-p0::Difference d*d 0 +9.99000:DEAL:d3-p0::Form 2 +9.99000:DEAL:d3-p0::d^2 0 +9.99000:DEAL:d3-p0::d*d^2 0 +9.99000:DEAL:d3-p0::Difference d*d 0 +9.99000:DEAL:d3-p1::Setup +16.8400:DEAL:d3-p1::Triangulation hypercube 3D refinement 1 steps 8 active cells 9 total cells +29.4100:DEAL:d3-p1::Form 0 +29.5100:DEAL:d3-p1::Difference d*d 0 +29.5100:DEAL:d3-p1::Form 1 +29.5100:DEAL:d3-p1::d^2 0 +29.5100:DEAL:d3-p1::d*d^2 0 +29.5500:DEAL:d3-p1::Difference d*d 0 +29.5500:DEAL:d3-p1::Form 2 +29.5500:DEAL:d3-p1::d^2 0 +29.5500:DEAL:d3-p1::d*d^2 0 +29.5500:DEAL:d3-p1::Difference d*d 0 +29.5700:DEAL:d3-p1::Triangulation hypercube 3D refinement 2 local steps 15 active cells 17 total cells +47.7600:DEAL:d3-p1::Form 0 +48.3300:DEAL:d3-p1::Difference d*d 0 +48.3300:DEAL:d3-p1::Form 1 +48.3300:DEAL:d3-p1::d^2 0 +48.3300:DEAL:d3-p1::d*d^2 0 +48.4100:DEAL:d3-p1::Difference d*d 0 +48.4100:DEAL:d3-p1::Form 2 +48.4100:DEAL:d3-p1::d^2 0 +48.4200:DEAL:d3-p1::d*d^2 0 +48.4200:DEAL:d3-p1::Difference d*d 0 diff --git a/tests/umfpack/umfpack_04.cc b/tests/umfpack/umfpack_04.cc index 098c8f3c29..2f986def67 100644 --- a/tests/umfpack/umfpack_04.cc +++ b/tests/umfpack/umfpack_04.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -49,7 +49,7 @@ void assemble_laplace (MATRIX &B, VECTOR &bb, DoFHandler &dof_handler, Fini update_values | update_gradients | 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);