From c6e31c174842c7525ea4ccc862d521cfeef98268 Mon Sep 17 00:00:00 2001
From: "Michael Zikeli (at CIP3)" <michael.zikeli@fau.de>
Date: Fri, 4 Apr 2025 13:42:24 +0200
Subject: [PATCH] Fix non matching types in std::max statement.
---
apps/benchmarks/UniformGridCPU/UniformGridCPU.cpp | 2 +-
apps/benchmarks/UniformGridGPU/UniformGridGPU.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/benchmarks/UniformGridCPU/UniformGridCPU.cpp b/apps/benchmarks/UniformGridCPU/UniformGridCPU.cpp
index c8a92078c..e701167d1 100644
--- a/apps/benchmarks/UniformGridCPU/UniformGridCPU.cpp
+++ b/apps/benchmarks/UniformGridCPU/UniformGridCPU.cpp
@@ -239,7 +239,7 @@ int main(int argc, char** argv)
// Prints timing statistics for every outer iteration
// TODO: to much information, should be a verbose option only.
// performance.logResultOnRoot(timesteps, timeToSolutionForCurrentOuterIteration);
- if ( outerIteration % std::max( 1, std::ceil(outerIterations / 10) ) == 0)
+ if ( outerIteration % std::max( uint_t(1), walberla::numeric_cast<uint_t>(std::ceil(outerIterations / 10) )) == 0)
{
WALBERLA_LOG_RESULT_ON_ROOT("Outer step [" << outerIteration << "/" << outerIterations << "] took " << timeToSolutionForCurrentOuterIteration << " seconds.")
}
diff --git a/apps/benchmarks/UniformGridGPU/UniformGridGPU.cpp b/apps/benchmarks/UniformGridGPU/UniformGridGPU.cpp
index 2e7454c55..3d4a0de63 100644
--- a/apps/benchmarks/UniformGridGPU/UniformGridGPU.cpp
+++ b/apps/benchmarks/UniformGridGPU/UniformGridGPU.cpp
@@ -288,7 +288,7 @@ int main(int argc, char** argv)
// Prints timing statistics for every outer iteration
// TODO: to much information, should be a verbose option only.
// performance.logResultOnRoot(timesteps, timeToSolutionForCurrentOuterIteration);
- if ( outerIteration % std::max( 1, std::ceil(outerIterations / 10) ) == 0)
+ if ( outerIteration % std::max( uint_t(1), walberla::numeric_cast<uint_t>(std::ceil(outerIterations / 10) )) == 0)
{
WALBERLA_LOG_RESULT_ON_ROOT("Outer step [" << outerIteration << "/" << outerIterations << "] took " << timeToSolutionForCurrentOuterIteration << " seconds.")
}
--
GitLab