Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor updates to GridGenerator::hyper_cube_with_cylindrical_hole(). #15696

Merged
merged 3 commits into from
Jul 14, 2023
Merged

Minor updates to GridGenerator::hyper_cube_with_cylindrical_hole(). #15696

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
498c5eb
Minor updates to GridGenerator::hyper_cube_with_cylindrical_hole().
bangerth Jul 10, 2023
da85dbe
Make a function more robust.
bangerth Jul 10, 2023
47f9717
Avoid the use of GeometryInfo.
bangerth Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 40 additions & 42 deletions source/grid/grid_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7488,64 +7488,62 @@ namespace GridGenerator
Assert(L > 0, ExcMessage("Must give positive extension L"));
Assert(Nz >= 1, ExcLowerRange(1, Nz));

// Start with a cylinder shell with the correct inner and outer radius
// and as many layers as requested
cylinder_shell(triangulation, L, inner_radius, outer_radius, 8, Nz);
triangulation.set_all_manifold_ids(numbers::flat_manifold_id);

Triangulation<dim>::active_cell_iterator cell =
triangulation.begin_active(),
endc = triangulation.end();
// Then loop over all vertices that are at the boundary (by looping
// over all cells, their faces, and if the face is at the boundary,
// their vertices. If we haven't touched that vertex yet, see if
// we need to move it from its cylinder mantle position to the
// outer boundary of the box.
std::vector<bool> treated_vertices(triangulation.n_vertices(), false);
for (; cell != endc; ++cell)
for (const auto &cell : triangulation.active_cell_iterators())
{
for (auto f : GeometryInfo<dim>::face_indices())
for (const auto f : cell->face_indices())
if (cell->face(f)->at_boundary())
{
for (unsigned int v = 0; v < GeometryInfo<dim>::vertices_per_face;
++v)
for (const unsigned int v : cell->face(f)->vertex_indices())
{
unsigned int vv = cell->face(f)->vertex_index(v);
const unsigned int vv = cell->face(f)->vertex_index(v);
if (treated_vertices[vv] == false)
{
treated_vertices[vv] = true;
for (unsigned int i = 0; i <= Nz; ++i)
{
double d = i * L / Nz;
switch (vv - i * 16)
{
case 1:
cell->face(f)->vertex(v) =
Point<dim>(outer_radius, outer_radius, d);
break;
case 3:
cell->face(f)->vertex(v) =
Point<dim>(-outer_radius, outer_radius, d);
break;
case 5:
cell->face(f)->vertex(v) =
Point<dim>(-outer_radius, -outer_radius, d);
break;
case 7:
cell->face(f)->vertex(v) =
Point<dim>(outer_radius, -outer_radius, d);
break;
default:
break;
}
}

// The vertices we have to treat are the ones that
// have x=y or x=-y and are at the outer ring -- that is,
// they are on the diagonal in the x-y plane and radius
// equal to outer_radius. These need to be pulled out to
// the corner point of the square, i.e., their x and y
// coordinates need to be multiplied by sqrt(2),
// whereas the z coordinate remains unchanged:
const Point<dim> vertex_location =
cell->face(f)->vertex(v);
if ((std::fabs(std::fabs(vertex_location[0]) -
std::fabs(vertex_location[1])) <
1e-12 * outer_radius) &&
(std::fabs(vertex_location[0] * vertex_location[0] +
vertex_location[1] * vertex_location[1] -
outer_radius * outer_radius) <
1e-12 * outer_radius))
cell->face(f)->vertex(v) =
Point<3>(vertex_location[0] * std::sqrt(2.0),
vertex_location[1] * std::sqrt(2.0),
vertex_location[2]);
}
}
}
}
double eps = 1e-3 * outer_radius;
cell = triangulation.begin_active();
for (; cell != endc; ++cell)
for (const auto &cell : triangulation.active_cell_iterators())
{
for (auto f : GeometryInfo<dim>::face_indices())
for (const unsigned int f : cell->face_indices())
if (cell->face(f)->at_boundary())
{
double dx = cell->face(f)->center()(0);
double dy = cell->face(f)->center()(1);
double dz = cell->face(f)->center()(2);
const double dx = cell->face(f)->center()(0);
const double dy = cell->face(f)->center()(1);
const double dz = cell->face(f)->center()(2);

if (colorize)
{
Expand Down Expand Up @@ -7575,9 +7573,9 @@ namespace GridGenerator
}
else
{
Point<dim> c = cell->face(f)->center();
c(2) = 0;
double d = c.norm();
Point<dim> c = cell->face(f)->center();
c(2) = 0;
const double d = c.norm();
if (d - inner_radius < 0)
{
cell->face(f)->set_all_boundary_ids(1);
Expand Down