Skip to content

Commit

Permalink
Merge pull request #15037 from marcfehling/make-2-cells
Browse files Browse the repository at this point in the history 
Replace make_2_cells() with TestGrids::hyper_line().
  • Loading branch information
@drwells
drwells committed Apr 7, 2023
2 parents e7afc19 + 0df9c95 commit 0ed9f79
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 320 deletions.
33 changes: 3 additions & 30 deletions tests/feinterface/fe_interface_values_01.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <deal.II/fe/fe_interface_values.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -31,6 +30,8 @@

#include "../tests.h"

#include "../test_grids.h"


template <int dim>
void
Expand Down Expand Up @@ -67,41 +68,13 @@ inspect_fiv(FEInterfaceValues<dim> &fiv)
}


template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}


template <int dim>
void
test()
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

DoFHandler<dim> dofh(tria);
FE_DGQ<dim> fe(1);
Expand Down
31 changes: 2 additions & 29 deletions tests/feinterface/fe_interface_values_02.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <deal.II/fe/fe_interface_values.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -32,41 +31,15 @@

#include "../tests.h"

template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}
#include "../test_grids.h"


template <int dim>
void
test(unsigned int fe_degree)
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

DoFHandler<dim> dofh(tria);
FE_DGQ<dim> fe(fe_degree);
Expand Down
32 changes: 3 additions & 29 deletions tests/feinterface/fe_interface_values_03.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <deal.II/fe/fe_interface_values.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -32,41 +31,16 @@

#include "../tests.h"

template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}
#include "../test_grids.h"


template <int dim>
void
test(unsigned int fe_degree)
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

tria.begin()->set_refine_flag();
tria.execute_coarsening_and_refinement();

Expand Down
33 changes: 3 additions & 30 deletions tests/feinterface/fe_interface_values_05.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <deal.II/fe/fe_q.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -31,6 +30,8 @@

#include "../tests.h"

#include "../test_grids.h"


template <int dim>
void
Expand Down Expand Up @@ -67,41 +68,13 @@ inspect_fiv(FEInterfaceValues<dim> &fiv)
}


template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}


template <int dim>
void
test()
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

DoFHandler<dim> dofh(tria);
FE_Q<dim> fe(1);
Expand Down
32 changes: 3 additions & 29 deletions tests/feinterface/fe_interface_values_06.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <deal.II/fe/fe_q.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -33,41 +32,16 @@

#include "../tests.h"

template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}
#include "../test_grids.h"


template <int dim>
void
test(unsigned int fe_degree)
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

tria.begin()->set_refine_flag();
tria.execute_coarsening_and_refinement();

Expand Down
31 changes: 2 additions & 29 deletions tests/feinterface/fe_interface_values_07.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <deal.II/fe/fe_q.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -33,41 +32,15 @@

#include "../tests.h"

template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}
#include "../test_grids.h"


template <int dim>
void
test(unsigned int fe_degree)
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

DoFHandler<dim> dofh(tria);
FE_Q<dim> fe(fe_degree);
Expand Down
31 changes: 2 additions & 29 deletions tests/feinterface/fe_interface_values_08.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <deal.II/fe/fe_q.h>
#include <deal.II/fe/mapping_q.h>

#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_refinement.h>
#include <deal.II/grid/tria.h>

Expand All @@ -33,41 +32,15 @@

#include "../tests.h"

template <int dim>
void
make_2_cells(Triangulation<dim> &tria);

template <>
void
make_2_cells<2>(Triangulation<2> &tria)
{
const unsigned int dim = 2;
std::vector<unsigned int> repetitions = {2, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}

template <>
void
make_2_cells<3>(Triangulation<3> &tria)
{
const unsigned int dim = 3;
std::vector<unsigned int> repetitions = {2, 1, 1};
Point<dim> p1;
Point<dim> p2(2.0, 1.0, 1.0);

GridGenerator::subdivided_hyper_rectangle(tria, repetitions, p1, p2);
}
#include "../test_grids.h"


template <int dim>
void
test(const FiniteElement<dim> &fe)
{
Triangulation<dim> tria;
make_2_cells(tria);
TestGrids::hyper_line(tria, 2);

DoFHandler<dim> dofh(tria);
deallog << fe.get_name() << std::endl;
Expand Down

0 comments on commit 0ed9f79

Please sign in to comment.