From b580482a8f108a03f66bb1d6934d15b19e8f7aa9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 14 Oct 2016 18:27:59 -0500 Subject: [PATCH] Add missing 'update_JxW_values' flags. These tests *do* use the JxW values, but they are not explicitly specified as necessary. Instead, some quirk of our internal machineries causes this flag to be set anyway, but it's better not to rely on this. --- tests/integrators/advection_01.cc | 8 ++++---- tests/integrators/divergence_01.cc | 14 +++++++------- tests/integrators/elasticity_01.cc | 8 ++++---- tests/integrators/elasticity_02.cc | 4 ++-- tests/integrators/grad_div_01.cc | 8 ++++---- tests/integrators/laplacian_01.cc | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/integrators/advection_01.cc b/tests/integrators/advection_01.cc index 400bba8bcf..f2a0c0e5cb 100644 --- a/tests/integrators/advection_01.cc +++ b/tests/integrators/advection_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -242,14 +242,14 @@ test_fe(Triangulation &tr, FiniteElement &fe) { deallog << fe.get_name() << std::endl << "cell matrix" << std::endl; QGauss quadrature(fe.tensor_degree()); - FEValues fev(fe, quadrature, update_values | update_gradients); + FEValues fev(fe, quadrature, update_values | update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell1 = tr.begin(1); fev.reinit(cell1); test_cell(fev); QGauss face_quadrature(fe.tensor_degree()+1); - FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); for (unsigned int i=0; i::faces_per_cell; ++i) { deallog << "boundary_matrix " << i << std::endl; @@ -257,7 +257,7 @@ test_fe(Triangulation &tr, FiniteElement &fe) test_boundary(fef1); } - FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); typename Triangulation::cell_iterator cell2 = cell1->neighbor(1); deallog << "face_matrix " << 0 << std::endl; diff --git a/tests/integrators/divergence_01.cc b/tests/integrators/divergence_01.cc index c1b53b8158..c70f606e45 100644 --- a/tests/integrators/divergence_01.cc +++ b/tests/integrators/divergence_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -218,8 +218,8 @@ test_fe(Triangulation &tr, FiniteElement &fv, FiniteElement &fs) { deallog << fv.get_name() << " x " << fs.get_name() << std::endl << "cell matrix" << std::endl; QGauss quadrature(fv.tensor_degree()+1); - FEValues fev(fv, quadrature, update_values | update_gradients); - FEValues fes(fs, quadrature, update_values | update_gradients); + FEValues fev(fv, quadrature, update_values | update_gradients | update_JxW_values); + FEValues fes(fs, quadrature, update_values | update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell1 = tr.begin(1); fev.reinit(cell1); @@ -227,8 +227,8 @@ test_fe(Triangulation &tr, FiniteElement &fv, FiniteElement &fs) test_cell(fev, fes); QGauss face_quadrature(fv.tensor_degree()+1); - FEFaceValues fev1(fv, face_quadrature, update_values | update_gradients | update_normal_vectors); - FEFaceValues fes1(fs, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fev1(fv, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); + FEFaceValues fes1(fs, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); for (unsigned int i=0; i::faces_per_cell; ++i) { deallog << "boundary_matrix " << i << std::endl; @@ -237,8 +237,8 @@ test_fe(Triangulation &tr, FiniteElement &fv, FiniteElement &fs) test_boundary(fev1, fes1); } - FEFaceValues fev2(fv, face_quadrature, update_values | update_gradients); - FEFaceValues fes2(fs, face_quadrature, update_values | update_gradients); + FEFaceValues fev2(fv, face_quadrature, update_values | update_gradients | update_JxW_values); + FEFaceValues fes2(fs, face_quadrature, update_values | update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell2 = cell1->neighbor(1); deallog << "face_matrix " << 0 << std::endl; diff --git a/tests/integrators/elasticity_01.cc b/tests/integrators/elasticity_01.cc index fb176c2971..ae4a496658 100644 --- a/tests/integrators/elasticity_01.cc +++ b/tests/integrators/elasticity_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -200,13 +200,13 @@ test_fe(Triangulation &tr, FiniteElement &fe) { deallog << fe.get_name() << std::endl << "cell matrix" << std::endl; QGauss quadrature(fe.tensor_degree()+1); - FEValues fev(fe, quadrature, update_gradients); + FEValues fev(fe, quadrature, update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell1 = tr.begin(1); fev.reinit(cell1); test_cell(fev); QGauss face_quadrature(fe.tensor_degree()+1); - FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); for (unsigned int i=0; i::faces_per_cell; ++i) { deallog << "boundary_matrix " << i << std::endl; @@ -214,7 +214,7 @@ test_fe(Triangulation &tr, FiniteElement &fe) test_boundary(fef1); } - FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients); + FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell2 = cell1->neighbor(1); deallog << "face_matrix " << 0 << std::endl; diff --git a/tests/integrators/elasticity_02.cc b/tests/integrators/elasticity_02.cc index ef9ba82f1c..40312214db 100644 --- a/tests/integrators/elasticity_02.cc +++ b/tests/integrators/elasticity_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -80,7 +80,7 @@ test_fe(Triangulation &tr, FiniteElement &fe) typename Triangulation::cell_iterator cell1 = tr.begin(1); QGauss face_quadrature(fe.tensor_degree()+1); - FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); for (unsigned int i=0; i::faces_per_cell; ++i) { deallog << "boundary_matrix " << i << std::endl; diff --git a/tests/integrators/grad_div_01.cc b/tests/integrators/grad_div_01.cc index 23773a42b1..a28a103c8c 100644 --- a/tests/integrators/grad_div_01.cc +++ b/tests/integrators/grad_div_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -200,13 +200,13 @@ test_fe(Triangulation &tr, FiniteElement &fe) { deallog << fe.get_name() << std::endl << "cell matrix" << std::endl; QGauss quadrature(fe.tensor_degree()+1); - FEValues fev(fe, quadrature, update_gradients); + FEValues fev(fe, quadrature, update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell1 = tr.begin(1); fev.reinit(cell1); test_cell(fev); QGauss face_quadrature(fe.tensor_degree()+1); - FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); for (unsigned int i=0; i::faces_per_cell; ++i) { deallog << "boundary_matrix " << i << std::endl; @@ -214,7 +214,7 @@ test_fe(Triangulation &tr, FiniteElement &fe) test_boundary(fef1); } - FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients); + FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell2 = cell1->neighbor(1); deallog << "face_matrix " << 0 << std::endl; diff --git a/tests/integrators/laplacian_01.cc b/tests/integrators/laplacian_01.cc index 65a272cc48..cc0cdec633 100644 --- a/tests/integrators/laplacian_01.cc +++ b/tests/integrators/laplacian_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -235,14 +235,14 @@ test_fe(Triangulation &tr, FiniteElement &fe) { deallog << fe.get_name() << std::endl << "cell matrix" << std::endl; QGauss quadrature(fe.tensor_degree()); - FEValues fev(fe, quadrature, update_gradients); + FEValues fev(fe, quadrature, update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell1 = tr.begin(1); fev.reinit(cell1); test_cell(fev); QGauss face_quadrature(fe.tensor_degree()+1); - FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors); + FEFaceValues fef1(fe, face_quadrature, update_values | update_gradients | update_normal_vectors | update_JxW_values); for (unsigned int i=0; i::faces_per_cell; ++i) { deallog << "boundary_matrix " << i << std::endl; @@ -250,7 +250,7 @@ test_fe(Triangulation &tr, FiniteElement &fe) test_boundary(fef1); } - FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients); + FEFaceValues fef2(fe, face_quadrature, update_values | update_gradients | update_JxW_values); typename Triangulation::cell_iterator cell2 = cell1->neighbor(1); deallog << "face_matrix " << 0 << std::endl; -- 2.39.5