Skip to content

Commit

Permalink
Merge pull request #13220 from marcfehling/tee-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
masterleinad committed Jan 11, 2022
2 parents 3a7b5d8 + 8d93b80 commit 0ae88c3
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 11 deletions.
30 changes: 21 additions & 9 deletions include/deal.II/grid/grid_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -1079,9 +1079,13 @@ namespace GridGenerator
* <tr><td>
* <td>Point
* <td>Radius
* <tr><td>Openings
* <td>$(2,0,0)$<br>$(0,2,0)$<br>$(0,0,2)$
* <td>$1$<br>$1$<br>$1$
* <tr><td rowspan="3">Openings
* <td>$(2,0,0)$
* <td>$1$
* <tr><td>$(0,2,0)$
* <td>$1$
* <tr><td>$(0,0,2)$
* <td>$1$
* <tr><td>Bifurcation
* <td>$(0,0,0)$
* <td>$1$
Expand All @@ -1097,9 +1101,13 @@ namespace GridGenerator
* <tr><td>
* <td>Point
* <td>Radius
* <tr><td>Openings
* <td>$(-2,0,0)$<br>$(0,2,0)$<br>$(2,0,0)$
* <td>$1$<br>$1$<br>$1$
* <tr><td rowspan="3">Openings
* <td>$(-2,0,0)$
* <td>$1$
* <tr><td>$(0,2,0)$
* <td>$1$
* <tr><td>$(2,0,0)$
* <td>$1$
* <tr><td>Bifurcation
* <td>$(0,0,0)$
* <td>$1$
Expand All @@ -1115,9 +1123,13 @@ namespace GridGenerator
* <tr><td>
* <td>Point
* <td>Radius
* <tr><td>Openings
* <td>$(-2,0,0)$<br>$(1,\sqrt{3},1)$<br>$(1,-\sqrt{3},1)$
* <td>$1$<br>$1$<br>$1$
* <tr><td rowspan="3">Openings
* <td>$(-2,0,0)$
* <td>$1$
* <tr><td>$(1,\sqrt{3},1)$
* <td>$1$
* <tr><td>$(1,-\sqrt{3},1)$
* <td>$1$
* <tr><td>Bifurcation
* <td>$(0,0,0)$
* <td>$1$
Expand Down
10 changes: 8 additions & 2 deletions source/grid/grid_generator_pipe_junction.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ namespace GridGenerator



// hide the template specialization from doxygen
#ifndef DOXYGEN

template <>
void
pipe_junction(Triangulation<3, 3> & tria,
Expand All @@ -102,15 +105,15 @@ namespace GridGenerator
constexpr unsigned int n_pipes = 3;
constexpr double tolerance = 1.e-12;

#ifdef DEBUG
# ifdef DEBUG
// Verify user input.
Assert(bifurcation.second > 0,
ExcMessage("Invalid input: negative radius."));
Assert(openings.size() == n_pipes,
ExcMessage("Invalid input: only 3 openings allowed."));
for (const auto &opening : openings)
Assert(opening.second > 0, ExcMessage("Invalid input: negative radius."));
#endif
# endif

// Each pipe segment will be identified by the index of its opening in the
// parameter array. To determine the next and previous entry in the array
Expand Down Expand Up @@ -428,6 +431,9 @@ namespace GridGenerator
face->set_boundary_id(n_pipes);
}
}

#endif

} // namespace GridGenerator


Expand Down

0 comments on commit 0ae88c3

Please sign in to comment.