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.

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

Standardize 2D/3D -> 2d/3d in a few strings. #14777

Merged
merged 2 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/step-81/step-81.cc
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ namespace Step81
{
public:
static_assert(dim == 2,
"The perfectly matched layer is only implemented in 2D.");
"The perfectly matched layer is only implemented in 2d.");

Parameters<dim> parameters;

Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/base/polynomials_rt_bubbles.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ DEAL_II_NAMESPACE_OPEN
* @image html rtbubbles.png
* </td></tr>
*
* <tr> <td align="center"> Left - $2D,\,k=3$,
* <tr> <td align="center"> Left - $2d,\,k=3$,
* right - $3D,\,k=2$.</td></tr> </table>
*
* @ingroup Polynomials
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/cgal/additional_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ namespace CGALWrappers
AssertThrow(
dim == 3,
ExcMessage(
"These struct can be instantiated with 3D Triangulations only."));
"These struct can be instantiated with 3d Triangulations only."));
edge_size = edge_s;
facet_angle = facet_a;
facet_size = facet_s;
Expand Down
4 changes: 2 additions & 2 deletions include/deal.II/cgal/utilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ namespace CGALWrappers
const Mapping<dim1, spacedim> &mapping1)
{
Assert(dim0 == 3 && dim1 == 3 && spacedim == 3,
ExcNotImplemented("2D geometries are not yet supported."));
ExcNotImplemented("2d geometries are not yet supported."));
if (dim1 > dim0)
{
return compute_quadrature_on_boolean_operation(
Expand Down Expand Up @@ -492,7 +492,7 @@ namespace CGALWrappers
const Mapping<dim1, spacedim> &mapping1)
{
Assert(dim0 == 3 && dim1 == 3 && spacedim == 3,
ExcNotImplemented("2D geometries are not yet supported."));
ExcNotImplemented("2d geometries are not yet supported."));
using K = CGAL::Exact_predicates_inexact_constructions_kernel;
using CGALPoint = CGAL::Point_3<K>;
using CGALTriangulation = CGAL::Triangulation_3<K>;
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/fe/fe_rt_bubbles.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ DEAL_II_NAMESPACE_OPEN
* @image html rtbubbles.png
* </td></tr>
*
* <tr> <td align="center"> Left - $2D,\,k=3$,
* <tr> <td align="center"> Left - $2d,\,k=3$,
* right - $3D,\,k=2$.</td></tr> </table>
*
* @todo Implement restriction matrices
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/lac/tensor_product_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class TensorProductMatrixSymmetricSum
*
* @warning This class accepts the following types:
* "std::array<Table<2, Number>, dim>", "std::array<FullMatrix<Number>, dim>",
* and "Table<2, Number>". In the latter case, we consider the same 1D
* and "Table<2, Number>". In the latter case, we consider the same 1d
* mass matrix @p mass_matrix and the same 1D derivative matrix
* @p derivative_matrix for each tensor direction.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace internal
static constexpr unsigned int max_n_points_1D = 40;

static_assert(structdim == 1 || structdim == 2,
"Only 1D and 2D interpolation implemented");
"Only 1D and 2d interpolation implemented");
Number temp[fe_degree != -1 ? fe_degree + 1 : max_n_points_1D];

const unsigned int points =
Expand Down
2 changes: 1 addition & 1 deletion include/deal.II/matrix_free/shape_info.templates.h
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ namespace internal
Assert(fe.n_dofs_per_cell() == 0 ||
std::abs(fe.shape_value(scalar_lexicographic[0], unit_point) -
1) < 1e-13,
ExcInternalError("Could not decode 1D shape functions for the "
ExcInternalError("Could not decode 1d shape functions for the "
"element " +
fe.get_name()));
}
Expand Down
6 changes: 3 additions & 3 deletions include/deal.II/numerics/vector_tools_boundary.templates.h
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ namespace VectorTools
// Sanity check:
const unsigned int n_associated_edge_dofs = associated_edge_dof_index;
Assert(n_associated_edge_dofs == degree + 1,
ExcMessage("Error: Unexpected number of 3D edge DoFs"));
ExcMessage("Error: Unexpected number of 3d edge DoFs"));

// Matrix and RHS vectors to store linear system:
// We have (degree+1) basis functions for an edge
Expand Down Expand Up @@ -1419,7 +1419,7 @@ namespace VectorTools
const unsigned int associated_edge_dofs =
associated_edge_dof_index;
Assert(associated_edge_dofs == degree + 1,
ExcMessage("Error: Unexpected number of 2D edge DoFs"));
ExcMessage("Error: Unexpected number of 2d edge DoFs"));

