From e3859a08c39089c879cd71ec0e014ca1472afb76 Mon Sep 17 00:00:00 2001
From: David L Parkhurst <dlpark@usgs.gov>
Date: Tue, 28 Aug 2007 20:45:29 +0000
Subject: [PATCH] reordering mpi.h

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2189 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 Solution.cxx   | 6 ++++--
 StorageBin.cxx | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Solution.cxx b/Solution.cxx
index 20c2fb72..2cce8e18 100644
--- a/Solution.cxx
+++ b/Solution.cxx
@@ -4,7 +4,10 @@
 #ifdef _DEBUG
 #pragma warning(disable : 4786)   // disable truncation warning (Only used by debugger)
 #endif
-
+#ifdef USE_MPI
+//MPICH seems to require mpi.h to be first
+  #include <mpi.h>
+#endif
 #include "Utils.h"   // define first
 #include "Solution.h"
 #define EXTERNAL extern
@@ -1073,7 +1076,6 @@ void cxxSolution::ORCH_store_global(std::map < std::string, double > output_map)
 }
 #endif
 #ifdef USE_MPI
-#include <mpi.h>
 /* ---------------------------------------------------------------------- */
 void cxxSolution::mpi_pack(std::vector<int>& ints, std::vector<double>& doubles)
 /* ---------------------------------------------------------------------- */
diff --git a/StorageBin.cxx b/StorageBin.cxx
index 65eaadda..ebba0f9b 100644
--- a/StorageBin.cxx
+++ b/StorageBin.cxx
@@ -4,6 +4,10 @@
 #ifdef _DEBUG
 #pragma warning(disable : 4786)   // disable truncation warning (Only used by debugger)
 #endif
+#ifdef USE_MPI
+//MPICH seems to require mpi.h to be first
+  #include <mpi.h>
+#endif
 
 #include <fstream>
 #include <iostream>     // std::cout std::cerr
@@ -663,7 +667,6 @@ struct system *cxxStorageBin::cxxStorageBin2system(int n)
 	return system_ptr;
 }
 #ifdef USE_MPI
-#include <mpi.h>
 void cxxStorageBin::mpi_send(int n, int task_number)
 {
         //