cell != triangulation.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->face(f)->center()[dim-1] == 0)
- cell->face(f)->set_all_boundary_indicators(1);
+ cell->face(f)->set_all_boundary_ids(1);
// We then apply an initial refinement
cell != triangulation.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->face(f)->center()[dim-1] == 0)
- cell->face(f)->set_all_boundary_indicators(1);
+ cell->face(f)->set_all_boundary_ids(1);
// We then apply an initial refinement
std::vector<bool> fixed_dofs (dof_handler.n_dofs());
- std::set<types::boundary_id> boundary_indicators;
- boundary_indicators.insert (0);
+ std::set<types::boundary_id> boundary_ids;
+ boundary_ids.insert (0);
// get a list of those boundary DoFs which
// we want to be fixed:
DoFTools::extract_boundary_dofs (dof_handler,
component_mask,
fixed_dofs,
- boundary_indicators);
+ boundary_ids);
// (Primitive) Check if the DoFs
// where adjusted correctly (note
bc_component_select[2] = false;
std::vector<bool> ned_boundary_dofs (dof_handler.n_dofs());
- std::set<types::boundary_id> boundary_indicators;
- boundary_indicators.insert (0);
+ std::set<types::boundary_id> boundary_ids;
+ boundary_ids.insert (0);
DoFTools::extract_boundary_dofs (dof_handler,
bc_component_select,
ned_boundary_dofs,
- boundary_indicators);
+ boundary_ids);
for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
// (the pressure is assumed to be set to 1
// on the boundary)
std::vector<bool> p_boundary_dofs (dof_handler.n_dofs());
- std::set<types::boundary_id> boundary_indicators;
- boundary_indicators.insert (0);
+ std::set<types::boundary_id> boundary_ids;
+ boundary_ids.insert (0);
DoFTools::extract_boundary_dofs (dof_handler,
bc_component_select,
p_boundary_dofs,
- boundary_indicators);
+ boundary_ids);
for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
{
// error: pressure boundary DoF
face!=tria.end_face(); ++face)
{
deallog << face << " "
- << (int)face->boundary_indicator() << " "
+ << (int)face->boundary_id() << " "
<< '<' << face->vertex(0) << '>' << std::endl
<< " <" << face->vertex(1) << '>' << std::endl
<< " <" << face->vertex(2) << '>' << std::endl
// set bottom face to use MyBoundary
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1)
- coarse_grid.begin_active()->face(f)->set_boundary_indicator (1);
+ coarse_grid.begin_active()->face(f)->set_boundary_id (1);
coarse_grid.set_boundary (1, my_boundary);
// now try to refine this one
// set bottom face to use MyBoundary
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1)
- coarse_grid.begin_active()->face(f)->set_boundary_indicator (1);
+ coarse_grid.begin_active()->face(f)->set_boundary_id (1);
coarse_grid.set_boundary (1, my_boundary);
// now try to refine this one
// set bottom face to use MyBoundary
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1)
- coarse_grid.begin_active()->face(f)->set_boundary_indicator (1);
+ coarse_grid.begin_active()->face(f)->set_boundary_id (1);
coarse_grid.set_boundary (1, my_boundary);
// now try to refine this one
if (coarse_grid.begin_active()->face(f)->line(e)->center()[0] == 0)
if (coarse_grid.begin_active()->face(f)->line(e)->center()[1] == 0.5)
if (coarse_grid.begin_active()->face(f)->line(e)->center()[2] == 0)
- coarse_grid.begin_active()->face(f)->line(e)->set_boundary_indicator (99);
+ coarse_grid.begin_active()->face(f)->line(e)->set_boundary_id (99);
coarse_grid.set_boundary (99, my_boundary);
// now try to refine this one
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
triangulation.refine_global(0);
}
if (cell_2->face(j)->center()(2) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
triangulation.refine_global(0);
}
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
}
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
}
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
}
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
cell_2->set_refine_flag();
triangulation.execute_coarsening_and_refinement();
if (cell_2->face(j)->center()(2) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
cell_2->set_refine_flag();
triangulation.execute_coarsening_and_refinement();
set_boundary_ids (Triangulation<dim> &tria)
{
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
- tria.begin_active()->face(f)->set_boundary_indicator (f);
+ tria.begin_active()->face(f)->set_boundary_id (f);
}
#include <deal.II/grid/tria.h>
#include <deal.II/grid/grid_generator.h>
-// Check if Triangulation<1>::get_boundary_indicators() works for 1d grids.
+// Check if Triangulation<1>::get_boundary_ids() works for 1d grids.
int main ()
Triangulation<1> triangulation;
GridGenerator::hyper_cube (triangulation, -1, 1);
- const std::vector<types::boundary_id> indicators = triangulation.get_boundary_indicators();
+ const std::vector<types::boundary_id> indicators = triangulation.get_boundary_ids();
for (unsigned int i=0; i<indicators.size(); ++i)
deallog << int (indicators[i]) << std::endl;
face!=tria.end_face(); ++face)
{
deallog << face << " "
- << (int)face->boundary_indicator() << " "
+ << (int)face->boundary_id() << " "
<< face->vertex_index(0)
<< " <" << face->vertex(0) << '>'
<< std::endl
deallog<< "Constructing the grid..." <<std::endl;
const Point<2> p1(0,0), p2(1,1);
GridGenerator::hyper_rectangle(triangulation,p1,p2);
- triangulation.begin_active()->face(2)->set_boundary_indicator(1);
- triangulation.begin_active()->face(3)->set_boundary_indicator(1);
- triangulation.begin_active()->face(0)->set_boundary_indicator(0);
- triangulation.begin_active()->face(1)->set_boundary_indicator(2);
+ triangulation.begin_active()->face(2)->set_boundary_id(1);
+ triangulation.begin_active()->face(3)->set_boundary_id(1);
+ triangulation.begin_active()->face(0)->set_boundary_id(0);
+ triangulation.begin_active()->face(1)->set_boundary_id(2);
triangulation.refine_global(1);
Triangulation<2>::active_cell_iterator cell = triangulation.begin_active();
for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
if (cell->face(face)->at_boundary()
&&
- (cell->face(face)->boundary_indicator() == 1))
+ (cell->face(face)->boundary_id() == 1))
{
x_fe_face_values.reinit (cell, face);
const FEFaceValues<dim> &fe_face_values
if ((cell->face(face)->center()(0) == -1)
||
(cell->face(face)->center()(1) == -1))
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
else
refine_grid ();
if (cell->face(face)->at_boundary()
&&
- (cell->face(face)->boundary_indicator() == 1))
+ (cell->face(face)->boundary_id() == 1))
{
const double neumann_value =
- scratch.exact_solution.gradient (quadrature_point) * normal
if (cell->face(face)->at_boundary())
for (unsigned int d=0; d<dim; ++d)
if ((std::fabs(cell->face(face)->center()(d) - (1)) < 1e-12))
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
if (cell->face(face)->at_boundary()
&&
- (cell->face(face)->boundary_indicator() == 1))
+ (cell->face(face)->boundary_id() == 1))
{
const double neumann_value =
- scratch.exact_solution.gradient (quadrature_point) * normal
if (cell->face(face)->at_boundary())
for (unsigned int d=0; d<dim; ++d)
if ((std::fabs(cell->face(face)->center()(d) - (1)) < 1e-12))
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
if (cell->face(face)->at_boundary()
&&
- (cell->face(face)->boundary_indicator() == 1))
+ (cell->face(face)->boundary_id() == 1))
{
x_fe_face_values.reinit (cell, face);
const FEFaceValues<dim> &fe_face_values
if ((cell->face(face)->center()(0) == -1)
||
(cell->face(face)->center()(1) == -1))
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
else
refine_grid ();
// for surfaces, we need some sort of mapping also for interior cells
// and faces, but at the time of writing this, we can only set
-// boundary_indicators of faces and edges that are truly at the
+// boundary_ids of faces and edges that are truly at the
// boundary of the domain. to work around this, we use the material_id
// field that one can set on cells, and copy it also to the adjacent
// faces. initially, however, we also copied the material_id to the
-// boundary_indicator of adjacent faces that truly were at the
+// boundary_id of adjacent faces that truly were at the
// boundary of the domain, and which might have had something
// purposefully set already
//
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f))
{
- cell->face(f)->set_boundary_indicator(1);
+ cell->face(f)->set_boundary_id(1);
done = true;
break;
}
// now extract a mesh of the 5
// surface faces
- std::set<types::boundary_id> boundary_indicators;
- boundary_indicators.insert (0);
+ std::set<types::boundary_id> boundary_ids;
+ boundary_ids.insert (0);
GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh,
- boundary_indicators);
+ boundary_ids);
deallog << volume_mesh.n_active_cells () << std::endl;
deallog << boundary_mesh.n_active_cells () << std::endl;
cell != boundary_mesh.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim-1>::faces_per_cell; ++f)
if (cell->at_boundary(f))
- cell->face(f)->set_boundary_indicator(1);
+ cell->face(f)->set_boundary_id(1);
boundary_mesh.refine_global (2);
Triangulation<dim> volume_mesh;
GridGenerator::hyper_cube(volume_mesh);
- volume_mesh.begin_active()->face(0)->set_boundary_indicator(1);
+ volume_mesh.begin_active()->face(0)->set_boundary_id(1);
volume_mesh.refine_global (1);
save_mesh(volume_mesh);
Triangulation<dim> volume_mesh;
GridGenerator::hyper_cube(volume_mesh);
- volume_mesh.begin_active()->face(0)->set_boundary_indicator(1);
+ volume_mesh.begin_active()->face(0)->set_boundary_id(1);
volume_mesh.refine_global (1);
save_mesh(volume_mesh);
Triangulation<dim> volume_mesh;
GridGenerator::hyper_cube(volume_mesh);
- volume_mesh.begin_active()->face(0)->set_boundary_indicator(1);
+ volume_mesh.begin_active()->face(0)->set_boundary_id(1);
volume_mesh.refine_global (1);
save_mesh(volume_mesh);
cell != volume_mesh.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f))
- cell->face(f)->set_all_boundary_indicators (1);
+ cell->face(f)->set_all_boundary_ids (1);
volume_mesh.set_boundary (1, boundary_description);
volume_mesh.refine_global (1);
cell != volume_mesh.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f) && (cell->center()[dim-1]>0))
- cell->face(f)->set_all_boundary_indicators (1);
+ cell->face(f)->set_all_boundary_ids (1);
volume_mesh.set_boundary (1, boundary_description);
volume_mesh.set_boundary (0, boundary_description);
Triangulation<spacedim>::active_cell_iterator
cell = volume_mesh.begin_active();
- cell->face(0)->set_all_boundary_indicators (1);
+ cell->face(0)->set_all_boundary_ids (1);
std::set<types::boundary_id> boundary_ids;
boundary_ids.insert(0);
GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
Triangulation<spacedim>::active_cell_iterator
cell = volume_mesh.begin_active();
- cell->face(0)->set_all_boundary_indicators (1);
+ cell->face(0)->set_all_boundary_ids (1);
std::set<types::boundary_id> boundary_ids;
boundary_ids.insert(0);
GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
Triangulation<spacedim>::active_cell_iterator
cell = volume_mesh.begin_active();
- cell->face(0)->set_all_boundary_indicators (1);
+ cell->face(0)->set_all_boundary_ids (1);
std::set<types::boundary_id> boundary_ids;
boundary_ids.insert(0);
GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f) &&
- (cell->face(f)->boundary_indicator() == boundary_id))
+ (cell->face(f)->boundary_id() == boundary_id))
for (unsigned int v=0; v<GeometryInfo<dim>::vertices_per_face; ++v)
for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
{
cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f) &&
- (cell->face(f)->boundary_indicator() == boundary_id))
+ (cell->face(f)->boundary_id() == boundary_id))
for (unsigned int v=0; v<GeometryInfo<dim>::vertices_per_face; ++v)
for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
{
cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f) &&
- (cell->face(f)->boundary_indicator() == boundary_id))
+ (cell->face(f)->boundary_id() == boundary_id))
for (unsigned int v=0; v<GeometryInfo<dim>::vertices_per_face; ++v)
for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
{
cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f) &&
- (cell->face(f)->boundary_indicator() == boundary_id))
+ (cell->face(f)->boundary_id() == boundary_id))
for (unsigned int v=0; v<GeometryInfo<dim>::vertices_per_face; ++v)
for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
{
{
Triangulation<dim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin()->face(0)->set_boundary_indicator(1);
+ tria.begin()->face(0)->set_boundary_id(1);
tria.refine_global(1);
tria.begin_active()->set_refine_flag();
tria.execute_coarsening_and_refinement();
{
Triangulation<dim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin()->face(0)->set_boundary_indicator(1);
+ tria.begin()->face(0)->set_boundary_id(1);
tria.refine_global(1);
tria.begin_active()->set_refine_flag();
tria.execute_coarsening_and_refinement();
// id was invented after the above was
// written, so we are not very strict
// here with using these flags
- && (line->boundary_indicator() == 1))
+ && (line->boundary_id() == 1))
return middle;
{
if (dim==3)
{
- tria->begin_active()->face(4)->set_boundary_indicator(1);
- tria->begin_active()->face(5)->set_boundary_indicator(1);
+ tria->begin_active()->face(4)->set_boundary_id(1);
+ tria->begin_active()->face(5)->set_boundary_id(1);
};
// set the boundary function
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (c->face(f)->at_boundary())
for (unsigned int e=0; e<GeometryInfo<dim>::lines_per_face; ++e)
- c->face(f)->line(e)->set_boundary_indicator(0);
+ c->face(f)->line(e)->set_boundary_id(0);
static const HyperShellBoundary<dim> boundary(center);
tria.set_boundary(0, boundary);
cell != tria.end(); ++cell)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->at_boundary(f))
- deallog << cell->face(f) << ' ' << (int)cell->face(f)->boundary_indicator()
+ deallog << cell->face(f) << ' ' << (int)cell->face(f)->boundary_id()
<< ' ' << cell->face(f)->center().norm() << std::endl;
}
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (cell->face(f)->at_boundary())
for (unsigned int l=0; l<GeometryInfo<dim>::lines_per_face; ++l)
- AssertThrow (cell->face(f)->line(l)->boundary_indicator()
+ AssertThrow (cell->face(f)->line(l)->boundary_id()
==
- cell->face(f)->boundary_indicator(),
+ cell->face(f)->boundary_id(),
ExcInternalError());
deallog << "OK" << std::endl;
{
Triangulation<dim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin_active()->line(0)->set_boundary_indicator(1);
- tria.begin_active()->face(2*dim-1)->set_boundary_indicator(2);
+ tria.begin_active()->line(0)->set_boundary_id(1);
+ tria.begin_active()->face(2*dim-1)->set_boundary_id(2);
GridOut grid_out;
GridOutFlags::Ucd flags;
{
Triangulation<dim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin_active()->line(0)->set_boundary_indicator(1);
- tria.begin_active()->face(2*dim-1)->set_boundary_indicator(2);
+ tria.begin_active()->line(0)->set_boundary_id(1);
+ tria.begin_active()->face(2*dim-1)->set_boundary_id(2);
GridOut grid_out;
GridOutFlags::Msh flags;
{
Triangulation<dim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin_active()->line(0)->set_boundary_indicator(1);
- tria.begin_active()->face(2*dim-1)->set_boundary_indicator(2);
+ tria.begin_active()->line(0)->set_boundary_id(1);
+ tria.begin_active()->face(2*dim-1)->set_boundary_id(2);
GridOut grid_out;
GridOutFlags::Ucd flags;
// id was invented after the above was
// written, so we are not very strict
// here with using these flags
- && (line->boundary_indicator() == 1))
+ && (line->boundary_id() == 1))
return middle;
{
if (dim==3)
{
- tria.begin_active()->face(4)->set_boundary_indicator(1);
- tria.begin_active()->face(5)->set_boundary_indicator(1);
+ tria.begin_active()->face(4)->set_boundary_id(1);
+ tria.begin_active()->face(5)->set_boundary_id(1);
};
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(42);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(42);
triangulation.refine_global(1);
}
if (cell_2->face(j)->center()(2) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(42);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(42);
triangulation.refine_global(1);
}
if (cell_2->face(j)->center()(1) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
triangulation.refine_global(1);
}
if (cell_2->face(j)->center()(2) < -2.9)
face_2 = cell_2->face(j);
}
- face_1->set_boundary_indicator(42);
- face_2->set_boundary_indicator(43);
+ face_1->set_boundary_id(42);
+ face_2->set_boundary_id(43);
triangulation.refine_global(1);
}
// circle.
new_points.insert(std::pair<types::global_dof_index, Point<dim> > (
face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center));
- face->set_boundary_indicator(1);
+ face->set_boundary_id(1);
}
else
Assert(false, ExcInternalError());
// circle.
new_points.insert(std::pair<types::global_dof_index, Point<dim> > (
face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center));
- face->set_boundary_indicator(1);
+ face->set_boundary_id(1);
}
else
Assert(false, ExcInternalError());
std::vector<bool> fixed_dofs (dof_handler.n_dofs());
- std::set<types::boundary_id> boundary_indicators;
- boundary_indicators.insert (0);
+ std::set<types::boundary_id> boundary_ids;
+ boundary_ids.insert (0);
// get a list of those boundary DoFs which
// we want to be fixed:
DoFTools::extract_boundary_dofs (dof_handler,
component_mask,
fixed_dofs,
- boundary_indicators);
+ boundary_ids);
// (Primitive) Check if the DoFs
// where adjusted correctly (note
DoFHandler<dim> dof_handler(triangulation);
GridGenerator::hyper_cube (triangulation, 0, 1);
- triangulation.begin_active()->face(0)->set_boundary_indicator(10);
- triangulation.begin_active()->face(1)->set_boundary_indicator(20);
+ triangulation.begin_active()->face(0)->set_boundary_id(10);
+ triangulation.begin_active()->face(1)->set_boundary_id(20);
triangulation.refine_global (1);
dof_handler.distribute_dofs (fe);
(cell->face(f)->center()[2] != 7)
&&
(cell->face(f)->at_boundary()))
- cell->face(f)->set_boundary_indicator (1);
+ cell->face(f)->set_boundary_id (1);
triangulation.refine_global (1);
for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
{
if (cell->face(face)->at_boundary())
- boundary_count[cell->face(face)->boundary_indicator()]++;
+ boundary_count[cell->face(face)->boundary_id()]++;
}
}
++face)
{
if (cell->face(face)->at_boundary())
- boundary_count[cell->face(face)->boundary_indicator()]++;
+ boundary_count[cell->face(face)->boundary_id()]++;
}
}
deallog << " boundary indicators: ";
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
double radius = cell->face(f)->center().norm() - center.norm();
if (std::fabs(cell->face(f)->center()(2) - sqrt(3.)*cell->face(f)->center()(0)) < eps ) // z = sqrt(3)x set boundary 2
{
- cell->face(f)->set_boundary_indicator(2);
+ cell->face(f)->set_boundary_id(2);
for (unsigned int j=0; j<GeometryInfo<3>::lines_per_face; ++j)
if (cell->face(f)->line(j)->at_boundary())
if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps)
- cell->face(f)->line(j)->set_boundary_indicator(2);
+ cell->face(f)->line(j)->set_boundary_id(2);
}
else if (std::fabs(cell->face(f)->center()(2) + sqrt(3.)*cell->face(f)->center()(0)) < eps) // z = -sqrt(3)x set boundary 3
{
- cell->face(f)->set_boundary_indicator(3);
+ cell->face(f)->set_boundary_id(3);
for (unsigned int j=0; j<GeometryInfo<3>::lines_per_face; ++j)
if (cell->face(f)->line(j)->at_boundary())
if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps)
- cell->face(f)->line(j)->set_boundary_indicator(3);
+ cell->face(f)->line(j)->set_boundary_id(3);
}
else if (std::fabs(cell->face(f)->center()(2) - sqrt(3.)*cell->face(f)->center()(1)) < eps ) // z = sqrt(3)y set boundary 4
{
- cell->face(f)->set_boundary_indicator(4);
+ cell->face(f)->set_boundary_id(4);
for (unsigned int j=0; j<GeometryInfo<3>::lines_per_face; ++j)
if (cell->face(f)->line(j)->at_boundary())
if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps)
- cell->face(f)->line(j)->set_boundary_indicator(4);
+ cell->face(f)->line(j)->set_boundary_id(4);
}
else if (std::fabs(cell->face(f)->center()(2) + sqrt(3.)*cell->face(f)->center()(1)) < eps ) // z = -sqrt(3)y set boundary 5
{
- cell->face(f)->set_boundary_indicator(5);
+ cell->face(f)->set_boundary_id(5);
for (unsigned int j=0; j<GeometryInfo<3>::lines_per_face; ++j)
if (cell->face(f)->line(j)->at_boundary())
if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps)
- cell->face(f)->line(j)->set_boundary_indicator(5);
+ cell->face(f)->line(j)->set_boundary_id(5);
}
else if (radius < middle) // inner radius set boundary 0
{
- cell->face(f)->set_boundary_indicator(0);
+ cell->face(f)->set_boundary_id(0);
for (unsigned int j=0; j<GeometryInfo<3>::lines_per_face; ++j)
if (cell->face(f)->line(j)->at_boundary())
if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) < eps)
- cell->face(f)->line(j)->set_boundary_indicator(0);
+ cell->face(f)->line(j)->set_boundary_id(0);
}
else if (radius > middle) // outer radius set boundary 1
{
- cell->face(f)->set_boundary_indicator(1);
+ cell->face(f)->set_boundary_id(1);
for (unsigned int j=0; j<GeometryInfo<3>::lines_per_face; ++j)
if (cell->face(f)->line(j)->at_boundary())
if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) < eps)
- cell->face(f)->line(j)->set_boundary_indicator(1);
+ cell->face(f)->line(j)->set_boundary_id(1);
}
else
AssertThrow (false, ExcInternalError());
for (unsigned int f=0; f<6; ++f)
deallog << "Face=" << f << ", boundary_id="
- << (int)triangulation.begin_active()->face(f)->boundary_indicator() << std::endl;
+ << (int)triangulation.begin_active()->face(f)->boundary_id() << std::endl;
std::set<unsigned char> no_normal_flux_boundaries;
no_normal_flux_boundaries.insert (0);
if ( (std::fabs(cell->face(face)->center()(0)) < 0.1)
&& (std::fabs(cell->face(face)->center()(dim-1)) < 1e-12) )
{
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
if ( (std::fabs(cell->face(face)->center()(0)) < 1e-12)
&& (std::fabs(cell->face(face)->center()(dim-1)) < 0.1) )
{
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
if ( (std::fabs(1.0-cell->face(face)->center()(0)) < 0.1)
&& (std::fabs(1.0-cell->face(face)->center()(dim-1)) < 1e-12) )
{
- cell->face(face)->set_boundary_indicator (2);
+ cell->face(face)->set_boundary_id (2);
}
if ( (std::fabs(1.0-cell->face(face)->center()(0)) < 1e-12)
&& (std::fabs(1.0-cell->face(face)->center()(dim-1)) < 0.1) )
{
- cell->face(face)->set_boundary_indicator (2);
+ cell->face(face)->set_boundary_id (2);
}
// no normal flux boundary
if ( (std::fabs(cell->face(face)->center()(0)) >= 0.1 && std::fabs(cell->face(face)->center()(0)) <= 1.0)
&& (std::fabs(cell->face(face)->center()(dim-1)) < 1e-12) )
{
- cell->face(face)->set_boundary_indicator (3);
+ cell->face(face)->set_boundary_id (3);
}
if ( (std::fabs(cell->face(face)->center()(0)) >= 0.0 && std::fabs(cell->face(face)->center()(0)) <= 0.9)
&& (std::fabs(1.0-cell->face(face)->center()(dim-1)) < 1e-12) )
{
- cell->face(face)->set_boundary_indicator (5);
+ cell->face(face)->set_boundary_id (5);
}
if ( (std::fabs(1.0-cell->face(face)->center()(0)) < 1e-12)
&& (std::fabs(cell->face(face)->center()(dim-1)) >= 0.0 && std::fabs(cell->face(face)->center()(dim-1)) <= 0.9) )
{
- cell->face(face)->set_boundary_indicator (4);
+ cell->face(face)->set_boundary_id (4);
}
if ( (std::fabs(cell->face(face)->center()(0)) < 1e-12)
&& (std::fabs(cell->face(face)->center()(dim-1)) >= 0.1 && std::fabs(cell->face(face)->center()(dim-1)) <= 1.0) )
{
- cell->face(face)->set_boundary_indicator (6);
+ cell->face(face)->set_boundary_id (6);
}
}
}
{\r
Triangulation<dim> triangulation;\r
GridGenerator::hyper_cube (triangulation,-1.0,1.0);\r
- triangulation.begin_active()->face(1)->set_all_boundary_indicators(1);\r
+ triangulation.begin_active()->face(1)->set_all_boundary_ids(1);\r
\r
FE_Q<dim> fe(1);\r
DoFHandler<dim> dof_handler(triangulation);\r
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube(tr);
for (unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i)
- tr.begin_active()->face(i)->set_boundary_indicator (i);
+ tr.begin_active()->face(i)->set_boundary_id (i);
tr.refine_global(2);
GridGenerator::hyper_cube (tria);
deallog << "Coarse mesh:" << std::endl;
- deallog << "Left vertex=" << (int)tria.begin_active()->face(0)->boundary_indicator() << std::endl;
- deallog << "Right vertex=" << (int)tria.begin_active()->face(1)->boundary_indicator() << std::endl;
+ deallog << "Left vertex=" << (int)tria.begin_active()->face(0)->boundary_id() << std::endl;
+ deallog << "Right vertex=" << (int)tria.begin_active()->face(1)->boundary_id() << std::endl;
tria.refine_global (2);
cell != tria.end(); ++cell)
{
deallog << "Cell: " << cell << std::endl;
- deallog << "Left vertex=" << (int)cell->face(0)->boundary_indicator() << std::endl;
- deallog << "Right vertex=" << (int)cell->face(1)->boundary_indicator() << std::endl;
+ deallog << "Left vertex=" << (int)cell->face(0)->boundary_id() << std::endl;
+ deallog << "Right vertex=" << (int)cell->face(1)->boundary_id() << std::endl;
}
}
// verify that we can do things like cell->face() in 1d as well. here:
-// Triangulation::get_boundary_indicators()
+// Triangulation::get_boundary_ids()
#include "../tests.h"
tria.refine_global (2);
std::vector<types::boundary_id>
- boundary_ids = tria.get_boundary_indicators ();
+ boundary_ids = tria.get_boundary_ids ();
for (unsigned int i=0; i<boundary_ids.size(); ++i)
deallog << (int)boundary_ids[i] << std::endl;
// verify that we can do things like cell->face() in 1d as well. here:
-// Triangulation::get_boundary_indicators() should return an empty vector when
+// Triangulation::get_boundary_ids() should return an empty vector when
// called to create a mesh that is a loop
GridGenerator::extract_boundary_mesh (volume_mesh, tria);
deallog << "n_cells = " << tria.n_active_cells() << std::endl;
- deallog << "n_boundary_ids = " << tria.get_boundary_indicators ().size()
+ deallog << "n_boundary_ids = " << tria.get_boundary_ids ().size()
<< std::endl;
}
Triangulation<1,spacedim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin_active()->face(0)->set_boundary_indicator(2);
- tria.begin_active()->face(1)->set_boundary_indicator(4);
+ tria.begin_active()->face(0)->set_boundary_id(2);
+ tria.begin_active()->face(1)->set_boundary_id(4);
std::vector<types::boundary_id>
- boundary_ids = tria.get_boundary_indicators ();
+ boundary_ids = tria.get_boundary_ids ();
for (unsigned int i=0; i<boundary_ids.size(); ++i)
deallog << (int)boundary_ids[i] << std::endl;
Triangulation<1,spacedim> tria;
GridGenerator::hyper_cube (tria);
- tria.begin_active()->face(0)->set_boundary_indicator(2);
- tria.begin_active()->face(1)->set_boundary_indicator(4);
+ tria.begin_active()->face(0)->set_boundary_id(2);
+ tria.begin_active()->face(1)->set_boundary_id(4);
- deallog << (int)tria.begin_active()->face(0)->boundary_indicator() << std::endl;
- deallog << (int)tria.begin_active()->face(1)->boundary_indicator() << std::endl;
+ deallog << (int)tria.begin_active()->face(0)->boundary_id() << std::endl;
+ deallog << (int)tria.begin_active()->face(1)->boundary_id() << std::endl;
}
(cell->face(f)->center()[2] != 7)
&&
(cell->face(f)->at_boundary()))
- cell->face(f)->set_boundary_indicator (1);
+ cell->face(f)->set_boundary_id (1);
triangulation.refine_global (1);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
// set boundary id on cell 1
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (tr.begin_active()->at_boundary(f))
- tr.begin_active()->face(f)->set_boundary_indicator (1);
+ tr.begin_active()->face(f)->set_boundary_id (1);
test(tr);
}
v3(1) = 3.;
tria->set_boundary(1,*boundary1);
tria->set_boundary(2,*boundary2);
- tria->begin_active()->face(1)->set_boundary_indicator(1);
- tria->begin_active()->face(3)->set_boundary_indicator(2);
+ tria->begin_active()->face(1)->set_boundary_id(1);
+ tria->begin_active()->face(3)->set_boundary_id(2);
double pi=std::acos(-1.);
double alpha=2*std::atan(0.5);
exact_areas.push_back(4+pi-2.5*(alpha-std::sin(alpha)));
v3(0) = 0.5;
v3(1) = 1.5;
tria->set_boundary(1,*boundary1);
- tria->begin_active()->face(1)->set_boundary_indicator(1);
+ tria->begin_active()->face(1)->set_boundary_id(1);
exact_areas.push_back(0.);
for (unsigned int i=0; i<=4; ++i)
show[4][i]=1;
tria_ptr.push_back(tria);
GridGenerator::hyper_cube(*tria, 1., 3.);
tria->set_boundary(1,*boundary1);
- tria->begin_active()->face(1)->set_boundary_indicator(1);
+ tria->begin_active()->face(1)->set_boundary_id(1);
exact_areas.push_back(8.+pi/3*h*h*(3*r-h));
}
// set the boundary indicator for
// one face of the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+ triangulation.begin_active()->face(0)->set_boundary_id (1);
const unsigned int n_points = 5;
// set the boundary indicator for
// one face of the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+ triangulation.begin_active()->face(0)->set_boundary_id (1);
const unsigned int n_points = 5;
std::vector< Point<dim> > unit_points(Utilities::fixed_power<dim>(n_points));
// set the boundary indicator for
// one face of the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+ triangulation.begin_active()->face(0)->set_boundary_id (1);
const unsigned int n_points = 5;
std::vector< Point<dim> > unit_points(Utilities::fixed_power<dim>(n_points));
// one face and adjacent edges of
// the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(5)->set_all_boundary_indicators (1);
+ triangulation.begin_active()->face(5)->set_all_boundary_ids (1);
// now try to find the coordinates
// of the following point in the
// one face and adjacent edges of
// the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(5)->set_all_boundary_indicators (1);
+ triangulation.begin_active()->face(5)->set_all_boundary_ids (1);
// now try to find the coordinates
// of the following point in the
// one face and adjacent edges of
// the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(5)->set_all_boundary_indicators (1);
+ triangulation.begin_active()->face(5)->set_all_boundary_ids (1);
// now try to find the coordinates
// of the following point in the
// one face and adjacent edges of
// the single cell
triangulation.set_boundary (1, boundary);
- triangulation.begin_active()->face(5)->set_all_boundary_indicators (1);
+ triangulation.begin_active()->face(5)->set_all_boundary_ids (1);
// now see if the point is inside
// or outside
Vector<double> rhs_vector2(hp_dof_handler2.n_dofs());
types::boundary_id myints[1] = {0};
- std::set<types::boundary_id> boundary_indicators (myints,myints+1);
+ std::set<types::boundary_id> boundary_ids (myints,myints+1);
myints[0]=0;
hp::QCollection<1> quadrature;
quadrature.push_back (QGauss<1>(1));
quadrature,
rhs_function,
rhs_vector2,
- boundary_indicators);
+ boundary_ids);
Assert (std::fabs (std::accumulate (rhs_vector2.begin(),
rhs_vector2.end(), 0.)
- 4) < 1e-12,
quadrature,
rhs_function,
rhs_vector,
- boundary_indicators);
+ boundary_ids);
Assert (std::fabs (std::accumulate (rhs_vector.begin(),
rhs_vector.end(), 0.)
- 4) < 1e-12,
triangulationR.begin_active()->set_material_id(id_of_lagrange_mult);
for (unsigned int i=0;i<n_faces_per_cell;i++) {
- triangulationL.begin_active()->face(i)->set_boundary_indicator(i);
- triangulationR.begin_active()->face(i)->set_boundary_indicator(n_faces_per_cell+i);
+ triangulationL.begin_active()->face(i)->set_boundary_id(i);
+ triangulationR.begin_active()->face(i)->set_boundary_id(n_faces_per_cell+i);
}
GridGenerator::merge_triangulations (triangulationL, triangulationR, triangulation);
for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
if (cell->face(face)->at_boundary()
&&
- (cell->face(face)->boundary_indicator() == 1))
+ (cell->face(face)->boundary_id() == 1))
{
x_fe_face_values.reinit (cell, face);
const FEFaceValues<dim> &fe_face_values
if ((cell->face(face)->center()(0) == -1)
||
(cell->face(face)->center()(1) == -1))
- cell->face(face)->set_boundary_indicator (1);
+ cell->face(face)->set_boundary_id (1);
}
else
refine_grid ();
void AdvectionProblem<dim>::integrate_boundary_term (MeshWorker::DoFInfo<dim> &dinfo,
MeshWorker::IntegrationInfo<dim> &info)
{
- const unsigned int boundary_id = dinfo.face->boundary_indicator();
+ const unsigned int boundary_id = dinfo.face->boundary_id();
// We only have a non-zero boundary contribution at the
// x=0 boundary
if(cell->face(f)->at_boundary())
deallog << "face: " << cell->face(f)
<< ", boundary_id: "
- << (int)cell->face(f)->boundary_indicator()
+ << (int)cell->face(f)->boundary_id()
<< ", manifold_id: "
<< (int)cell->face(f)->manifold_id() << std::endl;
}
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
deallog << "face: " << cell->face(f)
<< ", boundary_id: "
- << (int)cell->face(f)->boundary_indicator()
+ << (int)cell->face(f)->boundary_id()
<< ", manifold_id: "
<< (int)cell->face(f)->manifold_id() << std::endl;
}
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
deallog << "face: " << cell->face(f)
<< ", boundary_id: "
- << (int)cell->face(f)->boundary_indicator()
+ << (int)cell->face(f)->boundary_id()
<< ", manifold_id: "
<< (int)cell->face(f)->manifold_id() << std::endl;
}
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
deallog << "face: " << cell->face(f)
<< ", boundary_id: "
- << (int)cell->face(f)->boundary_indicator()
+ << (int)cell->face(f)->boundary_id()
<< ", manifold_id: "
<< (int)cell->face(f)->manifold_id() << std::endl;
}
if (c1->face(f)->at_boundary())
{
- if (c1->face(f)->boundary_indicator() !=
- c2->face(f)->boundary_indicator())
+ if (c1->face(f)->boundary_id() !=
+ c2->face(f)->boundary_id())
return false;
}
else
for (; c1 != t1.end(); ++c1)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (c1->at_boundary(f))
- c1->face(f)->set_boundary_indicator (42);
+ c1->face(f)->set_boundary_id (42);
}
if (c1->face(f)->at_boundary())
{
- if (c1->face(f)->boundary_indicator() !=
- c2->face(f)->boundary_indicator())
+ if (c1->face(f)->boundary_id() !=
+ c2->face(f)->boundary_id())
return false;
}
else
for (; c1 != t1.end(); ++c1)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (c1->at_boundary(f)) {
- c1->face(f)->set_boundary_indicator (42);
+ c1->face(f)->set_boundary_id (42);
// c1->face(f)->set_manifold_id (43);
}
}
if (c1->face(f)->at_boundary())
{
- if (c1->face(f)->boundary_indicator() !=
- c2->face(f)->boundary_indicator())
+ if (c1->face(f)->boundary_id() !=
+ c2->face(f)->boundary_id())
return false;
}
else
for (; c1 != t1.end(); ++c1)
for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
if (c1->at_boundary(f))
- c1->face(f)->set_boundary_indicator (42);
+ c1->face(f)->set_boundary_id (42);
}