Merge branch 'master' of /Users/eschnett/Cbeta/carpet/

1 files changed, 34 insertions, 18 deletions

diff --git a/Carpet/LoopControl/src/wavetoy-loopcontrol.c b/Carpet/LoopControl/src/wavetoy-loopcontrol.c
index 0b7ce7782..f7fa99a40 100644
--- a/Carpet/LoopControl/src/wavetoy-loopcontrol.c
+++ b/Carpet/LoopControl/src/wavetoy-loopcontrol.c
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 
 #ifdef _OPENMP
-
-#include <omp.h>
+#  include <omp.h>
+#endif
 
 #include "loopcontrol.h"
 
@@ -45,6 +45,38 @@
 #define BUILD_STANDALONE
  ***/
 
+
+
+#ifndef _OPENMP
+/* Replacements for some OpenMP routines if OpenMP is not available */
+
+static inline
+int
+omp_get_thread_num (void)
+{
+  return 0;
+}
+
+static inline
+int
+omp_get_num_threads (void)
+{
+  return 1;
+}
+
+static inline
+double
+omp_get_wtime (void)
+{
+  struct timeval tv;
+  gettimeofday (& tv, NULL);
+  return tv.tv_sec + 1.0e-6 * tv.tv_usec;
+}
+
+#endif
+
+
+
 static int NI;
 static int NJ;
 static int NK;
@@ -234,19 +266,3 @@ int lc_demo (void)
   //
   return 0;
 }
-#else
-#ifdef BUILD_STANDALONE
- int main(void) {
-   printf("\n We do not have OpenMP. Can't do anything. \n");
-   return 0;
- }
-#else
- int lc_demo (void)
- {
-   printf("\n We do not have OpenMP. Can't do anything. \n");
-   return 0;
- }
-#endif
-
-
-#endif