-
Notifications
You must be signed in to change notification settings - Fork 707
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13678 from bangerth/ref-cell
Add ReferenceCell::volume() and ::barycenter().
- Loading branch information
Showing
6 changed files
with
338 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
New: There are now functions ReferenceCell::volume() and | ||
ReferenceCells::barycenter() that compute what their names suggest for | ||
the various kinds of reference cells deal.II supports. | ||
<br> | ||
(Wolfgang Bangerth, 2022/05/04) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
// --------------------------------------------------------------------- | ||
// | ||
// Copyright (C) 2020 - 2021 by the deal.II authors | ||
// | ||
// This file is part of the deal.II library. | ||
// | ||
// The deal.II library is free software; you can use it, redistribute | ||
// it, and/or modify it under the terms of the GNU Lesser General | ||
// Public License as published by the Free Software Foundation; either | ||
// version 2.1 of the License, or (at your option) any later version. | ||
// The full text of the license can be found in the file LICENSE.md at | ||
// the top level directory of deal.II. | ||
// | ||
// --------------------------------------------------------------------- | ||
|
||
|
||
// Test ReferenceCell::volume() | ||
|
||
#include <deal.II/base/quadrature_lib.h> | ||
|
||
#include <deal.II/fe/fe_nothing.h> | ||
#include <deal.II/fe/fe_values.h> | ||
|
||
#include <deal.II/grid/grid_generator.h> | ||
#include <deal.II/grid/tria.h> | ||
|
||
#include "../tests.h" | ||
|
||
using namespace dealii; | ||
|
||
template <int dim> | ||
void | ||
test(const ReferenceCell &reference_cell) | ||
{ | ||
Triangulation<dim> triangulation; | ||
GridGenerator::reference_cell(triangulation, reference_cell); | ||
|
||
std::unique_ptr<Quadrature<dim>> q; | ||
if (reference_cell == ReferenceCells::Line) | ||
q = std::make_unique<QGauss<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Triangle) | ||
q = std::make_unique<QGaussSimplex<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Quadrilateral) | ||
q = std::make_unique<QGauss<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Tetrahedron) | ||
q = std::make_unique<QGaussSimplex<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Wedge) | ||
q = std::make_unique<QGaussWedge<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Pyramid) | ||
q = std::make_unique<QGaussPyramid<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Hexahedron) | ||
q = std::make_unique<QGauss<dim>>(2); | ||
|
||
FE_Nothing<dim> fe(reference_cell); | ||
|
||
// Set up the objects to compute an integral on the reference cell | ||
FEValues<dim> fe_values(fe, *q, update_JxW_values); | ||
fe_values.reinit(triangulation.begin_active()); | ||
|
||
double volume = 0; | ||
for (unsigned int i = 0; i < q->size(); ++i) | ||
volume += fe_values.JxW(i); | ||
|
||
deallog << "ReferenceCell: " << reference_cell.to_string() << std::endl; | ||
deallog << " computed volume = " << volume << std::endl; | ||
deallog << " self-reported volume = " << reference_cell.volume() | ||
<< std::endl; | ||
|
||
Assert(std::fabs(volume - reference_cell.volume()) < 1e-12, | ||
ExcInternalError()); | ||
} | ||
|
||
int | ||
main() | ||
{ | ||
initlog(); | ||
|
||
{ | ||
deallog.push("1D"); | ||
test<1>(ReferenceCells::Line); | ||
deallog.pop(); | ||
} | ||
|
||
{ | ||
deallog.push("2D"); | ||
test<2>(ReferenceCells::Quadrilateral); | ||
test<2>(ReferenceCells::Triangle); | ||
deallog.pop(); | ||
} | ||
|
||
{ | ||
deallog.push("3D"); | ||
test<3>(ReferenceCells::Tetrahedron); | ||
test<3>(ReferenceCells::Pyramid); | ||
test<3>(ReferenceCells::Wedge); | ||
test<3>(ReferenceCells::Hexahedron); | ||
deallog.pop(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
|
||
DEAL:1D::ReferenceCell: Line | ||
DEAL:1D:: computed volume = 1.00000 | ||
DEAL:1D:: self-reported volume = 1.00000 | ||
DEAL:2D::ReferenceCell: Quad | ||
DEAL:2D:: computed volume = 1.00000 | ||
DEAL:2D:: self-reported volume = 1.00000 | ||
DEAL:2D::ReferenceCell: Tri | ||
DEAL:2D:: computed volume = 0.500000 | ||
DEAL:2D:: self-reported volume = 0.500000 | ||
DEAL:3D::ReferenceCell: Tet | ||
DEAL:3D:: computed volume = 0.166667 | ||
DEAL:3D:: self-reported volume = 0.166667 | ||
DEAL:3D::ReferenceCell: Pyramid | ||
DEAL:3D:: computed volume = 1.33333 | ||
DEAL:3D:: self-reported volume = 1.33333 | ||
DEAL:3D::ReferenceCell: Wedge | ||
DEAL:3D:: computed volume = 0.500000 | ||
DEAL:3D:: self-reported volume = 0.500000 | ||
DEAL:3D::ReferenceCell: Hex | ||
DEAL:3D:: computed volume = 1.00000 | ||
DEAL:3D:: self-reported volume = 1.00000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
// --------------------------------------------------------------------- | ||
// | ||
// Copyright (C) 2020 - 2021 by the deal.II authors | ||
// | ||
// This file is part of the deal.II library. | ||
// | ||
// The deal.II library is free software; you can use it, redistribute | ||
// it, and/or modify it under the terms of the GNU Lesser General | ||
// Public License as published by the Free Software Foundation; either | ||
// version 2.1 of the License, or (at your option) any later version. | ||
// The full text of the license can be found in the file LICENSE.md at | ||
// the top level directory of deal.II. | ||
// | ||
// --------------------------------------------------------------------- | ||
|
||
|
||
// Test ReferenceCell::barycenter() | ||
|
||
#include <deal.II/base/quadrature_lib.h> | ||
|
||
#include <deal.II/fe/fe_nothing.h> | ||
#include <deal.II/fe/fe_values.h> | ||
|
||
#include <deal.II/grid/grid_generator.h> | ||
#include <deal.II/grid/tria.h> | ||
|
||
#include "../tests.h" | ||
|
||
using namespace dealii; | ||
|
||
template <int dim> | ||
void | ||
test(const ReferenceCell &reference_cell) | ||
{ | ||
Triangulation<dim> triangulation; | ||
GridGenerator::reference_cell(triangulation, reference_cell); | ||
|
||
std::unique_ptr<Quadrature<dim>> q; | ||
if (reference_cell == ReferenceCells::Line) | ||
q = std::make_unique<QGauss<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Triangle) | ||
q = std::make_unique<QGaussSimplex<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Quadrilateral) | ||
q = std::make_unique<QGauss<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Tetrahedron) | ||
q = std::make_unique<QGaussSimplex<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Wedge) | ||
q = std::make_unique<QGaussWedge<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Pyramid) | ||
q = std::make_unique<QGaussPyramid<dim>>(2); | ||
else if (reference_cell == ReferenceCells::Hexahedron) | ||
q = std::make_unique<QGauss<dim>>(2); | ||
|
||
FE_Nothing<dim> fe(reference_cell); | ||
|
||
// Set up the objects to compute an integral on the reference cell | ||
FEValues<dim> fe_values(fe, *q, update_JxW_values | update_quadrature_points); | ||
fe_values.reinit(triangulation.begin_active()); | ||
|
||
double volume = 0; | ||
Point<dim> barycenter; | ||
for (unsigned int i = 0; i < q->size(); ++i) | ||
{ | ||
volume += fe_values.JxW(i); | ||
barycenter += fe_values.quadrature_point(i) * fe_values.JxW(i); | ||
} | ||
barycenter /= volume; | ||
|
||
deallog << "ReferenceCell: " << reference_cell.to_string() << std::endl; | ||
deallog << " computed barycenter = " << barycenter << std::endl; | ||
deallog << " self-reported barycenter = " << reference_cell.barycenter<dim>() | ||
<< std::endl; | ||
|
||
Assert((barycenter - reference_cell.barycenter<dim>()).norm() <= 1e-12, | ||
ExcInternalError()); | ||
} | ||
|
||
int | ||
main() | ||
{ | ||
initlog(); | ||
|
||
{ | ||
deallog.push("1D"); | ||
test<1>(ReferenceCells::Line); | ||
deallog.pop(); | ||
} | ||
|
||
{ | ||
deallog.push("2D"); | ||
test<2>(ReferenceCells::Quadrilateral); | ||
test<2>(ReferenceCells::Triangle); | ||
deallog.pop(); | ||
} | ||
|
||
{ | ||
deallog.push("3D"); | ||
test<3>(ReferenceCells::Tetrahedron); | ||
test<3>(ReferenceCells::Pyramid); | ||
test<3>(ReferenceCells::Wedge); | ||
test<3>(ReferenceCells::Hexahedron); | ||
deallog.pop(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
|
||
DEAL:1D::ReferenceCell: Line | ||
DEAL:1D:: computed barycenter = 0.500000 | ||
DEAL:1D:: self-reported barycenter = 0.500000 | ||
DEAL:2D::ReferenceCell: Quad | ||
DEAL:2D:: computed barycenter = 0.500000 0.500000 | ||
DEAL:2D:: self-reported barycenter = 0.500000 0.500000 | ||
DEAL:2D::ReferenceCell: Tri | ||
DEAL:2D:: computed barycenter = 0.333333 0.333333 | ||
DEAL:2D:: self-reported barycenter = 0.333333 0.333333 | ||
DEAL:3D::ReferenceCell: Tet | ||
DEAL:3D:: computed barycenter = 0.250000 0.250000 0.250000 | ||
DEAL:3D:: self-reported barycenter = 0.250000 0.250000 0.250000 | ||
DEAL:3D::ReferenceCell: Pyramid | ||
DEAL:3D:: computed barycenter = 0 0 0.250000 | ||
DEAL:3D:: self-reported barycenter = 0.00000 0.00000 0.250000 | ||
DEAL:3D::ReferenceCell: Wedge | ||
DEAL:3D:: computed barycenter = 0.333333 0.333333 0.500000 | ||
DEAL:3D:: self-reported barycenter = 0.333333 0.333333 0.500000 | ||
DEAL:3D::ReferenceCell: Hex | ||
DEAL:3D:: computed barycenter = 0.500000 0.500000 0.500000 | ||
DEAL:3D:: self-reported barycenter = 0.500000 0.500000 0.500000 |