From 328cb2b00b38957e3a58c5edfe3bdd722407d0a7 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@cct.lsu.edu>
Date: Thu, 24 Apr 2008 18:44:28 -0500
Subject: CarpetInterp: Remove problematic OpenMP parallelisation

The C++ STL is incompatible with OpenMP.  Don't parallelise loops which access vector<bool>.
---
 Carpet/CarpetInterp/src/interp.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'Carpet/CarpetInterp')

diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc
index ae9461698..9ebb438f2 100644
--- a/Carpet/CarpetInterp/src/interp.cc
+++ b/Carpet/CarpetInterp/src/interp.cc
@@ -502,12 +502,22 @@ namespace CarpetInterp {
       {
         vector<bool> filled(tmp.size(), false);
         for (size_t n=0; n<dist::size(); ++n) {
-#pragma omp parallel for
+          //#pragma omp parallel for
           for (int i=0; i<recvcnt.AT(n); ++i) {
             assert (not filled.AT(recvdispl.AT(n)+i));
             filled.AT(recvdispl.AT(n)+i) = true;
           }
         }
+        bool error = false;
+        for (int i=0; i<filled.size(); ++i) {
+          error = error or not (filled.AT(i));
+        }
+        if (error) {
+          cerr << "error" << endl;
+          cerr << "recvdispl: " << recvdispl << endl;
+          cerr << "recvcnt: " << recvcnt << endl;
+          cerr << "filled: " << filled << endl;
+        }
 #pragma omp parallel for
         for (int i=0; i<filled.size(); ++i) {
           assert (filled.AT(i));
@@ -603,7 +613,7 @@ namespace CarpetInterp {
       {
         vector<bool> filled(source_map.size(), false);
         for (size_t n=0; n<dist::size(); ++n) {
-#pragma omp parallel for
+          //#pragma omp parallel for
           for (int i=0; i<recvcnt.AT(n); ++i) {
             assert (not filled.AT(recvdispl.AT(n)+i));
             filled.AT(recvdispl.AT(n)+i) = true;
-- 
cgit v1.2.3