Skip to content

Commit

Permalink
Apply clang format everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@fdrmrc
fdrmrc committed Apr 20, 2024
1 parent 2917772 commit 92cabd2
Show file tree
Hide file tree
Showing 42 changed files with 168 additions and 163 deletions.
4 changes: 2 additions & 2 deletions examples/benchmarks_3D.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class AgglomerationBenchmark

public:
AgglomerationBenchmark(
const GridType & grid_type = GridType::grid_generator,
const GridType &grid_type = GridType::grid_generator,
const PartitionerType &partitioner_type = PartitionerType::rtree,
const unsigned int extraction_level = 0,
const unsigned int n_subdomains = 0);
Expand All @@ -70,7 +70,7 @@ class AgglomerationBenchmark

template <int dim>
AgglomerationBenchmark<dim>::AgglomerationBenchmark(
const GridType & grid_type,
const GridType &grid_type,
const PartitionerType &partitioner_type,
const unsigned int extraction_level,
const unsigned int n_subdomains)
Expand Down
12 changes: 6 additions & 6 deletions examples/classical_dg_assembly.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ class Solution : public Function<dim>

virtual void
value_list(const std::vector<Point<dim>> &points,
std::vector<double> & values,
std::vector<double> &values,
const unsigned int /*component*/) const override;

virtual Tensor<1, dim>
gradient(const Point<dim> & p,
gradient(const Point<dim> &p,
const unsigned int component = 0) const override;
};

Expand Down Expand Up @@ -92,7 +92,7 @@ Solution<dim>::gradient(const Point<dim> &p, const unsigned int) const
template <int dim>
void
Solution<dim>::value_list(const std::vector<Point<dim>> &points,
std::vector<double> & values,
std::vector<double> &values,
const unsigned int /*component*/) const
{
for (unsigned int i = 0; i < values.size(); ++i)
Expand All @@ -111,15 +111,15 @@ class RightHandSide : public Function<dim>

virtual void
value_list(const std::vector<Point<dim>> &points,
std::vector<double> & values,
std::vector<double> &values,
const unsigned int /*component*/) const override;
};


