CarpetLib: Set number of OpenMP threads via an external function call

Set the number of OpenMP threads via an external function call instead
of via a CarpetLib parameter.

darcs-hash:20080114150439-dae7b-a6a6a629162ca195411852823e1ece0a2071d771.gz

1 files changed, 12 insertions, 2 deletions

diff --git a/Carpet/CarpetLib/src/dist.hh b/Carpet/CarpetLib/src/dist.hh
index 1206901e3..7d501c857 100644
--- a/Carpet/CarpetLib/src/dist.hh
+++ b/Carpet/CarpetLib/src/dist.hh
@@ -6,6 +6,9 @@
 #include <cstdlib>
 
 #include <mpi.h>
+#ifdef _OPENMP
+#  include <omp.h>
+#endif
 
 #include "cctk.h"
 
@@ -63,13 +66,20 @@ namespace dist {
     return size_;
   }
   
+  // Set number of threads
+  void set_num_threads (int num_threads);
+  
   // Local number of threads
-  int num_threads_worker ();
   inline int num_threads ()
   {
     static int num_threads_ = -1;
     if (num_threads_ == -1) {
-      num_threads_ = num_threads_worker();
+#ifdef _OPENMP
+      num_threads_ = omp_get_max_threads();
+#else
+      num_threads_ = 1;
+#endif
+      assert (num_threads_ >= 1);
     }
     return num_threads_;
   }