Skip to content

Commit 3747019

Browse files
nicola-giulianinicola-giuliani
authored
Merge branch 'master' into license-bem
2 parents 49726eb + 8c1b5fb commit 3747019

File tree

10 files changed

+108
-23
lines changed

10 files changed

+108
-23
lines changed

‎include/ass_leg_function.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <deal.II/grid/tria_iterator.h>
1818

1919
#include <deal.II/lac/full_matrix.h>
20-
#include <deal.II/lac/matrix_lib.h>
2120
#include <deal.II/lac/precondition.h>
2221
#include <deal.II/lac/solver_control.h>
2322
#include <deal.II/lac/solver_gmres.h>

‎include/bem_fma.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11

2+
// ---------------------------------------------------------------------
3+
//
4+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
5+
//
6+
// This file is part of the pi-BEM library.
7+
//
8+
// The pi-BEM is free software; you can use it, redistribute
9+
// it, and/or modify it under the terms of the GNU Lesser General
10+
// Public License version 2.1 as published by the Free Software Foundation.
11+
// The full text of the license can be found in the file LICENSE at
12+
// the top level of the pi-BEM distribution.
13+
//
14+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
15+
//
16+
// ---------------------------------------------------------------------
217
/// This class contains all the methods
318
/// of the Fast Multipole Algorithm
419
/// applied to the Boundary Element

‎include/boundary_conditions.h‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// ---------------------------------------------------------------------
2+
//
3+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
4+
//
5+
// This file is part of the pi-BEM library.
6+
//
7+
// The pi-BEM is free software; you can use it, redistribute
8+
// it, and/or modify it under the terms of the GNU Lesser General
9+
// Public License version 2.1 as published by the Free Software Foundation.
10+
// The full text of the license can be found in the file LICENSE at
11+
// the top level of the pi-BEM distribution.
12+
//
13+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
114

215
#ifndef boundary_conditions_h
316
#define boundary_conditions_h
@@ -16,7 +29,6 @@
1629
#include <deal.II/grid/tria_iterator.h>
1730

1831
#include <deal.II/lac/full_matrix.h>
19-
#include <deal.II/lac/matrix_lib.h>
2032
#include <deal.II/lac/precondition.h>
2133
#include <deal.II/lac/solver_control.h>
2234
#include <deal.II/lac/solver_gmres.h>

‎include/computational_domain.h‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// ---------------------------------------------------------------------
2+
//
3+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
4+
//
5+
// This file is part of the pi-BEM library.
6+
//
7+
// The pi-BEM is free software; you can use it, redistribute
8+
// it, and/or modify it under the terms of the GNU Lesser General
9+
// Public License version 2.1 as published by the Free Software Foundation.
10+
// The full text of the license can be found in the file LICENSE at
11+
// the top level of the pi-BEM distribution.
12+
//
13+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
114

215
// We start with including a bunch
316
// of include files: they might be more than
@@ -22,7 +35,6 @@
2235
#include <deal.II/grid/tria_iterator.h>
2336

2437
#include <deal.II/lac/full_matrix.h>
25-
#include <deal.II/lac/matrix_lib.h>
2638
#include <deal.II/lac/precondition.h>
2739
#include <deal.II/lac/solver_control.h>
2840
#include <deal.II/lac/solver_gmres.h>

‎include/constrained_matrix.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
//---------------------------------------------------------------------------
2-
// $Id: filtered_matrix.h 23248 2011-01-23 06:03:57Z bangerth $
3-
// Version: $Name$
1+
// ---------------------------------------------------------------------
42
//
5-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
6-
// 2011 by the deal.II authors
3+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
74
//
8-
// This file is subject to QPL and may not be distributed
9-
// without copyright and license information. Please refer
10-
// to the file deal.II/doc/license.html for the text and
11-
// further information on this license.
5+
// This file is part of the pi-BEM library.
126
//
13-
//---------------------------------------------------------------------------
7+
// The pi-BEM is free software; you can use it, redistribute
8+
// it, and/or modify it under the terms of the GNU Lesser General
9+
// Public License version 2.1 as published by the Free Software Foundation.
10+
// The full text of the license can be found in the file LICENSE at
11+
// the top level of the pi-BEM distribution.
12+
//
13+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
14+
1415
#ifndef __deal2__constrained_matrix_h
1516
# define __deal2__constrained_matrix_h
1617

