aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetLib/src/dist.cc
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2010-12-02 13:33:42 -0500
committerBarry Wardell <barry.wardell@gmail.com>2011-12-14 18:25:40 +0000
commitc364073589286a4667233eda63d24b9cb24e90f0 (patch)
tree6e6ff95aafde4c351c264856bf85ec2e199ffef7 /Carpet/CarpetLib/src/dist.cc
parent0c5ebf66d02eaebe2fe8de5641df163ad2d39258 (diff)
CarpetLib: Rearrange order of #include statements
Diffstat (limited to 'Carpet/CarpetLib/src/dist.cc')
-rw-r--r--Carpet/CarpetLib/src/dist.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/Carpet/CarpetLib/src/dist.cc b/Carpet/CarpetLib/src/dist.cc
index 89acacfad..67ebe35a6 100644
--- a/Carpet/CarpetLib/src/dist.cc
+++ b/Carpet/CarpetLib/src/dist.cc
@@ -1,14 +1,18 @@
+#include <cctk.h>
+#include <cctk_Parameters.h>
+
#include <cassert>
#include <typeinfo>
-#include <mpi.h>
+#ifdef CCTK_MPI
+# include <mpi.h>
+#else
+# include "nompi.h"
+#endif
#ifdef _OPENMP
# include <omp.h>
#endif
-#include "cctk.h"
-#include "cctk_Parameters.h"
-
#include "defs.hh"
#include "limits.hh"
#include "startup_time.hh"
@@ -54,17 +58,12 @@ namespace dist {
#endif
// Output startup time
- // cerr << "QQQ: pseudoinit[1]" << endl;
CarpetLib::output_startup_time ();
- // cerr << "QQQ: pseudoinit[2]" << endl;
// Check and/or modify system limits
CarpetLib::set_system_limits ();
- // cerr << "QQQ: pseudoinit[3]" << endl;
- // cerr << "QQQ: pseudoinit[4]" << endl;
collect_total_num_threads ();
- // cerr << "QQQ: pseudoinit[5]" << endl;
}
void finalize () {