Skip to content

Commit

Permalink
Merge branch 'master' into Helmholtz
Browse files Browse the repository at this point in the history
  • Loading branch information
mx-nlte authored Feb 27, 2024
2 parents 499b2e4 + 6886edf commit d991edf
Show file tree
Hide file tree
Showing 72 changed files with 5,224 additions and 649 deletions.
91 changes: 0 additions & 91 deletions .circleci/config.yml

This file was deleted.

47 changes: 47 additions & 0 deletions .github/workflows/build-n-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build and Deploy

on:
push:
branches: [ "master" ]

permissions:
contents: write

jobs:
build-n-test:
uses: ./.github/workflows/build-n-test.yml
with:
target: E2Etests

coverage-monitor:
uses: ./.github/workflows/coverage-monitor.yml

deploy-docs:
needs: [coverage-monitor, build-n-test]
concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3

- name: Getting Doxygen
run: |
sudo apt-get install --yes doxygen
- name: Getting dot
run: |
sudo apt-get install --yes graphviz
- name: Creating Documentation
run: |
doxygen Doxyfile
- name: Download Coverage Report
uses: actions/download-artifact@v4
with:
path: coverage

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: .
2 changes: 1 addition & 1 deletion .github/workflows/build-n-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Configure system
run: sudo apt-get update
Expand Down
66 changes: 66 additions & 0 deletions .github/workflows/coverage-monitor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Coverage Monitor

on:
workflow_call:

permissions:
contents: write

env:
BUILD_TYPE: Coverage

jobs:
coverage-monitor:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: "3.10"

- name: Configure system
run: sudo apt-get update

- name: Install Eigen3
run: sudo apt-get install --yes libeigen3-dev

- name: Install Gcovr
run: sudo pip install gcovr

- name: Configure CMake
# Use a bash shell so we can use the same syntax for environment variable
# access regardless of the host operating system
shell: bash
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -B build

- name: Build
shell: bash
run: cmake --build build --config $BUILD_TYPE -j 2 --target unittests

- name: Run Unittests
working-directory: ${{github.workspace}}/build
shell: bash
run: ctest -C $BUILD_TYPE -L unittests --output-on-failure

- name: Create Coverage Report
working-directory: ${{github.workspace}}/build
shell: bash
run: |
mkdir ../coverage
gcovr -r ../ -f ../Bembel --html --html-details --output ../coverage/report.html
- name: Create Coverage Badge
working-directory: ${{github.workspace}}/build
shell: bash
run: |
npm install -g badge-maker
gcovr -r ../ -f ../Bembel > coverage.txt
badge coverage "$(cat coverage.txt | grep "TOTAL" | awk '{print $(NF-0)}')" :green > ../coverage/coverage.svg
- name: Upload Report
uses: actions/upload-artifact@v4
with:
name: report
path: coverage
48 changes: 0 additions & 48 deletions .github/workflows/monitor-coverage.yml

This file was deleted.

1 change: 0 additions & 1 deletion Bembel/AnsatzSpace
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_ANSATZSPACE_MODULE_

/**
* \ingroup Modules
* \defgroup AnsatzSpace AnsatzSpace
* \brief The AnsatzSpace module contains the routines managing the discrete
* space on the surface of the geometry.
Expand Down
1 change: 0 additions & 1 deletion Bembel/ClusterTree
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_CLUSTERTREE_MODULE_

/**
* \ingroup Modules
* \defgroup ClusterTree ClusterTree
* \brief The ClusterTree module introduces a structure onto the parametric
* surfaces.
Expand Down
1 change: 0 additions & 1 deletion Bembel/DuffyTrick
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_DUFFYTRICK_MODULE_

/**
* \ingroup Modules
* \defgroup DuffyTrick DuffyTrick
* \brief The DuffyTrick module provides quadrature routines for (nearly)
* singular integrals.
Expand Down
4 changes: 3 additions & 1 deletion Bembel/Geometry
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_GEOMETRY_MODULE_

/**
* \ingroup Modules
* \defgroup Geometry Geometry
* \brief This module handles all geometry related concerns.
*
Expand All @@ -31,6 +30,8 @@
#include <memory>
#include <string>
#include <vector>
#include <algorithm>
#include <ctime>

#include <Eigen/Dense>
#include <Eigen/Sparse>
Expand All @@ -42,6 +43,7 @@
#include "src/Geometry/Patch.hpp"
#include "src/Geometry/PatchVector.hpp"
#include "src/Geometry/GeometryIO.hpp"
#include "src/Geometry/GeometryIGS.hpp"
#include "src/Geometry/Geometry.hpp"

#endif // BEMBEL_GEOMETRY_MODULE_
1 change: 0 additions & 1 deletion Bembel/H2Matrix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_H2MATRIX_MODULE_

/**
* \ingroup Modules
* \defgroup H2Matrix H2Matrix
* \brief The H2Matrix module provides functionality for an efficient
* compression of the system matrix and reduction of the computational
Expand Down
1 change: 0 additions & 1 deletion Bembel/Helmholtz
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_HELMHOLTZOPERATOR_MODULE_

/**
* \ingroup Modules
* \defgroup Helmholtz Helmholtz
* \brief The Helmholtz module provides some specializations to solve Helmholtz
*problems.
Expand Down
34 changes: 34 additions & 0 deletions Bembel/HomogenisedLaplace
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// This file is part of Bembel, the higher order C++ boundary element library.
//
// Copyright (C) 2022 see <http://www.bembel.eu>
//
// It was written as part of a cooperation of J. Doelz, H. Harbrecht, S. Kurz,
// M. Multerer, S. Schoeps, and F. Wolf at Technische Universitaet Darmstadt,
// Universitaet Basel, and Universita della Svizzera italiana, Lugano. This
// source code is subject to the GNU General Public License version 3 and
// provided WITHOUT ANY WARRANTY, see <http://www.bembel.eu> for further
// information.

#ifndef BEMBEL_HOMOGENISEDLAPLACEOPERATOR_MODULE_
#define BEMBEL_HOMOGENISEDLAPLACEOPERATOR_MODULE_

/**
* \defgroup HomogenisedLaplace HomogenisedLaplace
* \brief The HomogenisedLaplace module provides some specializations to solve
* a homogenised Laplace problem.
**/

#include <functional>

#include <Eigen/Dense>

#include "LinearOperator"
#include "Potential"

#include "src/util/Sphericals.hpp"

#include "src/HomogenisedLaplace/Coefficients.hpp"
#include "src/HomogenisedLaplace/SingleLayerOperator.hpp"
#include "src/HomogenisedLaplace/SingleLayerPotential.hpp"

#endif
2 changes: 1 addition & 1 deletion Bembel/IO
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_VISUALIZE_MODULE_

/**
* \ingroup Modules
* \defgroup IO IO
* \brief The IO module provides input-output functionality.
**/
Expand All @@ -35,6 +34,7 @@
#include "src/IO/Stopwatch.hpp"
#include "src/IO/VTKDomainExport.hpp"
#include "src/IO/VTKSurfaceExport.hpp"
#include "src/IO/VTKPointExport.hpp"
#include "src/IO/print2file.hpp"

#endif // BEMBEL_VISUALIZE_MODULE_
1 change: 0 additions & 1 deletion Bembel/Laplace
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#define BEMBEL_LAPLACEOPERATOR_MODULE_

/**
* \ingroup Modules
* \defgroup Laplace Laplace
* \brief The Laplace module provides some specializations to solve Laplace
*problems.
Expand Down
Loading

0 comments on commit d991edf

Please sign in to comment.