Ensure that _OPENMP and BOUT_USE_OPENMP is the same

boutproject · Feb 21, 2024 · f9b8426 · f9b8426
1 parent 828552b
commit f9b8426
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/bout/array.hxx b/include/bout/array.hxx
@@ -31,7 +31,7 @@
 #include <memory>
 #include <vector>
 
-#ifdef _OPENMP
+#if BOUT_USE_OPENMP
 #include <omp.h>
 #endif
 

diff --git a/include/bout/openmpwrap.hxx b/include/bout/openmpwrap.hxx
@@ -44,9 +44,13 @@
 #define BOUT_OMP(...) _Pragma(INDIRECT2(__VA_ARGS__))
 #else
 #define BOUT_OMP(...)
+#ifdef _OPENMP
 inline int constexpr omp_get_max_threads() { return 1; }
 inline int constexpr omp_get_num_threads() { return 1; }
 inline int constexpr omp_get_thread_num() { return 0; }
+#else
+#error OpenMP used but BOUT++ thinks it is disabled
+#endif
 #endif
 
 //Perhaps want to cleanup local helpers with below, but DON'T!