// Matrix and RHS vectors to store:
// We have (degree+1) edge basis functions
Expand Down Expand Up @@ -1659,7 +1659,7 @@ namespace VectorTools
const unsigned int associated_face_dofs =
associated_face_dof_index;
Assert(associated_face_dofs == 2 * degree * (degree + 1),
ExcMessage("Error: Unexpected number of 3D face DoFs"));
ExcMessage("Error: Unexpected number of 3d face DoFs"));

// Storage for the linear system.
// There are 2*degree*(degree+1) DoFs associated with a face in
Expand Down
2 changes: 1 addition & 1 deletion source/base/quadrature_lib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ QSimplex<dim>::mapped_quadrature(
const std::vector<std::array<Point<spacedim>, dim + 1>> &simplices) const
{
Assert(!(dim == 1 && spacedim == 1),
ExcMessage("This function is not supposed to work in 1D-1D case."));
ExcMessage("This function is not supposed to work in 1D-1d case."));
Assert(dim <= spacedim,
ExcMessage("Invalid combination of dim and spacedim ."));

Expand Down
4 changes: 2 additions & 2 deletions source/dofs/dof_tools_constraints.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2308,12 +2308,12 @@ namespace DoFTools
face_rotation == false),
ExcMessage("The supplied orientation "
"(face_orientation, face_flip, face_rotation) "
"is invalid for 1D"));
"is invalid for 1d"));

Assert((dim != 2) || (face_orientation == true && face_rotation == false),
ExcMessage("The supplied orientation "
"(face_orientation, face_flip, face_rotation) "
"is invalid for 2D"));
"is invalid for 2d"));

Assert(face_1 != face_2,
ExcMessage("face_1 and face_2 are equal! Cannot constrain DoFs "
Expand Down
2 changes: 1 addition & 1 deletion source/fe/fe_face.cc
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ FE_FaceQ<1, spacedim>::fill_fe_subface_values(
spacedim>
&) const
{
Assert(false, ExcMessage("There are no sub-face values to fill in 1D!"));
Assert(false, ExcMessage("There are no sub-face values to fill in 1d!"));
}


Expand Down
12 changes: 6 additions & 6 deletions source/grid/grid_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ namespace GridGenerator
void
create_triangulation(Triangulation<1, 1> &, const AdditionalData &)
{
Assert(false, ExcMessage("Airfoils only exist for 2D and 3D!"));
Assert(false, ExcMessage("Airfoils only exist for 2D and 3d!"));
}


Expand All @@ -1197,7 +1197,7 @@ namespace GridGenerator
typename Triangulation<1, 1>::cell_iterator>> &,
const AdditionalData &)
{
Assert(false, ExcMessage("Airfoils only exist for 2D and 3D!"));
Assert(false, ExcMessage("Airfoils only exist for 2D and 3d!"));
}


Expand Down Expand Up @@ -1233,7 +1233,7 @@ namespace GridGenerator
typename Triangulation<3, 3>::cell_iterator>> &periodic_faces,
const AdditionalData & additional_data)
{
Assert(false, ExcMessage("3D airfoils are not implemented yet!"));
Assert(false, ExcMessage("3d airfoils are not implemented yet!"));
(void)tria;
(void)additional_data;
(void)periodic_faces;
Expand Down Expand Up @@ -2335,11 +2335,11 @@ namespace GridGenerator
"The triangulation you are trying to create will consist of cells"
" with negative measures. This is usually the result of input data"
" that does not define a right-handed coordinate system. The usual"
" fix for this is to ensure that in 1D the given point is to the"
" right of the origin (or the given edge tensor is positive), in 2D"
" fix for this is to ensure that in 1d the given point is to the"
" right of the origin (or the given edge tensor is positive), in 2d"
" that the two edges (and their cross product) obey the right-hand"
" rule (which may usually be done by switching the order of the"
" points or edge tensors), or in 3D that the edges form a"
" points or edge tensors), or in 3d that the edges form a"
" right-handed coordinate system (which may also be accomplished by"
" switching the order of the first two points or edge tensors)."));

