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

clang-format: run indent-all #16

Closed
wants to merge 6 commits into from
Closed

clang-format: run indent-all #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ad8ed3
clang-format: update indent and compile script to version 16.0.6
tamiko Aug 21, 2023
0870dea
Test: tensors/tensor_31: use clang-format off to avoid declaration /…
tamiko Aug 21, 2023
007f526
clang-format: update configuration
tamiko Aug 21, 2023
44e227b
clang-format: update examples/.clang-format
tamiko Aug 21, 2023
ecf6696
clang-format: run indent-all
tamiko Aug 21, 2023
e1bd09d
clang-indent: fix-up "typename const"
tamiko Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# The clang-format (Clang 11) style file used by deal.II.
# The clang-format (Clang 16) style file used by deal.II.
#

AccessModifierOffset: -2
Expand Down Expand Up @@ -157,6 +157,8 @@ PenaltyBreakBeforeFirstCallParameter: 90

PointerAlignment: Right

QualifierAlignment: Left

ReflowComments: true
CommentPragmas: '( \| |\*--|<li>|@ref | @p |@param |@name |@returns |@warning |@ingroup |@author |@date |@related |@relates |@relatesalso |@deprecated |@image |@return |@brief |@attention |@copydoc |@addtogroup |@todo |@tparam |@see |@note |@skip |@skipline |@until |@line |@dontinclude |@include)'

Expand All @@ -175,7 +177,7 @@ SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false

Standard: Cpp11
Standard: c++20

TabWidth: 2

Expand Down
2 changes: 1 addition & 1 deletion contrib/python-bindings/include/mapping_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace python
PointWrapper
project_real_point_to_unit_point_on_face(CellAccessorWrapper &cell,
const unsigned int face_no,
PointWrapper & point);
PointWrapper &point);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉


/**
* Get the underlying mapping.
Expand Down
2 changes: 1 addition & 1 deletion contrib/python-bindings/include/tria_accessor_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace python
/**
* Constructor.
*/
TriaAccessorWrapper(void * tria_accessor,
TriaAccessorWrapper(void *tria_accessor,
const int structdim,
const int dim,
const int spacedim);
Expand Down
18 changes: 9 additions & 9 deletions contrib/python-bindings/include/triangulation_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ namespace python
*/
void
generate_subdivided_hyper_rectangle(boost::python::list &repetitions,
PointWrapper & p1,
PointWrapper & p2,
PointWrapper &p1,
PointWrapper &p2,
const bool colorize = false);

/**
Expand All @@ -159,8 +159,8 @@ namespace python
*/
void
generate_subdivided_steps_hyper_rectangle(boost::python::list &step_sizes,
PointWrapper & p1,
PointWrapper & p2,
PointWrapper &p1,
PointWrapper &p2,
const bool colorize = false);

/**
Expand All @@ -174,7 +174,7 @@ namespace python
void
generate_subdivided_material_hyper_rectangle(
boost::python::list &spacing,
PointWrapper & p,
PointWrapper &p,
boost::python::list &material_id,
const bool colorize = false);

Expand Down Expand Up @@ -260,7 +260,7 @@ namespace python
/*! @copydoc GridGenerator::hyper_shell
*/
void
generate_hyper_shell(PointWrapper & center,
generate_hyper_shell(PointWrapper &center,
const double inner_radius,
const double outer_radius,
const unsigned n_cells = 0,
Expand All @@ -287,7 +287,7 @@ namespace python
*/
void
replicate_triangulation(TriangulationWrapper &tria_in,
boost::python::list & extents);
boost::python::list &extents);

/*! @copydoc GridGenerator::flatten_triangulation
*/
Expand Down Expand Up @@ -319,7 +319,7 @@ namespace python
/*! @copydoc GridTools::find_active_cell_around_point
*/
CellAccessorWrapper
find_active_cell_around_point(PointWrapper & p,
find_active_cell_around_point(PointWrapper &p,
MappingQWrapper mapping = MappingQWrapper());

/*! @copydoc GridTools::find_cells_adjacent_to_vertex
Expand Down Expand Up @@ -384,7 +384,7 @@ namespace python
/*! @copydoc GridTools::compute_aspect_ratio_of_cells
*/
boost::python::list
compute_aspect_ratio_of_cells(const MappingQWrapper & mapping,
compute_aspect_ratio_of_cells(const MappingQWrapper &mapping,
const QuadratureWrapper &quadrature);

/**
Expand Down
8 changes: 4 additions & 4 deletions contrib/python-bindings/source/mapping_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace python
project_real_point_to_unit_point_on_face(void *mapping_ptr,
void *cell_accessor_ptr,
const unsigned int face_no,
void * point_ptr)
void *point_ptr)
{
const MappingQ<dim, spacedim> *mapping =
static_cast<const MappingQ<dim, spacedim> *>(mapping_ptr);
Expand Down Expand Up @@ -218,7 +218,7 @@ namespace python

PointWrapper
MappingQWrapper::transform_unit_to_real_cell(CellAccessorWrapper &cell,
PointWrapper & p)
PointWrapper &p)
{
AssertThrow(
dim == p.get_dim(),
Expand All @@ -243,7 +243,7 @@ namespace python

PointWrapper
MappingQWrapper::transform_real_to_unit_cell(CellAccessorWrapper &cell,
PointWrapper & p)
PointWrapper &p)
{
AssertThrow(
spacedim == p.get_dim(),
Expand All @@ -270,7 +270,7 @@ namespace python
MappingQWrapper::project_real_point_to_unit_point_on_face(
CellAccessorWrapper &cell,
const unsigned int face_no,
PointWrapper & p)
PointWrapper &p)
{
AssertThrow(
spacedim == p.get_dim(),
Expand Down
2 changes: 1 addition & 1 deletion contrib/python-bindings/source/tria_accessor_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ namespace python
ExcMessage("Wrong structdim-dim-spacedim combination."));
}

TriaAccessorWrapper::TriaAccessorWrapper(void * tria_accessor,
TriaAccessorWrapper::TriaAccessorWrapper(void *tria_accessor,
const int structdim,
const int dim,
const int spacedim)
Expand Down