aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Carpet/CarpetInterp2/interface.ccl2
-rw-r--r--Carpet/CarpetInterp2/src/fasterp.cc12
2 files changed, 10 insertions, 4 deletions
diff --git a/Carpet/CarpetInterp2/interface.ccl b/Carpet/CarpetInterp2/interface.ccl
index 0b1363a6e..24bc256bf 100644
--- a/Carpet/CarpetInterp2/interface.ccl
+++ b/Carpet/CarpetInterp2/interface.ccl
@@ -6,6 +6,8 @@ INCLUDE HEADER: fasterp.hh IN carpetinterp2.hh
+USES INCLUDE HEADER: nompi.h
+
USES INCLUDE HEADER: defs.hh
USES INCLUDE HEADER: typeprops.hh
USES INCLUDE HEADER: vect.hh
diff --git a/Carpet/CarpetInterp2/src/fasterp.cc b/Carpet/CarpetInterp2/src/fasterp.cc
index 6f42fe2b3..249676636 100644
--- a/Carpet/CarpetInterp2/src/fasterp.cc
+++ b/Carpet/CarpetInterp2/src/fasterp.cc
@@ -1,3 +1,6 @@
+#include <cctk.h>
+#include <cctk_Parameters.h>
+
#include <algorithm>
#include <cassert>
#include <cmath>
@@ -6,10 +9,11 @@
#include <iostream>
#include <sstream>
-#include <cctk.h>
-#include <cctk_Parameters.h>
-
-#include <mpi.h>
+#ifdef CCTK_MPI
+# include <mpi.h>
+#else
+# include "nompi.h"
+#endif
#include <carpet.hh>
#include <vect.hh>