diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-12-03 16:22:27 -0500 |
---|---|---|
committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-12-03 16:22:27 -0500 |
commit | a13a86fcc85c0b787ce48c2ad259d2bf626368ab (patch) | |
tree | 3895e6785faa49062f12de59cdd67f8c87a347ae /Carpet | |
parent | 78815dcb6342791035c4081726a6ee896c5e51d8 (diff) |
CarpetInterp: Use thorn NoMPI
Diffstat (limited to 'Carpet')
-rw-r--r-- | Carpet/CarpetInterp/interface.ccl | 2 | ||||
-rw-r--r-- | Carpet/CarpetInterp/src/interp.cc | 17 |
2 files changed, 12 insertions, 7 deletions
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" |