Expand Down
4 changes: 2 additions & 2 deletions source/grid/grid_out.cc
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,12 @@ namespace GridOutFlags
param.declare_entry("Cell number",
"false",
Patterns::Bool(),
"(2D only) Write cell numbers"
"(2d only) Write cell numbers"
" into the centers of cells");
param.declare_entry("Level number",
"false",
Patterns::Bool(),
"(2D only) if \"Cell number\" is true, write "
"(2d only) if \"Cell number\" is true, write "
"numbers in the form level.number");
param.declare_entry("Vertex number",
"false",
Expand Down
4 changes: 2 additions & 2 deletions source/grid/tria.cc
Original file line number Diff line number Diff line change
Expand Up @@ -683,12 +683,12 @@ namespace
face_rotation == false),
ExcMessage("The supplied orientation "
"(face_orientation, face_flip, face_rotation) "
"is invalid for 1D"));
"is invalid for 1d"));

Assert((dim != 2) || (face_orientation == true && face_rotation == false),
ExcMessage("The supplied orientation "
"(face_orientation, face_flip, face_rotation) "
"is invalid for 2D"));
"is invalid for 2d"));

Assert(face_1 != face_2, ExcMessage("face_1 and face_2 are equal!"));

Expand Down
6 changes: 3 additions & 3 deletions tests/grid/twisted_parallelepiped_01.debug.output
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ExcInvalidInputOrientation ("The triangulation you are trying to create will consist of cells" " with negative measures. This is usually the result of input data" " that does not define a right-handed coordinate system. The usual" " fix for this is to ensure that in 1D the given point is to the" " right of the origin (or the given edge tensor is positive), in 2D" " that the two edges (and their cross product) obey the right-hand" " rule (which may usually be done by switching the order of the" " points or edge tensors), or in 3D that the edges form a" " right-handed coordinate system (which may also be accomplished by" " switching the order of the first two points or edge tensors).")
ExcInvalidInputOrientation ("The triangulation you are trying to create will consist of cells" " with negative measures. This is usually the result of input data" " that does not define a right-handed coordinate system. The usual" " fix for this is to ensure that in 1D the given point is to the" " right of the origin (or the given edge tensor is positive), in 2D" " that the two edges (and their cross product) obey the right-hand" " rule (which may usually be done by switching the order of the" " points or edge tensors), or in 3D that the edges form a" " right-handed coordinate system (which may also be accomplished by" " switching the order of the first two points or edge tensors).")
ExcInvalidInputOrientation ("The triangulation you are trying to create will consist of cells" " with negative measures. This is usually the result of input data" " that does not define a right-handed coordinate system. The usual" " fix for this is to ensure that in 1D the given point is to the" " right of the origin (or the given edge tensor is positive), in 2D" " that the two edges (and their cross product) obey the right-hand" " rule (which may usually be done by switching the order of the" " points or edge tensors), or in 3D that the edges form a" " right-handed coordinate system (which may also be accomplished by" " switching the order of the first two points or edge tensors).")
ExcInvalidInputOrientation ("The triangulation you are trying to create will consist of cells" " with negative measures. This is usually the result of input data" " that does not define a right-handed coordinate system. The usual" " fix for this is to ensure that in 1d the given point is to the" " right of the origin (or the given edge tensor is positive), in 2d" " that the two edges (and their cross product) obey the right-hand" " rule (which may usually be done by switching the order of the" " points or edge tensors), or in 3d that the edges form a" " right-handed coordinate system (which may also be accomplished by" " switching the order of the first two points or edge tensors).")
ExcInvalidInputOrientation ("The triangulation you are trying to create will consist of cells" " with negative measures. This is usually the result of input data" " that does not define a right-handed coordinate system. The usual" " fix for this is to ensure that in 1d the given point is to the" " right of the origin (or the given edge tensor is positive), in 2d" " that the two edges (and their cross product) obey the right-hand" " rule (which may usually be done by switching the order of the" " points or edge tensors), or in 3d that the edges form a" " right-handed coordinate system (which may also be accomplished by" " switching the order of the first two points or edge tensors).")
ExcInvalidInputOrientation ("The triangulation you are trying to create will consist of cells" " with negative measures. This is usually the result of input data" " that does not define a right-handed coordinate system. The usual" " fix for this is to ensure that in 1d the given point is to the" " right of the origin (or the given edge tensor is positive), in 2d" " that the two edges (and their cross product) obey the right-hand" " rule (which may usually be done by switching the order of the" " points or edge tensors), or in 3d that the edges form a" " right-handed coordinate system (which may also be accomplished by" " switching the order of the first two points or edge tensors).")
OK