]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Further replacements of QGaussN -> QGauss(N).
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Sat, 18 Sep 2010 21:49:58 +0000 (21:49 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sat, 18 Sep 2010 21:49:58 +0000 (21:49 +0000)
git-svn-id: https://svn.dealii.org/trunk@22039 0785d39b-7218-0410-832d-ea1e28bc413d

tests/base/quadrature_selector.cc
tests/benchmarks/spec2006-447.dealII.cc
tests/bits/mesh_3d_12.cc
tests/fe/abf_01.cc
tests/hp/matrices.cc

index acf83bc1c0e72e7e3f2f6e7abd54cbe7cd999428..c2b84d5e00ec667c1ec0809238e5f30fdfc0aa22 100644 (file)
@@ -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>());
index 356196828eb1ebe8278a5ef631ea13a4ec506f42..61615da850e6bcecd299887d8addcc13b1b0e096 100644 (file)
@@ -1141,7 +1141,7 @@ namespace LaplaceSolver
   {
     Vector<float> estimated_error_per_cell (this->triangulation->n_active_cells());
     KellyErrorEstimator<dim>::estimate (this->dof_handler,
-                                       QGauss3<dim-1>(),
+                                       QGauss<dim-1>(3),
                                        typename FunctionMap<dim>::type(),
                                        this->solution,
                                        estimated_error_per_cell);
@@ -2926,7 +2926,7 @@ namespace LaplaceSolver
     {
       MappingQ<dim> mapping(4);
       KellyErrorEstimator<dim>::estimate (mapping, primal_solver.dof_handler,
-                                         QGauss3<dim-1>(),
+                                         QGauss<dim-1>(3),
                                          typename FunctionMap<dim>::type(),
                                          primal_solver.solution,
                                          error_indicators);
index fbf9a8aeebdfec0d52bc83b90cabce45e452d0d8..38eb1111347d603cd9fccf5ed243656d62ac65fe 100644 (file)
@@ -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);
index 713c220a2c8282dd670afe92e8818ebe2343e10d..4f183ff433ff76c69e5136ff43551b2a34e40546 100644 (file)
@@ -427,7 +427,7 @@ void project (const Mapping<dim>       &mapping,
              const Function<dim>      &function,
              Vector<double>           &vec,
              const bool                enforce_zero_boundary = false,
-             const Quadrature<dim-1>  & = QGauss2<dim-1>(),
+             const Quadrature<dim-1>  & = QGauss<dim-1>(2),
              const bool                project_to_boundary_first = false)
 {
   Assert (dof.get_fe().n_components() == function.n_components,
index c210f775a45f05739ae4b16c82fdfaf1ae538fa4..d1504a62a5193cf984f6e46d5e9c14d218578b07 100644 (file)
@@ -70,7 +70,7 @@ check_boundary (const hp::DoFHandler<dim> &dof,
   function_map[0] = &coefficient;
 
   hp::QCollection<dim-1> face_quadrature;
-  face_quadrature.push_back (QGauss6<dim-1>());
+  face_quadrature.push_back (QGauss<dim-1>(6));
   
   std::vector<unsigned int> dof_to_boundary_mapping;
   DoFTools::map_dof_to_boundary_indices (dof,
@@ -150,7 +150,7 @@ check ()
   mapping.push_back (MappingQ<dim>(3));
 
   hp::QCollection<dim> quadrature;
-  quadrature.push_back (QGauss6<dim>());
+  quadrature.push_back (QGauss<dim>(6));
 
                                   // create sparsity pattern. note
                                   // that different components should

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.