@@ -24,7 +25,6 @@
2425
# include <deal.II/base/types.h>
2526

2627
# include <deal.II/lac/affine_constraints.h>
27-
# include <deal.II/lac/pointer_matrix.h>
2828
# include <deal.II/lac/vector_memory.h>
2929

3030
# include <algorithm>

‎include/driver.h‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// ---------------------------------------------------------------------
2+
//
3+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
4+
//
5+
// This file is part of the pi-BEM library.
6+
//
7+
// The pi-BEM is free software; you can use it, redistribute
8+
// it, and/or modify it under the terms of the GNU Lesser General
9+
// Public License version 2.1 as published by the Free Software Foundation.
10+
// The full text of the license can be found in the file LICENSE at
11+
// the top level of the pi-BEM distribution.
12+
//
13+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
14+
115
#ifndef driver_h
216
#define driver_h
317

@@ -10,7 +24,6 @@
1024
#include <deal.II/base/utilities.h>
1125

1226
#include <deal.II/lac/full_matrix.h>
13-
#include <deal.II/lac/matrix_lib.h>
1427
#include <deal.II/lac/precondition.h>
1528
#include <deal.II/lac/solver_control.h>
1629
#include <deal.II/lac/solver_gmres.h>

‎include/local_expansion_coeff.h‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
/*
2-
* File: LocalExpansionCoeff.hpp
3-
* Author: matteo
4-
*
5-
* Created on April 3, 2015, 6:05 PM
6-
*/
1+
// ---------------------------------------------------------------------
2+
//
3+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
4+
//
5+
// This file is part of the pi-BEM library.
6+
//
7+
// The pi-BEM is free software; you can use it, redistribute
8+
// it, and/or modify it under the terms of the GNU Lesser General
9+
// Public License version 2.1 as published by the Free Software Foundation.
10+
// The full text of the license can be found in the file LICENSE at
11+
// the top level of the pi-BEM distribution.
12+
//
13+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
714

815
#ifndef LOCALEXPANSIONCOEFF_H
916
#define LOCALEXPANSIONCOEFF_H

‎include/multipole_expansion.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// ---------------------------------------------------------------------
2+
//
3+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
4+
//
5+
// This file is part of the pi-BEM library.
6+
//
7+
// The pi-BEM is free software; you can use it, redistribute
8+
// it, and/or modify it under the terms of the GNU Lesser General
9+
// Public License version 2.1 as published by the Free Software Foundation.
10+
// The full text of the license can be found in the file LICENSE at
11+
// the top level of the pi-BEM distribution.
12+
//
13+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
14+
115
#ifndef MULTIPOLE_EXPANSION_H_
216
#define MULTIPOLE_EXPANSION_H_
317

‎include/octree_block.h‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2+
// ---------------------------------------------------------------------
3+
//
4+
// Copyright (C) 2014 - 2020 by the pi-BEM authors.
5+
//
6+
// This file is part of the pi-BEM library.
7+
//
8+
// The pi-BEM is free software; you can use it, redistribute
9+
// it, and/or modify it under the terms of the GNU Lesser General
10+
// Public License version 2.1 as published by the Free Software Foundation.
11+
// The full text of the license can be found in the file LICENSE at
12+
// the top level of the pi-BEM distribution.
13+
//
14+
// Authors: Nicola Giuliani, Andrea Mola, Luca Heltai
15+
116
#ifndef octree_block_h
217
#define octree_block_h
318

@@ -17,7 +32,6 @@
1732
#include <deal.II/grid/tria_iterator.h>
1833

1934
#include <deal.II/lac/full_matrix.h>
20-
#include <deal.II/lac/matrix_lib.h>
2135
#include <deal.II/lac/precondition.h>
2236
#include <deal.II/lac/solver_control.h>
2337
#include <deal.II/lac/solver_gmres.h>

‎include/true_constrained_matrix.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
# include <deal.II/base/thread_management.h>
2424

2525
# include <deal.II/lac/affine_constraints.h>
26-
# include <deal.II/lac/pointer_matrix.h>
2726
# include <deal.II/lac/vector_memory.h>
2827

2928
# include <algorithm>

0 commit comments

Comments
 (0)