template <int dim>
void
RightHandSide<dim>::value_list(const std::vector<Point<dim>> &points,
std::vector<double> & values,
std::vector<double> &values,
const unsigned int /*component*/) const
{
for (unsigned int i = 0; i < values.size(); ++i)
Expand Down Expand Up @@ -260,7 +260,7 @@ Poisson<dim>::assemble_system()

fe_values.reinit(cell);

const auto & q_points = fe_values.get_quadrature_points();
const auto &q_points = fe_values.get_quadrature_points();
const unsigned int n_qpoints = q_points.size();
std::vector<double> rhs(n_qpoints);
rhs_function->value_list(q_points, rhs);
Expand Down
16 changes: 10 additions & 6 deletions examples/metrics.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Mesh


public:
Mesh(const MeshType & grid_type = MeshType::square,
Mesh(const MeshType &grid_type = MeshType::square,
const PartitionerType &partitioner_type = PartitionerType::rtree,
const unsigned int = 0,
const unsigned int = 0);
Expand All @@ -92,7 +92,7 @@ class Mesh


template <int dim>
Mesh<dim>::Mesh(const MeshType & grid_type,
Mesh<dim>::Mesh(const MeshType &grid_type,
const PartitionerType &partitioner_type,
const unsigned int extraction_level,
const unsigned int n_subdomains)
Expand All @@ -115,19 +115,22 @@ Mesh<dim>::setup_agglomerated_grid()
GridIn<dim> grid_in;
switch (grid_type)
{
case MeshType::square: {
case MeshType::square:
{
GridGenerator::hyper_cube(tria, 0., 1.);
tria.refine_global(5); // 1024
std::cout << "Number of background cells: " << tria.n_active_cells()
<< std::endl;
break;
}
case MeshType::ball: {
case MeshType::ball:
{
GridGenerator::hyper_ball(tria);
tria.refine_global(6); // 20480
break;
}
case MeshType::unstructured: {
case MeshType::unstructured:
{
grid_in.attach_triangulation(tria);
std::ifstream gmsh_file(
"../../meshes/t3.msh"); // unstructured square [0,1]^2
Expand Down Expand Up @@ -227,7 +230,8 @@ Mesh<dim>::setup_agglomerated_grid()
#endif
}
else if (partitioner_type == PartitionerType::no_partition)
{}
{
}
else
{
Assert(false, ExcMessage("Wrong partitioning."));
Expand Down
8 changes: 4 additions & 4 deletions examples/minimal_SIP.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ class RightHandSide : public Function<dim>

virtual void
value_list(const std::vector<Point<dim>> &points,
std::vector<double> & values,
std::vector<double> &values,
const unsigned int /*component*/) const override;
};


template <int dim>
void
RightHandSide<dim>::value_list(const std::vector<Point<dim>> &points,
std::vector<double> & values,
std::vector<double> &values,
const unsigned int /*component*/) const
{
for (unsigned int i = 0; i < values.size(); ++i)
Expand Down Expand Up @@ -391,7 +391,7 @@ Poisson<dim>::assemble_system()
cell_rhs = 0;
const auto &agglo_values = ah->reinit(polytope);

const auto & q_points = agglo_values.get_quadrature_points();
const auto &q_points = agglo_values.get_quadrature_points();
const unsigned int n_qpoints = q_points.size();
std::vector<double> rhs(n_qpoints);
rhs_function->value_list(q_points, rhs);
Expand Down Expand Up @@ -791,7 +791,7 @@ main(int argc, char *argv[])
<< std::endl;
Poisson<dim> standard_problem(false);
standard_problem.run();
const auto & standard_matrix = standard_problem.get_matrix();
const auto &standard_matrix = standard_problem.get_matrix();
Poisson<dim> agglo_problem(true);
agglo_problem.run();
const auto &agglo_matrix = agglo_problem.get_matrix();
Expand Down
12 changes: 6 additions & 6 deletions include/agglomeration_accessor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,16 @@ class AgglomerationAccessor
*/
AgglomerationAccessor(
const typename Triangulation<dim, spacedim>::active_cell_iterator
& master_cell,
&master_cell,
const AgglomerationHandler<dim, spacedim> *ah);

/**
* Same as above, but needed when the argument @p cells is a ghost cell.
*/
AgglomerationAccessor(
const typename Triangulation<dim, spacedim>::active_cell_iterator &cell,
const CellId & cell_id,
const AgglomerationHandler<dim, spacedim> * ah);
const CellId &cell_id,
const AgglomerationHandler<dim, spacedim> *ah);

/**
* Default destructor.
Expand Down Expand Up @@ -462,7 +462,7 @@ inline AgglomerationAccessor<dim, spacedim>::AgglomerationAccessor()
template <int dim, int spacedim>
inline AgglomerationAccessor<dim, spacedim>::AgglomerationAccessor(
const typename Triangulation<dim, spacedim>::active_cell_iterator &cell,
const AgglomerationHandler<dim, spacedim> * ah)
const AgglomerationHandler<dim, spacedim> *ah)
{
handler = const_cast<AgglomerationHandler<dim, spacedim> *>(ah);
if (&(*handler->master_cells_container.end()) == std::addressof(cell))
Expand All @@ -486,7 +486,7 @@ inline AgglomerationAccessor<dim, spacedim>::AgglomerationAccessor(
template <int dim, int spacedim>
inline AgglomerationAccessor<dim, spacedim>::AgglomerationAccessor(
const typename Triangulation<dim, spacedim>::active_cell_iterator &neigh_cell,
const CellId & master_cell_id,
const CellId &master_cell_id,
const AgglomerationHandler<dim, spacedim> *ah)
{
Assert(neigh_cell->is_ghost(), ExcInternalError());
Expand Down Expand Up @@ -695,7 +695,7 @@ template <int dim, int spacedim>
unsigned int
AgglomerationAccessor<dim, spacedim>::n_agglomerated_faces() const
{
const auto & agglomeration = get_agglomerate();
const auto &agglomeration = get_agglomerate();
unsigned int n_neighbors = 0;
for (const auto &cell : agglomeration)
n_neighbors += n_agglomerated_faces_per_cell(cell);
Expand Down
16 changes: 8 additions & 8 deletions include/agglomeration_iterator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ class AgglomerationIterator
*/
AgglomerationIterator(
const typename Triangulation<dim, spacedim>::active_cell_iterator &cell,
const AgglomerationHandler<dim, spacedim> * handler);
const AgglomerationHandler<dim, spacedim> *handler);

/**
* Same as above, needed for ghosted elements.
*/
AgglomerationIterator(
const typename Triangulation<dim, spacedim>::active_cell_iterator
& master_cell,
const CellId & cell_id,
&master_cell,
const CellId &cell_id,
const AgglomerationHandler<dim, spacedim> *handler);

/**
Expand Down Expand Up @@ -168,16 +168,16 @@ inline AgglomerationIterator<dim, spacedim>::AgglomerationIterator()
template <int dim, int spacedim>
inline AgglomerationIterator<dim, spacedim>::AgglomerationIterator(
const typename Triangulation<dim, spacedim>::active_cell_iterator
& master_cell,
&master_cell,
const AgglomerationHandler<dim, spacedim> *handler)
: accessor(master_cell, handler)
{}

template <int dim, int spacedim>
inline AgglomerationIterator<dim, spacedim>::AgglomerationIterator(
const typename Triangulation<dim, spacedim>::active_cell_iterator
& master_cell,
const CellId & cell_id,
&master_cell,
const CellId &cell_id,
const AgglomerationHandler<dim, spacedim> *handler)
: accessor(master_cell, cell_id, handler)
{}
Expand Down Expand Up @@ -255,7 +255,7 @@ inline AgglomerationIterator<dim, spacedim>
AgglomerationIterator<dim, spacedim>::operator++(int)
{
AgglomerationIterator tmp(*this);
operator++();
operator++();

return tmp;
}
Expand All @@ -277,7 +277,7 @@ inline AgglomerationIterator<dim, spacedim>
AgglomerationIterator<dim, spacedim>::operator--(int)
{
AgglomerationIterator tmp(*this);
operator--();
operator--();

return tmp;
}
Expand Down
22 changes: 11 additions & 11 deletions include/poly_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ namespace dealii::PolyUtils::internal
void
get_face_connectivity_of_cells(
const parallel::fullydistributed::Triangulation<dim, spacedim>
& triangulation,
DynamicSparsityPattern & cell_connectivity,
&triangulation,
DynamicSparsityPattern &cell_connectivity,
const std::vector<types::global_cell_index> locally_owned_cells)
{
cell_connectivity.reinit(triangulation.n_locally_owned_active_cells(),
Expand Down Expand Up @@ -151,7 +151,7 @@ namespace dealii::PolyUtils
unsigned int target_level,
std::vector<std::vector<typename Triangulation<
boost::geometry::dimension<Box>::value>::active_cell_iterator>> &boxes,
std::vector<std::vector<unsigned int>> & csr);
std::vector<std::vector<unsigned int>> &csr);


/**
Expand Down Expand Up @@ -231,11 +231,11 @@ namespace dealii::PolyUtils
typename Box,
typename Allocators>
Rtree_visitor<Value, Options, Translator, Box, Allocators>::Rtree_visitor(
const Translator & translator,
const Translator &translator,
const unsigned int target_level,
std::vector<std::vector<typename Triangulation<
boost::geometry::dimension<Box>::value>::active_cell_iterator>>
& bb_in_boxes,
&bb_in_boxes,
std::vector<std::vector<unsigned int>> &csr)
: translator(translator)
, level(0)
Expand Down Expand Up @@ -393,7 +393,7 @@ namespace dealii::PolyUtils
compute_h_orthogonal(
const unsigned int face_index,
const std::vector<typename Triangulation<dim>::active_face_iterator>
& polygon_boundary,
&polygon_boundary,
const Tensor<1, dim> &deal_normal)
{
#ifdef DEAL_II_WITH_CGAL
Expand Down Expand Up @@ -516,8 +516,8 @@ namespace dealii::PolyUtils
void
interpolate_to_fine_grid(
const AgglomerationHandler<dim, spacedim> &agglomeration_handler,
VectorType & dst,
const VectorType & src)
VectorType &dst,
const VectorType &src)
{
Assert((dim == spacedim), ExcNotImplemented());
Assert(
Expand Down Expand Up @@ -700,7 +700,7 @@ namespace dealii::PolyUtils
template <int dim, int spacedim = dim>
void
collect_cells_for_agglomeration(
const Triangulation<dim, spacedim> & tria,
const Triangulation<dim, spacedim> &tria,
const std::vector<types::global_cell_index> &cell_idxs,
std::vector<typename Triangulation<dim, spacedim>::active_cell_iterator>
&cells_to_be_agglomerated)
Expand Down Expand Up @@ -912,7 +912,7 @@ namespace dealii::PolyUtils

// box_ratio

const auto & agglo_values = ah.reinit(polytope);
const auto &agglo_values = ah.reinit(polytope);
const double measure_element =
std::accumulate(agglo_values.get_JxW_values().cbegin(),
agglo_values.get_JxW_values().cend(),
Expand Down Expand Up @@ -952,7 +952,7 @@ namespace dealii::PolyUtils
void
export_polygon_to_csv_file(
const AgglomerationHandler<dim> &agglomeration_handler,
const std::string & filename)
const std::string &filename)
{
static_assert(dim == 2); // With 3D, Paraview is much better
std::ofstream myfile;
Expand Down
Loading

0 comments on commit 92cabd2

Please sign in to comment.