Skip to content

Commit b2d734c

Browse files
committed
Merge remote-tracking branch 'upstream/develop'
2 parents 0de11d5 + c379c1c commit b2d734c

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,25 @@ on: [push, pull_request]
44

55
jobs:
66
build-linux:
7-
runs-on: Ubuntu-18.04
7+
runs-on: Ubuntu-20.04
88
strategy:
99
matrix:
1010
compiler: ['g++-9', 'g++-8']
1111
separate: ['ON', 'OFF']
12+
1213
steps:
1314
- name: Checkout
1415
uses: actions/checkout@v2
1516
with:
1617
submodules: true
18+
- name: Install
19+
run: sudo apt-get install libboost-all-dev
20+
1721
- name: Configure
1822
run: |
1923
mkdir build
2024
cd build
21-
cmake .. -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DSEPARATE_BUILD=${{ matrix.separate }} -DUSE_OPENMP=ON -DBUILD_INTEGRATION_TEST=OFF -DBoost_USE_MULTITHREADED=ON -DBoost_ARCHITECTURE=-x64 -DBoost_ADDITIONAL_VERSIONS=1.72.0 -DFIND_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=${BOOST_ROOT_1_72_0}
25+
cmake .. -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DSEPARATE_BUILD=${{ matrix.separate }} -DUSE_OPENMP=ON -DBUILD_INTEGRATION_TEST=OFF -DFIND_BOOST=ON
2226
- name: Build
2327
run: |
2428
cd build && cmake --build .

test/core/test_excluded_volume_potential.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
BOOST_AUTO_TEST_CASE(EXV_double)
1414
{
15+
mjolnir::LoggerManager::set_default_logger(
16+
"test_excluded_volume_potential.log");
17+
1518
using traits_type = mjolnir::SimulatorTraits<double, mjolnir::UnlimitedBoundary>;
1619
using real_type = typename traits_type::real_type;
1720
using molecule_id_type = mjolnir::Topology::molecule_id_type;
@@ -46,6 +49,9 @@ BOOST_AUTO_TEST_CASE(EXV_double)
4649

4750
BOOST_AUTO_TEST_CASE(EXV_float)
4851
{
52+
mjolnir::LoggerManager::set_default_logger(
53+
"test_excluded_volume_potential.log");
54+
4955
using traits_type = mjolnir::SimulatorTraits<float, mjolnir::UnlimitedBoundary>;
5056
using real_type = typename traits_type::real_type;
5157
using molecule_id_type = mjolnir::Topology::molecule_id_type;

test/core/test_inverse_power_potential.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
BOOST_AUTO_TEST_CASE(InversePower_double)
1414
{
15+
mjolnir::LoggerManager::set_default_logger(
16+
"test_inverse_power_potential.log");
17+
1518
using traits_type = mjolnir::SimulatorTraits<double, mjolnir::UnlimitedBoundary>;
1619
using real_type = typename traits_type::real_type;
1720
using integer_type = typename mjolnir::InversePowerPotential<traits_type>::integer_type;

0 commit comments

Comments
 (0)