Skip to content

Commit 38ccc1d

Browse files
author
Andrea Mola
committed
forgot the indent
1 parent 2c17963 commit 38ccc1d

29 files changed

Lines changed: 1942 additions & 1542 deletions

‎include/bem_fma.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ class BEMFMA : public ParameterAcceptor
9898
/// Mapping in the BEMFMA class. It also sets up some useful vector for,
9999
/// mixed boundary conditions and double nodes handling.
100100
void
101-
init_fma(const DoFHandler<dim - 1, dim> & input_dh,
101+
init_fma(const DoFHandler<dim - 1, dim> &input_dh,
102102
const std::vector<std::set<types::global_dof_index>> &db_in,
103-
const TrilinosWrappers::MPI::Vector & input_sn,
104-
const Mapping<dim - 1, dim> & input_mapping =
103+
const TrilinosWrappers::MPI::Vector &input_sn,
104+
const Mapping<dim - 1, dim> &input_mapping =
105105
StaticMappingQ1<dim - 1, dim>::mapping,
106106
unsigned int quad_order = 4,
107107
unsigned int sing_quad_order = 5);
@@ -173,8 +173,8 @@ class BEMFMA : public ParameterAcceptor
173173
multipole_matr_vect_products(
174174
const TrilinosWrappers::MPI::Vector &phi_values,
175175
const TrilinosWrappers::MPI::Vector &dphi_dn_values,
176-
TrilinosWrappers::MPI::Vector & matrVectProdN,
177-
TrilinosWrappers::MPI::Vector & matrVectProdD) const;
176+
TrilinosWrappers::MPI::Vector &matrVectProdN,
177+
TrilinosWrappers::MPI::Vector &matrVectProdD) const;
178178

179179

180180
// void compute_m2l_flags();
@@ -209,7 +209,7 @@ class BEMFMA : public ParameterAcceptor
209209
/// architectures.
210210
TrilinosWrappers::PreconditionILU &
211211
FMA_preconditioner(const TrilinosWrappers::MPI::Vector &alpha,
212-
AffineConstraints<double> & c);
212+
AffineConstraints<double> &c);
213213

214214
protected:
215215
/// Three pointers to the problem parameters to be set equal to

‎include/bem_problem.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ class BEMProblem : public ParameterAcceptor
126126
const MPI_Comm comm = MPI_COMM_WORLD);
127127

