Clean up OpenMP usage and make it required

CMakeLists.txt

@@ -7,7 +7,7 @@ project(richdem
 )
 
 find_package(GDAL)
-find_package(OpenMP)
+find_package(OpenMP REQUIRED)
 find_package(MPI)
 
 set(CMAKE_MACOSX_RPATH 1)
@@ -43,10 +43,6 @@ add_library(richdem
   src/terrain_generation/PerlinNoise.cpp
 )
 
-if(NOT OpenMP_CXX_FOUND)
-  message(WARNING "Compiling without OpenMP!")
-endif()
-
 # set_target_properties(richdem PROPERTIES VERSION ${PROJECT_VERSION})
 # set_target_properties(richdem PROPERTIES SOVERSION 2)
 

include/richdem/common/ProgressBar.hpp

@@ -18,22 +18,19 @@
 #ifndef _richdem_progress_bar_hpp_
 #define _richdem_progress_bar_hpp_
 
-#include <string>
-#include <iostream>
-#include <iomanip>
-#include <stdexcept>
 #include <richdem/common/timer.hpp>
 
-namespace richdem {
+#include <iomanip>
+#include <iostream>
+#include <stdexcept>
+#include <string>
 
-///Macros used to disguise the fact that we do not have multithreading enabled.
 #ifdef _OPENMP
   #include <omp.h>
-#else
-  #define omp_get_thread_num()  0
-  #define omp_get_num_threads() 1
 #endif
 
+namespace richdem {
+
 ///@brief Manages a console-based progress bar to keep the user entertained.
 ///
 ///Defining the global `RICHDEM_NO_PROGRESS` will

include/richdem/common/random.hpp

@@ -7,19 +7,15 @@
 #include <random>
 #include <string>
 
+#ifdef _OPENMP
+  #include <omp.h>
+#endif
+
 namespace richdem {
 
 ///Maximum number of threads this class should deal with
 #define PRNG_THREAD_MAX 32
 
-#ifdef _OPENMP
-  #include <omp.h>
-#else
-  #define omp_get_thread_num()  0
-  #define omp_get_num_threads() 1
-  #define omp_get_max_threads() 1
-#endif
-
 typedef std::string RandomEngineState;
 
 typedef std::mt19937 our_random_engine;