From 3f0505a62ac2538d433ad70c9ca0654402cbc896 Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Wed, 25 Jan 2023 13:39:13 +0100
Subject: [PATCH] CI Compiler changes
---
.gitlab-ci.yml | 296 +++---------------
CMakeLists.txt | 11 +
.../FluidParticleWorkloadDistribution.cpp | 4 +-
.../ExtrapolateNormalsSweep.impl.h | 2 -
tests/core/mpi/BufferTest.cpp | 10 +-
.../PeriodicIntersect.cpp | 2 +
.../UpdateParticleMapping.cpp | 2 -
tests/mesa_pd/kernel/LinearSpringDashpot.cpp | 4 -
tests/mesh/NumericIntegrationTest.cpp | 2 -
9 files changed, 68 insertions(+), 265 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4131a3914..77f6a476b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -944,7 +944,6 @@ gcc_11_mpionly:
gcc_11_hybrid:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
- stage: pretest
before_script:
- pip3 install lbmpy==1.1 jinja2 pytest
- cd python
@@ -956,6 +955,9 @@ gcc_11_hybrid:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda11
- docker
@@ -978,6 +980,9 @@ gcc_11_serial_dbg:
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda11
- docker
@@ -998,6 +1003,9 @@ gcc_11_mpionly_dbg:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda11
- docker
@@ -1017,6 +1025,9 @@ gcc_11_hybrid_dbg:
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda11
- docker
@@ -1039,208 +1050,16 @@ gcc_11_hybrid_dbg_sp:
WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
- tags:
- - cuda11
- - docker
-
-clang_6.0_serial:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_6.0_mpionly:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_6.0_hybrid:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_6.0_serial_dbg:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_6.0_mpionly_dbg:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- - docker
-
-clang_6.0_hybrid_dbg:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- tags:
- - cuda
- - docker
-
-clang_6.0_hybrid_dbg_sp:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_DOUBLE_ACCURACY: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_serial:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_mpionly:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_hybrid:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_serial_dbg:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_mpionly_dbg:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_hybrid_dbg:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
- - docker
-
-clang_7.0_hybrid_dbg_sp:
- extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
- variables:
- WALBERLA_BUILD_WITH_CUDA: "ON"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_DOUBLE_ACCURACY: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_serial:
+gcc_12_serial:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -1250,12 +1069,12 @@ clang_8.0_serial:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_mpionly:
+gcc_12_mpionly:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
@@ -1263,78 +1082,64 @@ clang_8.0_mpionly:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_hybrid:
+gcc_12_hybrid:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
+ stage: pretest
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_serial_dbg:
+gcc_12_serial_dbg:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_mpionly_dbg:
+gcc_12_mpionly_dbg:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_hybrid_dbg:
+gcc_12_hybrid_dbg:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
-clang_8.0_hybrid_dbg_sp:
+gcc_12_hybrid_dbg_sp:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:12
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
+ - cuda11
- docker
clang_9.0_serial:
@@ -1413,9 +1218,6 @@ clang_9.0_hybrid_dbg:
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
@@ -2007,9 +1809,9 @@ clang_13.0_hybrid_dbg_sp:
- cuda11
- docker
-inteloneapi_22.1_serial:
+inteloneapi_22.3_serial:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -2021,9 +1823,9 @@ inteloneapi_22.1_serial:
tags:
- docker
-inteloneapi_22.1_mpionly:
+inteloneapi_22.3_mpionly:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
@@ -2033,17 +1835,17 @@ inteloneapi_22.1_mpionly:
tags:
- docker
-inteloneapi_22.1_hybrid:
+inteloneapi_22.3_hybrid:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
tags:
- docker
-inteloneapi_22.1_serial_dbg:
+inteloneapi_22.3_serial_dbg:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -2053,9 +1855,9 @@ inteloneapi_22.1_serial_dbg:
tags:
- docker
-inteloneapi_22.1_mpionly_dbg:
+inteloneapi_22.3_mpionly_dbg:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -2063,18 +1865,18 @@ inteloneapi_22.1_mpionly_dbg:
tags:
- docker
-inteloneapi_22.1_hybrid_dbg:
+inteloneapi_22.3_hybrid_dbg:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
tags:
- docker
-inteloneapi_22.1_hybrid_dbg_sp:
+inteloneapi_22.3_hybrid_dbg_sp:
extends: .build_template
- image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.1
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bed4370c3..d2200a984 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -422,6 +422,17 @@ if( WALBERLA_CXX_COMPILER_IS_GNU OR WALBERLA_CXX_COMPILER_IS_INTEL OR WALBERLA_C
endif()
endif()
+# Omit maybe-uninitialized for gcc 12 for now. Check if it is a bug or a real problem:
+if( WALBERLA_CXX_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0" )
+ add_flag( CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized" )
+endif()
+
+# GCC 12 reports a "array bounds" warning at UniformBufferedScheme.h:297 (error: array subscript 26 is above array bounds of)
+# when e.g. compiling the GhostLayerCommTest.
+# Since this is most probably a bug in GCC disable the warning for now
+if( WALBERLA_CXX_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0" )
+ add_flag( CMAKE_CXX_FLAGS "-Wno-array-bounds" )
+endif()
#fastmath
if ( WALBERLA_BUILD_WITH_FASTMATH )
diff --git a/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/FluidParticleWorkloadDistribution.cpp b/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/FluidParticleWorkloadDistribution.cpp
index 943d6ee9d..afba732e9 100644
--- a/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/FluidParticleWorkloadDistribution.cpp
+++ b/apps/benchmarks/FluidParticleCouplingWithLoadBalancing/FluidParticleWorkloadDistribution.cpp
@@ -439,14 +439,14 @@ void evaluateParticleSimulation(const shared_ptr<mesa_pd::data::ParticleStorage>
{
auto numShapes = ss->shapes.size();
uint_t numLocalParticles = 0;
- uint_t numGhostParticles = 0;
+ //uint_t numGhostParticles = 0;
uint_t numGlobalParticlesOfRank = 0;
for(auto p = ps->begin(); p != ps->end(); ++p)
{
using namespace walberla::mesa_pd::data::particle_flags;
if (isSet(p->getFlags(), GHOST))
{
- ++numGhostParticles;
+ //++numGhostParticles;
} else if (isSet(p->getFlags(), GLOBAL))
{
++numGlobalParticlesOfRank;
diff --git a/src/lbm/free_surface/surface_geometry/ExtrapolateNormalsSweep.impl.h b/src/lbm/free_surface/surface_geometry/ExtrapolateNormalsSweep.impl.h
index 309bc79bb..3e80905cb 100644
--- a/src/lbm/free_surface/surface_geometry/ExtrapolateNormalsSweep.impl.h
+++ b/src/lbm/free_surface/surface_geometry/ExtrapolateNormalsSweep.impl.h
@@ -45,7 +45,6 @@ void ExtrapolateNormalsSweep< Stencil_T, FlagField_T, VectorField_T >::operator(
WALBERLA_FOR_ALL_CELLS(flagFieldIt, flagField, normalFieldIt, normalField, {
if (!isFlagSet(flagFieldIt, interfaceFlag) && isFlagInNeighborhood< stencil::D3Q27 >(flagFieldIt, interfaceFlag))
{
- uint_t count = uint_c(0);
vector_t& normal = *normalFieldIt;
normal.set(real_c(0), real_c(0), real_c(0));
@@ -56,7 +55,6 @@ void ExtrapolateNormalsSweep< Stencil_T, FlagField_T, VectorField_T >::operator(
if (isFlagSet(flagFieldIt.neighbor(*i), interfaceFlag))
{
normal += real_c(stencil::gaussianMultipliers[i.toIdx()]) * normalFieldIt.neighbor(*i);
- ++count;
}
}
diff --git a/tests/core/mpi/BufferTest.cpp b/tests/core/mpi/BufferTest.cpp
index 887927a47..bbda58f6e 100644
--- a/tests/core/mpi/BufferTest.cpp
+++ b/tests/core/mpi/BufferTest.cpp
@@ -293,12 +293,10 @@ void bufferTestUInt8()
std::string recvStdString, recvStdStringEmpty;
- walberla::optional<int> recvOptional0, recvOptional1, recvOptional2, recvOptional3;
-
- recvOptional0 = 123;
- recvOptional1 = 123;
- recvOptional2 = 456;
- recvOptional3 = 456;
+ walberla::optional<int> recvOptional0 = 123;
+ walberla::optional<int> recvOptional1 = 123;
+ walberla::optional<int> recvOptional2 = 456;
+ walberla::optional<int> recvOptional3 = 456;
rb >> recvStdString >> recvStdStringEmpty;
rb >> recvOptional0 >> recvOptional1;
diff --git a/tests/domain_decomposition/PeriodicIntersect.cpp b/tests/domain_decomposition/PeriodicIntersect.cpp
index 6753c472e..0e89f5639 100644
--- a/tests/domain_decomposition/PeriodicIntersect.cpp
+++ b/tests/domain_decomposition/PeriodicIntersect.cpp
@@ -183,12 +183,14 @@ int main( int argc, char** argv )
{
++countdx;
WALBERLA_LOG_DETAIL("Intersection dx: " << countdx << " Periodic: " << !box1.intersects(box2));
+ WALBERLA_UNUSED( countdx );
}
if (periodicCheck(*forest, box1, box2))
{
WALBERLA_CHECK(checkWithDx);
++count;
WALBERLA_LOG_DETAIL("Intersection: " << count << " Periodic: " << !box1.intersects(box2));
+ WALBERLA_UNUSED( count );
}
}
diff --git a/tests/lbm_mesapd_coupling/momentum_exchange_method/UpdateParticleMapping.cpp b/tests/lbm_mesapd_coupling/momentum_exchange_method/UpdateParticleMapping.cpp
index 6ac2b87c8..4ff4bc3d8 100644
--- a/tests/lbm_mesapd_coupling/momentum_exchange_method/UpdateParticleMapping.cpp
+++ b/tests/lbm_mesapd_coupling/momentum_exchange_method/UpdateParticleMapping.cpp
@@ -177,7 +177,6 @@ public:
// check the mapping of a plane for a given AABB
void operator()(std::string testIdentifier, const math::AABB & planeAABB )
{
- uint_t cellCounter( uint_t(0) );
for( auto blockIt = blocks_->begin(); blockIt != blocks_->end(); ++blockIt )
{
auto * boundaryHandling = blockIt->getData< BoundaryHandling_T >( boundaryHandlingID_ );
@@ -193,7 +192,6 @@ public:
testIdentifier << " Invalid mapping in cell " << cellIt
<< " with center at " << cellCenter
<< " - expected boundary cell since inside AABB " << planeAABB);
- ++cellCounter;
}
}
}
diff --git a/tests/mesa_pd/kernel/LinearSpringDashpot.cpp b/tests/mesa_pd/kernel/LinearSpringDashpot.cpp
index cc7f2abb8..86b3ef6a4 100644
--- a/tests/mesa_pd/kernel/LinearSpringDashpot.cpp
+++ b/tests/mesa_pd/kernel/LinearSpringDashpot.cpp
@@ -150,7 +150,6 @@ int main( int argc, char ** argv )
WALBERLA_LOG_DEVEL("begin: vel = " << p.getLinearVelocity() << ", contact vel: " << getVelocityAtWFPoint(0,*accessor,p.getPosition() + Vec3(0,0,-radius)) );
- uint_t steps = 0;
real_t maxPenetration = real_t(0);
do
{
@@ -164,15 +163,12 @@ int main( int argc, char ** argv )
maxPenetration = std::max( maxPenetration, std::abs(penetration));
dem(acd.getIdx1(), acd.getIdx2(), *accessor, acd.getContactPoint(), acd.getContactNormal(), acd.getPenetrationDepth(), dt);
- //auto force = accessor->getForce(0);
- //WALBERLA_LOG_INFO(steps << ": penetration = " << penetration << " || vel = " << accessor->getLinearVelocity(0) << " || force = " << force);
}
rch(*ps);
if(useVelocityVerlet) vvPostForce(0,*accessor);
else implEuler(0, *accessor);
- ++steps;
} while (double_cast(0, 1, *accessor, acd, *accessor ) || p.getLinearVelocity()[2] < 0);
real_t uTout = p.getLinearVelocity()[0] - radius * p.getAngularVelocity()[1];
diff --git a/tests/mesh/NumericIntegrationTest.cpp b/tests/mesh/NumericIntegrationTest.cpp
index 7f393ee0c..da1a55088 100644
--- a/tests/mesh/NumericIntegrationTest.cpp
+++ b/tests/mesh/NumericIntegrationTest.cpp
@@ -87,7 +87,6 @@ Matrix3<real_t> inertiaTensorNumeric( const ContainmentT & body, const AABB & aa
Vector3<real_t> pointOfReference = aabb.min() + Vector3<real_t>( real_t(0.5) * spacing );
math::KahanAccumulator<real_t> inertiaTensor[6];
- uint_t numPoints = 0;
for(grid_generator::SCIterator it( aabb, pointOfReference, spacing ); it != grid_generator::SCIterator(); ++it)
{
@@ -104,7 +103,6 @@ Matrix3<real_t> inertiaTensorNumeric( const ContainmentT & body, const AABB & aa
inertiaTensor[3] += x*x + z*z;
inertiaTensor[4] += -y*z;
inertiaTensor[5] += x*x + y*y;
- ++numPoints;
}
}
--
GitLab