max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

reordering mpi.h

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2189 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2007-08-28 20:45:29 +00:00
parent 37b1add946
commit e3859a08c3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Solution.cxx
View File

@ -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)
/* ---------------------------------------------------------------------- */

5
StorageBin.cxx
View File

@ -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)
{
//