enable openmp for apple clang compiler

xLPMG · Jan 9, 2024 · 51ee65b · 51ee65b
1 parent b1248e5
commit 51ee65b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/SConstruct b/SConstruct
@@ -174,14 +174,23 @@ if 'report' in env['report']:
 #      OPENMP       #
 #####################
 if 'gnu' in env['omp']:
-  env.Append( CXXFLAGS = [ '-fopenmp' ] )
-  env.Append( LINKFLAGS = [ '-fopenmp' ] )
-  env.Append( CXXFLAGS = [ '-DUSEOMP' ] )
+  if OS == "Darwin":
+    env.Append( CXXFLAGS = [ '-Xpreprocessor', '-fopenmp' ] )
+    env.Append( LINKFLAGS = [ '-Xpreprocessor', '-fopenmp' ] )
+    env.Append( CXXFLAGS = [ '-DUSEOMP' ] )
+  else:
+    env.Append( CXXFLAGS = [ '-fopenmp' ] )
+    env.Append( LINKFLAGS = [ '-fopenmp' ] )
+    env.Append( CXXFLAGS = [ '-DUSEOMP' ] )
 if 'intel' in env['omp']:
   env.Append( CXXFLAGS = [ '-qopenmp' ] )
   env.Append( LINKFLAGS = [ '-qopenmp' ] )
   env.Append( CXXFLAGS = [ '-DUSEOMP' ] )
 
+if OS == "Darwin":
+  env.Append( CXXFLAGS = [ '-I/usr/local/opt/libomp/include' ] )
+  env.Append( LINKFLAGS = [ '-L/usr/local/opt/libomp/lib' ] )
+  env.Append( LINKFLAGS = [ '-lomp' ] )
 #####################
 #    SANITIZERS    #
 #####################

diff --git a/src/Launcher.h b/src/Launcher.h
@@ -9,6 +9,10 @@
 #ifndef TSUNAMI_LAB_LAUNCHER_H
 #define TSUNAMI_LAB_LAUNCHER_H
 
+#ifdef USEOMP
+#include <omp.h>
+#endif
+
 // waveprop patches
 #include "patches/WavePropagation1d.h"
 #include "patches/WavePropagation2d.h"
@@ -84,7 +88,7 @@ class tsunami_lab::Launcher
 
     // simulation parameters
     std::string m_solver = "";
-    tsunami_lab::patches::WavePropagation *m_waveProp = nullptr;
+    tsunami_lab::patches::WavePropagation *m_waveProp;
     tsunami_lab::t_idx m_nx = 0;
     tsunami_lab::t_idx m_ny = 0;
     tsunami_lab::t_idx m_nk = 1;
@@ -213,8 +217,8 @@ class tsunami_lab::Launcher
     //-----------------GETTERS------------------//
     //------------------------------------------//
 
-    void getWaveProp(tsunami_lab::patches::WavePropagation &o_waveprop){
-        o_waveprop = *m_waveProp;
+    tsunami_lab::patches::WavePropagation *getWaveProp(){
+        return m_waveProp;
     }
 
     void getSetupChoice(std::string &o_setupChoice){