From c2b585929fac3ab3ce24b9cc2a9d7835d36000b6 Mon Sep 17 00:00:00 2001 From: Martin Bauer <martin.bauer@fau.de> Date: Thu, 21 Feb 2019 09:11:00 +0100 Subject: [PATCH] OpenMP Header: missing walberla definitions include - WALBERLA_BUILD_WITH_OPENMP was never defined --- src/core/OpenMP.h | 1 + src/waLBerlaDefinitions.in.h | 1 + tests/core/OpenMPWrapperTest.cpp | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/OpenMP.h b/src/core/OpenMP.h index 825046dc1..67d32589a 100644 --- a/src/core/OpenMP.h +++ b/src/core/OpenMP.h @@ -21,6 +21,7 @@ #pragma once #include "core/Abort.h" +#include "waLBerlaDefinitions.h" // MPI SECTION // diff --git a/src/waLBerlaDefinitions.in.h b/src/waLBerlaDefinitions.in.h index 563ec863a..610aea18d 100644 --- a/src/waLBerlaDefinitions.in.h +++ b/src/waLBerlaDefinitions.in.h @@ -20,6 +20,7 @@ // External libraries #cmakedefine WALBERLA_BUILD_WITH_MPI +#cmakedefine WALBERLA_BUILD_WITH_OPENMP #cmakedefine WALBERLA_BUILD_WITH_METIS #cmakedefine WALBERLA_BUILD_WITH_PARMETIS diff --git a/tests/core/OpenMPWrapperTest.cpp b/tests/core/OpenMPWrapperTest.cpp index 6da8cbadc..d71965239 100644 --- a/tests/core/OpenMPWrapperTest.cpp +++ b/tests/core/OpenMPWrapperTest.cpp @@ -21,11 +21,13 @@ #include <core/debug/TestSubsystem.h> #include <core/logging/Logging.h> #include <core/OpenMP.h> +#include <core/mpi/Environment.h> using namespace walberla; -int main( int /*argc*/, char** /*argv*/ ) +int main( int argc, char** argv ) { + mpi::Environment env(argc, argv); debug::enterTestMode(); WALBERLA_OPENMP_SECTION() -- GitLab