Skip to content

Commit 7c5c33c

Browse files
author
Andrea Mola
committed
implemented changes to move to deal.II version 9.6.0
1 parent a21787c commit 7c5c33c

26 files changed

+79
-82
lines changed

‎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: 8 additions & 8 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:
@@ -198,15 +198,15 @@ class BEMProblem : public ParameterAcceptor
198198
/// vector src. The result is stored
199199
/// in the vector dst.
200200
void
201-
vmult(TrilinosWrappers::MPI::Vector & dst,
201+
vmult(TrilinosWrappers::MPI::Vector &dst,
202202
const TrilinosWrappers::MPI::Vector &src) const;
203203

204204
/// The second method computes the
205205
/// right hand side vector of the
206206
/// system.
207207

208208
void
209-
compute_rhs(TrilinosWrappers::MPI::Vector & dst,
209+
compute_rhs(TrilinosWrappers::MPI::Vector &dst,
210210
const TrilinosWrappers::MPI::Vector &src) const;
211211

212212
/// The third method computes the
@@ -223,8 +223,8 @@ class BEMProblem : public ParameterAcceptor
223223
/// Depending on the resolution stategy we go whether for the direct or fma
224224
/// strategy.
225225
void
226-
solve_system(TrilinosWrappers::MPI::Vector & phi,
227-
TrilinosWrappers::MPI::Vector & dphi_dn,
226+
solve_system(TrilinosWrappers::MPI::Vector &phi,
227+
TrilinosWrappers::MPI::Vector &dphi_dn,
228228
const TrilinosWrappers::MPI::Vector &tmp_rhs);
229229

230230

‎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/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;

‎include/laplace_kernel.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ namespace LaplaceKernel
112112
template <int dim> // mio//
113113
void
114114
kernels(const Tensor<1, dim> &R,
115-
Tensor<2, dim> & H,
116-
Tensor<1, dim> & D,
117-
double & d)
115+
Tensor<2, dim> &H,
116+
Tensor<1, dim> &D,
117+
double &d)
118118
{
119119
double r = R.norm();
120120
double r2 = r * r;

‎include/local_expansion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class LocalExpansion
4444

4545
LocalExpansion(const unsigned int order,
4646
const dealii::Point<3> &center,
47-
const AssLegFunction * assLegFunction);
47+
const AssLegFunction *assLegFunction);
4848

4949
LocalExpansion(const LocalExpansion &other);
5050

‎include/local_expansion_coeff.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class LocalExpansionCoeff
3131
const unsigned int &m,
3232
const unsigned int &nn,
3333
const unsigned int &mm,
34-
const double & value);
34+
const double &value);
3535
unsigned int
3636
getNumberOfElements();
3737
unsigned int
@@ -49,7 +49,7 @@ class LocalExpansionCoeff
4949

5050
private:
5151
unsigned int _p;
52-
double * _coeff;
52+
double *_coeff;
5353
};
5454

5555
#endif /* LOCALEXPANSIONCOEFF_HPP */

‎include/multipole_expansion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MultipoleExpansion
5151

5252
MultipoleExpansion(const unsigned int order,
5353
const dealii::Point<3> &center,
54-
const AssLegFunction * assLegFunction);
54+
const AssLegFunction *assLegFunction);
5555

5656
MultipoleExpansion(const MultipoleExpansion &other);
5757

@@ -68,7 +68,7 @@ class MultipoleExpansion
6868

6969
void
7070
AddNormDer(const double strength,
71-
const dealii::Point<3> & point,
71+
const dealii::Point<3> &point,
7272
const dealii::Tensor<1, 3> &normal);
7373

7474
double

‎include/singular_kernel_integral.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <deal.II/grid/tria_iterator.h>
3434
// Here are some functions to generate standard grids:
3535
#include <deal.II/grid/grid_generator.h>
36-
#include <deal.II/grid/grid_reordering.h>
3736
#include <deal.II/grid/grid_tools.h>
3837

3938
// Output of grids in various graphics formats:
@@ -60,9 +59,9 @@ class SingularKernelIntegral
6059
public:
6160
SingularKernelIntegral(
6261
const typename DoFHandler<dim - 1, dim>::active_cell_iterator &in_cell,
63-
const FiniteElement<dim - 1, dim> & in_fe,
64-
const Mapping<dim - 1, dim> & in_mapping,
65-
const Point<dim - 1> & in_eta);
62+
const FiniteElement<dim - 1, dim> &in_fe,
63+
const Mapping<dim - 1, dim> &in_mapping,
64+
const Point<dim - 1> &in_eta);
6665

6766

6867

@@ -80,9 +79,9 @@ class SingularKernelIntegral
8079

8180
private:
8281
const typename DoFHandler<dim - 1, dim>::active_cell_iterator &cell;
83-
const FiniteElement<dim - 1, dim> & fe;
84-
const Mapping<dim - 1, dim> & mapping;
85-
const Point<dim - 1> & eta;
82+
const FiniteElement<dim - 1, dim> &fe;
83+
const Mapping<dim - 1, dim> &mapping;
84+
const Point<dim - 1> &eta;
8685
// to be read from input file
8786
unsigned int rho_quadrature_order = 4;
8887
unsigned int theta_quadrature_order = 20;

‎include/true_constrained_matrix.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ template <class VEC, class MATRIX>
5050
class ConstrainedOperator
5151
{
5252
public:
53-
ConstrainedOperator(const MATRIX & m,
53+
ConstrainedOperator(const MATRIX &m,
5454
const AffineConstraints<double> &c,
55-
const IndexSet & c_cpu_set,
55+
const IndexSet &c_cpu_set,
5656
MPI_Comm comm = MPI_COMM_WORLD)
5757
: cm(c)
5858
, matrix(m)
@@ -82,7 +82,7 @@ class ConstrainedOperator
8282

8383
private:
8484
const AffineConstraints<double> &cm;
85-
const MATRIX & matrix;
85+
const MATRIX &matrix;
8686
const IndexSet constr_cpu_set;
8787
AffineConstraints<double> cmt;
8888
MPI_Comm mpi_communicator;
@@ -112,7 +112,7 @@ class ConstrainedOperator
112112

113113
template <class VEC, class MATRIX>
114114
void
115-
ConstrainedOperator<VEC, MATRIX>::constraint_vmult(VEC & dst,
115+
ConstrainedOperator<VEC, MATRIX>::constraint_vmult(VEC &dst,
116116
const VEC &src) const
117117
{
118118
VEC loc_src(src.locally_owned_elements(), constr_cpu_set, mpi_communicator);
@@ -141,7 +141,7 @@ ConstrainedOperator<VEC, MATRIX>::constraint_vmult(VEC & dst,
141141

142142
template <class VEC, class MATRIX>
143143
void
144-
ConstrainedOperator<VEC, MATRIX>::constraint_tvmult(VEC & dst,
144+
ConstrainedOperator<VEC, MATRIX>::constraint_tvmult(VEC &dst,
145145
const VEC &src) const
146146
{
147147
VEC loc_dst(constr_cpu_set);

0 commit comments

Comments
 (0)