Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/indentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:

runs-on: ubuntu-latest
container:
image: dealii/dealii:v9.6.0-jammy
image: dealii/dealii:v9.7.1-noble
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

steps:
- uses: actions/checkout@v2
- name: Check indentation
run: |
git config --global --add safe.directory /__w/pi-BEM/pi-BEM
./scripts/check_indentation.sh
./scripts/check_indentation.sh
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: dealii/dealii:v9.6.0-jammy
image: dealii/dealii:v9.7.1-noble
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

steps:
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: dealii/dealii:v9.6.0-jammy
image: dealii/dealii:v9.7.1-noble
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

steps:
Expand All @@ -45,4 +45,4 @@ jobs:
cmake .. -GNinja -DCMAKE_CXX_FLAGS=-Werror -DCMAKE_BUILD_TYPE=Release
ninja
ctest -N
ctest --output-on-failure
ctest --output-on-failure
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENDIF()
CMAKE_MINIMUM_REQUIRED(VERSION 3.13.4)


FIND_PACKAGE(deal.II 9.5.0 REQUIRED
FIND_PACKAGE(deal.II 9.7.1 REQUIRED
HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Just follow the [instructions](https://github.com/dealii/dealii/wiki/deal.II-in-
We provide the possibility of using Docker as a tool to provide a fully operational environment for our library. To use such tool you need to install Docker following the [instructions](https://docs.docker.com/engine/installation/) provided by its authors. Then you can execute the following command line instruction

```
docker run -v `pwd`:/pwd_to_your_own_directory/ -i -t dealii/dealii:v9.6.0-jammy bash
docker run -v `pwd`:/pwd_to_your_own_directory/ -i -t dealii/dealii:v9.7.1-noble bash
```

to retrieve the environment. In such a shell you can easily compile the pi-BEM library following its own instructions.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.0
9.7.1
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dealii/dealii:v9.6.0-jammy
FROM dealii/dealii:v9.7.1-noble

# pi-BEM master image
RUN git clone https://github.com/mathLab/pi-BEM/ &&\
Expand Down
20 changes: 10 additions & 10 deletions docs/complex-robin.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Multiple potentials, complex problems and Robin conditions

## Build and run with deal.II 9.6.0
## Build and run with deal.II 9.7.1

From the repository root, build both configurations in the supplied container:

```sh
docker run --rm -v "$PWD:/workspace" -w /workspace \
dealii/dealii:v9.6.0-jammy bash -lc '
cmake -S . -B build-docker/9.6.0 -GNinja \
dealii/dealii:v9.7.1-noble bash -lc '
cmake -S . -B build-docker/9.7.1 -GNinja \
-DCMAKE_BUILD_TYPE=DebugRelease -DCMAKE_CXX_FLAGS=-Werror &&
cmake --build build-docker/9.6.0 -j 4 &&
cd build-docker/9.6.0 && ctest --output-on-failure
cmake --build build-docker/9.7.1 -j 4 &&
cd build-docker/9.7.1 && ctest --output-on-failure
'
```

Expand All @@ -24,13 +24,13 @@ The sphere examples use paths relative to `samples/`. Keep each run's output
separate, and copy both the parameter file and its grid directory:

```sh
mkdir -p build-docker/9.6.0/example-complex
cp -R samples/grids build-docker/9.6.0/example-complex/
mkdir -p build-docker/9.7.1/example-complex
cp -R samples/grids build-docker/9.7.1/example-complex/
cp samples/ref_params_sphere_complex_DR_direct.prm \
build-docker/9.6.0/example-complex/parameters_bem_3.prm
build-docker/9.7.1/example-complex/parameters_bem_3.prm
docker run --rm -v "$PWD:/workspace" \
-w /workspace/build-docker/9.6.0/example-complex \
dealii/dealii:v9.6.0-jammy bash -lc '
-w /workspace/build-docker/9.7.1/example-complex \
dealii/dealii:v9.7.1-noble bash -lc '
mpirun -np 2 ../bem_fma_3d 2
'
```
Expand Down
2 changes: 1 addition & 1 deletion include/ass_leg_function.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
#define __sissa__ass_leg_function_h

#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/utilities.h>

#include <deal.II/dofs/dof_accessor.h>
Expand Down
8 changes: 4 additions & 4 deletions include/bem_fma.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ class BEMFMA : public ParameterAcceptor
protected:
/// Three pointers to the problem parameters to be set equal to
/// the ones in the calling problem through the init function
SmartPointer<const DoFHandler<dim - 1, dim>> fma_dh;
SmartPointer<const Mapping<dim - 1, dim>> fma_mapping;
ObserverPointer<const DoFHandler<dim - 1, dim>> fma_dh;
ObserverPointer<const Mapping<dim - 1, dim>> fma_mapping;

/// Truncation order for the multipole
/// and local expansion series: it is
Expand Down Expand Up @@ -455,8 +455,8 @@ class BEMFMA : public ParameterAcceptor
ConditionalOStream pcout;

/// TODO parsed quadrature?
std::shared_ptr<Quadrature<dim - 1>> quadrature;
SmartPointer<const Vector<double>> dirichlet_nodes;
std::shared_ptr<Quadrature<dim - 1>> quadrature;
ObserverPointer<const Vector<double>> dirichlet_nodes;
/// This should be erased by the usage of the constraint matrix.
const std::vector<std::set<types::global_dof_index>> *double_nodes_set;

Expand Down
2 changes: 1 addition & 1 deletion include/bem_problem.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@

#include <deal.II/base/conditional_ostream.h>
#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parameter_acceptor.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/types.h>
#include <deal.II/base/utilities.h>

Expand Down
2 changes: 1 addition & 1 deletion include/boundary_conditions.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#ifndef boundary_conditions_h
#define boundary_conditions_h
#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parameter_acceptor.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/types.h>
#include <deal.II/base/utilities.h>

Expand Down
2 changes: 1 addition & 1 deletion include/computational_domain.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

#include <deal.II/base/conditional_ostream.h>
#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parameter_acceptor.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/types.h>
#include <deal.II/base/utilities.h>

Expand Down
4 changes: 2 additions & 2 deletions include/constrained_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <deal.II/base/config.h>

#include <deal.II/base/memory_consumption.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/thread_management.h>
#include <deal.II/base/types.h>

Expand Down Expand Up @@ -76,7 +76,7 @@ class ConstrainedOperator
unsigned int this_mpi_process;
};

/*@}*/
/** @} */
/*---------------------- Inline functions -----------------------------------*/

//--------------------------------Iterators--------------------------------------//
Expand Down
2 changes: 1 addition & 1 deletion include/constrained_matrix_complex.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <deal.II/base/config.h>

#include <deal.II/base/memory_consumption.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/thread_management.h>
#include <deal.II/base/types.h>

Expand Down
2 changes: 1 addition & 1 deletion include/driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

#include <deal.II/base/conditional_ostream.h>
#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parameter_acceptor.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/utilities.h>

#include <deal.II/lac/full_matrix.h>
Expand Down
2 changes: 1 addition & 1 deletion include/laplace_kernel.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef laplace_kernel_h
#define laplace_kernel_h

#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/point.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/utilities.h>

#include <cmath>
Expand Down
5 changes: 3 additions & 2 deletions include/local_expansion.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,9 @@ class LocalExpansion

/// Return a read-only reference to owned triangular coefficient storage,
/// indexed by n*(n+1)/2+m. Copy the vector to retain an independent snapshot.
/// Use SetCoeff()/AddToCoeff() for changes; assignment invalidates
/// references.
/// Use SetCoeff()/AddToCoeff() for changes. Assignment can invalidate
/// references to individual coefficients; the vector object remains owned
/// here.
inline const std::vector<std::complex<double>> &
GetCoeffs() const
{
Expand Down
5 changes: 3 additions & 2 deletions include/multipole_expansion.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,9 @@ class MultipoleExpansion

/// Return a read-only reference to owned triangular coefficient storage,
/// indexed by n*(n+1)/2+m. Copy the vector to retain an independent snapshot.
/// Use SetCoeff()/AddToCoeff() for changes; assignment invalidates
/// references.
/// Use SetCoeff()/AddToCoeff() for changes. Assignment can invalidate
/// references to individual coefficients; the vector object remains owned
/// here.
inline const std::vector<std::complex<double>> &
GetCoeffs() const
{
Expand Down
2 changes: 1 addition & 1 deletion include/octree_block.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#define octree_block_h

#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/point.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/utilities.h>

#include <deal.II/dofs/dof_accessor.h>
Expand Down
4 changes: 2 additions & 2 deletions include/true_constrained_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# include <deal.II/base/config.h>

# include <deal.II/base/memory_consumption.h>
# include <deal.II/base/smartpointer.h>
# include <deal.II/base/observer_pointer.h>
# include <deal.II/base/thread_management.h>

# include <deal.II/lac/affine_constraints.h>
Expand Down Expand Up @@ -90,7 +90,7 @@ class ConstrainedOperator
unsigned int this_mpi_process;
};

/*@}*/
/** @} */
/*---------------------- Inline functions -----------------------------------*/


Expand Down
2 changes: 1 addition & 1 deletion include/vector_tools_integrate_difference.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#define vector_tools_integrate_difference_h

#include <deal.II/base/convergence_table.h>
#include <deal.II/base/observer_pointer.h>
#include <deal.II/base/parsed_function.h>
#include <deal.II/base/quadrature_lib.h>
#include <deal.II/base/quadrature_selector.h>
#include <deal.II/base/smartpointer.h>
#include <deal.II/base/types.h>
#include <deal.II/base/utilities.h>

Expand Down
4 changes: 3 additions & 1 deletion scripts/docker.sh
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
docker run -P -t -i -v `pwd`:/home/dealii/app:rw mathlab/deal2lkit:v8.5.0-debugrelease
#!/bin/sh
# Open the supported deal.II environment in the current checkout.
exec docker run --rm -it -v "$PWD:/app" -w /app dealii/dealii:v9.7.1-noble bash
6 changes: 4 additions & 2 deletions scripts/dr.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#!/bin/bash
docker run --user $(id -u):$(id -g) -i -t --rm -P -v `pwd`:/app:rw dealii/dealii:v9.6.0-jammy /bin/sh -c "cd /app; $@"
#!/bin/sh
# Run a shell command in the supported deal.II environment.
exec docker run --user "$(id -u):$(id -g)" -it --rm \
-v "$PWD:/app" -w /app dealii/dealii:v9.7.1-noble /bin/sh -c "$*"
7 changes: 4 additions & 3 deletions scripts/run_docker.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
CMD=`grep -e '- ' .travis.yml | sed 's/- //'`
docker run --user $(id -u):$(id -g) -i -t --rm -P -v `pwd`:/app:rw mathlab/deal2lkit:v9.1.1-debugrelease /bin/sh -c "cd /app; $CMD"
#!/bin/sh
# Run the same warning-free Debug/Release checks used for releases.
exec docker run --rm -v "$PWD:/app" -w /app dealii/dealii:v9.7.1-noble \
bash -lc 'set -e; cmake -S . -B build-docker/9.7.1 -GNinja -DCMAKE_BUILD_TYPE=DebugRelease -DCMAKE_CXX_FLAGS=-Werror; cmake --build build-docker/9.7.1 -j 4; cd build-docker/9.7.1; ctest --output-on-failure'
Loading
Loading