128128
void
129-
solve(TrilinosWrappers::MPI::Vector & phi,
130-
TrilinosWrappers::MPI::Vector & dphi_dn,
129+
solve(TrilinosWrappers::MPI::Vector &phi,
130+
TrilinosWrappers::MPI::Vector &dphi_dn,
131131
const TrilinosWrappers::MPI::Vector &tmp_rhs);
132132

133133
/// This function takes care of the proper initialization of all the elements
@@ -151,8 +151,8 @@ class BEMProblem : public ParameterAcceptor
151151
/// have kept this function serial. We stress that it needs to be called only
152152
/// once.
153153
void
154-
compute_constraints(IndexSet & c_cpu_set,
155-
AffineConstraints<double> & constraints,
154+
compute_constraints(IndexSet &c_cpu_set,
155+
AffineConstraints<double> &constraints,
156156
const TrilinosWrappers::MPI::Vector &tmp_rhs);
157157

158158
// private:
@@ -169,8 +169,10 @@ class BEMProblem : public ParameterAcceptor
169169
virtual void
170170
parse_parameters(ParameterHandler &prm);
171171

172-
/// This function computes the free coefficients appearing in the hypersingular BIE.
173-
void compute_hypersingular_free_coeffs();
172+
/// This function computes the free coefficients appearing in the
173+
/// hypersingular BIE.
174+
void
175+
compute_hypersingular_free_coeffs();
174176

175177
/// This function computes the fraction of solid angles seen by our domain. We
176178
/// use the Double Layer Operator (through the Neumann matrix) to determine
@@ -196,15 +198,15 @@ class BEMProblem : public ParameterAcceptor
196198
/// vector src. The result is stored
197199
/// in the vector dst.
198200
void
199-
vmult(TrilinosWrappers::MPI::Vector & dst,
201+
vmult(TrilinosWrappers::MPI::Vector &dst,
200202
const TrilinosWrappers::MPI::Vector &src) const;
201203

202204
/// The second method computes the
203205
/// right hand side vector of the
204206
/// system.
205207

206208
void
207-
compute_rhs(TrilinosWrappers::MPI::Vector & dst,
209+
compute_rhs(TrilinosWrappers::MPI::Vector &dst,
208210
const TrilinosWrappers::MPI::Vector &src) const;
209211

210212
/// The third method computes the
@@ -221,8 +223,8 @@ class BEMProblem : public ParameterAcceptor
221223
/// Depending on the resolution stategy we go whether for the direct or fma
222224
/// strategy.
223225
void
224-
solve_system(TrilinosWrappers::MPI::Vector & phi,
225-
TrilinosWrappers::MPI::Vector & dphi_dn,
226+
solve_system(TrilinosWrappers::MPI::Vector &phi,
227+
TrilinosWrappers::MPI::Vector &dphi_dn,
226228
const TrilinosWrappers::MPI::Vector &tmp_rhs);
227229

228230

@@ -349,13 +351,14 @@ class BEMProblem : public ParameterAcceptor
349351
/// solution and alpha vectors
350352
TrilinosWrappers::MPI::Vector sol;
351353
TrilinosWrappers::MPI::Vector alpha;
352-
/// an alternatively computed alpha vector (obtained with geometric computations)
354+
/// an alternatively computed alpha vector (obtained with geometric
355+
/// computations)
353356
TrilinosWrappers::MPI::Vector hyp_alpha;
354357
/// a set of distributed vectors which contain all the entries of the
355-
/// C_ij tensor appearing in the hypersingular BIE
358+
/// C_ij tensor appearing in the hypersingular BIE
356359
std::vector<TrilinosWrappers::MPI::Vector> C_ij;
357360
/// a set of distributed vectors which contain all the entries of the
358-
/// b_i vector appearing in the hypersingular BIE
361+
/// b_i vector appearing in the hypersingular BIE
359362
std::vector<TrilinosWrappers::MPI::Vector> b_i;
360363

361364
mutable TrilinosWrappers::MPI::Vector serv_phi;
@@ -444,9 +447,6 @@ class BEMProblem : public ParameterAcceptor
444447
bool have_dirichlet_bc;
445448

446449
BEMFMA<dim> fma;
447-
448-
449-
450450
};
451451

452452
#endif

‎include/boundary_conditions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class BoundaryConditions : public ParameterAcceptor
7777
{
7878
public:
7979
BoundaryConditions(ComputationalDomain<dim> &comp_dom,
80-
BEMProblem<dim> & bem,
80+
BEMProblem<dim> &bem,
8181
const MPI_Comm comm = MPI_COMM_WORLD)
8282
: wind(dim)
8383
, comp_dom(comp_dom)

‎include/cached_nurbs_patch_manifold.h‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,53 @@
11
#include <deal.II/opencascade/manifold_lib.h>
22
#include <deal.II/opencascade/utilities.h>
3+
34
#include <unordered_map>
45
DEAL_II_NAMESPACE_OPEN
56

67

78
template <int dim, int spacedim>
8-
class CachedNURBSPatchManifold : public OpenCASCADE::NURBSPatchManifold<dim, spacedim>
9+
class CachedNURBSPatchManifold
10+
: public OpenCASCADE::NURBSPatchManifold<dim, spacedim>
911
{
10-
1112
public:
1213
CachedNURBSPatchManifold(const TopoDS_Face &face,
13-
const double tolerance=1e-7)//,
14-
// const types::global_dof_index cache_size=100000)
15-
:
16-
OpenCASCADE::NURBSPatchManifold<2, 3>(face, tolerance),
17-
tolerance(tolerance),
18-
face(face)
19-
{
20-
// projections_cache.reserve(cache_size);
21-
};
22-
23-
virtual Point<dim> pull_back(const Point<spacedim> &space_point) const;
24-
25-
// virtual Point<3> get_new_point(const ArrayView<const Point<3>> &surrounding_points,
14+
const double tolerance = 1e-7) //,
15+
// const types::global_dof_index cache_size=100000)
16+
: OpenCASCADE::NURBSPatchManifold<2, 3>(face, tolerance)
17+
, tolerance(tolerance)
18+
, face(face){
19+
// projections_cache.reserve(cache_size);
20+
};
21+
22+
virtual Point<dim>
23+
pull_back(const Point<spacedim> &space_point) const;
24+
25+
// virtual Point<3> get_new_point(const ArrayView<const Point<3>>
26+
// &surrounding_points,
2627
// const ArrayView<const double> &weights) const;
2728

28-
// virtual void get_new_points(const ArrayView<const Point<3>> &surrounding_points,
29+
// virtual void get_new_points(const ArrayView<const Point<3>>
30+
// &surrounding_points,
2931
// const Table<2,double> &weights,
3032
// ArrayView<Point<3>> new_points) const;
3133
// virtual Tensor<1,3> get_tangent_vector (const Point<3> &x1,
3234
// const Point<3> &x2) const;
3335

34-
inline std::unordered_map <std::size_t, Point<dim> > &get_projections_cache()
36+
inline std::unordered_map<std::size_t, Point<dim>> &
37+
get_projections_cache()
3538
{
3639
return projections_cache;
3740
};
3841

3942
mutable types::global_dof_index new_pull_backs, cache_hits;
43+
4044
private:
41-
mutable std::unordered_map <std::size_t, Point<dim> > projections_cache;
42-
double tolerance;
43-
TopoDS_Face face;
44-
const FlatManifold<dim,dim> sub_manifold;
45+
mutable std::unordered_map<std::size_t, Point<dim>> projections_cache;
46+
double tolerance;
47+
TopoDS_Face face;
48+
const FlatManifold<dim, dim> sub_manifold;
4549
};
4650

4751

4852

49-
5053
DEAL_II_NAMESPACE_CLOSE

‎include/constrained_matrix.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ template <class VEC, class MATRIX>
5252
class ConstrainedOperator
5353
{
5454
public:
55-
ConstrainedOperator(const MATRIX & m,
55+
ConstrainedOperator(const MATRIX &m,
5656
const AffineConstraints<double> &c,
57-
const IndexSet & c_cpu_set,
57+
const IndexSet &c_cpu_set,
5858
MPI_Comm comm = MPI_COMM_WORLD)
5959
: constraints(c)
6060
, matrix(m)
@@ -74,7 +74,7 @@ class ConstrainedOperator
7474

7575
private:
7676
const AffineConstraints<double> &constraints;
77-
const MATRIX & matrix;
77+
const MATRIX &matrix;
7878
const IndexSet constr_cpu_set;
7979
MPI_Comm mpi_communicator;
8080
unsigned int n_mpi_processes;

0 commit comments

Comments
 (0)