From: bangerth Date: Sat, 18 Sep 2010 21:49:58 +0000 (+0000) Subject: Further replacements of QGaussN -> QGauss(N). X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c60e983f6981a4d32a87e3c26bb93744d09df310;p=dealii-svn.git Further replacements of QGaussN -> QGauss(N). git-svn-id: https://svn.dealii.org/trunk@22039 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/base/quadrature_selector.cc b/tests/base/quadrature_selector.cc index acf83bc1c0..c2b84d5e00 100644 --- a/tests/base/quadrature_selector.cc +++ b/tests/base/quadrature_selector.cc @@ -45,12 +45,12 @@ int main() deallog.depth_console(0); deallog.threshold_double(1.e-10); - check ("gauss", 2, QGauss2<1>()); - check ("gauss", 2, QGauss2<2>()); - check ("gauss", 2, QGauss2<3>()); + check ("gauss", 2, QGauss<1>(2)); + check ("gauss", 2, QGauss<2>(2)); + check ("gauss", 2, QGauss<3>(2)); - check ("gauss", 2, QGauss2<3>()); - check ("gauss", 6, QGauss6<3>()); + check ("gauss", 2, QGauss<3>(2)); + check ("gauss", 6, QGauss<3>(6)); check ("gauss", 10, QGauss<3>(10)); check ("weddle", 0, QWeddle<2>()); diff --git a/tests/benchmarks/spec2006-447.dealII.cc b/tests/benchmarks/spec2006-447.dealII.cc index 356196828e..61615da850 100644 --- a/tests/benchmarks/spec2006-447.dealII.cc +++ b/tests/benchmarks/spec2006-447.dealII.cc @@ -1141,7 +1141,7 @@ namespace LaplaceSolver { Vector estimated_error_per_cell (this->triangulation->n_active_cells()); KellyErrorEstimator::estimate (this->dof_handler, - QGauss3(), + QGauss(3), typename FunctionMap::type(), this->solution, estimated_error_per_cell); @@ -2926,7 +2926,7 @@ namespace LaplaceSolver { MappingQ mapping(4); KellyErrorEstimator::estimate (mapping, primal_solver.dof_handler, - QGauss3(), + QGauss(3), typename FunctionMap::type(), primal_solver.solution, error_indicators); diff --git a/tests/bits/mesh_3d_12.cc b/tests/bits/mesh_3d_12.cc index fbf9a8aeeb..38eb111134 100644 --- a/tests/bits/mesh_3d_12.cc +++ b/tests/bits/mesh_3d_12.cc @@ -54,7 +54,7 @@ void check_this (Triangulation<3> &tria) u); KellyErrorEstimator<3>::estimate (dof_handler, - QGauss2<2>(), + QGauss<2>(2), FunctionMap<3>::type(), u, e); diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 713c220a2c..4f183ff433 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -427,7 +427,7 @@ void project (const Mapping &mapping, const Function &function, Vector &vec, const bool enforce_zero_boundary = false, - const Quadrature & = QGauss2(), + const Quadrature & = QGauss(2), const bool project_to_boundary_first = false) { Assert (dof.get_fe().n_components() == function.n_components, diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc index c210f775a4..d1504a62a5 100644 --- a/tests/hp/matrices.cc +++ b/tests/hp/matrices.cc @@ -70,7 +70,7 @@ check_boundary (const hp::DoFHandler &dof, function_map[0] = &coefficient; hp::QCollection face_quadrature; - face_quadrature.push_back (QGauss6()); + face_quadrature.push_back (QGauss(6)); std::vector dof_to_boundary_mapping; DoFTools::map_dof_to_boundary_indices (dof, @@ -150,7 +150,7 @@ check () mapping.push_back (MappingQ(3)); hp::QCollection quadrature; - quadrature.push_back (QGauss6()); + quadrature.push_back (QGauss(6)); // create sparsity pattern. note // that different components should