From 591b29e88d1ab21dda9b0d83c9815bcddd6606fb Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@cct.lsu.edu>
Date: Fri, 3 Dec 2010 16:22:27 -0500
Subject: CarpetInterp: Use thorn NoMPI

---
 Carpet/CarpetInterp/interface.ccl |  2 ++
 Carpet/CarpetInterp/src/interp.cc | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'Carpet/CarpetInterp')

diff --git a/Carpet/CarpetInterp/interface.ccl b/Carpet/CarpetInterp/interface.ccl
index 85d5f38b0..4213b5198 100644
--- a/Carpet/CarpetInterp/interface.ccl
+++ b/Carpet/CarpetInterp/interface.ccl
@@ -2,6 +2,8 @@
 
 IMPLEMENTS: interp
 
+uses include header: nompi.h
+
 uses include header: data.hh
 uses include header: bbox.hh
 uses include header: data.hh
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc
index 065dd87cd..bbeeb7558 100644
--- a/Carpet/CarpetInterp/src/interp.cc
+++ b/Carpet/CarpetInterp/src/interp.cc
@@ -1,3 +1,8 @@
+#include <cctk.h>
+#include <cctk_Parameters.h>
+#include <util_ErrorCodes.h>
+#include <util_Table.h>
+
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -7,13 +12,11 @@
 #include <map>
 #include <vector>
 
-#include <mpi.h>
-
-#include "cctk.h"
-#include "cctk_Parameters.h"
-
-#include "util_ErrorCodes.h"
-#include "util_Table.h"
+#ifdef CCTK_MPI
+#  include <mpi.h>
+#else
+#  include "nompi.h"
+#endif
 
 #include "bbox.hh"
 #include "data.hh"
-- 
cgit v1.2.3